diff --git a/dumux/porousmediumflow/1pnc/volumevariables.hh b/dumux/porousmediumflow/1pnc/volumevariables.hh
index a098d5499eac056172fdf92bb452940cd4be6328..278d0142100a4ae02e4f3b1aa59fc681fbeb9073 100644
--- a/dumux/porousmediumflow/1pnc/volumevariables.hh
+++ b/dumux/porousmediumflow/1pnc/volumevariables.hh
@@ -69,8 +69,12 @@ public:
     using Indices = typename Traits::ModelTraits::Indices;
     //! export type of solid state
     using SolidState = typename Traits::SolidState;
+    //! export type of solid system
     using SolidSystem = typename Traits::SolidSystem;
 
+    //! return whether moles or masses are balanced
+    static constexpr bool useMoles() { return Traits::ModelTraits::useMoles(); }
+
     /*!
      * \brief Update all quantities for a given control volume
      *
@@ -142,13 +146,23 @@ public:
         fluidState.setPressure(0, priVars[pressureIdx]);
 
         // Set fluid state mole fractions
-        Scalar sumMoleFracNotMainComp = 0;
-        for (int compIdx = 1; compIdx < numFluidComps; ++compIdx)
+        if (useMoles())
+        {
+            Scalar sumMoleFracNotMainComp = 0;
+            for (int compIdx = 1; compIdx < numFluidComps; ++compIdx)
+            {
+                fluidState.setMoleFraction(0, compIdx, priVars[compIdx]);
+                sumMoleFracNotMainComp += priVars[compIdx];
+            }
+            fluidState.setMoleFraction(0, 0, 1.0 - sumMoleFracNotMainComp);
+        }
+        else
         {
-            fluidState.setMoleFraction(0, compIdx, priVars[compIdx]);
-            sumMoleFracNotMainComp += priVars[compIdx];
+            // for mass fractions we only have to set numComponents-1 mass fractions
+            // the fluid state will internally compute the remaining mass fraction
+            for (int compIdx = 1; compIdx < numFluidComps; ++compIdx)
+                fluidState.setMassFraction(0, compIdx, priVars[compIdx]);
         }
-        fluidState.setMoleFraction(0, 0, 1.0 - sumMoleFracNotMainComp);
 
         typename FluidSystem::ParameterCache paramCache;
         paramCache.updateAll(fluidState);
@@ -210,37 +224,37 @@ public:
     Scalar saturation(int phaseIdx = 0) const
     { return 1.0; }
 
-     /*!
-      * \brief Return mole fraction \f$\mathrm{[mol/mol]}\f$ of a component in the phase.
-      *
-      * \param phaseIdx the index of the fluid phase
-      * \param compIdx the index of the component
-      *
-      * \note the phase index passed to this function is for compatibility reasons
-      *       with multiphasic models.
-      */
-     Scalar moleFraction(int phaseIdx, int compIdx) const
-     {
-         // make sure this is only called with admissible indices
-         assert(compIdx < numFluidComps);
-         return fluidState_.moleFraction(0, compIdx);
-     }
-
-     /*!
-      * \brief Returns the mass fraction of a component in the phase
-      *
-      * \param phaseIdx the index of the fluid phase
-      * \param compIdx the index of the component
-      *
-      * \note the phase index passed to this function is for compatibility reasons
-      *       with multiphasic models.
-      */
-     Scalar massFraction(int phaseIdx, int compIdx) const
-     {
-         // make sure this is only called with admissible indices
-         assert(compIdx < numFluidComps);
-         return fluidState_.massFraction(0, compIdx);
-     }
+    /*!
+     * \brief Return mole fraction \f$\mathrm{[mol/mol]}\f$ of a component in the phase.
+     *
+     * \param phaseIdx the index of the fluid phase
+     * \param compIdx the index of the component
+     *
+     * \note the phase index passed to this function is for compatibility reasons
+     *       with multiphasic models.
+     */
+    Scalar moleFraction(int phaseIdx, int compIdx) const
+    {
+        // make sure this is only called with admissible indices
+        assert(compIdx < numFluidComps);
+        return fluidState_.moleFraction(0, compIdx);
+    }
+
+    /*!
+     * \brief Returns the mass fraction of a component in the phase
+     *
+     * \param phaseIdx the index of the fluid phase
+     * \param compIdx the index of the component
+     *
+     * \note the phase index passed to this function is for compatibility reasons
+     *       with multiphasic models.
+     */
+    Scalar massFraction(int phaseIdx, int compIdx) const
+    {
+        // make sure this is only called with admissible indices
+        assert(compIdx < numFluidComps);
+        return fluidState_.massFraction(0, compIdx);
+    }
 
     /*!
      * \brief Return the effective pressure \f$\mathrm{[Pa]}\f$ of a given phase within
@@ -318,16 +332,16 @@ public:
         return fluidState_.molarity(0, compIdx);
     }
 
-     /*!
-      * \brief Returns the mass fraction of a component in the phase
-      *
-      * \param compIdx the index of the component
-      */
-     Scalar massFraction(int compIdx) const
-     {
-         assert(compIdx < numFluidComps);
-         return this->fluidState_.massFraction(0, compIdx);
-     }
+    /*!
+     * \brief Returns the mass fraction of a component in the phase
+     *
+     * \param compIdx the index of the component
+     */
+    Scalar massFraction(int compIdx) const
+    {
+        assert(compIdx < numFluidComps);
+        return fluidState_.massFraction(0, compIdx);
+    }
 
     /*!
      * \brief Returns the permeability within the control volume in \f$[m^2]\f$.
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt
index ee8d570d6de2a2a003867d89737305c6c08212e8..8f0dd228f49327ff93e7058e4086b757e57a4a25 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag>
@@ -15,7 +15,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan params.input")
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_fickslaw
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS DIFFUSIONTYPE=FicksLaw<TypeTag>
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
index ef763e257c37e0ea7d0f784cfa07dff973cd1b2f..b5aba6a76e5c3b46a3b9fd3795beb0702ee16b6b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
@@ -1,15 +1,14 @@
 add_input_file_links()
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal
-              LABELS multidomain freeflow
-             SOURCES main.cc
-             CMAKE_GUARD HAVE_UMFPACK
-             COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-             CMD_ARGS       --script fuzzy
-                            --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-00020.vtu
-                                    ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-00020.vtu
-
-                            --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal params.input
-                            -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_horizontal")
+              LABELS multidomain freeflow 1pnc
+              SOURCES main.cc
+              CMAKE_GUARD HAVE_UMFPACK
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS  --script fuzzy
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-00020.vtu
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-00020.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal params.input
+                                    -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_horizontal")
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
index 1988ed7f9d957f42baa155743713f37993b23063..1574bd3746d79c2fbaacb8c307e3f91a1cf27b62 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
@@ -3,7 +3,7 @@ add_input_file_links()
 add_executable(test_md_boundary_darcy1p2c_stokes1p2c_vertical EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               TARGET test_md_boundary_darcy1p2c_stokes1p2c_vertical
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -17,7 +17,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion
                              -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion")
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               TARGET test_md_boundary_darcy1p2c_stokes1p2c_vertical
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt
index 4afa37814f57094079d504160dde35eae6737f97..f668fd1c3f16c11a43524a8ca7f79037759303e8 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_md_boundary_darcy1p3c_stokes1p3c_horizontal
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
index 89938290acec32bd5b3ec88ba99742376788a5b0..8e2e10b53cbe8ca2225687807e1f26f912b852f6 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
@@ -1,5 +1,5 @@
 dune_add_test(NAME test_md_embedded1d3d_1p2c_richards2c
-              LABELS multidomain
+              LABELS multidomain 1pnc
               SOURCES main.cc
               CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UG )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
index 8cc7894b3c1062234557d11c4e37c991fc529ac0..d24a7c42644611f121b459f3be20a9fd2fe81eea 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links()
 
 dune_add_test(NAME test_1p2c_transport_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2c_transport_box
 
 dune_add_test(NAME test_1p2c_transport_tpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -24,6 +26,7 @@ dune_add_test(NAME test_1p2c_transport_tpfa
 
 dune_add_test(NAME test_1p2c_transport_mpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
index 934b5e4c7d43a75c711750e9a3ebedda69287f92..d55b3f3ad60e3ccc1b382cdfacfde5a7e55282cb 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
@@ -3,9 +3,10 @@ add_input_file_links()
 # salt-water intrusion test using the box model
 dune_add_test(NAME test_1p2c_saltwaterintrusion_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=SaltWaterIntrusionTest
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/test_1p2c_saltwaterintrusion_box-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_saltwaterintrusion_box-00035.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_saltwaterintrusion_box-00033.vtu
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_saltwaterintrusion_box params.input -Problem.Name test_1p2c_saltwaterintrusion_box")
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
index a0f4cdcd59f23411dbad1286e2adbea303ada3d7..a115a67767f2a2ae455785ac8856efa0a179a0b6 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/problem.hh
@@ -154,7 +154,7 @@ public:
 
         // salt water is in contact on the right boundary
         if (globalPos[0] > this->fvGridGeometry().bBoxMax()[0] - eps_)
-            values[FluidSystem::NaClIdx] = 0.03;
+            values[FluidSystem::NaClIdx] = 0.035; // 3.5% salinity (sea water)
 
         return values;
     }
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
index 5c5ea113d7ac365319be0cf4b58730e726c3c9d3..e0ec87a6451cfe2b6db0a78a7a49ea4912011220 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links()
 # conduction
 dune_add_test(NAME test_1p2cni_conduction_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2cni_conduction_box
 
 dune_add_test(NAME test_1p2cni_conduction_tpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -24,6 +26,7 @@ dune_add_test(NAME test_1p2cni_conduction_tpfa
 
 dune_add_test(NAME test_1p2cni_conduction_mpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
index f9a915fb1a5726214e43aabe3232d3c1cfc866b2..59c631957f5eadcbce68a61073974f0854bb418d 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links()
 # convection
 dune_add_test(NAME test_1p2cni_convection_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2cni_convection_box
 
 dune_add_test(NAME test_1p2cni_convection_tpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -24,6 +26,7 @@ dune_add_test(NAME test_1p2cni_convection_tpfa
 
 dune_add_test(NAME test_1p2cni_convection_mpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
index 4ca17d93c0bb906553d8b79a201e05641b9e29b1..9e1955b1242d208a3b100f4beb1b65056a6cfba7 100644
--- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links()
 # conduction
 dune_add_test(NAME test_1p2c_nonequilibrium_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2c_nonequilibrium_box
 
 dune_add_test(NAME test_1p2c_nonequilibrium_tpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
index 0f9f73e76b25aa69c333206c545c203cae38bb92..73ddd44e9e0b30108594a5c38e0e2c71f9b4279a 100644
--- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links()
 
 dune_add_test(NAME test_1pncminni_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=ThermoChemBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/references/test_1p2c_saltwaterintrusion_box-reference.vtu b/test/references/test_1p2c_saltwaterintrusion_box-reference.vtu
index 232523ebf9eead9836fdcac0377674cf53a92635..0d6063d7a734cbe0ce862fbfd6c8286e671697fb 100644
--- a/test/references/test_1p2c_saltwaterintrusion_box-reference.vtu
+++ b/test/references/test_1p2c_saltwaterintrusion_box-reference.vtu
@@ -2,144 +2,144 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="100" NumberOfPoints="126">
-      <PointData Scalars="pressure" Vectors="velocity_liq (m/s)">
+      <PointData Scalars="p" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
-          590500 590285 492400 492299 590207 492235 590200 492207 590269 492202 590418 492216
-          590651 492253 590968 492318 591361 492418 591823 492559 592340 492748 592899 492988
-          593489 493284 594098 493636 594720 494046 595348 494504 595967 494988 596546 495423
-          596965 495582 596369 494686 590500 492400 394300 394261 394232 394210 394188 394161
-          394128 394088 394044 394000 393963 393940 393943 393981 394063 394197 394410 394754
-          395020 394887 394300 296200 296216 296225 296219 296198 296160 296103 296026 295927
-          295807 295665 295503 295321 295121 294908 294697 294523 294491 294846 295460 296200
-          198100 198186 198236 198248 198232 198192 198128 198038 197921 197773 197591 197370
-          197108 196799 196441 196029 195549 194971 194673 195828 198100 100000 100216 100289
-          100308 100294 100254 100189 100096 99974.3 99818.8 99625.4 99388.3 99100.9 98755 98339.4
-          97833.1 97203.1 96378.1 95093.2 94304.6 100000
+          590500 590280 492400 492296 590188 492227 590142 492189 590117 492169 590104 492158
+          590097 492153 590094 492150 590093 492149 590096 492151 590104 492157 590124 492167
+          590171 492185 590263 492215 590416 492264 590637 492344 590919 492466 591247 492634
+          591603 492812 591869 492810 590500 492400 394300 394265 394241 394226 394218 394213
+          394210 394209 394208 394208 394209 394210 394209 394206 394200 394195 394203 394245
+          394337 394376 394300 296200 296227 296248 296261 296267 296270 296271 296271 296270
+          296268 296265 296258 296245 296222 296185 296129 296056 295978 295954 296058 296200
+          198100 198201 198269 198306 198324 198334 198338 198339 198338 198334 198328 198316
+          198295 198261 198207 198123 198000 197825 197620 197679 198100 100000 100233 100325
+          100371 100394 100406 100411 100413 100412 100408 100400 100387 100363 100326 100265
+          100171 100027 99801.1 99384.9 98748.7 100000
         </DataArray>
         <DataArray type="Float32" Name="rho" NumberOfComponents="1" format="ascii">
-          998.415 998.415 998.37 998.37 998.415 998.37 998.77 998.431 999.963 998.711 1002.07 999.319
-          1005.05 1000.36 1008.66 1001.92 1012.57 1004.06 1016.45 1006.76 1020.04 1009.94 1023.17 1013.41
-          1025.77 1016.89 1027.82 1020.11 1029.41 1022.91 1030.64 1025.29 1031.71 1027.37 1033.13 1029.74
-          1036.83 1037.78 1053.37 1056.01 1062.69 1062.64 998.325 998.325 998.325 998.34 998.409 998.571
-          998.88 999.396 1000.17 1001.28 1002.75 1004.68 1007.18 1010.41 1014.47 1019.11 1023.83 1027.21
-          1038.49 1059.75 1062.6 998.281 998.281 998.281 998.285 998.3 998.338 998.416 998.561 998.801
-          999.174 999.727 1000.53 1001.66 1003.19 1005.16 1007.65 1010.56 1021.69 1038.7 1060.59 1062.55
-          998.236 998.236 998.236 998.237 998.239 998.245 998.259 998.286 998.338 998.427 998.573 998.807
-          999.166 999.695 1000.47 1001.67 1003.53 1004.97 1031.51 1060.27 1062.51 998.191 998.191 998.191
-          998.191 998.191 998.192 998.194 998.197 998.205 998.22 998.247 998.296 998.378 998.515 998.749
-          999.171 999.996 1001.16 1001.19 1058.2 1062.47
+          998.415 998.415 998.37 998.37 998.415 998.37 998.415 998.37 998.415 998.37 998.415 998.37
+          998.415 998.37 998.415 998.37 998.415 998.37 998.415 998.37 998.423 998.371 998.496 998.385
+          998.823 998.47 999.649 998.763 1001.05 999.419 1002.86 1000.49 1004.88 1001.86 1006.93 1003.34
+          1008.98 1004.94 1014.78 1015.43 1022.35 1022.31 998.325 998.325 998.325 998.325 998.325 998.325
+          998.325 998.325 998.325 998.325 998.326 998.327 998.343 998.421 998.651 999.146 1000.07 1001.75
+          1004.47 1016.08 1022.26 998.281 998.281 998.281 998.281 998.281 998.281 998.281 998.281 998.281
+          998.281 998.281 998.281 998.283 998.3 998.367 998.547 998.949 999.587 1003.96 1016.56 1022.22
+          998.236 998.236 998.236 998.236 998.236 998.236 998.236 998.236 998.236 998.236 998.236 998.236
+          998.236 998.239 998.252 998.3 998.44 998.722 1000.49 1016.31 1022.17 998.191 998.191 998.191
+          998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.193
+          998.203 998.241 998.371 998.84 1014.38 1022.13
         </DataArray>
         <DataArray type="Float32" Name="mu" NumberOfComponents="1" format="ascii">
-          0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.00098427 0.000981637 0.000992116 0.00098416 0.00100318 0.000988447
-          0.00101646 0.000994607 0.0010305 0.00100268 0.00104409 0.00101245 0.00105643 0.00102352 0.00106707 0.00103529 0.00107588 0.001047
-          0.00108291 0.0010579 0.00108835 0.0010674 0.00109246 0.00107528 0.00109562 0.00108175 0.00109837 0.00108728 0.00110197 0.00109344
-          0.00111121 0.00111366 0.00115229 0.0011592 0.0011768 0.0011768 0.000980804 0.000980804 0.000980804 0.000981072 0.000981887 0.000983382
-          0.000985767 0.000989222 0.000993834 0.000999725 0.00100682 0.00101529 0.00102531 0.00103707 0.00105055 0.00106464 0.00107792 0.00108697
-          0.00111554 0.00116914 0.0011768 0.000980804 0.000980804 0.000980804 0.000980896 0.00098114 0.0009816 0.000982397 0.000983666 0.000985521
-          0.000988087 0.000991523 0.000996038 0.00100184 0.00100903 0.00101748 0.00102727 0.00103777 0.00107214 0.00111617 0.0011715 0.0011768
-          0.000980804 0.000980804 0.000980806 0.000980831 0.000980888 0.000980992 0.000981187 0.000981527 0.000982074 0.000982906 0.000984133 0.000985892
-          0.00098833 0.0009916 0.000995949 0.00100211 0.00101073 0.00101686 0.00109832 0.00117076 0.0011768 0.000980804 0.000980804 0.000980805
-          0.00098081 0.000980821 0.000980839 0.000980875 0.000980943 0.000981064 0.000981267 0.000981594 0.000982105 0.000982877 0.000984026 0.000985795
-          0.000988654 0.000993602 0.000999832 0.000999968 0.00116538 0.0011768
+          0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804
+          0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980817 0.000980806 0.000980967 0.000980837 0.000981852 0.000981069
+          0.000984678 0.000982046 0.000990241 0.000984561 0.000998068 0.000989083 0.00100693 0.000995351 0.00101574 0.00100241 0.00102399 0.00100929
+          0.00103167 0.00101618 0.00105126 0.00105343 0.00107361 0.00107361 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804
+          0.000980804 0.000980804 0.000980804 0.000980804 0.000980808 0.000980852 0.000981114 0.000982007 0.000984035 0.000987603 0.000993261 0.00100208
+          0.00101442 0.00105556 0.00107361 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804
+          0.000980804 0.000980804 0.000980812 0.000980871 0.000981141 0.000981908 0.000983553 0.00098657 0.000990682 0.00101243 0.00105717 0.00107361
+          0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980805
+          0.000980815 0.000980874 0.000981091 0.000981676 0.000983026 0.000985266 0.000996082 0.00105654 0.00107361 0.000980804 0.000980804 0.000980804
+          0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980804 0.000980805 0.000980815 0.000980862
+          0.000981025 0.000981523 0.000982809 0.000986441 0.00105069 0.00107361
         </DataArray>
         <DataArray type="Float32" Name="delp" NumberOfComponents="1" format="ascii">
-          490500 490285 392400 392299 490207 392235 490200 392207 490269 392202 490418 392216
-          490651 392253 490968 392318 491361 392418 491823 392559 492340 392748 492899 392988
-          493489 393284 494098 393636 494720 394046 495348 394504 495967 394988 496546 395423
-          496965 395582 496369 394686 490500 392400 294300 294261 294232 294210 294188 294161
-          294128 294088 294044 294000 293963 293940 293943 293981 294063 294197 294410 294754
-          295020 294887 294300 196200 196216 196225 196219 196198 196160 196103 196026 195927
-          195807 195665 195503 195321 195121 194908 194697 194523 194491 194846 195460 196200
-          98100 98186.2 98236.4 98248.1 98231.9 98191.8 98127.9 98038.5 97921 97772.8 97590.5 97370.4
-          97108 96799.2 96440.7 96028.8 95548.6 94970.6 94672.6 95827.8 98100 0 216.437 288.781
-          308.084 294.356 254.183 188.678 96.3219 -25.7275 -181.171 -374.606 -611.69 -899.142 -1244.97 -1660.62
-          -2166.87 -2796.87 -3621.87 -4906.8 -5695.4 0
+          490500 490280 392400 392296 490188 392227 490142 392189 490117 392169 490104 392158
+          490097 392153 490094 392150 490093 392149 490096 392151 490104 392157 490124 392167
+          490171 392185 490263 392215 490416 392264 490637 392344 490919 392466 491247 392634
+          491603 392812 491869 392810 490500 392400 294300 294265 294241 294226 294218 294213
+          294210 294209 294208 294208 294209 294210 294209 294206 294200 294195 294203 294245
+          294337 294376 294300 196200 196227 196248 196261 196267 196270 196271 196271 196270
+          196268 196265 196258 196245 196222 196185 196129 196056 195978 195954 196058 196200
+          98100 98201.2 98269.5 98305.6 98324.3 98333.6 98337.7 98338.8 98337.7 98334.3 98327.7 98315.8
+          98295.4 98261.2 98206.6 98122.8 97999.8 97824.6 97619.5 97678.6 98100 0 233.013 325.135
+          370.928 394.293 405.962 411.282 412.861 411.735 407.855 400.189 386.579 363.463 325.498 265.06
+          171.289 27.4563 -198.938 -615.137 -1251.29 0
         </DataArray>
-        <DataArray type="Float32" Name="x^H2O_Brine" NumberOfComponents="1" format="ascii">
-          1 1 1 1 1 1 0.999837 0.999972 0.999289 0.999843 0.99832 0.999564
-          0.996948 0.999087 0.995283 0.998368 0.993478 0.997384 0.991682 0.996136 0.990016 0.994668 0.988562 0.993068
-          0.987356 0.991458 0.986399 0.989963 0.985661 0.988663 0.985088 0.987558 0.984586 0.986588 0.983922 0.985484
-          0.982192 0.981728 0.974418 0.973145 0.97 0.97 1 1 1 0.999993 0.999961 0.999887
-          0.999745 0.999508 0.999151 0.998642 0.997965 0.997077 0.995923 0.994433 0.992556 0.990405 0.988216 0.986643
-          0.981372 0.971351 0.97 1 1 1 0.999998 0.999991 0.999974 0.999938 0.999871 0.999761
-          0.999589 0.999335 0.998967 0.998447 0.997741 0.996834 0.995685 0.994341 0.989188 0.981253 0.970931 0.97
-          1 1 1 1 0.999998 0.999996 0.999989 0.999977 0.999953 0.999912 0.999845 0.999737
-          0.999572 0.999329 0.998974 0.998422 0.997565 0.996902 0.984595 0.971063 0.97 1 1 1
-          1 1 0.999999 0.999999 0.999997 0.999993 0.999987 0.999974 0.999952 0.999914 0.999851 0.999743
-          0.999549 0.99917 0.998632 0.99862 0.972024 0.97
+        <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 0.999996 0.999999 0.999963 0.999993
+          0.999813 0.999954 0.999433 0.99982 0.99879 0.999518 0.997954 0.999025 0.997027 0.998393 0.99608 0.997714
+          0.995135 0.996979 0.992453 0.992132 0.988943 0.988943 1 1 1 1 1 1
+          1 1 1 1 1 0.999999 0.999992 0.999956 0.99985 0.999623 0.999197 0.998424
+          0.997172 0.991812 0.988943 1 1 1 1 1 1 1 1 1
+          1 1 1 0.999999 0.999991 0.99996 0.999878 0.999693 0.999399 0.997386 0.991569 0.988943
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 0.999999 0.999993 0.99997 0.999906 0.999777 0.998963 0.991664 0.988943 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 0.999999
+          0.999995 0.999977 0.999917 0.999701 0.992536 0.988943
         </DataArray>
-        <DataArray type="Float32" Name="x^NaCl_Brine" NumberOfComponents="1" format="ascii">
-          0 1.23038e-16 0 1.25424e-16 1.44703e-10 9.7583e-11 0.000163246 2.78637e-05 0.000711444 0.000156837 0.00167959 0.000436138
-          0.0030524 0.000912874 0.00471708 0.00163164 0.00652198 0.00261643 0.0083182 0.00386361 0.00998376 0.00533152 0.0114382 0.00693182
-          0.0126439 0.00854176 0.0136008 0.0100366 0.0143387 0.0113371 0.0149121 0.0124424 0.015414 0.0134121 0.0160783 0.0145161
-          0.0178083 0.0182716 0.0255822 0.0268545 0.03 0.03 0 1.01531e-16 4.135e-11 6.8197e-06 3.85549e-05 0.00011307
-          0.000254897 0.000491869 0.000849285 0.00135803 0.00203526 0.00292306 0.00407734 0.00556658 0.00744436 0.00959452 0.0117842 0.0133567
-          0.0186279 0.0286486 0.03 0 6.06804e-13 1.77139e-11 1.81266e-06 9.04556e-06 2.63165e-05 6.22498e-05 0.000128721 0.000239279
-          0.000410718 0.000665066 0.00103334 0.00155326 0.00225895 0.00316604 0.00431548 0.00565921 0.0108122 0.0187471 0.0290689 0.03
-          0 2.82482e-09 1.81409e-08 3.93417e-07 1.61257e-06 4.39747e-06 1.06263e-05 2.33725e-05 4.70045e-05 8.78081e-05 0.000155288 0.000262911
-          0.000427838 0.000671106 0.00102576 0.00157834 0.00243458 0.00309756 0.0154047 0.0289371 0.03 0 2.81504e-09 9.31256e-09
-          6.70071e-08 2.18654e-07 5.41553e-07 1.30858e-06 3.02933e-06 6.57872e-06 1.34302e-05 2.60733e-05 4.84203e-05 8.62638e-05 0.000149084 0.000256678
-          0.000450905 0.000830349 0.00136774 0.00138014 0.0279759 0.03
+        <DataArray type="Float32" Name="x^NaCl_liq" NumberOfComponents="1" format="ascii">
+          0 3.50325e-44 0 1.47043e-39 3.95867e-42 6.83379e-38 2.12137e-38 5.47337e-36 1.30503e-32 1.21748e-32 7.81107e-27 6.14831e-27
+          4.62113e-21 3.23784e-21 2.90651e-15 1.58245e-15 2.55165e-09 2.11751e-10 1.63673e-07 1.76732e-08 3.68961e-06 5.08019e-07 3.70325e-05 6.73723e-06
+          0.000187426 4.57072e-05 0.000567289 0.00018041 0.00120963 0.000481808 0.00204618 0.000975108 0.00297342 0.00160697 0.00391965 0.00228589
+          0.00486486 0.00302106 0.00754748 0.00786779 0.0110566 0.0110566 0 2.18534e-34 5.06184e-33 1.84654e-31 1.26949e-29 5.24168e-27
+          1.05735e-21 1.49083e-16 5.90715e-12 8.15565e-10 3.85573e-08 8.12715e-07 8.17965e-06 4.39307e-05 0.000149628 0.000376991 0.000802674 0.00157572
+          0.00282809 0.00818764 0.0110566 0 4.73893e-29 6.44667e-28 1.24675e-26 4.05964e-25 2.61015e-23 4.56597e-21 7.04024e-18 1.58166e-13
+          3.12475e-11 2.4039e-09 8.1721e-08 1.23072e-06 9.04625e-06 3.94899e-05 0.000122443 0.000307101 0.000600568 0.00261428 0.00843106 0.0110566
+          0 4.20055e-27 2.09455e-26 1.50263e-25 1.73513e-24 3.58853e-23 1.54184e-21 2.31176e-19 3.35141e-15 9.09194e-13 1.08751e-10 5.73654e-09
+          1.26968e-07 1.28846e-06 7.42083e-06 2.9485e-05 9.4046e-05 0.000223371 0.00103714 0.00833577 0.0110566 0 4.39966e-27 1.29275e-26
+          5.32498e-26 3.49023e-25 4.05997e-24 9.64813e-23 7.22098e-21 5.43655e-17 1.97277e-14 3.59236e-12 2.8968e-10 9.36687e-09 1.31968e-07 1.02086e-06
+          5.37797e-06 2.32024e-05 8.27692e-05 0.000298609 0.00746363 0.0110566
         </DataArray>
-        <DataArray type="Float32" Name="X^H2O_Brine" NumberOfComponents="1" format="ascii">
-          1 1 1 1 1 1 0.999471 0.99991 0.997696 0.999491 0.994572 0.998587
-          0.990165 0.997045 0.984858 0.994726 0.979147 0.991562 0.97351 0.987574 0.968322 0.982909 0.963822 0.977857
-          0.960114 0.972811 0.957185 0.968158 0.954934 0.964134 0.95319 0.960732 0.951668 0.957761 0.949657 0.954394
-          0.944448 0.94306 0.921515 0.917833 0.908816 0.908816 1 1 1 0.999978 0.999875 0.999633
-          0.999174 0.998406 0.99725 0.995608 0.993427 0.990579 0.986893 0.982164 0.976247 0.969531 0.962756 0.957931
-          0.941994 0.912675 0.908816 1 1 1 0.999994 0.999971 0.999915 0.999798 0.999583 0.999224
-          0.998669 0.997846 0.996656 0.994979 0.992709 0.989802 0.986134 0.981871 0.965755 0.941638 0.911473 0.908816
-          1 1 1 0.999999 0.999995 0.999986 0.999966 0.999924 0.999848 0.999715 0.999496 0.999148
-          0.998613 0.997826 0.99668 0.994898 0.992145 0.990021 0.951696 0.91185 0.908816 1 1 1
-          1 0.999999 0.999998 0.999996 0.99999 0.999979 0.999956 0.999915 0.999843 0.99972 0.999517 0.999168
-          0.998539 0.997311 0.995577 0.995537 0.914605 0.908816
+        <DataArray type="Float32" Name="X^H2O_liq" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 0.999999 1 0.999988 0.999998 0.99988 0.999978
+          0.999392 0.999852 0.998162 0.999415 0.996086 0.998439 0.993392 0.996844 0.990418 0.994806 0.987395 0.992622
+          0.984388 0.990265 0.975923 0.974919 0.965 0.965 1 1 1 1 1 1
+          1 1 1 1 1 0.999997 0.999973 0.999857 0.999515 0.998778 0.997401 0.994906
+          0.990883 0.973918 0.965 1 1 1 1 1 1 1 1 1
+          1 1 1 0.999996 0.999971 0.999872 0.999603 0.999004 0.998054 0.991569 0.973157 0.965
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 0.999996 0.999976 0.999904 0.999695 0.999276 0.996643 0.973455 0.965 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 0.999997
+          0.999983 0.999925 0.999732 0.999032 0.976186 0.965
         </DataArray>
-        <DataArray type="Float32" Name="X^NaCl_Brine" NumberOfComponents="1" format="ascii">
-          0 3.99145e-16 0 4.06886e-16 4.69427e-10 3.16568e-10 0.000529391 9.03866e-05 0.00230431 0.000508614 0.00542828 0.00141348
-          0.00983488 0.00295539 0.0151423 0.00527386 0.0208527 0.00843838 0.0264905 0.0124262 0.0316784 0.0170914 0.0361777 0.022143
-          0.0398863 0.027189 0.0428155 0.0318425 0.0450659 0.035866 0.0468097 0.0392679 0.0483325 0.0422387 0.0503429 0.0456059
-          0.0555517 0.0569401 0.0784851 0.0821668 0.0911839 0.0911839 0 3.29376e-16 1.34143e-10 2.21234e-05 0.000125065 0.000366716
-          0.000826436 0.00159391 0.00274991 0.00439219 0.00657253 0.00942085 0.0131073 0.0178357 0.0237533 0.0304694 0.0372441 0.0420692
-          0.0580057 0.0873246 0.0911839 0 1.96852e-12 5.74654e-11 5.88041e-06 2.9344e-05 8.53678e-05 0.000201916 0.000417461 0.000775824
-          0.00133118 0.00215432 0.00334448 0.00502141 0.00729127 0.0101984 0.0138655 0.0181287 0.0342447 0.0583621 0.088527 0.0911839
-          0 9.16396e-09 5.88507e-08 1.27628e-06 5.23129e-06 1.42656e-05 3.44719e-05 7.58186e-05 0.000152471 0.000284801 0.000503593 0.000852404
-          0.00138661 0.00217385 0.00332002 0.00510221 0.00785508 0.00997939 0.0483044 0.0881501 0.0911839 0 9.13224e-09 3.02107e-08
-          2.17377e-07 7.09331e-07 1.75684e-06 4.24513e-06 9.82734e-06 2.13416e-05 4.35676e-05 8.4579e-05 0.000157063 0.000279793 0.00048348 0.000832206
-          0.0014613 0.00268871 0.00442348 0.00446347 0.0853952 0.0911839
+        <DataArray type="Float32" Name="X^NaCl_liq" NumberOfComponents="1" format="ascii">
+          0 1.13505e-43 0 4.77021e-39 1.28415e-41 2.21694e-37 6.88192e-38 1.77561e-35 4.23362e-32 3.9496e-32 2.53398e-26 1.99457e-26
+          1.49913e-20 1.05038e-20 9.42898e-15 5.13361e-15 8.27776e-09 6.86939e-10 5.3097e-07 5.73334e-08 1.19693e-05 1.64806e-06 0.000120127 2.18558e-05
+          0.000607772 0.000148263 0.001838 0.000585029 0.00391351 0.00156134 0.00660764 0.00315643 0.00958208 0.00519441 0.0126048 0.00737777
+          0.0156116 0.00973459 0.0240769 0.0250809 0.035 0.035 0 7.08942e-34 1.64211e-32 5.99035e-31 4.11834e-29 1.70045e-26
+          3.43012e-21 4.83638e-16 1.91633e-11 2.64576e-09 1.25083e-07 2.63651e-06 2.6535e-05 0.000142501 0.000485245 0.00122196 0.00259926 0.00509376
+          0.00911672 0.0260822 0.035 0 1.53735e-28 2.09136e-27 4.04456e-26 1.31698e-24 8.46756e-23 1.48124e-20 2.28391e-17 5.13103e-13
+          1.01369e-10 7.79847e-09 2.6511e-07 3.99255e-06 2.93462e-05 0.000128097 0.000397106 0.000995577 0.00194567 0.00843149 0.0268432 0.035
+          0 1.36269e-26 6.7949e-26 4.87465e-25 5.62891e-24 1.16415e-22 5.00187e-21 7.49956e-19 1.08723e-14 2.9495e-12 3.52797e-10 1.86098e-08
+          4.11897e-07 4.17988e-06 2.40734e-05 9.56455e-05 0.000305029 0.000724271 0.00335675 0.0265454 0.035 0 1.42729e-26 4.1938e-26
+          1.72747e-25 1.13226e-24 1.31709e-23 3.12994e-22 2.34255e-20 1.76366e-16 6.39983e-14 1.16539e-11 9.39747e-10 3.03869e-08 4.28116e-07 3.31174e-06
+          1.74464e-05 7.52666e-05 0.00026846 0.000968063 0.0238138 0.035
         </DataArray>
         <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
-          1.90517e-06 1.31733e-06 0 1.3318e-06 5.73367e-07 0 1.09948e-06 1.40499e-06 0 8.61489e-07 8.11376e-07 0
-          4.38221e-07 3.20212e-07 0 4.35845e-07 5.07866e-07 0 -1.93381e-07 3.1139e-07 0 1.14063e-07 4.45532e-07 0
-          -8.27179e-07 3.22407e-07 0 -1.42296e-07 4.44639e-07 0 -1.4806e-06 3.31012e-07 0 -3.95628e-07 4.62127e-07 0
-          -2.13601e-06 3.24384e-07 0 -6.77492e-07 4.75147e-07 0 -2.76339e-06 3.0298e-07 0 -9.99844e-07 4.74578e-07 0
-          -3.33797e-06 2.71569e-07 0 -1.35999e-06 4.60125e-07 0 -3.84273e-06 2.33156e-07 0 -1.74793e-06 4.32533e-07 0
-          -4.26789e-06 1.91964e-07 0 -2.15509e-06 3.99742e-07 0 -4.61296e-06 1.53075e-07 0 -2.57818e-06 3.68367e-07 0
-          -4.88802e-06 1.21961e-07 0 -3.01503e-06 3.435e-07 0 -5.10875e-06 9.87616e-08 0 -3.45582e-06 3.17995e-07 0
-          -5.27571e-06 6.81912e-08 0 -3.86656e-06 2.59683e-07 0 -5.33537e-06 -8.53964e-09 0 -4.17581e-06 1.09202e-07 0
-          -5.126e-06 -2.00849e-07 0 -4.16399e-06 -3.30428e-07 0 -4.05517e-06 -8.70044e-07 0 -2.93941e-06 -1.96515e-06 0
-          1.42515e-06 -4.61054e-06 0 2.50472e-06 -8.95995e-06 0 2.45981e-05 -1.85637e-05 0 1.43032e-05 -2.60141e-05 0
-          4.31608e-05 -4.29635e-05 0 2.17527e-05 -4.52844e-05 0 4.04782e-07 1.52496e-06 0 3.49948e-07 1.10424e-06 0
-          2.53485e-07 7.37166e-07 0 2.0606e-07 5.85482e-07 0 2.16481e-07 5.50667e-07 0 2.56259e-07 5.69693e-07 0
-          2.9955e-07 6.06195e-07 0 3.26075e-07 6.39393e-07 0 3.19201e-07 6.62366e-07 0 2.64155e-07 6.73295e-07 0
-          1.46639e-07 6.83672e-07 0 -4.39274e-08 6.98091e-07 0 -3.08055e-07 7.14746e-07 0 -6.3572e-07 7.15192e-07 0
-          -1.02419e-06 6.61682e-07 0 -1.54094e-06 5.33181e-07 0 -2.34037e-06 3.31729e-08 0 -2.59963e-06 -3.29431e-06 0
-          -5.72773e-07 -1.51027e-05 0 3.32061e-06 -3.55659e-05 0 5.42106e-06 -4.82239e-05 0 -1.84477e-07 1.56061e-06 0
-          -1.37289e-07 1.11194e-06 0 -1.68466e-08 7.05573e-07 0 1.33522e-07 5.1419e-07 0 2.93138e-07 4.51973e-07 0
-          4.6627e-07 4.55527e-07 0 6.55046e-07 4.88348e-07 0 8.55453e-07 5.30362e-07 0 1.05973e-06 5.74055e-07 0
-          1.25806e-06 6.18374e-07 0 1.44325e-06 6.70972e-07 0 1.61278e-06 7.31877e-07 0 1.76397e-06 7.93946e-07 0
-          1.8818e-06 8.4586e-07 0 1.91242e-06 8.88896e-07 0 1.74375e-06 9.91398e-07 0 1.05699e-06 1.06113e-06 0
-          -9.13944e-07 -2.09237e-06 0 -3.6835e-06 -1.55633e-05 0 -5.76258e-06 -3.69223e-05 0 -6.50825e-06 -4.86393e-05 0
-          -9.55343e-07 1.50948e-06 0 -7.21251e-07 8.30707e-07 0 -2.96956e-07 4.42149e-07 0 3.08816e-08 2.99463e-07 0
-          2.87484e-07 2.50525e-07 0 5.25339e-07 2.46028e-07 0 7.71773e-07 2.62679e-07 0 1.03881e-06 2.88637e-07 0
-          1.33091e-06 3.19453e-07 0 1.65038e-06 3.55222e-07 0 2.001e-06 3.98374e-07 0 2.38768e-06 4.48326e-07 0
-          2.81202e-06 5.02039e-07 0 3.2691e-06 5.62913e-07 0 3.75328e-06 6.5711e-07 0 4.29915e-06 8.46047e-07 0
-          4.97252e-06 1.21992e-06 0 4.34482e-06 3.47348e-07 0 -1.93617e-06 -8.95462e-06 0 -1.42653e-05 -2.9126e-05 0
-          -2.13171e-05 -4.62883e-05 0 -1.87466e-06 1.45501e-06 0 -1.27799e-06 5.96638e-07 0 -4.29354e-07 2.51962e-07 0
-          -1.5537e-08 1.61836e-07 0 2.7788e-07 1.31568e-07 0 5.36606e-07 1.27147e-07 0 7.98908e-07 1.35143e-07 0
-          1.08322e-06 1.4916e-07 0 1.39924e-06 1.66847e-07 0 1.75448e-06 1.88376e-07 0 2.15751e-06 2.14629e-07 0
-          2.61758e-06 2.45419e-07 0 3.14366e-06 2.80641e-07 0 3.75159e-06 3.27262e-07 0 4.4875e-06 4.08617e-07 0
-          5.44488e-06 5.48714e-07 0 6.83759e-06 8.43932e-07 0 9.03267e-06 1.35106e-06 0 6.70511e-06 -3.67869e-06 0
-          -1.90494e-05 -2.20747e-05 0 -4.11251e-05 -4.41406e-05 0
+          1.95007e-06 1.31006e-06 0 1.41186e-06 5.38212e-07 0 1.11801e-06 1.39317e-06 0 8.97607e-07 7.58631e-07 0
+          6.63533e-07 2.10112e-07 0 5.21524e-07 3.65793e-07 0 3.47337e-07 1.06085e-07 0 2.81263e-07 1.90671e-07 0
+          1.8509e-07 5.61618e-08 0 1.51302e-07 1.01541e-07 0 9.82302e-08 3.06981e-08 0 8.10827e-08 5.55402e-08 0
+          4.92985e-08 1.82335e-08 0 4.15123e-08 3.2963e-08 0 1.75098e-08 1.35552e-08 0 1.59378e-08 2.44008e-08 0
+          -1.11195e-08 1.50742e-08 0 -6.47591e-09 2.66429e-08 0 -5.13275e-08 2.51339e-08 0 -3.49655e-08 4.20556e-08 0
+          -1.28957e-07 5.24957e-08 0 -7.94331e-08 8.00432e-08 0 -2.90006e-07 1.08553e-07 0 -1.5156e-07 1.53136e-07 0
+          -5.84646e-07 1.86087e-07 0 -2.67809e-07 2.5776e-07 0 -1.02388e-06 2.53147e-07 0 -4.50376e-07 3.64051e-07 0
+          -1.56023e-06 2.83198e-07 0 -7.17765e-07 4.39695e-07 0 -2.11414e-06 2.70711e-07 0 -1.0733e-06 4.69756e-07 0
+          -2.59666e-06 2.11804e-07 0 -1.48787e-06 4.27346e-07 0 -2.91535e-06 1.06875e-07 0 -1.78425e-06 1.87714e-07 0
+          -2.45564e-06 -5.66623e-07 0 -1.1068e-06 -1.32496e-06 0 4.42498e-06 -6.31432e-06 0 2.14198e-06 -8.80508e-06 0
+          1.0739e-05 -1.65206e-05 0 4.63248e-06 -1.73059e-05 0 3.6237e-07 1.50857e-06 0 3.0634e-07 1.0351e-06 0
+          1.97595e-07 5.742e-07 0 1.12735e-07 3.07409e-07 0 6.31391e-08 1.64375e-07 0 3.61631e-08 8.99083e-08 0
+          2.10485e-08 5.3284e-08 0 1.15073e-08 3.91981e-08 0 3.89532e-09 4.18737e-08 0 -3.49978e-09 6.27127e-08 0
+          -9.38326e-09 1.09743e-07 0 -8.09239e-09 1.94283e-07 0 5.85983e-09 3.18928e-07 0 2.49863e-08 4.66351e-07 0
+          1.96737e-08 6.10132e-07 0 -5.81479e-08 7.32711e-07 0 -2.73469e-07 7.94329e-07 0 -6.47562e-07 4.91224e-07 0
+          -6.3395e-07 -2.31963e-06 0 2.2878e-07 -1.19226e-05 0 8.55232e-07 -1.82766e-05 0 -2.89957e-07 1.54676e-06 0
+          -2.53713e-07 1.05493e-06 0 -1.7081e-07 5.80283e-07 0 -9.35958e-08 3.0901e-07 0 -4.599e-08 1.64785e-07 0
+          -1.94994e-08 8.99943e-08 0 -4.40775e-09 5.32273e-08 0 5.51153e-09 3.88808e-08 0 1.46631e-08 4.06551e-08 0
+          2.75871e-08 5.84071e-08 0 5.09965e-08 9.65301e-08 0 9.53279e-08 1.61887e-07 0 1.73342e-07 2.59381e-07 0
+          2.93291e-07 3.86859e-07 0 4.5023e-07 5.38046e-07 0 6.20801e-07 7.12108e-07 0 7.33961e-07 9.1716e-07 0
+          5.4138e-07 9.35122e-07 0 -2.67039e-07 -1.96882e-06 0 -1.12291e-06 -1.22809e-05 0 -1.39158e-06 -1.83868e-05 0
+          -1.10486e-06 1.50186e-06 0 -8.85761e-07 7.99639e-07 0 -5.08869e-07 3.75858e-07 0 -2.65875e-07 1.93267e-07 0
+          -1.35137e-07 1.02205e-07 0 -6.47203e-08 5.56792e-08 0 -2.51342e-08 3.28712e-08 0 3.03528e-10 2.38841e-08 0
+          2.21954e-08 2.46119e-08 0 4.9238e-08 3.4488e-08 0 9.09974e-08 5.52874e-08 0 1.59679e-07 9.01281e-08 0
+          2.70567e-07 1.42257e-07 0 4.40628e-07 2.14002e-07 0 6.86385e-07 3.08248e-07 0 1.02331e-06 4.34471e-07 0
+          1.47001e-06 6.35004e-07 0 1.92134e-06 9.58611e-07 0 1.18102e-06 -4.43578e-07 0 -2.16124e-06 -9.60854e-06 0
+          -4.56541e-06 -1.75314e-05 0 -2.03971e-06 1.45105e-06 0 -1.45912e-06 5.80565e-07 0 -6.60441e-07 2.18075e-07 0
+          -3.34278e-07 1.08073e-07 0 -1.69528e-07 5.6669e-08 0 -8.20513e-08 3.0804e-08 0 -3.3082e-08 1.8163e-08 0
+          -1.76126e-09 1.31563e-08 0 2.48456e-08 1.34494e-08 0 5.69063e-08 1.86098e-08 0 1.04928e-07 2.94092e-08 0
+          1.81669e-07 4.73292e-08 0 3.0318e-07 7.41757e-08 0 4.89398e-07 1.12034e-07 0 7.6592e-07 1.64476e-07 0
+          1.17176e-06 2.41346e-07 0 1.79459e-06 3.81457e-07 0 2.93697e-06 7.60874e-07 0 4.19242e-06 4.94504e-07 0
+          -2.51777e-06 -7.20456e-06 0 -9.72249e-06 -1.6751e-05 0
         </DataArray>
       </PointData>
       <CellData Scalars="process rank">