diff --git a/dumux/porousmediumflow/2pnc/implicit/model.hh b/dumux/porousmediumflow/2pnc/implicit/model.hh
index 3c96bcb933844d01792a7527f620c67902999d3f..0c3de89aced08889eac4ee2f1f33ef656070fe84 100644
--- a/dumux/porousmediumflow/2pnc/implicit/model.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/model.hh
@@ -285,6 +285,7 @@ public:
ScalarField *mobW = writer.allocateManagedBuffer (numDofs);
ScalarField *mobN = writer.allocateManagedBuffer (numDofs);
ScalarField *temperature = writer.allocateManagedBuffer (numDofs);
+ ScalarField *phasePresence = writer.allocateManagedBuffer (numDofs);
ScalarField *poro = writer.allocateManagedBuffer (numDofs);
VectorField *velocityN = writer.template allocateManagedBuffer<double, dim>(numDofs);
VectorField *velocityW = writer.template allocateManagedBuffer<double, dim>(numDofs);
@@ -301,13 +302,13 @@ public:
}
ScalarField *moleFraction[numPhases][numComponents];
- for (int i = 0; i < numPhases; ++i)
- for (int j = 0; j < numComponents; ++j)
- moleFraction[i][j] = writer.allocateManagedBuffer(numDofs);
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ moleFraction[phaseIdx][compIdx] = writer.allocateManagedBuffer(numDofs);
ScalarField *molarity[numComponents];
- for (int j = 0; j < numComponents ; ++j)
- molarity[j] = writer.allocateManagedBuffer(numDofs);
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ molarity[compIdx] = writer.allocateManagedBuffer(numDofs);
ScalarField *perm[dim];
for (int j = 0; j < dim; ++j) //Permeability only in main directions xx and yy
@@ -345,6 +346,7 @@ public:
(*mobN)[dofIdxGlobal] = elemVolVars[scvIdx].mobility(nPhaseIdx);
(*poro)[dofIdxGlobal] = elemVolVars[scvIdx].porosity();
(*temperature)[dofIdxGlobal] = elemVolVars[scvIdx].temperature();
+ (*phasePresence)[dofIdxGlobal] = staticDat_[dofIdxGlobal].phasePresence;
for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
@@ -378,30 +380,28 @@ public:
writer.attachDofData(*mobN, "mobN", isBox);
writer.attachDofData(*poro, "porosity", isBox);
writer.attachDofData(*temperature, "temperature", isBox);
+ writer.attachDofData(*phasePresence, "phasePresence", isBox);
writer.attachDofData(*perm[0], "Kxx", isBox);
if (dim >= 2)
writer.attachDofData(*perm[1], "Kyy", isBox);
if (dim == 3)
writer.attachDofData(*perm[2], "Kzz", isBox);
- for (int i = 0; i < numPhases; ++i)
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
- for (int j = 0; j < numComponents; ++j)
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
std::ostringstream oss;
- oss << "x"
- << FluidSystem::componentName(j)
- << FluidSystem::phaseName(i);
- writer.attachDofData(*moleFraction[i][j], oss.str(), isBox);
+ oss << "x_" << FluidSystem::phaseName(phaseIdx) << "^" << FluidSystem::componentName(compIdx);
+ writer.attachDofData(*moleFraction[phaseIdx][compIdx], oss.str(), isBox);
}
}
- for (int j = 0; j < numComponents; ++j)
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
std::ostringstream oss;
- oss << "m^w_"
- << FluidSystem::componentName(j);
- writer.attachDofData(*molarity[j], oss.str().c_str(), isBox);
+ oss << "m_" << FluidSystem::phaseName(wPhaseIdx) << "^" << FluidSystem::componentName(compIdx);
+ writer.attachDofData(*molarity[compIdx], oss.str(), isBox);
}
if (velocityOutput.enableOutput()) // check if velocity output is demanded
@@ -673,11 +673,9 @@ protected:
globalSol[dofIdxGlobal][switchIdx] = 0.9999;
else if (formulation == pwsn)
globalSol[dofIdxGlobal][switchIdx] = 0.0001;
-
}
}
-
staticDat_[dofIdxGlobal].phasePresence = newPhasePresence;
staticDat_[dofIdxGlobal].wasSwitched = wouldSwitch;
return phasePresence != newPhasePresence;
diff --git a/dumux/porousmediumflow/2pnc/implicit/properties.hh b/dumux/porousmediumflow/2pnc/implicit/properties.hh
index 44e495060a32628912873862ba21e61bf810e442..2d4c941d9e812089d28fcd78657680d807e2f9cb 100644
--- a/dumux/porousmediumflow/2pnc/implicit/properties.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/properties.hh
@@ -59,6 +59,7 @@ NEW_TYPE_TAG(CCTwoPNCNI, INHERITS_FROM(CCModel, TwoPNCNI));
NEW_PROP_TAG(NumPhases); //!< Number of fluid phases in the system
NEW_PROP_TAG(NumComponents); //!< Number of fluid components in the system
NEW_PROP_TAG(NumMajorComponents); //!< Number of major fluid components which are considered in the calculation of the phase density
+NEW_PROP_TAG(SetMoleFractionsForWettingPhase); //!< Set the mole fraction in the wetting or non-wetting phase
NEW_PROP_TAG(TwoPNCIndices); //!< Enumerations for the 2pncMin models
NEW_PROP_TAG(Formulation); //!< The formulation of the model
NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
diff --git a/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh b/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
index 280f834e243b59be3cac5e8e751811b9502d332c..9687901a65ad6f34f7ec6e392d75db32a9a92da9 100644
--- a/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/propertydefaults.hh
@@ -86,6 +86,9 @@ public:
"The model is restricted to two phases, thus number of major components must also be two.");
};
+//! Set the primary variables mole fractions for the wetting or non-wetting phase
+SET_BOOL_PROP(TwoPNC, SetMoleFractionsForWettingPhase, true);
+
/*!
* \brief Set the property for the number of fluid phases.
*
diff --git a/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh b/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
index 23dc3348f763ab039bd070e6eec9cef86c9e450f..5e499a057a28060863d51ab8e78a99f36d370217 100644
--- a/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
@@ -200,20 +200,25 @@ public:
// set the saturations
/////////////
- Scalar Sg;
+ Scalar Sg;
if (phasePresence == nPhaseOnly)
Sg = 1.0;
- else if (phasePresence == wPhaseOnly) {
+ else if (phasePresence == wPhaseOnly)
+ {
Sg = 0.0;
}
- else if (phasePresence == bothPhases) {
+ else if (phasePresence == bothPhases)
+ {
if (formulation == pwsn)
Sg = priVars[switchIdx];
else if (formulation == pnsw)
Sg = 1.0 - priVars[switchIdx];
else DUNE_THROW(Dune::InvalidStateException, "Formulation: " << formulation << " is invalid.");
}
- else DUNE_THROW(Dune::InvalidStateException, "phasePresence: " << phasePresence << " is invalid.");
+ else
+ {
+ DUNE_THROW(Dune::InvalidStateException, "phasePresence: " << phasePresence << " is invalid.");
+ }
fluidState.setSaturation(nPhaseIdx, Sg);
fluidState.setSaturation(wPhaseIdx, 1.0 - Sg);
@@ -223,7 +228,7 @@ public:
// calculate capillary pressure
const MaterialLawParams &materialParams
- = problem.spatialParams().materialLawParams(element, fvGeometry, scvIdx);
+ = problem.spatialParams().materialLawParams(element, fvGeometry, scvIdx);
Scalar pc = MaterialLaw::pc(materialParams, 1 - Sg);
// extract the pressures
@@ -249,10 +254,10 @@ public:
// calculate the phase compositions
/////////////
- typename FluidSystem::ParameterCache paramCache;
-
+ typename FluidSystem::ParameterCache paramCache;
// now comes the tricky part: calculate phase composition
- if (phasePresence == bothPhases) {
+ if (phasePresence == bothPhases)
+ {
// both phases are present, phase composition results from
// the nonwetting <-> wetting equilibrium. This is
// the job of the "MiscibleMultiPhaseComposition"
@@ -260,55 +265,63 @@ public:
// set the known mole fractions in the fluidState so that they
// can be used by the Miscible2pNCComposition constraint solver
+ unsigned int knownPhaseIdx = nPhaseIdx;
+ if (GET_PROP_VALUE(TypeTag, SetMoleFractionsForWettingPhase))
+ {
+ knownPhaseIdx = wPhaseIdx;
+ }
+
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
{
- fluidState.setMoleFraction(wPhaseIdx, compIdx, priVars[compIdx]);
+ fluidState.setMoleFraction(knownPhaseIdx, compIdx, priVars[compIdx]);
}
Miscible2pNCComposition::solve(fluidState,
paramCache,
- wPhaseIdx, //known phaseIdx
+ knownPhaseIdx,
/*setViscosity=*/true,
/*setEnthalpy=*/false);
}
- else if (phasePresence == nPhaseOnly){
-
+ else if (phasePresence == nPhaseOnly)
+ {
Dune::FieldVector<Scalar, numComponents> moleFrac;
-
moleFrac[wCompIdx] = priVars[switchIdx];
-
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
- moleFrac[compIdx] = priVars[compIdx];
-
+ {
+ moleFrac[compIdx] = priVars[compIdx];
+ }
Scalar sumMoleFracOtherComponents = 0;
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
- sumMoleFracOtherComponents+=moleFrac[compIdx];
+ {
+ sumMoleFracOtherComponents+=moleFrac[compIdx];
+ }
sumMoleFracOtherComponents += moleFrac[wCompIdx];
moleFrac[nCompIdx] = 1 - sumMoleFracOtherComponents;
-
// Set fluid state mole fractions
for (int compIdx=0; compIdx<numComponents; ++compIdx)
- fluidState.setMoleFraction(nPhaseIdx, compIdx, moleFrac[compIdx]);
-
+ {
+ fluidState.setMoleFraction(nPhaseIdx, compIdx, moleFrac[compIdx]);
+ }
// calculate the composition of the remaining phases (as
// well as the densities of all phases). this is the job
// of the "ComputeFromReferencePhase" constraint solver
ComputeFromReferencePhase::solve(fluidState,
paramCache,
- nPhaseIdx,
+ nPhaseIdx,
/*setViscosity=*/true,
/*setEnthalpy=*/false);
}
- else if (phasePresence == wPhaseOnly){
- // only the wetting phase is present, i.e. wetting phase
- // composition is stored explicitly.
- // extract _mass_ fractions in the nonwetting phase
+ else if (phasePresence == wPhaseOnly)
+ {
+ // only the wetting phase is present, i.e. wetting phase
+ // composition is stored explicitly.
+ // extract _mass_ fractions in the nonwetting phase
Dune::FieldVector<Scalar, numComponents> moleFrac;
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
@@ -319,7 +332,7 @@ public:
Scalar sumMoleFracNotWater = 0;
for (int compIdx=numMajorComponents; compIdx<numComponents; ++compIdx)
{
- sumMoleFracNotWater+=moleFrac[compIdx];
+ sumMoleFracNotWater+=moleFrac[compIdx];
}
sumMoleFracNotWater += moleFrac[nCompIdx];
moleFrac[wCompIdx] = 1 -sumMoleFracNotWater;
@@ -373,13 +386,7 @@ public:
* \param phaseIdx The phase index
*/
Scalar density(int phaseIdx) const
- {
- if (phaseIdx < numPhases)
- return fluidState_.density(phaseIdx);
-
- else
- DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
- }
+ { return fluidState_.density(phaseIdx); }
/*!
* \brief Returns the mass density of a given phase within the
@@ -388,13 +395,7 @@ public:
* \param phaseIdx The phase index
*/
Scalar molarDensity(int phaseIdx) const
- {
- if (phaseIdx < numPhases)
- return fluidState_.molarDensity(phaseIdx);
-
- else
- DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
- }
+ { return fluidState_.molarDensity(phaseIdx); }
/*!
* \brief Returns the effective pressure of a given phase within
@@ -403,9 +404,7 @@ public:
* \param phaseIdx The phase index
*/
Scalar pressure(int phaseIdx) const
- {
- return fluidState_.pressure(phaseIdx);
- }
+ { return fluidState_.pressure(phaseIdx); }
/*!
* \brief Returns temperature inside the sub-control volume.
@@ -424,9 +423,7 @@ public:
* \param phaseIdx The phase index
*/
Scalar mobility(int phaseIdx) const
- {
- return mobility_[phaseIdx];
- }
+ { return mobility_[phaseIdx]; }
/*!
* \brief Returns the effective capillary pressure within the control volume
@@ -441,7 +438,6 @@ public:
Scalar porosity() const
{ return porosity_; }
-
/*!
* \brief Returns the binary diffusion coefficients for a phase in \f$[m^2/s]\f$.
*/
@@ -449,12 +445,12 @@ public:
{ return diffCoeff_[phaseIdx][compIdx]; }
/*!
- * \brief Returns the molarity of a component in the phase
+ * \brief Returns the molarity of a component in the phase \f$ moles/m^3 \f$
*
* \param phaseIdx the index of the fluid phase
* \param compIdx the index of the component
*/
- Scalar molarity(int phaseIdx, int compIdx) const // [moles/m^3]
+ Scalar molarity(int phaseIdx, int compIdx) const
{ return this->fluidState_.molarity(phaseIdx, compIdx);}
/*!
@@ -464,9 +460,7 @@ public:
* \param compIdx the index of the component
*/
Scalar massFraction(int phaseIdx, int compIdx) const
- {
- return this->fluidState_.massFraction(phaseIdx, compIdx);
- }
+ { return this->fluidState_.massFraction(phaseIdx, compIdx); }
/*!
* \brief Returns the mole fraction of a component in the phase
@@ -475,12 +469,9 @@ public:
* \param compIdx the index of the component
*/
Scalar moleFraction(int phaseIdx, int compIdx) const
- {
- return this->fluidState_.moleFraction(phaseIdx, compIdx);
- }
+ { return this->fluidState_.moleFraction(phaseIdx, compIdx); }
protected:
-
static Scalar temperature_(const PrimaryVariables &priVars,
const Problem& problem,
const Element &element,
@@ -499,8 +490,8 @@ protected:
}
/*!
- * \brief Called by update() to compute the energy related quantities
- */
+ * \brief Called by update() to compute the energy related quantities
+ */
void updateEnergy_(const PrimaryVariables &priVars,
const Problem &problem,
const Element &element,
@@ -509,8 +500,8 @@ protected:
bool isOldSol)
{ };
- Scalar porosity_; //!< Effective porosity within the control volume
- Scalar mobility_[numPhases]; //!< Effective mobility within the control volume
+ Scalar porosity_; //!< Effective porosity within the control volume
+ Scalar mobility_[numPhases]; //!< Effective mobility within the control volume
Scalar density_;
FluidState fluidState_;
Scalar theta_;
@@ -524,7 +515,6 @@ private:
const Implementation &asImp_() const
{ return *static_cast<const Implementation*>(this); }
-
};
} // end namespace
diff --git a/dumux/porousmediumflow/2pncmin/implicit/model.hh b/dumux/porousmediumflow/2pncmin/implicit/model.hh
index 3f20df868d2ed564d5aebfa1c26e913ef0ba7775..a4d52f87911ff3e842708fd7141a734937c82674 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/model.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/model.hh
@@ -201,17 +201,22 @@ public:
ScalarField *permeabilityFactor = writer.allocateManagedBuffer (numDofs);
ScalarField *precipitateVolumeFraction[numSPhases];
- for (int i = 0; i < numSPhases; ++i)
- precipitateVolumeFraction[i] = writer.allocateManagedBuffer(numDofs);
+ for (int sPhaseIdx = 0; sPhaseIdx < numSPhases; ++sPhaseIdx)
+ precipitateVolumeFraction[sPhaseIdx] = writer.allocateManagedBuffer(numDofs);
ScalarField *massFraction[numPhases][numComponents];
- for (int i = 0; i < numPhases; ++i)
- for (int j = 0; j < numComponents; ++j)
- massFraction[i][j] = writer.allocateManagedBuffer(numDofs);
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ massFraction[phaseIdx][compIdx] = writer.allocateManagedBuffer(numDofs);
+
+ ScalarField *moleFraction[numPhases][numComponents];
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ moleFraction[phaseIdx][compIdx] = writer.allocateManagedBuffer(numDofs);
ScalarField *molarity[numComponents];
- for (int j = 0; j < numComponents ; ++j)
- molarity[j] = writer.allocateManagedBuffer(numDofs);
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ molarity[compIdx] = writer.allocateManagedBuffer(numDofs);
ScalarField *Perm[dim];
for (int j = 0; j < dim; ++j) //Permeability only in main directions xx and yy
@@ -273,12 +278,16 @@ public:
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
(*massFraction[phaseIdx][compIdx])[dofIdxGlobal]= elemVolVars[scvIdx].massFraction(phaseIdx,compIdx);
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ (*moleFraction[phaseIdx][compIdx])[dofIdxGlobal]= elemVolVars[scvIdx].moleFraction(phaseIdx,compIdx);
+
for (int compIdx = 0; compIdx < numComponents; ++compIdx)
(*molarity[compIdx])[dofIdxGlobal] = (elemVolVars[scvIdx].molarity(wPhaseIdx, compIdx));
Tensor K = this->perm_(this->problem_().spatialParams().intrinsicPermeability(element, fvGeometry, scvIdx));
- for (int j = 0; j<dim; ++j)
+ for (int j = 0; j < dim; ++j)
(*Perm[j])[dofIdxGlobal] = K[j][j] * elemVolVars[scvIdx].permeabilityFactor();
};
@@ -316,21 +325,31 @@ public:
if (dim == 3)
writer.attachDofData(*Perm[2], "Kzz", isBox);
- for (int i = 0; i < numPhases; ++i)
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
+ {
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
+ {
+ std::ostringstream oss;
+ oss << "X_" << FluidSystem::phaseName(phaseIdx) << "^" << FluidSystem::componentName(compIdx);
+ writer.attachDofData(*massFraction[phaseIdx][compIdx], oss.str(), isBox);
+ }
+ }
+
+ for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx)
{
- for (int j = 0; j < numComponents; ++j)
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
std::ostringstream oss;
- oss << "X^" << FluidSystem::phaseName(i) << "_" << FluidSystem::componentName(j);
- writer.attachDofData(*massFraction[i][j], oss.str(), isBox);
+ oss << "x_" << FluidSystem::phaseName(phaseIdx) << "^" << FluidSystem::componentName(compIdx);
+ writer.attachDofData(*moleFraction[phaseIdx][compIdx], oss.str(), isBox);
}
}
- for (int j = 0; j < numComponents; ++j)
+ for (int compIdx = 0; compIdx < numComponents; ++compIdx)
{
std::ostringstream oss;
- oss << "m^w_" << FluidSystem::componentName(j);
- writer.attachDofData(*molarity[j], oss.str(), isBox);
+ oss << "m_" << FluidSystem::phaseName(wPhaseIdx) << "^" << FluidSystem::componentName(compIdx);
+ writer.attachDofData(*molarity[compIdx], oss.str(), isBox);
}
if (velocityOutput.enableOutput()) // check if velocity output is demanded
diff --git a/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh b/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
index c8d9e1605bcdffb155da85af96fd50363f41d4df..ddc8f86a28efa08d87b5a8b539855028d4a645f9 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
@@ -440,10 +440,8 @@ public:
{
if (phaseIdx < numPhases)
return this->fluidState_.density(phaseIdx);
- else if (phaseIdx >= numPhases)
- return FluidSystem::precipitateDensity(phaseIdx);
else
- DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
+ return FluidSystem::precipitateDensity(phaseIdx);
}
/*!
* \brief Returns the mass density of a given phase within the
@@ -455,10 +453,8 @@ public:
{
if (phaseIdx < numPhases)
return this->fluidState_.molarDensity(phaseIdx);
- else if (phaseIdx >= numPhases)
- return FluidSystem::precipitateMolarDensity(phaseIdx);
else
- DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
+ return FluidSystem::precipitateMolarDensity(phaseIdx);
}
/*!
diff --git a/test/references/fuelcell2pncbox-reference.vtu b/test/references/fuelcell2pncbox-reference.vtu
index 51349dfa14bf560ec3dcdf083b9860edafb5c54e..4b62fa46f0d10f730e7f34c3aac0eda6351d213f 100644
--- a/test/references/fuelcell2pncbox-reference.vtu
+++ b/test/references/fuelcell2pncbox-reference.vtu
@@ -168,6 +168,21 @@
310 310 310 310 310 310 310 310 310 310 310 310
310 310 310 310 310 310 310 310 310 310
</DataArray>
+ <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3
+ </DataArray>
<DataArray type="Float32" Name="Kxx" NumberOfComponents="1" format="ascii">
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
@@ -198,7 +213,7 @@
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
</DataArray>
- <DataArray type="Float32" Name="xH2Ol" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_l^H2O" NumberOfComponents="1" format="ascii">
0.999989 0.999989 0.999988 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
@@ -213,7 +228,7 @@
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
</DataArray>
- <DataArray type="Float32" Name="xN2l" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_l^N2" NumberOfComponents="1" format="ascii">
7.16836e-06 7.16836e-06 6.91411e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
@@ -228,7 +243,7 @@
5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06
5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06
</DataArray>
- <DataArray type="Float32" Name="xO2l" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_l^O2" NumberOfComponents="1" format="ascii">
4.30013e-06 4.30013e-06 4.78305e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06
4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06
4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06
@@ -243,7 +258,7 @@
6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
</DataArray>
- <DataArray type="Float32" Name="xH2Og" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_g^H2O" NumberOfComponents="1" format="ascii">
0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
@@ -258,7 +273,7 @@
0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
</DataArray>
- <DataArray type="Float32" Name="xN2g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_g^N2" NumberOfComponents="1" format="ascii">
0.712623 0.712623 0.687347 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347
0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347
0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347
@@ -273,7 +288,7 @@
0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799
0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799
</DataArray>
- <DataArray type="Float32" Name="xO2g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_g^O2" NumberOfComponents="1" format="ascii">
0.225071 0.225071 0.250346 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346
0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346
0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346
diff --git a/test/references/fuelcell2pnccc-reference.vtu b/test/references/fuelcell2pnccc-reference.vtu
index fa2279344b1ef04ac32e8b17556a4d0a6554d675..3a5220028140d50c16fa0d2fe149cd3797726036 100644
--- a/test/references/fuelcell2pnccc-reference.vtu
+++ b/test/references/fuelcell2pnccc-reference.vtu
@@ -146,6 +146,19 @@
310 310 310 310 310 310 310 310 310 310 310 310
310 310 310 310 310 310
</DataArray>
+ <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3 3 3 3 3 3 3
+ 3 3 3 3 3 3
+ </DataArray>
<DataArray type="Float32" Name="Kxx" NumberOfComponents="1" format="ascii">
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
@@ -172,7 +185,7 @@
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
</DataArray>
- <DataArray type="Float32" Name="xH2Ol" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_l^H2O" NumberOfComponents="1" format="ascii">
0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
@@ -185,7 +198,7 @@
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
</DataArray>
- <DataArray type="Float32" Name="xN2l" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_l^N2" NumberOfComponents="1" format="ascii">
7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06
7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 6.80754e-06 6.80754e-06 6.80754e-06
6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06
@@ -198,7 +211,7 @@
5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06
5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06
</DataArray>
- <DataArray type="Float32" Name="xO2l" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_l^O2" NumberOfComponents="1" format="ascii">
4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06
4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.98546e-06 4.98546e-06 4.98546e-06
4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06
@@ -211,7 +224,7 @@
6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06
6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06
</DataArray>
- <DataArray type="Float32" Name="xH2Og" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_g^H2O" NumberOfComponents="1" format="ascii">
0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623061 0.0623061 0.0623061
0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
@@ -224,7 +237,7 @@
0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
</DataArray>
- <DataArray type="Float32" Name="xN2g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_g^N2" NumberOfComponents="1" format="ascii">
0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006
0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.676753 0.676753 0.676753
0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753
@@ -237,7 +250,7 @@
0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504
0.584504 0.584504 0.584504 0.584504 0.584504 0.584504
</DataArray>
- <DataArray type="Float32" Name="xO2g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_g^O2" NumberOfComponents="1" format="ascii">
0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687
0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.260941 0.260941 0.260941
0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941
diff --git a/test/references/saltflushbox2pncmin-reference.vtu b/test/references/saltflushbox2pncmin-reference.vtu
index e2b9e4b3f36f3822987654e497b5af9a59e55bc3..9d53e9ad9912e3d111751658859ffaafa10ed99c 100644
--- a/test/references/saltflushbox2pncmin-reference.vtu
+++ b/test/references/saltflushbox2pncmin-reference.vtu
@@ -355,7 +355,7 @@
2.844e-15 2.8427e-15 2.84139e-15 2.84007e-15 1.94548e-14 1.94523e-14 1.94438e-14 1.94119e-14 1.93557e-14 1.93553e-14 1.93547e-14 1.93539e-14
1.93525e-14 1.935e-14 2.23e-14
</DataArray>
- <DataArray type="Float32" Name="X^liquid_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
0.998087 0.991686 0.998087 0.996078 0.981277 0.988358 0.886573 0.894589 0.844001 0.847821 0.839344 0.843234
0.833499 0.837189 0.826243 0.829518 0.817486 0.820213 0.807362 0.809473 0.787149 0.788135 0.768755 0.768643
0.754167 0.753065 0.743885 0.741953 0.738839 0.73884 0.738844 0.738845 0.738851 0.738852 0.738857 0.738859
@@ -377,7 +377,7 @@
0.85042 0.844631 0.836322 0.825548 0.801142 0.775999 0.753653 0.738845 0.73885 0.738856 0.738858 0.738859
0.73886 0.73886 0.599048
</DataArray>
- <DataArray type="Float32" Name="X^liquid_Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
0.00181273 0.00180461 0.00181273 0.00180883 0.00178941 0.00179689 -0.0798697 -0.0797377 -0.115342 -0.119578 -0.110178 -0.114492
-0.103696 -0.107788 -0.0956493 -0.0992815 -0.0859379 -0.0889622 -0.0747102 -0.0770521 -0.0522947 -0.0533882 -0.0318971 -0.0317728
-0.0157194 -0.0144972 -0.00431612 -0.00217354 0.00127991 0.00127878 0.00127366 0.00127232 0.00126643 0.00126513 0.00125917 0.00125779
@@ -399,7 +399,7 @@
-0.122461 -0.116041 -0.106827 -0.0948784 -0.0678123 -0.03993 -0.0151485 0.00127256 0.00126775 0.00126055 0.00125815 0.00125708
0.00125641 0.00125587 0.00111052
</DataArray>
- <DataArray type="Float32" Name="X^liquid_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_liquid^NaCl" NumberOfComponents="1" format="ascii">
9.99353e-05 0.00650982 9.99353e-05 0.00211363 0.016934 0.00984485 0.193297 0.185149 0.271341 0.271757 0.270834 0.271258
0.270197 0.270599 0.269406 0.269763 0.268452 0.268749 0.267349 0.267579 0.265146 0.265253 0.263142 0.263129
0.261552 0.261432 0.260431 0.260221 0.259882 0.259882 0.259882 0.259882 0.259883 0.259883 0.259884 0.259884
@@ -421,7 +421,7 @@
0.272041 0.27141 0.270505 0.26933 0.266671 0.263931 0.261496 0.259882 0.259883 0.259883 0.259884 0.259884
0.259884 0.259884 0.399841
</DataArray>
- <DataArray type="Float32" Name="X^gas_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
0.0201084 0.0200702 0.0201084 0.0201112 0.0200291 0.0200885 0.0197179 0.0197892 0.0198319 0.0199037 0.020105 0.0201789
0.0204306 0.0205064 0.0207698 0.0208424 0.0211092 0.0211755 0.021445 0.021503 0.0213807 0.0214195 0.0211134 0.0211317
0.0209052 0.0209025 0.0207283 0.0206301 0.0210615 0.0210799 0.0211629 0.0211847 0.0212813 0.0213028 0.0214016 0.0214247
@@ -443,7 +443,7 @@
0.0208058 0.0212242 0.0216109 0.0219683 0.0218463 0.0214565 0.0210965 0.0211809 0.0212595 0.0213786 0.0214187 0.0214365
0.0214476 0.0214567 0.0197087
</DataArray>
- <DataArray type="Float32" Name="X^gas_Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
0.979892 0.97993 0.979892 0.979889 0.979971 0.979912 -47.6609 -47.3265 -72.7179 -75.3212 -70.8098 -73.5118
-68.1982 -70.8384 -64.5119 -66.9307 -59.5402 -61.6235 -53.2442 -54.9182 -38.1115 -38.9304 -23.5048 -23.4368
-11.6911 -10.7965 -3.2269 -1.62153 0.978938 0.97892 0.978837 0.978815 0.978719 0.978697 0.978598 0.978575
@@ -465,7 +465,7 @@
-80.3868 -78.2366 -74.065 -67.7416 -49.6149 -29.6231 -11.3774 0.978819 0.97874 0.978621 0.978581 0.978563
0.978552 0.978543 0.980291
</DataArray>
- <DataArray type="Float32" Name="X^gas_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_gas^NaCl" NumberOfComponents="1" format="ascii">
4.84414e-12 3.16982e-10 4.84414e-12 1.02675e-10 8.31603e-10 4.81426e-10 1.03433e-08 9.85407e-09 1.53399e-08 1.53497e-08 1.56082e-08 1.56178e-08
1.59347e-08 1.5947e-08 1.62937e-08 1.63077e-08 1.66781e-08 1.66933e-08 1.70853e-08 1.71016e-08 1.73276e-08 1.73444e-08 1.7388e-08 1.74047e-08
1.74434e-08 1.74587e-08 1.74598e-08 1.74082e-08 1.78239e-08 1.78394e-08 1.79097e-08 1.79281e-08 1.80097e-08 1.80279e-08 1.81114e-08 1.81309e-08
@@ -487,7 +487,139 @@
1.6013e-08 1.64088e-08 1.68175e-08 1.72436e-08 1.74958e-08 1.7558e-08 1.76114e-08 1.79248e-08 1.79913e-08 1.8092e-08 1.81259e-08 1.81409e-08
1.81503e-08 1.8158e-08 3.16498e-08
</DataArray>
- <DataArray type="Float32" Name="m^w_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+ 0.998841 0.996854 0.998841 0.998219 0.993587 0.995816 0.988957 0.991719 0.986107 0.989053 0.982504 0.985515
+ 0.977962 0.980831 0.972293 0.974856 0.965408 0.967558 0.957386 0.959065 0.941172 0.941969 0.926181 0.926089
+ 0.914128 0.913211 0.905544 0.903922 0.901304 0.901305 0.901309 0.90131 0.901314 0.901315 0.90132 0.901321
+ 0.901322 0.901322 0.901322 0.901322 0.828569 0.828569 0.998841 0.998623 0.997206 0.993978 0.9918 0.988664
+ 0.984195 0.978285 0.97091 0.962209 0.944421 0.927645 0.913817 0.903722 0.901306 0.901311 0.901316 0.901321
+ 0.901322 0.901322 0.828569 0.998841 0.998737 0.997871 0.995297 0.993438 0.990651 0.986463 0.980721 0.973394
+ 0.96462 0.94641 0.929002 0.914477 0.903758 0.901307 0.901312 0.901317 0.901321 0.901322 0.901322 0.828569
+ 0.998841 0.998786 0.99823 0.996148 0.994515 0.992015 0.98811 0.982569 0.975336 0.966546 0.948042 0.93014
+ 0.915064 0.903848 0.901307 0.901313 0.901319 0.901321 0.901322 0.901322 0.828569 0.998841 0.998811 0.998442
+ 0.996736 0.99529 0.993048 0.989421 0.984103 0.976995 0.968224 0.949492 0.931157 0.915591 0.903941 0.901308
+ 0.901314 0.901319 0.901321 0.901322 0.901322 0.828569 0.998841 0.998825 0.998577 0.997169 0.995895 0.9939
+ 0.99055 0.985471 0.978514 0.96979 0.95087 0.932129 0.916087 0.904017 0.901309 0.901314 0.90132 0.901321
+ 0.901322 0.901322 0.828569 0.998841 0.998834 0.998666 0.997504 0.996402 0.994653 0.99158 0.986747 0.979961
+ 0.971308 0.952227 0.933087 0.916558 0.90406 0.90131 0.901315 0.90132 0.901321 0.901322 0.901322 0.828569
+ 0.998841 0.998839 0.998723 0.997766 0.996835 0.995337 0.992539 0.987959 0.981361 0.9728 0.95357 0.934024
+ 0.91698 0.904032 0.901311 0.901316 0.901321 0.901321 0.901322 0.901322 0.828569 0.998841 0.998842 0.998755
+ 0.997835 0.997137 0.995919 0.993356 0.989008 0.9826 0.974149 0.954782 0.934806 0.917162 0.903662 0.901312
+ 0.901318 0.901321 0.901321 0.901322 0.901322 0.828569 0.998841 0.998844 0.99875 0.996553 0.995509 0.99386
+ 0.991053 0.986594 0.980158 0.971749 0.952425 0.932112 0.9137 0.90131 0.901313 0.901319 0.90132 0.901321
+ 0.901322 0.901322 0.828569
+ </DataArray>
+ <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+ 0.0011285 0.00112845 0.0011285 0.00112764 0.00112711 0.00112623 -0.0554223 -0.0549881 -0.0838317 -0.0867777 -0.0802288 -0.0832394
+ -0.0756867 -0.0785561 -0.0700183 -0.072581 -0.0631329 -0.0652823 -0.0551111 -0.0567898 -0.0388964 -0.0396937 -0.0239055 -0.0238135
+ -0.0118527 -0.0109361 -0.00326841 -0.00164726 0.000971275 0.000970414 0.000966528 0.000965512 0.000961041 0.000960049 0.000955529 0.000954477
+ 0.000953561 0.000953643 0.000953313 0.000953238 0.000955504 0.000955504 0.0011285 0.00112709 0.00112541 -0.0371134 -0.0895243 -0.0863888
+ -0.0819198 -0.0760094 -0.0686352 -0.059934 -0.0421462 -0.0253697 -0.0115417 -0.00144647 0.000969548 0.000964522 0.000958934 0.000954227
+ 0.000953636 0.000953214 0.000955504 0.0011285 0.00112666 0.00112467 -0.0264538 -0.0911624 -0.088376 -0.084188 -0.0784457 -0.0711186
+ -0.0623447 -0.0441347 -0.026727 -0.0122022 -0.00148266 0.000968662 0.000963548 0.000957781 0.000954139 0.000953629 0.000953201 0.000955504
+ 0.0011285 0.00112628 0.00112397 -0.0197179 -0.0922388 -0.08974 -0.0858343 -0.080294 -0.0730608 -0.0642708 -0.0457666 -0.027865
+ -0.0127891 -0.00157328 0.00096776 0.000962595 0.000956696 0.000954108 0.000953624 0.000953192 0.000955504 0.0011285 0.00112592 0.00112331
+ -0.0151041 -0.0930135 -0.0907728 -0.0871456 -0.0818281 -0.0747202 -0.0659492 -0.0472168 -0.028882 -0.0133159 -0.00166578 0.000966847
+ 0.000961671 0.000955827 0.000954094 0.000953618 0.000953184 0.000955504 0.0011285 0.00112556 0.00112266 -0.0115437 -0.0936188 -0.0916252
+ -0.0882753 -0.0831957 -0.0762386 -0.0675147 -0.048595 -0.0298533 -0.0138114 -0.00174223 0.000965923 0.000960767 0.000955238 0.000954076
+ 0.000953605 0.000953173 0.000955504 0.0011285 0.00112519 0.001122 -0.00849969 -0.0941257 -0.0923782 -0.0893048 -0.0844722 -0.0776858
+ -0.0690332 -0.0499521 -0.0308113 -0.0142831 -0.00178519 0.000964981 0.000959844 0.000954881 0.000954055 0.000953585 0.000953157 0.000955504
+ 0.0011285 0.00112477 0.00112131 -0.0059707 -0.0945593 -0.093062 -0.0902633 -0.085684 -0.0790857 -0.0705246 -0.051295 -0.0317492
+ -0.0147044 -0.00175682 0.000964018 0.000958832 0.000954701 0.000954033 0.000953552 0.000953132 0.000955504 0.0011285 0.00112425 0.00112059
+ -0.00443916 -0.0948607 -0.093644 -0.0910812 -0.0867327 -0.0803252 -0.0718742 -0.0525064 -0.0325304 -0.0148866 -0.00138667 0.000963047
+ 0.00095766 0.000954669 0.000954004 0.000953502 0.000953091 0.000955504 0.0011285 0.00112355 0.00111983 -0.00868655 -0.0932334 -0.0915851
+ -0.0887773 -0.0843186 -0.077883 -0.0694735 -0.0501499 -0.0298363 -0.0114246 0.00096569 0.000962044 0.000956577 0.000954749 0.000953938
+ 0.000953433 0.00095302 0.000955504
+ </DataArray>
+ <DataArray type="Float32" Name="x_liquid^NaCl" NumberOfComponents="1" format="ascii">
+ 3.08286e-05 0.00201713 3.08286e-05 0.000652934 0.00528544 0.00305761 0.0664652 0.0632695 0.0977245 0.0977245 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.170476 0.170476 3.08286e-05 0.000250321 0.0016684 0.0431357 0.0977243 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.170476 3.08286e-05 0.000136417 0.0010046 0.0311571 0.0977242 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.170476
+ 3.08286e-05 8.78672e-05 0.000646441 0.0235702 0.0977241 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.170476 3.08286e-05 6.30437e-05 0.000434241
+ 0.0183678 0.0977241 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.170476 3.08286e-05 4.92158e-05 0.000299904 0.0143749 0.097724 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.170476 3.08286e-05 4.12583e-05 0.000212109 0.0109958 0.097724 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.170476
+ 3.08286e-05 3.66835e-05 0.000155638 0.0082051 0.097724 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.170476 3.08286e-05 3.40949e-05 0.000124636
+ 0.00660463 0.0977238 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.170476 3.08286e-05 3.25821e-05 0.000130399 0.0121336 0.0977241 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.170476
+ </DataArray>
+ <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+ 0.0319348 0.0318749 0.0319348 0.0319393 0.0318103 0.0319035 0.0317052 0.03182 0.0318857 0.0320011 0.032325 0.0324436
+ 0.0328488 0.0329705 0.0333946 0.0335113 0.0339411 0.0340474 0.034482 0.0345751 0.0343819 0.0344442 0.0339591 0.0339886
+ 0.0336424 0.0336411 0.0334528 0.0334252 0.0334294 0.0334581 0.0335882 0.0336224 0.0337737 0.0338075 0.0339621 0.0339983
+ 0.0340299 0.0340271 0.0340385 0.034041 0.0313075 0.0313075 0.0319348 0.0319667 0.0319691 0.03192 0.0320953 0.0325484
+ 0.0331018 0.0336542 0.0341946 0.0347205 0.0345669 0.0340784 0.0336957 0.0334493 0.033487 0.0336558 0.0338455 0.0340069
+ 0.0340273 0.0340419 0.0313075 0.0319348 0.0319821 0.0320101 0.0319888 0.0321487 0.0326064 0.0331909 0.0337604 0.0343099
+ 0.0348391 0.0346728 0.034161 0.0337522 0.0334818 0.0335166 0.0336887 0.0338849 0.03401 0.0340276 0.0340423 0.0313075
+ 0.0319348 0.0319941 0.0320403 0.0320411 0.0321839 0.0326422 0.0332559 0.0338444 0.0344052 0.0349401 0.0347657 0.0342355
+ 0.033806 0.0335164 0.0335469 0.033721 0.0339221 0.034011 0.0340277 0.0340426 0.0313075 0.0319348 0.0320048 0.0320652
+ 0.0320838 0.0322113 0.0326687 0.0333089 0.0339169 0.0344902 0.035032 0.034852 0.0343057 0.0338577 0.0335512 0.0335775
+ 0.0337523 0.0339519 0.0340115 0.034028 0.0340429 0.0313075 0.0319348 0.0320151 0.0320875 0.0321214 0.0322354 0.0326922
+ 0.0333568 0.0339841 0.0345705 0.0351201 0.0349358 0.0343744 0.0339084 0.0335859 0.0336086 0.033783 0.0339721 0.0340121
+ 0.0340284 0.0340433 0.0313075 0.0319348 0.0320256 0.0321086 0.0321565 0.0322591 0.0327159 0.0334041 0.0340496 0.034649
+ 0.0352069 0.0350191 0.0344428 0.0339586 0.0336197 0.0336403 0.0338144 0.0339844 0.0340129 0.0340291 0.0340438 0.0313075
+ 0.0319348 0.0320374 0.0321294 0.0321905 0.0322845 0.0327425 0.0334531 0.0341151 0.0347271 0.0352932 0.0351022 0.0345107
+ 0.0340071 0.0336514 0.0336728 0.033849 0.0339906 0.0340136 0.0340302 0.0340447 0.0313075 0.0319348 0.0320517 0.0321503
+ 0.0322181 0.0323131 0.0327753 0.0335029 0.0341778 0.0348011 0.0353752 0.0351808 0.0345731 0.034047 0.0336712 0.0337057
+ 0.0338891 0.0339917 0.0340146 0.0340319 0.0340461 0.0313075 0.0319348 0.0320711 0.0321715 0.0321957 0.0322932 0.0327435
+ 0.0334513 0.0341242 0.0347464 0.0353217 0.0351281 0.0345072 0.0339517 0.0336164 0.0337397 0.0339261 0.033989 0.0340169
+ 0.0340343 0.0340486 0.0313075
+ </DataArray>
+ <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+ 0.968065 0.968125 0.968065 0.968061 0.96819 0.968096 -47.6729 -47.3385 -72.73 -75.3333 -70.822 -73.5241
+ -68.2106 -70.8508 -64.5245 -66.9434 -59.5531 -61.6364 -53.2572 -54.9312 -38.1245 -38.9435 -23.5176 -23.4497
+ -11.7039 -10.8093 -3.23962 -1.63433 0.966571 0.966542 0.966412 0.966378 0.966226 0.966192 0.966038 0.966002
+ 0.96597 0.965973 0.965962 0.965959 0.968693 0.968693 0.968065 0.968033 0.968031 -31.978 -77.7306 -76.3084
+ -73.9254 -70.1578 -64.8573 -58.0261 -41.3892 -25.0062 -11.4188 -1.43647 0.966513 0.966344 0.966155 0.965993
+ 0.965973 0.965958 0.968693 0.968065 0.968018 0.96799 -22.8123 -79.1539 -78.0459 -76.0015 -72.4545 -67.2586
+ -60.4151 -43.3834 -26.3693 -12.0838 -1.47378 0.966483 0.966311 0.966115 0.96599 0.965972 0.965958 0.968693
+ 0.968065 0.968006 0.96796 -17.0168 -80.0896 -79.2285 -77.5102 -74.2064 -69.1494 -62.3375 -45.0304 -27.5183
+ -12.677 -1.56532 0.966453 0.966279 0.966078 0.965989 0.965972 0.965957 0.968693 0.968065 0.967995 0.967935
+ -13.0447 -80.768 -80.122 -78.7153 -75.668 -70.7744 -64.0226 -46.5015 -28.5499 -13.2117 -1.6589 0.966422
+ 0.966248 0.966048 0.965988 0.965972 0.965957 0.968693 0.968065 0.967985 0.967912 -9.97709 -81.305 -80.863
+ -79.7593 -76.9781 -72.2683 -65.6011 -47.9044 -29.5384 -13.7165 -1.73668 0.966391 0.966217 0.966028 0.965988
+ 0.965972 0.965957 0.968693 0.968065 0.967974 0.967891 -7.35177 -81.7637 -81.525 -80.7199 -78.2085 -73.6984
+ -67.1371 -49.2893 -30.5155 -14.1986 -1.78121 0.96636 0.966186 0.966016 0.965987 0.965971 0.965956 0.968693
+ 0.968065 0.967963 0.967871 -5.16843 -82.1693 -82.1387 -81.6272 -79.3856 -75.0883 -68.6504 -50.663 -31.4748
+ -14.6316 -1.75461 0.966327 0.966151 0.966009 0.965986 0.96597 0.965955 0.968693 0.968065 0.967948 0.96785
+ -3.84571 -82.4793 -82.6868 -82.4214 -80.4195 -76.3312 -70.0295 -51.9096 -32.2806 -14.8273 -1.38631 0.966294
+ 0.966111 0.966008 0.965985 0.965968 0.965954 0.968693 0.968065 0.967929 0.967829 -7.52973 -81.1468 -80.9577
+ -80.3994 -78.2495 -74.0782 -67.755 -49.6282 -29.6361 -11.3902 0.966384 0.96626 0.966074 0.966011 0.965983
+ 0.965966 0.965951 0.968693
+ </DataArray>
+ <DataArray type="Float32" Name="x_gas^NaCl" NumberOfComponents="1" format="ascii">
+ 2.37143e-12 1.55181e-10 2.37143e-12 5.02639e-11 4.07128e-10 2.35683e-10 5.12667e-09 4.8842e-09 7.60261e-09 7.6074e-09 7.73565e-09 7.74032e-09
+ 7.89752e-09 7.90358e-09 8.07555e-09 8.08245e-09 8.26622e-09 8.27371e-09 8.46833e-09 8.47632e-09 8.58921e-09 8.59749e-09 8.62091e-09 8.62924e-09
+ 8.65311e-09 8.66147e-09 8.68592e-09 8.69433e-09 8.72067e-09 8.72815e-09 8.76206e-09 8.77097e-09 8.81039e-09 8.81919e-09 8.85949e-09 8.86893e-09
+ 8.87715e-09 8.87641e-09 8.87938e-09 8.88005e-09 1.54978e-08 1.54978e-08 2.37143e-12 1.92788e-11 1.28686e-10 3.33281e-09 7.60866e-09 7.74058e-09
+ 7.90794e-09 8.08849e-09 8.28077e-09 8.48417e-09 8.60573e-09 8.63754e-09 8.66978e-09 8.70251e-09 8.73568e-09 8.77966e-09 8.82909e-09 8.87116e-09
+ 8.87648e-09 8.88028e-09 1.54978e-08 2.37143e-12 1.05103e-11 7.75346e-11 2.4093e-09 7.60873e-09 7.73881e-09 7.91098e-09 8.09383e-09 8.28749e-09
+ 8.49188e-09 8.61395e-09 8.64582e-09 8.67805e-09 8.71062e-09 8.74341e-09 8.78825e-09 8.83937e-09 8.87196e-09 8.87654e-09 8.88039e-09 1.54978e-08
+ 2.37143e-12 6.77192e-12 4.9921e-11 1.82404e-09 7.60883e-09 7.73666e-09 7.91328e-09 8.09872e-09 8.29397e-09 8.49951e-09 8.62215e-09 8.65408e-09
+ 8.6863e-09 8.71874e-09 8.75128e-09 8.79665e-09 8.84905e-09 8.87223e-09 8.87659e-09 8.88047e-09 1.54978e-08 2.37143e-12 4.86028e-12 3.35529e-11
+ 1.42249e-09 7.60936e-09 7.7349e-09 7.91538e-09 8.10342e-09 8.30035e-09 8.50711e-09 8.63036e-09 8.66236e-09 8.69458e-09 8.72693e-09 8.75926e-09
+ 8.80482e-09 8.85682e-09 8.87236e-09 8.87664e-09 8.88054e-09 1.54978e-08 2.37143e-12 3.7954e-12 2.31859e-11 1.11408e-09 7.61043e-09 7.73381e-09
+ 7.91773e-09 8.10821e-09 8.30676e-09 8.51473e-09 8.63858e-09 8.67066e-09 8.7029e-09 8.73519e-09 8.76736e-09 8.81282e-09 8.86209e-09 8.87252e-09
+ 8.87675e-09 8.88064e-09 1.54978e-08 2.37143e-12 3.18276e-12 1.64077e-11 8.52841e-10 7.61214e-09 7.73357e-09 7.92072e-09 8.11332e-09 8.31333e-09
+ 8.52242e-09 8.64684e-09 8.67899e-09 8.71128e-09 8.74357e-09 8.77563e-09 8.82101e-09 8.8653e-09 8.87272e-09 8.87694e-09 8.88078e-09 1.54978e-08
+ 2.37143e-12 2.83087e-12 1.20465e-11 6.36899e-10 7.61483e-09 7.73453e-09 7.92469e-09 8.11896e-09 8.32018e-09 8.53023e-09 8.65515e-09 8.68738e-09
+ 8.71972e-09 8.75209e-09 8.7841e-09 8.83001e-09 8.86692e-09 8.87291e-09 8.87723e-09 8.88101e-09 1.54978e-08 2.37143e-12 2.63228e-12 9.65287e-12
+ 5.13072e-10 7.61927e-09 7.73775e-09 7.92994e-09 8.12526e-09 8.32739e-09 8.5382e-09 8.66352e-09 8.69581e-09 8.72821e-09 8.76084e-09 8.79266e-09
+ 8.84045e-09 8.8672e-09 8.87317e-09 8.87768e-09 8.88138e-09 1.54978e-08 2.37143e-12 2.517e-12 1.0106e-11 9.43136e-10 7.62703e-09 7.74626e-09
+ 7.93614e-09 8.13236e-09 8.33502e-09 8.54635e-09 8.67195e-09 8.7043e-09 8.73677e-09 8.7694e-09 8.80152e-09 8.85011e-09 8.86648e-09 8.87376e-09
+ 8.8783e-09 8.88202e-09 1.54978e-08
+ </DataArray>
+ <DataArray type="Float32" Name="m_liquid^H2O" NumberOfComponents="1" format="ascii">
51442.1 51367 51442.1 51418.6 51237.6 51326.1 52593.9 52774.2 52738.4 52991.3 52425.7 52683.1
52034 52277.8 51549.2 51765.3 50965.8 51145.5 50293 50431.9 48960.6 49025.1 47753.3 47745.7
46797.7 46725.5 46125.1 45998.8 45795 45794.9 45794.4 45794.3 45793.8 45793.7 45793.2 45793
@@ -509,7 +641,7 @@
53152.8 52763.4 52207.8 51490.3 49878.4 48226.1 46762.1 45794.3 45793.9 45793.3 45793.1 45793
45792.9 45792.9 40533.6
</DataArray>
- <DataArray type="Float32" Name="m^w_Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_liquid^Air" NumberOfComponents="1" format="ascii">
58.1198 58.1477 58.1198 58.085 58.1229 58.0476 -2947.43 -2926.19 -4483.44 -4649.36 -4280.95 -4449.76
-4027.03 -4187 -3712.24 -3854.09 -3332.91 -3450.85 -2895.08 -2986.26 -2023.43 -2065.87 -1232.55 -1227.73
-606.783 -559.558 -166.481 -83.8256 49.3502 49.3063 49.1081 49.0563 48.8284 48.7778 48.5474 48.4937
@@ -531,7 +663,7 @@
-4761.37 -4509.39 -4148.41 -3681.21 -2626.35 -1543.69 -584.698 49.0654 48.8795 48.6008 48.5076 48.4662
48.4405 48.4195 46.7432
</DataArray>
- <DataArray type="Float32" Name="m^w_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_liquid^NaCl" NumberOfComponents="1" format="ascii">
1.58773 103.941 1.58773 33.6329 272.561 157.594 3534.7 3366.88 5226.44 5235.86 5214.53 5224.11
5199.6 5208.68 5181.18 5189.23 5159.08 5165.77 5133.64 5138.81 5083.73 5086.12 5038.62 5038.33
5002.91 5000.2 4977.74 4973.02 4965.36 4965.35 4965.28 4965.26 4965.18 4965.16 4965.08 4965.06
diff --git a/test/references/saltflushcc2pncmin-reference.vtu b/test/references/saltflushcc2pncmin-reference.vtu
index 68c61c057b35af984a667f3cfef244811c58af95..c8f825ba8fd60e48b2641d65cda740525023aa89 100644
--- a/test/references/saltflushcc2pncmin-reference.vtu
+++ b/test/references/saltflushcc2pncmin-reference.vtu
@@ -307,7 +307,7 @@
2.23e-14 2.23e-14 2.22954e-14 9.94228e-15 2.84606e-15 2.84359e-15 2.84292e-15 2.84104e-15 2.83957e-15 2.83887e-15 1.94398e-14 1.94389e-14
1.94092e-14 1.93559e-14 1.93556e-14 1.93551e-14 1.93545e-14 1.93534e-14 1.93517e-14 1.9348e-14
</DataArray>
- <DataArray type="Float32" Name="X^liquid_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
0.988248 0.970752 0.842904 0.838122 0.832254 0.824904 0.816034 0.805762 0.794435 0.782621 0.763352 0.748905
0.739363 0.738844 0.738849 0.738854 0.738859 0.738859 0.73886 0.73886 0.99625 0.987416 0.870973 0.846528
0.840824 0.833282 0.823865 0.81275 0.800377 0.787424 0.766109 0.74985 0.738887 0.738845 0.73885 0.738856
@@ -326,7 +326,7 @@
0.998086 0.997822 0.979501 0.857329 0.85503 0.850558 0.843195 0.832754 0.819633 0.804708 0.77752 0.753999
0.73885 0.738853 0.738858 0.738859 0.738859 0.73886 0.73886 0.73886
</DataArray>
- <DataArray type="Float32" Name="X^liquid_Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
0.00180087 0.00177768 -0.114125 -0.108823 -0.102315 -0.0941638 -0.0843282 -0.0729365 -0.0603747 -0.0472732 -0.0259049 -0.00988305
0.000697925 0.00127442 0.00126855 0.00126228 0.0012575 0.00125694 0.00125648 0.00125592 0.00181 0.00179712 -0.102415 -0.118145
-0.111819 -0.103455 -0.0930121 -0.0806855 -0.0669649 -0.0526002 -0.0289627 -0.0109316 0.00122667 0.00127322 0.00126727 0.0012608
@@ -345,7 +345,7 @@
0.00180879 0.00180253 -0.0116665 -0.130121 -0.127573 -0.122614 -0.114449 -0.102869 -0.0883188 -0.071768 -0.0416168 -0.0155322
0.00126759 0.00126379 0.00125871 0.00125737 0.00125681 0.00125635 0.00125594 0.00125563
</DataArray>
- <DataArray type="Float32" Name="X^liquid_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_liquid^NaCl" NumberOfComponents="1" format="ascii">
0.00995069 0.0274707 0.271221 0.270701 0.270061 0.26926 0.268294 0.267174 0.26594 0.264653 0.262553 0.260978
0.259939 0.259882 0.259883 0.259883 0.259884 0.259884 0.259884 0.259884 0.00194001 0.0107869 0.231442 0.271616
0.270995 0.270173 0.269147 0.267936 0.266588 0.265176 0.262853 0.261081 0.259887 0.259882 0.259883 0.259883
@@ -364,7 +364,7 @@
0.000104879 0.000375459 0.0321654 0.272792 0.272543 0.272056 0.271253 0.270116 0.268686 0.26706 0.264097 0.261534
0.259883 0.259883 0.259884 0.259884 0.259884 0.259884 0.259884 0.259884
</DataArray>
- <DataArray type="Float32" Name="X^gas_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
0.0200427 0.0199466 0.0196329 0.0197288 0.0199648 0.0202184 0.0204743 0.0207254 0.0209725 0.0212224 0.0211303 0.0209037
0.0213073 0.0211505 0.0212465 0.0213499 0.0214295 0.0214389 0.0214465 0.0214559 0.0201019 0.0200672 0.0197668 0.0198698
0.0201104 0.0203687 0.0206218 0.0208641 0.0210978 0.0213314 0.0212042 0.0209455 0.0211159 0.0211701 0.0212675 0.0213744
@@ -383,7 +383,7 @@
0.0201514 0.0202147 0.0199591 0.0200598 0.0203244 0.0207099 0.0210475 0.0213373 0.0215863 0.0218082 0.0215858 0.0211939
0.0212622 0.021325 0.0214093 0.0214317 0.021441 0.0214487 0.0214555 0.0214608
</DataArray>
- <DataArray type="Float32" Name="X^gas_Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
0.979957 0.980053 -71.3214 -68.7303 -65.8539 -61.9246 -56.7684 -50.3356 -42.7642 -34.3947 -19.2396 -7.40153
0.539651 0.978849 0.978754 0.97865 0.978571 0.978561 0.978553 0.978544 0.979898 0.979933 -62.363 -74.4048
-71.757 -67.8512 -62.466 -55.5741 -47.3613 -38.2325 -21.5083 -8.19286 0.940579 0.97883 0.978733 0.978626
@@ -402,7 +402,7 @@
0.979849 0.979785 -6.37841 -81.6884 -81.3635 -80.1025 -76.6508 -70.7203 -62.4088 -52.1851 -30.9998 -11.714
0.978738 0.978675 0.978591 0.978568 0.978559 0.978551 0.978544 0.978539
</DataArray>
- <DataArray type="Float32" Name="X^gas_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_gas^NaCl" NumberOfComponents="1" format="ascii">
4.85547e-10 1.35806e-09 1.51991e-08 1.5331e-08 1.55869e-08 1.58783e-08 1.61956e-08 1.6534e-08 1.68913e-08 1.72666e-08 1.74858e-08 1.75262e-08
1.80231e-08 1.78991e-08 1.79803e-08 1.80678e-08 1.8135e-08 1.81429e-08 1.81494e-08 1.81573e-08 9.41803e-11 5.27437e-10 1.26375e-08 1.5339e-08
1.55942e-08 1.58892e-08 1.62087e-08 1.65486e-08 1.69071e-08 1.72836e-08 1.75038e-08 1.75461e-08 1.78691e-08 1.79158e-08 1.7998e-08 1.80884e-08
@@ -421,7 +421,121 @@
5.09462e-12 1.83005e-11 1.57694e-09 1.53567e-08 1.55869e-08 1.59375e-08 1.62905e-08 1.66518e-08 1.70252e-08 1.74131e-08 1.76403e-08 1.7687e-08
1.79936e-08 1.80466e-08 1.81179e-08 1.81369e-08 1.81447e-08 1.81513e-08 1.8157e-08 1.81615e-08
</DataArray>
- <DataArray type="Float32" Name="m^w_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+ 0.99578 0.990234 0.985259 0.981556 0.976991 0.971243 0.964262 0.956113 0.947047 0.937502 0.921733 0.909744
+ 0.901746 0.901308 0.901313 0.901317 0.901321 0.901321 0.901322 0.901322 0.998273 0.99552 0.991312 0.988057
+ 0.98365 0.977793 0.970429 0.961664 0.951814 0.941394 0.924005 0.910533 0.901344 0.901309 0.901314 0.901318
+ 0.901321 0.901321 0.901322 0.901322 0.99864 0.997125 0.993647 0.99093 0.986946 0.981333 0.974038 0.96516
+ 0.955033 0.944213 0.925895 0.911431 0.90137 0.90131 0.901314 0.90132 0.901321 0.901321 0.901322 0.901322
+ 0.998747 0.997837 0.994982 0.992667 0.989071 0.983737 0.97658 0.967692 0.957415 0.946332 0.927368 0.912197
+ 0.901505 0.901311 0.901315 0.90132 0.901321 0.901322 0.901322 0.901322 0.998793 0.998219 0.995881 0.993878
+ 0.990644 0.985614 0.978636 0.969783 0.959409 0.948119 0.928623 0.912864 0.90166 0.901312 0.901316 0.90132
+ 0.901321 0.901322 0.901322 0.901322 0.998817 0.998448 0.996539 0.994813 0.991934 0.987236 0.980476 0.971699
+ 0.961263 0.949793 0.929805 0.913486 0.901805 0.901313 0.901317 0.901321 0.901321 0.901322 0.901322 0.901322
+ 0.998829 0.998592 0.997043 0.995582 0.993064 0.988721 0.982221 0.973563 0.9631 0.951476 0.931004 0.91411
+ 0.901931 0.901313 0.901318 0.901321 0.901321 0.901322 0.901322 0.901322 0.998836 0.998683 0.997441 0.996223
+ 0.994059 0.990085 0.983883 0.975396 0.964954 0.953211 0.93226 0.91475 0.902019 0.901314 0.901319 0.901321
+ 0.901321 0.901322 0.901322 0.901322 0.99884 0.998738 0.997729 0.9967 0.994833 0.991194 0.985301 0.977029
+ 0.966668 0.954861 0.933436 0.915234 0.901871 0.901315 0.90132 0.901321 0.901321 0.901322 0.901322 0.901322
+ 0.998842 0.998762 0.997294 0.996346 0.994588 0.991158 0.985485 0.977381 0.967101 0.955273 0.933353 0.913988
+ 0.901313 0.901316 0.90132 0.901321 0.901321 0.901322 0.901322 0.901322
+ </DataArray>
+ <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+ 0.00112881 0.00112804 -0.0829834 -0.0792808 -0.074716 -0.0689682 -0.0619869 -0.0538378 -0.0447722 -0.035227 -0.0194582 -0.00746833
+ 0.000529511 0.000967107 0.000962648 0.000957887 0.000954259 0.00095383 0.000953483 0.000953057 0.00112823 0.00112711 -0.0725117 -0.0857817
+ -0.081375 -0.0755173 -0.0681533 -0.0593884 -0.0495387 -0.0391192 -0.0217302 -0.00825746 0.000930856 0.000966191 0.000961679 0.000956767
+ 0.000954163 0.000953777 0.000953423 0.000953013 0.00112791 0.00112642 -0.0495865 -0.0886547 -0.0846707 -0.0790578 -0.0717628 -0.0628852
+ -0.0527577 -0.0419375 -0.0236199 -0.00915549 0.00090554 0.0009653 0.000960749 0.000955717 0.000954097 0.000953732 0.000953376 0.000952987
+ 0.00112766 0.00112584 -0.0362896 -0.0903909 -0.0867957 -0.0814619 -0.074305 -0.0654163 -0.05514 -0.0440572 -0.0250931 -0.00992185
+ 0.000770325 0.000964427 0.000959898 0.000955126 0.000954047 0.00095369 0.000953337 0.000952969 0.00112745 0.0011253 -0.027615 -0.0916025
+ -0.0883685 -0.083339 -0.0763606 -0.0675075 -0.0571337 -0.0458434 -0.0263478 -0.010589 0.000614774 0.000963562 0.000959093 0.000954782
+ 0.000954002 0.000953649 0.000953303 0.000952954 0.00112725 0.00112478 -0.0210021 -0.0925374 -0.0896592 -0.0849605 -0.0782009 -0.069424
+ -0.0589875 -0.0475182 -0.0275294 -0.011211 0.000470259 0.000962695 0.000958284 0.00095455 0.000953955 0.000953606 0.000953269 0.000952941
+ 0.00112704 0.00112424 -0.0155269 -0.0933058 -0.0907888 -0.0864456 -0.0799453 -0.0712881 -0.0608252 -0.0492009 -0.0287285 -0.0118344
+ 0.000343751 0.000961813 0.000957429 0.000954388 0.000953907 0.00095356 0.000953232 0.000952926 0.0011268 0.00112367 -0.0110062 -0.0939468
+ -0.0917835 -0.0878101 -0.0816079 -0.0731208 -0.0626793 -0.0509363 -0.0299849 -0.0124745 0.000256094 0.000960911 0.000956521 0.000954275
+ 0.000953856 0.000953509 0.000953191 0.000952908 0.00112649 0.00112304 -0.00731349 -0.0944235 -0.0925581 -0.0889187 -0.083026 -0.074754
+ -0.0643924 -0.0525854 -0.0311605 -0.0129587 0.000404293 0.00095999 0.000955671 0.000954202 0.000953801 0.000953451 0.00095314 0.000952881
+ 0.00112605 0.00112236 -0.00738924 -0.0940698 -0.0923128 -0.0888828 -0.0832093 -0.0751057 -0.0648254 -0.0529981 -0.0310773 -0.0117123
+ 0.000961921 0.000959032 0.000955175 0.000954157 0.000953737 0.000953383 0.000953077 0.000952837
+ </DataArray>
+ <DataArray type="Float32" Name="x_liquid^NaCl" NumberOfComponents="1" format="ascii">
+ 0.00309071 0.00863789 0.0977245 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.000599228 0.00335239 0.0811998 0.0977247
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.000232472 0.00174827 0.0559399 0.0977245 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.000125637 0.00103706 0.0413077 0.0977243 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 7.95337e-05 0.000655699 0.031734 0.0977242
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 5.62033e-05 0.000427619 0.0244634 0.0977242 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 4.37806e-05 0.0002841 0.0184842 0.0977241 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 3.72306e-05 0.000193481 0.0135652 0.097724
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 3.39245e-05 0.000139356 0.00958478 0.0977239 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 3.23536e-05 0.000115845 0.0100952 0.097724 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
+ </DataArray>
+ <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+ 0.0318317 0.0316809 0.0315658 0.0317203 0.0320999 0.0325083 0.0329203 0.0333251 0.033724 0.0341285 0.0339904 0.0336613
+ 0.0334796 0.0335688 0.0337192 0.0338813 0.0340059 0.0340206 0.0340326 0.0340473 0.0319245 0.0318701 0.0317818 0.0319466
+ 0.0323336 0.0327493 0.0331569 0.0335474 0.0339245 0.0343026 0.034107 0.0337231 0.0334977 0.0335996 0.033752 0.0339196
+ 0.0340092 0.0340225 0.0340347 0.0340488 0.0319449 0.0319386 0.0318776 0.0320459 0.032444 0.0328834 0.0333029 0.0336964
+ 0.0340692 0.0344373 0.0342093 0.0337885 0.0335305 0.0336296 0.0337836 0.0339557 0.0340114 0.034024 0.0340363 0.0340497
+ 0.0319549 0.0319767 0.0319406 0.0321022 0.0325082 0.0329747 0.0334098 0.0338103 0.0341833 0.0345463 0.0342962 0.0338488
+ 0.0335664 0.033659 0.0338126 0.033976 0.0340131 0.0340255 0.0340376 0.0340504 0.0319621 0.0320034 0.0319893 0.0321394
+ 0.0325507 0.0330456 0.0334985 0.0339081 0.0342832 0.034643 0.0343749 0.0339052 0.0336026 0.0336882 0.0338401 0.0339878
+ 0.0340147 0.0340269 0.0340388 0.0340509 0.0319683 0.0320249 0.0320305 0.0321674 0.0325831 0.0331072 0.0335794 0.0339995
+ 0.0343781 0.0347357 0.034451 0.0339599 0.0336382 0.0337176 0.0338677 0.0339958 0.0340163 0.0340284 0.03404 0.0340513
+ 0.0319745 0.0320442 0.0320679 0.0321916 0.0326115 0.0331652 0.0336577 0.0340897 0.0344727 0.034829 0.0345279 0.0340148
+ 0.0336735 0.0337475 0.0338969 0.0340014 0.034018 0.03403 0.0340413 0.0340518 0.0319813 0.0320629 0.0321034 0.0322156
+ 0.0326391 0.0332221 0.0337351 0.0341798 0.0345687 0.0349247 0.0346072 0.0340706 0.0337078 0.0337781 0.0339281 0.0340053
+ 0.0340197 0.0340317 0.0340427 0.0340525 0.03199 0.0320819 0.0321368 0.0322416 0.0326672 0.0332754 0.033807 0.0342647
+ 0.0346607 0.0350178 0.034684 0.034121 0.0337339 0.0338095 0.0339573 0.0340078 0.0340216 0.0340337 0.0340444 0.0340534
+ 0.0320022 0.0321015 0.0321463 0.0322516 0.032677 0.033297 0.0338402 0.0343068 0.034708 0.0350663 0.0347145 0.0341074
+ 0.0337438 0.0338422 0.0339743 0.0340094 0.0340238 0.034036 0.0340466 0.0340549
+ </DataArray>
+ <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+ 0.968168 0.968319 -71.3334 -68.7423 -65.866 -61.9369 -56.7809 -50.3482 -42.777 -34.4076 -19.2525 -7.41429
+ 0.527479 0.966431 0.966281 0.966119 0.965994 0.965979 0.965967 0.965953 0.968075 0.96813 -62.375 -74.4169
+ -71.7692 -67.8635 -62.4785 -55.5868 -47.3741 -38.2454 -21.5212 -8.20564 0.928197 0.9664 0.966248 0.96608
+ 0.965991 0.965978 0.965965 0.965951 0.968055 0.968061 -42.6827 -76.9246 -74.6808 -71.0786 -65.8323 -58.9068
+ -50.4967 -41.0389 -23.4151 -9.1067 0.903813 0.96637 0.966216 0.966044 0.965989 0.965976 0.965964 0.96595
+ 0.968045 0.968023 -31.2568 -78.4316 -76.5417 -73.2639 -68.2053 -61.3243 -52.822 -43.1527 -24.899 -9.87828
+ 0.769564 0.966341 0.966187 0.966024 0.965987 0.965975 0.965962 0.96595 0.968038 0.967997 -23.7999 -79.4778
+ -77.9066 -74.9703 -70.1307 -63.3308 -54.7777 -44.9432 -26.1686 -10.5524 0.614723 0.966312 0.96616 0.966012
+ 0.965985 0.965973 0.965961 0.965949 0.968032 0.967975 -18.112 -80.2834 -79.0202 -76.4456 -71.8591 -65.1756
+ -56.6023 -46.6274 -27.3678 -11.1826 0.470643 0.966282 0.966132 0.966004 0.965984 0.965972 0.96596 0.965949
+ 0.968026 0.967956 -13.3991 -80.9486 -79.9944 -77.8011 -73.5026 -66.9746 -58.4147 -48.3226 -28.5868 -11.8154
+ 0.344344 0.966253 0.966103 0.965999 0.965982 0.96597 0.965959 0.965948 0.968019 0.967937 -9.50465 -81.5127
+ -80.8583 -79.0557 -75.0767 -68.7486 -60.2469 -50.0731 -29.8652 -12.4662 0.256772 0.966222 0.966072 0.965995
+ 0.96598 0.965968 0.965957 0.965948 0.96801 0.967918 -6.32046 -81.9532 -81.5475 -80.0926 -76.4339 -70.341
+ -61.9483 -51.7426 -31.0659 -12.9624 0.405744 0.966191 0.966043 0.965992 0.965978 0.965966 0.965956 0.965947
+ 0.967998 0.967898 -6.39059 -81.7006 -81.3759 -80.1151 -76.6636 -70.7332 -62.4219 -52.1984 -31.013 -11.727
+ 0.966256 0.966158 0.966026 0.965991 0.965976 0.965964 0.965953 0.965945
+ </DataArray>
+ <DataArray type="Float32" Name="x_gas^NaCl" NumberOfComponents="1" format="ascii">
+ 2.37707e-10 6.64899e-10 7.53283e-09 7.59827e-09 7.72514e-09 7.8697e-09 8.02714e-09 8.19511e-09 8.3726e-09 8.55928e-09 8.67048e-09 8.6997e-09
+ 8.72948e-09 8.75699e-09 8.79619e-09 8.83842e-09 8.87088e-09 8.87473e-09 8.87785e-09 8.88169e-09 4.61058e-11 2.58212e-10 6.26342e-09 7.60212e-09
+ 7.72869e-09 7.87496e-09 8.03346e-09 8.20215e-09 8.38021e-09 8.56738e-09 8.67884e-09 8.70812e-09 8.73809e-09 8.76501e-09 8.80475e-09 8.84841e-09
+ 8.87174e-09 8.87521e-09 8.8784e-09 8.88208e-09 1.78917e-11 1.34729e-10 4.31781e-09 7.60362e-09 7.7292e-09 7.87867e-09 8.03893e-09 8.20873e-09
+ 8.38756e-09 8.57535e-09 8.68712e-09 8.71642e-09 8.7464e-09 8.77283e-09 8.81298e-09 8.8578e-09 8.87234e-09 8.87561e-09 8.87882e-09 8.88232e-09
+ 9.67137e-12 7.99585e-11 3.19041e-09 7.60366e-09 7.72784e-09 7.88124e-09 8.04375e-09 8.21495e-09 8.39472e-09 8.58322e-09 8.69534e-09 8.72463e-09
+ 8.75446e-09 8.78051e-09 8.82054e-09 8.8631e-09 8.87278e-09 8.87599e-09 8.87916e-09 8.88248e-09 6.12349e-12 5.05781e-11 2.4525e-09 7.60316e-09
+ 7.72565e-09 7.88315e-09 8.04817e-09 8.22094e-09 8.40176e-09 8.59104e-09 8.70352e-09 8.73278e-09 8.76238e-09 8.78812e-09 8.82769e-09 8.86619e-09
+ 8.87319e-09 8.87637e-09 8.87948e-09 8.88261e-09 4.32797e-12 3.29995e-11 1.8918e-09 7.60264e-09 7.72328e-09 7.88486e-09 8.05246e-09 8.22686e-09
+ 8.40876e-09 8.59884e-09 8.71169e-09 8.74091e-09 8.77027e-09 8.79577e-09 8.83489e-09 8.86827e-09 8.87361e-09 8.87675e-09 8.87978e-09 8.88273e-09
+ 3.37195e-12 2.19341e-11 1.43036e-09 7.60249e-09 7.72122e-09 7.88681e-09 8.05691e-09 8.23287e-09 8.41583e-09 8.60668e-09 8.71989e-09 8.74907e-09
+ 8.77823e-09 8.80356e-09 8.84251e-09 8.86972e-09 8.87404e-09 8.87716e-09 8.88011e-09 8.88287e-09 2.86808e-12 1.49451e-11 1.05045e-09 7.60324e-09
+ 7.72002e-09 7.88947e-09 8.06179e-09 8.23914e-09 8.42305e-09 8.61461e-09 8.72815e-09 8.7573e-09 8.78632e-09 8.81154e-09 8.85062e-09 8.87074e-09
+ 8.8745e-09 8.87762e-09 8.88048e-09 8.88303e-09 2.61409e-12 1.07702e-11 7.4278e-10 7.60573e-09 7.72066e-09 7.89328e-09 8.06734e-09 8.2458e-09
+ 8.43049e-09 8.62266e-09 8.7365e-09 8.76563e-09 8.79457e-09 8.81972e-09 8.85822e-09 8.87139e-09 8.875e-09 8.87814e-09 8.88094e-09 8.88327e-09
+ 2.49399e-12 8.95839e-12 7.82908e-10 7.61079e-09 7.72489e-09 7.89869e-09 8.07375e-09 8.25294e-09 8.43821e-09 8.63088e-09 8.74497e-09 8.77407e-09
+ 8.80261e-09 8.82823e-09 8.86266e-09 8.8718e-09 8.87557e-09 8.87875e-09 8.88151e-09 8.88367e-09
+ </DataArray>
+ <DataArray type="Float32" Name="m_liquid^H2O" NumberOfComponents="1" format="ascii">
51325.4 51098.7 52668.1 52349.4 51957.1 51466.8 50876.8 50195 49444.8 48664 47398.2 46452.7
45829 45794.5 45794 45793.4 45793 45793 45792.9 45792.9 51420.8 51314.7 53014.9 52905.8
52523.9 52020.3 51393.4 50655.2 49835.5 48979.2 47578.6 46514.3 45797.7 45794.4 45793.9 45793.3
@@ -440,7 +554,7 @@
51441.5 51437.5 51741.3 53621.5 53465.2 53163.1 52670.1 51974.2 51102.7 50114.2 48324.9 46783.9
45793.9 45793.6 45793.1 45793 45792.9 45792.9 45792.9 45792.8
</DataArray>
- <DataArray type="Float32" Name="m^w_Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_liquid^Air" NumberOfComponents="1" format="ascii">
58.182 58.2099 -4435.97 -4228.29 -3973.45 -3654.67 -3270.58 -2826.43 -2337.53 -1828.57 -1000.6 -381.343
26.9111 49.1376 48.9103 48.6676 48.4826 48.4607 48.4431 48.4213 58.1151 58.0975 -3877.89 -4593.2
-4345.17 -4017.66 -3609.36 -3128.26 -2593.77 -2035.31 -1118.92 -421.83 47.2972 49.091 48.8609 48.6105
@@ -459,7 +573,7 @@
57.9927 57.8029 -383.366 -5062.67 -4962.38 -4767.44 -4447.2 -3993.9 -3425.45 -2780.31 -1609.05 -599.514
48.8732 48.726 48.5293 48.4774 48.456 48.4379 48.4223 48.4101
</DataArray>
- <DataArray type="Float32" Name="m^w_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_liquid^NaCl" NumberOfComponents="1" format="ascii">
159.304 445.738 5223.96 5211.96 5197.07 5178.5 5156.19 5130.46 5102.16 5072.71 5025.29 4989.95
4966.62 4965.29 4965.21 4965.12 4965.06 4965.05 4965.04 4965.04 30.8661 172.801 4342.53 5232.69
5218.2 5199.13 5175.45 5147.61 5116.72 5084.46 5032.01 4992.24 4965.44 4965.27 4965.19 4965.1