diff --git a/test/boxmodels/2p2cni/waterair-reference.vtu b/test/boxmodels/2p2cni/waterair-reference.vtu
index fa7a6c0af2f194ea1737b80568a816d8f9381332..bdb24e256b195762e8f1f28435c9e8a728d64466 100644
--- a/test/boxmodels/2p2cni/waterair-reference.vtu
+++ b/test/boxmodels/2p2cni/waterair-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="4096" NumberOfPoints="4225">
- <PointData Scalars="Sg">
- <DataArray type="Float32" Name="Sg" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="Sn">
+ <DataArray type="Float32" Name="Sn" 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
0 0 0 0 0 0 0 0 0 0 0 0
@@ -358,7 +358,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0
</DataArray>
- <DataArray type="Float32" Name="Sl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="Sw" 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
@@ -713,7 +713,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1
</DataArray>
- <DataArray type="Float32" Name="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="pN" NumberOfComponents="1" format="ascii">
9.92e+06 9.92078e+06 9.91387e+06 9.91466e+06 9.92158e+06 9.91546e+06 9.92239e+06 9.91627e+06 9.92321e+06 9.91709e+06 9.92404e+06 9.91792e+06
9.92487e+06 9.91876e+06 9.92572e+06 9.91961e+06 9.92659e+06 9.92047e+06 9.92747e+06 9.92135e+06 9.92837e+06 9.92225e+06 9.92929e+06 9.92317e+06
9.93023e+06 9.92411e+06 9.93121e+06 9.92508e+06 9.93221e+06 9.92608e+06 9.93326e+06 9.92712e+06 9.93435e+06 9.92821e+06 9.93549e+06 9.92935e+06
@@ -1068,7 +1068,7 @@
9.5334e+06 9.53298e+06 9.53255e+06 9.53211e+06 9.53165e+06 9.53118e+06 9.53069e+06 9.5302e+06 9.5297e+06 9.52919e+06 9.52867e+06 9.52814e+06
9.5276e+06
</DataArray>
- <DataArray type="Float32" Name="pl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="pW" NumberOfComponents="1" format="ascii">
9.91e+06 9.91078e+06 9.90387e+06 9.90466e+06 9.91158e+06 9.90546e+06 9.91239e+06 9.90627e+06 9.91321e+06 9.90709e+06 9.91404e+06 9.90792e+06
9.91487e+06 9.90876e+06 9.91572e+06 9.90961e+06 9.91659e+06 9.91047e+06 9.91747e+06 9.91135e+06 9.91837e+06 9.91225e+06 9.91929e+06 9.91317e+06
9.92023e+06 9.91411e+06 9.92121e+06 9.91508e+06 9.92221e+06 9.91608e+06 9.92326e+06 9.91712e+06 9.92435e+06 9.91821e+06 9.92549e+06 9.91935e+06
@@ -1423,7 +1423,7 @@
9.5234e+06 9.52298e+06 9.52255e+06 9.52211e+06 9.52165e+06 9.52118e+06 9.52069e+06 9.5202e+06 9.5197e+06 9.51919e+06 9.51867e+06 9.51814e+06
9.5176e+06
</DataArray>
- <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="pC" NumberOfComponents="1" format="ascii">
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
@@ -1778,7 +1778,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000
</DataArray>
- <DataArray type="Float32" Name="rhoL" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
996.524 996.524 996.529 996.529 996.525 996.529 996.525 996.53 996.525 996.53 996.526 996.53
996.526 996.531 996.526 996.531 996.527 996.531 996.527 996.532 996.527 996.532 996.528 996.532
996.528 996.533 996.529 996.533 996.529 996.534 996.53 996.534 996.53 996.535 996.53 996.535
@@ -2133,7 +2133,7 @@
996.821 996.821 996.821 996.82 996.82 996.82 996.82 996.82 996.819 996.819 996.819 996.819
996.818
</DataArray>
- <DataArray type="Float32" Name="rhoG" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
68.6707 68.6761 68.6323 68.6378 68.6816 68.6434 68.6872 68.649 68.6929 68.6546 68.6986 68.6604
68.7044 68.6662 68.7103 68.672 68.7163 68.678 68.7224 68.6841 68.7286 68.6903 68.735 68.6967
68.7415 68.7032 68.7482 68.7099 68.7552 68.7169 68.7624 68.7241 68.7701 68.7316 68.7811 68.7403
@@ -2488,7 +2488,7 @@
66.2484 66.2456 66.2425 66.2394 66.2363 66.233 66.2296 66.2262 66.2227 66.2192 66.2156 66.2119
66.2081
</DataArray>
- <DataArray type="Float32" Name="mobL" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
1523.7 1523.7 1523.18 1523.18 1523.7 1523.18 1523.7 1523.18 1523.7 1523.18 1523.69 1523.18
1523.69 1523.18 1523.69 1523.18 1523.69 1523.18 1523.69 1523.18 1523.69 1523.18 1523.69 1523.18
1523.69 1523.18 1523.69 1523.18 1523.69 1523.18 1523.69 1523.18 1523.69 1523.18 1523.69 1523.18
@@ -2843,7 +2843,7 @@
1490.52 1490.52 1490.52 1490.52 1490.52 1490.52 1490.52 1490.52 1490.52 1490.52 1490.52 1490.52
1490.52
</DataArray>
- <DataArray type="Float32" Name="mobG" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mobN" 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
0 0 0 0 0 0 0 0 0 0 0 0