diff --git a/dumux/material/fluidstates/compositional.hh b/dumux/material/fluidstates/compositional.hh
index fd74eb89100ce1f4d13e686c08bfaf9ce099d01f..1ac12f3fdd564f68e4a972265f898235944a9b2c 100644
--- a/dumux/material/fluidstates/compositional.hh
+++ b/dumux/material/fluidstates/compositional.hh
@@ -56,7 +56,6 @@ public:
             for (int compIdx = 0; compIdx < numComponents; ++compIdx)
             {
                 moleFraction_[phaseIdx][compIdx] = 0;
-                massFraction_[phaseIdx][compIdx] = 0;
             }
 
             averageMolarMass_[phaseIdx] = 0;
@@ -91,7 +90,14 @@ public:
      * \brief The mass fraction of a component in a phase \f$\mathrm{[-]}\f$
      */
     Scalar massFraction(int phaseIdx, int compIdx) const
-    { return massFraction_[phaseIdx][compIdx]; }
+    {
+        // calculate the mass fractions:
+        // for "mass" models this is just a back calculation
+        return sumMoleFractions_[phaseIdx]
+               * moleFraction(phaseIdx, compIdx)
+               * FluidSystem::molarMass(compIdx)
+               / averageMolarMass_[phaseIdx];
+    }
 
     /*!
      * \brief The average molar mass of a fluid phase \f$\mathrm{[kg/mol]}\f$
@@ -289,15 +295,6 @@ public:
             sumMoleFractions_[phaseIdx] += moleFraction_[phaseIdx][compJIdx];
             averageMolarMass_[phaseIdx] += moleFraction_[phaseIdx][compJIdx]*FluidSystem::molarMass(compJIdx);
         }
-
-        for (int compJIdx = 0; compJIdx < numComponents; ++compJIdx)
-        {
-            massFraction_[phaseIdx][compJIdx] =
-                std::abs(sumMoleFractions_[phaseIdx])
-                * moleFraction_[phaseIdx][compJIdx]
-                * FluidSystem::molarMass(compJIdx)
-                / std::max(1e-40, std::abs(averageMolarMass_[phaseIdx]));
-        }
     }
 
     /*!
@@ -311,7 +308,6 @@ public:
         Valgrind::SetDefined(sumMoleFractions_[phaseIdx]);
         Valgrind::SetDefined(averageMolarMass_[phaseIdx]);
         Valgrind::SetDefined(moleFraction_[phaseIdx][compIdx]);
-        Valgrind::SetDefined(massFraction_[phaseIdx][compIdx]);
 
         if (numComponents != 2)
             DUNE_THROW(Dune::NotImplemented, "This currently only works for 2 components.");
@@ -323,11 +319,7 @@ public:
             Scalar X2 = 1.0-value;
             Scalar avgMolarMass = M1*M2/(M2 + X2*(M1 - M2));
 
-            massFraction_[phaseIdx][compIdx] = value;
-            massFraction_[phaseIdx][1-compIdx] = 1.0-value;
-
-            moleFraction_[phaseIdx][compIdx] = massFraction_[phaseIdx][compIdx]
-                                               * avgMolarMass / M1;
+            moleFraction_[phaseIdx][compIdx] = value * avgMolarMass / M1;
             moleFraction_[phaseIdx][1-compIdx] = 1.0-moleFraction_[phaseIdx][compIdx];
 
             // re-calculate the mean molar mass
@@ -400,7 +392,6 @@ public:
         for (int phaseIdx = 0; phaseIdx < numPhases; ++phaseIdx) {
             for (int compIdx = 0; compIdx < numComponents; ++compIdx) {
                 Valgrind::CheckDefined(moleFraction_[phaseIdx][compIdx]);
-                Valgrind::CheckDefined(massFraction_[phaseIdx][compIdx]);
                 Valgrind::CheckDefined(fugacityCoefficient_[phaseIdx][compIdx]);
             }
             Valgrind::CheckDefined(averageMolarMass_[phaseIdx]);
@@ -417,7 +408,6 @@ public:
 
 protected:
     Scalar moleFraction_[numPhases][numComponents];
-    Scalar massFraction_[numPhases][numComponents];
     Scalar fugacityCoefficient_[numPhases][numComponents];
 
     Scalar averageMolarMass_[numPhases];
diff --git a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
index cf6d7c650e64ba3ba20995972ea1b1f866cd60df..648835335987fe306137088ebcaa81270133b8da 100644
--- a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
+++ b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
@@ -8,7 +8,7 @@ add_dumux_test(test_2cnistokes2p2cni test_2cnistokes2p2cni test_2cnistokes2p2cni
                           ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00008.vtu
                           ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-pm-reference.vtu
                           ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00008.vtu
-                  --zeroThreshold {"v":1e-7,"velocityN_0":5e-12,"velocityW_0":5e-10,"velocityW_1":5e-9})
+                  --zeroThreshold {"v":1e-7,"velocityN_0":5e-11,"velocityW_0":5e-10,"velocityW_1":5e-9})
 
 add_dumux_test(test_2cnistokes2p2cni_boundarylayer test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
                python ${CMAKE_SOURCE_DIR}/bin/runtest.py
@@ -18,7 +18,7 @@ add_dumux_test(test_2cnistokes2p2cni_boundarylayer test_2cnistokes2p2cni test_2c
                           ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni_boundarylayer-00009.vtu
                           ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
                           ${CMAKE_CURRENT_BINARY_DIR}/2p2cni_boundarylayer-00009.vtu
-                  --zeroThreshold {"v":1e-7,"velocityN_0":5e-12,"velocityW_0":1e-9,"velocityW_1":5e-9})
+                  --zeroThreshold {"v":1e-7,"velocityN_0":5e-11,"velocityW_0":1e-9,"velocityW_1":5e-9})
 
 #install sources
 install(FILES
diff --git a/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu b/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
index 40a4c5bb42f51d073e83547b9c226bfca27064c8..93d580ea1a30687f1e4ce335ef18b86cf98e84b7 100644
--- a/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
+++ b/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
@@ -24,7 +24,7 @@
           0 0 0.00203022 0.00169113 0.00135307 0.00101496 0.000676669 0.00033832 0 0.0020249 0.00168645 0.00134971
           0.00101226 0.000674928 0.000337434 0 0.00203043 0.00169167 0.00135338 0.00101491 0.000676635 0.000338305 0 0.00202712
           0.00168831 0.00135073 0.00101277 0.000675254 0.000337629 0 0.00202988 0.00169127 0.00135299 0.00101457 0.000676386 0.000338197
-          0 0.00202749 0.00168909 0.00135121 0.00101317 0.000675484 0.000337744 0 0.0020284 0.00169001 0.00135195 0.00101373
+          0 0.00202749 0.00168909 0.00135121 0.00101317 0.000675484 0.000337743 0 0.0020284 0.00169001 0.00135195 0.00101373
           0.000675849 0.000337923 0
         </DataArray>
         <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
@@ -85,20 +85,20 @@
         </DataArray>
         <DataArray type="Float32" Name="v" NumberOfComponents="3" format="ascii">
           0.000848729 6.69021e-05 0 0.000852973 6.62443e-05 0 0.809861 0 0 0.811316 -0.000106896 0
-          0.000856591 6.5898e-05 0 0.813041 -3.33132e-05 0 0.000856756 6.56703e-05 0 0.813394 4.22833e-05 0
-          0.000857352 6.54581e-05 0 0.81369 4.68624e-05 0 0.000857574 6.52413e-05 0 0.813732 5.93718e-05 0
-          0.000857666 6.52293e-05 0 0.813817 5.89186e-05 0 1.82383 0 0 1.82427 -0.00138601 0
-          1.82518 -0.000759835 0 1.82578 -0.000165394 0 1.82614 -9.76131e-05 0 1.8263 5.15844e-06 0
-          1.82641 3.74926e-05 0 2.89743 0 0 2.89719 -0.00112596 0 2.89709 -0.00103494 0
-          2.89742 -0.00053794 0 2.89766 -0.000270951 0 2.89782 -0.000110419 0 2.89791 -1.67384e-07 0
-          3.50134 0 0 3.50113 -0.00104744 0 3.50075 -0.00104572 0 3.50055 -0.000725559 0
-          3.50045 -0.000429293 0 3.50043 -0.000213374 0 3.50041 -3.09636e-05 0 2.89743 0 0
-          2.89713 -0.000254873 0 2.89659 -0.000352972 0 2.89622 -0.00027735 0 2.89594 -0.000170511 0
-          2.89582 -8.90168e-05 0 2.89574 -1.936e-05 0 1.82383 0 0 1.82366 -0.000132684 0
-          1.82334 -0.000144384 0 1.82306 -0.000124358 0 1.82284 -7.66361e-05 0 1.82274 -3.91816e-05 0
-          1.82267 -3.18417e-06 0 0.809861 0 0 0.809771 0.000145063 0 0.809618 9.07917e-05 0
-          0.809485 7.14696e-05 0 0.809369 4.66045e-05 0 0.809325 2.33659e-05 0 0.809289 1.80506e-06 0
-          0.00134 0 0 0.00134 0 0 0.00134 -6.78679e-38 0 0.00134 0 0
+          0.000856591 6.5898e-05 0 0.813041 -3.33126e-05 0 0.000856756 6.56703e-05 0 0.813394 4.22835e-05 0
+          0.000857352 6.54581e-05 0 0.81369 4.6862e-05 0 0.000857574 6.52413e-05 0 0.813732 5.93728e-05 0
+          0.000857666 6.52293e-05 0 0.813817 5.89136e-05 0 1.82383 0 0 1.82427 -0.00138601 0
+          1.82518 -0.000759834 0 1.82578 -0.000165394 0 1.82614 -9.76138e-05 0 1.8263 5.16159e-06 0
+          1.82641 3.74822e-05 0 2.89743 0 0 2.89719 -0.00112596 0 2.89709 -0.00103494 0
+          2.89742 -0.000537939 0 2.89766 -0.000270951 0 2.89782 -0.000110417 0 2.89791 -1.79549e-07 0
+          3.50134 0 0 3.50113 -0.00104743 0 3.50075 -0.00104572 0 3.50055 -0.000725558 0
+          3.50045 -0.000429293 0 3.50043 -0.000213375 0 3.50041 -3.0973e-05 0 2.89743 0 0
+          2.89713 -0.000254869 0 2.89659 -0.000352971 0 2.89622 -0.000277349 0 2.89594 -0.000170512 0
+          2.89582 -8.90184e-05 0 2.89574 -1.93664e-05 0 1.82383 0 0 1.82366 -0.000132683 0
+          1.82334 -0.000144384 0 1.82306 -0.000124357 0 1.82284 -7.66369e-05 0 1.82274 -3.91831e-05 0
+          1.82267 -3.1855e-06 0 0.809861 0 0 0.809771 0.000145064 0 0.809618 9.07919e-05 0
+          0.809485 7.14699e-05 0 0.809369 4.66046e-05 0 0.809325 2.33654e-05 0 0.809289 1.80559e-06 0
+          0.00134 0 0 0.00134 0 0 0.00134 4.62834e-37 0 0.00134 0 0
           0.00134 0 0 0.00134 0 0 0.00134 0 0
         </DataArray>
       </PointData>
diff --git a/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu b/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
index 1f7f61229a98fa6aba62e947378f07007110ba7a..7006126ebb72844f842d8e55171be50d5ada163f 100644
--- a/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
+++ b/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
@@ -4,14 +4,14 @@
     <Piece NumberOfCells="24" NumberOfPoints="35">
       <PointData Scalars="Sn" Vectors="velocityW">
         <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
-          0.0100962 0.0100962 0.0103542 0.0103542 0.0100962 0.0103541 0.0100962 0.0103541 0.0100962 0.0103541 0.0100962 0.0103541
+          0.0100962 0.0100962 0.0103542 0.0103542 0.0100962 0.0103542 0.0100962 0.0103541 0.0100962 0.0103541 0.0100962 0.0103541
           0.0100962 0.0103541 0.0136457 0.0136457 0.0136457 0.0136457 0.0136457 0.0136457 0.0136457 0.0300134 0.0300133 0.0300132
           0.0300132 0.0300131 0.0300131 0.030013 0.15567 0.155669 0.155669 0.155669 0.155669 0.155669 0.155669
         </DataArray>
         <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
           0.989904 0.989904 0.989646 0.989646 0.989904 0.989646 0.989904 0.989646 0.989904 0.989646 0.989904 0.989646
           0.989904 0.989646 0.986354 0.986354 0.986354 0.986354 0.986354 0.986354 0.986354 0.969987 0.969987 0.969987
-          0.969987 0.969987 0.969987 0.969987 0.84433 0.844331 0.844331 0.844331 0.844331 0.844331 0.844331
+          0.969987 0.969987 0.969987 0.969987 0.84433 0.844331 0.844331 0.84433 0.84433 0.844331 0.844331
         </DataArray>
         <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
           101179 101179 100209 100209 101179 100209 101179 100209 101179 100209 101179 100209
@@ -24,8 +24,8 @@
           99017 99017 99017 99017 98715.9 98715.9 98715.9 98715.9 98715.9 98715.9 98715.9
         </DataArray>
         <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
-          17.4519 17.4517 63.3257 63.3267 17.4514 63.3225 17.4518 63.3202 17.4513 63.3181 17.4512 63.3168
-          17.4513 63.3151 532.36 532.359 532.359 532.358 532.358 532.357 532.357 983.379 983.379 983.378
+          17.4515 17.4516 63.3261 63.3248 17.4518 63.3243 17.4516 63.3202 17.4512 63.3172 17.4513 63.3158
+          17.4514 63.3158 532.36 532.359 532.359 532.358 532.358 532.357 532.357 983.379 983.379 983.378
           983.378 983.378 983.378 983.377 1284.13 1284.13 1284.13 1284.13 1284.13 1284.13 1284.13
         </DataArray>
         <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
@@ -39,14 +39,14 @@
           1.16082 1.16084 1.16085 1.16085 1.16537 1.1654 1.16544 1.16547 1.1655 1.16552 1.16554
         </DataArray>
         <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
-          1123.57 1123.57 1121.58 1121.57 1123.57 1121.57 1123.57 1121.57 1123.57 1121.57 1123.57 1121.57
-          1123.57 1121.57 1110.06 1110.06 1110.04 1110.02 1110 1109.98 1109.98 1060.7 1060.65 1060.57
+          1123.57 1123.57 1121.58 1121.58 1123.57 1121.57 1123.57 1121.57 1123.57 1121.57 1123.57 1121.57
+          1123.57 1121.57 1110.06 1110.05 1110.04 1110.02 1110 1109.98 1109.98 1060.7 1060.65 1060.57
           1060.49 1060.42 1060.37 1060.34 614.273 614.164 614.052 613.953 613.866 613.792 613.738
         </DataArray>
         <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          0.000310652 0.000310644 0.00469843 0.00469859 0.000310632 0.00469793 0.000310647 0.00469756 0.000310628 0.00469724 0.000310625 0.00469703
-          0.000310628 0.00469675 0.604802 0.6048 0.604799 0.604798 0.604798 0.604797 0.604795 20.9933 20.9931 20.9931
-          20.9932 20.9932 20.9931 20.993 1292.53 1292.54 1292.56 1292.58 1292.59 1292.6 1292.61
+          0.000310636 0.00031064 0.00469849 0.00469829 0.000310646 0.00469821 0.00031064 0.00469756 0.000310624 0.00469708 0.000310629 0.00469687
+          0.000310632 0.00469687 0.604801 0.6048 0.604799 0.604799 0.604798 0.604797 0.604795 20.9933 20.9931 20.9931
+          20.9932 20.9932 20.9931 20.993 1292.53 1292.55 1292.56 1292.58 1292.59 1292.6 1292.61
         </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
@@ -54,13 +54,13 @@
           0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
         </DataArray>
         <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
-          2.18092e-05 2.18092e-05 2.16227e-05 2.16227e-05 2.18092e-05 2.16227e-05 2.18092e-05 2.16227e-05 2.18092e-05 2.16227e-05 2.18092e-05 2.16228e-05
+          2.18092e-05 2.18092e-05 2.16226e-05 2.16227e-05 2.18092e-05 2.16227e-05 2.18092e-05 2.16227e-05 2.18092e-05 2.16227e-05 2.18092e-05 2.16228e-05
           2.18092e-05 2.16228e-05 2.17329e-05 2.1733e-05 2.17333e-05 2.17336e-05 2.17339e-05 2.17341e-05 2.17341e-05 2.20832e-05 2.2084e-05 2.20853e-05
           2.20866e-05 2.20877e-05 2.20885e-05 2.2089e-05 2.24795e-05 2.24826e-05 2.24858e-05 2.24886e-05 2.24911e-05 2.24932e-05 2.24948e-05
         </DataArray>
         <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
-          0.0197216 0.0197216 0.019822 0.0198218 0.0197216 0.0198219 0.0197216 0.0198218 0.0197216 0.0198217 0.0197216 0.0198216
-          0.0197216 0.0198216 0.0193764 0.0193762 0.0193752 0.0193743 0.0193734 0.0193728 0.0193726 0.0183488 0.0183467 0.018343
+          0.0197216 0.0197216 0.019822 0.0198219 0.0197216 0.0198218 0.0197216 0.0198218 0.0197216 0.0198217 0.0197216 0.0198216
+          0.0197216 0.0198216 0.0193764 0.019376 0.0193753 0.0193743 0.0193734 0.0193728 0.0193726 0.0183488 0.0183467 0.018343
           0.0183395 0.0183364 0.0183339 0.0183327 0.0172823 0.0172743 0.0172661 0.0172588 0.0172525 0.0172471 0.017243
         </DataArray>
         <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
@@ -74,13 +74,13 @@
           0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986 0.999986
         </DataArray>
         <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
-          1.3567e-05 1.3567e-05 1.34509e-05 1.3451e-05 1.3567e-05 1.3451e-05 1.3567e-05 1.3451e-05 1.3567e-05 1.3451e-05 1.3567e-05 1.3451e-05
-          1.3567e-05 1.3451e-05 1.35195e-05 1.35196e-05 1.35198e-05 1.352e-05 1.35201e-05 1.35202e-05 1.35203e-05 1.37375e-05 1.37379e-05 1.37387e-05
+          1.3567e-05 1.3567e-05 1.34509e-05 1.34509e-05 1.3567e-05 1.3451e-05 1.3567e-05 1.3451e-05 1.3567e-05 1.3451e-05 1.3567e-05 1.3451e-05
+          1.3567e-05 1.3451e-05 1.35195e-05 1.35196e-05 1.35197e-05 1.352e-05 1.35201e-05 1.35202e-05 1.35203e-05 1.37375e-05 1.37379e-05 1.37387e-05
           1.37395e-05 1.37402e-05 1.37408e-05 1.3741e-05 1.3984e-05 1.39859e-05 1.39879e-05 1.39896e-05 1.39912e-05 1.39925e-05 1.39935e-05
         </DataArray>
         <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
-          0.0313277 0.0313277 0.0314853 0.0314851 0.0313277 0.0314851 0.0313277 0.031485 0.0313277 0.0314849 0.0313277 0.0314848
-          0.0313277 0.0314847 0.0307858 0.0307855 0.0307839 0.0307824 0.0307811 0.0307802 0.0307798 0.0291712 0.0291679 0.0291621
+          0.0313277 0.0313277 0.0314853 0.0314853 0.0313277 0.031485 0.0313277 0.031485 0.0313277 0.0314849 0.0313277 0.0314848
+          0.0313277 0.0314847 0.0307858 0.0307852 0.030784 0.0307824 0.0307811 0.0307802 0.0307798 0.0291711 0.0291679 0.0291621
           0.0291565 0.0291516 0.0291477 0.0291458 0.0274932 0.0274805 0.0274677 0.0274563 0.0274463 0.0274377 0.0274314
         </DataArray>
         <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
@@ -94,8 +94,8 @@
           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 298.073 298.073 298.15 298.073 298.15 298.072 298.15 298.072 298.15 298.072
-          298.15 298.072 297.662 297.662 297.661 297.66 297.659 297.659 297.658 296.764 296.762 296.759
+          298.15 298.15 298.073 298.073 298.15 298.072 298.15 298.072 298.15 298.072 298.15 298.072
+          298.15 298.072 297.662 297.661 297.661 297.66 297.659 297.659 297.658 296.764 296.762 296.759
           296.756 296.753 296.751 296.75 295.785 295.777 295.769 295.763 295.757 295.751 295.748
         </DataArray>
         <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii">
@@ -104,26 +104,26 @@
           3 3 3 3 3 3 3 3 3 3 3
         </DataArray>
         <DataArray type="Float32" Name="velocityW" NumberOfComponents="3" format="ascii">
-          -1.02245e-10 -4.09402e-10 0 -1.77242e-10 -4.77321e-10 0 -1.57385e-10 -1.92304e-09 0 -2.86731e-10 -2.04364e-09 0
-          -2.98173e-10 -5.49714e-10 0 -4.61988e-10 -2.28247e-09 0 -3.41017e-10 -6.71965e-10 0 -4.9123e-10 -2.53505e-09 0
-          -2.90751e-10 -7.81813e-10 0 -4.08242e-10 -2.74944e-09 0 -1.66001e-10 -8.57562e-10 0 -2.34338e-10 -2.90968e-09 0
-          -8.84249e-11 -8.84624e-10 0 -1.26753e-10 -2.97412e-09 0 -2.64229e-10 -2.41455e-09 0 -3.75079e-10 -2.78515e-09 0
-          -4.83049e-10 -3.35626e-09 0 -4.47677e-10 -3.78712e-09 0 -3.67394e-10 -4.13257e-09 0 -2.32822e-10 -4.43613e-09 0
-          -1.4604e-10 -4.6159e-09 0 2.10644e-11 1.20643e-08 0 2.10942e-10 1.13027e-08 0 4.70662e-10 1.06634e-08 0
-          5.27823e-10 1.02533e-08 0 4.4796e-10 9.92712e-09 0 2.53343e-10 9.61492e-09 0 1.2591e-10 9.3342e-09 0
-          7.54234e-10 2.5521e-08 0 9.36887e-10 2.45658e-08 0 1.14677e-09 2.40241e-08 0 1.11354e-09 2.36827e-08 0
-          9.47767e-10 2.34023e-08 0 6.78416e-10 2.31403e-08 0 5.1437e-10 2.28366e-08 0
+          -9.87049e-11 -4.18131e-10 0 -1.82811e-10 -4.54604e-10 0 -1.60668e-10 -1.92528e-09 0 -2.81808e-10 -2.03736e-09 0
+          -3.05327e-10 -5.68547e-10 0 -4.55954e-10 -2.28726e-09 0 -3.40689e-10 -6.71845e-10 0 -4.92321e-10 -2.53489e-09 0
+          -2.906e-10 -7.81458e-10 0 -4.09083e-10 -2.74958e-09 0 -1.65994e-10 -8.57524e-10 0 -2.34661e-10 -2.90998e-09 0
+          -8.84303e-11 -8.84687e-10 0 -1.26839e-10 -2.97455e-09 0 -2.67304e-10 -2.4058e-09 0 -3.72858e-10 -2.80342e-09 0
+          -4.80419e-10 -3.33961e-09 0 -4.49601e-10 -3.78736e-09 0 -3.68594e-10 -4.13373e-09 0 -2.33333e-10 -4.43714e-09 0
+          -1.46254e-10 -4.617e-09 0 2.59111e-11 1.20722e-08 0 2.02087e-10 1.1288e-08 0 4.59061e-10 1.06776e-08 0
+          5.27091e-10 1.0253e-08 0 4.47236e-10 9.92566e-09 0 2.52962e-10 9.61364e-09 0 1.25773e-10 9.333e-09 0
+          7.54212e-10 2.55237e-08 0 9.30346e-10 2.45628e-08 0 1.13897e-09 2.40284e-08 0 1.11215e-09 2.36828e-08 0
+          9.47483e-10 2.34011e-08 0 6.78252e-10 2.31391e-08 0 5.14375e-10 2.28356e-08 0
         </DataArray>
         <DataArray type="Float32" Name="velocityN" NumberOfComponents="3" format="ascii">
-          -2.05049e-16 7.67913e-10 0 1.13256e-15 7.67893e-10 0 -1.97484e-14 2.2488e-09 0 3.72124e-14 2.24886e-09 0
-          1.47286e-15 7.67865e-10 0 7.24507e-14 2.24856e-09 0 1.06368e-15 7.67904e-10 0 4.88291e-14 2.24841e-09 0
-          1.20003e-15 7.67859e-10 0 3.90593e-14 2.24825e-09 0 7.22842e-16 7.67851e-10 0 3.55754e-14 2.24815e-09 0
-          6.97414e-16 7.6786e-10 0 3.99624e-14 2.24804e-09 0 1.69891e-12 1.74795e-09 0 2.37178e-12 1.74731e-09 0
-          2.71106e-12 1.74759e-09 0 2.25355e-12 1.74466e-09 0 2.04572e-12 1.74236e-09 0 2.32794e-12 1.74007e-09 0
-          2.69406e-12 1.74372e-09 0 8.54347e-11 -1.49419e-08 0 6.55393e-11 -1.48482e-08 0 4.5597e-11 -1.48693e-08 0
-          4.52412e-11 -1.48784e-08 0 4.5896e-11 -1.48877e-08 0 6.64199e-11 -1.49117e-08 0 8.598e-11 -1.48092e-08 0
-          5.43466e-09 -2.965e-08 0 4.13263e-09 -2.94613e-08 0 2.80721e-09 -2.95045e-08 0 2.77901e-09 -2.95172e-08 0
-          2.78598e-09 -2.95314e-08 0 4.19415e-09 -2.9575e-08 0 5.59054e-09 -2.93776e-08 0
+          4.40029e-16 7.67872e-10 0 1.88824e-16 7.67884e-10 0 3.02282e-14 2.2488e-09 0 2.06264e-14 2.24872e-09 0
+          1.06584e-15 7.679e-10 0 5.149e-14 2.24869e-09 0 2.10544e-15 7.67886e-10 0 8.0507e-14 2.2484e-09 0
+          1.20526e-15 7.6785e-10 0 4.94142e-14 2.24817e-09 0 1.28985e-16 7.67863e-10 0 1.57529e-14 2.24809e-09 0
+          -1.35731e-16 7.67871e-10 0 1.73604e-15 2.24809e-09 0 2.42668e-12 1.74657e-09 0 2.05733e-12 1.74972e-09 0
+          2.34703e-12 1.74559e-09 0 2.82181e-12 1.74482e-09 0 2.27821e-12 1.74265e-09 0 1.95993e-12 1.74047e-09 0
+          2.00099e-12 1.7426e-09 0 8.32584e-11 -1.49416e-08 0 6.56076e-11 -1.48452e-08 0 4.61398e-11 -1.48715e-08 0
+          4.46898e-11 -1.4879e-08 0 4.58749e-11 -1.48871e-08 0 6.67194e-11 -1.49116e-08 0 8.67459e-11 -1.4811e-08 0
+          5.43534e-09 -2.96466e-08 0 4.13304e-09 -2.94602e-08 0 2.8075e-09 -2.95047e-08 0 2.77891e-09 -2.95188e-08 0
+          2.78585e-09 -2.9531e-08 0 4.19439e-09 -2.95758e-08 0 5.59062e-09 -2.93789e-08 0
         </DataArray>
       </PointData>
       <CellData Scalars="process rank">
diff --git a/test/references/2cstokes2p2c-pm-reference.vtu b/test/references/2cstokes2p2c-pm-reference.vtu
index fcb9be64fea2e542d2cebae4de70ce42001af1d5..8bd8d53396226add9f3721edf6abf242f839d2a6 100644
--- a/test/references/2cstokes2p2c-pm-reference.vtu
+++ b/test/references/2cstokes2p2c-pm-reference.vtu
@@ -4,16 +4,16 @@
     <Piece NumberOfCells="120" NumberOfPoints="143">
       <PointData Scalars="Sn" Vectors="velocityW">
         <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
-          0.010017 0.010017 0.0100341 0.0100341 0.010017 0.0100341 0.0100171 0.010034 0.010017 0.0100341 0.0100171 0.010034
-          0.0100172 0.010034 0.0100165 0.0100341 0.010017 0.010034 0.010017 0.010034 0.010017 0.010034 0.0100471 0.0100471
-          0.0100471 0.010047 0.010047 0.0100471 0.010047 0.0100472 0.010047 0.010047 0.010047 0.0101575 0.0101575 0.0101575
-          0.0101575 0.0101574 0.0101574 0.0101574 0.0101575 0.0101574 0.0101574 0.0101574 0.0117335 0.0117335 0.0117335 0.0117335
+          0.010017 0.010017 0.0100341 0.0100341 0.010017 0.0100341 0.0100171 0.010034 0.010017 0.010034 0.0100171 0.010034
+          0.0100171 0.0100339 0.0100168 0.010034 0.010017 0.010034 0.010017 0.010034 0.010017 0.010034 0.0100471 0.0100471
+          0.0100471 0.010047 0.0100471 0.0100471 0.0100474 0.0100471 0.010047 0.010047 0.010047 0.0101575 0.0101575 0.0101575
+          0.0101575 0.0101575 0.0101574 0.0101572 0.0101575 0.0101574 0.0101574 0.0101574 0.0117335 0.0117335 0.0117335 0.0117335
           0.0117335 0.0117335 0.0117335 0.0117335 0.0117335 0.0117335 0.0117335 0.0136025 0.0136025 0.0136025 0.0136025 0.0136025
           0.0136025 0.0136025 0.0136025 0.0136025 0.0136025 0.0136025 0.0157827 0.0157827 0.0157827 0.0157827 0.0157827 0.0157827
           0.0157827 0.0157827 0.0157827 0.0157826 0.0157826 0.0195444 0.0195444 0.0195444 0.0195443 0.0195443 0.0195443 0.0195442
           0.0195442 0.0195442 0.0195442 0.0195441 0.0353712 0.0353711 0.0353711 0.035371 0.0353709 0.0353708 0.0353707 0.0353706
           0.0353705 0.0353704 0.0353704 0.0613567 0.0613566 0.0613564 0.0613563 0.0613561 0.0613559 0.0613557 0.0613555 0.0613554
-          0.0613552 0.0613551 0.0960918 0.0960917 0.0960914 0.0960911 0.0960908 0.0960905 0.0960902 0.0960899 0.0960897 0.0960895
+          0.0613552 0.0613551 0.0960918 0.0960916 0.0960914 0.0960911 0.0960908 0.0960905 0.0960902 0.0960899 0.0960897 0.0960895
           0.0960893 0.136264 0.136263 0.136263 0.136262 0.136262 0.136262 0.136261 0.136261 0.13626 0.13626 0.13626
           0.178147 0.178146 0.178146 0.178145 0.178145 0.178144 0.178144 0.178143 0.178143 0.178142 0.178142
         </DataArray>
@@ -60,13 +60,13 @@
           98720.1 98720.1 98720.1 98720.1 98720.1 98720.1 98720.1 98720.1 98720.1 98720.1 98720.1
         </DataArray>
         <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
-          2.84924 2.84917 5.69348 5.69333 2.84738 5.69298 2.85578 5.69011 2.85259 5.6977 2.85355 5.6923
-          2.87426 5.68447 2.76055 5.70776 2.85168 5.69177 2.85182 5.69156 2.85179 5.69151 7.86258 7.86203
-          7.8615 7.86006 7.85768 7.86893 7.85735 7.8777 7.85978 7.85923 7.85915 26.1388 26.138 26.1373
-          26.137 26.1343 26.1322 26.1337 26.1466 26.135 26.1332 26.1329 261.759 261.758 261.758 261.758
-          261.758 261.757 261.757 261.756 261.756 261.756 261.756 482.884 482.884 482.883 482.883 482.883
+          2.84985 2.84903 5.6935 5.69363 2.84784 5.69417 2.85589 5.69132 2.85282 5.69217 2.85483 5.69243
+          2.8658 5.67603 2.81387 5.68728 2.85175 5.69174 2.85183 5.69156 2.85181 5.69153 7.86232 7.86218
+          7.86156 7.85901 7.86919 7.86574 7.91585 7.87024 7.85971 7.85922 7.85917 26.1381 26.1377 26.1363
+          26.1366 26.1355 26.1295 26.0946 26.143 26.1347 26.1331 26.1329 261.759 261.758 261.758 261.758
+          261.757 261.757 261.759 261.755 261.756 261.756 261.756 482.884 482.884 482.883 482.883 482.883
           482.882 482.882 482.881 482.881 482.881 482.881 667.167 667.167 667.166 667.166 667.165 667.165
-          667.165 667.164 667.164 667.164 667.163 820.731 820.73 820.73 820.73 820.729 820.729 820.728
+          667.165 667.164 667.164 667.163 667.163 820.731 820.73 820.73 820.73 820.729 820.729 820.728
           820.728 820.727 820.727 820.727 948.693 948.693 948.692 948.692 948.691 948.691 948.69 948.69
           948.689 948.689 948.688 1055.33 1055.33 1055.33 1055.33 1055.33 1055.32 1055.32 1055.32 1055.32
           1055.32 1055.32 1144.19 1144.19 1144.19 1144.19 1144.19 1144.19 1144.18 1144.18 1144.18 1144.18
@@ -88,8 +88,8 @@
           997.047 997.047 997.047 997.047 997.047 997.047 997.047 997.047 997.047 997.047 997.047
         </DataArray>
         <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
-          1.16788 1.16788 1.16255 1.16255 1.16788 1.16255 1.16788 1.16255 1.16788 1.16256 1.16788 1.16255
-          1.16788 1.16255 1.16788 1.16256 1.16788 1.16255 1.16788 1.16255 1.16788 1.16255 1.15811 1.15811
+          1.16788 1.16788 1.16255 1.16255 1.16788 1.16256 1.16788 1.16255 1.16788 1.16255 1.16788 1.16255
+          1.16788 1.16255 1.16788 1.16255 1.16788 1.16255 1.16788 1.16255 1.16788 1.16255 1.15811 1.15811
           1.15811 1.15811 1.15811 1.15811 1.15811 1.15811 1.15811 1.15811 1.15811 1.1546 1.1546 1.1546
           1.1546 1.1546 1.1546 1.1546 1.1546 1.1546 1.1546 1.1546 1.15425 1.15425 1.15425 1.15425
           1.15425 1.15425 1.15425 1.15425 1.15425 1.15425 1.15425 1.15425 1.15425 1.15425 1.15425 1.15425
@@ -116,18 +116,18 @@
           577.276 577.278 577.279 577.28 577.281 577.282 577.284 577.285 577.286 577.286 577.287
         </DataArray>
         <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          1.32903e-05 1.32897e-05 5.48003e-05 5.47975e-05 1.32725e-05 5.47905e-05 1.33528e-05 5.4734e-05 1.33223e-05 5.48835e-05 1.33315e-05 5.47771e-05
-          1.35301e-05 5.46229e-05 1.24579e-05 5.50821e-05 1.33136e-05 5.47667e-05 1.33149e-05 5.47625e-05 1.33146e-05 5.47615e-05 0.000106151 0.000106136
-          0.000106121 0.000106081 0.000106016 0.000106327 0.000106007 0.00010657 0.000106074 0.000106059 0.000106056 0.00125246 0.00125238 0.00125232
-          0.00125228 0.00125201 0.0012518 0.00125195 0.00125323 0.00125209 0.0012519 0.00125188 0.168417 0.168417 0.168417 0.168416
-          0.168416 0.168416 0.168415 0.168413 0.168414 0.168414 0.168413 0.750676 0.750675 0.750674 0.750672 0.750671
-          0.750669 0.750667 0.750666 0.750664 0.750663 0.750663 1.97377 1.97377 1.97377 1.97376 1.97376 1.97375
-          1.97375 1.97374 1.97374 1.97374 1.97374 5.49229 5.49227 5.49224 5.49221 5.49217 5.49214 5.4921
-          5.49207 5.49204 5.49201 5.49199 40.3995 40.3993 40.399 40.3987 40.3984 40.3981 40.3978 40.3975
-          40.3972 40.397 40.3969 170.02 170.019 170.018 170.017 170.016 170.015 170.014 170.012 170.011
-          170.01 170.01 486.028 486.026 486.023 486.02 486.017 486.013 486.01 486.007 486.004 486.001
-          485.999 1056.25 1056.24 1056.24 1056.23 1056.22 1056.21 1056.21 1056.2 1056.2 1056.19 1056.19
-          1883.8 1883.79 1883.78 1883.76 1883.75 1883.74 1883.73 1883.72 1883.71 1883.7 1883.69
+          1.32961e-05 1.32883e-05 5.48007e-05 5.48033e-05 1.32769e-05 5.48139e-05 1.33538e-05 5.47577e-05 1.33244e-05 5.47744e-05 1.33437e-05 5.47797e-05
+          1.34488e-05 5.44569e-05 1.2955e-05 5.46781e-05 1.33142e-05 5.4766e-05 1.33151e-05 5.47625e-05 1.33148e-05 5.47619e-05 0.000106144 0.00010614
+          0.000106123 0.000106052 0.000106334 0.000106239 0.00010763 0.000106363 0.000106072 0.000106058 0.000106057 0.00125239 0.00125235 0.00125222
+          0.00125224 0.00125214 0.00125154 0.00124809 0.00125288 0.00125206 0.0012519 0.00125188 0.168417 0.168417 0.168417 0.168416
+          0.168416 0.168414 0.168418 0.168412 0.168414 0.168414 0.168413 0.750675 0.750675 0.750674 0.750672 0.75067
+          0.750669 0.750668 0.750665 0.750664 0.750663 0.750663 1.97377 1.97377 1.97377 1.97376 1.97376 1.97375
+          1.97375 1.97374 1.97374 1.97374 1.97374 5.49229 5.49227 5.49224 5.49221 5.49217 5.49213 5.4921
+          5.49206 5.49203 5.49201 5.49199 40.3994 40.3993 40.399 40.3987 40.3984 40.3981 40.3978 40.3975
+          40.3972 40.397 40.3969 170.02 170.019 170.018 170.017 170.016 170.015 170.013 170.012 170.011
+          170.01 170.01 486.028 486.026 486.023 486.02 486.016 486.013 486.01 486.006 486.004 486.001
+          485.999 1056.25 1056.24 1056.24 1056.23 1056.22 1056.21 1056.21 1056.2 1056.19 1056.19 1056.19
+          1883.8 1883.79 1883.78 1883.76 1883.75 1883.74 1883.73 1883.71 1883.7 1883.7 1883.69
         </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
@@ -146,7 +146,7 @@
         <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
           2.18068e-05 2.18068e-05 2.17053e-05 2.17053e-05 2.18068e-05 2.17053e-05 2.18068e-05 2.17053e-05 2.18068e-05 2.17053e-05 2.18068e-05 2.17053e-05
           2.18068e-05 2.17053e-05 2.18068e-05 2.17053e-05 2.18068e-05 2.17053e-05 2.18068e-05 2.17053e-05 2.18068e-05 2.17053e-05 2.16206e-05 2.16206e-05
-          2.16206e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.15538e-05 2.15538e-05 2.15538e-05
+          2.16206e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.16207e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.16206e-05 2.15538e-05 2.15538e-05 2.15538e-05
           2.15538e-05 2.15538e-05 2.15538e-05 2.15538e-05 2.15538e-05 2.15538e-05 2.15538e-05 2.15538e-05 2.15471e-05 2.15471e-05 2.15471e-05 2.15471e-05
           2.15471e-05 2.15471e-05 2.15471e-05 2.15471e-05 2.15471e-05 2.15471e-05 2.15471e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05
           2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05 2.1547e-05
@@ -284,80 +284,80 @@
           3 3 3 3 3 3 3 3 3 3 3
         </DataArray>
         <DataArray type="Float32" Name="velocityW" NumberOfComponents="3" format="ascii">
-          -9.02703e-11 1.53772e-10 0 -1.75994e-10 1.45238e-10 0 -1.05798e-10 3.00014e-10 0 -2.06168e-10 2.82208e-10 0
-          -3.34274e-10 1.20562e-10 0 -3.913e-10 2.30853e-10 0 -4.5934e-10 8.22199e-11 0 -5.39847e-10 1.50277e-10 0
-          -5.61621e-10 3.79601e-11 0 -6.33368e-10 4.62556e-11 0 -5.64444e-10 6.78313e-12 0 -6.54779e-10 -4.55277e-11 0
-          -5.13509e-10 -6.40743e-11 0 -6.18401e-10 -1.58053e-10 0 -4.54611e-10 -1.12902e-10 0 -5.28843e-10 -2.53829e-10 0
-          -3.28575e-10 -1.50468e-10 0 -3.83482e-10 -3.28939e-10 0 -1.73065e-10 -1.74168e-10 0 -2.01381e-10 -3.76812e-10 0
-          -8.86801e-11 -1.82229e-10 0 -1.03136e-10 -3.93241e-10 0 -1.48333e-10 6.14822e-10 0 -2.88652e-10 5.76377e-10 0
-          -5.46457e-10 4.65919e-10 0 -7.64737e-10 2.94455e-10 0 -8.75533e-10 7.39726e-11 0 -8.91692e-10 -1.39925e-10 0
-          -8.5536e-10 -3.60099e-10 0 -7.27837e-10 -5.58315e-10 0 -5.27277e-10 -7.14185e-10 0 -2.76737e-10 -8.1391e-10 0
-          -1.41721e-10 -8.48242e-10 0 -2.14267e-10 9.99786e-10 0 -4.15961e-10 9.35117e-10 0 -7.84289e-10 7.50742e-10 0
-          -1.09039e-09 4.74485e-10 0 -1.2379e-09 1.47592e-10 0 -1.26026e-09 -2.25237e-10 0 -1.20894e-09 -5.85421e-10 0
-          -1.02316e-09 -9.01771e-10 0 -7.40778e-10 -1.15095e-09 0 -3.88862e-10 -1.31088e-09 0 -1.992e-10 -1.36606e-09 0
-          -3.0247e-10 1.76085e-09 0 -5.84859e-10 1.66154e-09 0 -1.09539e-09 1.38217e-09 0 -1.48049e-09 9.72136e-10 0
-          -1.69954e-09 4.96332e-10 0 -1.75144e-09 -4.08153e-11 0 -1.64851e-09 -5.48982e-10 0 -1.39266e-09 -9.97353e-10 0
-          -1.00929e-09 -1.35317e-09 0 -5.30534e-10 -1.58342e-09 0 -2.72045e-10 -1.6633e-09 0 -4.13221e-10 2.91664e-09 0
-          -7.93893e-10 2.77084e-09 0 -1.47217e-09 2.36972e-09 0 -1.9612e-09 1.79453e-09 0 -2.23404e-09 1.12869e-09 0
-          -2.2918e-09 4.38043e-10 0 -2.14648e-09 -2.25253e-10 0 -1.81462e-09 -8.16041e-10 0 -1.31906e-09 -1.2904e-09 0
-          -6.95583e-10 -1.60189e-09 0 -3.57464e-10 -1.71108e-09 0 -5.48246e-10 4.24581e-09 0 -1.04247e-09 4.0364e-09 0
-          -1.90522e-09 3.48091e-09 0 -2.49825e-09 2.71924e-09 0 -2.81073e-09 1.86854e-09 0 -2.86248e-09 1.00568e-09 0
-          -2.67523e-09 1.82997e-10 0 -2.26712e-09 -5.54851e-10 0 -1.65706e-09 -1.15717e-09 0 -8.7869e-10 -1.56184e-09 0
-          -4.5331e-10 -1.7061e-09 0 -7.10487e-10 6.53206e-09 0 -1.32867e-09 6.23323e-09 0 -2.37912e-09 5.48537e-09 0
-          -3.0587e-09 4.51869e-09 0 -3.39378e-09 3.48226e-09 0 -3.43035e-09 2.45387e-09 0 -3.2019e-09 1.47956e-09 0
-          -2.72516e-09 5.98279e-10 0 -2.00789e-09 -1.37908e-10 0 -1.0737e-09 -6.48731e-10 0 -5.57285e-10 -8.35493e-10 0
-          -8.81525e-10 1.1383e-08 0 -1.60555e-09 1.0957e-08 0 -2.79619e-09 9.98023e-09 0 -3.51273e-09 8.80379e-09 0
-          -3.84149e-09 7.59365e-09 0 -3.85553e-09 6.4164e-09 0 -3.59579e-09 5.30627e-09 0 -3.07636e-09 4.29343e-09 0
-          -2.29063e-09 3.42393e-09 0 -1.23914e-09 2.79511e-09 0 -6.48886e-10 2.5571e-09 0 -1.01647e-09 1.92856e-08 0
-          -1.77804e-09 1.86844e-08 0 -2.98536e-09 1.74594e-08 0 -3.65524e-09 1.60907e-08 0 -3.94049e-09 1.47334e-08 0
-          -3.9291e-09 1.34338e-08 0 -3.66312e-09 1.22128e-08 0 -3.15306e-09 1.10886e-08 0 -2.3781e-09 1.00971e-08 0
-          -1.30609e-09 9.34502e-09 0 -6.92463e-10 9.04789e-09 0 -1.09973e-09 2.94865e-08 0 -1.8153e-09 2.86583e-08 0
-          -2.90803e-09 2.71954e-08 0 -3.46442e-09 2.56723e-08 0 -3.68351e-09 2.42033e-08 0 -3.65065e-09 2.28127e-08 0
-          -3.40337e-09 2.15094e-08 0 -2.94906e-09 2.03009e-08 0 -2.25808e-09 1.9209e-08 0 -1.26418e-09 1.83384e-08 0
-          -6.81485e-10 1.79773e-08 0 -1.24779e-09 4.11143e-08 0 -1.90952e-09 3.9999e-08 0 -2.88722e-09 3.83279e-08 0
-          -3.34596e-09 3.66908e-08 0 -3.51136e-09 3.51419e-08 0 -3.46043e-09 3.3687e-08 0 -3.22646e-09 3.23256e-08 0
-          -2.81513e-09 3.10568e-08 0 -2.19262e-09 2.98877e-08 0 -1.25647e-09 2.89069e-08 0 -6.91917e-10 2.84781e-08 0
-          -1.31961e-09 4.71613e-08 0 -1.89561e-09 4.58851e-08 0 -2.73226e-09 4.41182e-08 0 -3.10638e-09 4.2433e-08 0
-          -3.23109e-09 4.08507e-08 0 -3.17211e-09 3.93691e-08 0 -2.95808e-09 3.79834e-08 0 -2.59375e-09 3.66895e-08 0
-          -2.0472e-09 3.54869e-08 0 -1.19585e-09 3.44528e-08 0 -6.70536e-10 3.39889e-08 0
+          -9.0203e-11 1.53631e-10 0 -1.75854e-10 1.45103e-10 0 -1.05722e-10 2.99748e-10 0 -2.06021e-10 2.81944e-10 0
+          -3.33987e-10 1.20423e-10 0 -3.91029e-10 2.30598e-10 0 -4.58662e-10 8.21357e-11 0 -5.36496e-10 1.51537e-10 0
+          -5.72792e-10 3.91221e-11 0 -6.44224e-10 5.319e-11 0 -5.67877e-10 1.06768e-11 0 -6.6833e-10 -5.77645e-11 0
+          -5.00886e-10 -6.86429e-11 0 -6.08142e-10 -1.7691e-10 0 -4.5174e-10 -1.16555e-10 0 -5.1904e-10 -2.583e-10 0
+          -3.30432e-10 -1.5171e-10 0 -3.83446e-10 -3.29822e-10 0 -1.73491e-10 -1.74642e-10 0 -2.01395e-10 -3.77277e-10 0
+          -8.88535e-11 -1.82557e-10 0 -1.0316e-10 -3.93617e-10 0 -1.48266e-10 6.14341e-10 0 -2.8851e-10 5.75879e-10 0
+          -5.4612e-10 4.65403e-10 0 -7.46307e-10 2.965e-10 0 -9.04521e-10 8.75193e-11 0 -9.38612e-10 -1.42219e-10 0
+          -8.27401e-10 -3.54203e-10 0 -6.99868e-10 -5.56911e-10 0 -5.26916e-10 -7.14371e-10 0 -2.76637e-10 -8.14266e-10 0
+          -1.41688e-10 -8.48619e-10 0 -2.14244e-10 9.99198e-10 0 -4.15901e-10 9.34476e-10 0 -7.8402e-10 7.49904e-10 0
+          -1.06541e-09 4.70789e-10 0 -1.25862e-09 1.34404e-10 0 -1.28962e-09 -2.07901e-10 0 -1.18826e-09 -5.62417e-10 0
+          -1.01894e-09 -8.98368e-10 0 -7.41166e-10 -1.15115e-09 0 -3.88921e-10 -1.3112e-09 0 -1.99211e-10 -1.36641e-09 0
+          -3.02511e-10 1.76028e-09 0 -5.84953e-10 1.66091e-09 0 -1.09568e-09 1.3813e-09 0 -1.47751e-09 9.67207e-10 0
+          -1.70716e-09 4.75901e-10 0 -1.75486e-09 -3.19085e-11 0 -1.6405e-09 -5.48727e-10 0 -1.39213e-09 -9.98713e-10 0
+          -1.0094e-09 -1.3538e-09 0 -5.30561e-10 -1.58382e-09 0 -2.72049e-10 -1.66366e-09 0 -4.13305e-10 2.91618e-09 0
+          -7.94082e-10 2.77035e-09 0 -1.47267e-09 2.36916e-09 0 -1.96234e-09 1.79396e-09 0 -2.23608e-09 1.12908e-09 0
+          -2.29163e-09 4.42374e-10 0 -2.14418e-09 -2.25128e-10 0 -1.8135e-09 -8.16932e-10 0 -1.31875e-09 -1.29099e-09 0
+          -6.95496e-10 -1.60228e-09 0 -3.57427e-10 -1.71142e-09 0 -5.48342e-10 4.24548e-09 0 -1.04268e-09 4.03608e-09 0
+          -1.9057e-09 3.48061e-09 0 -2.49905e-09 2.7192e-09 0 -2.81147e-09 1.86925e-09 0 -2.86236e-09 1.00697e-09 0
+          -2.67434e-09 1.83622e-10 0 -2.26632e-09 -5.55049e-10 0 -1.65664e-09 -1.15753e-09 0 -8.78535e-10 -1.56213e-09 0
+          -4.53242e-10 -1.70636e-09 0 -7.10581e-10 6.53185e-09 0 -1.32886e-09 6.23303e-09 0 -2.37951e-09 5.48524e-09 0
+          -3.05923e-09 4.51877e-09 0 -3.39418e-09 3.48272e-09 0 -3.43027e-09 2.45453e-09 0 -3.2014e-09 1.47993e-09 0
+          -2.7246e-09 5.98273e-10 0 -2.00751e-09 -1.38085e-10 0 -1.07352e-09 -6.48925e-10 0 -5.57201e-10 -8.35675e-10 0
+          -8.81613e-10 1.13828e-08 0 -1.60572e-09 1.09569e-08 0 -2.79651e-09 9.98018e-09 0 -3.51312e-09 8.80387e-09 0
+          -3.84175e-09 7.59393e-09 0 -3.85546e-09 6.41677e-09 0 -3.59544e-09 5.30651e-09 0 -3.07594e-09 4.29348e-09 0
+          -2.29031e-09 3.42385e-09 0 -1.23897e-09 2.795e-09 0 -6.488e-10 2.55698e-09 0 -1.01654e-09 1.92855e-08 0
+          -1.77818e-09 1.86843e-08 0 -2.98561e-09 1.74593e-08 0 -3.65553e-09 1.60908e-08 0 -3.94067e-09 1.47336e-08 0
+          -3.92905e-09 1.3434e-08 0 -3.66286e-09 1.2213e-08 0 -3.15274e-09 1.10887e-08 0 -2.37783e-09 1.00971e-08 0
+          -1.30595e-09 9.34497e-09 0 -6.92396e-10 9.0478e-09 0 -1.09977e-09 2.94864e-08 0 -1.81541e-09 2.86582e-08 0
+          -2.90824e-09 2.71954e-08 0 -3.46463e-09 2.56724e-08 0 -3.68364e-09 2.42034e-08 0 -3.65061e-09 2.28128e-08 0
+          -3.40318e-09 2.15095e-08 0 -2.94881e-09 2.03009e-08 0 -2.25787e-09 1.9209e-08 0 -1.26407e-09 1.83383e-08 0
+          -6.81455e-10 1.79773e-08 0 -1.24784e-09 4.11143e-08 0 -1.90961e-09 3.99989e-08 0 -2.88739e-09 3.8328e-08 0
+          -3.34613e-09 3.66908e-08 0 -3.51145e-09 3.5142e-08 0 -3.46041e-09 3.36871e-08 0 -3.2263e-09 3.23256e-08 0
+          -2.81492e-09 3.10568e-08 0 -2.19246e-09 2.98877e-08 0 -1.25639e-09 2.89069e-08 0 -6.91875e-10 2.84781e-08 0
+          -1.31967e-09 4.71612e-08 0 -1.89569e-09 4.5885e-08 0 -2.7324e-09 4.41182e-08 0 -3.10653e-09 4.24329e-08 0
+          -3.23116e-09 4.08507e-08 0 -3.17209e-09 3.93691e-08 0 -2.95795e-09 3.79835e-08 0 -2.59358e-09 3.66895e-08 0
+          -2.04706e-09 3.54869e-08 0 -1.19578e-09 3.44528e-08 0 -6.70507e-10 3.39888e-08 0
         </DataArray>
         <DataArray type="Float32" Name="velocityN" NumberOfComponents="3" format="ascii">
-          1.14356e-17 3.41945e-11 0 1.05283e-16 3.41928e-11 0 1.0261e-16 8.76324e-11 0 2.05486e-16 8.7628e-11 0
-          -2.9805e-16 3.41488e-11 0 5.14037e-16 8.75969e-11 0 -3.65741e-16 3.43557e-11 0 -1.10687e-15 8.76278e-11 0
-          7.27287e-17 3.42769e-11 0 -7.49983e-16 8.77817e-11 0 -9.35733e-16 3.4301e-11 0 2.07536e-15 8.76549e-11 0
-          4.71847e-15 3.48126e-11 0 -3.61661e-16 8.77123e-11 0 1.15207e-15 3.20476e-11 0 -8.93892e-16 8.69215e-11 0
-          -4.54818e-15 3.42537e-11 0 8.80419e-16 8.76188e-11 0 -3.14358e-18 3.42581e-11 0 6.66549e-17 8.76158e-11 0
-          4.09588e-18 3.42574e-11 0 2.5244e-17 8.76141e-11 0 5.88866e-16 2.00059e-10 0 5.69714e-16 2.00037e-10 0
-          1.07881e-15 2.0001e-10 0 1.4237e-15 1.99888e-10 0 -3.64929e-15 2.00002e-10 0 1.02848e-15 2.00247e-10 0
-          -5.91797e-15 1.99654e-10 0 -1.71151e-15 2.00935e-10 0 9.86427e-15 1.99922e-10 0 4.06308e-16 1.99898e-10 0
-          9.28936e-17 1.99894e-10 0 9.01583e-15 3.11082e-10 0 8.17721e-15 3.11048e-10 0 6.48739e-15 3.11018e-10 0
-          1.77706e-14 3.10961e-10 0 1.56576e-14 3.1083e-10 0 2.3078e-15 3.11174e-10 0 -7.93975e-14 3.10818e-10 0
-          -9.3978e-15 3.11749e-10 0 8.13506e-14 3.10931e-10 0 1.09908e-14 3.10869e-10 0 2.48526e-15 3.10862e-10 0
-          2.47386e-13 1.17287e-10 0 3.35046e-13 1.17434e-10 0 4.51217e-13 1.17467e-10 0 6.41397e-13 1.17296e-10 0
-          7.14225e-13 1.1744e-10 0 1.86776e-13 1.17783e-10 0 -8.11095e-13 1.18029e-10 0 1.82212e-13 1.16067e-10 0
-          1.32614e-12 1.17932e-10 0 5.72485e-13 1.17702e-10 0 2.27476e-13 1.17563e-10 0 7.05056e-13 -3.99646e-10 0
-          1.12933e-12 -3.99099e-10 0 1.65287e-12 -3.98739e-10 0 1.6175e-12 -3.98865e-10 0 1.41996e-12 -3.98536e-10 0
-          1.49002e-12 -3.9793e-10 0 2.27572e-12 -3.97988e-10 0 1.70152e-12 -4.00733e-10 0 1.01696e-12 -3.98149e-10 0
-          1.21418e-12 -3.97744e-10 0 8.69016e-13 -3.97585e-10 0 2.76239e-12 -1.01389e-09 0 3.65598e-12 -1.01185e-09 0
-          4.4801e-12 -1.01055e-09 0 4.30392e-12 -1.01045e-09 0 4.16733e-12 -1.01023e-09 0 4.28531e-12 -1.00991e-09 0
-          4.51657e-12 -1.0104e-09 0 4.37538e-12 -1.01125e-09 0 4.25945e-12 -1.01048e-09 0 3.57621e-12 -1.00867e-09 0
-          2.78431e-12 -1.00672e-09 0 1.04914e-11 -2.5242e-09 0 1.21024e-11 -2.51579e-09 0 1.29437e-11 -2.51243e-09 0
-          1.20025e-11 -2.51261e-09 0 1.18283e-11 -2.51252e-09 0 1.18849e-11 -2.51234e-09 0 1.19647e-11 -2.51273e-09 0
-          1.20549e-11 -2.51336e-09 0 1.28706e-11 -2.51319e-09 0 1.20038e-11 -2.50938e-09 0 1.03909e-11 -2.50103e-09 0
-          9.02028e-11 -6.59631e-09 0 9.66559e-11 -6.5428e-09 0 9.59857e-11 -6.53145e-09 0 8.8026e-11 -6.53494e-09 0
-          8.72203e-11 -6.53534e-09 0 8.73206e-11 -6.53518e-09 0 8.73982e-11 -6.53548e-09 0 8.82178e-11 -6.53649e-09 0
-          9.59875e-11 -6.53962e-09 0 9.60986e-11 -6.52773e-09 0 8.92517e-11 -6.47498e-09 0 4.46086e-10 -1.38946e-08 0
-          4.39967e-10 -1.36212e-08 0 4.02053e-10 -1.35926e-08 0 3.68681e-10 -1.36111e-08 0 3.67198e-10 -1.36126e-08 0
-          3.67412e-10 -1.36125e-08 0 3.67526e-10 -1.36127e-08 0 3.69391e-10 -1.36148e-08 0 4.02525e-10 -1.36326e-08 0
-          4.37388e-10 -1.36026e-08 0 4.40988e-10 -1.33336e-08 0 1.54581e-09 -2.40176e-08 0 1.38016e-09 -2.29973e-08 0
-          1.13128e-09 -2.2984e-08 0 1.04907e-09 -2.30428e-08 0 1.05e-09 -2.30446e-08 0 1.05017e-09 -2.30446e-08 0
-          1.05065e-09 -2.30447e-08 0 1.05104e-09 -2.30476e-08 0 1.13372e-09 -2.31047e-08 0 1.37137e-09 -2.30859e-08 0
-          1.5265e-09 -2.2083e-08 0 4.15941e-09 -3.65999e-08 0 3.32956e-09 -3.36353e-08 0 2.38311e-09 -3.38421e-08 0
-          2.2749e-09 -3.39644e-08 0 2.28235e-09 -3.39632e-08 0 2.28203e-09 -3.39637e-08 0 2.28348e-09 -3.39638e-08 0
-          2.27888e-09 -3.3965e-08 0 2.39145e-09 -3.40845e-08 0 3.30623e-09 -3.42731e-08 0 4.10302e-09 -3.13604e-08 0
-          8.74859e-09 -4.34525e-08 0 6.44885e-09 -3.91106e-08 0 4.10098e-09 -3.95115e-08 0 4.06195e-09 -3.96692e-08 0
-          4.06988e-09 -3.96654e-08 0 4.07001e-09 -3.96663e-08 0 4.07172e-09 -3.96664e-08 0 4.06832e-09 -3.96658e-08 0
-          4.12088e-09 -3.98202e-08 0 6.40043e-09 -4.01935e-08 0 8.62361e-09 -3.59281e-08 0
+          8.09459e-17 3.42094e-11 0 9.22242e-17 3.41892e-11 0 6.39537e-18 8.76404e-11 0 -5.55732e-17 8.76337e-11 0
+          -3.27316e-16 3.416e-11 0 3.51537e-16 8.76329e-11 0 -2.34271e-16 3.43583e-11 0 -4.77571e-17 8.76595e-11 0
+          2.96387e-17 3.42827e-11 0 -4.80492e-16 8.76421e-11 0 -4.1242e-16 3.43325e-11 0 1.31783e-15 8.76724e-11 0
+          2.27562e-15 3.4604e-11 0 2.41035e-15 8.73849e-11 0 4.87143e-16 3.33305e-11 0 -9.04802e-16 8.70396e-11 0
+          -2.08885e-15 3.4256e-11 0 -1.92964e-15 8.76188e-11 0 -1.73708e-18 3.42585e-11 0 5.30731e-17 8.7616e-11 0
+          2.74304e-18 3.42579e-11 0 1.56311e-17 8.76149e-11 0 1.38463e-16 2.00051e-10 0 3.67234e-16 2.0005e-10 0
+          1.52674e-15 2.00043e-10 0 -3.09887e-15 1.99884e-10 0 -2.50972e-15 2.00251e-10 0 -1.60013e-14 2.00146e-10 0
+          -2.60095e-15 2.01444e-10 0 1.9909e-14 2.00163e-10 0 5.00245e-15 1.99918e-10 0 3.44731e-16 1.99898e-10 0
+          6.60268e-17 1.99895e-10 0 4.3126e-15 3.11059e-10 0 9.18451e-15 3.11046e-10 0 7.72043e-15 3.11001e-10 0
+          -2.73583e-15 3.10919e-10 0 2.9307e-14 3.11245e-10 0 1.62397e-13 3.10995e-10 0 -7.12411e-14 3.12082e-10 0
+          -1.52439e-13 3.11406e-10 0 5.68445e-14 3.10921e-10 0 9.40955e-15 3.10869e-10 0 2.0587e-15 3.10863e-10 0
+          2.16884e-13 1.17297e-10 0 3.55368e-13 1.17357e-10 0 4.38133e-13 1.17528e-10 0 5.44621e-13 1.17279e-10 0
+          1.42603e-12 1.16685e-10 0 3.37908e-12 1.16244e-10 0 -6.35881e-13 1.21656e-10 0 -2.86628e-12 1.1423e-10 0
+          4.23097e-13 1.17228e-10 0 4.43403e-13 1.1761e-10 0 1.92734e-13 1.1753e-10 0 7.51697e-13 -3.99639e-10 0
+          1.11589e-12 -3.99183e-10 0 1.67489e-12 -3.9866e-10 0 1.93377e-12 -3.99052e-10 0 1.72196e-12 -3.99915e-10 0
+          -1.38038e-13 -3.99322e-10 0 2.36498e-12 -3.92297e-10 0 3.32024e-12 -4.02513e-10 0 6.59382e-13 -3.99493e-10 0
+          9.58417e-13 -3.98072e-10 0 7.8646e-13 -3.97719e-10 0 2.76127e-12 -1.01393e-09 0 3.65395e-12 -1.01188e-09 0
+          4.53534e-12 -1.0106e-09 0 4.4785e-12 -1.01084e-09 0 4.07748e-12 -1.0112e-09 0 3.71857e-12 -1.00966e-09 0
+          4.54908e-12 -1.00832e-09 0 4.95792e-12 -1.01118e-09 0 4.3363e-12 -1.01155e-09 0 3.41942e-12 -1.00919e-09 0
+          2.69906e-12 -1.00698e-09 0 1.04902e-11 -2.52423e-09 0 1.21049e-11 -2.51582e-09 0 1.2977e-11 -2.51253e-09 0
+          1.20636e-11 -2.51305e-09 0 1.1765e-11 -2.51317e-09 0 1.16806e-11 -2.51197e-09 0 1.19772e-11 -2.51134e-09 0
+          1.22688e-11 -2.51312e-09 0 1.29316e-11 -2.51396e-09 0 1.19511e-11 -2.50995e-09 0 1.0346e-11 -2.50138e-09 0
+          9.02027e-11 -6.59633e-09 0 9.66638e-11 -6.54282e-09 0 9.60278e-11 -6.53157e-09 0 8.80769e-11 -6.53537e-09 0
+          8.71363e-11 -6.53584e-09 0 8.71253e-11 -6.53479e-09 0 8.74113e-11 -6.53433e-09 0 8.84258e-11 -6.53622e-09 0
+          9.60723e-11 -6.54025e-09 0 9.60604e-11 -6.5283e-09 0 8.92064e-11 -6.47537e-09 0 4.46088e-10 -1.38946e-08 0
+          4.39979e-10 -1.36212e-08 0 4.02099e-10 -1.35927e-08 0 3.6872e-10 -1.36115e-08 0 3.67102e-10 -1.3613e-08 0
+          3.67227e-10 -1.36121e-08 0 3.67539e-10 -1.36117e-08 0 3.69591e-10 -1.36145e-08 0 4.02625e-10 -1.36331e-08 0
+          4.37365e-10 -1.36031e-08 0 4.40948e-10 -1.3334e-08 0 1.54581e-09 -2.40176e-08 0 1.38018e-09 -2.29973e-08 0
+          1.13132e-09 -2.29842e-08 0 1.0491e-09 -2.30432e-08 0 1.04991e-09 -2.30449e-08 0 1.05001e-09 -2.30442e-08 0
+          1.05066e-09 -2.30438e-08 0 1.05121e-09 -2.30473e-08 0 1.13382e-09 -2.31051e-08 0 1.37136e-09 -2.30864e-08 0
+          1.52647e-09 -2.20834e-08 0 4.15941e-09 -3.65999e-08 0 3.32957e-09 -3.36353e-08 0 2.38314e-09 -3.38422e-08 0
+          2.27491e-09 -3.39647e-08 0 2.28228e-09 -3.39635e-08 0 2.28193e-09 -3.39633e-08 0 2.28349e-09 -3.3963e-08 0
+          2.27899e-09 -3.39647e-08 0 2.39151e-09 -3.40848e-08 0 3.30623e-09 -3.42736e-08 0 4.103e-09 -3.13608e-08 0
+          8.74859e-09 -4.34525e-08 0 6.44885e-09 -3.91106e-08 0 4.10099e-09 -3.95116e-08 0 4.06196e-09 -3.96695e-08 0
+          4.06986e-09 -3.96656e-08 0 4.06998e-09 -3.96659e-08 0 4.07172e-09 -3.96656e-08 0 4.06836e-09 -3.96655e-08 0
+          4.1209e-09 -3.98205e-08 0 6.40043e-09 -4.01939e-08 0 8.6236e-09 -3.59286e-08 0
         </DataArray>
       </PointData>
       <CellData Scalars="process rank">