[freeflow,multidomain]

fixed bug in the calculation of the diffusion and conduction term in the
stokes equation
updated reference solutions and added new tests for diffusion and
conduction

reviewed by bernd


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14997 2fb0f335-1f38-0410-981e-8018bf24f1b0

dumux/freeflow/stokesnc/stokesncfluxvariables.hh

@@ -154,7 +154,7 @@ protected:
 					// the gradient of the mole fraction at the IP
 					for (int dimIdx=0; dimIdx<dim; ++dimIdx)
 					{
-						moleFractionGrad_[compIdx] +=
+						moleFractionGrad_[compIdx][dimIdx] +=
 							this->face().grad[scvIdx][dimIdx] *
 							elemVolVars[scvIdx].moleFraction(compIdx);
 					}

dumux/freeflow/stokesncni/stokesncnifluxvariables.hh

@@ -142,7 +142,7 @@ protected:
 
             // the gradient of the temperature at the IP
             for (int dimIdx=0; dimIdx<dim; ++dimIdx)
-                temperatureGrad_ +=
+                temperatureGrad_[dimIdx] +=
                     this->face().grad[idx][dimIdx]*
                     elemVolVars[idx].temperature();
         }

test/freeflow/stokes2c/CMakeLists.txt

@@ -4,3 +4,11 @@ add_dumux_test(test_stokes2c test_stokes2c test_stokes2c.cc
   ${CMAKE_SOURCE_DIR}/test/references/stokes2c-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c)
+
+add_dumux_test(test_stokes2c_diffusion test_stokes2c test_stokes2c.cc
+  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
+  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
+  ${CMAKE_SOURCE_DIR}/test/references/stokes2c_diffusion-reference.vtu
+  ${CMAKE_CURRENT_BINARY_DIR}/stokes2c_diffusion-00020.vtu
+  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c
+  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2c_diffusion.input)

test/freeflow/stokes2c/stokes2ctestproblem.hh

@@ -134,8 +134,8 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
-    { return "stokes2c"; }
+    const std::string &name() const
+    { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name); }
 
     /*!
      * \brief Returns the temperature within the domain.
@@ -223,26 +223,27 @@ public:
    // \}
 
 private:
-   // internal method for the initial condition (reused for the
-   // dirichlet conditions!)
-   void initial_(PrimaryVariables &values,
-                 const GlobalPosition &globalPos) const
-   {
-       values = 0.0;
-
-       values[pressureIdx] = 1e5;
-       values[velocityXIdx] = 0.0;
-
-       //parabolic profile
-       const Scalar v1 = 1.0;
-       values[velocityYIdx] = -v1*(globalPos[0] - this->bBoxMin()[0])*(this->bBoxMax()[0] - globalPos[0])
-                                    / (0.25*(this->bBoxMax()[0] - this->bBoxMin()[0])*(this->bBoxMax()[0] - this->bBoxMin()[0]));
-
-       if (onUpperBoundary_(globalPos))
-           values[massOrMoleFracIdx] = 0.005;
-       else
-           values[massOrMoleFracIdx] = 0.007;
-   }
+    // internal method for the initial condition (reused for the
+    // dirichlet conditions!)
+    void initial_(PrimaryVariables &values,
+                  const GlobalPosition &globalPos) const
+    {
+        values = 0.0;
+
+        values[pressureIdx] = 1e5;
+        values[velocityXIdx] = 0.0;
+
+        //parabolic profile
+        values[velocityYIdx] = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, Velocity)
+                               * (globalPos[0] - this->bBoxMin()[0])*(this->bBoxMax()[0] - globalPos[0])
+                               / (0.25*(this->bBoxMax()[0] - this->bBoxMin()[0])*(this->bBoxMax()[0] - this->bBoxMin()[0]));
+
+        if (onUpperBoundary_(globalPos))
+            values[massOrMoleFracIdx] = 0.005;
+        else
+            values[massOrMoleFracIdx] = 0.007;
+    }
+
     bool onLeftBoundary_(const GlobalPosition &globalPos) const
     { return globalPos[0] < this->bBoxMin()[0] + eps_; }
 

test/freeflow/stokes2c/test_stokes2c.input

@@ -10,4 +10,5 @@ StabilizationAlpha = -1.0e3 # a stabilization factor. Set to zero for no stabili
 
 [Problem]
 EnableGravity = 0 # disable gravity
-
+Velocity = -0.5 # [m/s]
+Name = "stokes2c" # prefix of the vtk files

test/freeflow/stokes2c/test_stokes2c_diffusion.input

+[TimeManager]
+DtInitial = 0.1 # [s]
+TEnd = 2000 # [s]
+
+[Grid]
+File = ./grids/test_stokes2c.dgf
+
+[Stokes]
+StabilizationAlpha = -1.0e3 # a stabilization factor. Set to zero for no stabilization
+
+[Problem]
+EnableGravity = 0 # disable gravity
+Velocity = 0.0 # [m/s]
+Name = "stokes2c_diffusion" # prefix of the vtk files

test/freeflow/stokes2cni/CMakeLists.txt

@@ -4,3 +4,11 @@ add_dumux_test(test_stokes2cni test_stokes2cni test_stokes2cni.cc
   ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00008.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni)
+
+add_dumux_test(test_stokes2cni_conduction test_stokes2cni test_stokes2cni.cc
+  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
+  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
+  ${CMAKE_SOURCE_DIR}/test/references/stokes2cni_conduction-reference.vtu
+  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni_conduction-00008.vtu
+  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni
+  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2cni_conduction.input)

test/freeflow/stokes2cni/stokes2cnitestproblem.hh

@@ -143,6 +143,8 @@ public:
 
         // initialize the tables of the fluid system
         FluidSystem::init();
+
+        velocity_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, Scalar, Problem, Velocity);
     }
 
     /*!
@@ -155,8 +157,8 @@ public:
      *
      * This is used as a prefix for files generated by the simulation.
      */
-    const char *name() const
-    { return "stokes2cni"; }
+    const std::string &name() const
+    { return GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Problem, Name); }
 
     // \}
 
@@ -174,8 +176,10 @@ public:
         // the mass balance has to be of type outflow
         values.setOutflow(massBalanceIdx);
 
-        if (onUpperBoundary_(globalPos) &&
-                !onLeftBoundary_(globalPos) && !onRightBoundary_(globalPos))
+        if (onUpperBoundary_(globalPos)
+            && !onLeftBoundary_(globalPos)
+            && !onRightBoundary_(globalPos)
+            && velocity_ > 1e-10 /*if not conduction case*/)
             values.setAllOutflow();
 
         // set pressure at the upper boundary
@@ -234,10 +238,10 @@ private:
     void initial_(PrimaryVariables &values,
                   const GlobalPosition &globalPos) const
     {
-        const Scalar v1 = 0.5;
-        values[velocityXIdx] = 0.0;
-        values[velocityYIdx] = v1*(globalPos[0] - this->bBoxMin()[0])*(this->bBoxMax()[0] - globalPos[0])
-                                   / (0.25*(this->bBoxMax()[0] - this->bBoxMin()[0])*(this->bBoxMax()[0] - this->bBoxMin()[0]));
+        values = 0.0;
+        values[velocityYIdx] = velocity_
+                               * (globalPos[0] - this->bBoxMin()[0])*(this->bBoxMax()[0] - globalPos[0])
+                               / (0.25*(this->bBoxMax()[0] - this->bBoxMin()[0])*(this->bBoxMax()[0] - this->bBoxMin()[0]));
         values[pressureIdx] = 1e5 + 1.189*this->gravity()[1]*globalPos[1];
         values[massOrMoleFracIdx] = 1e-4;
         values[temperatureIdx] = 283.15;
@@ -280,6 +284,7 @@ private:
     }
 
     Scalar eps_;
+    Scalar velocity_;
 };
 } //end namespace
 

test/freeflow/stokes2cni/test_stokes2cni.input

@@ -8,3 +8,7 @@ File = ./grids/test_stokes2cni.dgf
 [Stokes]
 StabilizationAlpha = -1.0 # a stabilization factor. Set to zero for no stabilization
 
+[Problem]
+Velocity = 0.5 # [m/s]
+Name = "stokes2cni" # prefix of the vtk files
+

test/freeflow/stokes2cni/test_stokes2cni_conduction.input

+[TimeManager]
+DtInitial = 0.1 # [s]
+TEnd = 3 # [s]
+
+[Grid]
+File = ./grids/test_stokes2cni.dgf
+
+[Stokes]
+StabilizationAlpha = -1.0 # a stabilization factor. Set to zero for no stabilization
+
+[Problem]
+Velocity = 0.0 # [m/s]
+Name = "stokes2cni_conduction" # prefix of the vtk files

test/freeflow/zeroeq2c/CMakeLists.txt

@@ -3,7 +3,7 @@ add_dumux_test(test_zeroeq2c test_zeroeq2c test_zeroeq2c.cc
   ${CMAKE_SOURCE_DIR}/bin/runTest.sh
   ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
   ${CMAKE_SOURCE_DIR}/test/references/zeroeq2c-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00016.vtu
+  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00013.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2c
   -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq2c.input
   )

test/references/2cnistokes2p2cni-ff-reference.vtu

@@ -6,7 +6,7 @@
         <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
           297.353 297.35 298.15 298.149 297.347 298.149 297.345 298.148 297.344 298.147 297.344 298.147
           297.344 298.146 297.344 298.146 297.345 298.145 297.346 298.144 297.347 298.144 297.348 298.143
-          297.349 298.142 297.35 298.142 297.351 298.141 297.357 298.141 298.15 298.15 298.15 298.15
+          297.349 298.142 297.35 298.142 297.351 298.141 297.356 298.141 298.15 298.15 298.15 298.15
           298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
           298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
           298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
@@ -32,13 +32,13 @@
           100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
         </DataArray>
         <DataArray type="Float32" Name="delP" NumberOfComponents="1" format="ascii">
-          0.00202824 0.00189853 0.00200987 0.00188016 0.00176356 0.00174686 0.00162779 0.00161498 0.00149164 0.00148086 0.0013557 0.00134752
-          0.00121975 0.00121293 0.00108399 0.00107884 0.000948264 0.000944016 0.000812673 0.000809511 0.000677112 0.000674573 0.000541639 0.000539834
-          0.00040618 0.000404843 0.000270782 0.000269965 0.000135387 0.000134961 0 0 0.00203204 0.00189634 0.00176096 0.00162532
-          0.0014898 0.00135421 0.00121868 0.00108315 0.000947664 0.000812209 0.000676783 0.000541392 0.000406009 0.000270668 0.000135308 0
+          0.00202823 0.00189853 0.00200987 0.00188016 0.00176356 0.00174686 0.00162779 0.00161498 0.00149164 0.00148086 0.0013557 0.00134752
+          0.00121975 0.00121293 0.00108399 0.00107884 0.000948264 0.000944017 0.000812672 0.000809511 0.000677112 0.000674573 0.000541638 0.000539834
+          0.00040618 0.000404843 0.000270781 0.000269965 0.000135386 0.000134961 0 0 0.00203204 0.00189634 0.00176096 0.00162532
+          0.0014898 0.0013542 0.00121868 0.00108315 0.000947664 0.000812208 0.000676783 0.000541391 0.000406009 0.000270667 0.000135308 0
           0.0020228 0.00188696 0.00175253 0.00161779 0.00148329 0.00134871 0.00121402 0.00107937 0.000944527 0.000809752 0.000674812 0.000539939
-          0.000404941 0.000270001 0.000134975 0 0.00203097 0.00189542 0.00175994 0.00162434 0.00148893 0.00135338 0.00121802 0.00108254
-          0.000947211 0.000811804 0.000676503 0.000541154 0.000405867 0.000270561 0.000135278 0 0.00202645 0.00189072 0.00175571 0.00162036
+          0.000404941 0.000270001 0.000134975 0 0.00203097 0.00189542 0.00175994 0.00162434 0.00148893 0.00135338 0.00121801 0.00108254
+          0.00094721 0.000811804 0.000676502 0.000541154 0.000405867 0.000270561 0.000135278 0 0.00202645 0.00189072 0.00175571 0.00162036
           0.00148544 0.00135029 0.00121536 0.00108029 0.000945321 0.000810268 0.000675265 0.000540209 0.000405177 0.000270115 0.000135066 0
           0.00202979 0.00189428 0.00175893 0.00162342 0.0014881 0.00135264 0.00121738 0.00108197 0.000946745 0.0008114 0.000676195 0.000540896
           0.000405703 0.000270437 0.000135246 0 0.00202796 0.00189245 0.00175725 0.00162185 0.00148673 0.00135141 0.00121632 0.00108106
@@ -46,23 +46,23 @@
           0.00148702 0.00135163 0.00121649 0.00108119 0.000946081 0.000810847 0.000675746 0.00054055 0.000405444 0.000270272 0.000135149 0
         </DataArray>
         <DataArray type="Float32" Name="XH2Og" NumberOfComponents="1" format="ascii">
-          0.0190171 0.019014 0.008 0.00800807 0.0190107 0.00801612 0.0190084 0.00802415 0.0190071 0.00803217 0.0190066 0.00804016
-          0.0190067 0.00804815 0.0190073 0.00805612 0.0190082 0.00806409 0.0190093 0.00807204 0.0190105 0.00807999 0.0190118 0.00808796
-          0.019013 0.00809593 0.0190142 0.00810391 0.0190156 0.00811189 0.0190219 0.00811588 0.008 0.008 0.008 0.00800001
-          0.00800001 0.00800002 0.00800003 0.00800005 0.00800007 0.00800009 0.00800011 0.00800013 0.00800016 0.00800019 0.00800022 0.00800023
+          0.0190173 0.0190142 0.008 0.00800807 0.0190108 0.00801612 0.0190085 0.00802415 0.0190071 0.00803216 0.0190065 0.00804016
+          0.0190066 0.00804814 0.0190071 0.00805612 0.019008 0.00806408 0.0190091 0.00807204 0.0190103 0.00807999 0.0190115 0.00808795
+          0.0190127 0.00809593 0.0190139 0.00810391 0.0190152 0.00811189 0.0190213 0.00811588 0.008 0.008 0.00800001 0.00800002
+          0.00800003 0.00800004 0.00800006 0.00800007 0.0080001 0.00800012 0.00800014 0.00800017 0.0080002 0.00800024 0.00800027 0.00800029
           0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008
           0.008 0.008 0.008 0.00799999 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008
           0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008
           0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008
           0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008
-          0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.00800001
-          0.00800001 0.00800001 0.00800001 0.00800001 0.00800001 0.00800001 0.00800001 0.00800001 0.008 0.0080011 0.00800234 0.00800342
-          0.00800431 0.00800503 0.00800561 0.00800609 0.00800648 0.0080068 0.00800705 0.00800725 0.0080074 0.00800749 0.00800751 0.008
+          0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008 0.008
+          0.008 0.00800001 0.00800001 0.00800001 0.00800001 0.00800001 0.00800001 0.00800001 0.008 0.0080011 0.00800234 0.00800342
+          0.0080043 0.00800503 0.00800561 0.00800609 0.00800648 0.0080068 0.00800705 0.00800725 0.00800739 0.00800748 0.00800751 0.008
         </DataArray>
         <DataArray type="Float32" Name="XAirg" NumberOfComponents="1" format="ascii">
           0.980983 0.980986 0.992 0.991992 0.980989 0.991984 0.980992 0.991976 0.980993 0.991968 0.980993 0.99196
-          0.980993 0.991952 0.980993 0.991944 0.980992 0.991936 0.980991 0.991928 0.980989 0.99192 0.980988 0.991912
-          0.980987 0.991904 0.980986 0.991896 0.980984 0.991888 0.980978 0.991884 0.992 0.992 0.992 0.992
+          0.980993 0.991952 0.980993 0.991944 0.980992 0.991936 0.980991 0.991928 0.98099 0.99192 0.980989 0.991912
+          0.980987 0.991904 0.980986 0.991896 0.980985 0.991888 0.980979 0.991884 0.992 0.992 0.992 0.992
           0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
           0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
           0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
@@ -74,10 +74,10 @@
           0.991996 0.991995 0.991994 0.991994 0.991994 0.991993 0.991993 0.991993 0.991993 0.991993 0.991992 0.992
         </DataArray>
         <DataArray type="Float32" Name="h" NumberOfComponents="1" format="ascii">
-          71264.5 71254.1 44886.1 44905.4 71242.9 44924.6 71235.2 44943.8 71230.7 44962.9 71229 44982.1
-          71229.4 45001.1 71231.3 45020.2 71234.4 45039.2 71238.2 45058.2 71242.4 45077.2 71246.6 45096.2
-          71250.7 45115.3 71254.9 45134.3 71259.4 45153.4 71280.6 45162.9 44886.1 44886.1 44886.1 44886.1
-          44886.1 44886.2 44886.2 44886.2 44886.3 44886.3 44886.4 44886.4 44886.5 44886.6 44886.6 44886.6
+          71265.3 71254.7 44886.1 44905.4 71243.3 44924.6 71235.4 44943.8 71230.7 44962.9 71228.9 44982
+          71229.1 45001.1 71230.9 45020.2 71233.8 45039.2 71237.5 45058.2 71241.6 45077.2 71245.6 45096.2
+          71249.7 45115.3 71253.7 45134.3 71258.1 45153.4 71278.9 45162.9 44886.1 44886.1 44886.1 44886.1
+          44886.2 44886.2 44886.2 44886.3 44886.3 44886.4 44886.4 44886.5 44886.6 44886.7 44886.8 44886.8
           44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1
           44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1
           44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1
@@ -103,8 +103,8 @@
         </DataArray>
         <DataArray type="Float32" Name="mu" NumberOfComponents="1" format="ascii">
           1.79265e-05 1.79264e-05 1.81222e-05 1.81221e-05 1.79263e-05 1.81219e-05 1.79263e-05 1.81218e-05 1.79262e-05 1.81216e-05 1.79262e-05 1.81215e-05
-          1.79262e-05 1.81214e-05 1.79262e-05 1.81212e-05 1.79263e-05 1.81211e-05 1.79263e-05 1.81209e-05 1.79263e-05 1.81208e-05 1.79264e-05 1.81206e-05
-          1.79264e-05 1.81205e-05 1.79264e-05 1.81203e-05 1.79265e-05 1.81202e-05 1.79266e-05 1.81201e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05
+          1.79262e-05 1.81214e-05 1.79262e-05 1.81212e-05 1.79263e-05 1.81211e-05 1.79263e-05 1.81209e-05 1.79263e-05 1.81208e-05 1.79263e-05 1.81206e-05
+          1.79264e-05 1.81205e-05 1.79264e-05 1.81203e-05 1.79264e-05 1.81202e-05 1.79266e-05 1.81201e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05
           1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05
           1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05
           1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05
@@ -116,38 +116,38 @@
           1.81222e-05 1.81222e-05 1.81222e-05 1.81221e-05 1.81221e-05 1.81221e-05 1.81221e-05 1.81221e-05 1.81221e-05 1.81221e-05 1.81221e-05 1.81222e-05
         </DataArray>
         <DataArray type="Float32" Name="v" NumberOfComponents="3" format="ascii">
-          0.000913727 1.24804e-05 0 0.000915849 1.31476e-05 0 1.11851 0 0 1.11893 -0.000213047 0
-          0.000917983 1.31866e-05 0 1.1197 -0.000226833 0 0.000918642 1.31338e-05 0 1.12032 -0.000178034 0
-          0.000919169 1.30769e-05 0 1.12085 -0.000139395 0 0.000919449 1.30068e-05 0 1.12123 -9.92823e-05 0
-          0.000919687 1.29559e-05 0 1.12154 -7.27274e-05 0 0.000919819 1.29056e-05 0 1.12176 -4.90735e-05 0
-          0.000919934 1.28682e-05 0 1.12193 -3.36244e-05 0 0.000919996 1.28318e-05 0 1.12205 -2.03339e-05 0
-          0.000920052 1.28032e-05 0 1.12215 -1.15668e-05 0 0.000920081 1.2792e-05 0 1.12221 -4.22541e-06 0
-          0.000920107 1.27829e-05 0 1.12226 9.09295e-07 0 0.000920114 1.27631e-05 0 1.12229 5.25045e-06 0
-          0.000920132 1.28347e-05 0 1.12232 9.33954e-06 0 0.00092012 1.24617e-05 0 1.12233 1.02669e-05 0
-          2.1001 0 0 2.10015 -0.00141918 0 2.10037 -0.00156163 0 2.10071 -0.0012885 0
-          2.10104 -0.0010441 0 2.10135 -0.000782774 0 2.1016 -0.000601233 0 2.1018 -0.000438936 0
-          2.10196 -0.000329098 0 2.10208 -0.000235116 0 2.10218 -0.000171136 0 2.10225 -0.000117011 0
-          2.1023 -7.8718e-05 0 2.10233 -4.59412e-05 0 2.10235 -1.96544e-05 0 2.10237 3.59792e-06 0
-          2.88064 0 0 2.88051 -0.000679384 0 2.88031 -0.00110108 0 2.88029 -0.00117614 0
-          2.88035 -0.00107656 0 2.88047 -0.000912285 0 2.88062 -0.000742255 0 2.88076 -0.000583983 0
-          2.88089 -0.000451891 0 2.881 -0.000340911 0 2.8811 -0.000254163 0 2.88117 -0.000183268 0
-          2.88122 -0.000128443 0 2.88126 -8.20566e-05 0 2.88129 -4.33845e-05 0 2.8813 -5.66824e-06 0
-          3.37718 0 0 3.37714 -0.000935893 0 3.37702 -0.00131992 0 3.37688 -0.00143175 0
-          3.37677 -0.00137874 0 3.3767 -0.00122661 0 3.37667 -0.00104781 0 3.37666 -0.000857495 0
-          3.37666 -0.000689334 0 3.37668 -0.000535832 0 3.37669 -0.000411339 0 3.3767 -0.000303173 0
-          3.37671 -0.000217084 0 3.37672 -0.000141099 0 3.37673 -7.67434e-05 0 3.37673 -1.33439e-05 0
-          3.48529 0 0 3.4852 -0.000273593 0 3.485 -0.000567596 0 3.48479 -0.000734783 0
-          3.48458 -0.00079011 0 3.48441 -0.000765847 0 3.48427 -0.000693182 0 3.48416 -0.000597136 0
-          3.48409 -0.000495396 0 3.48403 -0.000397566 0 3.484 -0.000310374 0 3.48397 -0.000233915 0
-          3.48395 -0.000169661 0 3.48394 -0.000113134 0 3.48393 -6.40043e-05 0 3.48393 -1.52951e-05 0
-          3.07414 0 0 3.07409 -0.00036546 0 3.07397 -0.000530997 0 3.0738 -0.000623784 0
-          3.0736 -0.000652421 0 3.07341 -0.000633729 0 3.07323 -0.000582234 0 3.07308 -0.000510529 0
-          3.07294 -0.000432817 0 3.07283 -0.000353563 0 3.07275 -0.00028128 0 3.07268 -0.000214436 0
-          3.07263 -0.000156713 0 3.07259 -0.000103958 0 3.07257 -5.67935e-05 0 3.07256 -1.04615e-05 0
-          1.98047 0 0 1.98041 0.000143991 0 1.98031 0.000120858 0 1.98018 8.18358e-05 0
-          1.98003 4.57536e-05 0 1.97988 2.24467e-05 0 1.97974 7.83933e-06 0 1.97962 1.16378e-06 0
-          1.97951 -1.04837e-06 0 1.97942 -9.77571e-07 0 1.97935 9.76042e-08 0 1.97929 6.14402e-07 0
-          1.97925 8.41519e-07 0 1.97922 -4.07888e-08 0 1.9792 -9.90296e-07 0 1.9792 -3.52924e-06 0
+          0.000913727 1.24736e-05 0 0.000915849 1.31504e-05 0 1.11851 0 0 1.11893 -0.000213134 0
+          0.000917983 1.31894e-05 0 1.1197 -0.000226896 0 0.000918642 1.3135e-05 0 1.12032 -0.000178117 0
+          0.000919169 1.3081e-05 0 1.12085 -0.000139455 0 0.000919449 1.30104e-05 0 1.12123 -9.93458e-05 0
+          0.000919687 1.296e-05 0 1.12154 -7.27872e-05 0 0.000919819 1.291e-05 0 1.12176 -4.91311e-05 0
+          0.000919934 1.28729e-05 0 1.12193 -3.36791e-05 0 0.000919997 1.28367e-05 0 1.12205 -2.03858e-05 0
+          0.000920052 1.28084e-05 0 1.12215 -1.16157e-05 0 0.000920081 1.27974e-05 0 1.12221 -4.27176e-06 0
+          0.000920107 1.27885e-05 0 1.12226 8.65292e-07 0 0.000920114 1.27695e-05 0 1.12229 5.20693e-06 0
+          0.000920132 1.28375e-05 0 1.12232 9.29961e-06 0 0.000920121 1.24726e-05 0 1.12233 1.0237e-05 0
+          2.1001 0 0 2.10015 -0.00141918 0 2.10037 -0.00156166 0 2.10071 -0.00128854 0
+          2.10104 -0.00104414 0 2.10135 -0.000782819 0 2.1016 -0.000601274 0 2.1018 -0.000438977 0
+          2.10196 -0.000329137 0 2.10208 -0.000235154 0 2.10218 -0.000171174 0 2.10225 -0.00011705 0
+          2.1023 -7.87567e-05 0 2.10233 -4.59838e-05 0 2.10235 -1.9701e-05 0 2.10237 3.54637e-06 0
+          2.88064 0 0 2.88051 -0.000679438 0 2.88031 -0.00110115 0 2.88029 -0.00117623 0
+          2.88035 -0.00107664 0 2.88047 -0.000912372 0 2.88062 -0.000742338 0 2.88076 -0.000584066 0
+          2.88089 -0.000451971 0 2.881 -0.000340991 0 2.8811 -0.000254241 0 2.88117 -0.000183345 0
+          2.88122 -0.000128511 0 2.88126 -8.21192e-05 0 2.88129 -4.34416e-05 0 2.8813 -5.71682e-06 0
+          3.37718 0 0 3.37714 -0.000935901 0 3.37702 -0.00131995 0 3.37688 -0.00143179 0
+          3.37677 -0.00137879 0 3.3767 -0.00122665 0 3.37667 -0.00104786 0 3.37666 -0.000857546 0
+          3.37666 -0.00068939 0 3.37668 -0.000535886 0 3.37669 -0.000411393 0 3.3767 -0.000303228 0
+          3.37671 -0.000217136 0 3.37672 -0.000141149 0 3.37673 -7.67886e-05 0 3.37673 -1.33828e-05 0
+          3.48529 0 0 3.4852 -0.000273636 0 3.485 -0.000567654 0 3.48479 -0.00073485 0
+          3.48458 -0.00079018 0 3.48441 -0.000765918 0 3.48427 -0.00069325 0 3.48416 -0.000597206 0
+          3.48409 -0.000495466 0 3.48403 -0.000397633 0 3.484 -0.000310437 0 3.48397 -0.000233977 0
+          3.48395 -0.00016972 0 3.48394 -0.000113184 0 3.48393 -6.40433e-05 0 3.48393 -1.53238e-05 0
+          3.07414 0 0 3.07409 -0.000365461 0 3.07397 -0.00053101 0 3.0738 -0.000623803 0
+          3.0736 -0.000652446 0 3.07341 -0.000633756 0 3.07323 -0.000582263 0 3.07308 -0.000510557 0
+          3.07294 -0.000432842 0 3.07283 -0.000353586 0 3.07275 -0.000281305 0 3.07268 -0.000214464 0
+          3.07263 -0.000156743 0 3.07259 -0.000103981 0 3.07257 -5.6814e-05 0 3.07256 -1.04793e-05 0
+          1.98047 0 0 1.98041 0.000143963 0 1.98031 0.000120821 0 1.98018 8.17966e-05 0
+          1.98003 4.57155e-05 0 1.97988 2.24072e-05 0 1.97974 7.80253e-06 0 1.97962 1.12909e-06 0
+          1.97951 -1.0792e-06 0 1.97942 -1.00626e-06 0 1.97935 7.23332e-08 0 1.97929 5.90052e-07 0
+          1.97925 8.20378e-07 0 1.97922 -5.44615e-08 0 1.9792 -1.00231e-06 0 1.9792 -3.53896e-06 0
           0.00134 0 0 0.00134 0 0 0.00134 0 0 0.00134 0 0
           0.00134 0 0 0.00134 0 0 0.00134 0 0 0.00134 0 0
           0.00134 0 0 0.00134 0 0 0.00134 0 0 0.00134 0 0

test/references/2cnizeroeq2p2cni-pm-reference.vtu

@@ -4,14 +4,14 @@
     <Piece NumberOfCells="25" NumberOfPoints="36">
       <PointData Scalars="Sn" Vectors="velocityW">
         <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
-          0.0750879 0.0750906 0.875107 0.874938 0.0750629 0.8746 0.0750438 0.874156 0.0750472 0.873755 0.0750519 0.873594
-          0.938627 0.9388 0.937982 0.937143 0.936472 0.93608 0.957838 0.96014 0.958001 0.955501 0.954155 0.953244
-          0.97054 0.979307 0.976986 0.971314 0.966526 0.963334 0.965619 1 1 0.984275 0.976549 0.96919
+          0.0751027 0.0751055 0.875114 0.874945 0.0750779 0.874607 0.0750591 0.874162 0.0750627 0.873761 0.0750675 0.873599
+          0.938632 0.938805 0.937987 0.937147 0.936474 0.936081 0.957843 0.960149 0.958015 0.955513 0.954159 0.953244
+          0.970545 0.979311 0.977008 0.971367 0.966541 0.963333 0.965624 1 1 0.984446 0.976544 0.969192
         </DataArray>
         <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
-          0.924912 0.924909 0.124893 0.125062 0.924937 0.1254 0.924956 0.125844 0.924953 0.126245 0.924948 0.126406
-          0.0613725 0.0611999 0.0620181 0.0628566 0.0635281 0.0639198 0.0421615 0.0398596 0.0419992 0.044499 0.0458449 0.046756
-          0.0294595 0.0206932 0.0230136 0.0286856 0.0334739 0.036666 0.0343812 0 0 0.0157249 0.0234506 0.0308099
+          0.924897 0.924895 0.124886 0.125055 0.924922 0.125393 0.924941 0.125838 0.924937 0.126239 0.924932 0.126401
+          0.0613683 0.0611951 0.0620131 0.0628528 0.0635262 0.063919 0.0421571 0.039851 0.041985 0.0444875 0.0458414 0.0467556
+          0.0294554 0.0206888 0.0229923 0.0286333 0.0334589 0.036667 0.0343756 0 0 0.0155542 0.023456 0.0308084
         </DataArray>
         <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
           100007 100007 100004 100004 100006 100004 100006 100003 100006 100002 100006 100002
@@ -19,74 +19,74 @@
           100005 100007 99997.8 100005 99997.5 99998.7 100005 100010 99993.7 100008 99995 99999.1
         </DataArray>
         <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
-          98859.7 98859.7 97908.5 97908.8 98859.5 97909.2 98859.3 97909.8 98859.1 97910.5 98859 97910.7
-          97653.9 97652.3 97656.1 97660.6 97663.6 97665.5 97505.9 97481.9 97500.1 97525.3 97534.6 97542.2
-          97349.1 97174.5 97221.3 97335.9 97399.2 97440.2 97418.1 96325.4 96309.5 97016.2 97228.2 97363.4
+          98859.7 98859.6 97908.5 97908.8 98859.5 97909.2 98859.3 97909.8 98859.1 97910.5 98859 97910.7
+          97653.9 97652.3 97656.1 97660.5 97663.6 97665.5 97505.9 97481.8 97499.9 97525.2 97534.6 97542.2
+          97349 97174.4 97220.8 97335.1 97399 97440.2 97418 96325.4 96309.5 97009.3 97228.3 97363.4
         </DataArray>
         <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
-          1146.91 1146.92 2095.7 2095.24 1146.85 2094.32 1146.8 2093.11 1146.81 2092.02 1146.82 2091.58
-          2350.55 2351.62 2346.57 2341.49 2337.47 2335.15 2499.36 2522.84 2500.96 2477.14 2464.99 2457.03
-          2656.29 2832.23 2776.46 2668.7 2598.33 2558.45 2586.5 3684.13 3684.13 2991.69 2766.87 2635.66
+          1146.94 1146.95 2095.72 2095.26 1146.89 2094.34 1146.84 2093.12 1146.85 2092.03 1146.86 2091.59
+          2350.57 2351.65 2346.6 2341.51 2337.48 2335.16 2499.41 2522.93 2501.1 2477.24 2465.02 2457.03
+          2656.35 2832.35 2776.93 2669.55 2598.53 2558.44 2586.57 3684.13 3684.13 2998.59 2766.75 2635.69
         </DataArray>
         <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
-          997.055 997.055 997.114 997.117 997.055 997.121 997.055 997.12 997.055 997.112 997.055 997.108
-          997.323 997.376 997.435 997.452 997.382 997.319 997.534 997.788 997.973 998.118 997.924 997.598
-          997.554 998.08 998.351 998.719 998.52 997.669 997.668 997.756 998.682 999.103 999.057 997.504
+          997.055 997.055 997.114 997.117 997.055 997.121 997.055 997.12 997.055 997.113 997.055 997.108
+          997.324 997.377 997.436 997.453 997.382 997.319 997.535 997.789 997.975 998.12 997.926 997.6
+          997.554 998.082 998.352 998.722 998.524 997.67 997.669 997.756 998.677 999.107 999.061 997.505
         </DataArray>
         <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
           1.15435 1.15435 1.15541 1.15546 1.15435 1.15554 1.15435 1.15551 1.15434 1.15537 1.15434 1.15529
-          1.15935 1.16036 1.16148 1.16179 1.16042 1.15922 1.16345 1.16855 1.17241 1.17557 1.17134 1.16465
-          1.16383 1.1748 1.18081 1.18999 1.18487 1.16605 1.16611 1.17425 1.19112 1.20091 1.19934 1.16279
+          1.15936 1.16037 1.1615 1.16181 1.16044 1.15923 1.16347 1.16858 1.17244 1.17562 1.17138 1.16468
+          1.16385 1.17482 1.18083 1.19007 1.18495 1.16608 1.16614 1.17425 1.19105 1.20104 1.19946 1.16281
         </DataArray>
         <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
-          907.079 907.066 2.45157 2.46061 907.198 2.47902 907.289 2.50503 907.273 2.53001 907.251 2.54044
-          0.291851 0.287916 0.298081 0.309989 0.3223 0.330315 0.0894122 0.0729038 0.0843765 0.0996158 0.11178 0.122983
-          0.0278011 0.00763081 0.0108525 0.0221623 0.0380559 0.0564579 0.0458204 0 0 0.00229257 0.0104817 0.0324517
+          907.008 906.995 2.45114 2.46018 907.127 2.4786 907.216 2.50464 907.199 2.52966 907.176 2.54011
+          0.291774 0.287828 0.297982 0.309902 0.322244 0.330278 0.0893747 0.072844 0.0842712 0.0995093 0.111727 0.122962
+          0.0277857 0.00762373 0.0108154 0.022017 0.0379827 0.0564539 0.0457893 0 0 0.0021907 0.0104826 0.0324425
         </DataArray>
         <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          242.962 242.983 45242 45227.3 242.768 45197.6 242.621 45156.2 242.647 45117.1 242.684 45101
-          51931.4 51970.2 51900.7 51812.5 51710.4 51643.1 53991.8 54304.6 54197.3 54033.4 53812.4 53583.1
-          55016.8 55761.1 55786.9 55666.3 55200.9 54524.3 54706.7 55575.2 56337.7 56602.8 56223.1 54903.3
+          243.077 243.098 45242.7 45228 242.885 45198.2 242.739 45156.8 242.767 45117.7 242.804 45101.5
+          51932.1 51971.1 51901.6 51813.3 51710.9 51643.4 53992.6 54305.9 54199.3 54035.6 53813.7 53583.8
+          55017.4 55761.9 55788.6 55671.6 55204.1 54524.9 54707.7 55574.3 56332.1 56612 56226.1 54903.9
         </DataArray>
         <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999977 0.999977 0.999977 0.999977 0.999978
-          0.999978 0.999977 0.999976 0.999975 0.999976 0.999977 0.999977 0.452322 0.745811 0.999974 0.999974 0.999978
+          0.999978 0.999977 0.999976 0.999975 0.999976 0.999977 0.999977 0.451402 0.741507 0.999974 0.999974 0.999978
         </DataArray>
         <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
-          2.15483e-05 2.15483e-05 2.16354e-05 2.16394e-05 2.15483e-05 2.16463e-05 2.15482e-05 2.1644e-05 2.15482e-05 2.1633e-05 2.15482e-05 2.16266e-05
-          2.19593e-05 2.20444e-05 2.21408e-05 2.21677e-05 2.20522e-05 2.19511e-05 2.23077e-05 2.27596e-05 2.31174e-05 2.3416e-05 2.30191e-05 2.24169e-05
-          2.23408e-05 2.3338e-05 2.39345e-05 2.48871e-05 2.43496e-05 2.25407e-05 2.25412e-05 2.30241e-05 2.49001e-05 2.61252e-05 2.59543e-05 2.22553e-05
+          2.15483e-05 2.15483e-05 2.16356e-05 2.16397e-05 2.15483e-05 2.16465e-05 2.15482e-05 2.16443e-05 2.15482e-05 2.16332e-05 2.15482e-05 2.16268e-05
+          2.19602e-05 2.20456e-05 2.21423e-05 2.21694e-05 2.20537e-05 2.19523e-05 2.23092e-05 2.27619e-05 2.31205e-05 2.34207e-05 2.30233e-05 2.24194e-05
+          2.23423e-05 2.33404e-05 2.3937e-05 2.48953e-05 2.43584e-05 2.25436e-05 2.25438e-05 2.30239e-05 2.48901e-05 2.6141e-05 2.59693e-05 2.22573e-05
         </DataArray>
         <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
-          0.0199555 0.0199556 0.0196794 0.0196667 0.0199556 0.0196451 0.0199556 0.0196518 0.0199557 0.019686 0.0199557 0.0197058
-          0.0187047 0.0184602 0.018189 0.0181141 0.0184367 0.0187266 0.0177352 0.0165855 0.015752 0.0151054 0.0159738 0.0174441
-          0.017647 0.015272 0.0140715 0.0124361 0.0133201 0.0171252 0.0171265 0.00754476 0.00939182 0.0107062 0.0109197 0.0178733
+          0.0199555 0.0199556 0.0196786 0.0196659 0.0199556 0.0196442 0.0199556 0.019651 0.0199557 0.0196852 0.0199557 0.0197051
+          0.018702 0.0184569 0.0181848 0.0181094 0.0184327 0.0187232 0.0177312 0.01658 0.015745 0.0150953 0.0159641 0.0174375
+          0.0176431 0.0152669 0.0140668 0.0124234 0.0133049 0.0171179 0.0171199 0.00753022 0.00935194 0.0106866 0.0109004 0.0178679
         </DataArray>
         <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
-          0.980044 0.980044 0.980321 0.980333 0.980044 0.980355 0.980044 0.980348 0.980044 0.980314 0.980044 0.980294
-          0.981295 0.98154 0.981811 0.981886 0.981563 0.981273 0.982265 0.983414 0.984248 0.984895 0.984026 0.982556
-          0.982353 0.984728 0.985929 0.987564 0.98668 0.982875 0.982873 0.992455 0.990608 0.989294 0.98908 0.982127
+          0.980044 0.980044 0.980321 0.980334 0.980044 0.980356 0.980044 0.980349 0.980044 0.980315 0.980044 0.980295
+          0.981298 0.981543 0.981815 0.981891 0.981567 0.981277 0.982269 0.98342 0.984255 0.984905 0.984036 0.982562
+          0.982357 0.984733 0.985933 0.987577 0.986695 0.982882 0.98288 0.99247 0.990648 0.989313 0.9891 0.982132
         </DataArray>
         <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
           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.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999985 0.999986 0.999986
-          0.999986 0.999985 0.999985 0.999985 0.999985 0.999986 0.999986 0.45233 0.745821 0.999984 0.999984 0.999986
+          0.999986 0.999985 0.999985 0.999985 0.999985 0.999986 0.999986 0.451411 0.741517 0.999984 0.999984 0.999986
         </DataArray>
         <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
-          1.34047e-05 1.34047e-05 1.34589e-05 1.34614e-05 1.34047e-05 1.34656e-05 1.34046e-05 1.34642e-05 1.34046e-05 1.34574e-05 1.34046e-05 1.34534e-05
-          1.36603e-05 1.37133e-05 1.37733e-05 1.379e-05 1.37182e-05 1.36553e-05 1.38771e-05 1.41582e-05 1.43808e-05 1.45665e-05 1.43196e-05 1.3945e-05
-          1.38977e-05 1.4518e-05 1.48891e-05 1.54817e-05 1.51473e-05 1.40221e-05 1.40224e-05 1.43229e-05 1.54899e-05 1.62519e-05 1.61456e-05 1.38445e-05
+          1.34047e-05 1.34047e-05 1.3459e-05 1.34615e-05 1.34047e-05 1.34658e-05 1.34046e-05 1.34644e-05 1.34046e-05 1.34575e-05 1.34046e-05 1.34535e-05
+          1.36609e-05 1.3714e-05 1.37742e-05 1.37911e-05 1.37191e-05 1.3656e-05 1.3878e-05 1.41597e-05 1.43827e-05 1.45695e-05 1.43222e-05 1.39466e-05
+          1.38986e-05 1.45195e-05 1.48906e-05 1.54868e-05 1.51528e-05 1.40239e-05 1.4024e-05 1.43228e-05 1.54836e-05 1.62617e-05 1.61549e-05 1.38458e-05
         </DataArray>
         <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
-          0.0316949 0.031695 0.0312615 0.0312416 0.031695 0.0312076 0.0316951 0.0312182 0.0316952 0.0312718 0.0316952 0.031303
-          0.0297306 0.0293463 0.0289198 0.028802 0.0293094 0.0297651 0.028206 0.0263958 0.0250819 0.0240615 0.0254316 0.0277479
-          0.0280673 0.0243246 0.0224286 0.0198415 0.0212407 0.0272459 0.0272479 0.0120731 0.015012 0.0170994 0.0174381 0.0284233
+          0.0316949 0.031695 0.0312603 0.0312404 0.031695 0.0312063 0.0316951 0.0312169 0.0316952 0.0312706 0.0316952 0.0313019
+          0.0297263 0.0293411 0.0289133 0.0287947 0.029303 0.0297597 0.0281998 0.0263871 0.0250708 0.0240457 0.0254164 0.0277375
+          0.028061 0.0243164 0.0224213 0.0198214 0.0212165 0.0272344 0.0272374 0.01205 0.0149486 0.0170682 0.0174075 0.0284148
         </DataArray>
         <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
-          0.968305 0.968305 0.968739 0.968758 0.968305 0.968792 0.968305 0.968782 0.968305 0.968728 0.968305 0.968697
-          0.970269 0.970654 0.97108 0.971198 0.970691 0.970235 0.971794 0.973604 0.974918 0.975938 0.974568 0.972252
-          0.971933 0.975675 0.977571 0.980159 0.978759 0.972754 0.972752 0.987927 0.984988 0.982901 0.982562 0.971577
+          0.968305 0.968305 0.96874 0.96876 0.968305 0.968794 0.968305 0.968783 0.968305 0.968729 0.968305 0.968698
+          0.970274 0.970659 0.971087 0.971205 0.970697 0.97024 0.9718 0.973613 0.974929 0.975954 0.974584 0.972262
+          0.971939 0.975684 0.977579 0.980179 0.978783 0.972766 0.972763 0.98795 0.985051 0.982932 0.982592 0.971585
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41
@@ -94,9 +94,9 @@
           0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41 0.41
         </DataArray>
         <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
-          298.15 298.15 297.919 297.908 298.15 297.89 298.15 297.895 298.15 297.924 298.15 297.941
-          297.081 296.864 296.621 296.553 296.843 297.099 296.208 295.116 294.281 293.607 294.507 295.937
-          296.126 293.784 292.473 290.52 291.602 295.636 295.638 295.299 290.745 288.19 288.493 296.334
+          298.15 298.15 297.918 297.907 298.15 297.889 298.15 297.895 298.15 297.923 298.15 297.94
+          297.078 296.861 296.617 296.549 296.839 297.096 296.204 295.111 294.274 293.596 294.497 295.93
+          296.123 293.778 292.467 290.504 291.583 295.629 295.632 295.301 290.77 288.161 288.465 296.329
         </DataArray>
         <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii">
           3 3 3 3 3 3 3 3 3 3 3 3
@@ -104,26 +104,26 @@
           3 3 3 3 3 3 3 2 2 3 3 3
         </DataArray>
         <DataArray type="Float32" Name="velocityW" NumberOfComponents="3" format="ascii">
-          -1.13827e-08 -9.38867e-07 0 -2.02936e-08 -9.43886e-07 0 3.67637e-10 -6.9645e-07 0 -4.89952e-09 -6.95475e-07 0
-          -3.32727e-08 -9.54168e-07 0 -1.1732e-08 -7.10208e-07 0 -3.44622e-08 -9.68821e-07 0 -1.22953e-08 -7.29101e-07 0
-          -2.19662e-08 -9.83091e-07 0 -8.49334e-09 -7.47566e-07 0 -1.23489e-08 -9.89044e-07 0 -5.69332e-09 -7.57778e-07 0
-          6.46854e-09 -2.94085e-07 0 -8.5928e-10 -2.75075e-07 0 -9.47256e-09 -2.95962e-07 0 -8.4042e-09 -3.25321e-07 0
-          -5.12068e-09 -3.49662e-07 0 -4.19098e-09 -3.6815e-07 0 1.89538e-08 -6.94712e-08 0 5.01846e-09 -1.6798e-08 0
-          -1.33765e-08 -2.99025e-08 0 -1.34456e-08 -8.18932e-08 0 -8.12791e-09 -1.10338e-07 0 -7.20068e-09 -1.39335e-07 0
-          3.98571e-08 1.01552e-08 0 1.89117e-08 8.65335e-08 0 -1.14392e-08 1.16956e-07 0 -1.79959e-08 6.05178e-08 0
-          -1.48476e-08 7.61521e-09 0 -1.4548e-08 -4.10402e-08 0 2.09619e-07 2.51157e-08 0 1.04809e-07 1.03575e-07 0
-          -3.39414e-09 1.68041e-07 0 -8.24859e-09 1.23561e-07 0 -1.44586e-08 4.8624e-08 0 -1.92083e-08 -1.31981e-08 0
+          -1.13936e-08 -9.38801e-07 0 -2.03144e-08 -9.43824e-07 0 3.70767e-10 -6.96352e-07 0 -4.90039e-09 -6.95368e-07 0
+          -3.33099e-08 -9.54116e-07 0 -1.17473e-08 -7.10098e-07 0 -3.45049e-08 -9.68792e-07 0 -1.23256e-08 -7.29014e-07 0
+          -2.19957e-08 -9.83089e-07 0 -8.51927e-09 -7.47523e-07 0 -1.23663e-08 -9.89055e-07 0 -5.71041e-09 -7.57759e-07 0
+          6.48033e-09 -2.93983e-07 0 -8.46653e-10 -2.74942e-07 0 -9.47308e-09 -2.95769e-07 0 -8.42668e-09 -3.25135e-07 0
+          -5.14267e-09 -3.49566e-07 0 -4.20451e-09 -3.68106e-07 0 1.8966e-08 -6.94289e-08 0 5.04845e-09 -1.67398e-08 0
+          -1.33377e-08 -2.96534e-08 0 -1.34701e-08 -8.15245e-08 0 -8.18202e-09 -1.10201e-07 0 -7.23028e-09 -1.39303e-07 0
+          3.98403e-08 1.01461e-08 0 1.89146e-08 8.64735e-08 0 -1.12928e-08 1.16854e-07 0 -1.79851e-08 6.1432e-08 0
+          -1.4993e-08 7.86857e-09 0 -1.45903e-08 -4.10441e-08 0 2.09467e-07 2.50872e-08 0 1.04733e-07 1.03455e-07 0
+          -3.21272e-09 1.67557e-07 0 -8.21842e-09 1.24879e-07 0 -1.46028e-08 4.89636e-08 0 -1.91941e-08 -1.32315e-08 0
         </DataArray>
         <DataArray type="Float32" Name="velocityN" NumberOfComponents="3" format="ascii">
-          1.39233e-07 6.47251e-07 0 2.4638e-07 7.19854e-07 0 5.75125e-05 -9.52283e-05 0 9.57313e-05 -6.36067e-05 0
-          3.88318e-07 8.84205e-07 0 0.00013264 -1.45967e-06 0 3.78512e-07 1.06416e-06 0 0.000122537 1.91172e-05 0
-          2.30399e-07 1.19748e-06 0 8.0125e-05 5.83971e-05 0 1.26884e-07 1.25052e-06 0 4.65057e-05 7.91642e-05 0
-          0.000138223 -0.000329088 0 0.000268815 -0.000246146 0 0.000254242 0.000119787 0 0.000208719 -4.34298e-05 0
-          0.000208455 0.000207451 0 0.000108549 0.000265968 0 7.57763e-05 -0.000522431 0 0.00062318 -0.000653991 0
-          0.000326743 0.000691165 0 0.000188181 -0.000491347 0 0.000475768 0.000521091 0 5.80777e-05 0.000417074 0
-          -0.000471595 -0.000435573 0 0.00112488 -0.00143926 0 0.000312129 0.00189921 0 2.83532e-05 -0.00151907 0
-          0.000886834 0.00113801 0 -0.000380138 0.000346331 0 -0.00119016 -0.000293355 0 0.00149089 -0.0019349 0
-          0.000224842 0.00265946 0 -0.000144805 -0.00217949 0 0.0012347 0.00153314 0 -0.000963249 0.000233374 0
+          1.39292e-07 6.47075e-07 0 2.46485e-07 7.19711e-07 0 5.75108e-05 -9.52247e-05 0 9.57284e-05 -6.36041e-05 0
+          3.88484e-07 8.84135e-07 0 0.000132635 -1.45774e-06 0 3.78674e-07 1.06417e-06 0 0.000122531 1.91178e-05 0
+          2.30499e-07 1.19756e-06 0 8.01198e-05 5.8394e-05 0 1.26939e-07 1.25062e-06 0 4.65025e-05 7.91591e-05 0
+          0.000138219 -0.000329075 0 0.000268809 -0.000246137 0 0.000254235 0.000119789 0 0.000208705 -4.34185e-05 0
+          0.000208438 0.000207438 0 0.000108539 0.000265948 0 7.57759e-05 -0.000522412 0 0.000623168 -0.000653973 0
+          0.000326746 0.00069115 0 0.000188165 -0.000491293 0 0.000475733 0.000521055 0 5.80685e-05 0.000417034 0