From 608ac7c7cc2da8b81c474e5cf81185421c903251 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 25 Apr 2018 19:17:14 +0200
Subject: [PATCH 1/2] [2pnc][test] Fix fuelcell test

What was broken:
The test used philtophob law which used the wrong residual saturations. It went into efftoabslaw with
the non-wetting saturation so swr and snr where the wrong way around. It also overwrote the krw/krn function
of the material law in use with a quadratic/cubic law. It also defined the capillary pressure negative but then
it would be pc = pw-pn.

What was fixed:
Use the wettingPhase function instead to make the gas phase the wetting phase

This changed:
- the pw solution as swr and snr were corrected (the wrong way around pw was equal)
- the pc solution because it is now positite
- the mobilities as they didn't use the real van genuchten curves
---
 .../implicit/2pncdiffusionspatialparams.hh    |   2 +-
 .../2pnc/implicit/fuelcellspatialparams.hh    |  24 +-
 test/references/fuelcell2pncbox-reference.vtu | 440 +++++++++---------
 test/references/fuelcell2pnccc-reference.vtu  | 402 ++++++++--------
 4 files changed, 433 insertions(+), 435 deletions(-)

diff --git a/test/porousmediumflow/2pnc/implicit/2pncdiffusionspatialparams.hh b/test/porousmediumflow/2pnc/implicit/2pncdiffusionspatialparams.hh
index eb7a7abb6b..8a95ad985d 100644
--- a/test/porousmediumflow/2pnc/implicit/2pncdiffusionspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/2pncdiffusionspatialparams.hh
@@ -104,7 +104,7 @@ public:
         porosity_ = 0.2;
 
         // residual saturations
-        materialParams_.setSwr(0.02); //here water, see philtophoblaw
+        materialParams_.setSwr(0.02);
         materialParams_.setSnr(0.0);
 
         //parameters for the vanGenuchten law
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
index f12a2dddad..baf27e8a93 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
+++ b/test/porousmediumflow/2pnc/implicit/fuelcellspatialparams.hh
@@ -30,10 +30,9 @@
 #include <dumux/material/fluidmatrixinteractions/2p/linearmaterial.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh>
 #include <dumux/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh>
+#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
 
-namespace Dumux
-{
+namespace Dumux {
 /*!
  * \ingroup TwoPNCTests
  * \brief Definition of the spatial parameters for the fuel cell
@@ -43,8 +42,7 @@ namespace Dumux
 template<class TypeTag>
 class FuelCellSpatialParams;
 
-namespace Properties
-{
+namespace Properties {
 // The spatial parameters TypeTag
 NEW_TYPE_TAG(FuelCellSpatialParams);
 
@@ -54,22 +52,21 @@ SET_TYPE_PROP(FuelCellSpatialParams, SpatialParams, FuelCellSpatialParams<TypeTa
 // Set the material Law
 SET_PROP(FuelCellSpatialParams, MaterialLaw)
 {
- private:
+private:
     // define the material law which is parameterized by effective
     // saturations
     using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
     using EffMaterialLaw = RegularizedVanGenuchten<Scalar>;
 
- public:
+public:
     // define the material law parameterized by absolute saturations
-    using type = PhilToPhobLaw<EffMaterialLaw>;
+    using type = EffToAbsLaw<EffMaterialLaw>;
 };
 
 } // end namespace Properties
 
 /*!
  * \ingroup TwoPNCMinModel
- * \ingroup BoxTestProblems
  * \brief Definition of the spatial parameters for the FuelCell
  *        problem which uses the isothermal 2p2c box model
  */
@@ -110,8 +107,8 @@ public:
         porosity_ = 0.2;
 
         // residual saturations
-        materialParams_.setSwr(0.12); //here water, see philtophoblaw
-        materialParams_.setSnr(0.0);
+        materialParams_.setSwr(0.12); // air is wetting phase
+        materialParams_.setSnr(0.0); // water is non-wetting
 
         //parameters for the vanGenuchten law
         materialParams_.setVgAlpha(6.66e-5); // alpha = 1/pcb
@@ -152,10 +149,11 @@ public:
      *
      * \return the wetting phase index
      * \param globalPos The position of the center of the element
+     * \note we set a hydrophobic material
      */
     template<class FluidSystem>
     int wettingPhaseAtPos(const GlobalPosition& globalPos) const
-    { return FluidSystem::H2OIdx; }
+    { return FluidSystem::gasPhaseIdx; }
 
 private:
     DimWorldMatrix K_;
@@ -164,6 +162,6 @@ private:
     MaterialLawParams materialParams_;
 };
 
-}//end namespace
+} // end namespace Dumux
 
 #endif
diff --git a/test/references/fuelcell2pncbox-reference.vtu b/test/references/fuelcell2pncbox-reference.vtu
index 68dfaa91c9..5bef1c7387 100644
--- a/test/references/fuelcell2pncbox-reference.vtu
+++ b/test/references/fuelcell2pncbox-reference.vtu
@@ -2,96 +2,126 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="126" NumberOfPoints="154">
-      <PointData Scalars="Sn">
-        <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
-          0.699989 0.699989 0.699991 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991
-          0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991
-          0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991
-          0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699989 0.699991 0.699993 0.699993 0.699993 0.699993
-          0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993
-          0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995
-          0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995
-          0.699995 0.699995 0.699995 0.699995 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996
-          0.699996 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996 0.699996
-          0.699996 0.699996 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998
-          0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998
-          0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
-          0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
+      <PointData Scalars="porosity">
+        <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+        </DataArray>
+        <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
+          14005.8 14005.8 14005.7 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7
+          14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7
+          14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7
+          14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.8 14005.7 14005.6 14005.6 14005.6 14005.6
+          14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6
+          14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6
+          14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6
+          14005.6 14005.6 14005.6 14005.6 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5
+          14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5
+          14005.5 14005.5 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4
+          14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4
+          14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3
+          14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3
         </DataArray>
         <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
-          0.300011 0.300011 0.300009 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009
-          0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009
-          0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009
-          0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300011 0.300009 0.300007 0.300007 0.300007 0.300007
+          0.30002 0.30002 0.300017 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
+          0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
+          0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
+          0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.300013 0.300013 0.300013 0.300013
+          0.300013 0.300013 0.300013 0.300013 0.300013 0.300013 0.300013 0.300013 0.300013 0.300013 0.300013 0.300013
+          0.300013 0.300013 0.300013 0.300013 0.300013 0.300013 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001
+          0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001
+          0.30001 0.30001 0.30001 0.30001 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007
           0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300007
-          0.300007 0.300007 0.300007 0.300007 0.300007 0.300007 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005
-          0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005
-          0.300005 0.300005 0.300005 0.300005 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004
-          0.300004 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004 0.300004
-          0.300004 0.300004 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002
-          0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002
+          0.300007 0.300007 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003
+          0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
           0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3 0.3
         </DataArray>
-        <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
-          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
-          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
-          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
-          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
-          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
-          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
-          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
-        </DataArray>
         <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-        </DataArray>
-        <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
-          -11440.4 -11440.4 -11440.3 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3
-          -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3
-          -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3
-          -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.4 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3
-          -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3
-          -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3
-          -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3
-          -11440.3 -11440.3 -11440.3 -11440.3 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1
-          -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1 -11440.1
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
         </DataArray>
         <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
-          993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
+          993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
+          993.403 993.403 993.403 993.403 993.403 993.403 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+        </DataArray>
+        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+          302.595 302.595 302.589 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
+          302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
+          302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
+          302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.583 302.583 302.583 302.583
+          302.583 302.583 302.583 302.583 302.583 302.583 302.583 302.583 302.583 302.583 302.583 302.583
+          302.583 302.583 302.583 302.583 302.583 302.583 302.578 302.578 302.578 302.578 302.578 302.578
+          302.578 302.578 302.578 302.578 302.578 302.578 302.578 302.578 302.578 302.578 302.578 302.578
+          302.578 302.578 302.578 302.578 302.572 302.572 302.572 302.572 302.572 302.572 302.572 302.572
+          302.572 302.572 302.572 302.572 302.572 302.572 302.572 302.572 302.572 302.572 302.572 302.572
+          302.572 302.572 302.566 302.566 302.566 302.566 302.566 302.566 302.566 302.566 302.566 302.566
+          302.566 302.566 302.566 302.566 302.566 302.566 302.566 302.566 302.566 302.566 302.566 302.566
+          302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561
+          302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561
+        </DataArray>
+        <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+          0.69998 0.69998 0.699983 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
+          0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
+          0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
+          0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.699987 0.699987 0.699987 0.699987
+          0.699987 0.699987 0.699987 0.699987 0.699987 0.699987 0.699987 0.699987 0.699987 0.699987 0.699987 0.699987
+          0.699987 0.699987 0.699987 0.699987 0.699987 0.699987 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999
+          0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999
+          0.69999 0.69999 0.69999 0.69999 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993
+          0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993 0.699993
+          0.699993 0.699993 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997
+          0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997
+          0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
+          0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
+        </DataArray>
+        <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+          99999.6 99999.6 99999.7 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
+          99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
+          99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
+          99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.7 99999.7 99999.7 99999.7
+          99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7
+          99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
+          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
+          99999.8 99999.8 99999.8 99999.8 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
+          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
+          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
+          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
         </DataArray>
         <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
           1.0976 1.0976 1.10151 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151
@@ -108,80 +138,20 @@
           1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907
           1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
-          129.817 129.817 129.816 129.816 129.817 129.816 129.817 129.816 129.817 129.816 129.817 129.816
-          129.817 129.816 129.817 129.816 129.817 129.816 129.817 129.816 129.817 129.816 129.817 129.816
-          129.817 129.816 129.817 129.816 129.817 129.816 129.817 129.816 129.817 129.816 129.817 129.816
-          129.817 129.816 129.817 129.816 129.817 129.816 129.817 129.816 129.814 129.814 129.814 129.814
-          129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814
-          129.814 129.814 129.814 129.814 129.814 129.814 129.813 129.813 129.813 129.813 129.813 129.813
-          129.813 129.813 129.813 129.813 129.813 129.813 129.813 129.813 129.813 129.813 129.813 129.813
-          129.813 129.813 129.813 129.813 129.811 129.811 129.811 129.811 129.811 129.811 129.811 129.811
-          129.811 129.811 129.811 129.811 129.811 129.811 129.811 129.811 129.811 129.811 129.811 129.811
-          129.811 129.811 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81
-          129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81
-          129.808 129.808 129.808 129.808 129.808 129.808 129.808 129.808 129.808 129.808 129.808 129.808
-          129.808 129.808 129.808 129.808 129.808 129.808 129.808 129.808 129.808 129.808
-        </DataArray>
         <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          18761 18761 18685.6 18685.6 18761 18685.6 18761 18685.6 18761 18685.6 18761 18685.6
-          18761 18685.6 18761 18685.6 18761 18685.6 18761 18685.6 18761 18685.6 18761 18685.6
-          18761 18685.6 18761 18685.6 18761 18685.6 18761 18685.6 18761 18685.6 18761 18685.6
-          18761 18685.6 18761 18685.6 18761 18685.6 18761 18685.6 18613.3 18613.3 18613.3 18613.3
-          18613.3 18613.3 18613.3 18613.3 18613.3 18613.3 18613.3 18613.3 18613.3 18613.3 18613.3 18613.3
-          18613.3 18613.3 18613.3 18613.3 18613.3 18613.3 18544.2 18544.2 18544.2 18544.2 18544.2 18544.2
-          18544.2 18544.2 18544.2 18544.2 18544.2 18544.2 18544.2 18544.2 18544.2 18544.2 18544.2 18544.2
-          18544.2 18544.2 18544.2 18544.2 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1
-          18478.1 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1 18478.1
-          18478.1 18478.1 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7
-          18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7 18414.7
-          18354 18354 18354 18354 18354 18354 18354 18354 18354 18354 18354 18354
-          18354 18354 18354 18354 18354 18354 18354 18354 18354 18354
-        </DataArray>
-        <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-        </DataArray>
-        <DataArray type="Float32" Name="Kxx" NumberOfComponents="1" format="ascii">
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-        </DataArray>
-        <DataArray type="Float32" Name="Kyy" NumberOfComponents="1" format="ascii">
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          9071.99 9071.99 9035.61 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
+          9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
+          9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
+          9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9000.81 9000.81 9000.81 9000.81
+          9000.81 9000.81 9000.81 9000.81 9000.81 9000.81 9000.81 9000.81 9000.81 9000.81 9000.81 9000.81
+          9000.81 9000.81 9000.81 9000.81 9000.81 9000.81 8967.5 8967.5 8967.5 8967.5 8967.5 8967.5
+          8967.5 8967.5 8967.5 8967.5 8967.5 8967.5 8967.5 8967.5 8967.5 8967.5 8967.5 8967.5
+          8967.5 8967.5 8967.5 8967.5 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62
+          8935.62 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62 8935.62
+          8935.62 8935.62 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09
+          8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09 8905.09
+          8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85
+          8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85
         </DataArray>
         <DataArray type="Float32" Name="x_l^H2O" NumberOfComponents="1" format="ascii">
           0.999989 0.999989 0.999988 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
@@ -202,67 +172,67 @@
           7.16836e-06 7.16836e-06 6.91411e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
           7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
           7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
-          7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06
-          6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06
-          6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.66888e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06
-          6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06
-          6.43235e-06 6.43235e-06 6.43235e-06 6.43235e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06
-          6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06 6.20421e-06
-          6.20421e-06 6.20421e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06
+          7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06
+          6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06
+          6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.66887e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06
+          6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06
+          6.43234e-06 6.43234e-06 6.43234e-06 6.43234e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06
+          6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06 6.2042e-06
+          6.2042e-06 6.2042e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06
           5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06 5.98416e-06
           5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06
           5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06
         </DataArray>
         <DataArray type="Float32" Name="x_l^O2" NumberOfComponents="1" format="ascii">
-          4.30013e-06 4.30013e-06 4.78305e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06
-          4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06
-          4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06
-          4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 4.30013e-06 4.78305e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06
-          5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06
-          5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.24883e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06
+          4.3001e-06 4.3001e-06 4.78303e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
+          4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
+          4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
+          4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06
+          5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06
+          5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.24882e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06
           5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06
-          5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06
-          6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06 6.13141e-06
-          6.13141e-06 6.13141e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06
+          5.69809e-06 5.69809e-06 5.69809e-06 5.69809e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06
+          6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06 6.13142e-06
+          6.13142e-06 6.13142e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06
           6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06 6.54937e-06
           6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
           6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
         </DataArray>
         <DataArray type="Float32" Name="x_g^H2O" NumberOfComponents="1" format="ascii">
+          0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
+          0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
+          0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
+          0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623062 0.0623062 0.0623062 0.0623062
           0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
           0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
           0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
-          0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623061 0.0623061 0.0623061 0.0623061
+          0.0623062 0.0623062 0.0623062 0.0623062 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
           0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
           0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
           0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
-          0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
-          0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
-          0.0623061 0.0623061 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
-          0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
           0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
           0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
         </DataArray>
         <DataArray type="Float32" Name="x_g^N2" NumberOfComponents="1" format="ascii">
-          0.712623 0.712623 0.687347 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347
-          0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347
-          0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347
-          0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.712623 0.687347 0.662968 0.662968 0.662968 0.662968
+          0.712624 0.712624 0.687348 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
+          0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
+          0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
+          0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.662968 0.662968 0.662968 0.662968
           0.662968 0.662968 0.662968 0.662968 0.662968 0.662968 0.662968 0.662968 0.662968 0.662968 0.662968 0.662968
           0.662968 0.662968 0.662968 0.662968 0.662968 0.662968 0.639454 0.639454 0.639454 0.639454 0.639454 0.639454
           0.639454 0.639454 0.639454 0.639454 0.639454 0.639454 0.639454 0.639454 0.639454 0.639454 0.639454 0.639454
-          0.639454 0.639454 0.639454 0.639454 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774
-          0.616774 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774 0.616774
-          0.616774 0.616774 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898
+          0.639454 0.639454 0.639454 0.639454 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773
+          0.616773 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773 0.616773
+          0.616773 0.616773 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898
           0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898 0.594898
           0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799
           0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799
         </DataArray>
         <DataArray type="Float32" Name="x_g^O2" NumberOfComponents="1" format="ascii">
-          0.225071 0.225071 0.250346 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346
-          0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346
-          0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346
-          0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.225071 0.250346 0.274726 0.274726 0.274726 0.274726
+          0.225069 0.225069 0.250346 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
+          0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
+          0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
+          0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.274726 0.274726 0.274726 0.274726
           0.274726 0.274726 0.274726 0.274726 0.274726 0.274726 0.274726 0.274726 0.274726 0.274726 0.274726 0.274726
           0.274726 0.274726 0.274726 0.274726 0.274726 0.274726 0.29824 0.29824 0.29824 0.29824 0.29824 0.29824
           0.29824 0.29824 0.29824 0.29824 0.29824 0.29824 0.29824 0.29824 0.29824 0.29824 0.29824 0.29824
@@ -273,26 +243,26 @@
           0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895
           0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895
         </DataArray>
-        <DataArray type="Float32" Name="m_l^H2O" NumberOfComponents="1" format="ascii">
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
+        <DataArray type="Float32" Name="m_g^H2O" NumberOfComponents="1" format="ascii">
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
           55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
           55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
         </DataArray>
-        <DataArray type="Float32" Name="m_l^N2" NumberOfComponents="1" format="ascii">
-          0.395278 0.395278 0.381259 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259
-          0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259
-          0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259
-          0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.395278 0.381259 0.367736 0.367736 0.367736 0.367736
+        <DataArray type="Float32" Name="m_g^N2" NumberOfComponents="1" format="ascii">
+          0.395279 0.395279 0.381259 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259
+          0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259
+          0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259
+          0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.367736 0.367736 0.367736 0.367736
           0.367736 0.367736 0.367736 0.367736 0.367736 0.367736 0.367736 0.367736 0.367736 0.367736 0.367736 0.367736
           0.367736 0.367736 0.367736 0.367736 0.367736 0.367736 0.354693 0.354693 0.354693 0.354693 0.354693 0.354693
           0.354693 0.354693 0.354693 0.354693 0.354693 0.354693 0.354693 0.354693 0.354693 0.354693 0.354693 0.354693
@@ -303,11 +273,11 @@
           0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276
           0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276
         </DataArray>
-        <DataArray type="Float32" Name="m_l^O2" NumberOfComponents="1" format="ascii">
-          0.237118 0.237118 0.263747 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
-          0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
-          0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747
-          0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.237118 0.263747 0.289431 0.289431 0.289431 0.289431
+        <DataArray type="Float32" Name="m_g^O2" NumberOfComponents="1" format="ascii">
+          0.237117 0.237117 0.263746 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746
+          0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746
+          0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746
+          0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.289431 0.289431 0.289431 0.289431
           0.289431 0.289431 0.289431 0.289431 0.289431 0.289431 0.289431 0.289431 0.289431 0.289431 0.289431 0.289431
           0.289431 0.289431 0.289431 0.289431 0.289431 0.289431 0.314205 0.314205 0.314205 0.314205 0.314205 0.314205
           0.314205 0.314205 0.314205 0.314205 0.314205 0.314205 0.314205 0.314205 0.314205 0.314205 0.314205 0.314205
@@ -318,7 +288,7 @@
           0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375
           0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375 0.383375
         </DataArray>
-        <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
           3 3 3 3 3 3 3 3 3 3 3 3
           3 3 3 3 3 3 3 3 3 3 3 3
           3 3 3 3 3 3 3 3 3 3 3 3
@@ -333,11 +303,11 @@
           3 3 3 3 3 3 3 3 3 3 3 3
           3 3 3 3 3 3 3 3 3 3
         </DataArray>
-        <DataArray type="Float32" Name="reactionSourceH2O [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
-          747.822 747.822 0 0 747.822 0 747.822 0 747.822 0 747.822 0
-          747.822 0 747.822 0 747.822 0 747.822 0 747.822 0 747.822 0
-          747.822 0 747.822 0 747.822 0 747.822 0 747.822 0 747.822 0
-          747.822 0 747.822 0 747.822 0 747.822 0 0 0 0 0
+        <DataArray type="Float32" Name="currentDensity [A/cm^2]" NumberOfComponents="1" format="ascii">
+          0.451345 0.451345 0 0 0.451345 0 0.451345 0 0.451345 0 0.451345 0
+          0.451345 0 0.451345 0 0.451345 0 0.451345 0 0.451345 0 0.451345 0
+          0.451345 0 0.451345 0 0.451345 0 0.451345 0 0.451345 0 0.451345 0
+          0.451345 0 0.451345 0 0.451345 0 0.451345 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -348,11 +318,11 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="reactionSourceO2 [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
-          -255.16 -255.16 0 0 -255.16 0 -255.16 0 -255.16 0 -255.16 0
-          -255.16 0 -255.16 0 -255.16 0 -255.16 0 -255.16 0 -255.16 0
-          -255.16 0 -255.16 0 -255.16 0 -255.16 0 -255.16 0 -255.16 0
-          -255.16 0 -255.16 0 -255.16 0 -255.16 0 0 0 0 0
+        <DataArray type="Float32" Name="reactionSourceH2O [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
+          747.812 747.812 0 0 747.812 0 747.812 0 747.812 0 747.812 0
+          747.812 0 747.812 0 747.812 0 747.812 0 747.812 0 747.812 0
+          747.812 0 747.812 0 747.812 0 747.812 0 747.812 0 747.812 0
+          747.812 0 747.812 0 747.812 0 747.812 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -363,11 +333,11 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="currentDensity [A/cm^2]" NumberOfComponents="1" format="ascii">
-          0.451352 0.451352 0 0 0.451352 0 0.451352 0 0.451352 0 0.451352 0
-          0.451352 0 0.451352 0 0.451352 0 0.451352 0 0.451352 0 0.451352 0
-          0.451352 0 0.451352 0 0.451352 0 0.451352 0 0.451352 0 0.451352 0
-          0.451352 0 0.451352 0 0.451352 0 0.451352 0 0 0 0 0
+        <DataArray type="Float32" Name="reactionSourceO2 [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
+          -255.156 -255.156 0 0 -255.156 0 -255.156 0 -255.156 0 -255.156 0
+          -255.156 0 -255.156 0 -255.156 0 -255.156 0 -255.156 0 -255.156 0
+          -255.156 0 -255.156 0 -255.156 0 -255.156 0 -255.156 0 -255.156 0
+          -255.156 0 -255.156 0 -255.156 0 -255.156 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -378,6 +348,36 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0
         </DataArray>
+        <DataArray type="Float32" Name="Kxx" NumberOfComponents="1" format="ascii">
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+        </DataArray>
+        <DataArray type="Float32" Name="Kyy" NumberOfComponents="1" format="ascii">
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+        </DataArray>
       </PointData>
       <CellData Scalars="process rank">
         <DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
diff --git a/test/references/fuelcell2pnccc-reference.vtu b/test/references/fuelcell2pnccc-reference.vtu
index afcc2136cc..cb6fe7f630 100644
--- a/test/references/fuelcell2pnccc-reference.vtu
+++ b/test/references/fuelcell2pnccc-reference.vtu
@@ -2,84 +2,110 @@
 <VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
   <UnstructuredGrid>
     <Piece NumberOfCells="126" NumberOfPoints="154">
-      <CellData Scalars="Sn">
-        <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
-          0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999
-          0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.69999 0.699992 0.699992 0.699992
-          0.699992 0.699992 0.699992 0.699992 0.699992 0.699992 0.699992 0.699992 0.699992 0.699992 0.699992 0.699992
-          0.699992 0.699992 0.699992 0.699992 0.699992 0.699992 0.699994 0.699994 0.699994 0.699994 0.699994 0.699994
-          0.699994 0.699994 0.699994 0.699994 0.699994 0.699994 0.699994 0.699994 0.699994 0.699994 0.699994 0.699994
-          0.699994 0.699994 0.699994 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995
-          0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995
-          0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997
-          0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699997 0.699999 0.699999 0.699999
-          0.699999 0.699999 0.699999 0.699999 0.699999 0.699999 0.699999 0.699999 0.699999 0.699999 0.699999 0.699999
-          0.699999 0.699999 0.699999 0.699999 0.699999 0.699999
+      <CellData Scalars="porosity">
+        <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
+          0.2 0.2 0.2 0.2 0.2 0.2
+        </DataArray>
+        <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
+          14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7
+          14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7
+          14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.7
+          14005.7 14005.7 14005.7 14005.7 14005.7 14005.7 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6
+          14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6 14005.6
+          14005.6 14005.6 14005.6 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5
+          14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5
+          14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5
+          14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.5 14005.4 14005.4 14005.4
+          14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4
+          14005.4 14005.4 14005.4 14005.4 14005.4 14005.4
         </DataArray>
         <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
-          0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001
-          0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.30001 0.300008 0.300008 0.300008
-          0.300008 0.300008 0.300008 0.300008 0.300008 0.300008 0.300008 0.300008 0.300008 0.300008 0.300008 0.300008
-          0.300008 0.300008 0.300008 0.300008 0.300008 0.300008 0.300006 0.300006 0.300006 0.300006 0.300006 0.300006
-          0.300006 0.300006 0.300006 0.300006 0.300006 0.300006 0.300006 0.300006 0.300006 0.300006 0.300006 0.300006
-          0.300006 0.300006 0.300006 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005
+          0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019
+          0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300015 0.300015 0.300015
+          0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015
+          0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300012 0.300012 0.300012 0.300012 0.300012 0.300012
+          0.300012 0.300012 0.300012 0.300012 0.300012 0.300012 0.300012 0.300012 0.300012 0.300012 0.300012 0.300012
+          0.300012 0.300012 0.300012 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009
+          0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009 0.300009
           0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005
-          0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003
-          0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300003 0.300001 0.300001 0.300001
-          0.300001 0.300001 0.300001 0.300001 0.300001 0.300001 0.300001 0.300001 0.300001 0.300001 0.300001 0.300001
-          0.300001 0.300001 0.300001 0.300001 0.300001 0.300001
-        </DataArray>
-        <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
-          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
-          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
-          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
-          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
-          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
-          100000 100000 100000 100000 100000 100000
+          0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300005 0.300002 0.300002 0.300002
+          0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002
+          0.300002 0.300002 0.300002 0.300002 0.300002 0.300002
         </DataArray>
         <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440 111440
-          111440 111440 111440 111440 111440 111440
-        </DataArray>
-        <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
-          -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4
-          -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.4 -11440.3 -11440.3 -11440.3
-          -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3
-          -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3
-          -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3 -11440.3
-          -11440.3 -11440.3 -11440.3 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
-          -11440.2 -11440.2 -11440.2 -11440.2 -11440.2 -11440.2
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
+          114005 114005 114005 114005 114005 114005
         </DataArray>
         <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402 993.402
-          993.402 993.402 993.402 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
           993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
-          993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
-          993.403 993.403 993.403 993.403 993.403 993.403
+          993.403 993.403 993.403 993.403 993.403 993.403 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
+          993.404 993.404 993.404 993.404 993.404 993.404
+        </DataArray>
+        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+          302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592
+          302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.587 302.587 302.587
+          302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587
+          302.587 302.587 302.587 302.587 302.587 302.587 302.581 302.581 302.581 302.581 302.581 302.581
+          302.581 302.581 302.581 302.581 302.581 302.581 302.581 302.581 302.581 302.581 302.581 302.581
+          302.581 302.581 302.581 302.575 302.575 302.575 302.575 302.575 302.575 302.575 302.575 302.575
+          302.575 302.575 302.575 302.575 302.575 302.575 302.575 302.575 302.575 302.575 302.575 302.575
+          302.569 302.569 302.569 302.569 302.569 302.569 302.569 302.569 302.569 302.569 302.569 302.569
+          302.569 302.569 302.569 302.569 302.569 302.569 302.569 302.569 302.569 302.564 302.564 302.564
+          302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564
+          302.564 302.564 302.564 302.564 302.564 302.564
+        </DataArray>
+        <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+          0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981
+          0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699985 0.699985 0.699985
+          0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985
+          0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699988 0.699988 0.699988 0.699988 0.699988 0.699988
+          0.699988 0.699988 0.699988 0.699988 0.699988 0.699988 0.699988 0.699988 0.699988 0.699988 0.699988 0.699988
+          0.699988 0.699988 0.699988 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991
+          0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991 0.699991
+          0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995
+          0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699995 0.699998 0.699998 0.699998
+          0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998
+          0.699998 0.699998 0.699998 0.699998 0.699998 0.699998
+        </DataArray>
+        <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+          99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6
+          99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.7 99999.7 99999.7
+          99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7
+          99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
+          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
+          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
+          99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8 99999.8
+          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9
+          99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 99999.9 100000 100000 100000
+          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
+          100000 100000 100000 100000 100000 100000
         </DataArray>
         <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
           1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924
@@ -94,70 +120,18 @@
           1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742
           1.11742 1.11742 1.11742 1.11742 1.11742 1.11742
         </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
-          129.817 129.817 129.817 129.817 129.817 129.817 129.817 129.817 129.817 129.817 129.817 129.817
-          129.817 129.817 129.817 129.817 129.817 129.817 129.817 129.817 129.817 129.815 129.815 129.815
-          129.815 129.815 129.815 129.815 129.815 129.815 129.815 129.815 129.815 129.815 129.815 129.815
-          129.815 129.815 129.815 129.815 129.815 129.815 129.814 129.814 129.814 129.814 129.814 129.814
-          129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814 129.814
-          129.814 129.814 129.814 129.812 129.812 129.812 129.812 129.812 129.812 129.812 129.812 129.812
-          129.812 129.812 129.812 129.812 129.812 129.812 129.812 129.812 129.812 129.812 129.812 129.812
-          129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81
-          129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.81 129.809 129.809 129.809
-          129.809 129.809 129.809 129.809 129.809 129.809 129.809 129.809 129.809 129.809 129.809 129.809
-          129.809 129.809 129.809 129.809 129.809 129.809
-        </DataArray>
         <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3
-          18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18729.3 18654.1 18654.1 18654.1
-          18654.1 18654.1 18654.1 18654.1 18654.1 18654.1 18654.1 18654.1 18654.1 18654.1 18654.1 18654.1
-          18654.1 18654.1 18654.1 18654.1 18654.1 18654.1 18582.2 18582.2 18582.2 18582.2 18582.2 18582.2
-          18582.2 18582.2 18582.2 18582.2 18582.2 18582.2 18582.2 18582.2 18582.2 18582.2 18582.2 18582.2
-          18582.2 18582.2 18582.2 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5
-          18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5 18513.5
-          18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7
-          18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18447.7 18384.7 18384.7 18384.7
-          18384.7 18384.7 18384.7 18384.7 18384.7 18384.7 18384.7 18384.7 18384.7 18384.7 18384.7 18384.7
-          18384.7 18384.7 18384.7 18384.7 18384.7 18384.7
-        </DataArray>
-        <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
-          0.2 0.2 0.2 0.2 0.2 0.2
-        </DataArray>
-        <DataArray type="Float32" Name="Kxx" NumberOfComponents="1" format="ascii">
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-        </DataArray>
-        <DataArray type="Float32" Name="Kyy" NumberOfComponents="1" format="ascii">
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
-          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67
+          9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9020.45 9020.45 9020.45
+          9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45
+          9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 8985.82 8985.82 8985.82 8985.82 8985.82 8985.82
+          8985.82 8985.82 8985.82 8985.82 8985.82 8985.82 8985.82 8985.82 8985.82 8985.82 8985.82 8985.82
+          8985.82 8985.82 8985.82 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69
+          8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69 8952.69
+          8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99
+          8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8920.99 8890.66 8890.66 8890.66
+          8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66
+          8890.66 8890.66 8890.66 8890.66 8890.66 8890.66
         </DataArray>
         <DataArray type="Float32" Name="x_l^H2O" NumberOfComponents="1" format="ascii">
           0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
@@ -176,22 +150,22 @@
           7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06
           7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 6.80754e-06 6.80754e-06 6.80754e-06
           6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06
-          6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06
-          6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06 6.56266e-06
-          6.56266e-06 6.56266e-06 6.56266e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06
-          6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06 6.32658e-06
-          6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06
-          6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 6.099e-06 5.87961e-06 5.87961e-06 5.87961e-06
+          6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06
+          6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06 6.56265e-06
+          6.56265e-06 6.56265e-06 6.56265e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06
+          6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06 6.32657e-06
+          6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06
+          6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 6.09899e-06 5.87961e-06 5.87961e-06 5.87961e-06
           5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06
           5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06
         </DataArray>
         <DataArray type="Float32" Name="x_l^O2" NumberOfComponents="1" format="ascii">
-          4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06
-          4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.50297e-06 4.98546e-06 4.98546e-06 4.98546e-06
-          4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06
-          4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 4.98546e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06
-          5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06 5.45059e-06
-          5.45059e-06 5.45059e-06 5.45059e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06
+          4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06
+          4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.98544e-06 4.98544e-06 4.98544e-06
+          4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06
+          4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06
+          5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06 5.45058e-06
+          5.45058e-06 5.45058e-06 5.45058e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06
           5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06 5.89898e-06
           6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06
           6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.33125e-06 6.74795e-06 6.74795e-06 6.74795e-06
@@ -199,12 +173,12 @@
           6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06
         </DataArray>
         <DataArray type="Float32" Name="x_g^H2O" NumberOfComponents="1" format="ascii">
+          0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
+          0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623062 0.0623062 0.0623062
           0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
-          0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623061 0.0623061 0.0623061
-          0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
-          0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
-          0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
-          0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
+          0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
+          0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
+          0.0623062 0.0623062 0.0623062 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
           0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
           0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061
           0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.0623061 0.062306 0.062306 0.062306
@@ -212,45 +186,45 @@
           0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
         </DataArray>
         <DataArray type="Float32" Name="x_g^N2" NumberOfComponents="1" format="ascii">
-          0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006
-          0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.702006 0.676753 0.676753 0.676753
+          0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008
+          0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.676753 0.676753 0.676753
           0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753
           0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.652408 0.652408 0.652408 0.652408 0.652408 0.652408
           0.652408 0.652408 0.652408 0.652408 0.652408 0.652408 0.652408 0.652408 0.652408 0.652408 0.652408 0.652408
           0.652408 0.652408 0.652408 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939
           0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939 0.628939
-          0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315
-          0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.606315 0.584504 0.584504 0.584504
+          0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314
+          0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.606314 0.584504 0.584504 0.584504
           0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504
           0.584504 0.584504 0.584504 0.584504 0.584504 0.584504
         </DataArray>
         <DataArray type="Float32" Name="x_g^O2" NumberOfComponents="1" format="ascii">
-          0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687
-          0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.235687 0.260941 0.260941 0.260941
-          0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.260941
-          0.260941 0.260941 0.260941 0.260941 0.260941 0.260941 0.285286 0.285286 0.285286 0.285286 0.285286 0.285286
+          0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686
+          0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.26094 0.26094 0.26094
+          0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094
+          0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.285286 0.285286 0.285286 0.285286 0.285286 0.285286
           0.285286 0.285286 0.285286 0.285286 0.285286 0.285286 0.285286 0.285286 0.285286 0.285286 0.285286 0.285286
           0.285286 0.285286 0.285286 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755
           0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755 0.308755
-          0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379
-          0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.331379 0.35319 0.35319 0.35319
+          0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138
+          0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.33138 0.35319 0.35319 0.35319
           0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319
           0.35319 0.35319 0.35319 0.35319 0.35319 0.35319
         </DataArray>
-        <DataArray type="Float32" Name="m_l^H2O" NumberOfComponents="1" format="ascii">
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
-          55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
+        <DataArray type="Float32" Name="m_g^H2O" NumberOfComponents="1" format="ascii">
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
+          55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.4 55141.4 55141.4
           55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
           55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
         </DataArray>
-        <DataArray type="Float32" Name="m_l^N2" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="m_g^N2" NumberOfComponents="1" format="ascii">
           0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939
           0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.375382 0.375382 0.375382
           0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382
@@ -263,18 +237,31 @@
           0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214
           0.324214 0.324214 0.324214 0.324214 0.324214 0.324214
         </DataArray>
-        <DataArray type="Float32" Name="m_l^O2" NumberOfComponents="1" format="ascii">
-          0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303
-          0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.248303 0.274909 0.274909 0.274909
-          0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.274909
-          0.274909 0.274909 0.274909 0.274909 0.274909 0.274909 0.300557 0.300557 0.300557 0.300557 0.300557 0.300557
+        <DataArray type="Float32" Name="m_g^O2" NumberOfComponents="1" format="ascii">
+          0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302
+          0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.274908 0.274908 0.274908
+          0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908
+          0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.300557 0.300557 0.300557 0.300557 0.300557 0.300557
           0.300557 0.300557 0.300557 0.300557 0.300557 0.300557 0.300557 0.300557 0.300557 0.300557 0.300557 0.300557
-          0.300557 0.300557 0.300557 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282
-          0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282 0.325282
+          0.300557 0.300557 0.300557 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283
+          0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283 0.325283
           0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118
-          0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.372096 0.372096 0.372096
-          0.372096 0.372096 0.372096 0.372096 0.372096 0.372096 0.372096 0.372096 0.372096 0.372096 0.372096 0.372096
-          0.372096 0.372096 0.372096 0.372096 0.372096 0.372096
+          0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.349118 0.372097 0.372097 0.372097
+          0.372097 0.372097 0.372097 0.372097 0.372097 0.372097 0.372097 0.372097 0.372097 0.372097 0.372097 0.372097
+          0.372097 0.372097 0.372097 0.372097 0.372097 0.372097
+        </DataArray>
+        <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3 3 3 3 3 3 3
+          3 3 3 3 3 3
         </DataArray>
         <DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -289,22 +276,9 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii">
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3 3 3 3 3 3 3
-          3 3 3 3 3 3
-        </DataArray>
-        <DataArray type="Float32" Name="reactionSourceH2O [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
-          379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43
-          379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 379.43 0 0 0
+        <DataArray type="Float32" Name="currentDensity [A/cm^2]" NumberOfComponents="1" format="ascii">
+          0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007
+          0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0.458007 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -315,9 +289,9 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="reactionSourceO2 [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
-          -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463
-          -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 -129.463 0 0 0
+        <DataArray type="Float32" Name="reactionSourceH2O [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
+          379.425 379.425 379.425 379.425 379.425 379.425 379.425 379.425 379.425 379.425 379.425 379.425
+          379.425 379.425 379.425 379.425 379.425 379.425 379.425 379.425 379.425 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -328,9 +302,9 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="currentDensity [A/cm^2]" NumberOfComponents="1" format="ascii">
-          0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013
-          0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0.458013 0 0 0
+        <DataArray type="Float32" Name="reactionSourceO2 [mol/(sm^2)]" NumberOfComponents="1" format="ascii">
+          -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461
+          -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 -129.461 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -341,6 +315,32 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
+        <DataArray type="Float32" Name="Kxx" NumberOfComponents="1" format="ascii">
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+        </DataArray>
+        <DataArray type="Float32" Name="Kyy" NumberOfComponents="1" format="ascii">
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+          5e-11 5e-11 5e-11 5e-11 5e-11 5e-11
+        </DataArray>
       </CellData>
       <Points>
         <DataArray type="Float32" Name="Coordinates" NumberOfComponents="3" format="ascii">
-- 
GitLab


From a88a7d8aecfd397aaee1c733be0a4f0c89bb38dd Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 25 Apr 2018 19:22:10 +0200
Subject: [PATCH 2/2] Remove buggy and obsolete PhilToPhobLaw -> use
 wettingPhase() in spatial params to set the wetting phase index

---
 .../fluidmatrixinteractions/2p/CMakeLists.txt |   1 -
 .../2p/philtophoblaw.hh                       | 208 ------------------
 2 files changed, 209 deletions(-)
 delete mode 100644 dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh

diff --git a/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt b/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
index 9ad5b77c1d..05bb74d80e 100644
--- a/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
+++ b/dumux/material/fluidmatrixinteractions/2p/CMakeLists.txt
@@ -9,7 +9,6 @@ heatpipelaw.hh
 heatpipelawparams.hh
 linearmaterial.hh
 linearmaterialparams.hh
-philtophoblaw.hh
 regularizedbrookscorey.hh
 regularizedbrookscoreyparams.hh
 regularizedlinearmaterial.hh
diff --git a/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh b/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh
deleted file mode 100644
index bffa137c7b..0000000000
--- a/dumux/material/fluidmatrixinteractions/2p/philtophoblaw.hh
+++ /dev/null
@@ -1,208 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-// vi: set et ts=4 sw=4 sts=4:
-/*****************************************************************************
- *   See the file COPYING for full copying permissions.                      *
- *                                                                           *
- *   This program is free software: you can redistribute it and/or modify    *
- *   it under the terms of the GNU General Public License as published by    *
- *   the Free Software Foundation, either version 2 of the License, or       *
- *   (at your option) any later version.                                     *
- *                                                                           *
- *   This program is distributed in the hope that it will be useful,         *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of          *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the            *
- *   GNU General Public License for more details.                            *
- *                                                                           *
- *   You should have received a copy of the GNU General Public License       *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.   *
- *****************************************************************************/
-/*!
- * \file
- * \ingroup Fluidmatrixinteractions
- * \brief This material law takes a material law defined for effective
- *        saturations and converts it to a material law defined on
- *        absolute saturations. It is valid for hydrophobic materials and is
- *        called with the non-wetting phase saturation and then calls the
- *        material law defined for the wetting phase saturation.
- */
-#ifndef DUMUX_PHIL_TO_PHOB_LAW_HH
-#define DUMUX_PHIL_TO_PHOB_LAW_HH
-
-#include <dune/common/exceptions.hh>
-
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
-#include <dumux/material/fluidmatrixinteractions/2p/efftoabslawparams.hh>
-
-namespace Dumux
-{
-/*!
- * \ingroup Fluidmatrixinteractions
- * \brief This material law takes a material law defined for effective
- *        saturations and converts it to a material law defined on absolute
- *        saturations.
- *
- *        Additionally, this class converts the material law defined for the wetting phase so that it
- *        can be called with the non-wetting phase saturation. This is needed for hydrophobic materials.
- *
- *        The idea: "material laws" (like VanGenuchten or BrooksCorey) are defined for effective saturations.
- *        The numeric calculations however are performed with absolute saturations. The EffToAbsLaw class gets
- *        the "material laws" actually used as well as the corresponding parameter container as template arguments.
- *
- *        The desired function (pc, Sw... ) of the actually used "material laws" gets the non-wetting
- *        saturation from the model. Here, the wetting saturation is calculated from it: \f$\mathrm{S_w = 1 - S_n}\f$.
- *        Then the effective wetting saturations are calculated and handed to the material law.
- *
- *        The following definition shows the pc-Sw-relationship for the case in which the x-axis
- *        is \f$\mathrm{S_w (=S_{water})}\f$ and the y-axis is \f$\mathrm{p_c = p_{non_wetting}-p_{wetting}}\f$.
- *        \image html pc_Sw_1.png
- *
- *        But DumuX actually uses the following curve, because \f$\mathrm{p_c = p_{non-water}-p_{water}}\f$ for the y-axis is used.
- *        \image html pc_Sw_2.png
- *
- *        This approach makes sure that in the "material laws" only effective wetting saturations are considered,
- *        which makes sense, as these laws only deal with effective saturations. This also allows for changing
- *        the calculation of the effective saturations easily, as this is subject of discussion / may be problem specific.
- *
- *        Additionally, handing over effective saturations to the "material laws" in stead of them calculating effective
- *        saturations prevents accidentally "converting twice".
- *
- *        Additionally, the values calculated by the actual material laws are then modified: \f$\mathrm{pc_{phob} = - pc_{phil} (1-S_n)}\f$.
- *
- *        This boils down to:
- *        - the actual material laws (linear, VanGenuchten...) do not need to deal with any kind of conversion
- *        - the definition of the material law in the spatial parameters is not really intuitive, but using it is:
- *          Hand in values, get back values, do not deal with conversion.
- *
- *        CAREFUL: here w and n still stand for wetting and non-wetting. In the hydrophobic model w stands for
- *        water (non-wetting) and n for non-water (wetting). Hence, Swr is the wetting phase (gas) residual
- *        saturation and needs to be set accordingly in the spatial parameters.
- */
-
-template <class EffLawT, class AbsParamsT = EffToAbsLawParams<typename EffLawT::Params> >
-class PhilToPhobLaw : EffToAbsLaw<EffLawT>
-{
-    using EffLaw = EffLawT;
-
-public:
-    using Params = AbsParamsT;
-    using Scalar = typename EffLaw::Scalar;
-    using ParentType = EffToAbsLaw<EffLawT>;
-    /*!
-     * \brief The capillary pressure-saturation curve.
-     *
-     *
-     * \param sn Absolute saturation of the non-wetting phase \f$\mathrm{\overline{S}_n}\f$. It is converted to the
-     *                  effective saturation of the wetting phase and then handed over to the material law actually
-     *                  used for calculation.
-     * \param params A container object that is populated with the appropriate coefficients for the respective law.
-     *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen,
-     *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return Capillary pressure \f$\mathrm{p_c}\f$ in \f$\mathrm{[Pa]}\f$  calculated by specific constitutive relation
-     *                  (EffLaw e.g. Brooks & Corey, van Genuchten, linear...)*-1 to account for hydrophobic material.
-     *
-     */
-    static Scalar pc(const Params &params, Scalar sn)
-    {
-        return -1.0 * EffLaw::pc(params, 1.0 - ParentType::swToSwe(params, sn));
-    }
-
-    /*!
-     * \brief The saturation-capillary pressure curve.
-     *
-     * \param pc Capillary pressure \f$\mathrm{p_c}\f$ in \f$\mathrm{[Pa]}\f$
-     * \param params A container object that is populated with the appropriate coefficients for the respective law.
-     *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen,
-     *                  and then the params container is constructed accordingly. Afterwards the values are set there, too.
-     *\return Absolute wetting phase saturation calculated as inverse of
-     *                  (EffLaw e.g. Brooks & Corey, van Genuchten, linear...) constitutive relation.
-     *
-     * \return The absolute saturation of the wetting phase \f$\mathrm{S_w}\f$
-     */
-    static Scalar sw(const Params &params, Scalar pc)
-    {
-       DUNE_THROW(Dune::NotImplemented, "PhilToPhobLaw::sw(params, pc)");
-    }
-
-    /*!
-     * \brief Returns the partial derivative of the capillary
-     *        pressure w.r.t the absolute saturation.
-     *
-     *        In this case the chain rule needs to be applied:
-     \f$\mathrm{
-             p_c = p_c( \overline{S}_w (S_w))
-             \rightarrow p_c ^\prime = \frac{\partial  p_c}{\partial \overline{S}_w} \frac{\partial \overline{S}_w}{\partial S_w}
-     }\f$
-     * \param sw Absolute saturation of the wetting phase \f$\mathrm{\overline{S}_w}\f$.
-     * \param params A container object that is populated with the appropriate coefficients for the respective law.
-     *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen, and
-     *                  then the params container is constructed accordingly. Afterwards the values are set there, too.
-     * \return          Partial derivative of \f$\mathrm{p_c}\f$ w.r.t. effective saturation according to EffLaw
-     *                  e.g. Brooks & Corey, van Genuchten, linear... .
-     */
-    static Scalar dpc_dsw(const Params &params, Scalar sw)
-    {
-        DUNE_THROW(Dune::NotImplemented, "PhilToPhobLaw::dpc_dsw(params, sw)");
-    }
-
-    /*!
-     * \brief Returns the partial derivative of the absolute
-     *        saturation w.r.t. the capillary pressure.
-     *
-     * In this case the chain rule needs to be applied:
-     \f$\mathrm{
-            S_w = S_w(\overline{S}_w (p_c) )
-            \rightarrow S_w^\prime = \frac{\partial S_w}{\partial \overline{S}_w} \frac{\partial \overline{S}_w}{\partial p_c}
-    }\f$
-     *
-     *
-     * \param pc Capillary pressure \f$\mathrm{p_c}\f$ in \f$\mathrm{[Pa]}\f$
-     * \param params A container object that is populated with the appropriate coefficients for the respective law.
-     *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen, and then the params container
-     *                  is constructed accordingly. Afterwards the values are set there, too.
-     * \return Partial derivative of effective saturation w.r.t. \f$\mathrm{p_C}\f$ according to EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
-     */
-    static Scalar dsw_dpc(const Params &params, Scalar pc)
-    {
-        DUNE_THROW(Dune::NotImplemented, "PhilToPhobLaw::dsw_dpc(params, pc)");
-    }
-
-    /*!
-     * \brief The relative permeability for the wetting phase.
-     *
-     * \param sn Absolute saturation of the non-wetting phase \f$\mathrm{\overline{S}_w}\f$. It is converted to effective saturation of the wetting phase
-     *                  and then handed over to the material law actually used for calculation.
-     * \param params A container object that is populated with the appropriate coefficients for the respective law.
-     *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen, and then the params container
-     *                  is constructed accordingly. Afterwards the values are set there, too.
-     * \return Relative permeability of the wetting phase calculated as implied by EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
-     *
-     */
-    static Scalar krw(const Params &params, Scalar sn)
-    {
-        if(sn >= params.swr())
-            return sn*sn;//EffLaw::krn(params, SwToSwe(params, 1.0 - sn));
-        else
-            return 0.0;
-    };
-
-    /*!
-     * \brief The relative permeability for the non-wetting phase.
-     *
-     * \param sn Absolute saturation of the non-wetting phase \f$\mathrm{\overline{S}_w}\f$. It is converted to effective saturation of the wetting phase
-     *                  and then handed over to the material law actually used for calculation.
-     * \param params A container object that is populated with the appropriate coefficients for the respective law.
-     *                  Therefore, in the (problem specific) spatialParameters  first, the material law is chosen, and then the params container
-     *                  is constructed accordingly. Afterwards the values are set there, too.
-     * \return Relative permeability of the non-wetting phase calculated as implied by EffLaw e.g. Brooks & Corey, van Genuchten, linear... .
-     */
-    static Scalar krn(const Params &params, Scalar sn)
-    {
-        if((1.0-sn) >= params.snr())
-            return (1.0-sn)*(1.0-sn)*(1.0-sn);//EffLaw::krw(params, SwToSwe(params, 1.0 - sn));
-        else
-            return 0.0;
-    }
-};
-}
-
-#endif
-- 
GitLab