From a307c055ca12b104fe10f083177b865a4e377085 Mon Sep 17 00:00:00 2001
From: Katharina Heck <katharina.heck@iws.uni-stuttgart.de>
Date: Thu, 30 Nov 2017 13:17:26 +0100
Subject: [PATCH] [reference] delete output from nonwetting phase e.g. density
 not necessary

---
 .../richardsanalyticalcc-reference.vtu        | 228 +++++++---------
 .../richardsniconductionbox-reference.vtu     | 249 +++++-------------
 .../richardsniconductioncc-reference.vtu      | 128 +++------
 .../richardsniconvectionbox-reference.vtu     | 107 +++-----
 .../richardsniconvectioncc-reference.vtu      |  58 ++--
 5 files changed, 252 insertions(+), 518 deletions(-)

diff --git a/test/references/richardsanalyticalcc-reference.vtu b/test/references/richardsanalyticalcc-reference.vtu
index 842361c97b..ca2cf0fb0a 100644
--- a/test/references/richardsanalyticalcc-reference.vtu
+++ b/test/references/richardsanalyticalcc-reference.vtu
@@ -228,7 +228,7 @@
           1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2
           1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2 1057.2
         </DataArray>
-        <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -273,52 +273,7 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-        </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
@@ -363,50 +318,50 @@
           1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
           1000 1000 1000 1000 1000 1000 1000 1000
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
+        <DataArray type="Float32" Name="kr" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
@@ -453,51 +408,6 @@
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-          283.15 283.15 283.15 283.15 283.15 283.15 283.15 283.15
-        </DataArray>
         <DataArray type="Float32" Name="water content" NumberOfComponents="1" format="ascii">
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
@@ -543,7 +453,51 @@
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
         </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 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
+          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 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
+          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
           0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/richardsniconductionbox-reference.vtu b/test/references/richardsniconductionbox-reference.vtu
index 9cd70bcbc1..7b46a8ddad 100644
--- a/test/references/richardsniconductionbox-reference.vtu
+++ b/test/references/richardsniconductionbox-reference.vtu
@@ -183,7 +183,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
           996.544 996.726 996.544 996.726 996.906 996.906 997.084 997.084 997.239 997.239 997.385 997.385
           997.526 997.526 997.66 997.66 997.787 997.787 997.906 997.906 998.007 998.007 998.094 998.094
           998.175 998.175 998.248 998.248 998.315 998.315 998.376 998.376 998.431 998.431 998.48 998.48
@@ -219,43 +219,7 @@
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-        </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
           1169.89 1152.46 1169.89 1152.46 1135.68 1135.68 1119.64 1119.64 1102.68 1102.68 1086.42 1086.42
           1071.26 1071.26 1057.19 1057.19 1044.22 1044.22 1032.32 1032.32 1020.47 1020.47 1009.2 1009.2
           999.031 999.031 989.899 989.899 981.729 981.729 974.446 974.446 967.977 967.977 962.249 962.249
@@ -291,41 +255,41 @@
           921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392
           921.392 921.392 921.392 921.392 921.392 921.392
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
+        <DataArray type="Float32" Name="kr" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
@@ -363,6 +327,42 @@
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4 0.4 0.4
         </DataArray>
+        <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1
+        </DataArray>
         <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
           300 299.327 300 299.327 298.659 298.659 298.003 298.003 297.362 297.362 296.742 296.742
           296.147 296.147 295.58 295.58 295.043 295.043 294.539 294.539 294.068 294.068 293.632 293.632
@@ -435,109 +435,6 @@
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="velocity" NumberOfComponents="3" format="ascii">
-          -1.04565e-09 4.25604e-19 0 -1.03948e-09 -1.67705e-18 0 -1.04565e-09 4.25604e-19 0 -1.03948e-09 -1.67705e-18 0
-          -1.02126e-09 -2.68552e-18 0 -1.02126e-09 -2.68552e-18 0 -9.91887e-10 -2.03662e-19 0 -9.91887e-10 -2.03662e-19 0
-          -9.54807e-10 -2.00576e-19 0 -9.54807e-10 -2.00576e-19 0 -9.11444e-10 2.56905e-18 0 -9.11444e-10 2.56905e-18 0
-          -8.61045e-10 4.67665e-18 0 -8.61045e-10 4.67665e-18 0 -8.04909e-10 1.73072e-18 0 -8.04909e-10 1.73072e-18 0
-          -7.44388e-10 1.89942e-19 0 -7.44388e-10 1.89942e-19 0 -6.8232e-10 3.75556e-19 0 -6.8232e-10 3.75556e-19 0
-          -6.23547e-10 3.71246e-19 0 -6.23547e-10 3.71246e-19 0 -5.67767e-10 2.38644e-18 0 -5.67767e-10 2.38644e-18 0
-          -5.12412e-10 7.26891e-19 0 -5.12412e-10 7.26891e-19 0 -4.58259e-10 1.80062e-19 0 -4.58259e-10 1.80062e-19 0
-          -4.05951e-10 0 0 -4.05951e-10 0 0 -3.55999e-10 1.59526e-18 0 -3.55999e-10 1.59526e-18 0
-          -3.08787e-10 -1.76074e-19 0 -3.08787e-10 -1.76074e-19 0 -2.64581e-10 3.50064e-19 0 -2.64581e-10 3.50064e-19 0
-          -2.23542e-10 0 0 -2.23542e-10 0 0 -1.85741e-10 1.73304e-19 0 -1.85741e-10 1.73304e-19 0
-          -1.51172e-10 1.20816e-18 0 -1.51172e-10 1.20816e-18 0 -1.19769e-10 -1.20381e-18 0 -1.19769e-10 -1.20381e-18 0
-          -9.38154e-11 -1.71431e-19 0 -9.38153e-11 -1.71431e-19 0 -7.31082e-11 1.70893e-19 0 -7.31081e-11 1.70893e-19 0
-          -5.48136e-11 1.36337e-18 0 -5.48136e-11 1.36337e-18 0 -3.85543e-11 1.3601e-18 0 -3.85543e-11 1.3601e-18 0
-          -2.41689e-11 -1.69659e-19 0 -2.4169e-11 -1.69659e-19 0 -1.14949e-11 -2.87904e-18 0 -1.14949e-11 -2.87904e-18 0
-          -3.72034e-13 1.69094e-19 0 -3.72018e-13 1.69094e-19 0 9.35384e-12 3.37739e-19 0 9.35386e-12 3.37739e-19 0
-          1.78292e-11 -1.68677e-19 0 1.78292e-11 -1.68677e-19 0 2.51914e-11 -5.0554e-19 0 2.51914e-11 -5.0554e-19 0
-          3.15677e-11 -3.36746e-19 0 3.15677e-11 -3.36746e-19 0 3.70748e-11 -1.68253e-19 0 3.70748e-11 -1.68253e-19 0
-          4.18188e-11 -1.84967e-18 0 4.18188e-11 -1.84967e-18 0 4.58955e-11 1.34452e-18 0 4.58955e-11 1.34452e-18 0
-          4.93907e-11 3.35984e-19 0 4.93907e-11 3.35984e-19 0 5.23809e-11 0 0 5.23809e-11 0 0
-          5.4934e-11 -1.67878e-19 0 5.4934e-11 -1.67878e-19 0 5.71097e-11 0 0 5.71097e-11 0 0
-          5.89605e-11 5.03387e-19 0 5.89605e-11 5.03387e-19 0 6.05323e-11 1.67764e-18 0 6.05323e-11 1.67764e-18 0
-          6.18651e-11 1.67738e-19 0 6.1865e-11 1.67738e-19 0 6.29934e-11 -6.70861e-19 0 6.29935e-11 -6.70861e-19 0
-          6.39475e-11 1.67696e-18 0 6.39475e-11 1.67696e-18 0 6.4753e-11 3.68897e-18 0 6.4753e-11 3.68897e-18 0
-          6.54323e-11 3.01801e-18 0 6.54324e-11 3.01801e-18 0 6.60046e-11 7.54454e-18 0 6.60046e-11 7.54454e-18 0
-          6.64861e-11 3.35294e-18 0 6.64861e-11 3.35294e-18 0 6.68908e-11 2.84987e-18 0 6.68908e-11 2.84987e-18 0
-          6.72306e-11 4.02319e-18 0 6.72306e-11 4.02319e-18 0 6.75157e-11 2.68204e-18 0 6.75157e-11 2.68204e-18 0
-          6.77547e-11 2.68197e-18 0 6.77547e-11 2.68197e-18 0 6.79548e-11 2.17905e-18 0 6.79548e-11 2.17905e-18 0
-          6.81223e-11 2.51424e-18 0 6.81223e-11 2.51424e-18 0 6.82623e-11 5.0284e-19 0 6.82623e-11 5.0284e-19 0
-          6.83794e-11 3.35222e-19 0 6.83794e-11 3.35222e-19 0 6.84772e-11 8.38046e-19 0 6.84772e-11 8.38046e-19 0
-          6.85588e-11 -1.34086e-18 0 6.85587e-11 -1.34086e-18 0 6.86268e-11 -2.17888e-18 0 6.86268e-11 -2.17888e-18 0
-          6.86835e-11 -1.67605e-19 0 6.86835e-11 -1.67605e-19 0 6.87308e-11 -1.67605e-19 0 6.87308e-11 -1.67605e-19 0
-          6.87701e-11 0 0 6.87701e-11 0 0 6.88029e-11 3.35206e-18 0 6.88029e-11 3.35206e-18 0
-          6.88302e-11 4.19007e-18 0 6.88302e-11 4.19007e-18 0 6.88529e-11 4.86047e-18 0 6.88529e-11 4.86047e-18 0
-          6.88717e-11 3.85484e-18 0 6.88717e-11 3.85484e-18 0 6.88874e-11 1.84362e-18 0 6.88873e-11 1.84362e-18 0
-          6.89004e-11 2.17882e-18 0 6.89003e-11 2.17882e-18 0 6.89112e-11 -1.50841e-18 0 6.89111e-11 -1.50841e-18 0
-          6.89201e-11 -2.68162e-18 0 6.89201e-11 -2.68162e-18 0 6.89276e-11 -2.68161e-18 0 6.89276e-11 -2.68161e-18 0
-          6.89338e-11 -1.0056e-18 0 6.89338e-11 -1.0056e-18 0 6.89389e-11 1.67601e-18 0 6.89389e-11 1.67601e-18 0
-          6.89431e-11 3.35201e-19 0 6.89431e-11 3.35201e-19 0 6.89467e-11 1.3408e-18 0 6.89466e-11 1.3408e-18 0
-          6.89496e-11 -2.84921e-18 0 6.89496e-11 -2.84921e-18 0 6.8952e-11 -2.34641e-18 0 6.8952e-11 -2.34641e-18 0
-          6.8954e-11 -1.3408e-18 0 6.8954e-11 -1.3408e-18 0 6.89556e-11 -1.0056e-18 0 6.89557e-11 -1.0056e-18 0
-          6.8957e-11 -1.676e-19 0 6.89571e-11 -1.676e-19 0 6.89582e-11 2.1788e-18 0 6.89582e-11 2.1788e-18 0
-          6.89591e-11 3.01681e-18 0 6.89592e-11 3.01681e-18 0 6.89599e-11 4.52521e-18 0 6.89599e-11 4.52521e-18 0
-          6.89605e-11 2.6816e-18 0 6.89605e-11 2.6816e-18 0 6.89611e-11 3.51961e-18 0 6.89611e-11 3.51961e-18 0
-          6.89615e-11 1.676e-18 0 6.89615e-11 1.676e-18 0 6.89619e-11 -5.02801e-19 0 6.89619e-11 -5.02801e-19 0
-          6.89622e-11 -2.3464e-18 0 6.89622e-11 -2.3464e-18 0 6.89624e-11 -2.1788e-18 0 6.89624e-11 -2.1788e-18 0
-          6.89627e-11 -2.0112e-18 0 6.89626e-11 -2.0112e-18 0 6.89628e-11 -1.676e-18 0 6.89628e-11 -1.676e-18 0
-          6.89629e-11 -3.35201e-18 0 6.89629e-11 -3.35201e-18 0 6.89631e-11 -1.3408e-18 0 6.89631e-11 -1.3408e-18 0
-          6.89632e-11 -2.514e-18 0 6.89632e-11 -2.514e-18 0 6.89633e-11 -1.3408e-18 0 6.89632e-11 -1.3408e-18 0
-          6.89633e-11 -1.8436e-18 0 6.89633e-11 -1.8436e-18 0 6.89634e-11 1.676e-18 0 6.89634e-11 1.676e-18 0
-          6.89635e-11 1.0056e-18 0 6.89634e-11 1.0056e-18 0 6.89635e-11 -3.1844e-18 0 6.89634e-11 -3.1844e-18 0
-          6.89635e-11 0 0 6.89635e-11 0 0 6.89635e-11 -2.1788e-18 0 6.89635e-11 -2.1788e-18 0
-          6.89635e-11 -1.5084e-18 0 6.89635e-11 -1.5084e-18 0 6.89636e-11 0 0 6.89636e-11 0 0
-          6.89636e-11 1.1732e-18 0 6.89635e-11 1.1732e-18 0 6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0
-          6.89636e-11 -1.3408e-18 0 6.89636e-11 -1.3408e-18 0 6.89636e-11 0 0 6.89636e-11 0 0
-          6.89636e-11 -1.8436e-18 0 6.89636e-11 -1.8436e-18 0 6.89636e-11 -3.35201e-19 0 6.89636e-11 -3.35201e-19 0
-          6.89636e-11 -8.38001e-19 0 6.89636e-11 -8.38001e-19 0 6.89636e-11 6.70401e-19 0 6.89636e-11 6.70401e-19 0
-          6.89636e-11 1.676e-19 0 6.89636e-11 1.676e-19 0 6.89636e-11 -3.35201e-19 0 6.89636e-11 -3.35201e-19 0
-          6.89636e-11 0 0 6.89636e-11 0 0 6.89636e-11 1.5084e-18 0 6.89636e-11 1.5084e-18 0
-          6.89636e-11 -3.35201e-19 0 6.89636e-11 -3.35201e-19 0 6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0
-          6.89636e-11 -1.3408e-18 0 6.89636e-11 -1.3408e-18 0 6.89636e-11 -1.676e-18 0 6.89636e-11 -1.676e-18 0
-          6.89636e-11 -3.35201e-19 0 6.89636e-11 -3.35201e-19 0 6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0
-          6.89636e-11 -3.35201e-18 0 6.89636e-11 -3.35201e-18 0 6.89636e-11 -1.676e-18 0 6.89636e-11 -1.676e-18 0
-          6.89636e-11 -1.676e-18 0 6.89636e-11 -1.676e-18 0 6.89636e-11 -2.6816e-18 0 6.89636e-11 -2.6816e-18 0
-          6.89636e-11 -2.3464e-18 0 6.89637e-11 -2.3464e-18 0 6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0
-          6.89636e-11 -1.8436e-18 0 6.89636e-11 -1.8436e-18 0 6.89636e-11 -5.02801e-19 0 6.89636e-11 -5.02801e-19 0
-          6.89637e-11 -3.35201e-19 0 6.89636e-11 -3.35201e-19 0 6.89637e-11 -3.51961e-18 0 6.89636e-11 -3.51961e-18 0
-          6.89636e-11 -3.85481e-18 0 6.89636e-11 -3.85481e-18 0 6.89636e-11 -1.8436e-18 0 6.89636e-11 -1.8436e-18 0
-          6.89636e-11 -3.51961e-18 0 6.89636e-11 -3.51961e-18 0 6.89636e-11 -3.85481e-18 0 6.89637e-11 -3.85481e-18 0
-          6.89636e-11 -3.35201e-19 0 6.89637e-11 -3.35201e-19 0 6.89636e-11 -1.5084e-18 0 6.89636e-11 -1.5084e-18 0
-          6.89636e-11 -1.1732e-18 0 6.89636e-11 -1.1732e-18 0 6.89637e-11 -3.35201e-19 0 6.89636e-11 -3.35201e-19 0
-          6.89637e-11 -1.5084e-18 0 6.89636e-11 -1.5084e-18 0 6.89636e-11 -3.1844e-18 0 6.89637e-11 -3.1844e-18 0
-          6.89636e-11 -1.676e-19 0 6.89637e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0
-          6.89636e-11 -3.1844e-18 0 6.89636e-11 -3.1844e-18 0 6.89636e-11 -1.676e-18 0 6.89636e-11 -1.676e-18 0
-          6.89636e-11 0 0 6.89637e-11 0 0 6.89636e-11 -5.02801e-19 0 6.89636e-11 -5.02801e-19 0
-          6.89636e-11 -5.02801e-19 0 6.89636e-11 -5.02801e-19 0 6.89636e-11 -1.3408e-18 0 6.89636e-11 -1.3408e-18 0
-          6.89636e-11 -5.02801e-19 0 6.89636e-11 -5.02801e-19 0 6.89636e-11 -3.35201e-19 0 6.89636e-11 -3.35201e-19 0
-          6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0 6.89636e-11 -2.0112e-18 0 6.89636e-11 -2.0112e-18 0
-          6.89636e-11 -1.676e-18 0 6.89636e-11 -1.676e-18 0 6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0
-          6.89636e-11 -1.3408e-18 0 6.89636e-11 -1.3408e-18 0 6.89636e-11 -1.676e-18 0 6.89636e-11 -1.676e-18 0
-          6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0 6.89636e-11 1.676e-19 0 6.89636e-11 1.676e-19 0
-          6.89636e-11 1.676e-18 0 6.89636e-11 1.676e-18 0 6.89637e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0
-          6.89637e-11 -1.3408e-18 0 6.89636e-11 -1.3408e-18 0 6.89636e-11 -1.5084e-18 0 6.89636e-11 -1.5084e-18 0
-          6.89636e-11 0 0 6.89637e-11 0 0 6.89636e-11 2.3464e-18 0 6.89636e-11 2.3464e-18 0
-          6.89637e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0 6.89636e-11 1.3408e-18 0 6.89636e-11 1.3408e-18 0
-          6.89636e-11 2.1788e-18 0 6.89636e-11 2.1788e-18 0 6.89636e-11 1.676e-18 0 6.89636e-11 1.676e-18 0
-          6.89636e-11 0 0 6.89636e-11 0 0 6.89636e-11 1.5084e-18 0 6.89636e-11 1.5084e-18 0
-          6.89636e-11 1.8436e-18 0 6.89636e-11 1.8436e-18 0 6.89636e-11 1.3408e-18 0 6.89636e-11 1.3408e-18 0
-          6.89636e-11 3.35201e-18 0 6.89636e-11 3.35201e-18 0 6.89636e-11 3.35201e-19 0 6.89636e-11 3.35201e-19 0
-          6.89636e-11 1.1732e-18 0 6.89636e-11 1.1732e-18 0 6.89636e-11 0 0 6.89636e-11 0 0
-          6.89636e-11 2.3464e-18 0 6.89636e-11 2.3464e-18 0 6.89637e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0
-          6.89636e-11 1.3408e-18 0 6.89636e-11 1.3408e-18 0 6.89636e-11 2.3464e-18 0 6.89636e-11 2.3464e-18 0
-          6.89636e-11 1.1732e-18 0 6.89636e-11 1.1732e-18 0 6.89636e-11 0 0 6.89636e-11 0 0
-          6.89636e-11 2.3464e-18 0 6.89636e-11 2.3464e-18 0 6.89636e-11 1.8436e-18 0 6.89636e-11 1.8436e-18 0
-          6.89636e-11 1.1732e-18 0 6.89636e-11 1.1732e-18 0 6.89636e-11 8.38001e-19 0 6.89636e-11 8.38001e-19 0
-          6.89636e-11 1.676e-18 0 6.89636e-11 1.676e-18 0 6.89636e-11 1.1732e-18 0 6.89636e-11 1.1732e-18 0
-          6.89636e-11 1.676e-19 0 6.89636e-11 1.676e-19 0 6.89636e-11 1.676e-18 0 6.89636e-11 1.676e-18 0
-          6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0 6.89636e-11 1.3408e-18 0 6.89636e-11 1.3408e-18 0
-          6.89636e-11 1.676e-19 0 6.89636e-11 1.676e-19 0 6.89636e-11 -1.676e-19 0 6.89637e-11 -1.676e-19 0
-          6.89636e-11 0 0 6.89636e-11 0 0 6.89636e-11 2.1788e-18 0 6.89636e-11 2.1788e-18 0
-          6.89636e-11 -1.676e-19 0 6.89636e-11 -1.676e-19 0 6.89636e-11 1.3408e-18 0 6.89636e-11 1.3408e-18 0
-          6.89637e-11 0 0 6.89636e-11 0 0
-        </DataArray>
         <DataArray type="Float32" Name="temperatureExact" NumberOfComponents="1" format="ascii">
           300 299.373 300 299.373 298.749 298.749 298.133 298.133 297.529 297.529 296.939 296.939
           296.368 296.368 295.817 295.817 295.289 295.289 294.787 294.787 294.313 294.313 293.866 293.866
diff --git a/test/references/richardsniconductioncc-reference.vtu b/test/references/richardsniconductioncc-reference.vtu
index cea0db5b7a..937bdfe599 100644
--- a/test/references/richardsniconductioncc-reference.vtu
+++ b/test/references/richardsniconductioncc-reference.vtu
@@ -98,7 +98,7 @@
           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="rhoW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
           996.635 996.816 996.995 997.163 997.312 997.456 997.593 997.724 997.847 997.96 998.051 998.135
           998.212 998.282 998.346 998.404 998.456 998.502 998.544 998.58 998.613 998.641 998.664 998.682
           998.697 998.711 998.722 998.732 998.74 998.748 998.754 998.76 998.764 998.768 998.771 998.774
@@ -117,26 +117,7 @@
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-        </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
           1161.11 1144 1127.6 1111.26 1094.48 1078.77 1064.16 1050.64 1038.21 1026.63 1014.77 1004.04
           994.394 985.742 978.014 971.136 965.035 959.642 954.889 950.713 947.055 943.859 940.897 938.104
           935.684 933.594 931.791 930.24 928.909 927.768 926.792 925.959 925.25 924.646 924.134 923.699
@@ -155,24 +136,24 @@
           921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392
           921.392 921.392 921.392 921.392 921.392 921.392 921.392 921.392
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
+        <DataArray type="Float32" Name="kr" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
@@ -231,57 +212,24 @@
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="velocity" NumberOfComponents="3" format="ascii">
-          -1.03797e-09 0 0 -1.02573e-09 0 0 -1.00183e-09 0 0 -9.69465e-10 0 0
-          -9.30241e-10 0 0 -8.83399e-10 0 0 -8.30174e-10 0 0 -7.7189e-10 0 0
-          -7.09893e-10 0 0 -6.50497e-10 0 0 -5.94981e-10 0 0 -5.39432e-10 0 0
-          -4.84687e-10 0 0 -4.31453e-10 0 0 -3.80308e-10 0 0 -3.31701e-10 0 0
-          -2.85956e-10 0 0 -2.4329e-10 0 0 -2.0382e-10 0 0 -1.6758e-10 0 0
-          -1.34542e-10 0 0 -1.06341e-10 0 0 -8.36011e-11 0 0 -6.41689e-11 0 0
-          -4.68528e-11 0 0 -3.14954e-11 0 0 -1.79352e-11 0 0 -6.01101e-12 0 0
-          4.43412e-12 0 0 1.35505e-11 0 0 2.14803e-11 0 0 2.83564e-11 0 0
-          3.4301e-11 0 0 3.94262e-11 0 0 4.38332e-11 0 0 4.76134e-11 0 0
-          5.08484e-11 0 0 5.36109e-11 0 0 5.59649e-11 0 0 5.7967e-11 0 0
-          5.96667e-11 0 0 6.11072e-11 0 0 6.23261e-11 0 0 6.33557e-11 0 0
-          6.42243e-11 0 0 6.4956e-11 0 0 6.55716e-11 0 0 6.60889e-11 0 0
-          6.6523e-11 0 0 6.6887e-11 0 0 6.71918e-11 0 0 6.74469e-11 0 0
-          6.76601e-11 0 0 6.78381e-11 0 0 6.79866e-11 0 0 6.81105e-11 0 0
-          6.82136e-11 0 0 6.82995e-11 0 0 6.8371e-11 0 0 6.84304e-11 0 0
-          6.84798e-11 0 0 6.85208e-11 0 0 6.85548e-11 0 0 6.8583e-11 0 0
-          6.86064e-11 0 0 6.86258e-11 0 0 6.86419e-11 0 0 6.86552e-11 0 0
-          6.86662e-11 0 0 6.86753e-11 0 0 6.86829e-11 0 0 6.86891e-11 0 0
-          6.86942e-11 0 0 6.86984e-11 0 0 6.87019e-11 0 0 6.87048e-11 0 0
-          6.87072e-11 0 0 6.87092e-11 0 0 6.87108e-11 0 0 6.87122e-11 0 0
-          6.87133e-11 0 0 6.87142e-11 0 0 6.8715e-11 0 0 6.87156e-11 0 0
-          6.8716e-11 0 0 6.87165e-11 0 0 6.87169e-11 0 0 6.87172e-11 0 0
-          6.87174e-11 0 0 6.87175e-11 0 0 6.87177e-11 0 0 6.87179e-11 0 0
-          6.8718e-11 0 0 6.8718e-11 0 0 6.87181e-11 0 0 6.87182e-11 0 0
-          6.87182e-11 0 0 6.87183e-11 0 0 6.87183e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87184e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87184e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0
-          6.87184e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0
-          6.87184e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0
-          6.87185e-11 0 0 6.87185e-11 0 0 6.87184e-11 0 0 6.87184e-11 0 0
-          6.87184e-11 0 0 6.87184e-11 0 0 6.87185e-11 0 0 6.87185e-11 0 0
+        <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1
         </DataArray>
         <DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/richardsniconvectionbox-reference.vtu b/test/references/richardsniconvectionbox-reference.vtu
index 6483078316..3c22cab033 100644
--- a/test/references/richardsniconvectionbox-reference.vtu
+++ b/test/references/richardsniconvectionbox-reference.vtu
@@ -83,7 +83,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
           0 0 0 0 0 0
         </DataArray>
-        <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
           998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631 998.631
           998.632 998.632 998.633 998.633 998.635 998.635 998.639 998.639 998.645 998.645 998.653 998.653
           998.663 998.663 998.673 998.673 998.684 998.684 998.696 998.696 998.708 998.708 998.721 998.721
@@ -99,23 +99,7 @@
           998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.79 998.789 998.789
           998.789 998.789 998.789 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-        </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
           946.105 946.107 946.105 946.107 946.107 946.107 946.104 946.104 946.093 946.093 946.059 946.059
           945.981 945.981 945.825 945.825 945.548 945.548 945.105 945.105 944.453 944.453 943.564 943.564
           942.433 942.433 940.896 940.896 939.114 939.114 937.185 937.185 935.19 935.19 933.206 933.206
@@ -131,21 +115,21 @@
           921.42 921.42 921.42 921.42 921.42 921.42 921.419 921.419 921.419 921.419 921.419 921.419
           921.419 921.419 921.419 921.419 921.392 921.392
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
+        <DataArray type="Float32" Name="kr" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
@@ -195,48 +179,21 @@
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="velocity" NumberOfComponents="3" format="ascii">
-          0.0001 -3.44191e-19 0 0.0001 0 0 0.0001 -3.44191e-19 0 0.0001 0 0
-          0.0001 -1.37677e-18 0 0.0001 -1.37677e-18 0 0.0001 -1.72095e-18 0 0.0001 -1.72095e-18 0
-          0.0001 -1.72093e-18 0 0.0001 -1.72093e-18 0 0.0001 3.44174e-19 0 0.0001 3.44174e-19 0
-          0.0001 6.88292e-19 0 0.0001 6.88292e-19 0 0.0001 5.16134e-19 0 0.0001 5.16134e-19 0
-          9.99999e-05 3.43988e-19 0 9.99999e-05 3.43988e-19 0 9.99998e-05 1.20339e-18 0 9.99998e-05 1.20339e-18 0
-          9.99996e-05 3.4359e-19 0 9.99996e-05 3.4359e-19 0 9.99993e-05 1.37307e-18 0 9.99993e-05 1.37307e-18 0
-          9.99989e-05 6.8571e-19 0 9.99989e-05 6.8571e-19 0 9.99984e-05 1.19804e-18 0 9.99984e-05 1.19804e-18 0
-          9.9998e-05 3.41648e-19 0 9.9998e-05 3.41648e-19 0 9.99975e-05 1.70473e-19 0 9.99975e-05 1.70473e-19 0
-          9.9997e-05 0 0 9.9997e-05 0 0 9.99964e-05 3.39499e-19 0 9.99964e-05 3.39499e-19 0
-          9.99959e-05 -1.69404e-19 0 9.99959e-05 -1.69404e-19 0 9.99954e-05 1.52176e-18 0 9.99954e-05 1.52176e-18 0
-          9.9995e-05 -1.68799e-18 0 9.9995e-05 -1.68799e-18 0 9.99946e-05 -1.85405e-18 0 9.99946e-05 -1.85405e-18 0
-          9.99942e-05 -8.41696e-19 0 9.99942e-05 -8.41696e-19 0 9.99939e-05 0 0 9.99939e-05 0 0
-          9.99937e-05 -1.34421e-18 0 9.99937e-05 -1.34421e-18 0 9.99935e-05 3.35831e-19 0 9.99935e-05 3.35831e-19 0
-          9.99934e-05 1.67831e-18 0 9.99934e-05 1.67831e-18 0 9.99933e-05 1.67767e-19 0 9.99933e-05 1.67767e-19 0
-          9.99932e-05 1.34175e-18 0 9.99932e-05 1.34175e-18 0 9.99932e-05 -1.50916e-18 0 9.99932e-05 -1.50916e-18 0
-          9.99931e-05 0 0 9.99931e-05 0 0 9.99931e-05 1.67642e-19 0 9.99931e-05 1.67642e-19 0
-          9.99931e-05 1.6763e-19 0 9.99931e-05 1.6763e-19 0 9.99931e-05 -1.67622e-18 0 9.99931e-05 -1.67622e-18 0
-          9.99931e-05 -2.51425e-18 0 9.99931e-05 -2.51425e-18 0 9.99931e-05 -1.17329e-18 0 9.99931e-05 -1.17329e-18 0
-          9.99931e-05 -1.6761e-19 0 9.99931e-05 -1.6761e-19 0 9.99931e-05 1.67609e-19 0 9.99931e-05 1.67609e-19 0
-          9.99931e-05 1.67608e-19 0 9.99931e-05 1.67608e-19 0 9.99932e-05 0 0 9.99932e-05 0 0
-          9.99932e-05 3.35214e-19 0 9.99932e-05 3.35214e-19 0 9.99932e-05 -1.67607e-19 0 9.99932e-05 -1.67607e-19 0
-          9.99932e-05 1.50846e-18 0 9.99932e-05 1.50846e-18 0 9.99932e-05 8.38031e-19 0 9.99932e-05 8.38031e-19 0
-          9.99932e-05 0 0 9.99932e-05 0 0 9.99932e-05 -1.34085e-18 0 9.99932e-05 -1.34085e-18 0
-          9.99932e-05 -1.67606e-19 0 9.99932e-05 -1.67606e-19 0 9.99933e-05 1.67606e-18 0 9.99933e-05 1.67606e-18 0
-          9.99933e-05 1.67606e-19 0 9.99933e-05 1.67606e-19 0 9.99933e-05 1.34085e-18 0 9.99933e-05 1.34085e-18 0
-          9.99933e-05 -5.02818e-19 0 9.99933e-05 -5.02818e-19 0 9.99933e-05 -2.01127e-18 0 9.99933e-05 -2.01127e-18 0
-          9.99933e-05 -1.34085e-18 0 9.99933e-05 -1.34085e-18 0 9.99933e-05 -1.67606e-19 0 9.99933e-05 -1.67606e-19 0
-          9.99934e-05 1.67606e-19 0 9.99934e-05 1.67606e-19 0 9.99934e-05 -8.38029e-19 0 9.99934e-05 -8.38029e-19 0
-          9.99934e-05 -6.70423e-19 0 9.99934e-05 -6.70423e-19 0 9.99934e-05 1.67606e-19 0 9.99934e-05 1.67606e-19 0
-          9.99934e-05 1.67606e-19 0 9.99934e-05 1.67606e-19 0 9.99934e-05 1.67606e-19 0 9.99934e-05 1.67606e-19 0
-          9.99934e-05 1.50845e-18 0 9.99934e-05 1.50845e-18 0 9.99934e-05 0 0 9.99934e-05 0 0
-          9.99935e-05 1.00563e-18 0 9.99935e-05 1.00563e-18 0 9.99935e-05 3.35211e-19 0 9.99935e-05 3.35211e-19 0
-          9.99935e-05 -1.67606e-19 0 9.99935e-05 -1.67606e-19 0 9.99935e-05 -3.0169e-18 0 9.99935e-05 -3.0169e-18 0
-          9.99935e-05 0 0 9.99935e-05 0 0 9.99935e-05 6.70422e-19 0 9.99935e-05 6.70422e-19 0
-          9.99935e-05 -1.50845e-18 0 9.99935e-05 -1.50845e-18 0 9.99936e-05 -3.35211e-19 0 9.99936e-05 -3.35211e-19 0
-          9.99936e-05 -1.17324e-18 0 9.99936e-05 -1.17324e-18 0 9.99936e-05 0 0 9.99936e-05 0 0
-          9.99936e-05 -5.02816e-19 0 9.99936e-05 -5.02816e-19 0 9.99936e-05 8.38026e-19 0 9.99936e-05 8.38026e-19 0
-          9.99936e-05 -1.67605e-18 0 9.99936e-05 -1.67605e-18 0 9.99936e-05 -1.67605e-19 0 9.99936e-05 -1.67605e-19 0
-          9.99936e-05 5.02816e-19 0 9.99936e-05 5.02816e-19 0 9.99937e-05 1.67605e-19 0 9.99937e-05 1.67605e-19 0
-          9.99937e-05 2.17887e-18 0 9.99937e-05 2.17887e-18 0 9.99937e-05 0 0 9.99937e-05 0 0
-          9.99937e-05 0 0 9.99937e-05 0 0
+        <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1
         </DataArray>
         <DataArray type="Float32" Name="temperatureExact" NumberOfComponents="1" format="ascii">
           291 291 291 291 291 291 291 291 291 291 291 291
diff --git a/test/references/richardsniconvectioncc-reference.vtu b/test/references/richardsniconvectioncc-reference.vtu
index ff1a163720..624dc10b51 100644
--- a/test/references/richardsniconvectioncc-reference.vtu
+++ b/test/references/richardsniconvectioncc-reference.vtu
@@ -48,7 +48,7 @@
           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="rhoW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
           998.631 998.631 998.631 998.631 998.631 998.631 998.632 998.634 998.637 998.642 998.649 998.658
           998.668 998.678 998.69 998.702 998.715 998.727 998.738 998.749 998.758 998.766 998.773 998.779
           998.783 998.786 998.789 998.791 998.792 998.793 998.794 998.794 998.794 998.794 998.794 998.794
@@ -57,16 +57,7 @@
           998.792 998.791 998.791 998.791 998.791 998.791 998.791 998.791 998.791 998.79 998.79 998.79
           998.79 998.79 998.79 998.79 998.79 998.789 998.789 998.789
         </DataArray>
-        <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-          1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
-        </DataArray>
-        <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
           946.105 946.106 946.105 946.098 946.075 946.018 945.9 945.683 945.321 944.771 944 942.989
           941.669 939.994 938.14 936.18 934.194 932.256 930.432 928.771 927.302 926.041 924.985 924.123
           923.435 922.898 922.488 922.18 921.954 921.79 921.674 921.592 921.536 921.498 921.472 921.455
@@ -75,14 +66,14 @@
           921.422 921.422 921.421 921.421 921.421 921.421 921.421 921.421 921.42 921.42 921.42 921.42
           921.42 921.42 921.42 921.419 921.419 921.419 921.419 921.418
         </DataArray>
-        <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
-          1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10 1e+10
+        <DataArray type="Float32" Name="kr" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
@@ -111,27 +102,14 @@
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
           0.4 0.4 0.4 0.4 0.4 0.4 0.4 0.4
         </DataArray>
-        <DataArray type="Float32" Name="velocity" NumberOfComponents="3" format="ascii">
-          0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
-          0.0001 0 0 0.0001 0 0 0.0001 0 0 0.0001 0 0
-          9.99999e-05 0 0 9.99997e-05 0 0 9.99995e-05 0 0 9.99991e-05 0 0
-          9.99987e-05 0 0 9.99982e-05 0 0 9.99977e-05 0 0 9.99972e-05 0 0
-          9.99967e-05 0 0 9.99962e-05 0 0 9.99956e-05 0 0 9.99952e-05 0 0
-          9.99948e-05 0 0 9.99944e-05 0 0 9.99941e-05 0 0 9.99938e-05 0 0
-          9.99936e-05 0 0 9.99934e-05 0 0 9.99933e-05 0 0 9.99932e-05 0 0
-          9.99932e-05 0 0 9.99931e-05 0 0 9.99931e-05 0 0 9.99931e-05 0 0
-          9.99931e-05 0 0 9.99931e-05 0 0 9.99931e-05 0 0 9.99931e-05 0 0
-          9.99931e-05 0 0 9.99931e-05 0 0 9.99931e-05 0 0 9.99931e-05 0 0
-          9.99932e-05 0 0 9.99932e-05 0 0 9.99932e-05 0 0 9.99932e-05 0 0
-          9.99932e-05 0 0 9.99932e-05 0 0 9.99932e-05 0 0 9.99933e-05 0 0
-          9.99933e-05 0 0 9.99933e-05 0 0 9.99933e-05 0 0 9.99933e-05 0 0
-          9.99933e-05 0 0 9.99933e-05 0 0 9.99933e-05 0 0 9.99934e-05 0 0
-          9.99934e-05 0 0 9.99934e-05 0 0 9.99934e-05 0 0 9.99934e-05 0 0
-          9.99934e-05 0 0 9.99934e-05 0 0 9.99934e-05 0 0 9.99935e-05 0 0
-          9.99935e-05 0 0 9.99935e-05 0 0 9.99935e-05 0 0 9.99935e-05 0 0
-          9.99935e-05 0 0 9.99935e-05 0 0 9.99936e-05 0 0 9.99936e-05 0 0
-          9.99936e-05 0 0 9.99936e-05 0 0 9.99936e-05 0 0 9.99936e-05 0 0
-          9.99936e-05 0 0 9.99936e-05 0 0 9.99937e-05 0 0 9.99937e-05 0 0
+        <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1 1 1 1 1
+          1 1 1 1 1 1 1 1
         </DataArray>
         <DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
-- 
GitLab