diff --git a/dumux/porousmediumflow/3p3c/localresidual.hh b/dumux/porousmediumflow/3p3c/localresidual.hh
index 335843787cb696fdbbaefc3103200dc31cb6012a..2dbf5cd49bd6456fca40ad08c1dee312d6a82e61 100644
--- a/dumux/porousmediumflow/3p3c/localresidual.hh
+++ b/dumux/porousmediumflow/3p3c/localresidual.hh
@@ -165,26 +165,28 @@ public:
         const auto diffusionFluxesWPhase = fluxVars.molecularDiffusionFlux(wPhaseIdx);
         Scalar jGW = diffusionFluxesWPhase[gCompIdx];
         Scalar jNW = diffusionFluxesWPhase[nCompIdx];
+        Scalar jWW = -(jGW+jNW);
 
         //check for the reference system and adapt units of the diffusive flux accordingly.
         if (referenceSystemFormulation == ReferenceSystemFormulation::massAveraged)
         {
             jGW /= FluidSystem::molarMass(gCompIdx);
             jNW /= FluidSystem::molarMass(nCompIdx);
+            jWW /= FluidSystem::molarMass(wCompIdx);
         }
-        const Scalar jWW = -(jGW+jNW);
 
         const auto diffusionFluxesGPhase = fluxVars.molecularDiffusionFlux(gPhaseIdx);
         Scalar jWG = diffusionFluxesGPhase[wCompIdx];
         Scalar jNG = diffusionFluxesGPhase[nCompIdx];
+        Scalar jGG = -(jWG+jNG);
 
         //check for the reference system and adapt units of the diffusive flux accordingly.
         if (referenceSystemFormulation == ReferenceSystemFormulation::massAveraged)
         {
             jWG /= FluidSystem::molarMass(wCompIdx);
             jNG /= FluidSystem::molarMass(nCompIdx);
+            jGG /= FluidSystem::molarMass(gCompIdx);
         }
-        const Scalar jGG = -(jWG+jNG);
 
         // At the moment we do not consider diffusion in the NAPL phase
         const Scalar jWN = 0.0;
diff --git a/dumux/porousmediumflow/3pwateroil/localresidual.hh b/dumux/porousmediumflow/3pwateroil/localresidual.hh
index 1191ea582c13f35e8d3d51f6056ad86e1f905f7b..9649a2541d5ae270f5d34267409d4bd978a61321 100644
--- a/dumux/porousmediumflow/3pwateroil/localresidual.hh
+++ b/dumux/porousmediumflow/3pwateroil/localresidual.hh
@@ -175,24 +175,33 @@ public:
         static constexpr auto referenceSystemFormulation = FluxVariables::MolecularDiffusionType::referenceSystemFormulation();
         const auto diffusionFluxesWPhase = fluxVars.molecularDiffusionFlux(wPhaseIdx);
         Scalar jNW = diffusionFluxesWPhase[nCompIdx];
+        Scalar jWW = -jNW;
         // check for the reference system and adapt units of the diffusive flux accordingly.
         if (referenceSystemFormulation == ReferenceSystemFormulation::massAveraged)
+        {
             jNW /=  FluidSystem::molarMass(nCompIdx);
-        const Scalar jWW = -jNW;
+            jWW /=  FluidSystem::molarMass(wCompIdx);
+        }
 
         const auto diffusionFluxesGPhase = fluxVars.molecularDiffusionFlux(gPhaseIdx);
         Scalar jWG = diffusionFluxesGPhase[wCompIdx];
+        Scalar jNG = -jWG;
         // check for the reference system and adapt units of the diffusive flux accordingly.
         if (referenceSystemFormulation == ReferenceSystemFormulation::massAveraged)
+        {
             jWG /= FluidSystem::molarMass(wCompIdx);
-        const Scalar jNG = -jWG;
+            jNG /= FluidSystem::molarMass(nCompIdx);
+        }
 
         const auto diffusionFluxesNPhase = fluxVars.molecularDiffusionFlux(nPhaseIdx);
         Scalar jWN = diffusionFluxesNPhase[wCompIdx];
+        Scalar jNN = -jWN;
         // check for the reference system and adapt units of the diffusive flux accordingly.
         if (referenceSystemFormulation == ReferenceSystemFormulation::massAveraged)
+        {
             jWN /= FluidSystem::molarMass(wCompIdx);
-        const Scalar jNN = -jWN;
+            jNN /= FluidSystem::molarMass(nCompIdx);
+        }
 
         flux[conti0EqIdx] += jWW+jWG+jWN;
         flux[conti1EqIdx] += jNW+jNG+jNN;
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
index faa487f11932a3a3f4a290ccca85837eb69b499d..e1eeba40ecdea576cb60cb27391ba473a8d2232b 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
+++ b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
@@ -9,7 +9,7 @@ dumux_add_test(NAME test_3p3cni_columnxylol_box
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_3p3cni_columnxylol_box-reference.vtu
-                               ${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_columnxylol_box-00061.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_columnxylol_box-00069.vtu
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_columnxylol_box params.input -Problem.Name test_3p3cni_columnxylol_box")
 
 dumux_add_test(NAME test_3p3cni_columnxylol_tpfa
diff --git a/test/references/test_3p3cni_columnxylol_box-reference.vtu b/test/references/test_3p3cni_columnxylol_box-reference.vtu
index 74063c56b2f49dd815830537c609f816dcb62ebb..75dec7d09f0dbe6d9ba9adfa6cd5890c5458fe34 100644
--- a/test/references/test_3p3cni_columnxylol_box-reference.vtu
+++ b/test/references/test_3p3cni_columnxylol_box-reference.vtu
@@ -22,9 +22,9 @@
           0.00499998 0.00499998 0.00499999 0.00499999 0.00499999 0.00499999 0.00499999 0.00499999 0.00499999 0.00499999 0.00499999 0.00499999
           0.00499999 0.00499999 0.005 0.005 0.005 0.005 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001
           0.00500001 0.00500001 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
-          0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.00500001 0.00500001 0.00500006 0.00500006
-          0.00500071 0.00500071 0.00500894 0.00500894 0.00521304 0.00521304 0.0336511 0.0336511 0.0769172 0.0769172 0.146717 0.146717
-          0.162309 0.162309
+          0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.00500001 0.00500001 0.00500007 0.00500007
+          0.00500077 0.00500077 0.00500978 0.00500978 0.00527077 0.00527077 0.0336782 0.0336782 0.076542 0.076542 0.147179 0.147179
+          0.162005 0.162005
         </DataArray>
         <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           99947.1 99947.1 99947 99947 99946.9 99946.9 99946.8 99946.8 99946.6 99946.6 99946.5 99946.5
@@ -37,17 +37,17 @@
           99942.2 99942.2 99942.1 99942.1 99942 99942 99941.9 99941.9 99941.7 99941.7 99941.6 99941.6
           99941.5 99941.5 99941.4 99941.4 99941.3 99941.3 99941.1 99941.1 99941 99941 99940.9 99940.9
           99940.8 99940.8 99940.7 99940.7 99940.6 99940.6 99940.4 99940.4 99940.3 99940.3 99940.2 99940.2
-          99940.1 99940.1 99940 99940 99939.9 99939.9 99939.7 99939.7 99939.6 99939.6 99939.5 99939.5
+          99940.1 99940.1 99940 99940 99939.9 99939.9 99939.8 99939.8 99939.6 99939.6 99939.5 99939.5
           99939.4 99939.4 99939.3 99939.3 99939.2 99939.2 99939 99939 99938.9 99938.9 99938.8 99938.8
           99938.7 99938.7 99938.6 99938.6 99938.5 99938.5 99938.3 99938.3 99938.2 99938.2 99938.1 99938.1
           99938 99938 99937.9 99937.9 99937.8 99937.8 99937.6 99937.6 99937.5 99937.5 99937.4 99937.4
           99937.3 99937.3 99937.2 99937.2 99937.1 99937.1 99936.9 99936.9 99936.8 99936.8 99936.7 99936.7
-          45892 45892 45805.8 45805.8 45718.4 45718.4 45629.9 45629.9 45540.3 45540.3 45449 45449
-          45355.6 45355.6 45258.9 45258.9 45157.9 45157.9 45050.5 45050.5 44934.5 44934.5 44806.3 44806.3
-          44661 44661 44491.6 44491.6 44288 44288 44037.5 44037.5 43729 43729 43372.1 43372.1
-          43018.7 43018.7 42702.3 42702.3 42389.9 42389.9 42042.6 42042.6 41632.4 41632.4 41113.9 41113.9
-          40413.1 40413.1 39428.2 39428.2 41665.9 41665.9 53416.2 53416.2 68500.9 68500.9 93777.3 93777.3
-          94795.5 94795.5
+          45893.1 45893.1 45807.1 45807.1 45719.9 45719.9 45631.7 45631.7 45542.2 45542.2 45451.1 45451.1
+          45357.8 45357.8 45261.2 45261.2 45160.2 45160.2 45053 45053 44937 44937 44808.9 44808.9
+          44663.7 44663.7 44494.2 44494.2 44290.7 44290.7 44040.3 44040.3 43731.8 43731.8 43374.9 43374.9
+          43021.4 43021.4 42705.1 42705.1 42392.8 42392.8 42045.4 42045.4 41635.2 41635.2 41116.8 41116.8
+          40416.1 40416.1 39431.7 39431.7 41677.4 41677.4 53424.9 53424.9 68383.4 68383.4 93821.4 93821.4
+          94790 94790
         </DataArray>
         <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
@@ -69,8 +69,8 @@
           997.637 997.637 997.637 997.637 997.637 997.637 997.637 997.637 997.637 997.637 997.637 997.637
           997.636 997.636 997.636 997.636 997.636 997.636 997.636 997.636 997.636 997.636 997.636 997.636
           997.636 997.636 997.636 997.636 997.635 997.635 997.635 997.635 997.635 997.635 997.634 997.634
-          997.625 997.625 997.519 997.519 996.209 996.209 980.955 980.955 967.145 967.145 964.445 964.445
-          959.187 959.187
+          997.624 997.624 997.516 997.516 996.182 996.182 981.016 981.016 967.381 967.381 964.424 964.424
+          958.752 958.752
         </DataArray>
         <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
@@ -92,8 +92,8 @@
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
-          0.99996 0.99996 0.999959 0.999959 0.999951 0.999951 0.999763 0.999763 0.999379 0.999379 0.999557 0.999557
-          0.999984 0.999984
+          0.99996 0.99996 0.999959 0.999959 0.999951 0.999951 0.999764 0.999764 0.999388 0.999388 0.999545 0.999545
+          0.999987 0.999987
         </DataArray>
         <DataArray type="Float32" Name="x^xylene_aq" NumberOfComponents="1" format="ascii">
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
@@ -111,12 +111,12 @@
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
-          2.62564e-05 2.62564e-05 2.62564e-05 2.62564e-05 2.62564e-05 2.62564e-05 2.62565e-05 2.62565e-05 2.62565e-05 2.62565e-05 2.62566e-05 2.62566e-05
+          2.62565e-05 2.62565e-05 2.62564e-05 2.62564e-05 2.62564e-05 2.62564e-05 2.62565e-05 2.62565e-05 2.62565e-05 2.62565e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
-          2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62567e-05 2.62567e-05 2.62571e-05 2.62571e-05 2.62623e-05 2.62623e-05
-          2.63242e-05 2.63242e-05 2.70516e-05 2.70516e-05 3.64053e-05 3.64053e-05 0.000230951 0.000230951 0.000620412 0.000620412 0.000442455 0.000442455
-          1.578e-05 1.578e-05
+          2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62567e-05 2.62567e-05 2.62571e-05 2.62571e-05 2.62625e-05 2.62625e-05
+          2.63263e-05 2.63263e-05 2.7072e-05 2.7072e-05 3.66002e-05 3.66002e-05 0.000229759 0.000229759 0.000611292 0.000611292 0.000455234 0.000455234
+          1.31198e-05 1.31198e-05
         </DataArray>
         <DataArray type="Float32" Name="x^Air_aq" NumberOfComponents="1" format="ascii">
           1.37483e-05 1.37483e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05
@@ -134,12 +134,12 @@
           1.37471e-05 1.37471e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05
           1.3747e-05 1.3747e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05
           1.37469e-05 1.37469e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05
-          1.37474e-05 1.37474e-05 1.3748e-05 1.3748e-05 1.37485e-05 1.37485e-05 1.37488e-05 1.37488e-05 1.3749e-05 1.3749e-05 1.37491e-05 1.37491e-05
-          1.37493e-05 1.37493e-05 1.37494e-05 1.37494e-05 1.37494e-05 1.37494e-05 1.37495e-05 1.37495e-05 1.37495e-05 1.37495e-05 1.37496e-05 1.37496e-05
-          1.37496e-05 1.37496e-05 1.37496e-05 1.37496e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05
-          1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37497e-05 1.37496e-05 1.37496e-05 1.37487e-05 1.37487e-05
-          1.37385e-05 1.37385e-05 1.36207e-05 1.36207e-05 1.2426e-05 1.2426e-05 6.31336e-06 6.31336e-06 2.07889e-07 2.07889e-07 9.00182e-08 9.00182e-08
-          1.8594e-07 1.8594e-07
+          1.37475e-05 1.37475e-05 1.37482e-05 1.37482e-05 1.37487e-05 1.37487e-05 1.3749e-05 1.3749e-05 1.37493e-05 1.37493e-05 1.37495e-05 1.37495e-05
+          1.37496e-05 1.37496e-05 1.37497e-05 1.37497e-05 1.37498e-05 1.37498e-05 1.37498e-05 1.37498e-05 1.37499e-05 1.37499e-05 1.37499e-05 1.37499e-05
+          1.375e-05 1.375e-05 1.375e-05 1.375e-05 1.375e-05 1.375e-05 1.37501e-05 1.37501e-05 1.37501e-05 1.37501e-05 1.37501e-05 1.37501e-05
+          1.37501e-05 1.37501e-05 1.37501e-05 1.37501e-05 1.37501e-05 1.37501e-05 1.37501e-05 1.37501e-05 1.375e-05 1.375e-05 1.37491e-05 1.37491e-05
+          1.37386e-05 1.37386e-05 1.36179e-05 1.36179e-05 1.2406e-05 1.2406e-05 6.33439e-06 6.33439e-06 3.42305e-07 3.42305e-07 1.46427e-08 1.46427e-08
+          7.06484e-12 7.06484e-12
         </DataArray>
         <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 9.99999e-05 9.99999e-05 9.99999e-05 9.99999e-05
@@ -156,12 +156,12 @@
           9.99962e-05 9.99962e-05 9.99962e-05 9.99962e-05 9.99961e-05 9.99961e-05 9.9996e-05 9.9996e-05 9.9996e-05 9.9996e-05 9.99959e-05 9.99959e-05
           9.99959e-05 9.99959e-05 9.99958e-05 9.99958e-05 9.99957e-05 9.99957e-05 9.99957e-05 9.99957e-05 9.99956e-05 9.99956e-05 9.99956e-05 9.99956e-05
           9.99955e-05 9.99955e-05 9.99955e-05 9.99955e-05 9.99954e-05 9.99954e-05 9.99953e-05 9.99953e-05 9.99953e-05 9.99953e-05 9.99952e-05 9.99952e-05
-          9.99952e-05 9.99952e-05 9.99951e-05 9.99951e-05 9.9995e-05 9.9995e-05 9.9995e-05 9.9995e-05 9.99948e-05 9.99948e-05 9.98474e-05 9.98474e-05
-          0.913312 0.913312 0.889921 0.889921 0.863292 0.863292 0.833649 0.833649 0.801279 0.801279 0.766491 0.766491
-          0.729582 0.729582 0.690808 0.690808 0.650365 0.650365 0.608371 0.608371 0.564857 0.564857 0.519785 0.519785
-          0.473102 0.473102 0.424864 0.424864 0.375479 0.375479 0.326158 0.326158 0.27959 0.27959 0.240316 0.240316
-          0.212329 0.212329 0.193723 0.193723 0.179621 0.179621 0.167565 0.167565 0.156847 0.156847 0.147057 0.147057
-          0.138104 0.138104 0.130337 0.130337 0.155716 0.155716 0.2073 0.2073 0.14496 0.14496 0 0
+          9.99952e-05 9.99952e-05 9.99951e-05 9.99951e-05 9.9995e-05 9.9995e-05 9.9995e-05 9.9995e-05 9.99948e-05 9.99948e-05 9.98492e-05 9.98492e-05
+          0.913438 0.913438 0.889956 0.889956 0.863284 0.863284 0.833624 0.833624 0.801248 0.801248 0.766459 0.766459
+          0.729551 0.729551 0.690782 0.690782 0.650345 0.650345 0.608359 0.608359 0.564851 0.564851 0.519785 0.519785
+          0.473106 0.473106 0.424871 0.424871 0.375487 0.375487 0.326165 0.326165 0.279594 0.279594 0.240316 0.240316
+          0.212328 0.212328 0.193722 0.193722 0.179621 0.179621 0.167565 0.167565 0.156847 0.156847 0.147057 0.147057
+          0.138104 0.138104 0.130338 0.130338 0.155401 0.155401 0.206818 0.206818 0.145699 0.145699 0 0
           0 0
         </DataArray>
         <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
@@ -175,17 +175,17 @@
           99942.2 99942.2 99942.1 99942.1 99942 99942 99941.9 99941.9 99941.7 99941.7 99941.6 99941.6
           99941.5 99941.5 99941.4 99941.4 99941.3 99941.3 99941.1 99941.1 99941 99941 99940.9 99940.9
           99940.8 99940.8 99940.7 99940.7 99940.6 99940.6 99940.4 99940.4 99940.3 99940.3 99940.2 99940.2
-          99940.1 99940.1 99940 99940 99939.9 99939.9 99939.7 99939.7 99939.6 99939.6 99939.5 99939.5
+          99940.1 99940.1 99940 99940 99939.9 99939.9 99939.8 99939.8 99939.6 99939.6 99939.5 99939.5
           99939.4 99939.4 99939.3 99939.3 99939.2 99939.2 99939 99939 99938.9 99938.9 99938.8 99938.8
           99938.7 99938.7 99938.6 99938.6 99938.5 99938.5 99938.3 99938.3 99938.2 99938.2 99938.1 99938.1
           99938 99938 99937.9 99937.9 99937.8 99937.8 99937.6 99937.6 99937.5 99937.5 99937.4 99937.4
           99937.3 99937.3 99937.2 99937.2 99937.1 99937.1 99936.9 99936.9 99936.8 99936.8 99936.7 99936.7
-          98773.1 98773.1 98686.9 98686.9 98599.5 98599.5 98511 98511 98421.4 98421.4 98330.2 98330.2
-          98236.7 98236.7 98140.1 98140.1 98039 98039 97931.6 97931.6 97815.6 97815.6 97687.4 97687.4
-          97542.1 97542.1 97372.7 97372.7 97169.1 97169.1 96918.6 96918.6 96610.2 96610.2 96253.3 96253.3
-          95899.8 95899.8 95583.5 95583.5 95271.1 95271.1 94923.7 94923.7 94513.5 94513.5 93995 93995
-          93294 93294 92306.1 92306.1 94472 94472 96206.3 96206.3 96052.5 96052.5 93777.3 93777.3
-          94795.5 94795.5
+          98774.3 98774.3 98688.2 98688.2 98601.1 98601.1 98512.8 98512.8 98423.3 98423.3 98332.2 98332.2
+          98238.9 98238.9 98142.4 98142.4 98041.4 98041.4 97934.1 97934.1 97818.1 97818.1 97690 97690
+          97544.8 97544.8 97375.4 97375.4 97171.8 97171.8 96921.4 96921.4 96612.9 96612.9 96256 96256
+          95902.6 95902.6 95586.2 95586.2 95273.9 95273.9 94926.6 94926.6 94516.3 94516.3 93997.9 93997.9
+          93296.9 93296.9 92309.4 92309.4 94463.1 94463.1 96205.4 96205.4 96067.1 96067.1 93821.4 93821.4
+          94790 94790
         </DataArray>
         <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
@@ -207,8 +207,8 @@
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.462 860.462
-          860.428 860.428 860.033 860.033 855.615 855.615 822.277 822.277 798.796 798.796 796.222 796.222
-          791.806 791.806
+          860.427 860.427 860.022 860.022 855.534 855.534 822.387 822.387 799.187 799.187 796.111 796.111
+          791.247 791.247
         </DataArray>
         <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -253,8 +253,8 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
-          1 1 1 1 1 1 1 1 1 1 0.647651 0.647651
-          0.0196751 0.0196751
+          1 1 1 1 1 1 1 1 1 1 0.663624 0.663624
+          0.0160358 0.0160358
         </DataArray>
         <DataArray type="Float32" Name="x^Air_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -295,12 +295,12 @@
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
-          0.0816884 0.0816884 0.105079 0.105079 0.131708 0.131708 0.161351 0.161351 0.193721 0.193721 0.228509 0.228509
-          0.265418 0.265418 0.304192 0.304192 0.344635 0.344635 0.386629 0.386629 0.430143 0.430143 0.475215 0.475215
-          0.521898 0.521898 0.570136 0.570136 0.619521 0.619521 0.668842 0.668842 0.71541 0.71541 0.754684 0.754684
-          0.782671 0.782671 0.801277 0.801277 0.815379 0.815379 0.827435 0.827435 0.838153 0.838153 0.847943 0.847943
-          0.856896 0.856896 0.864654 0.864654 0.839071 0.839071 0.759049 0.759049 0.778123 0.778123 0.853283 0.853283
-          0.837691 0.837691
+          0.0815625 0.0815625 0.105044 0.105044 0.131716 0.131716 0.161376 0.161376 0.193752 0.193752 0.228541 0.228541
+          0.265449 0.265449 0.304218 0.304218 0.344655 0.344655 0.386641 0.386641 0.430149 0.430149 0.475215 0.475215
+          0.521894 0.521894 0.570129 0.570129 0.619513 0.619513 0.668835 0.668835 0.715406 0.715406 0.754684 0.754684
+          0.782672 0.782672 0.801278 0.801278 0.815379 0.815379 0.827435 0.827435 0.838153 0.838153 0.847943 0.847943
+          0.856895 0.856895 0.864652 0.864652 0.839329 0.839329 0.759503 0.759503 0.777759 0.777759 0.852821 0.852821
+          0.837995 0.837995
         </DataArray>
         <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100000 100000 99999.9 99999.9 99999.8 99999.8 99999.6 99999.6 99999.5 99999.5 99999.4 99999.4
@@ -318,12 +318,12 @@
           99991.6 99991.6 99991.5 99991.5 99991.3 99991.3 99991.2 99991.2 99991.1 99991.1 99991 99991
           99990.9 99990.9 99990.8 99990.8 99990.6 99990.6 99990.5 99990.5 99990.4 99990.4 99990.3 99990.3
           99990.2 99990.2 99990.1 99990.1 99989.9 99989.9 99989.8 99989.8 99989.7 99989.7 99989.6 99989.6
-          99993.7 99993.7 99998.2 99998.2 100001 100001 100003 100003 100005 100005 100006 100006
-          100007 100007 100008 100008 100008 100008 100009 100009 100009 100009 100009 100009
-          100009 100009 100010 100010 100010 100010 100010 100010 100010 100010 100010 100010
-          100010 100010 100010 100010 100010 100010 100010 100010 100010 100010 100010 100010
-          100010 100010 100010 100010 100010 100010 100011 100011 100097 100097 100173 100173
-          100271 100271
+          99994.3 99994.3 99999.4 99999.4 100003 100003 100005 100005 100007 100007 100008 100008
+          100009 100009 100010 100010 100011 100011 100011 100011 100012 100012 100012 100012
+          100012 100012 100012 100012 100012 100012 100013 100013 100013 100013 100013 100013
+          100013 100013 100013 100013 100013 100013 100013 100013 100013 100013 100013 100013
+          100013 100013 100013 100013 100013 100013 100015 100015 100106 100106 100180 100180
+          100279 100279
         </DataArray>
         <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19438 1.19438
@@ -337,16 +337,16 @@
           1.19433 1.19433 1.19432 1.19432 1.19432 1.19432 1.19432 1.19432 1.19432 1.19432 1.19432 1.19432
           1.19432 1.19432 1.19432 1.19432 1.19431 1.19431 1.19431 1.19431 1.19431 1.19431 1.19431 1.19431
           1.19431 1.19431 1.19431 1.19431 1.19431 1.19431 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943
-          1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.19429 1.19429 1.19429 1.19429
+          1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.19429 1.19429
           1.19429 1.19429 1.19429 1.19429 1.19429 1.19429 1.19429 1.19429 1.19429 1.19429 1.19429 1.19429
           1.19428 1.19428 1.19428 1.19428 1.19428 1.19428 1.19428 1.19428 1.19428 1.19428 1.19428 1.19428
           1.19428 1.19428 1.19427 1.19427 1.19427 1.19427 1.19427 1.19427 1.19427 1.19427 1.19427 1.19427
-          1.19432 1.19432 1.19437 1.19437 1.19441 1.19441 1.19443 1.19443 1.19445 1.19445 1.19446 1.19446
-          1.19447 1.19447 1.19448 1.19448 1.19449 1.19449 1.19449 1.19449 1.1945 1.1945 1.1945 1.1945
-          1.1945 1.1945 1.1945 1.1945 1.19451 1.19451 1.19451 1.19451 1.19451 1.19451 1.19451 1.19451
-          1.19451 1.19451 1.19451 1.19451 1.19451 1.19451 1.19451 1.19451 1.19451 1.19451 1.1945 1.1945
-          1.19438 1.19438 1.19303 1.19303 1.17909 1.17909 1.16081 1.16081 1.28317 1.28317 1.07849 1.07849
-          0.616623 0.616623
+          1.19432 1.19432 1.19438 1.19438 1.19443 1.19443 1.19445 1.19445 1.19447 1.19447 1.19449 1.19449
+          1.1945 1.1945 1.19451 1.19451 1.19452 1.19452 1.19452 1.19452 1.19453 1.19453 1.19453 1.19453
+          1.19453 1.19453 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454
+          1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19454 1.19453 1.19453
+          1.19441 1.19441 1.19303 1.19303 1.17888 1.17888 1.16057 1.16057 1.27988 1.27988 1.08909 1.08909
+          0.606011 0.606011
         </DataArray>
         <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0282497 0.0282497 0.0282498 0.0282498 0.0282498 0.0282498 0.0282498 0.0282498 0.0282499 0.0282499 0.0282499 0.0282499
@@ -358,18 +358,18 @@
           0.0282509 0.0282509 0.028251 0.028251 0.028251 0.028251 0.028251 0.028251 0.0282511 0.0282511 0.0282511 0.0282511
           0.0282511 0.0282511 0.0282512 0.0282512 0.0282512 0.0282512 0.0282512 0.0282512 0.0282513 0.0282513 0.0282513 0.0282513
           0.0282513 0.0282513 0.0282514 0.0282514 0.0282514 0.0282514 0.0282514 0.0282514 0.0282515 0.0282515 0.0282515 0.0282515
-          0.0282515 0.0282515 0.0282516 0.0282516 0.0282516 0.0282516 0.0282516 0.0282516 0.0282517 0.0282517 0.0282517 0.0282517
+          0.0282515 0.0282515 0.0282516 0.0282516 0.0282516 0.0282516 0.0282516 0.0282516 0.0282516 0.0282516 0.0282517 0.0282517
           0.0282517 0.0282517 0.0282518 0.0282518 0.0282518 0.0282518 0.0282518 0.0282518 0.0282518 0.0282518 0.0282519 0.0282519
           0.0282519 0.0282519 0.0282519 0.0282519 0.028252 0.028252 0.028252 0.028252 0.028252 0.028252 0.0282521 0.0282521
           0.0282521 0.0282521 0.0282521 0.0282521 0.0282522 0.0282522 0.0282522 0.0282522 0.0282522 0.0282522 0.0282523 0.0282523
           0.0282523 0.0282523 0.0282523 0.0282523 0.0282524 0.0282524 0.0282524 0.0282524 0.0282524 0.0282524 0.0282525 0.0282525
           0.0282525 0.0282525 0.0282525 0.0282525 0.0282526 0.0282526 0.0282526 0.0282526 0.0282526 0.0282526 0.0282527 0.0282527
-          0.0282513 0.0282513 0.02825 0.02825 0.0282492 0.0282492 0.0282486 0.0282486 0.0282482 0.0282482 0.0282479 0.0282479
-          0.0282477 0.0282477 0.0282475 0.0282475 0.0282474 0.0282474 0.0282473 0.0282473 0.0282472 0.0282472 0.0282471 0.0282471
-          0.028247 0.028247 0.028247 0.028247 0.028247 0.028247 0.0282469 0.0282469 0.0282469 0.0282469 0.0282469 0.0282469
-          0.0282469 0.0282469 0.0282469 0.0282469 0.0282469 0.0282469 0.028247 0.028247 0.0282474 0.0282474 0.0282532 0.0282532
-          0.0283206 0.0283206 0.0291033 0.0291033 0.039309 0.039309 0.265414 0.265414 0.745094 0.745094 0.824633 0.824633
-          0.973795 0.973795
+          0.0282512 0.0282512 0.0282497 0.0282497 0.0282487 0.0282487 0.0282481 0.0282481 0.0282476 0.0282476 0.0282473 0.0282473
+          0.0282471 0.0282471 0.0282469 0.0282469 0.0282467 0.0282467 0.0282466 0.0282466 0.0282465 0.0282465 0.0282464 0.0282464
+          0.0282463 0.0282463 0.0282462 0.0282462 0.0282462 0.0282462 0.0282462 0.0282462 0.0282462 0.0282462 0.0282462 0.0282462
+          0.0282462 0.0282462 0.0282461 0.0282461 0.0282461 0.0282461 0.0282462 0.0282462 0.0282467 0.0282467 0.0282526 0.0282526
+          0.028322 0.028322 0.0291242 0.0291242 0.0395384 0.0395384 0.264019 0.264019 0.733965 0.733965 0.828065 0.828065
+          0.995095 0.995095
         </DataArray>
         <DataArray type="Float32" Name="x^xylene_gas" NumberOfComponents="1" format="ascii">
           0.00984259 0.00984259 0.0098426 0.0098426 0.00984261 0.00984261 0.00984262 0.00984262 0.00984264 0.00984264 0.00984265 0.00984265
@@ -382,17 +382,17 @@
           0.00984307 0.00984307 0.00984308 0.00984308 0.0098431 0.0098431 0.00984311 0.00984311 0.00984312 0.00984312 0.00984313 0.00984313
           0.00984314 0.00984314 0.00984315 0.00984315 0.00984317 0.00984317 0.00984318 0.00984318 0.00984319 0.00984319 0.0098432 0.0098432
           0.00984321 0.00984321 0.00984322 0.00984322 0.00984323 0.00984323 0.00984325 0.00984325 0.00984326 0.00984326 0.00984327 0.00984327
-          0.00984328 0.00984328 0.00984329 0.00984329 0.0098433 0.0098433 0.00984332 0.00984332 0.00984333 0.00984333 0.00984334 0.00984334
+          0.00984328 0.00984328 0.00984329 0.00984329 0.0098433 0.0098433 0.00984331 0.00984331 0.00984333 0.00984333 0.00984334 0.00984334
           0.00984335 0.00984335 0.00984336 0.00984336 0.00984337 0.00984337 0.00984338 0.00984338 0.0098434 0.0098434 0.00984341 0.00984341
           0.00984342 0.00984342 0.00984343 0.00984343 0.00984344 0.00984344 0.00984345 0.00984345 0.00984346 0.00984346 0.00984348 0.00984348
           0.00984349 0.00984349 0.0098435 0.0098435 0.00984351 0.00984351 0.00984352 0.00984352 0.00984353 0.00984353 0.00984355 0.00984355
           0.00984356 0.00984356 0.00984357 0.00984357 0.00984358 0.00984358 0.00984359 0.00984359 0.0098436 0.0098436 0.00984361 0.00984361
-          0.00984315 0.00984315 0.00984269 0.00984269 0.00984239 0.00984239 0.00984219 0.00984219 0.00984206 0.00984206 0.00984196 0.00984196
-          0.00984189 0.00984189 0.00984183 0.00984183 0.00984178 0.00984178 0.00984174 0.00984174 0.0098417 0.0098417 0.00984167 0.00984167
-          0.00984165 0.00984165 0.00984163 0.00984163 0.00984162 0.00984162 0.00984161 0.00984161 0.00984161 0.00984161 0.00984161 0.00984161
-          0.00984162 0.00984162 0.00984162 0.00984162 0.00984162 0.00984162 0.00984163 0.00984163 0.00984179 0.00984179 0.00984376 0.00984376
-          0.00986694 0.00986694 0.0101396 0.0101396 0.0136456 0.0136456 0.0865649 0.0865649 0.232343 0.232343 0.165573 0.165573
-          0.0058993 0.0058993
+          0.00984309 0.00984309 0.00984258 0.00984258 0.00984224 0.00984224 0.00984202 0.00984202 0.00984186 0.00984186 0.00984175 0.00984175
+          0.00984167 0.00984167 0.0098416 0.0098416 0.00984154 0.00984154 0.0098415 0.0098415 0.00984146 0.00984146 0.00984142 0.00984142
+          0.00984139 0.00984139 0.00984137 0.00984137 0.00984136 0.00984136 0.00984135 0.00984135 0.00984134 0.00984134 0.00984134 0.00984134
+          0.00984134 0.00984134 0.00984134 0.00984134 0.00984134 0.00984134 0.00984135 0.00984135 0.00984152 0.00984152 0.00984354 0.00984354
+          0.00986743 0.00986743 0.0101469 0.0101469 0.0137182 0.0137182 0.0861145 0.0861145 0.228906 0.228906 0.170342 0.170342
+          0.0049044 0.0049044
         </DataArray>
         <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961907 0.961907
@@ -410,12 +410,12 @@
           0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904
           0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904
           0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904
-          0.961906 0.961906 0.961907 0.961907 0.961908 0.961908 0.961909 0.961909 0.96191 0.96191 0.96191 0.96191
-          0.96191 0.96191 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911
-          0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911
-          0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961911 0.961903 0.961903
-          0.961812 0.961812 0.960757 0.960757 0.947045 0.947045 0.648021 0.648021 0.0225632 0.0225632 0.00979414 0.00979414
-          0.0203057 0.0203057
+          0.961906 0.961906 0.961908 0.961908 0.961909 0.961909 0.96191 0.96191 0.96191 0.96191 0.961911 0.961911
+          0.961911 0.961911 0.961911 0.961911 0.961912 0.961912 0.961912 0.961912 0.961912 0.961912 0.961912 0.961912
+          0.961912 0.961912 0.961912 0.961912 0.961912 0.961912 0.961912 0.961912 0.961913 0.961913 0.961913 0.961913
+          0.961913 0.961913 0.961913 0.961913 0.961913 0.961913 0.961912 0.961912 0.961912 0.961912 0.961904 0.961904
+          0.961811 0.961811 0.960729 0.960729 0.946743 0.946743 0.649866 0.649866 0.0371291 0.0371291 0.00159325 0.00159325
+          7.71867e-07 7.71867e-07
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46
@@ -506,8 +506,8 @@
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.154 296.154
-          296.193 296.193 296.653 296.653 301.783 301.783 339.415 339.415 364.743 364.743 367.459 367.459
-          372.088 372.088
+          296.195 296.195 296.666 296.666 301.877 301.877 339.294 339.294 364.33 364.33 367.576 367.576
+          372.672 372.672
         </DataArray>
       </PointData>
       <CellData Scalars="process rank">
diff --git a/test/references/test_3p3cni_columnxylol_tpfa-reference.vtu b/test/references/test_3p3cni_columnxylol_tpfa-reference.vtu
index 95f99ec3d8de9547fada88a7ace74162b4b5aa6a..48c0a0d805bf88a6726e794de28a39a50404a8e2 100644
--- a/test/references/test_3p3cni_columnxylol_tpfa-reference.vtu
+++ b/test/references/test_3p3cni_columnxylol_tpfa-reference.vtu
@@ -12,8 +12,8 @@
           0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
           0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
           0.005 0.005 0.005 0.005 0.005 0.00499997 0.00499999 0.00499999 0.00499999 0.00499999 0.005 0.005
-          0.005 0.005 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001 0.005 0.00500001 0.00500001 0.00500001
-          0.00500001 0.00500001 0.00500001 0.00500001 0.00500003 0.00500023 0.00500246 0.00503262 0.0076304 0.0634068 0.121622 0.148817
+          0.005 0.005 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001 0.005 0.005 0.005 0.00500001 0.00500001
+          0.00500001 0.00500001 0.00500001 0.00500001 0.00500003 0.00500024 0.00500264 0.00503609 0.0081539 0.0620157 0.122274 0.149044
         </DataArray>
         <DataArray type="Float32" Name="p_aq" NumberOfComponents="1" format="ascii">
           99947.1 99946.9 99946.8 99946.7 99946.6 99946.5 99946.4 99946.2 99946.1 99946 99945.9 99945.8
@@ -22,10 +22,10 @@
           99942.9 99942.7 99942.6 99942.5 99942.4 99942.3 99942.2 99942 99941.9 99941.8 99941.7 99941.6
           99941.5 99941.3 99941.2 99941.1 99941 99940.9 99940.8 99940.6 99940.5 99940.4 99940.3 99940.2
           99940.1 99939.9 99939.8 99939.7 99939.6 99939.5 99939.4 99939.2 99939.1 99939 99938.9 99938.8
-          99938.6 99938.5 99938.4 99938.3 99938.2 99938.1 99938 99937.8 99937.7 99937.6 99937.5 99937.4
-          99937.2 99937.1 99937 99936.9 99936.8 99936.7 45848.3 45763.4 45677.8 45591.3 45503.3 45413.3
-          45320.4 45223.6 45121.4 45011.5 44891.2 44756.2 44600.7 44416.4 44191.8 43913.9 43578.8 43217.4
-          42884.5 42575.7 42251.8 41876.7 41414.3 40826.2 39980.9 39102.8 43132.6 63904.4 85488.3 94128.2
+          99938.6 99938.5 99938.4 99938.3 99938.2 99938.1 99937.9 99937.8 99937.7 99937.6 99937.5 99937.4
+          99937.2 99937.1 99937 99936.9 99936.8 99936.7 45847.5 45762.5 45676.8 45590.1 45502 45411.9
+          45319 45222.1 45119.8 45009.8 44889.4 44754.4 44598.9 44414.6 44189.9 43912.1 43576.9 43215.5
+          42882.5 42573.8 42249.9 41874.7 41412.3 40824.2 39979.1 39110.7 43330.3 63404.7 85748.6 94141.8
         </DataArray>
         <DataArray type="Float32" Name="rho_aq" NumberOfComponents="1" format="ascii">
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
@@ -37,7 +37,7 @@
           997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
           997.661 997.661 997.661 997.661 997.661 997.661 997.637 997.637 997.637 997.637 997.637 997.637
           997.637 997.637 997.637 997.637 997.637 997.637 997.636 997.636 997.636 997.636 997.636 997.636
-          997.636 997.635 997.635 997.635 997.635 997.632 997.602 997.299 993.557 968.333 966.804 959.307
+          997.636 997.635 997.635 997.635 997.635 997.632 997.602 997.291 993.413 968.957 966.835 958.773
         </DataArray>
         <DataArray type="Float32" Name="x^H2O_aq" NumberOfComponents="1" format="ascii">
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
@@ -49,7 +49,7 @@
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
           0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
-          0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.999958 0.999931 0.999423 0.999366 0.999981
+          0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.999958 0.99993 0.999445 0.999367 0.999984
         </DataArray>
         <DataArray type="Float32" Name="x^xylene_aq" NumberOfComponents="1" format="ascii">
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
@@ -61,19 +61,19 @@
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62565e-05 2.62564e-05 2.62565e-05 2.62565e-05 2.62566e-05 2.62566e-05
           2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
-          2.62566e-05 2.62567e-05 2.62567e-05 2.62568e-05 2.62584e-05 2.62765e-05 2.64744e-05 2.86241e-05 5.78215e-05 0.000575762 0.000633928 1.87975e-05
+          2.62566e-05 2.62567e-05 2.62567e-05 2.62568e-05 2.62585e-05 2.62771e-05 2.64798e-05 2.86879e-05 5.91141e-05 0.000553582 0.000632739 1.61894e-05
         </DataArray>
         <DataArray type="Float32" Name="x^Air_aq" NumberOfComponents="1" format="ascii">
           1.37483e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05
-          1.37481e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05
+          1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05
           1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05
           1.37476e-05 1.37476e-05 1.37476e-05 1.37476e-05 1.37476e-05 1.37476e-05 1.37475e-05 1.37475e-05 1.37475e-05 1.37475e-05 1.37475e-05 1.37475e-05
           1.37474e-05 1.37474e-05 1.37474e-05 1.37474e-05 1.37474e-05 1.37474e-05 1.37473e-05 1.37473e-05 1.37473e-05 1.37473e-05 1.37473e-05 1.37473e-05
           1.37472e-05 1.37472e-05 1.37472e-05 1.37472e-05 1.37472e-05 1.37472e-05 1.37471e-05 1.37471e-05 1.37471e-05 1.37471e-05 1.37471e-05 1.37471e-05
           1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.3747e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05 1.37469e-05
-          1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.3748e-05 1.37494e-05 1.37504e-05 1.37511e-05 1.37516e-05 1.3752e-05
-          1.37523e-05 1.37526e-05 1.37528e-05 1.37529e-05 1.37531e-05 1.37532e-05 1.37533e-05 1.37534e-05 1.37534e-05 1.37535e-05 1.37536e-05 1.37536e-05
-          1.37536e-05 1.37537e-05 1.37537e-05 1.37537e-05 1.37535e-05 1.37506e-05 1.3718e-05 1.33863e-05 1.08237e-05 8.74437e-07 1.99089e-08 2.29685e-07
+          1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37468e-05 1.37479e-05 1.37493e-05 1.37503e-05 1.37509e-05 1.37514e-05 1.37518e-05
+          1.37521e-05 1.37523e-05 1.37525e-05 1.37527e-05 1.37528e-05 1.37529e-05 1.3753e-05 1.37531e-05 1.37532e-05 1.37532e-05 1.37533e-05 1.37533e-05
+          1.37534e-05 1.37534e-05 1.37534e-05 1.37535e-05 1.37532e-05 1.37502e-05 1.37168e-05 1.33768e-05 1.07528e-05 1.2199e-06 3.84048e-08 -1.40421e-10
         </DataArray>
         <DataArray type="Float32" Name="S_napl" NumberOfComponents="1" format="ascii">
           0.0001 0.0001 0.0001 0.0001 9.99999e-05 9.99998e-05 9.99998e-05 9.99997e-05 9.99997e-05 9.99996e-05 9.99995e-05 9.99995e-05
@@ -83,9 +83,9 @@
           9.99973e-05 9.99972e-05 9.99972e-05 9.99971e-05 9.9997e-05 9.9997e-05 9.99969e-05 9.99969e-05 9.99968e-05 9.99967e-05 9.99967e-05 9.99966e-05
           9.99966e-05 9.99965e-05 9.99964e-05 9.99964e-05 9.99963e-05 9.99963e-05 9.99962e-05 9.99961e-05 9.99961e-05 9.9996e-05 9.9996e-05 9.99959e-05
           9.99959e-05 9.99958e-05 9.99957e-05 9.99957e-05 9.99956e-05 9.99956e-05 9.99955e-05 9.99954e-05 9.99954e-05 9.99953e-05 9.99953e-05 9.99952e-05
-          9.99951e-05 9.99951e-05 9.9995e-05 9.9995e-05 9.99948e-05 9.99359e-05 0.90136 0.874924 0.845887 0.814373 0.780583 0.744747
-          0.707083 0.667762 0.62689 0.584498 0.540554 0.494992 0.447798 0.399172 0.349861 0.301728 0.258415 0.224775
-          0.202168 0.186288 0.173436 0.162081 0.151753 0.142526 0.133945 0.128338 0.16918 0.171827 0.0625093 0
+          9.99951e-05 9.99951e-05 9.9995e-05 9.9995e-05 9.99948e-05 9.99364e-05 0.901233 0.87487 0.84588 0.814395 0.780619 0.744787
+          0.707118 0.667788 0.626906 0.584506 0.540556 0.494991 0.447797 0.399172 0.349862 0.30173 0.258417 0.224776
+          0.202168 0.186288 0.173436 0.162081 0.151753 0.142526 0.133946 0.128378 0.169172 0.172358 0.0618454 0
         </DataArray>
         <DataArray type="Float32" Name="p_napl" NumberOfComponents="1" format="ascii">
           99947.1 99946.9 99946.8 99946.7 99946.6 99946.5 99946.4 99946.2 99946.1 99946 99945.9 99945.8
@@ -94,10 +94,10 @@
           99942.9 99942.7 99942.6 99942.5 99942.4 99942.3 99942.2 99942 99941.9 99941.8 99941.7 99941.6
           99941.5 99941.3 99941.2 99941.1 99941 99940.9 99940.8 99940.6 99940.5 99940.4 99940.3 99940.2
           99940.1 99939.9 99939.8 99939.7 99939.6 99939.5 99939.4 99939.2 99939.1 99939 99938.9 99938.8
-          99938.6 99938.5 99938.4 99938.3 99938.2 99938.1 99938 99937.8 99937.7 99937.6 99937.5 99937.4
-          99937.2 99937.1 99937 99936.9 99936.8 99936.7 98729.4 98644.6 98559 98472.4 98384.4 98294.4
-          98201.6 98104.8 98002.5 97892.6 97772.3 97637.3 97481.8 97297.5 97072.9 96795.1 96459.9 96098.6
-          95765.6 95456.8 95133 94757.9 94295.4 93707.3 92861.2 91972.4 95087.3 96214.3 92868.4 94128.2
+          99938.6 99938.5 99938.4 99938.3 99938.2 99938.1 99937.9 99937.8 99937.7 99937.6 99937.5 99937.4
+          99937.2 99937.1 99937 99936.9 99936.8 99936.7 98728.6 98643.6 98557.9 98471.2 98383.1 98293
+          98200.1 98103.2 98000.9 97890.9 97770.5 97635.5 97480 97295.7 97071 96793.2 96458 96096.6
+          95763.6 95454.9 95131 94755.9 94293.4 93705.3 92859.3 91979.1 95100.6 96204.6 92908.1 94141.8
         </DataArray>
         <DataArray type="Float32" Name="rho_napl" NumberOfComponents="1" format="ascii">
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
@@ -109,7 +109,7 @@
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
           860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
-          860.465 860.465 860.465 860.465 860.464 860.454 860.346 859.209 848.278 800.753 798.225 791.95
+          860.465 860.465 860.465 860.465 860.464 860.454 860.343 859.177 847.912 801.769 798.275 791.255
         </DataArray>
         <DataArray type="Float32" Name="x^H2O_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -133,7 +133,7 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
-          1 1 1 1 1 1 1 1 1 1 1 0.0235578
+          1 1 1 1 1 1 1 1 1 1 1 0.0197936
         </DataArray>
         <DataArray type="Float32" Name="x^Air_napl" NumberOfComponents="1" format="ascii">
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -155,21 +155,21 @@
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
           0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
-          0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.0936397 0.120076 0.149113 0.180627 0.214417 0.250253
-          0.287917 0.327238 0.36811 0.410502 0.454446 0.500008 0.547202 0.595828 0.645139 0.693272 0.736585 0.770225
-          0.792832 0.808712 0.821564 0.832919 0.843247 0.852474 0.861052 0.866629 0.82319 0.764766 0.815869 0.851183
+          0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.0937666 0.12013 0.14912 0.180605 0.214381 0.250214
+          0.287882 0.327212 0.368094 0.410494 0.454444 0.500009 0.547203 0.595828 0.645138 0.69327 0.736583 0.770224
+          0.792832 0.808712 0.821564 0.832919 0.843247 0.852474 0.861051 0.866586 0.822674 0.765626 0.81588 0.850956
         </DataArray>
         <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           99999.9 99999.8 99999.7 99999.6 99999.5 99999.4 99999.2 99999.1 99999 99998.9 99998.8 99998.7
           99998.5 99998.4 99998.3 99998.2 99998.1 99998 99997.8 99997.7 99997.6 99997.5 99997.4 99997.3
           99997.1 99997 99996.9 99996.8 99996.7 99996.6 99996.4 99996.3 99996.2 99996.1 99996 99995.9
-          99995.7 99995.6 99995.5 99995.4 99995.3 99995.2 99995 99994.9 99994.8 99994.7 99994.6 99994.5
+          99995.7 99995.6 99995.5 99995.4 99995.3 99995.1 99995 99994.9 99994.8 99994.7 99994.6 99994.5
           99994.3 99994.2 99994.1 99994 99993.9 99993.8 99993.6 99993.5 99993.4 99993.3 99993.2 99993
           99992.9 99992.8 99992.7 99992.6 99992.5 99992.4 99992.2 99992.1 99992 99991.9 99991.8 99991.6
           99991.5 99991.4 99991.3 99991.2 99991.1 99990.9 99990.8 99990.7 99990.6 99990.5 99990.4 99990.2
-          99990.1 99990 99989.9 99989.8 99989.7 99989.5 99998 100008 100015 100020 100023 100026
-          100028 100030 100032 100033 100034 100034 100035 100036 100036 100037 100037 100037
-          100038 100038 100038 100039 100039 100039 100039 100040 100040 100086 100265 100363
+          99990.1 99990 99989.9 99989.8 99989.7 99989.5 99997.6 100007 100014 100019 100022 100025
+          100027 100029 100030 100031 100032 100033 100033 100034 100034 100035 100035 100035
+          100036 100036 100036 100037 100037 100037 100037 100038 100038 100086 100264 100360
         </DataArray>
         <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
           1.19439 1.19439 1.19439 1.19439 1.19439 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438
@@ -179,9 +179,9 @@
           1.19432 1.19432 1.19432 1.19432 1.19432 1.19432 1.19432 1.19432 1.19431 1.19431 1.19431 1.19431
           1.19431 1.19431 1.19431 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.1943 1.19429 1.19429
           1.19429 1.19429 1.19429 1.19429 1.19429 1.19428 1.19428 1.19428 1.19428 1.19428 1.19428 1.19428
-          1.19428 1.19427 1.19427 1.19427 1.19427 1.19427 1.19437 1.19449 1.19457 1.19463 1.19467 1.1947
-          1.19473 1.19475 1.19476 1.19478 1.19479 1.1948 1.19481 1.19481 1.19482 1.19482 1.19483 1.19483
-          1.19483 1.19484 1.19484 1.19485 1.19485 1.19481 1.19445 1.19065 1.16117 1.26711 1.28959 0.622243
+          1.19428 1.19427 1.19427 1.19427 1.19427 1.19427 1.19436 1.19448 1.19456 1.19461 1.19465 1.19468
+          1.19471 1.19473 1.19474 1.19476 1.19477 1.19478 1.19478 1.19479 1.1948 1.1948 1.1948 1.19481
+          1.19481 1.19482 1.19482 1.19482 1.19482 1.19479 1.19441 1.19052 1.16042 1.25976 1.28918 0.609752
         </DataArray>
         <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
           0.0282497 0.0282498 0.0282498 0.0282498 0.0282499 0.0282499 0.0282499 0.02825 0.02825 0.02825 0.0282501 0.0282501
@@ -191,9 +191,9 @@
           0.0282513 0.0282514 0.0282514 0.0282514 0.0282515 0.0282515 0.0282515 0.0282516 0.0282516 0.0282516 0.0282517 0.0282517
           0.0282517 0.0282518 0.0282518 0.0282518 0.0282519 0.0282519 0.0282519 0.028252 0.028252 0.028252 0.0282521 0.0282521
           0.0282521 0.0282522 0.0282522 0.0282522 0.0282523 0.0282523 0.0282523 0.0282524 0.0282524 0.0282524 0.0282525 0.0282525
-          0.0282525 0.0282526 0.0282526 0.0282526 0.0282527 0.0282527 0.0282501 0.0282472 0.0282453 0.028244 0.028243 0.0282423
-          0.0282417 0.0282412 0.0282408 0.0282405 0.0282402 0.02824 0.0282398 0.0282396 0.0282395 0.0282394 0.0282393 0.0282392
-          0.0282391 0.028239 0.028239 0.028239 0.0282407 0.0282603 0.0284753 0.0307266 0.0633184 0.689694 0.760833 0.967922
+          0.0282525 0.0282526 0.0282526 0.0282526 0.0282527 0.0282527 0.0282502 0.0282475 0.0282456 0.0282443 0.0282434 0.0282427
+          0.0282421 0.0282417 0.0282413 0.028241 0.0282407 0.0282405 0.0282403 0.0282401 0.02824 0.0282399 0.0282398 0.0282397
+          0.0282397 0.0282396 0.0282395 0.0282396 0.0282413 0.0282616 0.0284818 0.0307917 0.0647608 0.660806 0.75927 0.993968
         </DataArray>
         <DataArray type="Float32" Name="x^xylene_gas" NumberOfComponents="1" format="ascii">
           0.0098426 0.00984261 0.00984262 0.00984263 0.00984264 0.00984265 0.00984266 0.00984268 0.00984269 0.0098427 0.00984271 0.00984272
@@ -202,10 +202,10 @@
           0.00984301 0.00984302 0.00984303 0.00984304 0.00984306 0.00984307 0.00984308 0.00984309 0.0098431 0.00984311 0.00984312 0.00984314
           0.00984315 0.00984316 0.00984317 0.00984318 0.00984319 0.00984321 0.00984322 0.00984323 0.00984324 0.00984325 0.00984326 0.00984327
           0.00984329 0.0098433 0.00984331 0.00984332 0.00984333 0.00984334 0.00984335 0.00984337 0.00984338 0.00984339 0.0098434 0.00984341
-          0.00984342 0.00984343 0.00984345 0.00984346 0.00984347 0.00984348 0.00984349 0.0098435 0.00984352 0.00984353 0.00984354 0.00984355
-          0.00984356 0.00984357 0.00984358 0.0098436 0.00984361 0.00984362 0.00984273 0.00984173 0.00984106 0.00984059 0.00984025 0.00983999
-          0.00983979 0.00983963 0.00983949 0.00983937 0.00983927 0.00983919 0.00983912 0.00983906 0.00983902 0.00983898 0.00983895 0.00983892
-          0.00983889 0.00983886 0.00983883 0.00983886 0.00983943 0.00984618 0.0099203 0.0107258 0.0216663 0.215646 0.237008 0.00702096
+          0.00984342 0.00984344 0.00984345 0.00984346 0.00984347 0.00984348 0.00984349 0.0098435 0.00984352 0.00984353 0.00984354 0.00984355
+          0.00984356 0.00984357 0.00984358 0.0098436 0.00984361 0.00984362 0.00984277 0.0098418 0.00984116 0.00984071 0.00984039 0.00984014
+          0.00983994 0.00983978 0.00983965 0.00983954 0.00983945 0.00983937 0.0098393 0.00983924 0.0098392 0.00983916 0.00983913 0.00983911
+          0.00983908 0.00983905 0.00983903 0.00983906 0.00983965 0.0098466 0.00992255 0.0107499 0.0221511 0.207337 0.236566 0.00604699
         </DataArray>
         <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
           0.961908 0.961908 0.961908 0.961908 0.961908 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
@@ -215,9 +215,9 @@
           0.961906 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905
           0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961905 0.961904
           0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961904
-          0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961907 0.961911 0.961914 0.961915 0.961917 0.961918
-          0.961919 0.961919 0.96192 0.96192 0.96192 0.961921 0.961921 0.961921 0.961922 0.961922 0.961922 0.961922
-          0.961922 0.961922 0.961922 0.961922 0.96192 0.961893 0.961604 0.958548 0.915015 0.0946601 0.00215881 0.0250566
+          0.961904 0.961904 0.961904 0.961904 0.961904 0.961904 0.961907 0.961911 0.961913 0.961915 0.961916 0.961917
+          0.961918 0.961919 0.961919 0.961919 0.96192 0.96192 0.96192 0.961921 0.961921 0.961921 0.961921 0.961921
+          0.961921 0.961921 0.961921 0.961921 0.961919 0.961892 0.961596 0.958458 0.913088 0.131857 0.00416417 -1.53292e-05
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46 0.46
@@ -265,7 +265,7 @@
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
           296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15 296.15
-          296.15 296.15 296.15 296.15 296.151 296.163 296.289 297.613 310.229 362.67 365.346 371.938
+          296.15 296.15 296.15 296.15 296.151 296.163 296.293 297.651 310.648 361.591 365.294 372.664
         </DataArray>
         <DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0