Skip to content

GitLab

Commit 3b19d8e9 authored by Andreas Lauser's avatar Andreas Lauser
Browse files

replace tabulators by 4 spaces 

in some places the indentation might be slightly messed-up by this

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@5042 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent 33f4d3fa
Expand all Hide whitespace changes
Inline Side-by-side
appl/lecture/msm/1p2cvs2p/external_interface.hh
View file @ 3b19d8e9
......@@ -54,7 +54,7 @@ public:
{
using namespace std;
std::cout
<< "-----> ISP: Interface Soil Properties Initialization ...\n";
<< "-----> ISP: Interface Soil Properties Initialization ...\n";
//ISP input file defenition
ifstream input;
......@@ -65,7 +65,7 @@ public:
cout << "\n";
cout << "-----> ISP: Fatal error! - Data read \n";
cout << "-----> ISP: Could not open the input data file: \""
<< isp_filename << "\n";
<< isp_filename << "\n";
}
//iPCM input file reading
......@@ -81,21 +81,21 @@ public:
input >> reader;
ISP_Permeability = atof(reader);
cout << "-----> ISP: Permeability: " << ISP_Permeability
<< "\n";
<< "\n";
}
if (reader == string("<FinePermeability>"))
{
input >> reader;
ISP_FinePermeability = atof(reader);
cout << "-----> ISP: Fine permeability: "
<< ISP_FinePermeability << "\n";
<< ISP_FinePermeability << "\n";
}
if (reader == string("<CoarsePermeability>"))
{
input >> reader;
ISP_CoarsePermeability = atof(reader);
cout << "-----> ISP: Coarse permeability: "
<< ISP_CoarsePermeability << "\n";
<< ISP_CoarsePermeability << "\n";
}
if (reader == string("<Porosity>"))
{
......@@ -108,91 +108,91 @@ public:
input >> reader;
ISP_FinePorosity = atof(reader);
cout << "-----> ISP: Fine porosity: " << ISP_FinePorosity
<< "\n";
<< "\n";
}
if (reader == string("<CoarsePorosity>"))
{
input >> reader;
ISP_CoarsePorosity = atof(reader);
cout << "-----> ISP: Coarse porosity: " << ISP_CoarsePorosity
<< "\n";
<< "\n";
}
if (reader == string("<LeakageWellPermeability>"))
{
input >> reader;
ISP_LeakageWellPermeability = atof(reader);
cout << "-----> ISP: Leakage Well Permeability: "
<< ISP_LeakageWellPermeability << "\n";
<< ISP_LeakageWellPermeability << "\n";
}
if (reader == string("<LongitudinalDispersivity>"))
{
input >> reader;
ISP_LongitudinalDispersivity = atof(reader);
cout << "-----> ISP: Longitudinal dispersivity: "
<< ISP_LongitudinalDispersivity << "\n";
<< ISP_LongitudinalDispersivity << "\n";
}
if (reader == string("<TransverseDispersivity>"))
{
input >> reader;
ISP_TransverseDispersivity = atof(reader);
cout << "-----> ISP: Transverse dispersivity: "
<< ISP_TransverseDispersivity << "\n";
<< ISP_TransverseDispersivity << "\n";
}
if (reader == string("<FineBrooksCoreyLambda>"))
{
input >> reader;
ISP_FineBrooksCoreyLambda = atof(reader);
cout << "-----> ISP: Brooks-Corey lambda, fine: "
<< ISP_FineBrooksCoreyLambda << "\n";
<< ISP_FineBrooksCoreyLambda << "\n";
}
if (reader == string("<FineBrooksCoreyEntryPressure>"))
{
input >> reader;
ISP_FineBrooksCoreyEntryPressure = atof(reader);
cout << "-----> ISP: Brooks-Corey entry pressure, fine: "
<< ISP_FineBrooksCoreyEntryPressure << "\n";
<< ISP_FineBrooksCoreyEntryPressure << "\n";
}
if (reader == string("<CoarseBrooksCoreyLambda>"))
{
input >> reader;
ISP_CoarseBrooksCoreyLambda = atof(reader);
cout << "-----> ISP: Brooks-Corey lambda, coarse: "
<< ISP_CoarseBrooksCoreyLambda << "\n";
<< ISP_CoarseBrooksCoreyLambda << "\n";
}
if (reader == string("<CoarseBrooksCoreyEntryPressure>"))
{
input >> reader;
ISP_CoarseBrooksCoreyEntryPressure = atof(reader);
cout << "-----> ISP: Brooks-Corey entry pressure, coarse: "
<< ISP_CoarseBrooksCoreyEntryPressure << "\n";
<< ISP_CoarseBrooksCoreyEntryPressure << "\n";
}
if (reader == string("<FineResidualSaturationWetting>"))
{
input >> reader;
ISP_FineResidualSaturationWetting = atof(reader);
cout << "-----> ISP: Residual saturation wetting phase, fine: "
<< ISP_FineResidualSaturationWetting << "\n";
<< ISP_FineResidualSaturationWetting << "\n";
}
if (reader == string("<FineResidualSaturationNonWetting>"))
{
input >> reader;
ISP_FineResidualSaturationNonWetting = atof(reader);
cout << "-----> ISP: Residual saturation nonwetting phase, fine: "
<< ISP_FineResidualSaturationNonWetting << "\n";
<< ISP_FineResidualSaturationNonWetting << "\n";
}
if (reader == string("<CoarseResidualSaturationWetting>"))
{
input >> reader;
ISP_CoarseResidualSaturationWetting = atof(reader);
cout << "-----> ISP: Residual saturation wetting phase, coarse: "
<< ISP_CoarseResidualSaturationWetting << "\n";
<< ISP_CoarseResidualSaturationWetting << "\n";
}
if (reader == string("<CoarseResidualSaturationNonWetting>"))
{
input >> reader;
ISP_CoarseResidualSaturationNonWetting = atof(reader);
cout << "-----> ISP: Residual saturation nonwetting phase, coarse: "
<< ISP_CoarseResidualSaturationNonWetting << "\n";
<< ISP_CoarseResidualSaturationNonWetting << "\n";
}
}
input.close();
......@@ -216,7 +216,7 @@ public:
{
using namespace std;
std::cout
<< "-----> IFP: Interface Fluid Properties Initialization ...\n";
<< "-----> IFP: Interface Fluid Properties Initialization ...\n";
//IFP input file defenition
ifstream input;
......@@ -227,7 +227,7 @@ public:
cout << "\n";
cout << "-----> IFP: Fatal error! - Data read \n";
cout << "-----> IFP: Could not open the input data file: \""
<< ifp_filename << "\n";
<< ifp_filename << "\n";
}
//iPCM input file reading
......@@ -244,21 +244,21 @@ public:
input >> reader;
IFP_GasDiffCoeff = atof(reader);
cout << "-----> IFP: Gas Diffusion Coefficient: "
<< IFP_GasDiffCoeff << "\n";
<< IFP_GasDiffCoeff << "\n";
}
if (reader == string("<CO2ResidualSaturation>"))
{
input >> reader;
IFP_CO2ResidSat = atof(reader);
cout << "-----> IFP: Residual Saturation of CO2: "
<< IFP_CO2ResidSat << "\n";
<< IFP_CO2ResidSat << "\n";
}
if (reader == string("<MolecularDiffusionCoefficient>"))
{
input >> reader;
IFP_MolecularDiffusionCoefficient = atof(reader);
cout << "-----> IFP: Molecular diffusion coefficient: "
<< IFP_MolecularDiffusionCoefficient << "\n";
<< IFP_MolecularDiffusionCoefficient << "\n";
}
}
input.close();
......@@ -288,8 +288,7 @@ public:
//Initialization of IPP Parameters
{
using namespace std;
std::cout
<< "-----> IPP: Interface Soil Properties Initialization ...\n";
std::cout << "-----> IPP: Interface Soil Properties Initialization ...\n";
//IPP input file defenition
ifstream input;
......@@ -300,7 +299,7 @@ public:
cout << "\n";
cout << "-----> IPP: Fatal error! - Data read \n";
cout << "-----> IPP: Could not open the input data file: \""
<< ipp_filename << "\n";
<< ipp_filename << "\n";
}
//iPCM input file reading
......@@ -323,63 +322,63 @@ public:
input >> reader;
IPP_InjectionWellRate = atof(reader);
cout << "-----> IPP: Injection Well Rate: "
<< IPP_InjectionWellRate << "\n";
<< IPP_InjectionWellRate << "\n";
}
if (reader == string("<InjectionWellWindowSize>"))
{
input >> reader;
IPP_InjectionWindowSize = atof(reader);
cout << "-----> IPP: Injection Well Window Size: "
<< IPP_InjectionWindowSize << "\n";
<< IPP_InjectionWindowSize << "\n";
}
if (reader == string("<UpperPressure>"))
{
input >> reader;
IPP_UpperPressure = atof(reader);
cout << "-----> IPP: Upper pressure: "
<< IPP_UpperPressure << "\n";
<< IPP_UpperPressure << "\n";
}
if (reader == string("<LowerPressure>"))
{
input >> reader;
IPP_LowerPressure = atof(reader);
cout << "-----> IPP: Lower pressure: "
<< IPP_LowerPressure << "\n";
<< IPP_LowerPressure << "\n";
}
if (reader == string("<InfiltrationRate>"))
{
input >> reader;
IPP_InfiltrationRate = atof(reader);
cout << "-----> IPP: Infiltration rate: "
<< IPP_InfiltrationRate << "\n";
<< IPP_InfiltrationRate << "\n";
}
if (reader == string("<MaxTimeStepSize>"))
{
input >> reader;
IPP_MaxTimeStepSize = atof(reader);
cout << "-----> IPP: Maximum time step size: "
<< IPP_MaxTimeStepSize << "\n";
<< IPP_MaxTimeStepSize << "\n";
}
if (reader == string("<InfiltrationStartTime>"))
{
input >> reader;
IPP_InfiltrationStartTime = atof(reader);
cout << "-----> IPP: Start time of infiltration: "
<< IPP_InfiltrationStartTime << "\n";
<< IPP_InfiltrationStartTime << "\n";
}
if (reader == string("<InfiltrationEndTime>"))
{
input >> reader;
IPP_InfiltrationEndTime = atof(reader);
cout << "-----> IPP: End time of infiltration: "
<< IPP_InfiltrationEndTime << "\n";
<< IPP_InfiltrationEndTime << "\n";
}
if (reader == string("<SimulationNumber>"))
{
input >> reader;
IPP_SimulationNumber = atof(reader);
cout << "-----> IPP: Output Name: "
<< IPP_SimulationNumber << "\n";
<< IPP_SimulationNumber << "\n";
}
}
input.close();
......
appl/lecture/msm/1p2cvs2p/lensproblem2p.hh
View file @ 3b19d8e9
......@@ -186,23 +186,22 @@ class LensProblem : public TwoPProblem<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FVElementGeometry)) FVElementGeometry;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
typedef Dune::FieldVector<Scalar, dim> LocalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
public:
LensProblem(TimeManager &timeManager,
const GridView &gridView,
const GlobalPosition &lowerLeft,
const GlobalPosition &upperRight,
const GlobalPosition &lowerLeft,
const GlobalPosition &upperRight,
const GlobalPosition &lensLowerLeft,
const GlobalPosition &lensUpperRight)
: ParentType(timeManager, gridView)
{
this->spatialParameters().setLensCoords(lensLowerLeft, lensUpperRight);
bboxMin_[0] = lowerLeft[0];
bboxMin_[1] = lowerLeft[1];
bboxMax_[0] = upperRight[0];
bboxMax_[1] = upperRight[1];
bboxMin_[0] = lowerLeft[0];
bboxMin_[1] = lowerLeft[1];
bboxMax_[0] = upperRight[0];
bboxMax_[1] = upperRight[1];
//load interface-file
Dumux::InterfaceProblemProperties interfaceProbProps("interface2p.xml");
......@@ -210,8 +209,8 @@ public:
lowerPressure_ = interfaceProbProps.IPP_LowerPressure;
upperPressure_ = interfaceProbProps.IPP_UpperPressure;
infiltrationRate_ = interfaceProbProps.IPP_InfiltrationRate;
//infiltrationStartTime_= interfaceProbProps.IPP_InfiltrationStartTime;
infiltrationStartTime_= 1.0e-9;//The infiltrations starts always after the first time step!
//infiltrationStartTime_= interfaceProbProps.IPP_InfiltrationStartTime;
infiltrationStartTime_= 1.0e-9;//The infiltrations starts always after the first time step!
infiltrationEndTime_= interfaceProbProps.IPP_InfiltrationEndTime;
}
......@@ -232,7 +231,7 @@ public:
Scalar simNum = interfaceProbProps.IPP_SimulationNumber;
return (str(boost::format("%s-%02d")
%simName%simNum).c_str());
%simName%simNum).c_str());
}
/*!
......@@ -241,8 +240,8 @@ public:
* This problem assumes a temperature of 10 degrees Celsius.
*/
Scalar temperature(const Element &element,
const FVElementGeometry &fvElemGeom,
int scvIdx) const
const FVElementGeometry &fvElemGeom,
int scvIdx) const
{
return 273.15 + 10; // -> 10°C
};
......@@ -267,7 +266,7 @@ public:
const GlobalPosition globalPos = vertex.geometry().center();
if (onUpperBoundary_(globalPos) || onLowerBoundary_(globalPos))
if (onUpperBoundary_(globalPos) || onLowerBoundary_(globalPos))
values.setAllDirichlet();
else
values.setAllNeumann();
......@@ -300,7 +299,7 @@ public:
values[SnIdx] = 0.0;
}
else
values = 0.0;
values = 0.0;
// Scalar densityW = this->wettingPhase().density();
//
......@@ -345,11 +344,11 @@ public:
const Scalar& time = this->timeManager().time();
if (time >= infiltrationStartTime_ && time <= infiltrationEndTime_)
{
if (onInlet_(globalPos))
values[contiNEqIdx] = -infiltrationRate_; // kg / (m * s)
}
if (time >= infiltrationStartTime_ && time <= infiltrationEndTime_)
{
if (onInlet_(globalPos))
values[contiNEqIdx] = -infiltrationRate_; // kg / (m * s)
}
}
// \}
......@@ -423,8 +422,8 @@ private:
{
Scalar width = this->bboxMax()[0] - this->bboxMin()[0];
Scalar lambda = (this->bboxMax()[0] - globalPos[0])/width;
return onUpperBoundary_(globalPos) && (bboxMax_[0]-0.35*width)/width > lambda && lambda > (bboxMax_[0]-0.55*width)/width;
}
return onUpperBoundary_(globalPos) && (bboxMax_[0]-0.35*width)/width > lambda && lambda > (bboxMax_[0]-0.55*width)/width;
}
static const Scalar eps_ = 3e-6;
GlobalPosition bboxMin_;
......
dumux/boxmodels/1p/1pfluxvariables.hh
View file @ 3b19d8e9
......@@ -26,7 +26,7 @@
* the flux of the fluid over a face of a finite volume for the one-phase model.
*
* This means pressure and temperature gradients, phase densities at
* the integration point, etc.
* the integration point, etc.
*/
#ifndef DUMUX_1P_FLUX_VARIABLES_HH
#define DUMUX_1P_FLUX_VARIABLES_HH
......@@ -75,7 +75,7 @@ class OnePFluxVariables
typedef Dune::FieldMatrix<Scalar, dim, dim> Tensor;
public:
/*
/*
* \brief The constructor
*
* \param problem The problem
......
dumux/boxmodels/2p2cni/2p2cniboundaryvariables.hh
View file @ 3b19d8e9
......@@ -156,7 +156,7 @@ protected:
ScalarGradient tmp(0.0);
// calculate gradients and secondary variables at IPs of the boundary
for (int idx = 0;
for (int idx = 0;
idx < fvElemGeom_.numVertices;
idx++) // loop over adjacent vertices
{
......@@ -198,8 +198,8 @@ protected:
for (int phaseIdx=0; phaseIdx < numPhases; phaseIdx++)
{
densityAtIP_[phaseIdx] += elemDat[idx].density(phaseIdx)*boundaryFace_->shapeValue[idx];
molarDensityAtIP_[phaseIdx] += elemDat[idx].molarDensity(phaseIdx)*boundaryFace_->shapeValue[idx];
densityAtIP_[phaseIdx] += elemDat[idx].density(phaseIdx)*boundaryFace_->shapeValue[idx];
molarDensityAtIP_[phaseIdx] += elemDat[idx].molarDensity(phaseIdx)*boundaryFace_->shapeValue[idx];
}
}
......
dumux/common/pardiso.hh
View file @ 3b19d8e9
......@@ -319,24 +319,24 @@ public:
initAndFactor(A);
}
/*! \brief Prepare the preconditioner.
/*! \brief Prepare the preconditioner.
A solver solves a linear operator equation A(x)=b by applying
A solver solves a linear operator equation A(x)=b by applying
one or several steps of the preconditioner. The method pre()
is called before the first apply operation.
b and x are right hand side and solution vector of the linear
system respectively. It may. e.g., scale the system, allocate memory or
compute a (I)LU decomposition.
Note: The ILU decomposition could also be computed in the constructor
Note: The ILU decomposition could also be computed in the constructor
or with a separate method of the derived method if several
linear systems with the same matrix are to be solved.
\param x The left hand side of the equation.
\param b The right hand side of the equation.
*/
*/
virtual void pre (X& x, Y& b) {}
/*! \brief Apply one step of the preconditioner to the system \f$ A(v)=d \f$.
/*! \brief Apply one step of the preconditioner to the system \f$ A(v)=d \f$.
On entry \f$ v=0 \f$ and \f$ d=b-A(x) \f$ (although this might not be
computed in that way. On exit v contains the update, i.e
......@@ -345,7 +345,7 @@ public:
the preconditioner.
\param[out] v The update to be computed
\param d The current defect.
*/
*/
virtual void apply (X& v, const Y& d)
{
#ifdef HAVE_PARDISO
......@@ -389,14 +389,14 @@ public:
#endif
}
/*! \brief Clean up.
/*! \brief Clean up.
This method is called after the last apply call for the
This method is called after the last apply call for the
linear system to be solved. Memory may be deallocated safely
here. x is the solution of the linear equation.
\param x The right hand side of the equation.
*/
*/
virtual void post (X& x)
{
#ifdef HAVE_PARDISO
......
dumux/common/start.hh
View file @ 3b19d8e9
......@@ -121,7 +121,7 @@ int startFromDGF(int argc, char **argv)
std::cerr << "WARNING: THE PROGRAM IS STARTED USING MPI, BUT THE GRID IMPLEMENTATION\n"
<< " YOU HAVE CHOSEN IS NOT PARALLEL!\n";
}
gridPtr.loadBalance();
gridPtr.loadBalance();
}
// instantiate and run the concrete problem
......
dumux/decoupled/2p2c/2p2cproblem.hh
View file @ 3b19d8e9
......@@ -52,8 +52,8 @@ class IMPETProblem2P2C : public IMPETProblem<TypeTag, Implementation>
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
// material properties
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(SpatialParameters)) SpatialParameters;
enum {
......
dumux/decoupled/2p2c/2p2cproperties.hh
View file @ 3b19d8e9
......@@ -108,7 +108,7 @@ SET_PROP(DecoupledTwoPTwoC, TwoPIndices)
// set fluid/component information
SET_PROP(DecoupledTwoPTwoC, NumPhases) //!< The number of phases in the 2p model is 2
{
// the property is created in decoupledproperties.hh
// the property is created in decoupledproperties.hh
private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(FluidSystem)) FluidSystem;
......
dumux/decoupled/2p2c/dec2p2cfluidstate.hh
View file @ 3b19d8e9
......@@ -60,8 +60,8 @@ class DecTwoPTwoCFluidState : public FluidState<typename GET_PROP_TYPE(TypeTag,
};
public:
enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),};
enum { numPhases = GET_PROP_VALUE(TypeTag, PTAG(NumPhases)),
numComponents = GET_PROP_VALUE(TypeTag, PTAG(NumComponents)),};
public:
/*!
......@@ -90,11 +90,11 @@ public:
}
else
phasePressure_[wPhaseIdx] = pw;
phasePressure_[nPhaseIdx] = pw; // as long as capillary pressure is neglected
phasePressure_[nPhaseIdx] = pw; // as long as capillary pressure is neglected
temperature_=temperature;
//mole equilibrium ratios K for in case wPhase is reference phase
//mole equilibrium ratios K for in case wPhase is reference phase
double k1 = FluidSystem::activityCoeff(wPhaseIdx, wCompIdx, temperature_, phasePressure_[nPhaseIdx], *this)
/ phasePressure_[nPhaseIdx]; // = p^wComp_vap / p_n
double k2 = FluidSystem::activityCoeff(wPhaseIdx, nCompIdx, temperature_, phasePressure_[nPhaseIdx], *this)
......@@ -102,23 +102,23 @@ public:
// get mole fraction from equilibrium konstants
Scalar xw1 = (1. - k2) / (k1 -k2);
Scalar xn1 = xw1 * k1;
Scalar xn1 = xw1 * k1;
// transform mole to mass fractions
massfrac_[wPhaseIdx][wCompIdx] = xw1 * FluidSystem::molarMass(wCompIdx)
// transform mole to mass fractions
massfrac_[wPhaseIdx][wCompIdx] = xw1 * FluidSystem::molarMass(wCompIdx)
/ ( xw1 * FluidSystem::molarMass(wCompIdx) + (1.-xw1) * FluidSystem::molarMass(nCompIdx) );
massfrac_[nPhaseIdx][wCompIdx] = xn1 * FluidSystem::molarMass(wCompIdx)
massfrac_[nPhaseIdx][wCompIdx] = xn1 * FluidSystem::molarMass(wCompIdx)
/ ( xn1 * FluidSystem::molarMass(wCompIdx) + (1.-xn1) * FluidSystem::molarMass(nCompIdx) );
//mass equilibrium ratios
equilRatio_[nPhaseIdx][wCompIdx] = massfrac_[nPhaseIdx][wCompIdx] / massfrac_[wPhaseIdx][wCompIdx]; // = Xn1 / Xw1 = K1
equilRatio_[nPhaseIdx][nCompIdx] = (1.-massfrac_[nPhaseIdx][wCompIdx])/ (1.-massfrac_[wPhaseIdx][wCompIdx]); // =(1.-Xn1) / (1.-Xw1) = K2
equilRatio_[wPhaseIdx][nCompIdx] = equilRatio_[wPhaseIdx][wCompIdx] = 1.;
equilRatio_[nPhaseIdx][wCompIdx] = massfrac_[nPhaseIdx][wCompIdx] / massfrac_[wPhaseIdx][wCompIdx]; // = Xn1 / Xw1 = K1
equilRatio_[nPhaseIdx][nCompIdx] = (1.-massfrac_[nPhaseIdx][wCompIdx])/ (1.-massfrac_[wPhaseIdx][wCompIdx]); // =(1.-Xn1) / (1.-Xw1) = K2
equilRatio_[wPhaseIdx][nCompIdx] = equilRatio_[wPhaseIdx][wCompIdx] = 1.;
// phase fraction of nPhase [mass/totalmass]
nu_[nPhaseIdx] = 0;
// phase fraction of nPhase [mass/totalmass]
nu_[nPhaseIdx] = 0;
// check if there is enough of component 1 to form a phase
if (Z1 > massfrac_[nPhaseIdx][wCompIdx] && Z1 < massfrac_[wPhaseIdx][wCompIdx])
......@@ -129,7 +129,7 @@ public:
massfrac_[nPhaseIdx][wCompIdx] = Z1; // hence, assign complete mass soluted into nPhase
massfrac_[wPhaseIdx][wCompIdx] = 1.;
}
else // (Z1 >= Xw1) => no nPhase
else // (Z1 >= Xw1) => no nPhase
{
nu_[nPhaseIdx] = 0; // no second phase
massfrac_[wPhaseIdx][wCompIdx] = Z1;
......@@ -137,16 +137,16 @@ public:
}
// complete array of mass fractions
massfrac_[wPhaseIdx][nCompIdx] = 1. - massfrac_[wPhaseIdx][wCompIdx];
massfrac_[nPhaseIdx][nCompIdx] = 1. - massfrac_[nPhaseIdx][wCompIdx];
massfrac_[wPhaseIdx][nCompIdx] = 1. - massfrac_[wPhaseIdx][wCompIdx];
massfrac_[nPhaseIdx][nCompIdx] = 1. - massfrac_[nPhaseIdx][wCompIdx];
// complete phase mass fractions
nu_[wPhaseIdx] = 1. - nu_[nPhaseIdx];
// complete phase mass fractions
nu_[wPhaseIdx] = 1. - nu_[nPhaseIdx];
// // let FluidSystem compute partial pressures
// FluidSystem::computePartialPressures(temperature_, phasePressure_[nPhaseIdx], *this);
// // let FluidSystem compute partial pressures
// FluidSystem::computePartialPressures(temperature_, phasePressure_[nPhaseIdx], *this);
// get densities w