diff --git a/dumux/porousmediumflow/2pnc/implicit/model.hh b/dumux/porousmediumflow/2pnc/implicit/model.hh
index 0f4a7446c84d203aa3c95f38d752e40ca1b51455..e47217ca80859d30516376abec7a1665a20a60f4 100644
--- a/dumux/porousmediumflow/2pnc/implicit/model.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/model.hh
@@ -194,15 +194,24 @@ public:
for (int i = 0; i < numPhases; ++i)
for (int j = 0; j < numComponents; ++j)
- vtkOutputModule.addSecondaryVariable("x" + FluidSystem::componentName(j) + FluidSystem::phaseName(i),
+ vtkOutputModule.addSecondaryVariable("x_" + FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j),
[i,j](const VolumeVariables& v){ return v.moleFraction(i,j); });
for (int j = 0; j < numComponents; ++j)
- vtkOutputModule.addSecondaryVariable("m^w_" + FluidSystem::componentName(j),
+ vtkOutputModule.addSecondaryVariable("m_" + FluidSystem::phaseName(wPhaseIdx) + "^" + FluidSystem::componentName(j),
[j](const VolumeVariables& v){ return v.molarity(wPhaseIdx,j); });
}
-
+ /*!
+ * \brief Adds additional VTK output data to the VTKWriter. Function is called by the output module on every write.
+ */
+ template<class VtkOutputModule>
+ void addVtkOutputFields(VtkOutputModule& outputModule) const
+ {
+ auto& phasePresence = outputModule.createScalarField("phase presence", dofCodim);
+ for (std::size_t i = 0; i < phasePresence.size(); ++i)
+ phasePresence[i] = priVarSwitch().phasePresence(i);
+ }
/*!
* \brief One Newton iteration was finished.
diff --git a/dumux/porousmediumflow/2pnc/implicit/properties.hh b/dumux/porousmediumflow/2pnc/implicit/properties.hh
index 148632e8b57e9a9b6bf1f5b591115c61f460307d..24f1041f5db39be2faa67c9d5efa4e5cfbab4e07 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 4a90dc947efa9d4fba075b77aa1e881f94c1a891..2a4529a1f77030ad9bbe63291812dc8b7452cc3e 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 849742ea7cce238e9faf7d26eb436e5fe26d917d..84ff5891ccd752ccea4134169e16ecd1f4ed1b1c 100644
--- a/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pnc/implicit/volumevariables.hh
@@ -258,35 +258,40 @@ 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,
- /*setInternalEnergy=*/false);
+ /*setEnthalpy=*/false);
+
}
else if (phasePresence == nPhaseOnly)
{
Dune::FieldVector<Scalar, numComponents> moleFrac;
- moleFrac[wCompIdx] = priVars[switchIdx];
+ moleFrac[wCompIdx] = priVars[switchIdx];
for (int compIdx=numMajorComponents; compIdx<numComponents; ++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]);
@@ -297,12 +302,13 @@ public:
// of the "ComputeFromReferencePhase" constraint solver
ComputeFromReferencePhase::solve(fluidState,
paramCache,
- nPhaseIdx,
+ nPhaseIdx,
/*setViscosity=*/true,
/*setEnthalpy=*/false);
}
- else if (phasePresence == wPhaseOnly){
+ 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
@@ -372,7 +378,6 @@ public:
{
if (phaseIdx < numPhases)
return fluidState_.density(phaseIdx);
-
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
@@ -387,7 +392,6 @@ public:
{
if (phaseIdx < numPhases)
return fluidState_.viscosity(phaseIdx);
-
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
@@ -402,7 +406,6 @@ public:
{
if (phaseIdx < numPhases)
return fluidState_.molarDensity(phaseIdx);
-
else
DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
}
@@ -456,7 +459,7 @@ public:
/*!
- * \brief Returns the diffusion coeffiecient
+ * \brief Returns the diffusion coefficient
*/
Scalar diffusionCoefficient(int phaseIdx, int compIdx) const
{
diff --git a/dumux/porousmediumflow/2pncmin/implicit/model.hh b/dumux/porousmediumflow/2pncmin/implicit/model.hh
index 313167208f4d28fffd3b39d00cd34a13a3777d9b..cc8ef4b2d8d5f25e823aca39fbe0e52269c33d33 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/model.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/model.hh
@@ -185,11 +185,11 @@ public:
for (int i = 0; i < numPhases; ++i)
for (int j = 0; j < numComponents; ++j)
- vtkOutputModule.addSecondaryVariable("x" + FluidSystem::componentName(j) + FluidSystem::phaseName(i),
+ vtkOutputModule.addSecondaryVariable("x_" + FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j),
[i,j](const VolumeVariables& v){ return v.moleFraction(i,j); });
for (int j = 0; j < numComponents; ++j)
- vtkOutputModule.addSecondaryVariable("m^w_" + FluidSystem::componentName(j),
+ vtkOutputModule.addSecondaryVariable("m_" + FluidSystem::phaseName(wPhaseIdx) + "^" + FluidSystem::componentName(j),
[j](const VolumeVariables& v){ return v.molarity(wPhaseIdx,j); });
}
diff --git a/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh b/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
index e10ed139f6d76290f70a45ec2598b2d231e563af..118bae241089f85721e2becdfeec0098e8fde9fe 100644
--- a/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/2pncmin/implicit/volumevariables.hh
@@ -399,10 +399,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
@@ -414,10 +412,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..e6c358eb279f57ef6635fcc262f384c4244a7165 100644
--- a/test/references/fuelcell2pncbox-reference.vtu
+++ b/test/references/fuelcell2pncbox-reference.vtu
@@ -198,7 +198,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 +213,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 +228,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 +243,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 +258,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 +273,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
@@ -288,7 +288,7 @@
0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895
0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895
</DataArray>
- <DataArray type="Float32" Name="m^w_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_l^H2O" NumberOfComponents="1" format="ascii">
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
@@ -303,7 +303,7 @@
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
</DataArray>
- <DataArray type="Float32" Name="m^w_N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_l^N2" NumberOfComponents="1" format="ascii">
0.395278 0.395278 0.381259 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259
0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259
0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259
@@ -318,7 +318,7 @@
0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276
0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276
</DataArray>
- <DataArray type="Float32" Name="m^w_O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^_l^O2" NumberOfComponents="1" format="ascii">
0.237118 0.237118 0.263747 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
@@ -333,6 +333,21 @@
0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375
0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375
</DataArray>
+ <DataArray type="Float32" Name="phase presence" 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="reactionSourceH2O [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
747.822 747.822 0 0 747.822 0 747.822 0 747.822 0 747.822 0
747.822 0 747.822 0 747.822 0 747.822 0 747.822 0 747.822 0
diff --git a/test/references/fuelcell2pnccc-reference.vtu b/test/references/fuelcell2pnccc-reference.vtu
index fa2279344b1ef04ac32e8b17556a4d0a6554d675..d334911546ac6436af3c8c09bda478f21c746b7f 100644
--- a/test/references/fuelcell2pnccc-reference.vtu
+++ b/test/references/fuelcell2pnccc-reference.vtu
@@ -172,7 +172,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 +185,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 +198,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 +211,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 +224,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 +237,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
@@ -250,7 +250,7 @@
0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319
0.35319 0.35319 0.35319 0.35319 0.35319 0.35319
</DataArray>
- <DataArray type="Float32" Name="m^w_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_l^H2O" NumberOfComponents="1" format="ascii">
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
@@ -263,7 +263,7 @@
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
</DataArray>
- <DataArray type="Float32" Name="m^w_N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_l^N2" NumberOfComponents="1" format="ascii">
0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939
0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.375382 0.375382 0.375382
0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382
@@ -276,7 +276,7 @@
0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214
0.324214 0.324214 0.324214 0.324214 0.324214 0.324214
</DataArray>
- <DataArray type="Float32" Name="m^w_O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m_l^O2" NumberOfComponents="1" format="ascii">
0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303
0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.274909 0.274909 0.274909
0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909
@@ -302,6 +302,19 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0
</DataArray>
+ <DataArray type="Float32" Name="phase presence" 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="reactionSourceH2O [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43
379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 0 0 0
diff --git a/test/references/saltflushbox2pncmin-reference.vtu b/test/references/saltflushbox2pncmin-reference.vtu
index 14c9b759e54cf8cb51fbe031aa53b07a275a7782..2d1546c5a45cb87578f27e7a4e0916516e9a9916 100644
--- a/test/references/saltflushbox2pncmin-reference.vtu
+++ b/test/references/saltflushbox2pncmin-reference.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="231">
- <PointData Scalars="Sn" Vectors="velocityW">
+ <PointData Scalars="Sn" Vectors="velocity_liquid (m/s)">
<DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
0.05 0.0323458 0.05 0.0477935 0.0259454 0.0419438 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
@@ -223,28 +223,6 @@
0.0575249 0.0575162 0.0575065 0.0575003 0.105464 0.105458 0.105444 0.105324 0.105298 0.105297 0.105296 0.105295
0.105293 0.105288 0.11
</DataArray>
- <DataArray type="Float32" Name="permeabilityFactor" NumberOfComponents="1" format="ascii">
- 1 1 1 1 1 1 0.979153 0.975704 0.134861 0.134708 0.127475 0.127501
- 0.127408 0.127435 0.127352 0.127361 0.127291 0.127317 0.127249 0.127269 0.870166 0.870672 0.869856 0.870294
- 0.869623 0.870043 0.869468 0.869325 0.868083 0.867972 0.867953 0.867952 0.867926 0.867925 0.867887 0.867886
- 0.867826 0.867826 0.86771 0.867709 1 1 1 1 1 0.990616 0.154796 0.127516
- 0.127449 0.127384 0.12733 0.127279 0.870957 0.870575 0.870301 0.869309 0.867972 0.867952 0.867924 0.867887
- 0.867826 0.86771 1 1 1 1 0.995406 0.181119 0.127524 0.12746 0.1274 0.127339
- 0.127294 0.871087 0.870748 0.870464 0.869387 0.867972 0.867952 0.867924 0.867887 0.867826 0.86771 1
- 1 1 1 0.997082 0.209313 0.12753 0.127469 0.127412 0.127346 0.127305 0.87116 0.870855
- 0.870573 0.869478 0.867971 0.867951 0.867924 0.867887 0.867826 0.86771 1 1 1 1
- 0.998042 0.238845 0.127535 0.127477 0.12742 0.127354 0.127313 0.871219 0.870939 0.870661 0.869561 0.867971
- 0.867951 0.867924 0.867887 0.867826 0.867711 1 1 1 1 0.99858 0.272586 0.127542
- 0.127492 0.127428 0.127361 0.127321 0.871276 0.87102 0.870747 0.86963 0.867971 0.867951 0.867925 0.867887
- 0.867826 0.867711 1 1 1 1 0.998972 0.316178 0.12755 0.12751 0.127436 0.127368
- 0.127328 0.871335 0.871109 0.870846 0.869689 0.867971 0.86795 0.867925 0.867887 0.867827 0.867712 1
- 1 1 1 0.99933 0.390796 0.127558 0.127528 0.127444 0.127379 0.127335 0.871408 0.871218
- 0.870965 0.869726 0.867971 0.86795 0.867925 0.867887 0.867827 0.867712 1 1 1 1
- 0.999571 0.551143 0.127565 0.127547 0.127453 0.127395 0.127342 0.87157 0.871403 0.871136 0.869644 0.86797
- 0.86795 0.867925 0.867887 0.867827 0.867712 1 1 1 1 0.998908 0.26436 0.127592
- 0.127535 0.127475 0.127408 0.127365 0.872408 0.872245 0.871882 0.868661 0.867968 0.867949 0.867924 0.867887
- 0.867827 0.867712 1
- </DataArray>
<DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
@@ -355,138 +333,6 @@
2.84404e-15 2.84269e-15 2.84119e-15 2.84023e-15 1.94547e-14 1.94511e-14 1.9443e-14 1.93711e-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">
- 0.998087 0.990709 0.998087 0.995582 0.979032 0.986502 0.869404 0.873958 0.842092 0.845712 0.836653 0.840187
- 0.82983 0.833033 0.82145 0.824122 0.811536 0.813566 0.800381 0.801742 0.779481 0.779747 0.761724 0.760951
- 0.748579 0.746919 0.739861 0.738839 0.738842 0.738843 0.738848 0.73885 0.738855 0.738856 0.738859 0.738859
- 0.738859 0.738859 0.73886 0.73886 0.599048 0.599048 0.998087 0.997134 0.991459 0.905321 0.849428 0.844372
- 0.837422 0.828494 0.817723 0.80551 0.782467 0.762448 0.747247 0.73884 0.738845 0.738851 0.738857 0.738859
- 0.738859 0.73886 0.599048 0.998087 0.997604 0.993962 0.927106 0.851776 0.847184 0.840551 0.831765 0.820958
- 0.808547 0.784799 0.763883 0.74778 0.738841 0.738846 0.738852 0.738858 0.738859 0.73886 0.73886 0.599048
- 0.998087 0.997816 0.995371 0.941687 0.853384 0.849198 0.842905 0.834317 0.823546 0.811017 0.786742 0.765115
- 0.748296 0.738842 0.738847 0.738853 0.738858 0.738859 0.73886 0.73886 0.599048 0.998087 0.99793 0.996244
- 0.952729 0.854584 0.85077 0.844828 0.836473 0.825782 0.813185 0.788472 0.766214 0.748761 0.738843 0.738848
- 0.738854 0.738858 0.738859 0.73886 0.73886 0.599048 0.998087 0.997996 0.99682 0.961523 0.855552 0.852106
- 0.846528 0.838434 0.827854 0.815216 0.790103 0.767241 0.749176 0.738844 0.738849 0.738855 0.738858 0.738859
- 0.73886 0.73886 0.599048 0.998087 0.998036 0.997213 0.9691 0.856382 0.853314 0.848112 0.840302 0.829864
- 0.817217 0.791733 0.768267 0.749567 0.738845 0.73885 0.738856 0.738859 0.738859 0.73886 0.73886 0.599048
- 0.998087 0.998061 0.997477 0.976153 0.857124 0.854451 0.849626 0.842111 0.831841 0.819213 0.793373 0.769288
- 0.749909 0.738846 0.738851 0.738857 0.738859 0.738859 0.73886 0.73886 0.599048 0.998087 0.998076 0.997627
- 0.979965 0.857668 0.855457 0.85096 0.843725 0.833641 0.821062 0.794852 0.770062 0.749918 0.738847 0.738852
- 0.738857 0.738859 0.738859 0.73886 0.73886 0.599048 0.998087 0.998085 0.997598 0.964419 0.855098 0.852134
- 0.847309 0.839981 0.829929 0.817483 0.791454 0.766341 0.745326 0.738848 0.738854 0.738857 0.738859 0.738859
- 0.73886 0.73886 0.599048
- </DataArray>
- <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
- 0.00181273 0.00180341 0.00181273 0.00180823 0.00178661 0.00179458 -0.0943279 -0.097469 -0.113225 -0.11724 -0.107193 -0.111112
- -0.0996272 -0.103179 -0.0903341 -0.0932968 -0.0793392 -0.0815912 -0.0669688 -0.0684783 -0.0437917 -0.0440866 -0.0240995 -0.0232424
- -0.00952187 -0.00768152 0.000146341 0.00127972 0.00127581 0.00127455 0.001269 0.00126774 0.00126212 0.00126039 0.00125717 0.00125722
- 0.00125682 0.00125674 0.00125629 0.0012562 0.00111052 0.00111052 0.00181273 0.0018093 0.00179949 -0.0726365 -0.121359 -0.115754
- -0.108046 -0.098146 -0.0862006 -0.072657 -0.0471034 -0.0249028 -0.00804519 0.00127853 0.00127332 0.00126645 0.00125905 0.00125728
- 0.0012567 0.00125615 0.00111052 0.00181273 0.00180921 0.00180145 -0.0550036 -0.123963 -0.118872 -0.111516 -0.101773 -0.0897887
- -0.0760245 -0.049689 -0.0264933 -0.00863623 0.00127732 0.00127212 0.00126518 0.00125845 0.00125726 0.00125668 0.00125611 0.00111052
- 0.00181273 0.00180886 0.00180212 -0.0433319 -0.125747 -0.121106 -0.114127 -0.104603 -0.0926578 -0.078764 -0.0518441 -0.0278602
- -0.0092079 0.0012761 0.00127093 0.00126398 0.00125813 0.00125723 0.00125665 0.00125609 0.00111052 0.00181273 0.00180843 0.00180215
- -0.0344528 -0.127077 -0.122849 -0.116259 -0.106995 -0.0951384 -0.0811683 -0.0537621 -0.029079 -0.00972345 0.00127489 0.00126975
- 0.00126279 0.00125793 0.00125719 0.00125662 0.00125607 0.00111052 0.00181273 0.00180794 0.00180182 -0.0273521 -0.12815 -0.12433
- -0.118144 -0.109169 -0.0974353 -0.0834204 -0.0555714 -0.0302181 -0.0101838 0.00127367 0.00126857 0.0012616 0.00125782 0.00125715
- 0.00125659 0.00125605 0.00111052 0.00181273 0.00180738 0.00180124 -0.0211591 -0.12907 -0.12567 -0.119901 -0.111241 -0.0996648
- -0.0856393 -0.0573783 -0.0313557 -0.0106179 0.00127246 0.00126739 0.00126048 0.00125776 0.00125712 0.00125655 0.00125602 0.00111052
- 0.00181273 0.00180674 0.00180046 -0.0152534 -0.129893 -0.126931 -0.12158 -0.113246 -0.101857 -0.0878532 -0.0591975 -0.0324876
- -0.0109969 0.00127126 0.00126619 0.00125957 0.00125774 0.00125707 0.00125649 0.00125598 0.00111052 0.00181273 0.00180592 0.00179948
- -0.0118564 -0.130497 -0.128047 -0.123059 -0.115036 -0.103854 -0.0899037 -0.060837 -0.0333461 -0.0110064 0.00127009 0.00126487
- 0.00125907 0.00125772 0.00125701 0.00125642 0.00125593 0.00111052 0.00181273 0.00180481 0.00179821 -0.0227514 -0.127647 -0.124362
- -0.119011 -0.110885 -0.0997373 -0.0859349 -0.0570695 -0.0292199 -0.00591392 0.00126911 0.00126319 0.001259 0.00125767 0.00125692
- 0.00125633 0.00125583 0.00111052
- </DataArray>
- <DataArray type="Float32" Name="X_liquid^NaCl" NumberOfComponents="1" format="ascii">
- 9.99353e-05 0.00748776 9.99353e-05 0.00261002 0.019181 0.0117039 0.224924 0.223511 0.271133 0.271527 0.270541 0.270926
- 0.269797 0.270146 0.268884 0.269175 0.267803 0.268025 0.266588 0.266736 0.26431 0.264339 0.262375 0.262291
- 0.260943 0.260762 0.259993 0.259882 0.259882 0.259882 0.259883 0.259883 0.259883 0.259883 0.259884 0.259884
- 0.259884 0.259884 0.259884 0.259884 0.399841 0.399841 9.99353e-05 0.00105698 0.00674116 0.167316 0.271932 0.271382
- 0.270624 0.269652 0.268478 0.267147 0.264636 0.262454 0.260798 0.259882 0.259882 0.259883 0.259884 0.259884
- 0.259884 0.259884 0.399841 9.99353e-05 0.0005863 0.00423686 0.127897 0.272187 0.271688 0.270965 0.270008 0.26883
- 0.267478 0.26489 0.262611 0.260856 0.259882 0.259882 0.259883 0.259884 0.259884 0.259884 0.259884 0.399841
- 9.99353e-05 0.000375091 0.00282674 0.101645 0.272362 0.271908 0.271222 0.270286 0.269112 0.267747 0.265102 0.262745
- 0.260912 0.259882 0.259882 0.259883 0.259884 0.259884 0.259884 0.259884 0.399841 9.99353e-05 0.000261944 0.00195432
- 0.0817233 0.272493 0.272079 0.271431 0.270521 0.269356 0.267983 0.26529 0.262865 0.260963 0.259882 0.259883
- 0.259883 0.259884 0.259884 0.259884 0.259884 0.399841 9.99353e-05 0.000195981 0.00137787 0.0658291 0.272598 0.272225
- 0.271617 0.270735 0.269582 0.268205 0.265468 0.262977 0.261008 0.259882 0.259883 0.259883 0.259884 0.259884
- 0.259884 0.259884 0.399841 9.99353e-05 0.000156296 0.000985335 0.0520593 0.272689 0.272356 0.271789 0.270938 0.269801
- 0.268423 0.265646 0.263088 0.261051 0.259882 0.259883 0.259883 0.259884 0.259884 0.259884 0.259884 0.399841
- 9.99353e-05 0.000132506 0.000722604 0.0391007 0.272769 0.27248 0.271954 0.271135 0.270016 0.26864 0.265824 0.2632
- 0.261088 0.259882 0.259883 0.259884 0.259884 0.259884 0.259884 0.259884 0.399841 9.99353e-05 0.00011854 0.000573813
- 0.0318915 0.272828 0.27259 0.2721 0.271311 0.270212 0.268842 0.265985 0.263284 0.261089 0.259882 0.259883
- 0.259884 0.259884 0.259884 0.259884 0.259884 0.399841 9.99353e-05 0.00011015 0.000603453 0.0583324 0.272549 0.272228
- 0.271702 0.270903 0.269808 0.268452 0.265615 0.262879 0.260588 0.259883 0.259883 0.259884 0.259884 0.259884
- 0.259884 0.259884 0.399841
- </DataArray>
- <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
- 0.0201084 0.0200639 0.0201084 0.020108 0.0200148 0.0200767 0.0196995 0.0197706 0.0198249 0.019895 0.0201071 0.0201766
- 0.0204211 0.0204894 0.0207433 0.0208062 0.0210638 0.0211183 0.0213816 0.0214264 0.0213017 0.0213272 0.0210416 0.0210467
- 0.0208484 0.0208279 0.0228024 0.0210646 0.0211279 0.0211484 0.0212391 0.0212598 0.0213526 0.0213813 0.0214351 0.0214342
- 0.0214408 0.0214421 0.0214497 0.0214512 0.0197087 0.0197087 0.0201084 0.0201269 0.0201217 0.0198322 0.0199588 0.0202463
- 0.0205728 0.0208955 0.0212087 0.0215142 0.0213987 0.0210962 0.0208561 0.021084 0.0211684 0.0212811 0.0214036 0.0214332
- 0.0214428 0.0214521 0.0197087 0.0201084 0.0201373 0.0201499 0.0198744 0.0199969 0.020288 0.0206321 0.0209643 0.0212821
- 0.0215883 0.0214626 0.0211443 0.0208889 0.0211035 0.021188 0.0213019 0.0214136 0.0214335 0.0214432 0.0214526 0.0197087
- 0.0201084 0.0201452 0.0201706 0.0199064 0.020022 0.0203146 0.0206764 0.0210196 0.0213435 0.021652 0.0215192 0.0211883
- 0.0209209 0.0211232 0.0212075 0.0213218 0.021419 0.021434 0.0214436 0.021453 0.0197087 0.0201084 0.0201522 0.0201875
- 0.0199323 0.0200408 0.020334 0.0207129 0.0210678 0.0213985 0.0217101 0.0215717 0.0212296 0.0209515 0.021143 0.0212268
- 0.0213415 0.0214222 0.0214346 0.0214441 0.0214533 0.0197087 0.0201084 0.0201589 0.0202026 0.0199544 0.0200569 0.0203505
- 0.020746 0.0211128 0.0214507 0.0217658 0.0216225 0.0212695 0.0209807 0.0211627 0.0212462 0.0213612 0.0214241 0.0214352
- 0.0214447 0.0214537 0.0197087 0.0201084 0.0201658 0.0202168 0.0199735 0.0200722 0.0203668 0.0207787 0.021157 0.0215023
- 0.0218212 0.0216733 0.0213095 0.0210092 0.0211824 0.0212655 0.0213799 0.0214251 0.0214358 0.0214454 0.0214542 0.0197087
- 0.0201084 0.0201733 0.0202307 0.0199884 0.0200886 0.020385 0.0208129 0.0212016 0.021554 0.0218768 0.0217245 0.0213495
- 0.0210366 0.0212021 0.0212852 0.0213949 0.0214254 0.0214366 0.0214463 0.0214548 0.0197087 0.0201084 0.0201825 0.0202443
- 0.0199984 0.0201075 0.020408 0.0208478 0.0212448 0.0216036 0.0219303 0.0217729 0.021385 0.0210567 0.0212212 0.0213071
- 0.0214033 0.0214258 0.0214376 0.0214475 0.0214558 0.0197087 0.0201084 0.0201949 0.0202578 0.019999 0.0200894 0.0203789
- 0.0208047 0.0212007 0.0215593 0.0218871 0.0217308 0.0213337 0.0209608 0.0212373 0.0213348 0.0214045 0.0214266 0.0214391
- 0.0214491 0.0214574 0.0197087
- </DataArray>
- <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
- 0.979892 0.979936 0.979892 0.979892 0.979985 0.979923 -57.3467 -59.1601 -71.5204 -73.9997 -69.1205 -71.5929
- -65.7812 -68.0916 -61.2044 -63.1979 -55.2524 -56.8256 -48.0009 -49.1023 -32.1096 -32.3536 -17.8617 -17.2482
- -7.11528 -5.74715 0.121013 0.978935 0.978872 0.978852 0.978761 0.97874 0.978647 0.978619 0.978565 0.978566
- 0.978559 0.978558 0.97855 0.978549 0.980291 0.980291 0.979892 0.979873 0.979878 -42.6932 -76.5097 -74.4697
- -71.2188 -66.4155 -59.9864 -52.0674 -34.5626 -18.4874 -6.02474 0.978916 0.978832 0.978719 0.978596 0.978567
- 0.978557 0.978548 0.980291 0.979892 0.979863 0.97985 -31.6366 -78.0841 -76.379 -73.4431 -68.8248 -62.4524
- -54.463 -36.4601 -19.676 -6.47293 0.978896 0.978812 0.978698 0.978586 0.978567 0.978557 0.978547 0.980291
- 0.979892 0.979855 0.979829 -24.577 -79.1577 -77.732 -75.114 -70.7086 -64.4309 -56.4196 -38.0475 -20.7008
- -6.90721 0.978877 0.978792 0.978678 0.978581 0.978566 0.978556 0.978547 0.980291 0.979892 0.979848 0.979812
- -19.3396 -79.9581 -78.78 -76.4775 -72.304 -66.1466 -58.1425 -39.4647 -21.6174 -7.30005 0.978857 0.978773
- 0.978658 0.978578 0.978565 0.978556 0.978547 0.980291 0.979892 0.979841 0.979797 -15.2301 -80.6063 -79.6697
- -77.6854 -73.7579 -67.739 -59.7598 -40.8044 -22.4764 -7.65205 0.978837 0.978754 0.978639 0.978576 0.978565
- 0.978555 0.978546 0.980291 0.979892 0.979834 0.979783 -11.7009 -81.1684 -80.4782 -78.8175 -75.1477 -69.2872
- -61.3548 -42.1433 -23.3352 -7.98497 0.978818 0.978734 0.97862 0.978575 0.978564 0.978555 0.978546 0.980291
- 0.979892 0.979827 0.979769 -8.38035 -81.6821 -81.2502 -79.9099 -76.4993 -70.813 -62.9476 -43.4921 -24.1909
- -8.27697 0.978798 0.978715 0.978605 0.978575 0.978563 0.978554 0.978545 0.980291 0.979892 0.979818 0.979756
- -6.49188 -82.0864 -81.9606 -80.8912 -77.7178 -72.2112 -64.4288 -44.7129 -24.8464 -8.29194 0.978779 0.978693
- 0.978597 0.978574 0.978562 0.978552 0.978544 0.980291 0.979892 0.979805 0.979742 -12.6586 -80.4627 -79.7983
- -78.4045 -75.0909 -69.516 -61.7324 -42.0425 -21.8252 -4.46243 0.978763 0.978665 0.978595 0.978573 0.978561
- 0.978551 0.978543 0.980291
- </DataArray>
- <DataArray type="Float32" Name="X_gas^NaCl" NumberOfComponents="1" format="ascii">
- 4.84414e-12 3.64845e-10 4.84414e-12 1.2683e-10 9.43439e-10 5.73076e-10 1.22619e-08 1.21651e-08 1.53576e-08 1.53682e-08 1.56432e-08 1.56535e-08
- 1.5974e-08 1.59865e-08 1.63361e-08 1.63502e-08 1.67237e-08 1.6739e-08 1.71345e-08 1.71508e-08 1.73785e-08 1.73953e-08 1.74378e-08 1.74542e-08
- 1.74851e-08 1.74946e-08 1.92788e-08 1.78266e-08 1.78801e-08 1.78973e-08 1.7974e-08 1.79915e-08 1.807e-08 1.80943e-08 1.81397e-08 1.8139e-08
- 1.81445e-08 1.81457e-08 1.81521e-08 1.81534e-08 3.16498e-08 3.16498e-08 4.84414e-12 5.13309e-11 3.29163e-10 8.8185e-09 1.53729e-08 1.5656e-08
- 1.59958e-08 1.63626e-08 1.67535e-08 1.71669e-08 1.74123e-08 1.74718e-08 1.7513e-08 1.78429e-08 1.79143e-08 1.80095e-08 1.81131e-08 1.81381e-08
- 1.81462e-08 1.81541e-08 3.16498e-08 4.84414e-12 2.84741e-11 2.0665e-10 6.59651e-09 1.53742e-08 1.56538e-08 1.60022e-08 1.63736e-08 1.67671e-08
- 1.71826e-08 1.74292e-08 1.74891e-08 1.7532e-08 1.78594e-08 1.79309e-08 1.80271e-08 1.81216e-08 1.81384e-08 1.81466e-08 1.81546e-08 3.16498e-08
- 4.84414e-12 1.82199e-11 1.37818e-10 5.16964e-09 1.53744e-08 1.56498e-08 1.6007e-08 1.63835e-08 1.67803e-08 1.71981e-08 1.74459e-08 1.75062e-08
- 1.75505e-08 1.78761e-08 1.79473e-08 1.8044e-08 1.81261e-08 1.81388e-08 1.81469e-08 1.81549e-08 3.16498e-08 4.84414e-12 1.27268e-11 9.52801e-11
- 4.11361e-09 1.53746e-08 1.56456e-08 1.60111e-08 1.63929e-08 1.67932e-08 1.72135e-08 1.74626e-08 1.75231e-08 1.75686e-08 1.78928e-08 1.79637e-08
- 1.80606e-08 1.81289e-08 1.81394e-08 1.81474e-08 1.81552e-08 3.16498e-08 4.84414e-12 9.52448e-12 6.71872e-11 3.28689e-09 1.53754e-08 1.56422e-08
- 1.60154e-08 1.64024e-08 1.68061e-08 1.72289e-08 1.74792e-08 1.754e-08 1.75864e-08 1.79095e-08 1.798e-08 1.80773e-08 1.81305e-08 1.81399e-08
- 1.81478e-08 1.81555e-08 3.16498e-08 4.84414e-12 7.5981e-12 4.80614e-11 2.5815e-09 1.53773e-08 1.56401e-08 1.60208e-08 1.64126e-08 1.68193e-08
- 1.72444e-08 1.74959e-08 1.7557e-08 1.76041e-08 1.79261e-08 1.79963e-08 1.8093e-08 1.81313e-08 1.81404e-08 1.81484e-08 1.81559e-08 3.16498e-08
- 4.84414e-12 6.4438e-12 3.52611e-11 1.92635e-09 1.53812e-08 1.56403e-08 1.60283e-08 1.64238e-08 1.68331e-08 1.72602e-08 1.75128e-08 1.75741e-08
- 1.76215e-08 1.79427e-08 1.80131e-08 1.81057e-08 1.81316e-08 1.8141e-08 1.81492e-08 1.81564e-08 3.16498e-08 4.84414e-12 5.76721e-12 2.80152e-11
- 1.56584e-09 1.53892e-08 1.56458e-08 1.60387e-08 1.64364e-08 1.68477e-08 1.72764e-08 1.75298e-08 1.75912e-08 1.76381e-08 1.79589e-08 1.80316e-08
- 1.81129e-08 1.81318e-08 1.81419e-08 1.81502e-08 1.81572e-08 3.16498e-08 4.84414e-12 5.36224e-12 2.94827e-11 2.91031e-09 1.54058e-08 1.56636e-08
- 1.60509e-08 1.64507e-08 1.6863e-08 1.72927e-08 1.75465e-08 1.76071e-08 1.76321e-08 1.79725e-08 1.80549e-08 1.81138e-08 1.81326e-08 1.81432e-08
- 1.81515e-08 1.81586e-08 3.16498e-08
- </DataArray>
<DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
0.998841 0.99655 0.998841 0.998066 0.992877 0.995234 0.987893 0.990631 0.984632 0.987428 0.980415 0.983157
0.9751 0.977599 0.968531 0.97063 0.960702 0.96231 0.951817 0.952905 0.93495 0.935167 0.92039 0.919751
@@ -685,7 +531,7 @@
5233.5 5214.82 5189.46 5158.25 5094.01 5032.45 4981.07 4965.22 4965.14 4965.08 4965.06 4965.05
4965.04 4965.04 8339.66
</DataArray>
- <DataArray type="Float32" Name="velocityW" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
1.68521e-07 -6.8271e-07 0 4.96888e-07 -1.649e-07 0 4.60589e-07 -7.14101e-07 0 6.42236e-07 -2.5642e-07 0
8.60591e-07 -1.80278e-08 0 8.77679e-07 -4.54305e-08 0 9.32315e-07 -3.08919e-08 0 9.41801e-07 -5.06339e-08 0
9.90353e-07 -1.83557e-08 0 9.80556e-07 -4.02578e-08 0 1.05507e-06 -2.15159e-08 0 1.05681e-06 -4.54092e-08 0
@@ -745,7 +591,7 @@
4.48081e-07 2.11289e-08 0 9.16024e-08 -1.94026e-09 0 7.74233e-10 -7.83545e-10 0 2.12345e-10 -7.61835e-10 0
1.72369e-10 -7.55751e-10 0 2.48337e-10 -7.37371e-10 0 3.39843e-10 0 0
</DataArray>
- <DataArray type="Float32" Name="velocityN" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
6.83249e-10 4.15686e-10 0 7.76514e-10 6.65134e-10 0 1.86512e-09 2.8875e-10 0 2.4155e-09 1.08737e-09 0
6.87003e-10 4.21248e-10 0 2.66618e-09 1.05839e-09 0 2.52113e-10 0 0 1.18324e-09 0 0
0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/saltflushcc2pncmin-reference.vtu b/test/references/saltflushcc2pncmin-reference.vtu
index e2fc89a883a55e78b6c1ddaa71a261fbb68f69e4..b104ead9184257536c775d7598b6e1ad829c52a2 100644
--- a/test/references/saltflushcc2pncmin-reference.vtu
+++ b/test/references/saltflushcc2pncmin-reference.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="231">
- <CellData Scalars="Sn" Vectors="velocityW">
+ <CellData Scalars="Sn" Vectors="velocity_liquid (m/s)">
<DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
1 0.0487924 0 0 0 0 0 0 0 0 0 0
0 0.0086939 0.0771145 0.117547 0.301786 0.610907 0.621245 0.626117 1 0.0571734 0 0
@@ -193,25 +193,6 @@
0.11 0.11 0.109469 0.0584545 0.0574946 0.0574945 0.0574915 0.0574901 0.0574889 0.0574858 0.105422 0.10542
0.105358 0.105298 0.105298 0.105297 0.105296 0.105294 0.105291 0.105285
</DataArray>
- <DataArray type="Float32" Name="permeabilityFactor" NumberOfComponents="1" format="ascii">
- 0.702511 1 0.998756 0.157279 0.127638 0.127382 0.127408 0.12734 0.127319 0.127297 0.870663 0.870273
- 0.869985 0.869582 0.867965 0.867943 0.867911 0.867866 0.867788 0.867618 0.715337 1 0.999432 0.19327
- 0.127649 0.127398 0.12743 0.127358 0.127342 0.127316 0.871069 0.870602 0.870296 0.869266 0.867965 0.867942
- 0.867911 0.867866 0.867788 0.867618 0.721069 1 0.999756 0.254438 0.127668 0.127407 0.127439 0.127368
- 0.127349 0.127327 0.871266 0.87082 0.870504 0.869181 0.867964 0.867942 0.867911 0.867866 0.867788 0.867619
- 0.724934 1 0.999861 0.325501 0.127684 0.127413 0.127446 0.127376 0.127359 0.127335 0.871359 0.870963
- 0.870649 0.869155 0.867964 0.867941 0.867911 0.867866 0.867789 0.86762 0.728081 1 0.99991 0.408353
- 0.127701 0.127421 0.127457 0.127384 0.12737 0.127343 0.871425 0.871073 0.870766 0.869153 0.867964 0.867941
- 0.867911 0.867866 0.867789 0.86762 0.730668 1 0.999944 0.532697 0.12772 0.12743 0.127467 0.127392
- 0.12738 0.12735 0.871487 0.871177 0.870875 0.869164 0.867964 0.867941 0.867912 0.867866 0.867789 0.867621
- 0.732438 1 0.999968 0.813993 0.127744 0.12744 0.127478 0.127405 0.127391 0.127357 0.871548 0.871283
- 0.870987 0.869172 0.867964 0.867941 0.867912 0.867866 0.86779 0.867621 0.733829 1 0.999983 0.973519
- 0.149548 0.127448 0.127486 0.127423 0.127396 0.127361 0.871603 0.871361 0.871072 0.869101 0.867963 0.867941
- 0.867912 0.867866 0.86779 0.867622 0.620871 1 0.999958 0.598966 0.127662 0.127413 0.127462 0.127383
- 0.127362 0.12734 0.871407 0.871184 0.870915 0.868591 0.867963 0.867941 0.867912 0.867866 0.86779 0.867622
- 1 1 0.984404 0.134083 0.127325 0.127325 0.127304 0.127295 0.127286 0.127264 0.871296 0.871241
- 0.869582 0.867978 0.867961 0.867941 0.867912 0.867866 0.86779 0.867622
- </DataArray>
<DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
@@ -307,120 +288,6 @@
2.23e-14 2.23e-14 2.19522e-14 2.99004e-15 2.83936e-15 2.83934e-15 2.83889e-15 2.83867e-15 2.83849e-15 2.83799e-15 1.94299e-14 1.94287e-14
1.93917e-14 1.93559e-14 1.93555e-14 1.93551e-14 1.93544e-14 1.93534e-14 1.93517e-14 1.9348e-14
</DataArray>
- <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
- -0.46717 0.997853 0.915226 0.854961 0.851826 0.84727 0.840774 0.832027 0.821064 0.808324 0.784042 0.763414
- 0.748278 0.738842 0.738846 0.738852 0.738858 0.738859 0.73886 0.73886 -0.467173 0.998006 0.939683 0.856335
- 0.853708 0.849407 0.843012 0.834231 0.823105 0.810091 0.785047 0.76347 0.747431 0.738843 0.738847 0.738853
- 0.738858 0.738859 0.73886 0.73886 -0.467176 0.998064 0.960435 0.857443 0.855264 0.851335 0.845193 0.836528
- 0.825378 0.812205 0.786574 0.764192 0.747303 0.738844 0.738848 0.738854 0.738859 0.738859 0.73886 0.73886
- -0.467179 0.998092 0.973194 0.858205 0.856368 0.852829 0.847003 0.838525 0.827411 0.814133 0.788023 0.764966
- 0.74738 0.738845 0.738849 0.738855 0.738859 0.738859 0.73886 0.73886 -0.467181 0.998103 0.981467 0.858731
- 0.857185 0.854033 0.848569 0.840341 0.829325 0.815989 0.789454 0.765764 0.74754 0.738846 0.738851 0.738857
- 0.738859 0.738859 0.73886 0.73886 -0.467184 0.998096 0.987256 0.8591 0.857817 0.855043 0.849971 0.84205
- 0.831194 0.817853 0.790931 0.76661 0.747747 0.738847 0.738852 0.738857 0.738859 0.738859 0.73886 0.73886
- -0.467187 0.998066 0.990199 0.859309 0.858274 0.85585 0.851178 0.843604 0.832968 0.819681 0.792399 0.767432
- 0.747922 0.738848 0.738853 0.738858 0.738859 0.738859 0.73886 0.73886 -0.467189 0.998005 0.98436 0.901679
- 0.858413 0.85636 0.851979 0.844661 0.834201 0.820953 0.793219 0.767634 0.747639 0.738849 0.738854 0.738858
- 0.738859 0.73886 0.73886 0.73886 -0.46719 0.99787 0.961159 0.85801 0.856915 0.854011 0.848663 0.840349
- 0.829089 0.815375 0.787914 0.763387 0.744857 0.73885 0.738855 0.738858 0.738859 0.73886 0.73886 0.73886
- 0.998168 0.997591 0.893007 0.853117 0.849648 0.843253 0.834162 0.822681 0.809317 0.794945 0.770398 0.750099
- 0.738847 0.738851 0.738856 0.738858 0.738859 0.73886 0.73886 0.73886
- </DataArray>
- <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
- -3.31684e-08 0.0018116 -0.0721687 -0.127496 -0.12402 -0.118968 -0.111763 -0.102064 -0.0899062 -0.0757777 -0.0488499 -0.0259737
- -0.00918774 0.00127652 0.00127171 0.00126523 0.00125852 0.00125701 0.00125653 0.00125593 -3.27414e-08 0.00181084 -0.0497098 -0.129019
- -0.126107 -0.121338 -0.114245 -0.104507 -0.0921698 -0.0777365 -0.0499637 -0.0260356 -0.00824912 0.00127535 0.00127041 0.00126394
- 0.00125794 0.00125696 0.00125646 0.00125588 -3.26022e-08 0.00181012 -0.0308384 -0.130248 -0.127832 -0.123476 -0.116664 -0.107055
- -0.0946899 -0.0800818 -0.0516574 -0.026836 -0.00810721 0.0012742 0.00126912 0.00126259 0.00125768 0.00125692 0.0012564 0.00125585
- -3.25505e-08 0.00180945 -0.019484 -0.131092 -0.129057 -0.125133 -0.118672 -0.109269 -0.0969448 -0.0822199 -0.0532644 -0.0276943
- -0.00819178 0.00127304 0.00126786 0.00126122 0.00125751 0.00125688 0.00125636 0.00125582 -3.2538e-08 0.00180879 -0.0121768 -0.131675
- -0.129963 -0.126468 -0.120409 -0.111284 -0.0990673 -0.0842781 -0.0548513 -0.0285801 -0.00836991 0.00127188 0.00126665 0.00125998
- 0.0012574 0.00125683 0.00125632 0.00125581 -3.25473e-08 0.00180811 -0.0070295 -0.132084 -0.130664 -0.127587 -0.121963 -0.113178
- -0.10114 -0.086345 -0.0564895 -0.0295177 -0.00859933 0.00127072 0.00126548 0.00125908 0.00125732 0.00125678 0.00125628 0.00125579
- -3.25638e-08 0.0018074 -0.00431707 -0.132316 -0.13117 -0.128483 -0.123301 -0.114902 -0.103107 -0.0883723 -0.058117 -0.0304293
- -0.00879352 0.00126956 0.00126432 0.0012585 0.00125726 0.00125673 0.00125624 0.00125577 -3.25627e-08 0.00180661 -0.00932408 -0.0900506
- -0.131324 -0.129049 -0.12419 -0.116074 -0.104474 -0.0897825 -0.059026 -0.0306533 -0.00847934 0.00126838 0.00126307 0.00125813
- 0.0012572 0.00125667 0.00125619 0.00125575 -3.21264e-08 0.00180558 -0.0300516 -0.130876 -0.129664 -0.126443 -0.120512 -0.111293
- -0.0988058 -0.083597 -0.0531428 -0.025944 -0.00539397 0.00126718 0.00126162 0.00125792 0.00125715 0.00125661 0.00125612 0.00125572
- 0.00181015 0.00180424 -0.0921766 -0.125452 -0.121605 -0.114513 -0.104431 -0.091699 -0.0768789 -0.0609404 -0.0337188 -0.0112076
- 0.00127042 0.00126588 0.00126003 0.00125782 0.00125708 0.00125652 0.00125604 0.00125566
- </DataArray>
- <DataArray type="Float32" Name="X_liquid^NaCl" NumberOfComponents="1" format="ascii">
- 1.46717 0.000335482 0.156943 0.272535 0.272194 0.271698 0.27099 0.270037 0.268842 0.267454 0.264807 0.26256
- 0.26091 0.259882 0.259882 0.259883 0.259884 0.259884 0.259884 0.259884 1.46717 0.000183028 0.110027 0.272684
- 0.272399 0.27193 0.271233 0.270277 0.269064 0.267646 0.264917 0.262566 0.260818 0.259882 0.259882 0.259883
- 0.259884 0.259884 0.259884 0.259884 1.46718 0.000126334 0.0704035 0.272805 0.272569 0.272141 0.271471 0.270527
- 0.269312 0.267876 0.265083 0.262644 0.260804 0.259882 0.259883 0.259883 0.259884 0.259884 0.259884 0.259884
- 1.46718 9.84772e-05 0.0462904 0.272888 0.272689 0.272303 0.271668 0.270745 0.269534 0.268087 0.265241 0.262729
- 0.260812 0.259882 0.259883 0.259883 0.259884 0.259884 0.259884 0.259884 1.46718 8.85527e-05 0.0307099 0.272945
- 0.272778 0.272435 0.271839 0.270943 0.269742 0.268289 0.265397 0.262816 0.26083 0.259882 0.259883 0.259883
- 0.259884 0.259884 0.259884 0.259884 1.46718 9.63828e-05 0.0197738 0.272985 0.272847 0.272545 0.271992 0.271129
- 0.269946 0.268492 0.265558 0.262908 0.260852 0.259882 0.259883 0.259884 0.259884 0.259884 0.259884 0.259884
- 1.46719 0.000126466 0.0141181 0.273007 0.272897 0.272633 0.272123 0.271298 0.270139 0.268691 0.265718 0.262997
- 0.260871 0.259883 0.259883 0.259884 0.259884 0.259884 0.259884 0.259884 1.46719 0.000188535 0.0249646 0.188372
- 0.272911 0.272688 0.272211 0.271413 0.270273 0.26883 0.265807 0.263019 0.260841 0.259883 0.259883 0.259884
- 0.259884 0.259884 0.259884 0.259884 1.46719 0.000324595 0.0688922 0.272866 0.272749 0.272432 0.271849 0.270943
- 0.269716 0.268222 0.265229 0.262557 0.260537 0.259883 0.259883 0.259884 0.259884 0.259884 0.259884 0.259884
- 2.23205e-05 0.000604685 0.19917 0.272334 0.271957 0.27126 0.270269 0.269018 0.267562 0.265996 0.263321 0.261109
- 0.259882 0.259883 0.259883 0.259884 0.259884 0.259884 0.259884 0.259884
- </DataArray>
- <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
- 0.998106 0.0201161 0.0198383 0.019928 0.020171 0.0204839 0.020799 0.0210987 0.0213769 0.0216366 0.0214756 0.021156
- 0.0209164 0.0211165 0.0211947 0.0213011 0.0214125 0.0214376 0.0214457 0.0214556 0.998131 0.0201274 0.0198625 0.0199542
- 0.0202049 0.020531 0.0208521 0.0211542 0.021432 0.0216889 0.0215151 0.0211774 0.0209156 0.0211355 0.021216 0.0213225
- 0.0214221 0.0214385 0.0214469 0.0214566 0.998139 0.0201364 0.0198818 0.0199704 0.020226 0.0205709 0.0209024 0.0212103
- 0.0214906 0.0217473 0.0215642 0.0212116 0.0209318 0.0211542 0.0212371 0.0213447 0.0214265 0.0214392 0.0214478 0.0214571
- 0.998142 0.0201443 0.0198941 0.0199809 0.020238 0.0206019 0.0209455 0.0212607 0.0215448 0.0218021 0.0216117 0.0212466
- 0.020953 0.021173 0.0212577 0.0213675 0.0214293 0.0214399 0.0214486 0.0214575 0.998142 0.0201518 0.0198978 0.0199894
- 0.0202465 0.0206279 0.0209842 0.0213079 0.0215967 0.0218556 0.0216588 0.021282 0.0209762 0.0211919 0.0212778 0.0213881
- 0.0214311 0.0214406 0.0214492 0.0214578 0.998142 0.0201589 0.0198861 0.0199985 0.0202551 0.0206519 0.0210206 0.0213533
- 0.0216479 0.0219092 0.0217068 0.0213184 0.0210005 0.0212109 0.021297 0.0214031 0.0214325 0.0214414 0.0214499 0.0214581
- 0.998141 0.0201661 0.0198585 0.02001 0.0202662 0.0206747 0.0210549 0.0213967 0.0216976 0.0219622 0.0217547 0.0213543
- 0.021024 0.0212299 0.0213162 0.0214128 0.0214335 0.0214423 0.0214506 0.0214584 0.998141 0.0201736 0.0199205 0.0200202
- 0.0202825 0.0206954 0.0210842 0.0214324 0.0217383 0.0220055 0.0217906 0.0213783 0.0210364 0.0212493 0.0213369 0.0214189
- 0.0214344 0.0214433 0.0214514 0.0214587 0.998166 0.0201821 0.0199466 0.0200244 0.0202902 0.0206807 0.0210483 0.0213786
- 0.0216693 0.0219259 0.0217122 0.0213156 0.020978 0.021269 0.0213609 0.0214225 0.0214353 0.0214444 0.0214525 0.0214593
- 0.0201381 0.0201914 0.0199266 0.0199824 0.0202197 0.0205308 0.0208282 0.0210973 0.0213417 0.0215745 0.0214002 0.021063
- 0.0212159 0.0212904 0.0213873 0.0214242 0.0214364 0.0214458 0.0214538 0.0214603
- </DataArray>
- <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
- 0.00190134 0.979884 -41.972 -79.7353 -78.7954 -77.1711 -74.1816 -69.4421 -62.8046 -54.4226 -35.9007 -19.3126
- -6.89077 0.978884 0.978805 0.978699 0.978587 0.978562 0.978554 0.978544 0.0018769 0.979873 -28.1923 -80.664
- -80.0797 -78.6911 -75.8208 -71.1034 -64.3917 -55.8424 -36.7397 -19.3768 -6.19356 0.978864 0.978784 0.978677
- 0.978578 0.978561 0.978553 0.978543 0.00186893 0.979864 -17.1283 -81.393 -81.1121 -80.0516 -77.4126 -72.8296
- -66.1507 -57.5317 -37.9979 -19.9858 -6.09277 0.978846 0.978763 0.978655 0.978574 0.978561 0.978552 0.978543
- 0.00186595 0.979856 -10.6865 -81.8909 -81.832 -81.1054 -78.7383 -74.3351 -67.7297 -59.0764 -39.1941 -20.6382
- -6.16193 0.978827 0.978742 0.978633 0.978571 0.97856 0.978551 0.978543 0.00186523 0.979848 -6.62364 -82.2399
- -82.3622 -81.9586 -79.8906 -75.7095 -69.2192 -60.5657 -40.3765 -21.3116 -6.30154 0.978808 0.978722 0.978612
- 0.978569 0.978559 0.978551 0.978542 0.00186575 0.979841 -3.79907 -82.4972 -82.7809 -82.6824 -80.9286 -77.0061
- -70.6753 -62.0614 -41.5967 -22.024 -6.47997 0.978789 0.978703 0.978597 0.978567 0.978559 0.97855 0.978542
- 0.00186668 0.979834 -2.32299 -82.6693 -83.1028 -83.2761 -81.8341 -78.193 -72.0619 -63.5305 -42.8101 -22.7181
- -6.63218 0.97877 0.978684 0.978587 0.978566 0.978558 0.978549 0.978542 0.00186661 0.979826 -5.06276 -53.646
- -83.2537 -83.6767 -82.461 -79.0236 -73.0462 -64.5714 -43.5065 -22.905 -6.40142 0.978751 0.978663 0.978581
- 0.978566 0.978557 0.978549 0.978541 0.00184164 0.979818 -16.7331 -81.9525 -82.3761 -82.1541 -80.1947 -75.9659
- -69.2883 -60.315 -39.2919 -19.4368 -4.076 0.978731 0.978639 0.978577 0.978565 0.978556 0.978548 0.978541
- 0.979862 0.979809 -55.1865 -78.8407 -77.6463 -74.806 -69.9625 -63.0949 -54.394 -44.3755 -25.1309 -8.44403
- 0.978784 0.97871 0.978613 0.978576 0.978564 0.978554 0.978546 0.97854
- </DataArray>
- <DataArray type="Float32" Name="X_gas^NaCl" NumberOfComponents="1" format="ascii">
- -7.54171e-06 1.62718e-11 8.18475e-09 1.52837e-08 1.55075e-08 1.58039e-08 1.61288e-08 1.64751e-08 1.68404e-08 1.72242e-08 1.74511e-08 1.75061e-08
- 1.7547e-08 1.78704e-08 1.79365e-08 1.80265e-08 1.81206e-08 1.81419e-08 1.81487e-08 1.81571e-08 -7.54187e-06 8.88097e-12 5.5955e-09 1.52876e-08
- 1.55111e-08 1.5814e-08 1.61416e-08 1.64894e-08 1.68559e-08 1.72406e-08 1.74681e-08 1.75229e-08 1.756e-08 1.78864e-08 1.79546e-08 1.80446e-08
- 1.81287e-08 1.81427e-08 1.81497e-08 1.81579e-08 -7.5419e-06 6.13241e-12 3.50647e-09 1.5287e-08 1.55087e-08 1.5821e-08 1.6153e-08 1.65031e-08
- 1.6871e-08 1.72569e-08 1.74849e-08 1.75399e-08 1.75757e-08 1.79023e-08 1.79724e-08 1.80634e-08 1.81324e-08 1.81432e-08 1.81505e-08 1.81584e-08
- -7.54189e-06 4.78196e-12 2.27669e-09 1.52861e-08 1.55046e-08 1.58265e-08 1.61634e-08 1.65162e-08 1.68858e-08 1.72729e-08 1.75016e-08 1.75567e-08
- 1.75922e-08 1.79182e-08 1.79898e-08 1.80826e-08 1.81348e-08 1.81438e-08 1.81511e-08 1.81587e-08 -7.54186e-06 4.30157e-12 1.49794e-09 1.52864e-08
- 1.55015e-08 1.58318e-08 1.61735e-08 1.65291e-08 1.69005e-08 1.72889e-08 1.75183e-08 1.75735e-08 1.76091e-08 1.79342e-08 1.80067e-08 1.81e-08
- 1.81364e-08 1.81444e-08 1.81517e-08 1.81589e-08 -7.54183e-06 4.68364e-12 9.58293e-10 1.5289e-08 1.55005e-08 1.58379e-08 1.61839e-08 1.65421e-08
- 1.69152e-08 1.73049e-08 1.75349e-08 1.75902e-08 1.76261e-08 1.79502e-08 1.8023e-08 1.81127e-08 1.81375e-08 1.81451e-08 1.81522e-08 1.81591e-08
- -7.5418e-06 6.14787e-12 6.81221e-10 1.52954e-08 1.55036e-08 1.58456e-08 1.61952e-08 1.65555e-08 1.69301e-08 1.7321e-08 1.75516e-08 1.7607e-08
- 1.7643e-08 1.79663e-08 1.80392e-08 1.81209e-08 1.81384e-08 1.81458e-08 1.81528e-08 1.81594e-08 -7.54177e-06 9.16915e-12 1.21551e-09 1.00628e-08
- 1.55144e-08 1.58552e-08 1.62077e-08 1.65694e-08 1.69452e-08 1.73372e-08 1.75684e-08 1.76236e-08 1.76581e-08 1.79827e-08 1.80567e-08 1.8126e-08
- 1.81392e-08 1.81467e-08 1.81535e-08 1.81597e-08 -7.54195e-06 1.57951e-11 3.43979e-09 1.53216e-08 1.55381e-08 1.58726e-08 1.62218e-08 1.65838e-08
- 1.69605e-08 1.73533e-08 1.75847e-08 1.76386e-08 1.76542e-08 1.79993e-08 1.8077e-08 1.81291e-08 1.81399e-08 1.81476e-08 1.81544e-08 1.81602e-08
- 1.08344e-12 2.94463e-11 1.06928e-08 1.53472e-08 1.55712e-08 1.58899e-08 1.62362e-08 1.65983e-08 1.69755e-08 1.73686e-08 1.75985e-08 1.76405e-08
- 1.79544e-08 1.80175e-08 1.80993e-08 1.81305e-08 1.81409e-08 1.81488e-08 1.81556e-08 1.8161e-08
- </DataArray>
<DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
31.332 0.998769 0.996208 0.994535 0.992132 0.988629 0.983611 0.976815 0.968228 0.958152 0.938656 0.921785
0.90922 0.901307 0.90131 0.901315 0.90132 0.901321 0.901322 0.901322 31.3281 0.998816 0.996825 0.995586
@@ -592,7 +459,7 @@
0.354593 9.61046 3656.64 5248.96 5240.03 5223.73 5200.78 5171.98 5138.59 5102.79 5042.38 4992.73
4965.23 4965.17 4965.09 4965.06 4965.05 4965.04 4965.04 4965.03
</DataArray>
- <DataArray type="Float32" Name="velocityW" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
7.49233e-07 0 0 -1.70346e-07 -2.35051e-07 0 7.19299e-07 -3.19825e-08 0 8.04456e-07 -8.90236e-08 0
9.33616e-07 -6.87675e-08 0 1.02899e-06 -2.65413e-08 0 1.06725e-06 -1.1635e-08 0 1.08447e-06 -5.49112e-09 0
1.09281e-06 -2.74738e-09 0 1.09713e-06 -1.47339e-09 0 1.10607e-06 -7.39007e-09 0 1.12348e-06 -9.99123e-09 0
@@ -644,7 +511,7 @@
9.32899e-07 -3.53215e-08 0 6.88564e-07 3.42352e-09 0 2.99814e-07 4.80212e-08 0 1.53705e-08 -1.03048e-09 0
2.68279e-10 -9.26523e-10 0 1.96588e-10 -9.10009e-10 0 1.62799e-10 -9.08172e-10 0 3.85391e-10 -8.56634e-10 0
</DataArray>
- <DataArray type="Float32" Name="velocityN" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
-5.87016e-06 6.86281e-07 0 7.99268e-06 2.03328e-09 0 1.30377e-09 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0