diff --git a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
index 6d3ff5ea1719846559e97e08e88a0875e2856f05..bbba4c96472aeb49ac89102cc71ed7b5bc7ec0f6 100644
--- a/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/CMakeLists.txt
@@ -8,7 +8,7 @@ dune_add_test(NAME test_1p2c_box
--files ${CMAKE_SOURCE_DIR}/test/references/outflowbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1pnctestbox-00009.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_box test_1p2c_fv.input -Problem.Name 1pnctestbox"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-15})
+ --zeroThreshold {"velocity_Water \(m/s\)_1":1e-15})
dune_add_test(NAME test_1p2c_tpfa
SOURCES test_1p2c_fv.cc
@@ -18,7 +18,7 @@ dune_add_test(NAME test_1p2c_tpfa
--files ${CMAKE_SOURCE_DIR}/test/references/1p2ctestcc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1pnctest_tpfa-00009.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2c_tpfa test_1p2c_fv.input -Problem.Name 1pnctest_tpfa"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-15})
+ --zeroThreshold {"velocity_Water \(m/s\)_1":1e-15})
#Note: The mpfa model does not support velocity output yet. We therefore deactivate it for the test and use a copy of the tpfa reference
# solution where the velocities have been removed.
@@ -51,7 +51,7 @@ dune_add_test(NAME test_1p2cni_conduction_box
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniboxconduction-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1p2cni_conductiontest_box-00005.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_conduction_box test_1p2cni_conduction_fv.input -Problem.Name 1p2cni_conductiontest_box"
- --zeroThreshold {"velocity_w \(m/s\)":1e-9})
+ --zeroThreshold {"velocity_Water \(m/s\)":1e-9})
dune_add_test(NAME test_1p2cni_conduction_tpfa
SOURCES test_1p2cni_conduction_fv.cc
@@ -61,7 +61,7 @@ dune_add_test(NAME test_1p2cni_conduction_tpfa
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccconduction-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1p2cni_conductiontest_tpfa-00005.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_conduction_tpfa test_1p2cni_conduction_fv.input -Problem.Name 1p2cni_conductiontest_tpfa"
- --zeroThreshold {"velocity_w \(m/s\)_0":1e-9})
+ --zeroThreshold {"velocity_Water \(m/s\)_0":1e-9})
#Note: The mpfa model does not support velocity output yet. We therefore deactivate it for the test and use a copy of the tpfa reference
# solution where the velocities have been removed.
@@ -83,7 +83,7 @@ dune_add_test(NAME test_1p2cni_convection_box
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniboxconvection-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1p2cni_convectiontest_box-00009.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_convection_box test_1p2cni_convection_fv.input -Problem.Name 1p2cni_convectiontest_box"
- --zeroThreshold {"velocity_w \(m/s\)":1e-9})
+ --zeroThreshold {"velocity_Water \(m/s\)":1e-9})
dune_add_test(NAME test_1p2cni_convection_tpfa
SOURCES test_1p2cni_convection_fv.cc
@@ -93,7 +93,7 @@ dune_add_test(NAME test_1p2cni_convection_tpfa
--files ${CMAKE_SOURCE_DIR}/test/references/1p2cniccconvection-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/1p2cni_convectiontest_tpfa-00009.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_1p2cni_convection_tpfa test_1p2cni_convection_fv.input -Problem.Name 1p2cni_convectiontest_tpfa"
- --zeroThreshold {"velocity_w \(m/s\)_0":1e-9})
+ --zeroThreshold {"velocity_Water \(m/s\)_0":1e-9})
#Note: The mpfa model does not support velocity output yet. We therefore deactivate it for the test and use a copy of the tpfa reference
# solution where the velocities have been removed.
diff --git a/test/porousmediumflow/3p/implicit/CMakeLists.txt b/test/porousmediumflow/3p/implicit/CMakeLists.txt
index 7001201af3e570a2e474b6c0d892438c4e001ae2..5b4774d9edc346f7808e0673e5aaa75a63dd7787 100644
--- a/test/porousmediumflow/3p/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/3p/implicit/CMakeLists.txt
@@ -28,7 +28,7 @@ dune_add_test(NAME test_box3pniconvection
--files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectionbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection-00009.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconvection test_3pni_fv_convection.input -Problem.Name test_box3pniconvection"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+ --zeroThreshold {"velocity_Water \(m/s\)_1":1e-8})
dune_add_test(NAME test_cc3pniconvection
SOURCES test_3pni_fv_convection.cc
@@ -38,7 +38,7 @@ dune_add_test(NAME test_cc3pniconvection
--files ${CMAKE_SOURCE_DIR}/test/references/3pniconvectioncc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection-00009.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconvection test_3pni_fv_convection.input -Problem.Name test_cc3pniconvection"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+ --zeroThreshold {"velocity_Water \(m/s\)_1":1e-8})
dune_add_test(NAME test_box3pniconduction
SOURCES test_3pni_fv_conduction.cc
@@ -48,7 +48,7 @@ dune_add_test(NAME test_box3pniconduction
--files ${CMAKE_SOURCE_DIR}/test/references/3pniconductionbox-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction-00005.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_box3pniconduction test_3pni_fv_conduction.input -Problem.Name test_box3pniconduction"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+ --zeroThreshold {"velocity_Water \(m/s\)_1":1e-8})
dune_add_test(NAME test_cc3pniconduction
SOURCES test_3pni_fv_conduction.cc
@@ -58,7 +58,7 @@ dune_add_test(NAME test_cc3pniconduction
--files ${CMAKE_SOURCE_DIR}/test/references/3pniconductioncc-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction-00005.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3pniconduction test_3pni_fv_conduction.input -Problem.Name test_cc3pniconduction"
- --zeroThreshold {"velocity_w \(m/s\)_1":1e-8})
+ --zeroThreshold {"velocity_Water \(m/s\)_1":1e-8})
#install sources
install(FILES
diff --git a/test/references/1p2cniboxconduction-reference.vtu b/test/references/1p2cniboxconduction-reference.vtu
index 066df3c1bbb49f036156a67e8d27369dd9a6d510..c813b18e43aa626f01390e8f13efb1bbae0a14f9 100644
--- a/test/references/1p2cniboxconduction-reference.vtu
+++ b/test/references/1p2cniboxconduction-reference.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="402">
- <PointData Scalars="p" Vectors="velocity_w (m/s)">
+ <PointData Scalars="p" Vectors="velocity_Water (m/s)">
<DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -75,7 +75,7 @@
0.00019143 0.00019143 0.000167501 0.000167501 0.000143572 0.000143572 0.000119644 0.000119644 9.57149e-05 9.57149e-05 7.17862e-05 7.17861e-05
4.78574e-05 4.78574e-05 2.39287e-05 2.39287e-05 0 0
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" format="ascii">
-1.16593e-09 8.51209e-19 0 -1.16052e-09 0 0 -1.16593e-09 8.51209e-19 0 -1.16052e-09 0 0
-1.14449e-09 8.29172e-19 0 -1.14449e-09 8.29172e-19 0 -1.11832e-09 -4.09371e-19 0 -1.11832e-09 -4.09371e-19 0
-1.08514e-09 -2.02051e-18 0 -1.08514e-09 -2.02051e-18 0 -1.04625e-09 -2.39224e-18 0 -1.04625e-09 -2.39224e-18 0
@@ -178,7 +178,7 @@
8.81909e-11 -1.676e-19 0 8.81909e-11 -1.676e-19 0 8.81909e-11 6.70401e-19 0 8.81909e-11 6.70401e-19 0
8.81909e-11 0 0 8.81909e-11 0 0
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
@@ -214,7 +214,7 @@
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
@@ -250,7 +250,7 @@
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
</DataArray>
- <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" NumberOfComponents="1" format="ascii">
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
@@ -286,7 +286,7 @@
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
diff --git a/test/references/1p2cniboxconvection-reference.vtu b/test/references/1p2cniboxconvection-reference.vtu
index ef7fb528653fdff73f916b4824bdc4bd9089e6d0..079a32ba59681f50986c5057f040362b118282e3 100644
--- a/test/references/1p2cniboxconvection-reference.vtu
+++ b/test/references/1p2cniboxconvection-reference.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="80" NumberOfPoints="162">
- <PointData Scalars="pressuere" Vectors="velocity_w (m/s)">
+ <PointData Scalars="pressuere" Vectors="velocity_Water (m/s)">
<DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
@@ -35,7 +35,7 @@
2170.43 2170.43 1899.12 1899.12 1627.82 1627.82 1356.52 1356.52 1085.21 1085.21 813.911 813.911
542.607 542.607 271.304 271.304 0 0
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" format="ascii">
0.0001 5.50706e-18 0 0.0001 -3.44192e-19 0 0.0001 5.50706e-18 0 0.0001 -3.44192e-19 0
0.0001 3.09773e-18 0 0.0001 3.09773e-18 0 0.0001 -1.06699e-17 0 0.0001 -1.06699e-17 0
0.0001 2.75349e-18 0 0.0001 2.75349e-18 0 0.0001 -1.37669e-17 0 0.0001 -1.37669e-17 0
@@ -78,7 +78,7 @@
9.99937e-05 -3.3521e-19 0 9.99937e-05 -3.3521e-19 0 9.99937e-05 0 0 9.99937e-05 0 0
9.99937e-05 0 0 9.99937e-05 0 0
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" 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
@@ -94,7 +94,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" 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
@@ -110,7 +110,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 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="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" 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
@@ -126,7 +126,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
diff --git a/test/references/1p2cniccconduction-reference.vtu b/test/references/1p2cniccconduction-reference.vtu
index 39c440c662a6fb5a891fbcf17b02cea93c8b8589..69ce24cc038a1aaf4191ca7303dbb94bb97cb050 100644
--- a/test/references/1p2cniccconduction-reference.vtu
+++ b/test/references/1p2cniccconduction-reference.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="402">
- <CellData Scalars="p" Vectors="velocity_w (m/s)">
+ <CellData Scalars="p" Vectors="velocity_Water (m/s)">
<DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
@@ -41,7 +41,7 @@
0.000466521 0.000442597 0.000418673 0.000394748 0.000370824 0.0003469 0.000322976 0.000299052 0.000275128 0.000251204 0.000227279 0.000203355
0.000179431 0.000155507 0.000131583 0.000107659 8.37345e-05 5.98104e-05 3.58862e-05 1.19621e-05
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" format="ascii">
-1.16432e-09 0 0 -1.15349e-09 0 0 -1.13227e-09 0 0 -1.10279e-09 0 0
-1.06692e-09 0 0 -1.02441e-09 0 0 -9.75539e-10 0 0 -9.21308e-10 0 0
-8.62751e-10 0 0 -8.00917e-10 0 0 -7.41148e-10 0 0 -6.85144e-10 0 0
@@ -93,7 +93,7 @@
8.81741e-11 0 0 8.81741e-11 0 0 8.81741e-11 0 0 8.81741e-11 0 0
8.81741e-11 0 0 8.81741e-11 0 0 8.81741e-11 0 0 8.81741e-11 0 0
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
@@ -112,7 +112,7 @@
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
@@ -131,7 +131,7 @@
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
</DataArray>
- <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" NumberOfComponents="1" format="ascii">
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
@@ -150,7 +150,7 @@
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
diff --git a/test/references/1p2cniccconvection-reference.vtu b/test/references/1p2cniccconvection-reference.vtu
index 835d4c0ff8956d4a1f3db66197a9c9d7810edb32..0293fd9a2339d4acd7fb7601d8dbfe4e4997b273 100644
--- a/test/references/1p2cniccconvection-reference.vtu
+++ b/test/references/1p2cniccconvection-reference.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="80" NumberOfPoints="162">
- <CellData Scalars="p" Vectors="velocity_w (m/s)">
+ <CellData Scalars="p" Vectors="velocity_Water (m/s)">
<DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
118274 118009 117743 117476 117209 116941 116673 116405 116135 115866 115596 115326
@@ -21,7 +21,7 @@
5290.4 5019.1 4747.8 4476.5 4205.2 3933.89 3662.59 3391.29 3119.99 2848.68 2577.38 2306.08
2034.77 1763.47 1492.17 1220.87 949.562 678.259 406.955 135.652
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" 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.99994e-05 0 0 9.99991e-05 0 0
@@ -43,7 +43,7 @@
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>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" 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
@@ -52,7 +52,7 @@
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="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" 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
@@ -61,7 +61,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 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="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" 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
@@ -70,7 +70,7 @@
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="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
diff --git a/test/references/1p2cniccmpfaconduction-reference.vtu b/test/references/1p2cniccmpfaconduction-reference.vtu
index 2ccf1fe1ed16b350efd31250d6965b25b574d8e1..2b626b830b2a8ac6a8a2fa231818d6e0da7e16f5 100644
--- a/test/references/1p2cniccmpfaconduction-reference.vtu
+++ b/test/references/1p2cniccmpfaconduction-reference.vtu
@@ -41,7 +41,7 @@
0.000466521 0.000442597 0.000418673 0.000394748 0.000370824 0.0003469 0.000322976 0.000299052 0.000275128 0.000251204 0.000227279 0.000203355
0.000179431 0.000155507 0.000131583 0.000107659 8.37345e-05 5.98104e-05 3.58862e-05 1.19621e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
@@ -60,7 +60,7 @@
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
@@ -79,7 +79,7 @@
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
</DataArray>
- <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" NumberOfComponents="1" format="ascii">
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
@@ -98,7 +98,7 @@
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05 1.55498e-05
diff --git a/test/references/1p2cniccmpfaconvection-reference.vtu b/test/references/1p2cniccmpfaconvection-reference.vtu
index 06b047a28d999d5df73f41ffa0d80d67fd968035..5c91c52f3a0c5e46eab1eb411a6b06e1afbbaaa0 100644
--- a/test/references/1p2cniccmpfaconvection-reference.vtu
+++ b/test/references/1p2cniccmpfaconvection-reference.vtu
@@ -21,7 +21,7 @@
5290.4 5019.1 4747.8 4476.5 4205.2 3933.89 3662.59 3391.29 3119.99 2848.68 2577.38 2306.08
2034.77 1763.47 1492.17 1220.87 949.562 678.259 406.955 135.652
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" 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
@@ -30,7 +30,7 @@
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="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" 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
@@ -39,7 +39,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 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="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" 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
@@ -48,7 +48,7 @@
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="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10 1.55499e-10
diff --git a/test/references/1p2ctestcc-reference.vtu b/test/references/1p2ctestcc-reference.vtu
index 3729e02bbe08c4d7477a6385a26fded0a5fd0291..4699da1a9f538e2cc1f9dfb4d5342e9058d99646 100644
--- a/test/references/1p2ctestcc-reference.vtu
+++ b/test/references/1p2ctestcc-reference.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="40" NumberOfPoints="63">
- <CellData Scalars="p" Vectors="velocity_w (m/s)">
+ <CellData Scalars="p" Vectors="velocity_Water (m/s)">
<DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
197500 192500 187500 182501 177501 172501 167501 162501 157501 152501 147501 142501
137501 132501 127501 122501 117501 112500 107500 102500 197500 192500 187500 182501
@@ -15,7 +15,7 @@
77500.7 72500.8 67500.8 62500.9 57500.9 52501 47501 42500.9 37500.9 32500.8 27500.8 22500.7
17500.6 12500.4 7500.27 2500.1
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" format="ascii">
0.00997014 2.9018e-18 0 0.00997016 2.90179e-18 0 0.00997018 0 0 0.00997021 2.90178e-18 0
0.00997023 2.90178e-18 0 0.00997025 2.90177e-18 0 0.00997027 2.90177e-18 0 0.0099703 2.90176e-18 0
0.00997032 2.90176e-18 0 0.00997034 2.90176e-18 0 0.00997037 2.90175e-18 0 0.00997039 2.90175e-18 0
@@ -27,25 +27,25 @@
0.00997041 2.90174e-18 0 0.00997043 0 0 0.00997046 1.45087e-18 0 0.00997048 1.45086e-18 0
0.0099705 2.90172e-18 0 0.00997053 -1.45086e-18 0 0.00997055 -1.45086e-18 0 0.00997057 0 0
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998
0.99998 0.99998 0.99998 0.999981 0.999981 0.999981 0.999981 0.999981 0.99998 0.99998 0.99998 0.99998
0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.999981
0.999981 0.999981 0.999981 0.999981
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
2e-05 1.99999e-05 1.99995e-05 1.99985e-05 1.99962e-05 1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05
1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05 1.9394e-05 1.92505e-05 1.90878e-05 1.89055e-05 2e-05 1.99999e-05 1.99995e-05 1.99985e-05
1.99962e-05 1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05 1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05
1.9394e-05 1.92505e-05 1.90878e-05 1.89055e-05
</DataArray>
- <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" NumberOfComponents="1" format="ascii">
0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969
0.999969 0.999969 0.999969 0.99997 0.99997 0.99997 0.99997 0.999971 0.999969 0.999969 0.999969 0.999969
0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.99997
0.99997 0.99997 0.99997 0.999971
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
3.10994e-05 3.10992e-05 3.10986e-05 3.1097e-05 3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05
3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05 3.01571e-05 2.9934e-05 2.9681e-05 2.93976e-05 3.10994e-05 3.10992e-05 3.10986e-05 3.1097e-05
3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05 3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05
diff --git a/test/references/1p2ctestmpfa-reference.vtu b/test/references/1p2ctestmpfa-reference.vtu
index 6b0db83b63d860a49d53d115f4f2b2b4368fe23e..b585e1a34e7f838f5ad9a52bcb6f6192c89bc342 100644
--- a/test/references/1p2ctestmpfa-reference.vtu
+++ b/test/references/1p2ctestmpfa-reference.vtu
@@ -15,25 +15,25 @@
77500.7 72500.8 67500.8 62500.9 57500.9 52501 47501 42500.9 37500.9 32500.8 27500.8 22500.7
17500.6 12500.4 7500.27 2500.1
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998
0.99998 0.99998 0.99998 0.999981 0.999981 0.999981 0.999981 0.999981 0.99998 0.99998 0.99998 0.99998
0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.999981
0.999981 0.999981 0.999981 0.999981
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
2e-05 1.99999e-05 1.99995e-05 1.99985e-05 1.99962e-05 1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05
1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05 1.9394e-05 1.92505e-05 1.90878e-05 1.89055e-05 2e-05 1.99999e-05 1.99995e-05 1.99985e-05
1.99962e-05 1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05 1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05
1.9394e-05 1.92505e-05 1.90878e-05 1.89055e-05
</DataArray>
- <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" NumberOfComponents="1" format="ascii">
0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969
0.999969 0.999969 0.999969 0.99997 0.99997 0.99997 0.99997 0.999971 0.999969 0.999969 0.999969 0.999969
0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.99997
0.99997 0.99997 0.99997 0.999971
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
3.10994e-05 3.10992e-05 3.10986e-05 3.1097e-05 3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05
3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05 3.01571e-05 2.9934e-05 2.9681e-05 2.93976e-05 3.10994e-05 3.10992e-05 3.10986e-05 3.1097e-05
3.10935e-05 3.10868e-05 3.10752e-05 3.10565e-05 3.10285e-05 3.09886e-05 3.0934e-05 3.0862e-05 3.077e-05 3.06556e-05 3.05165e-05 3.03508e-05
diff --git a/test/references/3pniconductionbox-reference.vtu b/test/references/3pniconductionbox-reference.vtu
index 3490330550e0cb63e8725cae747be06dc7417a47..76c2fc8bf69a0e4b096cd36e5b93a32c57ded5a3 100644
--- a/test/references/3pniconductionbox-reference.vtu
+++ b/test/references/3pniconductionbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="402">
- <PointData Scalars="S_w" Vectors="velocity_w (m/s)">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water" Vectors="velocity_Water (m/s)">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -39,7 +39,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" NumberOfComponents="1" format="ascii">
1e-05 1.00893e-05 1e-05 1.00893e-05 1.00829e-05 1.00829e-05 1.00767e-05 1.00767e-05 1.00705e-05 1.00705e-05 1.00646e-05 1.00646e-05
1.00589e-05 1.00589e-05 1.00535e-05 1.00535e-05 1.00484e-05 1.00484e-05 1.00436e-05 1.00436e-05 1.00391e-05 1.00391e-05 1.00349e-05 1.00349e-05
1.00311e-05 1.00311e-05 1.00275e-05 1.00275e-05 1.00243e-05 1.00243e-05 1.00214e-05 1.00214e-05 1.00188e-05 1.00188e-05 1.00165e-05 1.00165e-05
@@ -75,7 +75,7 @@
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
-1e-05 -1.03219e-05 -1e-05 -1.03219e-05 -1.02992e-05 -1.02992e-05 -1.02768e-05 -1.02768e-05 -1.02549e-05 -1.02549e-05 -1.02337e-05 -1.02337e-05
-1.02133e-05 -1.02133e-05 -1.01939e-05 -1.01939e-05 -1.01754e-05 -1.01754e-05 -1.01581e-05 -1.01581e-05 -1.01419e-05 -1.01419e-05 -1.01268e-05 -1.01268e-05
-1.0113e-05 -1.0113e-05 -1.01002e-05 -1.01002e-05 -1.00886e-05 -1.00886e-05 -1.00781e-05 -1.00781e-05 -1.00686e-05 -1.00686e-05 -1.00601e-05 -1.00601e-05
@@ -111,7 +111,7 @@
-1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05
-1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
@@ -147,7 +147,7 @@
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
@@ -183,7 +183,7 @@
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -219,7 +219,7 @@
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
996.544 996.723 996.544 996.723 996.902 996.902 997.077 997.077 997.232 997.232 997.377 997.377
997.517 997.517 997.65 997.65 997.777 997.777 997.895 997.895 997.998 997.998 998.085 998.085
998.166 998.166 998.24 998.24 998.307 998.307 998.368 998.368 998.423 998.423 998.473 998.473
@@ -255,7 +255,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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
864.863 865.417 864.863 865.417 865.966 865.966 866.506 866.506 867.033 867.033 867.544 867.544
868.034 868.034 868.502 868.502 868.945 868.945 869.362 869.362 869.751 869.751 870.112 870.112
870.445 870.445 870.75 870.75 871.028 871.028 871.28 871.28 871.508 871.508 871.712 871.712
@@ -291,7 +291,7 @@
873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149
873.149 873.149 873.149 873.149 873.149 873.149
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.16103 1.16361 1.16103 1.16361 1.16618 1.16618 1.16872 1.16872 1.17121 1.17121 1.17363 1.17363
1.17598 1.17598 1.17822 1.17822 1.18036 1.18036 1.18237 1.18237 1.18426 1.18426 1.18602 1.18602
1.18765 1.18765 1.18914 1.18914 1.19051 1.19051 1.19176 1.19176 1.19288 1.19288 1.19389 1.19389
@@ -435,7 +435,7 @@
290 290 290 290 290 290 290 290 290 290 290 290
290 290 290 290 290 290
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" format="ascii">
-1.05621e-09 -4.25604e-19 0 -1.05011e-09 6.29013e-19 0 -1.05621e-09 -4.25604e-19 0 -1.05011e-09 6.29013e-19 0
-1.03209e-09 1.65322e-18 0 -1.03209e-09 1.65322e-18 0 -1.00278e-09 3.05647e-18 0 -1.00278e-09 3.05647e-18 0
-9.65784e-10 3.61297e-18 0 -9.65784e-10 3.61297e-18 0 -9.22759e-10 5.93352e-18 0 -9.22759e-10 5.93352e-18 0
@@ -538,7 +538,7 @@
7.02047e-11 -1.676e-18 0 7.02047e-11 -1.676e-18 0 7.02047e-11 -2.0112e-18 0 7.02047e-11 -2.0112e-18 0
7.02047e-11 -1.3408e-18 0 7.02047e-11 -1.3408e-18 0
</DataArray>
- <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_NAPL (m/s)" NumberOfComponents="3" 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
@@ -641,7 +641,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="velocity_g (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" 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
diff --git a/test/references/3pniconductioncc-reference.vtu b/test/references/3pniconductioncc-reference.vtu
index 624cee4f9a737a3a90c328563d151145e63e0546..cd3d2cef4cdbae4392140900cd485092b8c2a602 100644
--- a/test/references/3pniconductioncc-reference.vtu
+++ b/test/references/3pniconductioncc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="402">
- <CellData Scalars="S_w" Vectors="velocityW">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water" Vectors="velocityW">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -22,7 +22,7 @@
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="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" NumberOfComponents="1" format="ascii">
1.00926e-05 1.00861e-05 1.00798e-05 1.00736e-05 1.00675e-05 1.00617e-05 1.00561e-05 1.00509e-05 1.00459e-05 1.00412e-05 1.00369e-05 1.00329e-05
1.00292e-05 1.00259e-05 1.00228e-05 1.00201e-05 1.00176e-05 1.00154e-05 1.00134e-05 1.00116e-05 1.00101e-05 1.00087e-05 1.00075e-05 1.00065e-05
1.00056e-05 1.00048e-05 1.00041e-05 1.00035e-05 1.0003e-05 1.00025e-05 1.00021e-05 1.00018e-05 1.00015e-05 1.00013e-05 1.00011e-05 1.00009e-05
@@ -41,7 +41,7 @@
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05 1e-05
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
-1.03333e-05 -1.03105e-05 -1.02879e-05 -1.02657e-05 -1.02441e-05 -1.02233e-05 -1.02033e-05 -1.01844e-05 -1.01665e-05 -1.01497e-05 -1.01341e-05 -1.01196e-05
-1.01063e-05 -1.00942e-05 -1.00831e-05 -1.00731e-05 -1.00641e-05 -1.0056e-05 -1.00488e-05 -1.00425e-05 -1.00368e-05 -1.00318e-05 -1.00275e-05 -1.00237e-05
-1.00203e-05 -1.00174e-05 -1.00149e-05 -1.00127e-05 -1.00109e-05 -1.00092e-05 -1.00079e-05 -1.00067e-05 -1.00056e-05 -1.00048e-05 -1.0004e-05 -1.00034e-05
@@ -60,7 +60,7 @@
-1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05
-1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05 -1e-05
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
@@ -79,7 +79,7 @@
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
@@ -98,7 +98,7 @@
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7 99998.7
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -117,7 +117,7 @@
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="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
996.634 996.813 996.99 997.158 997.306 997.448 997.585 997.715 997.838 997.952 998.043 998.127
998.204 998.275 998.339 998.397 998.449 998.496 998.538 998.575 998.608 998.637 998.661 998.679
998.694 998.708 998.72 998.73 998.739 998.746 998.753 998.758 998.763 998.767 998.77 998.773
@@ -136,7 +136,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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
865.141 865.693 866.239 866.773 867.293 867.794 868.274 868.73 869.16 869.563 869.938 870.285
870.604 870.896 871.161 871.4 871.616 871.809 871.981 872.133 872.268 872.387 872.492 872.583
872.663 872.732 872.792 872.844 872.889 872.928 872.961 872.989 873.014 873.034 873.052 873.067
@@ -155,7 +155,7 @@
873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149
873.149 873.149 873.149 873.149 873.149 873.149 873.149 873.149
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.16232 1.1649 1.16746 1.16998 1.17244 1.17483 1.17713 1.17932 1.1814 1.18335 1.18517 1.18687
1.18843 1.18986 1.19117 1.19235 1.19341 1.19437 1.19523 1.19598 1.19666 1.19725 1.19777 1.19823
1.19863 1.19897 1.19928 1.19954 1.19976 1.19995 1.20012 1.20026 1.20039 1.20049 1.20058 1.20065
@@ -231,7 +231,7 @@
290 290 290 290 290 290 290 290 290 290 290 290
290 290 290 290 290 290 290 290
</DataArray>
- <DataArray type="Float32" Name="velocity_w" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water" NumberOfComponents="3" format="ascii">
-1.0499e-09 0 0 -1.03771e-09 0 0 -1.01387e-09 0 0 -9.81573e-10 0 0
-9.42382e-10 0 0 -8.95523e-10 0 0 -8.42218e-10 0 0 -7.83778e-10 0 0
-7.21541e-10 0 0 -6.61849e-10 0 0 -6.05993e-10 0 0 -5.50043e-10 0 0
@@ -283,7 +283,7 @@
7.00058e-11 0 0 7.00058e-11 0 0 7.00058e-11 0 0 7.00058e-11 0 0
7.00058e-11 0 0 7.00058e-11 0 0 7.00058e-11 0 0 7.00058e-11 0 0
</DataArray>
- <DataArray type="Float32" Name="velocity_n" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_NAPL" NumberOfComponents="3" 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
@@ -335,7 +335,7 @@
0 0 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="velocity_g" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Air" NumberOfComponents="3" 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
diff --git a/test/references/3pniconvectionbox-reference.vtu b/test/references/3pniconvectionbox-reference.vtu
index c3778bb138880ab4709c190b11fcb8660cb451ac..fa53625428a6bc3cf7a7b93bb8c13904870a3e57 100644
--- a/test/references/3pniconvectionbox-reference.vtu
+++ b/test/references/3pniconvectionbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="80" NumberOfPoints="162">
- <PointData Scalars="S_w" Vectors="velocity_w (m/s)">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water" Vectors="velocity_Water (m/s)">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -19,7 +19,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" NumberOfComponents="1" format="ascii">
1.00095e-10 1.00095e-10 1.00095e-10 1.00095e-10 1.00095e-10 1.00095e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00094e-10
1.00094e-10 1.00094e-10 1.00093e-10 1.00093e-10 1.00092e-10 1.00092e-10 1.0009e-10 1.0009e-10 1.00088e-10 1.00088e-10 1.00084e-10 1.00084e-10
1.00079e-10 1.00079e-10 1.00073e-10 1.00073e-10 1.00067e-10 1.00067e-10 1.00059e-10 1.00059e-10 1.00052e-10 1.00052e-10 1.00045e-10 1.00045e-10
@@ -35,7 +35,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 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="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
-8.25349e-11 -8.27141e-11 -8.25349e-11 -8.27141e-11 -8.28945e-11 -8.28945e-11 -8.30759e-11 -8.30759e-11 -8.32585e-11 -8.32585e-11 -8.34409e-11 -8.34409e-11
-8.36238e-11 -8.36238e-11 -8.38062e-11 -8.38062e-11 -8.39878e-11 -8.39878e-11 -8.41683e-11 -8.41683e-11 -8.43469e-11 -8.43469e-11 -8.45235e-11 -8.45235e-11
-8.46979e-11 -8.46979e-11 -8.48705e-11 -8.48705e-11 -8.50416e-11 -8.50416e-11 -8.52119e-11 -8.52119e-11 -8.53827e-11 -8.53827e-11 -8.55548e-11 -8.55548e-11
@@ -51,7 +51,7 @@
-9.78757e-11 -9.78757e-11 -9.81362e-11 -9.81362e-11 -9.83981e-11 -9.83981e-11 -9.86616e-11 -9.86616e-11 -9.89263e-11 -9.89263e-11 -9.91925e-11 -9.91925e-11
-9.94603e-11 -9.94603e-11 -9.97295e-11 -9.97295e-11 -1e-10 -1e-10
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -67,7 +67,7 @@
102170 102170 101899 101899 101628 101628 101357 101357 101085 101085 100814 100814
100543 100543 100271 100271 100000 100000
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -83,7 +83,7 @@
102170 102170 101899 101899 101628 101628 101357 101357 101085 101085 100814 100814
100543 100543 100271 100271 100000 100000
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -99,7 +99,7 @@
102170 102170 101899 101899 101628 101628 101357 101357 101085 101085 100814 100814
100543 100543 100271 100271 100000 100000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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
@@ -115,7 +115,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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
872.324 872.324 872.324 872.324 872.324 872.324 872.324 872.324 872.325 872.325 872.326 872.326
872.329 872.329 872.335 872.335 872.345 872.345 872.361 872.361 872.385 872.385 872.418 872.418
872.46 872.46 872.51 872.51 872.567 872.567 872.629 872.629 872.694 872.694 872.759 872.759
@@ -131,7 +131,7 @@
873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148
873.148 873.148 873.148 873.148 873.149 873.149
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.45523 1.45206 1.45523 1.45206 1.4489 1.4489 1.44574 1.44574 1.44258 1.44258 1.43942 1.43942
1.43628 1.43628 1.43315 1.43315 1.43004 1.43004 1.42698 1.42698 1.42395 1.42395 1.42098 1.42098
1.41805 1.41805 1.41517 1.41517 1.41233 1.41233 1.4095 1.4095 1.40669 1.40669 1.40386 1.40386
@@ -195,7 +195,7 @@
290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
290.001 290.001 290.001 290.001 290 290
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" format="ascii">
0.0001 -3.44191e-19 0 0.0001 5.16287e-19 0 0.0001 -3.44191e-19 0 0.0001 5.16287e-19 0
0.0001 1.20467e-18 0 0.0001 1.20467e-18 0 0.0001 1.37676e-18 0 0.0001 1.37676e-18 0
0.0001 -1.03256e-18 0 0.0001 -1.03256e-18 0 0.0001 1.20461e-18 0 0.0001 1.20461e-18 0
@@ -238,7 +238,7 @@
9.99936e-05 3.3521e-19 0 9.99936e-05 3.3521e-19 0 9.99937e-05 0 0 9.99937e-05 0 0
9.99937e-05 0 0 9.99937e-05 0 0
</DataArray>
- <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_NAPL (m/s)" NumberOfComponents="3" 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
@@ -281,7 +281,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="velocity_g (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" 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
diff --git a/test/references/3pniconvectioncc-reference.vtu b/test/references/3pniconvectioncc-reference.vtu
index 1bfbaf9acaa20433e2b422f929344002041f8ebb..df09afb0d042032ec919d16113387a2a14fc1ff3 100644
--- a/test/references/3pniconvectioncc-reference.vtu
+++ b/test/references/3pniconvectioncc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="80" NumberOfPoints="162">
- <CellData Scalars="S_w" Vectors="velocity_w (m/s)">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water" Vectors="velocity_Water (m/s)">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -12,7 +12,7 @@
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="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" NumberOfComponents="1" format="ascii">
1.00095e-10 1.00095e-10 1.00095e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00094e-10 1.00093e-10 1.00091e-10 1.00089e-10 1.00086e-10 1.00081e-10
1.00076e-10 1.0007e-10 1.00063e-10 1.00056e-10 1.00048e-10 1.00041e-10 1.00034e-10 1.00028e-10 1.00022e-10 1.00018e-10 1.00014e-10 1.0001e-10
1.00008e-10 1.00006e-10 1.00004e-10 1.00003e-10 1.00002e-10 1.00002e-10 1.00001e-10 1.00001e-10 1.00001e-10 1e-10 1e-10 1e-10
@@ -21,7 +21,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 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="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
-8.26245e-11 -8.28042e-11 -8.29853e-11 -8.31669e-11 -8.33493e-11 -8.35316e-11 -8.37144e-11 -8.38968e-11 -8.40776e-11 -8.42573e-11 -8.44353e-11 -8.46107e-11
-8.4784e-11 -8.49557e-11 -8.51263e-11 -8.52972e-11 -8.54686e-11 -8.56413e-11 -8.58167e-11 -8.59952e-11 -8.6177e-11 -8.63622e-11 -8.65512e-11 -8.67439e-11
-8.69391e-11 -8.71376e-11 -8.7339e-11 -8.75425e-11 -8.77475e-11 -8.7955e-11 -8.81637e-11 -8.8374e-11 -8.85857e-11 -8.87985e-11 -8.90127e-11 -8.92278e-11
@@ -30,7 +30,7 @@
-9.49755e-11 -9.52206e-11 -9.54674e-11 -9.57154e-11 -9.59647e-11 -9.62149e-11 -9.64667e-11 -9.672e-11 -9.69744e-11 -9.72301e-11 -9.74873e-11 -9.77457e-11
-9.80056e-11 -9.82668e-11 -9.85296e-11 -9.87938e-11 -9.90593e-11 -9.93263e-11 -9.95948e-11 -9.98645e-11
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -39,7 +39,7 @@
105290 105019 104748 104476 104205 103934 103663 103391 103120 102849 102577 102306
102035 101763 101492 101221 100950 100678 100407 100136
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -48,7 +48,7 @@
105290 105019 104748 104476 104205 103934 103663 103391 103120 102849 102577 102306
102035 101763 101492 101221 100950 100678 100407 100136
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -57,7 +57,7 @@
105290 105019 104748 104476 104205 103934 103663 103391 103120 102849 102577 102306
102035 101763 101492 101221 100950 100678 100407 100136
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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
@@ -66,7 +66,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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
872.324 872.324 872.324 872.324 872.325 872.327 872.332 872.34 872.353 872.373 872.401 872.439
872.485 872.539 872.598 872.662 872.726 872.79 872.849 872.904 872.952 872.994 873.029 873.058
873.081 873.099 873.112 873.122 873.13 873.135 873.139 873.142 873.144 873.145 873.146 873.147
@@ -75,7 +75,7 @@
873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148
873.148 873.148 873.148 873.148 873.148 873.148 873.148 873.148
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.45364 1.45048 1.44732 1.44416 1.441 1.43785 1.43471 1.4316 1.42851 1.42546 1.42247 1.41951
1.41661 1.41375 1.41091 1.40809 1.40527 1.40243 1.39957 1.39666 1.39372 1.39072 1.38769 1.38461
1.38149 1.37835 1.37517 1.37198 1.36876 1.36554 1.3623 1.35906 1.35581 1.35256 1.34931 1.34606
@@ -111,7 +111,7 @@
290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
290.001 290.001 290.001 290.001 290.001 290.001 290.001 290.001
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" 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
@@ -133,7 +133,7 @@
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>
- <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_NAPL (m/s)" NumberOfComponents="3" 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
@@ -155,7 +155,7 @@
0 0 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="velocity_g (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Air (m/s)" NumberOfComponents="3" 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
diff --git a/test/references/3pwateroilbox-reference.vtu b/test/references/3pwateroilbox-reference.vtu
index dfec51dfed80a036c7972d05ba56a60f475c7014..7bddf327206cb1315c6fc83761463cac762d6c9f 100644
--- a/test/references/3pwateroilbox-reference.vtu
+++ b/test/references/3pwateroilbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="2400" NumberOfPoints="2501">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.700844 0.700878 0.700804 0.700852 0.70096 0.700958 0.701052 0.701063 0.701129 0.701142 0.701182 0.701194
0.701215 0.701224 0.701229 0.701237 0.701231 0.701236 0.701223 0.701227 0.701207 0.70121 0.701187 0.701189
0.701163 0.701164 0.701136 0.701137 0.701108 0.701109 0.701079 0.70108 0.70105 0.70105 0.70102 0.70102
@@ -214,7 +214,7 @@
0.700009 0.700008 0.700007 0.700007 0.700006 0.700006 0.700005 0.700005 0.700004 0.700004 0.700003 0.700003
0.700002 0.700002 0.700001 0.700001 0.7
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" NumberOfComponents="1" format="ascii">
0.299156 0.299122 0.299196 0.299148 0.29904 0.299042 0.298948 0.298937 0.298871 0.298858 0.298818 0.298806
0.298785 0.298776 0.298771 0.298763 0.298769 0.298764 0.298777 0.298773 0.298793 0.29879 0.298813 0.298811
0.298837 0.298836 0.298864 0.298863 0.298892 0.298891 0.298921 0.29892 0.29895 0.29895 0.29898 0.29898
@@ -425,7 +425,7 @@
0.299991 0.299992 0.299993 0.299993 0.299994 0.299994 0.299995 0.299995 0.299996 0.299996 0.299997 0.299997
0.299998 0.299998 0.299999 0.299999 0.3
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Gas" 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
@@ -636,7 +636,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
4.31845e+06 4.33023e+06 4.29458e+06 4.31129e+06 4.35884e+06 4.34844e+06 4.39106e+06 4.38512e+06 4.41784e+06 4.4126e+06 4.43656e+06 4.43079e+06
4.44779e+06 4.44122e+06 4.45295e+06 4.44565e+06 4.45348e+06 4.44556e+06 4.45057e+06 4.44217e+06 4.44517e+06 4.4364e+06 4.438e+06 4.42896e+06
4.4296e+06 4.42035e+06 4.42037e+06 4.41096e+06 4.41059e+06 4.40107e+06 4.40047e+06 4.39086e+06 4.39017e+06 4.3805e+06 4.37979e+06 4.37007e+06
@@ -847,7 +847,7 @@
3.63587e+06 3.63566e+06 3.63545e+06 3.63525e+06 3.63505e+06 3.63486e+06 3.63467e+06 3.63449e+06 3.6343e+06 3.63412e+06 3.63395e+06 3.63377e+06
3.6336e+06 3.63343e+06 3.63326e+06 3.6331e+06 3.63302e+06
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
4.31845e+06 4.33023e+06 4.29458e+06 4.31129e+06 4.35884e+06 4.34845e+06 4.39106e+06 4.38512e+06 4.41785e+06 4.41261e+06 4.43656e+06 4.43079e+06
4.44779e+06 4.44122e+06 4.45295e+06 4.44565e+06 4.45348e+06 4.44556e+06 4.45057e+06 4.44217e+06 4.44517e+06 4.4364e+06 4.438e+06 4.42896e+06
4.4296e+06 4.42035e+06 4.42037e+06 4.41096e+06 4.41059e+06 4.40107e+06 4.40047e+06 4.39087e+06 4.39017e+06 4.3805e+06 4.37979e+06 4.37008e+06
@@ -1058,7 +1058,7 @@
3.63587e+06 3.63566e+06 3.63545e+06 3.63525e+06 3.63505e+06 3.63486e+06 3.63467e+06 3.63449e+06 3.63431e+06 3.63413e+06 3.63395e+06 3.63377e+06
3.6336e+06 3.63343e+06 3.63326e+06 3.6331e+06 3.63302e+06
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Gas" NumberOfComponents="1" format="ascii">
4.31845e+06 4.33023e+06 4.29458e+06 4.31129e+06 4.35884e+06 4.34845e+06 4.39106e+06 4.38512e+06 4.41785e+06 4.41261e+06 4.43656e+06 4.43079e+06
4.44779e+06 4.44122e+06 4.45295e+06 4.44565e+06 4.45348e+06 4.44556e+06 4.45057e+06 4.44217e+06 4.44517e+06 4.4364e+06 4.438e+06 4.42896e+06
4.4296e+06 4.42035e+06 4.42037e+06 4.41096e+06 4.41059e+06 4.40107e+06 4.40047e+06 4.39087e+06 4.39017e+06 4.3805e+06 4.37979e+06 4.37008e+06
@@ -1269,7 +1269,7 @@
3.63587e+06 3.63566e+06 3.63545e+06 3.63525e+06 3.63505e+06 3.63486e+06 3.63467e+06 3.63449e+06 3.63431e+06 3.63413e+06 3.63395e+06 3.63377e+06
3.6336e+06 3.63343e+06 3.63326e+06 3.6331e+06 3.63302e+06
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
999.667 999.672 999.656 999.663 999.684 999.679 999.698 999.695 999.71 999.707 999.718 999.715
999.722 999.719 999.724 999.721 999.725 999.721 999.724 999.72 999.721 999.717 999.718 999.714
999.715 999.71 999.711 999.706 999.707 999.702 999.702 999.698 999.698 999.694 999.693 999.689
@@ -1480,7 +1480,7 @@
999.368 999.367 999.367 999.367 999.367 999.367 999.367 999.367 999.367 999.367 999.367 999.367
999.367 999.367 999.367 999.366 999.366
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
944.219 944.326 944.003 944.154 944.585 944.491 944.877 944.823 945.12 945.072 945.289 945.237
945.391 945.331 945.438 945.371 945.442 945.371 945.416 945.34 945.367 945.288 945.302 945.22
945.226 945.142 945.142 945.057 945.054 944.967 944.962 944.875 944.869 944.781 944.775 944.687
@@ -1691,7 +1691,7 @@
938.035 938.033 938.031 938.029 938.027 938.026 938.024 938.022 938.021 938.019 938.017 938.016
938.014 938.013 938.011 938.01 938.009
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Gas" NumberOfComponents="1" format="ascii">
0.0195339 0.0195361 0.0195355 0.0195378 0.01954 0.0195411 0.0195436 0.0195446 0.0195466 0.0195474 0.0195487 0.0195493
0.01955 0.0195505 0.0195506 0.019551 0.0195507 0.019551 0.0195504 0.0195506 0.0195497 0.0195499 0.0195488 0.0195489
0.0195478 0.0195478 0.0195466 0.0195466 0.0195453 0.0195453 0.019544 0.019544 0.0195426 0.0195426 0.0195412 0.0195413
@@ -1902,7 +1902,7 @@
0.0194945 0.0194945 0.0194945 0.0194944 0.0194944 0.0194944 0.0194944 0.0194943 0.0194943 0.0194943 0.0194943 0.0194942
0.0194942 0.0194942 0.0194942 0.0194941 0.0194941
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
198.575 198.623 198.533 198.598 198.735 198.737 198.857 198.874 198.959 198.977 199.031 199.046
199.074 199.086 199.093 199.103 199.096 199.103 199.084 199.09 199.064 199.067 199.036 199.039
199.004 199.005 198.968 198.969 198.93 198.931 198.891 198.891 198.851 198.851 198.81 198.81
@@ -2113,7 +2113,7 @@
197.425 197.425 197.424 197.423 197.422 197.421 197.421 197.42 197.419 197.419 197.418 197.417
197.416 197.416 197.415 197.414 197.414
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_NAPL" NumberOfComponents="1" format="ascii">
8.91136e-05 8.91177e-05 8.91537e-05 8.91501e-05 8.91119e-05 8.9125e-05 8.90978e-05 8.91015e-05 8.90853e-05 8.90864e-05 8.90771e-05 8.90774e-05
8.90728e-05 8.90727e-05 8.90711e-05 8.90709e-05 8.90712e-05 8.90709e-05 8.90723e-05 8.90721e-05 8.90741e-05 8.90739e-05 8.90764e-05 8.90762e-05
8.90788e-05 8.90786e-05 8.90813e-05 8.90811e-05 8.90838e-05 8.90837e-05 8.90863e-05 8.90862e-05 8.90887e-05 8.90887e-05 8.90912e-05 8.90911e-05
@@ -2324,7 +2324,7 @@
8.91725e-05 8.91726e-05 8.91726e-05 8.91726e-05 8.91727e-05 8.91727e-05 8.91727e-05 8.91728e-05 8.91728e-05 8.91728e-05 8.91728e-05 8.91729e-05
8.91729e-05 8.91729e-05 8.9173e-05 8.9173e-05 8.9173e-05
</DataArray>
- <DataArray type="Float32" Name="mob_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Gas" 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
@@ -2535,7 +2535,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="viscos_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="viscos_Water" NumberOfComponents="1" format="ascii">
0.000954057 0.000954014 0.000954032 0.000953987 0.000953936 0.000953917 0.000953862 0.000953846 0.000953803 0.000953789 0.00095376 0.000953749
0.000953733 0.000953725 0.00095372 0.000953715 0.000953718 0.000953715 0.000953725 0.000953724 0.000953739 0.000953738 0.000953757 0.000953757
0.000953778 0.000953779 0.000953802 0.000953803 0.000953827 0.000953829 0.000953854 0.000953856 0.000953881 0.000953883 0.000953909 0.00095391
@@ -2746,7 +2746,7 @@
0.000954929 0.000954929 0.00095493 0.00095493 0.000954931 0.000954932 0.000954932 0.000954933 0.000954933 0.000954934 0.000954934 0.000954935
0.000954935 0.000954936 0.000954936 0.000954936 0.000954937
</DataArray>
- <DataArray type="Float32" Name="viscos_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="viscos_NAPL" NumberOfComponents="1" format="ascii">
1739.16 1738.7 1738.82 1738.36 1737.91 1737.68 1737.17 1736.98 1736.57 1736.4 1736.14 1736
1735.87 1735.77 1735.74 1735.66 1735.72 1735.66 1735.79 1735.75 1735.92 1735.89 1736.11 1736.09
1736.33 1736.31 1736.57 1736.56 1736.83 1736.82 1737.1 1737.09 1737.38 1737.37 1737.66 1737.65
@@ -2957,7 +2957,7 @@
1747.21 1747.22 1747.22 1747.23 1747.24 1747.24 1747.25 1747.25 1747.26 1747.26 1747.27 1747.27
1747.28 1747.28 1747.29 1747.29 1747.29
</DataArray>
- <DataArray type="Float32" Name="viscos_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="viscos_Gas" NumberOfComponents="1" format="ascii">
5.91112e-09 5.89577e-09 5.94453e-09 5.92224e-09 5.85837e-09 5.87276e-09 5.81658e-09 5.82477e-09 5.78228e-09 5.78942e-09 5.75858e-09 5.7663e-09
5.74447e-09 5.75313e-09 5.73802e-09 5.74757e-09 5.73737e-09 5.74768e-09 5.74101e-09 5.75193e-09 5.74777e-09 5.75918e-09 5.75676e-09 5.76855e-09
5.76732e-09 5.77942e-09 5.77898e-09 5.79133e-09 5.79138e-09 5.80392e-09 5.80426e-09 5.81697e-09 5.81743e-09 5.83028e-09 5.83077e-09 5.84373e-09
@@ -3168,7 +3168,7 @@
7.00517e-09 7.00556e-09 7.00595e-09 7.00632e-09 7.00669e-09 7.00705e-09 7.0074e-09 7.00775e-09 7.00809e-09 7.00843e-09 7.00876e-09 7.00909e-09
7.00941e-09 7.00974e-09 7.01005e-09 7.01035e-09 7.01049e-09
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" 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
@@ -3379,7 +3379,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="x^heavyoil_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^heavyoil_Water" 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
@@ -3590,7 +3590,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_NAPL" 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
@@ -3801,7 +3801,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="x^heavyoil_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^heavyoil_NAPL" 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
@@ -4012,7 +4012,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Gas" NumberOfComponents="1" format="ascii">
0.000615291 0.00061369 0.000618767 0.000616443 0.00060979 0.000611286 0.000605435 0.000606286 0.00060186 0.000602601 0.000599389 0.000600191
0.000597919 0.000598819 0.000597246 0.000598239 0.000597178 0.000598251 0.000597557 0.000598694 0.000598262 0.000599449 0.000599199 0.000600426
0.000600301 0.00060156 0.000601516 0.000602801 0.000602809 0.000604114 0.000604152 0.000605474 0.000605525 0.000606862 0.000606915 0.000608264
@@ -4223,7 +4223,7 @@
0.000729251 0.000729292 0.000729332 0.000729371 0.000729409 0.000729447 0.000729484 0.00072952 0.000729555 0.00072959 0.000729625 0.000729659
0.000729693 0.000729727 0.00072976 0.000729791 0.000729806
</DataArray>
- <DataArray type="Float32" Name="x^heavyoil_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^heavyoil_Gas" NumberOfComponents="1" format="ascii">
1.53637e-40 1.53661e-40 1.54825e-40 1.54677e-40 1.53425e-40 1.54025e-40 1.53023e-40 1.53421e-40 1.5268e-40 1.53025e-40 1.52454e-40 1.52784e-40
1.52332e-40 1.52657e-40 1.52282e-40 1.52607e-40 1.52282e-40 1.52607e-40 1.52313e-40 1.52641e-40 1.52367e-40 1.52698e-40 1.52435e-40 1.52768e-40
1.52512e-40 1.52847e-40 1.52593e-40 1.52931e-40 1.52678e-40 1.53018e-40 1.52765e-40 1.53106e-40 1.52854e-40 1.53196e-40 1.52943e-40 1.53285e-40
diff --git a/test/references/boxtracermaxwellstefan-reference.vtu b/test/references/boxtracermaxwellstefan-reference.vtu
index 1eb09454435ef6b5e24d79ba11b86a8e4079b97d..37b33090391ec75b61736859c7c28182ba5ed2ed 100644
--- a/test/references/boxtracermaxwellstefan-reference.vtu
+++ b/test/references/boxtracermaxwellstefan-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="900" NumberOfPoints="961">
- <PointData Scalars="x_H2" Vectors="velocity_Gas (m/s)">
- <DataArray type="Float32" Name="x_H2" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="x^H2" Vectors="velocity_Gas (m/s)">
+ <DataArray type="Float32" Name="x^H2" NumberOfComponents="1" format="ascii">
0.258921 0.258921 0.258921 0.258921 0.258922 0.258922 0.258923 0.258923 0.258924 0.258924 0.258926 0.258926
0.258928 0.258928 0.25893 0.25893 0.258933 0.258933 0.258936 0.258936 0.25894 0.25894 0.258943 0.258943
0.258947 0.258947 0.258951 0.258951 0.258955 0.258955 0.258958 0.258958 0.258962 0.258962 0.258966 0.258966
@@ -86,7 +86,7 @@
0.25897 0.258974 0.258977 0.258981 0.258984 0.258987 0.258989 0.258991 0.258993 0.258994 0.258995 0.258996
0.258996
</DataArray>
- <DataArray type="Float32" Name="X_H2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2" NumberOfComponents="1" format="ascii">
0.0178813 0.0178813 0.0178813 0.0178813 0.0178813 0.0178813 0.0178814 0.0178814 0.0178815 0.0178815 0.0178816 0.0178816
0.0178818 0.0178818 0.0178819 0.0178819 0.0178821 0.0178821 0.0178823 0.0178823 0.0178826 0.0178826 0.0178828 0.0178828
0.0178831 0.0178831 0.0178833 0.0178833 0.0178836 0.0178836 0.0178839 0.0178839 0.0178841 0.0178841 0.0178844 0.0178844
@@ -169,7 +169,7 @@
0.0178847 0.0178849 0.0178852 0.0178854 0.0178856 0.0178858 0.017886 0.0178861 0.0178863 0.0178864 0.0178864 0.0178865
0.0178865
</DataArray>
- <DataArray type="Float32" Name="x_N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2" NumberOfComponents="1" format="ascii">
0.498132 0.498141 0.498132 0.498141 0.498168 0.498168 0.498213 0.498213 0.498275 0.498275 0.498354 0.498354
0.498448 0.498448 0.498558 0.498558 0.49868 0.49868 0.498815 0.498815 0.498961 0.498961 0.499115 0.499115
0.499277 0.499277 0.499445 0.499445 0.499616 0.499616 0.49979 0.49979 0.499963 0.499963 0.500135 0.500135
@@ -252,7 +252,7 @@
0.500303 0.500465 0.50062 0.500766 0.500901 0.501024 0.501133 0.501228 0.501307 0.501369 0.501414 0.501441
0.50145
</DataArray>
- <DataArray type="Float32" Name="X_N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2" NumberOfComponents="1" format="ascii">
0.481619 0.481628 0.481619 0.481628 0.481654 0.481654 0.481698 0.481698 0.481758 0.481758 0.481834 0.481834
0.481925 0.481925 0.482031 0.482031 0.482149 0.482149 0.48228 0.48228 0.48242 0.48242 0.48257 0.48257
0.482727 0.482727 0.482889 0.482889 0.483055 0.483055 0.483222 0.483222 0.48339 0.48339 0.483556 0.483556
@@ -335,7 +335,7 @@
0.483718 0.483875 0.484025 0.484166 0.484296 0.484415 0.484521 0.484612 0.484689 0.484749 0.484793 0.484819
0.484828
</DataArray>
- <DataArray type="Float32" Name="x_CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2" NumberOfComponents="1" format="ascii">
0.242947 0.242938 0.242947 0.242938 0.24291 0.24291 0.242864 0.242864 0.242801 0.242801 0.24272 0.24272
0.242624 0.242624 0.242512 0.242512 0.242387 0.242387 0.242249 0.242249 0.2421 0.2421 0.241942 0.241942
0.241776 0.241776 0.241604 0.241604 0.241429 0.241429 0.241252 0.241252 0.241074 0.241074 0.240899 0.240899
@@ -418,7 +418,7 @@
0.240727 0.240561 0.240403 0.240254 0.240116 0.23999 0.239878 0.239781 0.2397 0.239637 0.239591 0.239563
0.239553
</DataArray>
- <DataArray type="Float32" Name="X_CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2" NumberOfComponents="1" format="ascii">
0.369119 0.369105 0.369119 0.369105 0.369062 0.369062 0.368993 0.368993 0.368896 0.368896 0.368774 0.368774
0.368627 0.368627 0.368457 0.368457 0.368267 0.368267 0.368057 0.368057 0.367831 0.367831 0.367591 0.367591
0.367339 0.367339 0.367079 0.367079 0.366812 0.366812 0.366543 0.366543 0.366273 0.366273 0.366007 0.366007
diff --git a/test/references/cc2pcornerpoint-reference.vtu b/test/references/cc2pcornerpoint-reference.vtu
index a009cc2d792bdf747c221e50e6f40dc7703b2a28..6bb123056677c14fda02c9780624fb07ea17061f 100644
--- a/test/references/cc2pcornerpoint-reference.vtu
+++ b/test/references/cc2pcornerpoint-reference.vtu
@@ -9,28 +9,28 @@
<DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
2614.11 2091.05 2024.13 1414.34
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
0.285556 0.652038 0.702397 0.96918
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
184557 119320 121961 116546
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" NumberOfComponents="1" format="ascii">
1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" NumberOfComponents="1" format="ascii">
22.5775 249.234 311.805 943.527
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" NumberOfComponents="1" format="ascii">
0.714444 0.347962 0.297603 0.0308204
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
187171 121411 123985 117961
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" NumberOfComponents="1" format="ascii">
989.879 243.734 178.199 1.74053
</DataArray>
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
diff --git a/test/references/cctracermaxwellstefan-reference.vtu b/test/references/cctracermaxwellstefan-reference.vtu
index da22d32047ce308d8d115b17fe0b93f161d61c31..211573708e32e9615c438aa7a92991716b03aaa7 100644
--- a/test/references/cctracermaxwellstefan-reference.vtu
+++ b/test/references/cctracermaxwellstefan-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="900" NumberOfPoints="961">
- <CellData Scalars="x_H2" Vectors="velocity_Gas (m/s)">
- <DataArray type="Float32" Name="x_H2" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="x^H2" Vectors="velocity_Gas (m/s)">
+ <DataArray type="Float32" Name="x^H2" NumberOfComponents="1" format="ascii">
0.250566 0.250567 0.250567 0.250569 0.25057 0.250572 0.250575 0.250577 0.25058 0.250584 0.250587 0.250591
0.250595 0.250599 0.250603 0.250607 0.250611 0.250615 0.250619 0.250623 0.250626 0.25063 0.250633 0.250635
0.250638 0.25064 0.250641 0.250643 0.250643 0.250644 0.250566 0.250567 0.250567 0.250569 0.25057 0.250572
@@ -80,7 +80,7 @@
0.250575 0.250577 0.25058 0.250584 0.250587 0.250591 0.250595 0.250599 0.250603 0.250607 0.250611 0.250615
0.250619 0.250623 0.250626 0.25063 0.250633 0.250635 0.250638 0.25064 0.250641 0.250643 0.250643 0.250644
</DataArray>
- <DataArray type="Float32" Name="X_H2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2" NumberOfComponents="1" format="ascii">
0.0173043 0.0173043 0.0173044 0.0173045 0.0173046 0.0173047 0.0173049 0.0173051 0.0173053 0.0173055 0.0173058 0.017306
0.0173063 0.0173066 0.0173068 0.0173071 0.0173074 0.0173077 0.0173079 0.0173082 0.0173084 0.0173087 0.0173089 0.0173091
0.0173092 0.0173094 0.0173095 0.0173096 0.0173096 0.0173097 0.0173043 0.0173043 0.0173044 0.0173045 0.0173046 0.0173047
@@ -157,7 +157,7 @@
0.0173049 0.0173051 0.0173053 0.0173055 0.0173058 0.017306 0.0173063 0.0173066 0.0173068 0.0173071 0.0173074 0.0173077
0.0173079 0.0173082 0.0173084 0.0173087 0.0173089 0.0173091 0.0173092 0.0173094 0.0173095 0.0173096 0.0173096 0.0173097
</DataArray>
- <DataArray type="Float32" Name="x_N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2" NumberOfComponents="1" format="ascii">
0.498062 0.498081 0.498119 0.498176 0.498251 0.498344 0.498452 0.498576 0.498713 0.498862 0.499022 0.499191
0.499367 0.499548 0.499732 0.499917 0.5001 0.500281 0.500457 0.500626 0.500787 0.500937 0.501074 0.501198
0.501307 0.5014 0.501475 0.501532 0.501571 0.50159 0.498062 0.498081 0.498119 0.498176 0.498251 0.498344
@@ -234,7 +234,7 @@
0.498452 0.498576 0.498713 0.498862 0.499022 0.499191 0.499367 0.499548 0.499732 0.499917 0.5001 0.500281
0.500457 0.500626 0.500787 0.500937 0.501074 0.501198 0.501307 0.5014 0.501475 0.501532 0.501571 0.50159
</DataArray>
- <DataArray type="Float32" Name="X_N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2" NumberOfComponents="1" format="ascii">
0.481551 0.48157 0.481607 0.481662 0.481735 0.481824 0.481929 0.482048 0.482181 0.482326 0.48248 0.482643
0.482813 0.482988 0.483166 0.483345 0.483523 0.483698 0.483868 0.484031 0.484186 0.484331 0.484464 0.484584
0.484689 0.484779 0.484851 0.484907 0.484944 0.484963 0.481551 0.48157 0.481607 0.481662 0.481735 0.481824
@@ -311,7 +311,7 @@
0.481929 0.482048 0.482181 0.482326 0.48248 0.482643 0.482813 0.482988 0.483166 0.483345 0.483523 0.483698
0.483868 0.484031 0.484186 0.484331 0.484464 0.484584 0.484689 0.484779 0.484851 0.484907 0.484944 0.484963
</DataArray>
- <DataArray type="Float32" Name="x_CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2" NumberOfComponents="1" format="ascii">
0.251372 0.251352 0.251313 0.251255 0.251178 0.251084 0.250973 0.250847 0.250706 0.250554 0.25039 0.250218
0.250038 0.249853 0.249665 0.249476 0.249288 0.249104 0.248924 0.248751 0.248587 0.248434 0.248293 0.248167
0.248055 0.247961 0.247884 0.247825 0.247786 0.247766 0.251372 0.251352 0.251313 0.251255 0.251178 0.251084
@@ -388,7 +388,7 @@
0.250973 0.250847 0.250706 0.250554 0.25039 0.250218 0.250038 0.249853 0.249665 0.249476 0.249288 0.249104
0.248924 0.248751 0.248587 0.248434 0.248293 0.248167 0.248055 0.247961 0.247884 0.247825 0.247786 0.247766
</DataArray>
- <DataArray type="Float32" Name="X_CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2" NumberOfComponents="1" format="ascii">
0.381919 0.381889 0.381829 0.381741 0.381624 0.381481 0.381313 0.381121 0.380908 0.380676 0.380427 0.380165
0.379892 0.379611 0.379326 0.379039 0.378753 0.378472 0.378199 0.377936 0.377687 0.377455 0.377241 0.377049
0.37688 0.376736 0.376619 0.37653 0.37647 0.37644 0.381919 0.381889 0.381829 0.381741 0.381624 0.381481
diff --git a/test/references/co2box-reference.vtu b/test/references/co2box-reference.vtu
index 452684b97aa2219233e8a64ce9d897745a57c412..06b0148a60ec2991ae5c9353114087df7595578f 100644
--- a/test/references/co2box-reference.vtu
+++ b/test/references/co2box-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="3667" NumberOfPoints="3794">
- <PointData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_CO2">
+ <DataArray type="Float32" Name="S_CO2" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0.24004 0.0309938 0 0 0 0
0 0 0 0 0 0 0.338733 0.174925 0 0.357728 0.215148 0
0 0 0 0 0 0 0 0 0 0 0 0
@@ -322,7 +322,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Brine" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 0.75996 0.969006 1 1 1 1
1 1 1 1 1 1 0.661267 0.825075 1 0.642272 0.784852 1
1 1 1 1 1 1 1 1 1 1 1 1
@@ -641,7 +641,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_CO2" NumberOfComponents="1" format="ascii">
1.39004e+07 1.38741e+07 1.39017e+07 1.38781e+07 1.38709e+07 1.38854e+07 1.39051e+07 1.38759e+07 1.38432e+07 1.38532e+07 1.38532e+07 1.38645e+07
1.38509e+07 1.3833e+07 1.38369e+07 1.38131e+07 1.38145e+07 1.38598e+07 1.38936e+07 1.38759e+07 1.38459e+07 1.38819e+07 1.38669e+07 1.38299e+07
1.38128e+07 1.37898e+07 1.37877e+07 1.37621e+07 1.38184e+07 1.37905e+07 1.37997e+07 1.37689e+07 1.37803e+07 1.37535e+07 1.37611e+07 1.37391e+07
@@ -960,7 +960,7 @@
1.16705e+07 1.169e+07 1.17094e+07 1.1699e+07 1.16783e+07 1.1668e+07 1.16621e+07 1.16563e+07 1.16594e+07 1.16579e+07 1.16419e+07 1.16365e+07
1.16232e+07 1.1627e+07
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Brine" NumberOfComponents="1" format="ascii">
1.38904e+07 1.38641e+07 1.38917e+07 1.38681e+07 1.38609e+07 1.38754e+07 1.38935e+07 1.38658e+07 1.38332e+07 1.38432e+07 1.38432e+07 1.38545e+07
1.38409e+07 1.3823e+07 1.38269e+07 1.38031e+07 1.38045e+07 1.38498e+07 1.38811e+07 1.38648e+07 1.38359e+07 1.38693e+07 1.38556e+07 1.38199e+07
1.38028e+07 1.37798e+07 1.37777e+07 1.37521e+07 1.38084e+07 1.37805e+07 1.37897e+07 1.37589e+07 1.37703e+07 1.37435e+07 1.37511e+07 1.37291e+07
@@ -1598,7 +1598,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Brine" NumberOfComponents="1" format="ascii">
1066.37 1066.12 1073.05 1066.94 1066.04 1066.04 1073.65 1073.66 1066.06 1066.03 1066.18 1066.01
1066.01 1066.03 1066 1066.02 1066.05 1067.35 1073.68 1073.68 1071.02 1073.7 1073.7 1066.48
1066.1 1066.04 1066.07 1066.07 1066 1066.02 1065.99 1066.01 1065.98 1066 1065.97 1065.99
@@ -1917,7 +1917,7 @@
1066.43 1066.41 1066.39 1066.38 1066.4 1066.39 1066.36 1066.38 1066.39 1066.42 1066.42 1066.38
1066.41 1066.41
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_CO2" NumberOfComponents="1" format="ascii">
710.106 709.952 710.139 710.249 709.69 709.728 710.932 710.58 709.667 709.391 710.14 709.205
708.861 708.966 708.493 708.52 709.093 710.458 711.231 711.055 710.527 711.527 711.353 710.124
709.646 708.585 709.115 708.599 708.004 708.004 707.511 707.478 707.001 706.968 706.493 706.526
@@ -2236,7 +2236,7 @@
672.367 672.234 672.121 671.659 671.739 671.243 670.052 670.385 670.761 671.868 671.229 670.013
670.47 670.636
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Brine" NumberOfComponents="1" format="ascii">
1250.86 1249.92 1250.86 1249.56 1250.26 1250.86 389.756 1093.67 1249 1249.99 1248.61 1250.86
1250.86 1249.79 1250.86 1249.66 1248.67 1248.33 213.995 552.947 1247.55 188.446 446.45 1247.52
1247.58 1248.42 1247.36 1247.08 1250.86 1249.52 1250.86 1249.44 1250.86 1249.63 1250.86 1249.75
@@ -2555,7 +2555,7 @@
1198.95 1200.14 1201.3 1201.35 1200.17 1200.28 1201.51 1200.78 1200.46 1198.95 1198.95 1200.23
1198.95 1198.95
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_CO2" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 487.471 1.18248 0 0 0 0
0 0 0 0 0 0 1287.57 196.003 0 1497.14 355.958 0
0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/co2cc-reference.vtu b/test/references/co2cc-reference.vtu
index 61d41e463e3459deb733e45237965282b2e2215a..8e94f6120e94f59066b59e24a4582feee07f9c81 100644
--- a/test/references/co2cc-reference.vtu
+++ b/test/references/co2cc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="3667" NumberOfPoints="3794">
- <CellData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_CO2">
+ <DataArray type="Float32" Name="S_CO2" NumberOfComponents="1" format="ascii">
0 0 0.00632624 0 0 0 0 0 0 0 0.255683 0.0809946
0.280594 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0.122964 0.315788
@@ -311,7 +311,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Brine" NumberOfComponents="1" format="ascii">
1 1 0.993674 1 1 1 1 1 1 1 0.744317 0.919005
0.719406 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 0.877036 0.684212
@@ -619,7 +619,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_CO2" NumberOfComponents="1" format="ascii">
1.39144e+07 1.39205e+07 1.39106e+07 1.3895e+07 1.38893e+07 1.39098e+07 1.38856e+07 1.38676e+07 1.38674e+07 1.38903e+07 1.39214e+07 1.38947e+07
1.39226e+07 1.38724e+07 1.38617e+07 1.38463e+07 1.3846e+07 1.38248e+07 1.38522e+07 1.38375e+07 1.38248e+07 1.38119e+07 1.37959e+07 1.37774e+07
1.38272e+07 1.3796e+07 1.38086e+07 1.38038e+07 1.37888e+07 1.37757e+07 1.37529e+07 1.37639e+07 1.37613e+07 1.37349e+07 1.38947e+07 1.39213e+07
@@ -927,7 +927,7 @@
1.17296e+07 1.17167e+07 1.17005e+07 1.16865e+07 1.16738e+07 1.17256e+07 1.17166e+07 1.17102e+07 1.17009e+07 1.16908e+07 1.16819e+07 1.16767e+07
1.16782e+07 1.16781e+07 1.16633e+07 1.16524e+07 1.16503e+07 1.16503e+07 1.1648e+07
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Brine" NumberOfComponents="1" format="ascii">
1.39044e+07 1.39105e+07 1.39006e+07 1.3885e+07 1.38793e+07 1.38998e+07 1.38756e+07 1.38576e+07 1.38574e+07 1.38803e+07 1.39097e+07 1.38842e+07
1.39107e+07 1.38624e+07 1.38517e+07 1.38363e+07 1.3836e+07 1.38148e+07 1.38422e+07 1.38275e+07 1.38148e+07 1.38019e+07 1.37859e+07 1.37674e+07
1.38172e+07 1.3786e+07 1.37986e+07 1.37938e+07 1.37788e+07 1.37657e+07 1.37429e+07 1.37539e+07 1.37513e+07 1.37249e+07 1.3884e+07 1.39091e+07
@@ -1543,7 +1543,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000 10000 10000 10000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Brine" NumberOfComponents="1" format="ascii">
1066.64 1066.09 1073.65 1066.06 1066.17 1066.04 1066.03 1066.03 1066.05 1067.38 1073.68 1073.69
1073.71 1067.47 1066.19 1066.05 1066.08 1066.07 1066.02 1066.02 1066.01 1066.01 1066 1066
1066.05 1066.04 1066.04 1066.07 1066.03 1066.02 1066.02 1066.04 1066.05 1066.04 1073.71 1073.74
@@ -1851,7 +1851,7 @@
1066.44 1066.43 1066.42 1066.42 1066.41 1066.38 1066.37 1066.37 1066.4 1066.39 1066.39 1066.36
1066.38 1066.37 1066.41 1066.4 1066.38 1066.4 1066.4
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_CO2" NumberOfComponents="1" format="ascii">
710.759 710.818 710.986 710.546 710.683 710.54 709.994 709.589 710.085 710.946 711.793 711.411
712.362 710.947 710.586 709.674 710.2 709.794 709.239 708.883 708.533 708.152 707.73 707.281
709.289 708.518 708.915 709.407 708.14 707.79 707.373 707.927 708.234 707.543 711.927 712.837
@@ -2159,7 +2159,7 @@
674.262 673.735 673.091 672.545 672.045 672.311 671.942 671.589 672.226 671.801 671.37 670.401
671.081 670.851 671.617 671.152 670.464 670.918 670.921
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Brine" NumberOfComponents="1" format="ascii">
1250.3 1250.47 1216.74 1249.79 1249.27 1250.49 1250.38 1250.29 1249.36 1248.83 356.282 873.915
307.591 1248 1248.18 1249.14 1248.15 1247.88 1250.22 1250.17 1250.2 1250.27 1250.28 1250.21
1248.93 1248.84 1248.72 1247.59 1249.19 1249.2 1248.87 1248.39 1247.71 1247.71 716.384 247.642
@@ -2467,7 +2467,7 @@
1199.55 1199.57 1199.57 1199.55 1199.54 1201.9 1201.91 1202.04 1200.72 1200.74 1200.83 1201.82
1201.02 1201.31 1199.55 1199.58 1200.37 1199.78 1199.66
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_CO2" NumberOfComponents="1" format="ascii">
0 0 0.0101786 0 0 0 0 0 0 0 582.445 20.4998
757.19 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 69.9974 1054.78
diff --git a/test/references/co2nibox-reference.vtu b/test/references/co2nibox-reference.vtu
index 7b4426b48baacfb1503b3844e6fbffa54391d627..cd54260a3a85f4a76021bb2e4a38665a559906ae 100644
--- a/test/references/co2nibox-reference.vtu
+++ b/test/references/co2nibox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="3667" NumberOfPoints="3794">
- <PointData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_CO2">
+ <DataArray type="Float32" Name="S_CO2" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0.241166 0.0303768 0 0 0 0
0 0 0 0 0 0 0.339238 0.176353 0 0.358135 0.216743 0
0 0 0 0 0 0 0 0 0 0 0 0
@@ -322,7 +322,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Brine" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 0.758834 0.969623 1 1 1 1
1 1 1 1 1 1 0.660762 0.823647 1 0.641865 0.783257 1
1 1 1 1 1 1 1 1 1 1 1 1
@@ -641,7 +641,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_CO2" NumberOfComponents="1" format="ascii">
1.39005e+07 1.38742e+07 1.39018e+07 1.38783e+07 1.38711e+07 1.38856e+07 1.39049e+07 1.38759e+07 1.38434e+07 1.38535e+07 1.38533e+07 1.38648e+07
1.38512e+07 1.38333e+07 1.38374e+07 1.38136e+07 1.38148e+07 1.38598e+07 1.38934e+07 1.38756e+07 1.38458e+07 1.38815e+07 1.38664e+07 1.38299e+07
1.3813e+07 1.37903e+07 1.37881e+07 1.37625e+07 1.38189e+07 1.3791e+07 1.38003e+07 1.37695e+07 1.3781e+07 1.37542e+07 1.37618e+07 1.37398e+07
@@ -960,7 +960,7 @@
1.16707e+07 1.16903e+07 1.17096e+07 1.16991e+07 1.16785e+07 1.16681e+07 1.16621e+07 1.16563e+07 1.16595e+07 1.16581e+07 1.1642e+07 1.16365e+07
1.16232e+07 1.1627e+07
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Brine" NumberOfComponents="1" format="ascii">
1.38905e+07 1.38642e+07 1.38918e+07 1.38683e+07 1.38611e+07 1.38756e+07 1.38933e+07 1.38657e+07 1.38334e+07 1.38435e+07 1.38433e+07 1.38548e+07
1.38412e+07 1.38233e+07 1.38274e+07 1.38036e+07 1.38048e+07 1.38498e+07 1.38809e+07 1.38645e+07 1.38358e+07 1.38689e+07 1.3855e+07 1.38199e+07
1.3803e+07 1.37803e+07 1.37781e+07 1.37525e+07 1.38089e+07 1.3781e+07 1.37903e+07 1.37595e+07 1.3771e+07 1.37442e+07 1.37518e+07 1.37298e+07
@@ -1598,7 +1598,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Brine" NumberOfComponents="1" format="ascii">
1066.31 1066.1 1072.62 1066.9 1066.03 1066.04 1073.55 1073.3 1066.05 1066.03 1066.15 1066.02
1066.01 1066.02 1066 1066.02 1066.04 1067.25 1073.93 1073.41 1070.68 1074.03 1073.46 1066.43
1066.09 1066.04 1066.06 1066.06 1066 1066.01 1065.99 1066 1065.98 1065.99 1065.97 1065.99
@@ -1917,7 +1917,7 @@
1066.42 1066.4 1066.39 1066.38 1066.4 1066.39 1066.36 1066.38 1066.38 1066.41 1066.4 1066.38
1066.4 1066.4
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_CO2" NumberOfComponents="1" format="ascii">
709.214 709.663 702.858 709.149 709.579 709.799 708.952 703.473 709.498 709.279 709.577 709.283
708.908 708.844 708.528 708.396 708.947 708.359 716.298 705.559 705.145 718.067 706.424 709.46
709.462 708.445 708.967 708.457 708.03 707.879 707.536 707.353 707.046 706.857 706.557 706.426
@@ -2236,7 +2236,7 @@
672.022 672.2 672.126 671.662 671.705 671.214 670.052 670.374 670.738 671.519 670.886 670.013
670.23 670.334
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Brine" NumberOfComponents="1" format="ascii">
1252.49 1250.44 1264.28 1251.57 1250.45 1250.71 388.415 1108.13 1249.3 1250.19 1249.63 1250.7
1250.76 1250.01 1250.79 1249.88 1248.94 1252.17 211.666 553.338 1257.43 186.079 445.798 1248.73
1247.92 1248.69 1247.64 1247.36 1250.81 1249.75 1250.81 1249.68 1250.78 1249.85 1250.75 1249.94
@@ -2555,7 +2555,7 @@
1199.38 1200.17 1201.29 1201.34 1200.2 1200.3 1201.5 1200.78 1200.47 1199.39 1199.37 1200.21
1199.23 1199.32
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_CO2" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 496.194 1.13122 0 0 0 0
0 0 0 0 0 0 1278.49 203.128 0 1480.25 367.565 0
0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/test/references/co2nicc-reference.vtu b/test/references/co2nicc-reference.vtu
index d2492adfe51c285169aacfadeb30f74e8020fb60..d70cd7f8e98732a9cf1659496426e413b928830c 100644
--- a/test/references/co2nicc-reference.vtu
+++ b/test/references/co2nicc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="3667" NumberOfPoints="3794">
- <CellData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_CO2">
+ <DataArray type="Float32" Name="S_CO2" NumberOfComponents="1" format="ascii">
0 0 0.00651901 0 0 0 0 0 0 0 0.255911 0.0820775
0.280682 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0.123969 0.315685
@@ -311,7 +311,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Brine" NumberOfComponents="1" format="ascii">
1 1 0.993481 1 1 1 1 1 1 1 0.744089 0.917922
0.719318 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 0.876031 0.684315
@@ -619,7 +619,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_CO2" NumberOfComponents="1" format="ascii">
1.39162e+07 1.39223e+07 1.39124e+07 1.38969e+07 1.38911e+07 1.39116e+07 1.38874e+07 1.38695e+07 1.38693e+07 1.38921e+07 1.39229e+07 1.38964e+07
1.3924e+07 1.38742e+07 1.38636e+07 1.38481e+07 1.38478e+07 1.38267e+07 1.3854e+07 1.38393e+07 1.38266e+07 1.38137e+07 1.37977e+07 1.37792e+07
1.38291e+07 1.37978e+07 1.38104e+07 1.38056e+07 1.37906e+07 1.37774e+07 1.37547e+07 1.37656e+07 1.37631e+07 1.37367e+07 1.38962e+07 1.39226e+07
@@ -927,7 +927,7 @@
1.17298e+07 1.17169e+07 1.17007e+07 1.16867e+07 1.1674e+07 1.17257e+07 1.17167e+07 1.17103e+07 1.1701e+07 1.16909e+07 1.16819e+07 1.16767e+07
1.16783e+07 1.16781e+07 1.16634e+07 1.16524e+07 1.16503e+07 1.16504e+07 1.1648e+07
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Brine" NumberOfComponents="1" format="ascii">
1.39062e+07 1.39123e+07 1.39023e+07 1.38869e+07 1.38811e+07 1.39016e+07 1.38774e+07 1.38595e+07 1.38593e+07 1.38821e+07 1.39112e+07 1.38859e+07
1.39121e+07 1.38642e+07 1.38536e+07 1.38381e+07 1.38378e+07 1.38167e+07 1.3844e+07 1.38293e+07 1.38166e+07 1.38037e+07 1.37877e+07 1.37692e+07
1.38191e+07 1.37878e+07 1.38004e+07 1.37956e+07 1.37806e+07 1.37674e+07 1.37447e+07 1.37556e+07 1.37531e+07 1.37267e+07 1.38855e+07 1.39104e+07
@@ -1543,7 +1543,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000 10000 10000 10000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Brine" NumberOfComponents="1" format="ascii">
1066.59 1066.08 1073.26 1066.05 1066.15 1066.04 1066.03 1066.03 1066.05 1067.3 1073.64 1073.37
1073.73 1067.41 1066.18 1066.04 1066.07 1066.07 1066.02 1066.02 1066.01 1066 1066 1065.99
1066.04 1066.03 1066.04 1066.06 1066.02 1066.01 1066.01 1066.03 1066.05 1066.04 1073.37 1073.89
@@ -1851,7 +1851,7 @@
1066.43 1066.42 1066.42 1066.41 1066.41 1066.38 1066.37 1066.37 1066.39 1066.39 1066.39 1066.36
1066.38 1066.37 1066.4 1066.4 1066.38 1066.39 1066.4
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_CO2" NumberOfComponents="1" format="ascii">
709.741 710.686 703.09 710.43 710.399 710.524 709.995 709.584 709.991 709.144 710.883 705.168
712.733 709.425 710.374 709.583 710.092 709.682 709.221 708.856 708.51 708.144 707.727 707.27
709.194 708.4 708.804 709.292 708.043 707.7 707.269 707.838 708.135 707.453 705.135 715.889
@@ -2159,7 +2159,7 @@
674.062 673.552 672.932 672.379 671.876 672.302 671.934 671.585 672.2 671.776 671.362 670.381
671.063 670.797 671.444 670.992 670.332 670.674 670.753
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Brine" NumberOfComponents="1" format="ascii">
1252.25 1250.78 1230.01 1250.07 1249.86 1250.58 1250.43 1250.36 1249.61 1252.23 356.311 877.685
307.276 1250.87 1248.64 1249.38 1248.43 1248.17 1250.32 1250.28 1250.3 1250.35 1250.34 1250.29
1249.17 1249.12 1248.99 1247.88 1249.43 1249.43 1249.13 1248.62 1247.96 1247.95 720.144 246.677
@@ -2467,7 +2467,7 @@
1199.81 1199.8 1199.76 1199.75 1199.74 1201.91 1201.92 1202.04 1200.74 1200.76 1200.83 1201.83
1201.03 1201.37 1199.76 1199.77 1200.52 1200.08 1199.85
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_CO2" NumberOfComponents="1" format="ascii">
0 0 0.0113321 0 0 0 0 0 0 0 585.098 21.6161
757.237 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 72.7699 1046.7
diff --git a/test/references/column3p3cnibox-reference.vtu b/test/references/column3p3cnibox-reference.vtu
index 295b8855d051e493d824b9ee4eee53f4c26a5885..ffefab99e71b78711b1572f2f6f9e8ad27545483 100644
--- a/test/references/column3p3cnibox-reference.vtu
+++ b/test/references/column3p3cnibox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="120" NumberOfPoints="242">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
@@ -26,7 +26,7 @@
0.00500072 0.00500072 0.00500906 0.00500906 0.00522205 0.00522205 0.033731 0.033731 0.0757099 0.0757099 0.14603 0.14603
0.165966 0.165966
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" NumberOfComponents="1" format="ascii">
0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 9.99999e-05 9.99999e-05 9.99999e-05 9.99999e-05
9.99998e-05 9.99998e-05 9.99997e-05 9.99997e-05 9.99997e-05 9.99997e-05 9.99996e-05 9.99996e-05 9.99996e-05 9.99996e-05 9.99995e-05 9.99995e-05
9.99994e-05 9.99994e-05 9.99994e-05 9.99994e-05 9.99993e-05 9.99993e-05 9.99993e-05 9.99993e-05 9.99992e-05 9.99992e-05 9.99991e-05 9.99991e-05
@@ -49,7 +49,7 @@
0.138104 0.138104 0.130326 0.130326 0.155334 0.155334 0.207207 0.207207 0.145383 0.145383 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
@@ -72,7 +72,7 @@
0.856896 0.856896 0.864665 0.864665 0.839444 0.839444 0.759062 0.759062 0.778907 0.778907 0.85397 0.85397
0.834034 0.834034
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
99947.1 99947.1 99947 99947 99946.9 99946.9 99946.8 99946.8 99946.6 99946.6 99946.5 99946.5
99946.4 99946.4 99946.3 99946.3 99946.2 99946.2 99946.1 99946.1 99945.9 99945.9 99945.8 99945.8
99945.7 99945.7 99945.6 99945.6 99945.5 99945.5 99945.4 99945.4 99945.2 99945.2 99945.1 99945.1
@@ -95,7 +95,7 @@
40416.2 40416.2 39429.5 39429.5 41655 41655 53447.5 53447.5 68069 68069 93722 93722
94949.9 94949.9
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
99947.1 99947.1 99947 99947 99946.9 99946.9 99946.8 99946.8 99946.6 99946.6 99946.5 99946.5
99946.4 99946.4 99946.3 99946.3 99946.2 99946.2 99946.1 99946.1 99945.9 99945.9 99945.8 99945.8
99945.7 99945.7 99945.6 99945.6 99945.5 99945.5 99945.4 99945.4 99945.2 99945.2 99945.1 99945.1
@@ -118,7 +118,7 @@
93297 93297 92307.4 92307.4 94457.9 94457.9 96209.4 96209.4 96045.8 96045.8 93722 93722
94949.9 94949.9
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
100000 100000 99999.9 99999.9 99999.8 99999.8 99999.6 99999.6 99999.5 99999.5 99999.4 99999.4
99999.3 99999.3 99999.2 99999.2 99999.1 99999.1 99998.9 99998.9 99998.8 99998.8 99998.7 99998.7
99998.6 99998.6 99998.5 99998.5 99998.4 99998.4 99998.2 99998.2 99998.1 99998.1 99998 99998
@@ -141,7 +141,7 @@
100013 100013 100013 100013 100013 100013 100014 100014 100101 100101 100174 100174
100274 100274
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
@@ -164,7 +164,7 @@
997.625 997.625 997.519 997.519 996.217 996.217 980.936 980.936 967.239 967.239 964.715 964.715
958.813 958.813
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
@@ -187,7 +187,7 @@
860.428 860.428 860.036 860.036 855.637 855.637 822.241 822.241 798.951 798.951 796.369 796.369
791.297 791.297
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19439 1.19438 1.19438
1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438
1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437
@@ -210,7 +210,7 @@
1.19442 1.19442 1.19308 1.19308 1.17919 1.17919 1.16093 1.16093 1.28186 1.28186 1.11332 1.11332
0.611265 0.611265
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
@@ -233,7 +233,7 @@
0.99996 0.99996 0.999959 0.999959 0.999951 0.999951 0.999762 0.999762 0.999383 0.999383 0.999523 0.999523
0.999982 0.999982
</DataArray>
- <DataArray type="Float32" Name="x^xylene_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^xylene_Water" NumberOfComponents="1" format="ascii">
2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
@@ -256,7 +256,7 @@
2.6324e-05 2.6324e-05 2.70474e-05 2.70474e-05 3.63521e-05 3.63521e-05 0.000231338 0.000231338 0.000616789 0.000616789 0.000477095 0.000477095
1.8023e-05 1.8023e-05
</DataArray>
- <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Water" NumberOfComponents="1" format="ascii">
1.37483e-05 1.37483e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05
1.37482e-05 1.37482e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05
1.37481e-05 1.37481e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05
@@ -279,7 +279,7 @@
1.3739e-05 1.3739e-05 1.36218e-05 1.36218e-05 1.2432e-05 1.2432e-05 6.307e-06 6.307e-06 2.61175e-07 2.61175e-07 1.35611e-08 1.35611e-08
3.01356e-10 3.01356e-10
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -302,7 +302,7 @@
1e-10 1e-10 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="x^xylene_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^xylene_NAPL" 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
@@ -325,7 +325,7 @@
1 1 1 1 1 1 1 1 1 1 0.702178 0.702178
0.0220678 0.0220678
</DataArray>
- <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -348,7 +348,7 @@
1e-10 1e-10 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="x^H2O_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Air" NumberOfComponents="1" format="ascii">
0.0282497 0.0282497 0.0282498 0.0282498 0.0282498 0.0282498 0.0282498 0.0282498 0.0282499 0.0282499 0.0282499 0.0282499
0.0282499 0.0282499 0.02825 0.02825 0.02825 0.02825 0.02825 0.02825 0.0282501 0.0282501 0.0282501 0.0282501
0.0282501 0.0282501 0.0282502 0.0282502 0.0282502 0.0282502 0.0282502 0.0282502 0.0282503 0.0282503 0.0282503 0.0282503
@@ -371,7 +371,7 @@
0.0283195 0.0283195 0.0290981 0.0290981 0.0392447 0.0392447 0.265854 0.265854 0.740684 0.740684 0.819991 0.819991
0.993229 0.993229
</DataArray>
- <DataArray type="Float32" Name="x^xylene_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^xylene_Air" NumberOfComponents="1" format="ascii">
0.00984259 0.00984259 0.0098426 0.0098426 0.00984261 0.00984261 0.00984262 0.00984262 0.00984264 0.00984264 0.00984265 0.00984265
0.00984266 0.00984266 0.00984267 0.00984267 0.00984268 0.00984268 0.00984269 0.00984269 0.0098427 0.0098427 0.00984272 0.00984272
0.00984273 0.00984273 0.00984274 0.00984274 0.00984275 0.00984275 0.00984276 0.00984276 0.00984277 0.00984277 0.00984279 0.00984279
@@ -394,7 +394,7 @@
0.00986655 0.00986655 0.0101377 0.0101377 0.0136252 0.0136252 0.0867073 0.0867073 0.230976 0.230976 0.178534 0.178534
0.00673766 0.00673766
</DataArray>
- <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Air" NumberOfComponents="1" format="ascii">
0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961908 0.961907 0.961907
0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
diff --git a/test/references/column3p3cnicc-reference.vtu b/test/references/column3p3cnicc-reference.vtu
index 185f78c2e7a789e54f079595a421a57f4c8a31ac..166a26c8c469cd40e730a9265038acb085635ce3 100644
--- a/test/references/column3p3cnicc-reference.vtu
+++ b/test/references/column3p3cnicc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="120" NumberOfPoints="242">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005 0.005
@@ -15,7 +15,7 @@
0.005 0.005 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001 0.00500001 0.005 0.00500001 0.00500001 0.00500001
0.00500001 0.00500001 0.00500001 0.00500001 0.00500003 0.00500023 0.00500246 0.0050325 0.00759219 0.0625084 0.120604 0.150832
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" NumberOfComponents="1" format="ascii">
0.0001 0.0001 0.0001 0.0001 9.99999e-05 9.99998e-05 9.99998e-05 9.99997e-05 9.99997e-05 9.99996e-05 9.99995e-05 9.99995e-05
9.99994e-05 9.99994e-05 9.99993e-05 9.99992e-05 9.99992e-05 9.99991e-05 9.99991e-05 9.9999e-05 9.99989e-05 9.99989e-05 9.99988e-05 9.99988e-05
9.99987e-05 9.99987e-05 9.99986e-05 9.99985e-05 9.99985e-05 9.99984e-05 9.99984e-05 9.99983e-05 9.99982e-05 9.99982e-05 9.99981e-05 9.99981e-05
@@ -27,7 +27,7 @@
0.707095 0.667772 0.626895 0.584499 0.540551 0.494987 0.447792 0.399167 0.349857 0.301726 0.258414 0.224775
0.202168 0.186288 0.173436 0.162081 0.151753 0.142526 0.133945 0.128229 0.168423 0.171855 0.0632864 0
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949 0.9949
@@ -39,7 +39,7 @@
0.287905 0.327228 0.368105 0.410501 0.454449 0.500013 0.547208 0.595833 0.645143 0.693274 0.736586 0.770225
0.792832 0.808712 0.821564 0.832919 0.843247 0.852474 0.861053 0.866739 0.823984 0.765637 0.81611 0.849168
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
99947.1 99946.9 99946.8 99946.7 99946.6 99946.5 99946.4 99946.2 99946.1 99946 99945.9 99945.8
99945.7 99945.5 99945.4 99945.3 99945.2 99945.1 99945 99944.8 99944.7 99944.6 99944.5 99944.4
99944.3 99944.1 99944 99943.9 99943.8 99943.7 99943.6 99943.4 99943.3 99943.2 99943.1 99943
@@ -51,7 +51,7 @@
45320.7 45223.9 45121.6 45011.8 44891.4 44756.4 44601 44416.6 44192 43914.2 43579.1 43217.7
42884.8 42576 42252.1 41877 41414.6 40826.5 39981.2 39080.9 43095.5 63575.1 85085.3 94263.8
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
99947.1 99946.9 99946.8 99946.7 99946.6 99946.5 99946.4 99946.2 99946.1 99946 99945.9 99945.8
99945.7 99945.5 99945.4 99945.3 99945.2 99945.1 99945 99944.8 99944.7 99944.6 99944.5 99944.4
99944.3 99944.1 99944 99943.9 99943.8 99943.7 99943.6 99943.4 99943.3 99943.2 99943.1 99943
@@ -63,7 +63,7 @@
98201.8 98105 98002.7 97892.9 97772.5 97637.5 97482.1 97297.8 97073.2 96795.3 96460.2 96098.8
95765.9 95457.1 95133.3 94758.2 94295.7 93707.6 92861.4 91950.5 95063.7 96201.5 92784 94263.8
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
99999.9 99999.8 99999.7 99999.6 99999.5 99999.4 99999.2 99999.1 99999 99998.9 99998.8 99998.7
99998.5 99998.4 99998.3 99998.2 99998.1 99998 99997.8 99997.7 99997.6 99997.5 99997.4 99997.3
99997.1 99997 99996.9 99996.8 99996.7 99996.6 99996.4 99996.3 99996.2 99996.1 99996 99995.9
@@ -75,7 +75,7 @@
100029 100030 100032 100033 100034 100035 100035 100036 100037 100037 100037 100038
100038 100038 100039 100039 100039 100040 100040 100040 100041 100083 100261 100358
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661 997.661
@@ -87,7 +87,7 @@
997.637 997.637 997.637 997.637 997.637 997.637 997.636 997.636 997.636 997.636 997.636 997.636
997.636 997.635 997.635 997.635 997.635 997.632 997.603 997.304 993.633 968.606 966.822 958.85
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
@@ -99,7 +99,7 @@
860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465 860.465
860.465 860.465 860.465 860.465 860.464 860.454 860.347 859.226 848.469 801.198 798.254 791.319
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.19439 1.19439 1.19439 1.19439 1.19439 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438 1.19438
1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19437 1.19436 1.19436 1.19436 1.19436 1.19436
1.19436 1.19436 1.19435 1.19435 1.19435 1.19435 1.19435 1.19435 1.19435 1.19435 1.19434 1.19434
@@ -111,7 +111,7 @@
1.19473 1.19475 1.19477 1.19478 1.19479 1.1948 1.19481 1.19482 1.19482 1.19483 1.19483 1.19483
1.19484 1.19484 1.19485 1.19485 1.19485 1.19482 1.19445 1.19071 1.16157 1.26379 1.28932 0.616499
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
@@ -123,7 +123,7 @@
0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996
0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.99996 0.999958 0.999932 0.999433 0.999367 0.999978
</DataArray>
- <DataArray type="Float32" Name="x^xylene_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^xylene_Water" NumberOfComponents="1" format="ascii">
2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
@@ -135,7 +135,7 @@
2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05 2.62566e-05
2.62566e-05 2.62567e-05 2.62567e-05 2.62568e-05 2.62584e-05 2.62764e-05 2.6472e-05 2.85912e-05 5.7154e-05 0.000565966 0.000633245 2.2444e-05
</DataArray>
- <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Water" NumberOfComponents="1" format="ascii">
1.37483e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37482e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05 1.37481e-05
1.37481e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.3748e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05 1.37479e-05
1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37478e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05 1.37477e-05
@@ -147,7 +147,7 @@
1.37524e-05 1.37526e-05 1.37528e-05 1.3753e-05 1.37531e-05 1.37532e-05 1.37533e-05 1.37534e-05 1.37535e-05 1.37535e-05 1.37536e-05 1.37536e-05
1.37537e-05 1.37537e-05 1.37538e-05 1.37538e-05 1.37536e-05 1.37506e-05 1.37184e-05 1.33911e-05 1.08612e-05 1.02556e-06 3.0255e-08 6.16671e-10
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -159,7 +159,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
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="x^xylene_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^xylene_NAPL" 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
@@ -171,7 +171,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 0.0275024
</DataArray>
- <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -183,7 +183,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
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="x^H2O_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Air" NumberOfComponents="1" format="ascii">
0.0282497 0.0282498 0.0282498 0.0282498 0.0282499 0.0282499 0.0282499 0.02825 0.02825 0.02825 0.0282501 0.0282501
0.0282501 0.0282502 0.0282502 0.0282502 0.0282503 0.0282503 0.0282503 0.0282504 0.0282504 0.0282504 0.0282505 0.0282505
0.0282505 0.0282506 0.0282506 0.0282506 0.0282507 0.0282507 0.0282507 0.0282508 0.0282508 0.0282508 0.0282509 0.0282509
@@ -195,7 +195,7 @@
0.0282416 0.0282412 0.0282408 0.0282404 0.0282401 0.0282399 0.0282397 0.0282395 0.0282394 0.0282393 0.0282392 0.0282391
0.028239 0.0282389 0.0282389 0.0282389 0.0282406 0.0282601 0.0284727 0.0306931 0.0625632 0.677068 0.759958 0.991549
</DataArray>
- <DataArray type="Float32" Name="x^xylene_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^xylene_Air" NumberOfComponents="1" format="ascii">
0.0098426 0.00984261 0.00984262 0.00984263 0.00984264 0.00984265 0.00984266 0.00984268 0.00984269 0.0098427 0.00984271 0.00984272
0.00984273 0.00984275 0.00984276 0.00984277 0.00984278 0.00984279 0.0098428 0.00984281 0.00984283 0.00984284 0.00984285 0.00984286
0.00984287 0.00984288 0.00984289 0.00984291 0.00984292 0.00984293 0.00984294 0.00984295 0.00984296 0.00984298 0.00984299 0.009843
@@ -207,7 +207,7 @@
0.00983977 0.0098396 0.00983947 0.00983935 0.00983925 0.00983917 0.00983909 0.00983904 0.00983899 0.00983895 0.00983892 0.00983889
0.00983886 0.00983883 0.00983881 0.00983883 0.0098394 0.0098461 0.0099194 0.0107135 0.0214161 0.211982 0.236761 0.00838334
</DataArray>
- <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Air" NumberOfComponents="1" format="ascii">
0.961908 0.961908 0.961908 0.961908 0.961908 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907 0.961907
0.961907 0.961907 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906 0.961906
diff --git a/test/references/combustion-reference.vtp b/test/references/combustion-reference.vtp
index ccdd59325bb992af6b0d0c82e6cb74cd30c39255..7d2ec9e75311dac1ac0415c27b597ed2170cf56f 100644
--- a/test/references/combustion-reference.vtp
+++ b/test/references/combustion-reference.vtp
@@ -2,8 +2,8 @@
<VTKFile type="PolyData" version="0.1" byte_order="LittleEndian">
<PolyData>
<Piece NumberOfLines="199" NumberOfPoints="200">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -22,7 +22,7 @@
0.00174423 0.00174317 0.00174206 0.00174089 0.00173966 0.00173836 0.00173696 0.00173543 0.00173365 0.00173139 0.00172811 0.00172271
0.0017129 0.00169447 0.00166027 0.00159955 0.00149836 0.00134248 0.0011336 0.001
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Nitrogen" 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
@@ -41,7 +41,7 @@
0.998256 0.998257 0.998258 0.998259 0.99826 0.998262 0.998263 0.998265 0.998266 0.998269 0.998272 0.998277
0.998287 0.998305 0.99834 0.9984 0.998502 0.998658 0.998866 0.999
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
100273 100262 100251 100240 100229 100218 100207 100196 100185 100174 100163 100152
100141 100130 100119 100107 100096 100085 100074 100063 100052 100041 100030 100019
100008 99997.1 99986.1 99975 99964 99952.9 99941.9 99930.9 99919.8 99908.8 99897.8 99886.7
@@ -60,7 +60,7 @@
98623.1 98619.1 98614.9 98610.5 98605.9 98601.1 98596.1 98590.8 98585.3 98579.5 98573.4 98567
98560.4 98553.3 98545.9 98538.1 98529.8 98521 98511.7 98502.1
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
100273 100262 100251 100240 100229 100218 100207 100196 100185 100174 100163 100152
100141 100130 100119 100107 100096 100085 100074 100063 100052 100041 100030 100019
100008 99997.1 99986.1 99975 99964 99952.9 99941.9 99930.9 99919.8 99908.8 99897.8 99886.7
@@ -79,7 +79,7 @@
100119 100115 100111 100106 100102 100097 100092 100087 100081 100075 100069 100063
100056 100049 100042 100034 100026 100018 100009 100000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044
1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044
1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044
@@ -98,7 +98,7 @@
1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044 1044
1044 1044 1044 1044 1044 1044 1044 1044
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
@@ -117,7 +117,7 @@
1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
1.679 1.679 1.679 1.679 1.679 1.679 1.679 1.679
</DataArray>
- <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51 3555.51
@@ -136,7 +136,7 @@
1.88676e-05 1.88332e-05 1.87971e-05 1.87593e-05 1.87195e-05 1.86775e-05 1.86326e-05 1.85832e-05 1.85261e-05 1.84537e-05 1.83493e-05 1.81776e-05
1.7869e-05 1.72984e-05 1.62719e-05 1.45512e-05 1.19604e-05 8.60249e-06 5.17936e-06 3.55551e-06
</DataArray>
- <DataArray type="Float32" Name="lambda_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" 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
@@ -174,7 +174,7 @@
0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35
0.35 0.35 0.35 0.35 0.35 0.35 0.35 0.35
</DataArray>
- <DataArray type="Float32" Name="x^SimpleH2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^SimpleH2O_Water" 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
@@ -193,7 +193,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 0.406912
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" 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
@@ -212,7 +212,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="x^SimpleH2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^SimpleH2O_Nitrogen" NumberOfComponents="1" format="ascii">
0.03529 0.0352982 0.0353048 0.0353116 0.0353187 0.0353262 0.035334 0.0353423 0.035351 0.0353603 0.0353701 0.0353805
0.0353917 0.0354036 0.0354164 0.0354301 0.0354449 0.0354608 0.0354781 0.0354967 0.0355169 0.0355389 0.0355628 0.0355889
0.0356173 0.0356483 0.0356822 0.0357194 0.0357601 0.0358048 0.0358539 0.0359078 0.0359671 0.0360324 0.0361043 0.0361836
@@ -231,7 +231,7 @@
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="x^N2_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Nitrogen" 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
@@ -250,7 +250,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="T_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="T_Water" NumberOfComponents="1" format="ascii">
300.01 300.012 300.013 300.015 300.016 300.018 300.02 300.022 300.024 300.027 300.03 300.033
300.036 300.04 300.044 300.049 300.054 300.06 300.067 300.074 300.081 300.09 300.1 300.11
300.122 300.135 300.149 300.165 300.183 300.202 300.223 300.247 300.273 300.302 300.335 300.37
@@ -269,7 +269,7 @@
372.789 372.788 372.787 372.786 372.784 372.783 372.782 372.78 372.779 372.777 372.775 372.774
372.772 372.77 372.768 372.766 372.763 372.761 372.758 400
</DataArray>
- <DataArray type="Float32" Name="T_solid" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="T_Solid" NumberOfComponents="1" format="ascii">
300.011 300.012 300.013 300.015 300.016 300.018 300.02 300.022 300.024 300.027 300.03 300.033
300.037 300.04 300.045 300.049 300.055 300.061 300.067 300.074 300.082 300.091 300.1 300.111
300.123 300.136 300.15 300.166 300.184 300.203 300.225 300.249 300.275 300.304 300.337 300.372
@@ -288,7 +288,7 @@
372.789 372.788 372.787 372.786 372.784 372.783 372.782 372.78 372.779 372.777 372.775 372.774
372.772 372.77 372.768 372.766 372.763 372.761 372.758 400
</DataArray>
- <DataArray type="Float32" Name="reynoldsNumber_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="reynoldsNumber_Water" NumberOfComponents="1" format="ascii">
0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878 0.888878
@@ -307,7 +307,7 @@
0.000357284 0.000356599 0.000355882 0.000355128 0.000354331 0.000353478 0.000352542 0.000351459 0.000350085 0.000348104 0.000344847 0.000338991
0.000328164 0.000308687 0.00027604 0.000226887 0.000163183 9.82459e-05 6.74467e-05 6.74467e-05
</DataArray>
- <DataArray type="Float32" Name="nusseltNumber_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="nusseltNumber_Water" NumberOfComponents="1" format="ascii">
3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375
3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375
3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375 3.23375
@@ -326,7 +326,7 @@
2.01132 2.0113 2.01129 2.01128 2.01126 2.01124 2.01123 2.01121 2.01118 2.01114 2.01108 2.01097
2.01075 2.01037 2.00969 2.00862 2.00707 2.00522 2.00416 2.00416
</DataArray>
- <DataArray type="Float32" Name="prandtlNumber_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="prandtlNumber_Water" NumberOfComponents="1" format="ascii">
1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
@@ -345,7 +345,7 @@
1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419 1.74419
</DataArray>
- <DataArray type="Float32" Name="reynoldsNumber_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="reynoldsNumber_Nitrogen" 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
@@ -364,7 +364,7 @@
20.8219 20.8219 20.8219 20.8219 20.822 20.822 20.822 20.822 20.8221 20.8221 20.8221 20.8222
20.8222 20.8222 20.8223 20.8223 20.8224 20.8224 20.8225 20.8225
</DataArray>
- <DataArray type="Float32" Name="nusseltNumber_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="nusseltNumber_Nitrogen" NumberOfComponents="1" format="ascii">
2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2
@@ -383,7 +383,7 @@
8.76243 8.76243 8.76244 8.76244 8.76245 8.76245 8.76245 8.76246 8.76247 8.76247 8.76248 8.76249
8.76249 8.7625 8.76251 8.76251 8.76252 8.76253 8.76256 8.76256
</DataArray>
- <DataArray type="Float32" Name="prandtlNumber_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="prandtlNumber_Nitrogen" NumberOfComponents="1" format="ascii">
0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545
0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545
0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545
@@ -403,8 +403,8 @@
0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545 0.983545
</DataArray>
</PointData>
- <CellData Scalars="velocity_w (m/s)">
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="velocity_Water (m/s)">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="1" format="ascii">
0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927 0.000478927
@@ -423,7 +423,7 @@
-1.92505e-07 -1.92136e-07 -1.91749e-07 -1.91343e-07 -1.90913e-07 -1.90454e-07 -1.8995e-07 -1.89366e-07 -1.88626e-07 -1.87558e-07 -1.85803e-07 -1.82648e-07
-1.76815e-07 -1.6632e-07 -1.4873e-07 -1.22247e-07 -8.79229e-08 -5.29349e-08 -3.63403e-08
</DataArray>
- <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="velocity_Nitrogen (m/s)" 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
diff --git a/test/references/evaporationatmosphere-reference.vtu b/test/references/evaporationatmosphere-reference.vtu
index 2a749f8f1e75da6b1062773da2e7e5eeaf6f40d5..182c0b072b77f02e8094d0b1efc4ce7961b303ef 100644
--- a/test/references/evaporationatmosphere-reference.vtu
+++ b/test/references/evaporationatmosphere-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="420" NumberOfPoints="465">
- <PointData Scalars="S_w" Vectors="velocity_w (m/s)">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water" Vectors="velocity_Water (m/s)">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.826778 0.826778 0.802471 0.802471 0.826778 0.802471 0.826778 0.802471 0.826777 0.80247 0.826777 0.80247
0.826776 0.802469 0.826776 0.802468 0.826775 0.802468 0.826774 0.802467 0.826774 0.802467 0.826773 0.802466
0.826773 0.802466 0.826773 0.802466 0.826773 0.802465 0.800574 0.800574 0.800574 0.800573 0.800573 0.800572
@@ -44,7 +44,7 @@
0.0001 0.0001 0.0001 0.0001 0.0001 0.0001 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05
9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 9.99972e-05 0.0001
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Nitrogen" NumberOfComponents="1" format="ascii">
0.173222 0.173222 0.197529 0.197529 0.173222 0.197529 0.173222 0.197529 0.173223 0.19753 0.173223 0.19753
0.173224 0.197531 0.173224 0.197532 0.173225 0.197532 0.173226 0.197533 0.173226 0.197533 0.173227 0.197534
0.173227 0.197534 0.173227 0.197534 0.173227 0.197535 0.199426 0.199426 0.199426 0.199427 0.199427 0.199428
@@ -85,7 +85,7 @@
0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999
0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999 0.9999
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
98451.4 98451.3 98230.6 98230.5 98450.9 98230.1 98450.4 98229.6 98449.7 98228.9 98449 98228.2
98448.2 98227.4 98447.4 98226.5 98446.5 98225.7 98445.7 98224.9 98444.9 98224.1 98444.2 98223.3
98443.6 98222.7 98443.1 98222.3 98443 98222.1 98092.4 98092.2 98091.8 98091.3 98090.6 98089.8
@@ -126,7 +126,7 @@
100004 100003 100002 100001 100000 100000 100012 100011 100010 100009 100008 100007
100006 100005 100004 100003 100002 100001 100001 100000 100000
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
100906 100906 100712 100712 100906 100712 100905 100711 100904 100710 100904 100710
100903 100709 100902 100708 100901 100707 100900 100706 100900 100706 100899 100705
100898 100704 100898 100704 100898 100704 100576 100576 100575 100575 100574 100573
@@ -167,7 +167,7 @@
100004 100003 100002 100001 100000 100000 100012 100011 100010 100009 100008 100007
100006 100005 100004 100003 100002 100001 100001 100000 100000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
@@ -208,7 +208,7 @@
998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232 998.232
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
1.1508 1.1508 1.14857 1.14857 1.1508 1.14857 1.15079 1.14856 1.15079 1.14855 1.15078 1.14855
1.15077 1.14854 1.15076 1.14853 1.15075 1.14852 1.15074 1.14851 1.15073 1.1485 1.15072 1.14849
1.15071 1.14848 1.15071 1.14848 1.15071 1.14848 1.14701 1.14701 1.147 1.147 1.14699 1.14698
@@ -249,7 +249,7 @@
1.149 1.14899 1.14898 1.14897 1.14896 1.14896 1.1491 1.14908 1.14907 1.14906 1.14905 1.14904
1.14903 1.14902 1.149 1.14899 1.14898 1.14897 1.14896 1.14896 1.14896
</DataArray>
- <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
489.117 489.117 437.596 437.596 489.116 437.596 489.115 437.595 489.114 437.594 489.113 437.593
489.112 437.592 489.111 437.591 489.109 437.59 489.108 437.588 489.107 437.587 489.106 437.586
489.105 437.586 489.104 437.585 489.104 437.585 433.75 433.75 433.749 433.749 433.748 433.746
@@ -290,7 +290,7 @@
6.41311e-10 6.41311e-10 6.41311e-10 6.41311e-10 6.41311e-10 6.41311e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10
6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41255e-10 6.41311e-10
</DataArray>
- <DataArray type="Float32" Name="lambda_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" NumberOfComponents="1" format="ascii">
483.894 483.895 710.469 710.47 483.896 710.472 483.899 710.476 483.903 710.48 483.907 710.486
483.912 710.492 483.917 710.498 483.922 710.505 483.926 710.511 483.931 710.517 483.935 710.522
483.938 710.525 483.94 710.528 483.941 710.528 730.569 730.57 730.573 730.577 730.583 730.589
@@ -372,7 +372,7 @@
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" 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
0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
@@ -413,7 +413,7 @@
0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
1.22764e-05 1.22764e-05 1.22735e-05 1.22735e-05 1.22764e-05 1.22735e-05 1.22764e-05 1.22735e-05 1.22763e-05 1.22734e-05 1.22763e-05 1.22734e-05
1.22763e-05 1.22734e-05 1.22763e-05 1.22734e-05 1.22763e-05 1.22733e-05 1.22762e-05 1.22733e-05 1.22762e-05 1.22733e-05 1.22762e-05 1.22733e-05
1.22762e-05 1.22733e-05 1.22762e-05 1.22732e-05 1.22762e-05 1.22732e-05 1.22695e-05 1.22695e-05 1.22695e-05 1.22695e-05 1.22694e-05 1.22694e-05
@@ -454,7 +454,7 @@
1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05
1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05 1.22526e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Nitrogen" NumberOfComponents="1" format="ascii">
0.0229976 0.0229976 0.0230419 0.0230419 0.0229977 0.023042 0.0229978 0.0230421 0.022998 0.0230423 0.0229982 0.0230424
0.0229983 0.0230426 0.0229985 0.0230428 0.0229987 0.023043 0.0229989 0.0230432 0.0229991 0.0230434 0.0229993 0.0230435
0.0229994 0.0230437 0.0229995 0.0230438 0.0229995 0.0230438 0.023073 0.0230731 0.0230732 0.0230733 0.0230735 0.0230736
@@ -495,7 +495,7 @@
0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059
0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059 0.00232059
</DataArray>
- <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Nitrogen" NumberOfComponents="1" format="ascii">
0.977002 0.977002 0.976958 0.976958 0.977002 0.976958 0.977002 0.976958 0.977002 0.976958 0.977002 0.976958
0.977002 0.976957 0.977001 0.976957 0.977001 0.976957 0.977001 0.976957 0.977001 0.976957 0.977001 0.976956
0.977001 0.976956 0.977001 0.976956 0.977 0.976956 0.976927 0.976927 0.976927 0.976927 0.976927 0.976926
@@ -536,7 +536,7 @@
0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679
0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679 0.997679
</DataArray>
- <DataArray type="Float32" Name="T_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="T_Water" NumberOfComponents="1" format="ascii">
293 293 293 293 293 293 293 293 293 293 293 293
293 293 293 293 293 293 293 293 293 293 293 293
293 293 293 293 293 293 293 293 293 293 293 293
@@ -577,7 +577,7 @@
293 293 293 293 293 293 293 293 293 293 293 293
293 293 293 293 293 293 293 293 293
</DataArray>
- <DataArray type="Float32" Name="T_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="T_Nitrogen" NumberOfComponents="1" format="ascii">
293 293 293 293 293 293 293 293 293 293 293 293
293 293 293 293 293 293 293 293 293 293 293 293
293 293 293 293 293 293 293 293 293 293 293 293
@@ -659,7 +659,7 @@
293 293 293 293 293 293 293 293 293 293 293 293
293 293 293 293 293 293 293 293 293
</DataArray>
- <DataArray type="Float32" Name="reynoldsNumber_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="reynoldsNumber_Water" NumberOfComponents="1" format="ascii">
0.00210154 0.0021015 0.00235722 0.00235713 0.0021014 0.00235694 0.00210129 0.00235674 0.00210121 0.00235658 0.00210114 0.00235647
0.0021011 0.00235638 0.00210106 0.00235631 0.00210102 0.00235624 0.00210098 0.00235616 0.00210091 0.00235603 0.00210081 0.00235585
0.00210065 0.00235557 0.00210049 0.00235527 0.00210042 0.00235512 0.0026347 0.00263452 0.00263414 0.00263377 0.00263347 0.00263325
@@ -700,7 +700,7 @@
6.22631e-08 6.22639e-08 6.22658e-08 6.22706e-08 6.22861e-08 6.23236e-08 6.23051e-08 6.22685e-08 6.2261e-08 6.22604e-08 6.22601e-08 6.226e-08
6.226e-08 6.226e-08 6.226e-08 6.22602e-08 6.22606e-08 6.22617e-08 6.22643e-08 6.22757e-08 6.23212e-08
</DataArray>
- <DataArray type="Float32" Name="nusseltNumber_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="nusseltNumber_Water" NumberOfComponents="1" format="ascii">
2.05213 2.05213 2.05585 2.05585 2.05213 2.05584 2.05213 2.05584 2.05213 2.05584 2.05212 2.05584
2.05212 2.05584 2.05212 2.05583 2.05212 2.05583 2.05212 2.05583 2.05212 2.05583 2.05212 2.05583
2.05212 2.05582 2.05211 2.05582 2.05211 2.05582 2.0597 2.0597 2.0597 2.05969 2.05969 2.05968
@@ -741,7 +741,7 @@
2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001
2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001 2.0001
</DataArray>
- <DataArray type="Float32" Name="prandtlNumber_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="prandtlNumber_Water" NumberOfComponents="1" format="ascii">
7.02294 7.02294 7.02295 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295
7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02294 7.02295
7.02294 7.02295 7.02294 7.02295 7.02294 7.02295 7.02295 7.02295 7.02295 7.02295 7.02295 7.02295
@@ -782,7 +782,7 @@
7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293
7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293 7.02293
</DataArray>
- <DataArray type="Float32" Name="reynoldsNumber_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="reynoldsNumber_Nitrogen" NumberOfComponents="1" format="ascii">
0.000138994 0.000138997 0.000155125 0.000155134 0.000139004 0.000155153 0.000139012 0.000155172 0.000139019 0.000155188 0.000139023 0.000155199
0.000139027 0.000155208 0.000139029 0.000155214 0.000139032 0.000155221 0.000139035 0.000155228 0.000139039 0.00015524 0.000139047 0.000155257
0.000139057 0.000155284 0.000139069 0.000155313 0.000139074 0.000155327 0.000172335 0.000172355 0.000172396 0.000172438 0.00017247 0.000172493
@@ -823,7 +823,7 @@
488.125 480.112 460.251 410.541 323.864 408.653 741.767 611.777 517.472 502.51 496.772 494.578
493.522 492.611 491.006 487.235 477.855 454.201 395.929 222.451 337.512
</DataArray>
- <DataArray type="Float32" Name="nusseltNumber_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="nusseltNumber_Nitrogen" NumberOfComponents="1" format="ascii">
2.00474 2.00474 2.00506 2.00506 2.00474 2.00506 2.00474 2.00506 2.00474 2.00506 2.00474 2.00506
2.00474 2.00506 2.00474 2.00506 2.00474 2.00506 2.00474 2.00506 2.00474 2.00507 2.00474 2.00507
2.00474 2.00507 2.00474 2.00507 2.00474 2.00507 2.00539 2.00539 2.00539 2.00539 2.0054 2.0054
@@ -864,7 +864,7 @@
41.9185 41.524 40.5347 37.9807 33.2085 37.8813 53.3116 47.71 43.3416 42.6202 42.3412 42.2343
42.1827 42.1382 42.0597 41.8748 41.4124 40.23 37.2067 26.9113 33.9911
</DataArray>
- <DataArray type="Float32" Name="prandtlNumber_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="prandtlNumber_Nitrogen" NumberOfComponents="1" format="ascii">
0.701122 0.701122 0.701142 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142
0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701122 0.701142
0.701122 0.701142 0.701122 0.701142 0.701122 0.701142 0.701156 0.701156 0.701156 0.701156 0.701156 0.701156
@@ -905,7 +905,7 @@
0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811
0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811 0.691811
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" format="ascii">
8.67434e-09 -2.1172e-05 0 1.6596e-08 -2.11716e-05 0 8.04171e-09 -2.37478e-05 0 1.52964e-08 -2.37469e-05 0
3.07023e-08 -2.11705e-05 0 2.80863e-08 -2.3745e-05 0 4.12191e-08 -2.11694e-05 0 3.74271e-08 -2.3743e-05 0
4.83799e-08 -2.11686e-05 0 4.36927e-08 -2.37414e-05 0 5.29412e-08 -2.11679e-05 0 4.76527e-08 -2.37402e-05 0
@@ -1024,7 +1024,7 @@
8.06468e-15 -6.27244e-12 0 7.66374e-15 -6.27255e-12 0 6.66777e-15 -6.27281e-12 0 3.3973e-15 -6.27397e-12 0
8.35171e-16 -6.27855e-12 0
</DataArray>
- <DataArray type="Float32" Name="velocity_n (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Nitrogen (m/s)" NumberOfComponents="3" format="ascii">
8.57643e-09 2.10005e-05 0 1.64083e-08 2.1001e-05 0 1.30484e-08 2.34834e-05 0 2.4819e-08 2.34847e-05 0
3.0354e-08 2.10022e-05 0 4.5569e-08 2.34876e-05 0 4.07501e-08 2.10035e-05 0 6.07216e-08 2.34907e-05 0
4.78284e-08 2.10046e-05 0 7.08847e-08 2.34932e-05 0 5.23371e-08 2.10055e-05 0 7.7308e-08 2.34951e-05 0
diff --git a/test/references/fracturebox2p-reference.vtu b/test/references/fracturebox2p-reference.vtu
index c863d3de6508b980e219ad30c9fee88cda1ef827..ca40c0131a0b3de7da190fc45f1090a7c25ab568 100644
--- a/test/references/fracturebox2p-reference.vtu
+++ b/test/references/fracturebox2p-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1670" NumberOfPoints="911">
- <PointData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_liqTrichloroethene">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" NumberOfComponents="1" format="ascii">
0.778389 0.771142 0.770769 0.835725 0.822641 0.836217 0.822475 0.691403 0.691088 0.718574 0.691575 0.719125
0.718643 0.71905 0.835559 0.836051 0.822441 0.691188 0.822277 0.762152 0.798585 0.794582 0.789227 0.759674
0.753064 0.748061 0.779304 0.766754 0.786095 0.778296 0.790016 0.807905 0.805752 0.741771 0.779231 0.778465
@@ -81,7 +81,7 @@
0.606908 0.668479 0.668571 0.596279 0.641588 0.620107 0.597574 0.667041 0.586604 0.680184 0.597205 0.667403
0.667498 0.597236 0.680296 0.586645 0.605886 0.585055 0.647215 0.614923 0.681927 0.601 0.607809
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
0.221611 0.228857 0.229231 0.164275 0.177359 0.163783 0.177525 0.308597 0.308912 0.281426 0.308425 0.280875
0.281357 0.28095 0.164441 0.163949 0.177559 0.308812 0.177723 0.237848 0.201415 0.205418 0.210773 0.240326
0.246936 0.251939 0.220696 0.233246 0.213905 0.221704 0.209984 0.192095 0.194248 0.258229 0.220769 0.221535
@@ -159,7 +159,7 @@
0.393092 0.331521 0.331429 0.403721 0.358412 0.379893 0.402426 0.332959 0.413396 0.319816 0.402795 0.332597
0.332502 0.402764 0.319704 0.413355 0.394114 0.414945 0.352785 0.385077 0.318073 0.399 0.392191
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
100514 100501 100500 100610 100592 100610 100592 100409 100408 100431 100409 100431
100431 100431 100610 100610 100592 100408 100592 100486 100552 100545 100535 100481
100472 100464 100516 100494 100528 100514 100536 100569 100565 100456 100516 100514
@@ -237,7 +237,7 @@
100368 100400 100400 100362 100387 100376 100362 100399 100356 100404 100362 100399
100399 100362 100404 100356 100367 100355 100390 100373 100405 100364 100368
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
100096 100088 100088 100138 100135 100138 100135 100041 100041 100050 100041 100050
100050 100050 100138 100138 100135 100041 100135 100079 100118 100114 100108 100076
100071 100067 100097 100084 100104 100096 100109 100126 100124 100062 100097 100096
@@ -393,7 +393,7 @@
332.447 356.77 356.81 328.664 345.58 337.295 329.119 356.145 325.304 361.976 328.989 356.302
356.343 329 362.026 325.319 332.079 324.774 347.841 335.37 362.77 330.332 332.773
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -471,7 +471,7 @@
1000 1000 1000 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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -549,7 +549,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" NumberOfComponents="1" format="ascii">
3.49546 3.96948 3.99501 1.00467 1.40006 0.9915 1.40567 12.3886 12.4353 8.78542 12.363 8.72094
8.77732 8.72964 1.00914 0.995942 1.40681 12.4205 1.41237 4.61613 2.37957 2.57797 2.86055 4.8062
5.33908 5.76827 3.43848 4.27685 3.03521 3.50124 2.81765 1.95822 2.05066 6.3404 3.443 3.49067
@@ -627,7 +627,7 @@
29.8913 16.1262 16.1099 32.8917 21.4237 26.4373 32.5154 16.3838 35.8 14.1332 32.6225 16.3186
16.3017 32.6133 14.115 35.7872 30.1711 36.2817 20.2285 27.7588 13.8518 31.5343 29.646
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1357.4 1338.46 1337.48 1504.94 1471.78 1506.17 1471.36 1129.2 1128.38 1200.41 1129.65 1201.85
1200.59 1201.66 1504.52 1505.76 1471.27 1128.64 1470.86 1314.9 1409.95 1399.57 1385.66 1308.4
1291.05 1277.91 1359.79 1326.96 1377.5 1357.16 1387.71 1434.02 1428.47 1261.38 1359.6 1357.6
diff --git a/test/references/fracturebox2p_gravity-reference.vtu b/test/references/fracturebox2p_gravity-reference.vtu
index 559a51f516f24f01a0567ff28ac36ff14506cf4c..ce9d13822ae60e52f02d4ebeb0c65acaca6c78cd 100644
--- a/test/references/fracturebox2p_gravity-reference.vtu
+++ b/test/references/fracturebox2p_gravity-reference.vtu
@@ -159,7 +159,7 @@
0 84.4586 0 0 0 668.623 0 0 0 111.917 0 419.154
0 273.647 0 0 0 0 0 370.189 0.0184311 0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
0.985911 0.991023 0.994774 0.064309 0.0710217 0.0721382 0.0628829 0.0724153 0.301859 0.151616 1 1
1 0.0666443 0.881175 0.797098 0.933311 1 0.998527 0.996558 0.940496 0.937048 0.974003 0.998074
0.998601 0.999671 0.969717 0.932984 0.99032 0.996164 0.991409 0.903548 0.884529 0.999599 0.999887 0.353607
@@ -237,7 +237,7 @@
1 0.994536 1 1 1 0.0829154 1 1 1 0.988303 1 0.22048
1 0.587802 1 1 1 1 1 0.302348 0.999999 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
96470.1 97035.4 95856.9 101208 99844.3 99879 101159 100518 99467.2 99491.6 90727.9 90713.4
91690.9 100593 90685 91665.9 91664.8 91705.8 90685.1 96239.1 96291.3 96986.2 95941.4 95008.6
95625.5 94553.3 97502.3 97980.1 94112.1 93653.1 93183 95654.6 96822.4 95549.2 92797 98376.6
@@ -315,7 +315,7 @@
92641.2 98769.9 92360 98703.4 90663.2 100430 96209.1 94856.7 92406.9 98675.8 91429.3 99670.2
91474.6 99599.3 92466.5 98592.5 94554.7 94030 91319.4 99765.8 97016 93943 93538.6
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -393,7 +393,7 @@
1000 1000 1000 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="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" NumberOfComponents="1" format="ascii">
982.073 992.479 997.391 0.00178831 0.00576332 0.00674626 0.00129942 0.00700648 11.4152 0.7016 1000 1000
1000 0.00283248 552.044 375.292 736.091 1000 999.788 998.855 774.908 756.117 943.697 999.638
999.809 999.989 925.917 734.358 991.293 998.582 993.095 610.902 560.487 999.984 999.999 20.4
@@ -471,7 +471,7 @@
1000 997.152 1000 1000 1000 0.0225595 1000 1000 1000 987.449 1000 3.42512
1000 124.807 1000 1000 1000 1000 1000 11.484 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" NumberOfComponents="1" format="ascii">
0.0140886 0.00897702 0.00522575 0.935691 0.928978 0.927862 0.937117 0.927585 0.698141 0.848384 0 0
0 0.933356 0.118825 0.202902 0.0666888 0 0.00147278 0.00344235 0.0595043 0.0629519 0.0259972 0.0019264
0.00139872 0.000329274 0.0302833 0.0670164 0.00968001 0.00383611 0.00859094 0.0964522 0.115471 0.000401127 0.000113032 0.646393
@@ -549,7 +549,7 @@
0 0.0054639 0 -0 0 0.917085 -0 -3.22299e-44 0 0.0116972 0 0.77952
0 0.412198 0 -0 0 0 0 0.697652 8.18167e-07 0 0
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
96586.6 97141 95939.1 102047 100600 100624 102022 101261 99837.6 99979.8 90727.9 90713.4
91690.9 101398 90873.8 91883 91829.2 91705.8 90715.2 96300.7 96451.5 97148.5 96074.5 95046.9
95654.3 94560.5 97640 98144.7 94219.5 93719.9 93287.2 95834 97009.8 95558 92799.5 98724.1
@@ -627,7 +627,7 @@
92641.2 98854.4 92360 98703.4 90663.2 101099 96209.1 94856.7 92406.9 98787.7 91429.3 100089
91474.6 99872.9 92466.5 98592.5 94554.7 94030 91319.4 100136 97016 93943 93538.6
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -705,7 +705,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" NumberOfComponents="1" format="ascii">
0.826486 0.350197 0.124847 1746.73 1738.41 1736.77 1748.14 1736.36 1146.82 1536.59 0 0
0 1744.15 47.128 128.071 15.8525 0 0.0111541 0.056322 12.7756 14.2134 2.65247 0.0186145
0.0101085 0.000640271 3.54541 16.0002 0.404308 0.069243 0.322053 31.826 44.6589 0.000933045 8.32691e-05 1012.5
diff --git a/test/references/fracturecc2p-reference.vtu b/test/references/fracturecc2p-reference.vtu
index 91a85d2b0e68a8955591cf46498d28520adeff4e..18a00318053f2c8e34483407909aafc76b7582ec 100644
--- a/test/references/fracturecc2p-reference.vtu
+++ b/test/references/fracturecc2p-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1670" NumberOfPoints="911">
- <CellData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_liqTrichloroethene">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" NumberOfComponents="1" format="ascii">
0.778646 0.834371 0.830443 0.713123 0.721337 0.72128 0.833145 0.713475 0.829149 0.774262 0.799415 0.760491
0.778773 0.789675 0.809597 0.755067 0.787629 0.781259 0.795456 0.766771 0.746669 0.814005 0.764422 0.753679
0.809423 0.747969 0.767384 0.799651 0.770311 0.836065 0.787679 0.709736 0.781657 0.832833 0.716202 0.776503
@@ -145,7 +145,7 @@
0.673126 0.639305 0.637896 0.641723 0.635404 0.601482 0.681793 0.648165 0.629384 0.611466 0.62567 0.651793
0.633841 0.64348
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
0.221354 0.165629 0.169557 0.286877 0.278663 0.27872 0.166855 0.286525 0.170851 0.225738 0.200585 0.239509
0.221227 0.210325 0.190403 0.244933 0.212371 0.218741 0.204544 0.233229 0.253331 0.185995 0.235578 0.246322
0.190577 0.252031 0.232617 0.200349 0.229689 0.163935 0.212321 0.290264 0.218343 0.167167 0.283798 0.223497
@@ -287,7 +287,7 @@
0.326874 0.360695 0.362104 0.358277 0.364596 0.398518 0.318207 0.351835 0.370616 0.388534 0.37433 0.348207
0.366159 0.35652
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
100524 100629 100623 100433 100441 100441 100626 100434 100620 100516 100567 100491
100524 100548 100587 100482 100544 100528 100559 100502 100470 100596 100498 100480
100588 100472 100501 100569 100509 100631 100544 100431 100529 100626 100437 100518
@@ -429,7 +429,7 @@
100412 100395 100394 100396 100393 100371 100416 100400 100389 100377 100387 100402
100392 100397
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
100106 100158 100158 100055 100059 100058 100157 100056 100156 100100 100132 100085
100105 100121 100143 100080 100119 100108 100127 100093 100073 100147 100090 100078
100143 100074 100091 100134 100096 100159 100119 100055 100108 100158 100057 100101
@@ -713,7 +713,7 @@
358.81 344.674 344.118 345.634 343.141 330.503 362.709 348.226 340.809 334.102 339.391 349.71
342.531 346.336
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -855,7 +855,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -997,7 +997,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" NumberOfComponents="1" format="ascii">
3.4794 1.04155 1.15369 9.44122 8.46526 8.47171 1.07573 9.39792 1.19233 3.76039 2.33979 4.74293
3.47142 2.83613 1.88763 5.17358 2.94878 3.31886 2.53376 4.27564 5.89174 1.71176 4.44658 5.28794
1.89478 5.77635 4.23178 2.32855 4.0265 0.995555 2.946 9.86524 3.29483 1.08454 9.06681 3.61486
@@ -1139,7 +1139,7 @@
15.3134 21.9221 22.2339 21.3944 22.7925 31.3979 13.8733 20.0313 24.1822 28.665 25.0683 19.2907
23.1479 21.0164
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1358.08 1501.52 1491.6 1186.1 1207.66 1207.52 1498.43 1187.02 1488.32 1346.62 1412.09 1310.55
1358.41 1386.82 1438.38 1296.31 1381.5 1364.9 1401.84 1327.01 1274.25 1449.7 1320.85 1292.66
1437.93 1277.67 1328.62 1412.71 1336.28 1505.79 1381.63 1177.21 1365.94 1497.64 1194.18 1352.48
diff --git a/test/references/fracturecc2p_gravity-reference.vtu b/test/references/fracturecc2p_gravity-reference.vtu
index 734246274ca2e8e01d9fee5eb44947c8d685b6aa..44f8007a269b34473882a8861fdb6c8adca30187 100644
--- a/test/references/fracturecc2p_gravity-reference.vtu
+++ b/test/references/fracturecc2p_gravity-reference.vtu
@@ -287,7 +287,7 @@
0 0 0 0 0 0 0 0 517.957 0 0 65.5156
0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
0.983346 0.0694469 0.0654786 0.160098 1 0.0915447 0.881106 1 0.999335 0.991878 0.97976 1
0.779975 1 0.94747 1 1 0.384588 0.963715 1 1 0.937967 1 0.997906
0.97496 1 0.213893 1 0.99959 0.71777 1 1 0.0649224 0.751339 1 0.0673584
@@ -429,7 +429,7 @@
1 1 1 1 1 1 1 1 0.132562 1 1 0.996259
1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
96196.7 100767 101134 99961 90881.1 100287 91223.3 91179.8 90920.5 96204.8 96256.4 94995.6
97399 93454.5 96120.2 95113 93018.3 97869.8 96455.6 92397 97070.4 93850.4 92860.3 97264.2
93640 93861.5 98485.7 92453.2 95511.3 95162.6 90619.2 95021.9 100933 94675.5 94569.4 100552
@@ -571,7 +571,7 @@
94315.5 94936.1 96008.1 94411.1 96531.4 94384.3 96391.8 91620.5 99315.9 93455.4 92436.3 98524.7
95658.8 95284.2
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -713,7 +713,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" NumberOfComponents="1" format="ascii">
975.367 0.00454761 0.00227112 0.896514 1000 0.0458381 551.873 1000 999.957 993.81 964.486 1000
346.097 1000 813.248 1000 1000 27.6321 898.294 1000 1000 761.102 1000 999.573
947.412 1000 3.03454 1000 999.983 255.137 1000 1000 0.00203189 301.457 1000 0.00321862
@@ -855,7 +855,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 0.372036 1000 1000 998.651
1000 1000
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" NumberOfComponents="1" format="ascii">
0.0166543 0.930553 0.934521 0.839902 0 0.908455 0.118894 0 0.000664982 0.0081222 0.0202395 0
0.220025 0 0.0525296 0 0 0.615412 0.0362854 0 0 0.0620329 0 0.00209423
0.0250403 0 0.786107 0 0.000409858 0.28223 0 0 0.935078 0.248661 0 0.932642
@@ -997,7 +997,7 @@
0 0 0 0 0 0 0 0 0.867438 0 0 0.00374064
0 0
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
96317.5 101539 101955 100438 90881.1 100914 91412 91179.8 90934.8 96307.1 96382.5 94995.6
97621.1 93454.5 96275.9 95113 93018.3 98205.3 96598.9 92397 97070.4 94012.2 92860.3 97305.3
93772 93861.5 98909.9 92453.2 95520.3 95401.9 90619.2 95021.9 101762 94905.7 94569.4 101348
@@ -1139,7 +1139,7 @@
94315.5 94936.1 96008.1 94411.1 96531.4 94384.3 96391.8 91620.5 99833.8 93455.4 92436.3 98590.2
95658.8 95284.2
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -1281,7 +1281,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1.13658 1740.61 1745.48 1515.43 0 1698.62 47.179 0 0.00244733 0.289391 1.64736 0
148.812 0 10.0877 0 0 933.574 4.99906 0 0 13.8232 0 0.0218297
2.46986 0 1377.54 0 0.00097217 235.32 0 0 1746.08 186.514 0 1743.29
diff --git a/test/references/fractureccmpfa2p-reference.vtu b/test/references/fractureccmpfa2p-reference.vtu
index 384b36223c45577fff95b666684ebab1c5f1def7..ad9a45da0e0bc5736beef693c63c41e22cb2da74 100644
--- a/test/references/fractureccmpfa2p-reference.vtu
+++ b/test/references/fractureccmpfa2p-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1670" NumberOfPoints="911">
- <CellData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_liqTrichloroethene">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" NumberOfComponents="1" format="ascii">
0.778061 0.833388 0.829036 0.707431 0.716741 0.716748 0.833148 0.707455 0.828789 0.772948 0.798128 0.758793
0.777067 0.788852 0.807821 0.753149 0.786494 0.779483 0.794014 0.765253 0.744935 0.813829 0.762288 0.752574
0.808729 0.745278 0.765482 0.798811 0.769107 0.833495 0.787638 0.70813 0.778246 0.830795 0.715073 0.772905
@@ -145,7 +145,7 @@
0.671501 0.638354 0.637066 0.640953 0.634507 0.600968 0.679418 0.64707 0.628694 0.610802 0.625715 0.650308
0.632679 0.642851
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
0.221939 0.166612 0.170964 0.292569 0.283259 0.283252 0.166852 0.292545 0.171211 0.227052 0.201872 0.241207
0.222933 0.211148 0.192179 0.246851 0.213506 0.220517 0.205986 0.234747 0.255065 0.186171 0.237712 0.247426
0.191271 0.254722 0.234518 0.201189 0.230893 0.166505 0.212362 0.29187 0.221754 0.169205 0.284927 0.227095
@@ -287,7 +287,7 @@
0.328499 0.361646 0.362934 0.359047 0.365493 0.399032 0.320582 0.35293 0.371306 0.389198 0.374285 0.349692
0.367321 0.357149
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
100511 100609 100603 100422 100430 100430 100608 100422 100602 100502 100550 100478
100510 100532 100568 100470 100528 100514 100542 100489 100460 100578 100484 100470
100570 100460 100489 100551 100495 100609 100530 100423 100512 100605 100429 100502
@@ -429,7 +429,7 @@
100404 100388 100387 100389 100386 100365 100408 100393 100382 100371 100380 100394
100385 100390
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
100093 100139 100139 100047 100050 100050 100139 100047 100139 100087 100116 100074
100092 100106 100125 100069 100103 100095 100111 100080 100064 100130 100077 100069
100126 100064 100080 100117 100084 100139 100105 100048 100093 100139 100050 100088
@@ -713,7 +713,7 @@
358.093 344.299 343.792 345.327 342.791 330.32 361.628 347.782 340.544 333.86 339.408 349.101
342.08 346.084
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -855,7 +855,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -997,7 +997,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" NumberOfComponents="1" format="ascii">
3.516 1.0689 1.19574 10.1611 9.00231 9.00152 1.07564 10.1579 1.20324 3.84755 2.40168 4.87503
3.57887 2.88112 1.96177 5.33197 3.01255 3.42737 2.60701 4.38556 6.04802 1.71856 4.60584 5.38013
1.92363 6.01689 4.36884 2.36868 4.11007 1.06589 2.94827 10.0707 3.50442 1.14332 9.20294 3.85038
@@ -1139,7 +1139,7 @@
15.5944 22.1323 22.4189 21.5616 22.996 31.5434 14.2582 20.2587 24.3452 28.8414 25.0575 19.5914
23.4146 21.1513
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1356.55 1499.04 1488.04 1171.16 1195.59 1195.61 1498.44 1171.23 1487.41 1343.18 1408.76 1306.09
1353.95 1384.68 1433.8 1291.27 1378.54 1360.26 1398.1 1323.03 1269.69 1449.25 1315.26 1289.76
1436.14 1270.59 1323.63 1410.53 1333.13 1499.31 1381.52 1173 1357.03 1492.49 1191.21 1343.07
diff --git a/test/references/fractureccmpfa2p_gravity-reference.vtu b/test/references/fractureccmpfa2p_gravity-reference.vtu
index a47d62de5fb86fe852274f4abffa4281fb240079..4753f3316a20bda8ada0823216ff96b97760bbe6 100644
--- a/test/references/fractureccmpfa2p_gravity-reference.vtu
+++ b/test/references/fractureccmpfa2p_gravity-reference.vtu
@@ -287,7 +287,7 @@
0 0 0 0 0 0 0 0 77.6412 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
1 0.0671304 0.0637442 0.122357 1 0.0765336 0.854272 1 0.997466 1 0.988668 1
0.998907 1 0.959554 1 1 0.980272 0.990862 1 1 0.94712 1 1
0.993477 1 0.661825 1 1 0.72274 1 1 0.06482 0.754 1 0.0688473
@@ -429,7 +429,7 @@
1 1 1 1 1 1 1 1 0.995225 1 1 1
1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
96414.9 100223 100639 99743.7 91012.9 100091 91300.9 91344.6 90974 96337.8 96367.3 95024.3
97466.4 93611.9 96217.2 95204.4 93173.8 97912.9 96589.3 92631.8 97070.2 94006.4 93093.9 97289.8
93781.7 94028.6 98429.3 92653.5 95662.7 95112.6 91009.8 95085.6 100316 94648.2 94623.1 99983.8
@@ -571,7 +571,7 @@
94492.2 94988.5 96031.2 94553 96466.8 94522 96379.3 91941.1 99082.7 93560.1 92532.7 98488.1
95720.6 95298.9
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -713,7 +713,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" NumberOfComponents="1" format="ascii">
1000 0.00309175 0.00158213 0.248711 1000 0.0117062 488.633 1000 999.376 1000 988.194 1000
999.883 1000 877.642 1000 1000 966.141 992.214 1000 1000 811.324 1000 1000
995.967 1000 190.432 1000 1000 261.615 1000 1000 0.00198974 305.398 1000 0.00413428
@@ -855,7 +855,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 997.816 1000 1000 1000
1000 1000
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1.21917e-07 0.93287 0.936256 0.877643 0 0.923466 0.145728 0 0.00253412 1.32125e-11 0.0113316 0
0.00109315 0 0.040446 0 0 0.0197279 0.0091384 0 0 0.0528803 0 2.0299e-38
0.0065235 0 0.338175 0 1.52847e-10 0.27726 0 0 0.93518 0.246 0 0.931153
@@ -997,7 +997,7 @@
0 0 0 0 0 0 0 0 0.00477465 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
96414.9 101022 101487 100281 91012.9 100801 91499.6 91344.6 91022.3 96337.8 96478.5 95024.3
97489.3 93611.9 96364 95204.4 93173.8 98038.3 96695.4 92631.8 97070.2 94162.3 93093.9 97289.8
93874.8 94028.6 98683.4 92653.5 95662.7 95350.6 91009.8 95085.6 101147 94877.7 94623.1 100762
@@ -1139,7 +1139,7 @@
94492.2 94988.5 96031.2 94553 96466.8 94522 96379.3 91941.1 99160.4 93560.1 92532.7 98488.1
95720.6 95298.9
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -1281,7 +1281,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1.81882e-10 1743.57 1747.3 1615.37 0 1729.67 69.105 0 0.0314033 4.95689e-18 0.545847 0
0.0063167 0 6.14345 0 0 1.56901 0.362292 0 0 10.2157 0 0
0.19056 0 327.049 0 5.29318e-16 227.789 0 0 1746.19 182.854 0 1741.4
diff --git a/test/references/infiltration3pbox-reference.vtu b/test/references/infiltration3pbox-reference.vtu
index 5ccc1ca0962831ff9b7a3223818e146044f7e965..c232d691ce5195ab581f2c7ff81d364e2fd3f8bc 100644
--- a/test/references/infiltration3pbox-reference.vtu
+++ b/test/references/infiltration3pbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="500" NumberOfPoints="561">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.97 0.970013 0.97 0.970015 0.970023 0.970025 0.970032 0.970035 0.970042 0.970046 0.970052 0.970056
0.970061 0.970066 0.970071 0.970077 0.970081 0.970087 0.970091 0.970098 0.970101 0.970109 0.970111 0.97012
0.970122 0.970131 0.970133 0.970143 0.970144 0.970155 0.970156 0.970167 0.970167 0.970179 0.970177 0.97019
@@ -52,7 +52,7 @@
0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_mesitylene" 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
@@ -101,7 +101,7 @@
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="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.03 0.0299868 0.03 0.0299851 0.0299769 0.0299747 0.0299675 0.0299647 0.0299579 0.0299544 0.0299483 0.0299441
0.0299386 0.0299337 0.0299288 0.0299232 0.029919 0.0299127 0.029909 0.029902 0.0298989 0.0298912 0.0298886 0.0298801
0.029878 0.0298688 0.0298672 0.0298572 0.029856 0.0298453 0.0298444 0.0298329 0.0298329 0.0298206 0.0298233 0.0298103
@@ -150,7 +150,7 @@
0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
148117 148134 138307 138327 148134 138327 148132 138324 148130 138323 148129 138322
148128 138321 148128 138321 148128 138321 148129 138321 148130 138323 148132 138325
148136 138328 148141 138333 148147 138340 148156 138349 148164 138357 148163 138356
@@ -199,7 +199,7 @@
87571.1 87570.7 87570.4 87570.2 87570 87569.9 87569.9 87569.9 87569.9 87570 87570.1 87570.4
87570.7 87571.2 87571.8 87572.7 87573.8 87575.3 87578.2 87578.1 87622.4
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_mesitylene" NumberOfComponents="1" format="ascii">
148117 148134 138307 138327 148134 138327 148132 138324 148130 138323 148129 138322
148128 138321 148128 138321 148128 138321 148129 138321 148130 138323 148132 138325
148136 138328 148141 138333 148147 138340 148156 138349 148164 138357 148163 138356
@@ -248,7 +248,7 @@
87571.1 87570.7 87570.4 87570.2 87570 87569.9 87569.9 87569.9 87569.9 87570 87570.1 87570.4
87570.7 87571.2 87571.8 87572.7 87573.8 87575.3 87578.2 87578.1 87622.4
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
149050 149067 139240 139260 149067 139259 149064 139257 149063 139256 149062 139254
149061 139254 149060 139253 149060 139253 149061 139253 149062 139255 149064 139257
149068 139260 149072 139265 149079 139272 149087 139280 149096 139288 149094 139287
@@ -297,7 +297,7 @@
99948.7 99948.3 99948 99947.8 99947.6 99947.5 99947.5 99947.4 99947.5 99947.6 99947.7 99947.9
99948.3 99948.8 99949.4 99950.3 99951.4 99952.9 99955.8 99955.7 100000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
999.724 999.724 999.719 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719
999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719
999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719 999.724 999.719
@@ -346,7 +346,7 @@
999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695
999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_mesitylene" NumberOfComponents="1" format="ascii">
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
@@ -395,7 +395,7 @@
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.83349 1.8337 1.71282 1.71306 1.8337 1.71306 1.83367 1.71303 1.83365 1.71301 1.83364 1.713
1.83363 1.71298 1.83362 1.71298 1.83362 1.71298 1.83362 1.71298 1.83364 1.713 1.83367 1.71303
1.83371 1.71307 1.83377 1.71313 1.83385 1.71321 1.83395 1.71331 1.83405 1.71341 1.83404 1.7134
diff --git a/test/references/infiltration3pcc-reference.vtu b/test/references/infiltration3pcc-reference.vtu
index b6e9cc957fdda3dc36e8b3e497c35d126071ab88..cd0d5f20fbe1a9876770ad371e245c756b214e84 100644
--- a/test/references/infiltration3pcc-reference.vtu
+++ b/test/references/infiltration3pcc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="500" NumberOfPoints="561">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
@@ -47,7 +47,7 @@
0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_mesitylene" 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
@@ -91,7 +91,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="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.0299999 0.0299997 0.0299996 0.0299996 0.0299996 0.0299997 0.0299997 0.0299997 0.0299997 0.0299998 0.0299998 0.0299998
0.0299998 0.0299999 0.0299999 0.0299999 0.0299999 0.0299999 0.0299999 0.0299999 0.0299999 0.03 0.03 0.03
0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03 0.03
@@ -135,7 +135,7 @@
0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
143184 143136 143087 143038 142989 142940 142891 142841 142792 142743 142694 142644
142595 142546 142497 142448 142398 142349 142300 142251 142202 142153 142104 142054
142005 141956 141907 141858 141809 141760 141711 141662 141613 141564 141515 141465
@@ -179,7 +179,7 @@
87599.9 87599.5 87599.1 87598.9 87598.8 87598.7 87598.6 87598.5 87598.5 87598.5 87598.4 87598.4
87598.4 87598.4 87598.4 87598.4 87598.4 87598.4 87598.4 87599.5
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_mesitylene" NumberOfComponents="1" format="ascii">
143184 143136 143087 143038 142989 142940 142891 142841 142792 142743 142694 142644
142595 142546 142497 142448 142398 142349 142300 142251 142202 142153 142104 142054
142005 141956 141907 141858 141809 141760 141711 141662 141613 141564 141515 141465
@@ -223,7 +223,7 @@
87599.9 87599.5 87599.1 87598.9 87598.8 87598.7 87598.6 87598.5 87598.5 87598.5 87598.4 87598.4
87598.4 87598.4 87598.4 87598.4 87598.4 87598.4 87598.4 87599.5
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
144117 144069 144020 143971 143922 143873 143823 143774 143725 143676 143626 143577
143528 143479 143430 143380 143331 143282 143233 143184 143135 143086 143036 142987
142938 142889 142840 142791 142742 142693 142644 142595 142546 142496 142447 142398
@@ -267,7 +267,7 @@
99977.5 99977 99976.7 99976.5 99976.3 99976.2 99976.2 99976.1 99976.1 99976 99976 99976
99976 99976 99976 99976 99976 99976 99976 99977.1
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.722 999.721
999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721
999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721 999.721
@@ -311,7 +311,7 @@
999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695
999.695 999.695 999.695 999.695 999.695 999.695 999.695 999.695
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_mesitylene" NumberOfComponents="1" format="ascii">
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
@@ -355,7 +355,7 @@
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.77281 1.77222 1.77162 1.77102 1.77041 1.76981 1.7692 1.76859 1.76799 1.76738 1.76678 1.76617
1.76557 1.76496 1.76436 1.76375 1.76315 1.76254 1.76194 1.76133 1.76073 1.76012 1.75952 1.75892
1.75831 1.75771 1.7571 1.7565 1.7559 1.75529 1.75469 1.75408 1.75348 1.75288 1.75227 1.75167
diff --git a/test/references/infiltrationbox-reference.vtu b/test/references/infiltrationbox-reference.vtu
index 18fdd77e20f251a5ee13c50d330fa530ac3ad233..aa6bf7876baefd3db20b35cdc50086bf1600c127 100644
--- a/test/references/infiltrationbox-reference.vtu
+++ b/test/references/infiltrationbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="160" NumberOfPoints="205">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.97 0.970035 0.97 0.97004 0.970056 0.97007 0.970081 0.970099 0.970109 0.970114 0.970228 0.970298
0.97025 0.970325 0.970176 0.970194 0.970194 0.970235 0.970214 0.970259 0.970234 0.970283 0.970255 0.970308
0.970275 0.970333 0.970296 0.970358 0.970316 0.970383 0.970334 0.970408 0.970341 0.970415 0.970342 0.970414
@@ -23,7 +23,7 @@
0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
0.12
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" 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
@@ -43,7 +43,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.03 0.0299654 0.03 0.0299603 0.0299437 0.0299302 0.0299191 0.0299006 0.0298913 0.0298862 0.0297724 0.029702
0.02975 0.0296752 0.029824 0.0298057 0.0298059 0.0297648 0.0297862 0.0297411 0.0297662 0.0297171 0.0297455 0.0296922
0.0297246 0.029667 0.0297041 0.0296418 0.0296843 0.0296168 0.0296661 0.0295923 0.0296591 0.0295854 0.0296578 0.0295857
@@ -63,7 +63,7 @@
0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
0.88
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
148117 148128 123592 123611 148142 123624 148150 123632 148171 123648 148353 123840
148354 123841 148174 123650 148157 123639 148154 123635 148149 123631 148145 123627
148141 123622 148134 123615 148122 123604 148100 123582 148064 123546 148014 123496
@@ -83,7 +83,7 @@
87570.6 87569.1 87567.7 87566.4 87565.3 87564.4 87563.6 87563 87562.9 87563.6 87567.2 87569.9
87622.4
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
148117 148128 123592 123611 148142 123624 148150 123632 148171 123648 148353 123840
148354 123841 148174 123650 148157 123639 148154 123635 148149 123631 148145 123627
148141 123622 148134 123615 148122 123604 148100 123582 148064 123546 148014 123496
@@ -103,7 +103,7 @@
87570.6 87569.1 87567.7 87566.4 87565.3 87564.4 87563.6 87563 87562.9 87563.6 87567.2 87569.9
87622.4
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
149050 149060 124525 124543 149075 124556 149082 124564 149103 124579 149284 124770
149285 124771 149105 124581 149088 124570 149085 124566 149080 124562 149076 124557
149071 124552 149064 124545 149052 124533 149030 124512 148994 124475 148944 124425
@@ -123,7 +123,7 @@
99948.1 99946.6 99945.3 99944 99942.9 99942 99941.2 99940.6 99940.5 99941.2 99944.8 99947.4
100000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
999.741 999.741 999.726 999.726 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.727
999.741 999.727 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726
999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726 999.741 999.726
@@ -143,7 +143,7 @@
999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706
999.706
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
@@ -163,7 +163,7 @@
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.8278 1.82793 1.52611 1.52633 1.8281 1.52649 1.8282 1.52659 1.82845 1.52678 1.83068 1.52918
1.83069 1.52918 1.82848 1.5268 1.82827 1.52666 1.82823 1.52662 1.82817 1.52656 1.82812 1.5265
1.82806 1.52644 1.82797 1.52636 1.82782 1.52621 1.82756 1.52595 1.82711 1.5255 1.8265 1.52488
@@ -183,7 +183,7 @@
1.22378 1.22377 1.22375 1.22373 1.22372 1.22371 1.2237 1.22369 1.22369 1.2237 1.22374 1.22378
1.22442
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.999973 0.999973 0.999977 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977
0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977
0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977 0.999973 0.999977
@@ -203,7 +203,7 @@
0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982
0.999982
</DataArray>
- <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_Water" NumberOfComponents="1" format="ascii">
4.50629e-09 4.50282e-09 3.76482e-09 3.76216e-09 4.50206e-09 3.76064e-09 4.50028e-09 3.75909e-09 4.50026e-09 4.01389e-09 4.71233e-09 4.2464e-08
4.70988e-09 4.24118e-08 4.49474e-09 4.0061e-09 4.49106e-09 3.74981e-09 4.48947e-09 3.748e-09 4.4877e-09 3.74625e-09 4.48584e-09 3.74438e-09
4.48393e-09 3.74243e-09 4.48194e-09 3.74036e-09 4.47971e-09 3.73797e-09 4.47715e-09 3.73504e-09 4.47569e-09 3.73378e-09 4.4744e-09 3.73275e-09
@@ -223,7 +223,7 @@
3.02211e-09 3.02208e-09 3.02205e-09 3.02202e-09 3.02199e-09 3.02197e-09 3.02195e-09 3.02194e-09 3.02193e-09 3.02193e-09 3.02198e-09 3.02186e-09
3.02334e-09
</DataArray>
- <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Water" NumberOfComponents="1" format="ascii">
2.72214e-05 2.72233e-05 2.27051e-05 2.27084e-05 2.72259e-05 2.27108e-05 2.72273e-05 2.27124e-05 2.72312e-05 2.27151e-05 2.72645e-05 2.275e-05
2.72646e-05 2.27501e-05 2.72316e-05 2.27155e-05 2.72284e-05 2.27134e-05 2.72279e-05 2.27127e-05 2.7227e-05 2.27118e-05 2.72262e-05 2.2711e-05
2.72253e-05 2.27101e-05 2.7224e-05 2.27089e-05 2.72218e-05 2.27067e-05 2.72178e-05 2.27026e-05 2.7211e-05 2.26959e-05 2.72019e-05 2.26867e-05
@@ -243,7 +243,7 @@
1.81793e-05 1.8179e-05 1.81787e-05 1.81785e-05 1.81783e-05 1.81781e-05 1.8178e-05 1.81779e-05 1.81779e-05 1.8178e-05 1.81787e-05 1.81791e-05
1.81888e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -263,7 +263,7 @@
1e-10 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="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_NAPL" NumberOfComponents="1" format="ascii">
0.00132302 0.00132201 0.00110533 0.00110455 0.00132178 0.00110411 0.00132126 0.00110365 0.00132125 0.00117846 0.00138352 0.0124672
0.0013828 0.0124519 0.00131963 0.00117617 0.00131855 0.00110093 0.00131809 0.00110039 0.00131757 0.00109988 0.00131702 0.00109933
0.00131646 0.00109876 0.00131587 0.00109815 0.00131522 0.00109745 0.00131447 0.00109659 0.00131404 0.00109622 0.00131366 0.00109592
@@ -283,7 +283,7 @@
0.000887276 0.000887266 0.000887257 0.000887249 0.000887242 0.000887236 0.00088723 0.000887225 0.000887224 0.000887225 0.000887238 0.000887202
0.000887638
</DataArray>
- <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -303,7 +303,7 @@
1e-10 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="x^H2O_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Air" NumberOfComponents="1" format="ascii">
0.00824008 0.0082395 0.00986295 0.00986152 0.00823871 0.00986049 0.00823829 0.00985983 0.00823713 0.00985864 0.00822714 0.00984356
0.00822711 0.00984352 0.00823703 0.0098585 0.00823796 0.00985938 0.00823814 0.00985968 0.0082384 0.00986006 0.00823864 0.00986041
0.00823891 0.00986079 0.00823929 0.00986134 0.00823996 0.00986228 0.00824116 0.00986401 0.00824319 0.00986691 0.00824593 0.00987085
@@ -323,7 +323,7 @@
0.0122882 0.0122884 0.0122886 0.0122887 0.0122889 0.012289 0.0122891 0.0122891 0.0122892 0.0122891 0.0122886 0.0122883
0.0122818
</DataArray>
- <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_Air" NumberOfComponents="1" format="ascii">
1e-06 9.9916e-07 1e-06 9.99149e-07 9.98895e-07 9.98643e-07 9.9845e-07 9.98164e-07 9.98305e-07 1.06569e-06 1.04408e-06 1.1257e-05
1.04353e-06 1.12431e-05 9.97068e-07 1.06361e-06 9.96365e-07 9.95655e-07 9.96034e-07 9.95204e-07 9.95673e-07 9.94777e-07 9.95289e-07 9.94316e-07
9.94898e-07 9.93836e-07 9.94501e-07 9.93341e-07 9.94087e-07 9.92802e-07 9.93664e-07 9.92198e-07 9.93583e-07 9.92154e-07 9.93629e-07 9.92278e-07
@@ -343,7 +343,7 @@
1.00011e-06 1.00012e-06 1.00012e-06 1.00012e-06 1.00013e-06 1.00013e-06 1.00013e-06 1.00013e-06 1.00013e-06 1.00012e-06 1.0001e-06 1.00003e-06
1e-06
</DataArray>
- <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Air" NumberOfComponents="1" format="ascii">
0.991759 0.991759 0.990136 0.990137 0.99176 0.990139 0.991761 0.990139 0.991762 0.99014 0.991772 0.990145
0.991772 0.990145 0.991762 0.99014 0.991761 0.99014 0.991761 0.990139 0.991761 0.990139 0.99176 0.990139
0.99176 0.990138 0.99176 0.990138 0.991759 0.990137 0.991758 0.990135 0.991756 0.990132 0.991753 0.990128
diff --git a/test/references/infiltrationcc-reference.vtu b/test/references/infiltrationcc-reference.vtu
index 75f09eff69b7d44c42ce1237c4b2bb69f65efd34..549460779fc583dafa7e36fc8b5901698bb1bfaa 100644
--- a/test/references/infiltrationcc-reference.vtu
+++ b/test/references/infiltrationcc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="160" NumberOfPoints="205">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.97 0.97 0.97 0.97 0.969999 0.969999 0.969999 0.969999 0.969999 0.969999 0.969999 0.969999
0.969999 0.969999 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97 0.97
@@ -19,7 +19,7 @@
0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
0.12 0.12 0.12 0.12
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" 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
@@ -35,7 +35,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.0300001 0.0300002 0.0300003 0.0300005 0.0300006 0.0300007 0.0300006 0.0300006 0.0300006 0.0300006 0.0300006 0.0300005
0.0300005 0.0300005 0.0300005 0.0300005 0.0300004 0.0300004 0.0300004 0.0300004 0.0300004 0.0300003 0.0300003 0.0300003
0.0300003 0.0300003 0.0300002 0.0300002 0.0300002 0.0300002 0.0300002 0.0300002 0.0300001 0.0300001 0.0300001 0.0300001
@@ -51,7 +51,7 @@
0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
0.88 0.88 0.88 0.88
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
135795 135682 135569 135456 135344 135262 135209 135156 135103 135050 134997 134944
134890 134837 134783 134730 134676 134622 134568 134514 134460 134406 134352 134298
134244 134189 134135 134081 134026 133972 133917 133863 133808 133754 133699 133645
@@ -67,7 +67,7 @@
87619.3 87618.5 87617.8 87617.1 87616.3 87615.5 87614.8 87614 87613.2 87612.5 87611.7 87610.9
87610.1 87609.4 87608.6 87608.4
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
135795 135682 135569 135456 135344 135262 135209 135156 135103 135050 134997 134944
134890 134837 134783 134730 134676 134622 134568 134514 134460 134406 134352 134298
134244 134189 134135 134081 134026 133972 133917 133863 133808 133754 133699 133645
@@ -83,7 +83,7 @@
87619.3 87618.5 87617.8 87617.1 87616.3 87615.5 87614.8 87614 87613.2 87612.5 87611.7 87610.9
87610.1 87609.4 87608.6 87608.4
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
136728 136615 136502 136389 136277 136195 136142 136089 136036 135983 135930 135876
135823 135770 135716 135662 135609 135555 135501 135447 135393 135339 135285 135231
135177 135122 135068 135014 134959 134905 134850 134796 134741 134687 134632 134578
@@ -99,7 +99,7 @@
99996.9 99996.1 99995.4 99994.6 99993.9 99993.1 99992.4 99991.6 99990.8 99990 99989.3 99988.5
99987.7 99986.9 99986.2 99985.9
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733
999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733 999.733
999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732 999.732
@@ -115,7 +115,7 @@
999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706 999.706
999.706 999.706 999.706 999.706
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
@@ -131,7 +131,7 @@
878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771 878.771
878.771 878.771 878.771 878.771
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
1.67622 1.67483 1.67344 1.67205 1.67067 1.66967 1.66901 1.66836 1.66771 1.66706 1.6664 1.66575
1.66509 1.66443 1.66377 1.66311 1.66245 1.66179 1.66113 1.66047 1.6598 1.65914 1.65847 1.6578
1.65714 1.65647 1.6558 1.65513 1.65446 1.65379 1.65312 1.65245 1.65178 1.65111 1.65044 1.64977
@@ -147,7 +147,7 @@
1.22438 1.22437 1.22436 1.22436 1.22435 1.22434 1.22433 1.22432 1.22431 1.2243 1.22429 1.22428
1.22427 1.22426 1.22425 1.22425
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975
0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975
0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975 0.999975
@@ -163,7 +163,7 @@
0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982
0.999982 0.999982 0.999982 0.999982
</DataArray>
- <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_Water" NumberOfComponents="1" format="ascii">
4.13455e-09 4.13268e-09 4.1308e-09 4.12893e-09 4.12718e-09 4.12541e-09 4.12334e-09 4.12149e-09 4.11964e-09 4.11779e-09 4.11594e-09 4.11409e-09
4.11224e-09 4.11039e-09 4.10854e-09 4.10669e-09 4.10484e-09 4.10298e-09 4.10113e-09 4.09928e-09 4.09743e-09 4.09558e-09 4.09373e-09 4.09188e-09
4.09003e-09 4.08818e-09 4.08633e-09 4.08448e-09 4.08263e-09 4.08078e-09 4.07893e-09 4.07708e-09 4.07522e-09 4.07337e-09 4.07152e-09 4.06967e-09
@@ -179,7 +179,7 @@
3.02315e-09 3.02313e-09 3.02312e-09 3.0231e-09 3.02309e-09 3.02307e-09 3.02306e-09 3.02304e-09 3.02303e-09 3.02301e-09 3.023e-09 3.02298e-09
3.02297e-09 3.02295e-09 3.02294e-09 3.02293e-09
</DataArray>
- <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Water" NumberOfComponents="1" format="ascii">
2.49523e-05 2.49315e-05 2.49107e-05 2.48899e-05 2.48692e-05 2.48542e-05 2.48444e-05 2.48346e-05 2.48249e-05 2.48151e-05 2.48053e-05 2.47955e-05
2.47857e-05 2.47758e-05 2.4766e-05 2.47561e-05 2.47462e-05 2.47363e-05 2.47264e-05 2.47164e-05 2.47065e-05 2.46965e-05 2.46866e-05 2.46766e-05
2.46666e-05 2.46566e-05 2.46466e-05 2.46366e-05 2.46266e-05 2.46165e-05 2.46065e-05 2.45965e-05 2.45864e-05 2.45764e-05 2.45663e-05 2.45563e-05
@@ -195,7 +195,7 @@
1.81882e-05 1.81881e-05 1.8188e-05 1.81878e-05 1.81877e-05 1.81876e-05 1.81874e-05 1.81873e-05 1.81871e-05 1.8187e-05 1.81869e-05 1.81867e-05
1.81866e-05 1.81864e-05 1.81863e-05 1.81862e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -211,7 +211,7 @@
1e-10 1e-10 1e-10 1e-10 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="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_NAPL" NumberOfComponents="1" format="ascii">
0.00121388 0.00121333 0.00121278 0.00121223 0.00121172 0.0012112 0.00121059 0.00121005 0.0012095 0.00120896 0.00120842 0.00120788
0.00120733 0.00120679 0.00120625 0.0012057 0.00120516 0.00120462 0.00120407 0.00120353 0.00120299 0.00120244 0.0012019 0.00120136
0.00120081 0.00120027 0.00119973 0.00119918 0.00119864 0.0011981 0.00119755 0.00119701 0.00119647 0.00119592 0.00119538 0.00119484
@@ -227,7 +227,7 @@
0.000887581 0.000887577 0.000887572 0.000887568 0.000887563 0.000887559 0.000887555 0.00088755 0.000887546 0.000887541 0.000887537 0.000887532
0.000887527 0.000887523 0.000887518 0.000887518
</DataArray>
- <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -243,7 +243,7 @@
1e-10 1e-10 1e-10 1e-10 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="x^H2O_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Air" NumberOfComponents="1" format="ascii">
0.00898269 0.00899012 0.00899756 0.00900501 0.00901244 0.00901781 0.00902135 0.00902485 0.00902837 0.00903189 0.00903543 0.00903897
0.00904252 0.00904609 0.00904965 0.00905323 0.00905682 0.00906041 0.00906401 0.00906762 0.00907124 0.00907486 0.00907849 0.00908213
0.00908577 0.00908942 0.00909308 0.00909674 0.00910041 0.00910408 0.00910776 0.00911144 0.00911513 0.00911882 0.00912252 0.00912622
@@ -259,7 +259,7 @@
0.0122822 0.0122823 0.0122824 0.0122825 0.0122826 0.0122827 0.0122828 0.0122829 0.012283 0.0122831 0.0122832 0.0122833
0.0122833 0.0122834 0.0122835 0.0122836
</DataArray>
- <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_Air" NumberOfComponents="1" format="ascii">
1.00019e-06 1.00057e-06 1.00094e-06 1.00132e-06 1.00172e-06 1.00188e-06 1.00177e-06 1.00171e-06 1.00165e-06 1.0016e-06 1.00154e-06 1.00148e-06
1.00142e-06 1.00137e-06 1.00131e-06 1.00125e-06 1.0012e-06 1.00115e-06 1.00109e-06 1.00104e-06 1.00099e-06 1.00093e-06 1.00088e-06 1.00083e-06
1.00078e-06 1.00073e-06 1.00068e-06 1.00063e-06 1.00058e-06 1.00053e-06 1.00048e-06 1.00043e-06 1.00038e-06 1.00033e-06 1.00028e-06 1.00023e-06
@@ -275,7 +275,7 @@
9.99968e-07 9.9997e-07 9.99973e-07 9.99975e-07 9.99978e-07 9.9998e-07 9.99983e-07 9.99985e-07 9.99988e-07 9.99991e-07 9.99993e-07 9.99996e-07
9.99999e-07 1e-06 1e-06 1.00001e-06
</DataArray>
- <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Air" NumberOfComponents="1" format="ascii">
0.991016 0.991009 0.991001 0.990994 0.990987 0.990981 0.990978 0.990974 0.990971 0.990967 0.990964 0.99096
0.990956 0.990953 0.990949 0.990946 0.990942 0.990939 0.990935 0.990931 0.990928 0.990924 0.99092 0.990917
0.990913 0.99091 0.990906 0.990902 0.990899 0.990895 0.990891 0.990888 0.990884 0.99088 0.990876 0.990873
diff --git a/test/references/injection2pnibox-cube-reference.vtu b/test/references/injection2pnibox-cube-reference.vtu
index 0a52c815382885c8489191aaae80daaa45cbc295..cfddfc2d8de41507315d7027abaa646048385aa6 100644
--- a/test/references/injection2pnibox-cube-reference.vtu
+++ b/test/references/injection2pnibox-cube-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -41,7 +41,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Nitrogen" 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
@@ -79,7 +79,7 @@
0 0 0 0 0 0 0 0 0 -0 -0 -0
-0 -0 -0 -0 -0
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
2.6587e+07 2.6587e+07 2.65625e+07 2.65629e+07 2.65874e+07 2.65634e+07 2.6588e+07 2.6564e+07 2.65887e+07 2.65648e+07 2.65895e+07 2.65656e+07
2.65904e+07 2.65664e+07 2.65912e+07 2.65673e+07 2.65921e+07 2.65681e+07 2.6593e+07 2.6569e+07 2.65939e+07 2.65699e+07 2.65948e+07 2.65708e+07
2.65958e+07 2.65718e+07 2.65968e+07 2.65729e+07 2.65979e+07 2.65739e+07 2.65989e+07 2.6575e+07 2.66e+07 2.6576e+07 2.6601e+07 2.65771e+07
@@ -117,7 +117,7 @@
2.62079e+07 2.62091e+07 2.62102e+07 2.62112e+07 2.62121e+07 2.6213e+07 2.62138e+07 2.62146e+07 2.62154e+07 2.62161e+07 2.62168e+07 2.62174e+07
2.62178e+07 2.62182e+07 2.62185e+07 2.62187e+07 2.62188e+07
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
2.6597e+07 2.6597e+07 2.65725e+07 2.65729e+07 2.65974e+07 2.65734e+07 2.6598e+07 2.6574e+07 2.65987e+07 2.65748e+07 2.65995e+07 2.65756e+07
2.66004e+07 2.65764e+07 2.66012e+07 2.65773e+07 2.66021e+07 2.65781e+07 2.6603e+07 2.6579e+07 2.66039e+07 2.65799e+07 2.66048e+07 2.65808e+07
2.66058e+07 2.65818e+07 2.66068e+07 2.65829e+07 2.66079e+07 2.65839e+07 2.66089e+07 2.6585e+07 2.661e+07 2.6586e+07 2.6611e+07 2.65871e+07
@@ -193,7 +193,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000 10000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
976.461 976.461 976.499 976.499 976.461 976.5 976.462 976.5 976.462 976.5 976.462 976.5
976.463 976.501 976.463 976.501 976.463 976.502 976.464 976.502 976.464 976.502 976.464 976.503
976.465 976.503 976.465 976.503 976.466 976.504 976.466 976.504 976.466 976.505 976.467 976.505
@@ -231,7 +231,7 @@
977.077 977.078 977.078 977.079 977.079 977.079 977.08 977.08 977.08 977.081 977.081 977.081
977.081 977.082 977.082 977.082 977.082
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
246.185 246.185 246.009 246.013 246.189 246.017 246.195 246.023 246.202 246.03 246.209 246.038
246.217 246.045 246.224 246.053 246.232 246.061 246.241 246.069 246.249 246.078 246.258 246.086
246.267 246.096 246.276 246.105 246.286 246.115 246.296 246.125 246.305 246.134 246.315 246.144
@@ -269,7 +269,7 @@
243.479 243.49 243.5 243.509 243.518 243.526 243.534 243.541 243.548 243.555 243.561 243.566
243.571 243.575 243.577 243.579 243.58
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
3141.32 3141.32 3138.74 3138.75 3141.31 3138.74 3141.31 3138.74 3141.31 3138.74 3141.31 3138.74
3141.31 3138.74 3141.31 3138.74 3141.31 3138.74 3141.31 3138.73 3141.3 3138.73 3141.3 3138.73
3141.3 3138.73 3141.3 3138.73 3141.3 3138.73 3141.3 3138.72 3141.29 3138.72 3141.29 3138.72
@@ -307,7 +307,7 @@
3100.58 3100.58 3100.58 3100.58 3100.58 3100.58 3100.57 3100.57 3100.57 3100.57 3100.57 3100.57
3100.57 3100.57 3100.57 3100.57 3100.57
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" 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
diff --git a/test/references/injection2pnibox-simplex-reference.vtu b/test/references/injection2pnibox-simplex-reference.vtu
index 9431df94843a43444304722014aa7c3844e13ae9..eaf7c1392b9576b6a25a6217a867721e9c9c5363 100644
--- a/test/references/injection2pnibox-simplex-reference.vtu
+++ b/test/references/injection2pnibox-simplex-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="768" NumberOfPoints="425">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -41,7 +41,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Nitrogen" 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
@@ -79,7 +79,7 @@
0 0 0 0 0 0 0 0 0 -0 -0 -0
-0 -0 -0 -0 -0
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
2.6587e+07 2.6587e+07 2.65629e+07 2.65625e+07 2.65874e+07 2.65634e+07 2.6588e+07 2.6564e+07 2.65888e+07 2.65648e+07 2.65896e+07 2.65656e+07
2.65904e+07 2.65664e+07 2.65912e+07 2.65673e+07 2.65921e+07 2.65681e+07 2.6593e+07 2.6569e+07 2.65939e+07 2.65699e+07 2.65948e+07 2.65708e+07
2.65958e+07 2.65719e+07 2.65968e+07 2.65729e+07 2.65979e+07 2.65739e+07 2.65989e+07 2.6575e+07 2.65999e+07 2.6576e+07 2.6601e+07 2.6577e+07
@@ -117,7 +117,7 @@
2.62079e+07 2.62091e+07 2.62102e+07 2.62112e+07 2.62121e+07 2.6213e+07 2.62138e+07 2.62146e+07 2.62154e+07 2.62161e+07 2.62168e+07 2.62174e+07
2.62179e+07 2.62183e+07 2.62186e+07 2.62187e+07 2.62188e+07
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
2.6597e+07 2.6597e+07 2.65729e+07 2.65725e+07 2.65974e+07 2.65734e+07 2.6598e+07 2.6574e+07 2.65988e+07 2.65748e+07 2.65996e+07 2.65756e+07
2.66004e+07 2.65764e+07 2.66012e+07 2.65773e+07 2.66021e+07 2.65781e+07 2.6603e+07 2.6579e+07 2.66039e+07 2.65799e+07 2.66048e+07 2.65808e+07
2.66058e+07 2.65819e+07 2.66068e+07 2.65829e+07 2.66079e+07 2.65839e+07 2.66089e+07 2.6585e+07 2.66099e+07 2.6586e+07 2.6611e+07 2.6587e+07
@@ -193,7 +193,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000 10000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
976.461 976.461 976.499 976.499 976.461 976.5 976.462 976.5 976.462 976.5 976.462 976.5
976.463 976.501 976.463 976.501 976.464 976.501 976.464 976.502 976.464 976.502 976.465 976.503
976.465 976.503 976.465 976.503 976.466 976.504 976.466 976.504 976.467 976.505 976.467 976.505
@@ -231,7 +231,7 @@
977.077 977.078 977.078 977.079 977.079 977.079 977.08 977.08 977.08 977.081 977.081 977.081
977.081 977.082 977.082 977.082 977.082
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
246.185 246.186 246.013 246.009 246.19 246.018 246.195 246.024 246.202 246.03 246.209 246.038
246.217 246.046 246.225 246.053 246.233 246.061 246.241 246.069 246.249 246.078 246.258 246.087
246.267 246.096 246.277 246.105 246.286 246.115 246.296 246.124 246.305 246.134 246.315 246.144
@@ -269,7 +269,7 @@
243.479 243.49 243.5 243.509 243.518 243.526 243.534 243.541 243.548 243.555 243.561 243.566
243.571 243.575 243.578 243.579 243.58
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
3141.32 3141.31 3138.75 3138.74 3141.31 3138.74 3141.3 3138.74 3141.3 3138.74 3141.3 3138.74
3141.3 3138.74 3141.3 3138.74 3141.29 3138.74 3141.29 3138.74 3141.29 3138.73 3141.29 3138.73
3141.29 3138.73 3141.28 3138.73 3141.28 3138.73 3141.28 3138.72 3141.28 3138.72 3141.28 3138.72
@@ -307,7 +307,7 @@
3100.59 3100.58 3100.58 3100.58 3100.58 3100.58 3100.58 3100.57 3100.57 3100.57 3100.57 3100.57
3100.57 3100.57 3100.57 3100.57 3100.57
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" 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
diff --git a/test/references/injection2pnicc-cube-reference.vtu b/test/references/injection2pnicc-cube-reference.vtu
index 8c1e918945d9d5f74c8ab4851f884a17f4c868f8..8db4852d31fb37e457c41ee8fb118ea326148b01 100644
--- a/test/references/injection2pnicc-cube-reference.vtu
+++ b/test/references/injection2pnicc-cube-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -37,7 +37,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Nitrogen" 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
@@ -71,7 +71,7 @@
0 0 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="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
2.65747e+07 2.65751e+07 2.65757e+07 2.65764e+07 2.65771e+07 2.65779e+07 2.65787e+07 2.65795e+07 2.65804e+07 2.65812e+07 2.65821e+07 2.65831e+07
2.65841e+07 2.65851e+07 2.65862e+07 2.65872e+07 2.65883e+07 2.65893e+07 2.65903e+07 2.65913e+07 2.65922e+07 2.65931e+07 2.65938e+07 2.65941e+07
2.65504e+07 2.6551e+07 2.65516e+07 2.65523e+07 2.65531e+07 2.65539e+07 2.65548e+07 2.65556e+07 2.65564e+07 2.65572e+07 2.65581e+07 2.65591e+07
@@ -105,7 +105,7 @@
2.62081e+07 2.62101e+07 2.6212e+07 2.62136e+07 2.62152e+07 2.62167e+07 2.62181e+07 2.62195e+07 2.62207e+07 2.62218e+07 2.62229e+07 2.62238e+07
2.62246e+07 2.62255e+07 2.62263e+07 2.62271e+07 2.62278e+07 2.62285e+07 2.62291e+07 2.62297e+07 2.62301e+07 2.62305e+07 2.62307e+07 2.62308e+07
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
2.65847e+07 2.65851e+07 2.65857e+07 2.65864e+07 2.65871e+07 2.65879e+07 2.65887e+07 2.65895e+07 2.65904e+07 2.65912e+07 2.65921e+07 2.65931e+07
2.65941e+07 2.65951e+07 2.65962e+07 2.65972e+07 2.65983e+07 2.65993e+07 2.66003e+07 2.66013e+07 2.66022e+07 2.66031e+07 2.66038e+07 2.66041e+07
2.65604e+07 2.6561e+07 2.65616e+07 2.65623e+07 2.65631e+07 2.65639e+07 2.65648e+07 2.65656e+07 2.65664e+07 2.65672e+07 2.65681e+07 2.65691e+07
@@ -173,7 +173,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
976.48 976.48 976.481 976.481 976.481 976.482 976.482 976.482 976.482 976.483 976.483 976.484
976.484 976.484 976.485 976.485 976.486 976.486 976.487 976.487 976.487 976.488 976.488 976.488
976.518 976.519 976.519 976.519 976.519 976.52 976.52 976.52 976.509 976.51 976.51 976.511
@@ -207,7 +207,7 @@
977.053 977.054 977.055 977.056 977.056 977.057 977.057 977.058 977.059 977.059 977.059 977.06
977.06 977.06 977.061 977.061 977.061 977.062 977.062 977.062 977.062 977.062 977.063 977.063
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
246.097 246.101 246.106 246.112 246.119 246.127 246.134 246.142 246.149 246.157 246.165 246.174
246.184 246.194 246.203 246.213 246.222 246.232 246.241 246.25 246.259 246.267 246.273 246.277
245.923 245.928 245.934 245.941 245.948 245.955 245.963 245.971 245.966 245.974 245.982 245.991
@@ -241,7 +241,7 @@
243.455 243.474 243.492 243.507 243.522 243.536 243.549 243.561 243.573 243.583 243.592 243.601
243.609 243.617 243.624 243.632 243.638 243.645 243.65 243.656 243.66 243.663 243.665 243.667
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
3140.03 3140.03 3140.03 3140.03 3140.03 3140.02 3140.02 3140.02 3140.02 3140.02 3140.02 3140.02
3140.01 3140.01 3140.01 3140.01 3140.01 3140 3140 3140 3140 3139.99 3139.99 3139.99
3137.47 3137.46 3137.46 3137.46 3137.45 3137.45 3137.45 3137.45 3138.06 3138.06 3138.06 3138.05
@@ -275,7 +275,7 @@
3101.86 3101.86 3101.85 3101.85 3101.85 3101.84 3101.84 3101.84 3101.84 3101.84 3101.83 3101.83
3101.83 3101.83 3101.83 3101.83 3101.83 3101.82 3101.82 3101.82 3101.82 3101.82 3101.82 3101.82
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" 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
diff --git a/test/references/injection2pnicc-simplex-reference.vtu b/test/references/injection2pnicc-simplex-reference.vtu
index adc0c23c57f8c520b9a3eb9ba6de2dca6123898d..af57eb46177710e867d7c4ae594a59732dff70f6 100644
--- a/test/references/injection2pnicc-simplex-reference.vtu
+++ b/test/references/injection2pnicc-simplex-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="768" NumberOfPoints="425">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -69,7 +69,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Nitrogen" 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
@@ -135,7 +135,7 @@
0 0 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="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
2.65871e+07 2.65777e+07 2.65997e+07 2.65907e+07 2.66109e+07 2.66022e+07 2.66214e+07 2.66128e+07 2.66315e+07 2.6623e+07 2.66412e+07 2.66328e+07
2.66508e+07 2.66424e+07 2.66602e+07 2.66518e+07 2.66695e+07 2.66612e+07 2.66788e+07 2.66704e+07 2.6688e+07 2.66797e+07 2.66972e+07 2.66889e+07
2.67065e+07 2.66982e+07 2.67158e+07 2.67074e+07 2.6725e+07 2.67167e+07 2.67342e+07 2.67259e+07 2.67435e+07 2.67351e+07 2.67527e+07 2.67443e+07
@@ -201,7 +201,7 @@
2.62866e+07 2.62786e+07 2.62948e+07 2.62868e+07 2.63032e+07 2.62951e+07 2.63116e+07 2.63035e+07 2.63201e+07 2.6312e+07 2.63287e+07 2.63205e+07
2.63372e+07 2.63291e+07 2.63458e+07 2.63376e+07 2.63543e+07 2.63461e+07 2.63627e+07 2.63546e+07 2.6371e+07 2.6363e+07 2.63792e+07 2.63712e+07
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
2.65971e+07 2.65877e+07 2.66097e+07 2.66007e+07 2.66209e+07 2.66122e+07 2.66314e+07 2.66228e+07 2.66415e+07 2.6633e+07 2.66512e+07 2.66428e+07
2.66608e+07 2.66524e+07 2.66702e+07 2.66618e+07 2.66795e+07 2.66712e+07 2.66888e+07 2.66804e+07 2.6698e+07 2.66897e+07 2.67072e+07 2.66989e+07
2.67165e+07 2.67082e+07 2.67258e+07 2.67174e+07 2.6735e+07 2.67267e+07 2.67442e+07 2.67359e+07 2.67535e+07 2.67451e+07 2.67627e+07 2.67543e+07
@@ -333,7 +333,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
976.478 976.49 976.483 976.495 976.488 976.499 976.492 976.504 976.496 976.508 976.5 976.512
976.504 976.516 976.508 976.52 976.511 976.523 976.515 976.527 976.519 976.531 976.523 976.535
976.527 976.539 976.53 976.542 976.534 976.546 976.538 976.55 976.542 976.554 976.546 976.557
@@ -399,7 +399,7 @@
977.078 977.09 977.081 977.094 977.084 977.097 977.088 977.1 977.091 977.104 977.095 977.107
977.098 977.111 977.102 977.114 977.105 977.118 977.109 977.121 977.112 977.125 977.116 977.128
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
246.205 246.134 246.32 246.253 246.424 246.359 246.521 246.457 246.614 246.551 246.704 246.642
246.792 246.731 246.879 246.818 246.965 246.904 247.05 246.989 247.136 247.075 247.221 247.16
247.307 247.246 247.392 247.331 247.478 247.417 247.563 247.502 247.648 247.587 247.733 247.672
@@ -465,7 +465,7 @@
244.175 244.117 244.251 244.193 244.329 244.27 244.407 244.348 244.486 244.427 244.565 244.506
244.644 244.585 244.723 244.664 244.802 244.743 244.88 244.822 244.958 244.899 245.033 244.975
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
3140.39 3139.57 3140.38 3139.57 3140.37 3139.56 3140.36 3139.55 3140.35 3139.53 3140.33 3139.51
3140.32 3139.5 3140.3 3139.48 3140.29 3139.47 3140.27 3139.45 3140.26 3139.44 3140.24 3139.42
3140.23 3139.41 3140.21 3139.39 3140.19 3139.37 3140.18 3139.36 3140.16 3139.34 3140.15 3139.33
@@ -531,7 +531,7 @@
3102.15 3101.32 3102.13 3101.31 3102.12 3101.29 3102.11 3101.28 3102.09 3101.27 3102.08 3101.25
3102.06 3101.24 3102.05 3101.22 3102.04 3101.21 3102.02 3101.2 3102.01 3101.18 3102 3101.17
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" 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
diff --git a/test/references/kuevette3p3cnibox-reference.vtu b/test/references/kuevette3p3cnibox-reference.vtu
index 402ad0171c87e812cd94378eb38cfc2b96ca9dbd..6deb874bf331929190f3263b3154a07cb8493060 100644
--- a/test/references/kuevette3p3cnibox-reference.vtu
+++ b/test/references/kuevette3p3cnibox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="120" NumberOfPoints="144">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.342731 0.335966 0.190201 0.187499 0.278052 0.177556 0.198895 0.131652 0.126982 0.120626 0.120051 0.120052
0.120004 0.120004 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.185017 0.178971 0.17791 0.134204
@@ -17,7 +17,7 @@
0.12 0.119999 0.12 0.12 0.12 0.12 0.12 0.12 0.148373 0.154518 0.160019 0.135266
0.121538 0.120142 0.120014 0.120001 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" 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
@@ -31,7 +31,7 @@
0.0699505 0 0 0 0 0 0 0 0 0 0 0
9.85531e-05 5.33018e-05 4.46501e-06 2.88161e-07 6.31619e-10 0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.657269 0.664034 0.809799 0.812501 0.721948 0.822444 0.801105 0.868348 0.873018 0.879374 0.879949 0.879948
0.879996 0.879996 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.814983 0.821029 0.82209 0.865796
@@ -45,7 +45,7 @@
0.81005 0.880001 0.88 0.88 0.88 0.88 0.88 0.88 0.851627 0.845482 0.839981 0.864734
0.878363 0.879805 0.879982 0.879998 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
99801.4 99784.8 99641.6 99624.1 99735.2 99586.7 99631.2 99227.9 99076.5 98851.8 98827.7 98826.7
98821.2 98820.1 98816.2 98815.1 98811.4 98810.3 98806.8 98805.6 98802.9 98801.2 98800.3 98798.2
87652.7 87649.5 87640.9 87638.7 87631.6 87630.5 87622.4 87622.4 99630.2 99602.8 99587.8 99281.3
@@ -59,7 +59,7 @@
98338.9 98793.2 98787.3 98781.2 98775.4 98769.1 98765.2 98762.2 99478.6 99507.3 99522.3 99297.9
98878.5 98822.8 98811.9 98805.1 98798.7 98792.4 98786.2 98780.2 98774.3 98768.8 98764.7 98762.2
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
99801.4 99784.8 99641.6 99624.1 99735.2 99586.7 99631.2 99227.9 99076.5 98851.8 98827.7 98826.7
98821.2 98820.1 98816.2 98815.1 98811.4 98810.3 98806.8 98805.6 98802.9 98801.2 98800.3 98798.2
87652.7 87649.5 87640.9 87638.7 87631.6 87630.5 87622.4 87622.4 99630.2 99602.8 99587.8 99281.3
@@ -73,7 +73,7 @@
99575.8 98793.2 98787.3 98781.2 98775.4 98769.1 98765.2 98762.2 99478.6 99507.3 99522.3 99297.9
98878.5 98822.8 98811.9 98805.1 98798.7 98792.4 98786.2 98780.2 98774.3 98768.8 98764.7 98762.2
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
100104 100091 100102 100091 100080 100080 100074 100073 100068 100067 100064 100063
100059 100058 100054 100053 100049 100048 100045 100043 100041 100039 100038 100036
100030 100027 100018 100016 100009 100008 100000 100000 100103 100092 100080 100072
@@ -87,7 +87,7 @@
100037 100031 100025 100019 100013 100007 100003 100000 100105 100094 100080 100070
100062 100056 100049 100043 100036 100030 100024 100018 100012 100007 100002 100000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
974.289 977.587 974.267 976.628 989.112 987.93 996.666 996.702 998.086 998.088 998.217 998.217
998.228 998.228 998.229 998.229 998.229 998.229 998.229 998.229 998.229 998.229 998.229 998.229
998.224 998.224 998.224 998.224 998.224 998.224 998.224 998.224 974.275 976.877 986.932 996.373
@@ -101,7 +101,7 @@
998.268 998.268 998.268 998.267 998.267 998.268 998.267 998.229 974.264 976.398 984.969 995.37
997.957 998.237 998.266 998.269 998.269 998.269 998.269 998.269 998.269 998.269 998.268 998.229
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
822.703 827.649 822.67 826.194 847.368 845.087 865.217 865.328 870.08 870.089 870.622 870.62
870.669 870.669 870.673 870.673 870.673 870.673 870.673 870.673 870.673 870.673 870.673 870.673
870.673 870.673 870.673 870.673 870.673 870.673 870.673 870.673 822.681 826.57 843.225 864.312
@@ -115,7 +115,7 @@
870.674 870.672 870.67 870.67 870.67 870.671 870.67 870.673 822.665 825.846 839.616 861.323
869.395 870.543 870.664 870.675 870.676 870.677 870.676 870.676 870.676 870.676 870.674 870.673
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
0.849255 0.894979 0.84892 0.881832 1.04201 1.02717 1.14835 1.14897 1.17581 1.17586 1.1788 1.17878
1.179 1.179 1.17897 1.17896 1.17891 1.17891 1.17886 1.17885 1.17881 1.1788 1.17878 1.17876
1.17869 1.17866 1.17855 1.17853 1.17844 1.17843 1.17833 1.17833 0.849036 0.885285 1.01473 1.14324
@@ -129,7 +129,7 @@
1.18731 1.18721 1.18712 1.18703 1.18696 1.18688 1.18676 1.17833 0.848902 0.878842 0.998729 1.1375
1.18132 1.18687 1.1874 1.18738 1.18731 1.18723 1.18716 1.18708 1.18701 1.18694 1.1868 1.17833
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.999994 0.999993 0.999994 0.999994 0.99999 0.999991 0.999987 0.999987 0.999985 0.999985 0.999985 0.999985
0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985
0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999994 0.999994 0.999991 0.999987
@@ -143,7 +143,7 @@
0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999985 0.999994 0.999994 0.999983 0.999978
0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999985
</DataArray>
- <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_Water" NumberOfComponents="1" format="ascii">
2.08448e-12 1.22675e-10 1.75938e-11 1.1111e-09 7.63694e-10 3.81439e-09 1.39276e-09 5.93258e-09 1.85415e-09 6.8391e-09 2.04346e-09 7.29939e-09
2.13314e-09 7.48588e-09 2.21242e-09 7.60206e-09 2.29158e-09 7.64691e-09 2.36919e-09 7.49368e-09 2.44429e-09 6.91015e-09 2.55385e-09 5.79007e-09
4.37969e-09 7.46323e-09 6.10234e-09 9.17925e-09 6.33041e-09 8.97294e-09 3.02334e-09 3.02334e-09 6.98242e-11 6.63323e-09 1.69605e-08 2.53094e-08
@@ -157,7 +157,7 @@
6.9018e-06 6.89529e-06 6.88521e-06 6.87541e-06 6.86842e-06 6.86781e-06 6.80909e-06 3.02334e-09 8.51315e-10 1.58222e-07 8.2412e-06 9.5667e-06
7.66875e-06 6.9776e-06 6.90778e-06 6.90107e-06 6.90051e-06 6.89974e-06 6.89856e-06 6.89683e-06 6.89444e-06 6.89089e-06 6.83048e-06 3.02334e-09
</DataArray>
- <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Water" NumberOfComponents="1" format="ascii">
5.66748e-06 6.57401e-06 5.66097e-06 6.31502e-06 9.58505e-06 9.2423e-06 1.30856e-05 1.31153e-05 1.45445e-05 1.45475e-05 1.47278e-05 1.4727e-05
1.47431e-05 1.47429e-05 1.47437e-05 1.47435e-05 1.47431e-05 1.47429e-05 1.47424e-05 1.47422e-05 1.47418e-05 1.47415e-05 1.47414e-05 1.47411e-05
1.47402e-05 1.47397e-05 1.47384e-05 1.47381e-05 1.4737e-05 1.47368e-05 1.47356e-05 1.47356e-05 5.66319e-06 6.38302e-06 8.96753e-06 1.28485e-05
@@ -171,7 +171,7 @@
1.47073e-05 1.47055e-05 1.47042e-05 1.47032e-05 1.47024e-05 1.47017e-05 1.47011e-05 1.47356e-05 5.66025e-06 6.25202e-06 8.41407e-06 1.20857e-05
1.42811e-05 1.46645e-05 1.47055e-05 1.47085e-05 1.47079e-05 1.4707e-05 1.4706e-05 1.4705e-05 1.47041e-05 1.47032e-05 1.47022e-05 1.47356e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -185,7 +185,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
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="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_NAPL" NumberOfComponents="1" format="ascii">
1.36916e-08 1.03792e-06 1.15374e-07 8.7152e-06 2.02398e-05 8.75223e-05 0.000130118 0.00055907 0.00025575 0.00094409 0.000294804 0.0010529
0.000308934 0.00108413 0.000320518 0.00110133 0.000331995 0.00110785 0.000343238 0.00108565 0.000354118 0.00100111 0.000369987 0.000838839
0.000634502 0.00108123 0.000884069 0.00132984 0.00091711 0.00129995 0.000438002 0.000438002 4.58134e-07 5.30501e-05 0.000346836 0.00220441
@@ -199,7 +199,7 @@
1 0.998852 0.997285 0.995835 0.99483 0.994797 0.986211 0.000438002 5.58117e-06 0.00121893 0.13566 0.664355
1 1 1 1 1 0.999899 0.999707 0.999439 0.999077 0.998531 0.989614 0.000438002
</DataArray>
- <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -213,7 +213,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
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="x^H2O_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Air" NumberOfComponents="1" format="ascii">
0.401819 0.316577 0.402441 0.340287 0.109762 0.12527 0.0346303 0.0343576 0.0242832 0.0242671 0.023361 0.0233644
0.0232828 0.0232834 0.0232774 0.0232777 0.023278 0.0232782 0.023279 0.0232793 0.02328 0.0232804 0.0232808 0.0232811
0.0232827 0.0232834 0.0232855 0.0232859 0.0232876 0.0232878 0.0232898 0.0232898 0.402231 0.334004 0.139297 0.0368506
@@ -227,7 +227,7 @@
0.0232788 0.0232844 0.023288 0.0232901 0.0232913 0.0232916 0.0232942 0.0232898 0.402528 0.346105 0.170091 0.0452885
0.0255009 0.0234986 0.0232938 0.0232754 0.0232752 0.0232764 0.0232783 0.02328 0.0232817 0.0232836 0.023288 0.0232898
</DataArray>
- <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_Air" NumberOfComponents="1" format="ascii">
6.88747e-10 4.05391e-08 5.81339e-09 3.67174e-07 2.52397e-07 1.26064e-06 4.60331e-07 1.96084e-06 6.1286e-07 2.26058e-06 6.75466e-07 2.41284e-06
7.05144e-07 2.4746e-06 7.31385e-07 2.51313e-06 7.57591e-07 2.52808e-06 7.83283e-07 2.47753e-06 8.08145e-07 2.28471e-06 8.44388e-07 1.91443e-06
1.44819e-06 2.46787e-06 2.01804e-06 3.03563e-06 2.09365e-06 2.96765e-06 1e-06 1e-06 2.30713e-08 2.192e-06 5.60537e-06 8.36531e-06
@@ -241,7 +241,7 @@
0.00228198 0.00227998 0.00227678 0.00227368 0.0022715 0.00227144 0.00225211 1e-06 2.81285e-07 5.22843e-05 0.00272367 0.00316208
0.00253494 0.00230663 0.00228369 0.00228162 0.00228158 0.00228147 0.00228122 0.00228079 0.00228013 0.00227908 0.00225919 1e-06
</DataArray>
- <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Air" NumberOfComponents="1" format="ascii">
0.598181 0.683423 0.597559 0.659713 0.890238 0.874729 0.965369 0.96564 0.975716 0.975731 0.976638 0.976633
0.976716 0.976714 0.976722 0.97672 0.976721 0.976719 0.97672 0.976718 0.976719 0.976717 0.976718 0.976717
0.976716 0.976714 0.976713 0.976711 0.97671 0.976709 0.976709 0.976709 0.597769 0.665994 0.860698 0.963141
diff --git a/test/references/kuevette3p3cnicc-reference.vtu b/test/references/kuevette3p3cnicc-reference.vtu
index e0d3f2b8799d13a2617fd339b89632077bcee2a8..85700b3e61c143eac6047b168e65ef96be76795a 100644
--- a/test/references/kuevette3p3cnicc-reference.vtu
+++ b/test/references/kuevette3p3cnicc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="120" NumberOfPoints="144">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.299058 0.269131 0.197939 0.131121 0.120225 0.120019 0.120001 0.12 0.12 0.12 0.12 0.12
0.12 0.12 0.12 0.193424 0.184726 0.157538 0.12416 0.120271 0.120023 0.120002 0.12 0.12
0.12 0.12 0.12 0.12 0.12 0.12 0.18752 0.171477 0.156963 0.125386 0.120356 0.120029
@@ -15,7 +15,7 @@
0.120004 0.12 0.119998 0.12 0.12 0.12 0.12 0.12 0.12 0.160048 0.168989 0.15684
0.126925 0.120597 0.120058 0.120005 0.12 0.12 0.12 0.12 0.12 0.12 0.12 0.12
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_NAPL" 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
@@ -27,7 +27,7 @@
0.0699676 0.0699371 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="S_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.700942 0.730869 0.802061 0.868879 0.879775 0.879981 0.879999 0.88 0.88 0.88 0.88 0.88
0.88 0.88 0.88 0.806576 0.815274 0.842462 0.87584 0.879729 0.879977 0.879998 0.88 0.88
0.88 0.88 0.88 0.88 0.88 0.88 0.81248 0.828523 0.843037 0.874614 0.879644 0.879971
@@ -39,7 +39,7 @@
0.810029 0.810063 0.880002 0.88 0.88 0.88 0.88 0.88 0.88 0.839952 0.831011 0.84316
0.873075 0.879403 0.879942 0.879995 0.88 0.88 0.88 0.88 0.88 0.88 0.88 0.88
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
99776.7 99740.2 99638.5 99218.6 98841.9 98829.8 98824.4 98819.6 98814.9 98810.4 98806.4 98803.7
87654 87639.6 87628.1 99653.2 99619.3 99511.8 98984.5 98842.5 98828.9 98823.3 98818.5 98813.7
98808.9 98804.3 98800.4 87648.5 87636.1 87627 99643.8 99581.3 99508.2 99026.7 98844.4 98828
@@ -51,7 +51,7 @@
98347.7 98341.6 98796.1 98790.2 98784.3 98778.2 98772 98767.7 98764 99543 99565.4 99499
99070.2 98840.7 98815.6 98807.6 98801.3 98795.1 98789.2 98783.2 98777.4 98771.8 98767.3 98763.6
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_NAPL" NumberOfComponents="1" format="ascii">
99776.7 99740.2 99638.5 99218.6 98841.9 98829.8 98824.4 98819.6 98814.9 98810.4 98806.4 98803.7
87654 87639.6 87628.1 99653.2 99619.3 99511.8 98984.5 98842.5 98828.9 98823.3 98818.5 98813.7
98808.9 98804.3 98800.4 87648.5 87636.1 87627 99643.8 99581.3 99508.2 99026.7 98844.4 98828
@@ -63,7 +63,7 @@
99584.8 99578.2 98796.1 98790.2 98784.3 98778.2 98772 98767.7 98764 99543 99565.4 99499
99070.2 98840.7 98815.6 98807.6 98801.3 98795.1 98789.2 98783.2 98777.4 98771.8 98767.3 98763.6
</DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
100106 100093 100083 100077 100072 100067 100062 100057 100053 100048 100044 100041
100032 100017 100006 100107 100093 100082 100076 100071 100066 100061 100056 100051
100047 100042 100038 100026 100014 100005 100111 100094 100081 100075 100070 100065
@@ -75,7 +75,7 @@
100046 100040 100034 100028 100022 100016 100010 100005 100002 100101 100086 100073
100064 100057 100051 100045 100039 100033 100027 100021 100015 100010 100005 100001
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
975.16 981.367 993.283 997.652 998.177 998.225 998.229 998.229 998.229 998.229 998.229 998.229
998.224 998.224 998.224 975.062 979.552 992.144 997.529 998.166 998.224 998.229 998.229 998.229
998.229 998.229 998.229 998.224 998.224 998.224 975.198 978.393 990.621 997.324 998.15 998.223
@@ -87,7 +87,7 @@
998.267 998.268 998.267 998.266 998.266 998.264 998.262 998.259 998.255 974.987 978.271 989.656
996.976 998.117 998.233 998.245 998.246 998.246 998.246 998.246 998.246 998.246 998.246 998.245
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_NAPL" NumberOfComponents="1" format="ascii">
823.982 833.621 856.245 868.48 870.458 870.654 870.671 870.673 870.673 870.673 870.673 870.673
870.673 870.673 870.673 823.839 830.71 853.654 868.049 870.413 870.65 870.671 870.673 870.673
870.673 870.673 870.673 870.673 870.673 870.673 824.037 828.903 850.404 867.331 870.345 870.646
@@ -99,7 +99,7 @@
870.669 870.674 870.671 870.669 870.669 870.669 870.67 870.671 870.669 823.728 828.714 848.4
866.119 870.14 870.621 870.671 870.675 870.676 870.676 870.676 870.675 870.675 870.675 870.673
</DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Air" NumberOfComponents="1" format="ascii">
0.861745 0.944794 1.09665 1.16685 1.17797 1.17902 1.17906 1.17901 1.17895 1.1789 1.17885 1.17882
1.17871 1.17854 1.1784 0.860347 0.921179 1.08118 1.1644 1.17771 1.17899 1.17905 1.17901 1.17895
1.17889 1.17884 1.17879 1.17865 1.17851 1.17841 0.862331 0.905736 1.06128 1.16041 1.17741 1.17906
@@ -111,7 +111,7 @@
1.18739 1.18734 1.18708 1.18691 1.18673 1.1864 1.18565 1.18495 1.18417 0.85921 0.904052 1.05174
1.15697 1.17968 1.1823 1.18248 1.18241 1.18233 1.18224 1.18215 1.18206 1.18197 1.18188 1.18173
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.999994 0.999992 0.999989 0.999986 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999985
0.999985 0.999985 0.999985 0.999994 0.999993 0.999989 0.999986 0.999985 0.999985 0.999985 0.999985 0.999985
0.999985 0.999985 0.999985 0.999985 0.999985 0.999985 0.999994 0.999993 0.99999 0.999986 0.999985 0.999985
@@ -123,7 +123,7 @@
0.999978 0.999978 0.999979 0.999979 0.999979 0.999979 0.999979 0.99998 0.999981 0.999994 0.999993 0.999987
0.999984 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999983
</DataArray>
- <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_Water" NumberOfComponents="1" format="ascii">
1.08406e-10 3.41182e-10 6.78031e-10 8.72625e-10 9.60789e-10 1.00605e-09 1.05633e-09 1.11232e-09 1.17331e-09 1.2365e-09 1.29692e-09 1.38008e-09
3.82849e-09 7.22517e-09 8.24558e-09 7.37023e-10 1.69159e-09 4.0991e-09 5.45829e-09 6.22711e-09 6.87165e-09 7.59904e-09 8.34481e-09 8.91829e-09
8.93013e-09 7.82912e-09 5.56102e-09 1.20022e-08 1.86701e-08 2.0786e-08 1.97416e-09 6.44421e-09 3.15057e-08 5.6646e-08 7.67159e-08 9.55248e-08
@@ -135,7 +135,7 @@
6.90493e-06 6.90197e-06 6.76907e-06 6.69476e-06 6.60405e-06 6.39952e-06 5.84332e-06 5.31923e-06 4.72968e-06 1.39964e-09 2.36645e-08 2.75485e-06
2.96524e-06 2.97194e-06 2.95531e-06 2.93722e-06 2.91981e-06 2.90579e-06 2.89192e-06 2.87827e-06 2.86402e-06 2.84619e-06 2.82069e-06 2.73927e-06
</DataArray>
- <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Water" NumberOfComponents="1" format="ascii">
5.91776e-06 7.54601e-06 1.10768e-05 1.40279e-05 1.46727e-05 1.47392e-05 1.47445e-05 1.47443e-05 1.47436e-05 1.4743e-05 1.47423e-05 1.47419e-05
1.47404e-05 1.47382e-05 1.47364e-05 5.88959e-06 7.085e-06 1.06067e-05 1.38949e-05 1.46572e-05 1.47377e-05 1.47443e-05 1.47441e-05 1.47434e-05
1.47427e-05 1.4742e-05 1.47414e-05 1.47395e-05 1.47376e-05 1.47362e-05 5.92901e-06 6.78263e-06 1.00615e-05 1.36799e-05 1.46338e-05 1.47356e-05
@@ -147,7 +147,7 @@
1.47067e-05 1.47076e-05 1.47063e-05 1.47052e-05 1.47046e-05 1.47048e-05 1.47071e-05 1.47092e-05 1.47111e-05 5.86735e-06 6.75013e-06 9.73569e-06
1.33182e-05 1.45483e-05 1.47109e-05 1.4727e-05 1.47278e-05 1.47271e-05 1.47263e-05 1.47254e-05 1.47245e-05 1.47237e-05 1.47229e-05 1.47223e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -159,7 +159,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
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="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_NAPL" NumberOfComponents="1" format="ascii">
7.59362e-07 3.98428e-06 3.25983e-05 0.000105621 0.000136733 0.000145521 0.000153017 0.000161147 0.000169984 0.000179139 0.000187891 0.000199938
0.000554648 0.00104674 0.00119457 5.12538e-06 1.68428e-05 0.000164651 0.000638073 0.000882898 0.000993654 0.00110076 0.00120896 0.00129206
0.00129377 0.00113426 0.000805661 0.00173882 0.00270482 0.00301136 1.38671e-05 5.82497e-05 0.00101714 0.00625156 0.0108166 0.0138081
@@ -171,7 +171,7 @@
1 1 0.980495 0.969613 0.956439 0.926835 0.846368 0.770493 0.685007 9.6792e-06 0.000211768 0.0780206
0.297291 0.411964 0.426325 0.425446 0.423094 0.421078 0.419063 0.417081 0.41501 0.412417 0.408705 0.39686
</DataArray>
- <DataArray type="Float32" Name="x^Air_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_NAPL" NumberOfComponents="1" format="ascii">
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
@@ -183,7 +183,7 @@
1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
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="x^H2O_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Air" NumberOfComponents="1" format="ascii">
0.377667 0.234147 0.0634704 0.0273767 0.023639 0.0233064 0.0232777 0.0232763 0.0232772 0.0232782 0.0232792 0.02328
0.0232824 0.0232857 0.0232884 0.380375 0.271852 0.0748324 0.0282608 0.0237159 0.0233129 0.0232783 0.0232764 0.0232773
0.0232784 0.0232795 0.0232805 0.0232835 0.0232865 0.0232886 0.376611 0.298062 0.0915019 0.0297321 0.0238307 0.0233205
@@ -195,7 +195,7 @@
0.023286 0.0232787 0.0232853 0.0232892 0.0232914 0.0232924 0.0232918 0.0232918 0.0232953 0.382482 0.300883 0.103048
0.0324184 0.0241838 0.0233653 0.023283 0.0232763 0.023277 0.0232786 0.0232802 0.0232818 0.0232836 0.0232855 0.0232888
</DataArray>
- <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^mesitylene_Air" NumberOfComponents="1" format="ascii">
3.58184e-08 1.12745e-07 2.2408e-07 2.88408e-07 3.17563e-07 3.32538e-07 3.49175e-07 3.677e-07 3.87879e-07 4.08787e-07 4.28778e-07 4.56286e-07
1.26591e-06 2.38938e-06 2.72715e-06 2.43518e-07 5.58991e-07 1.35471e-06 1.80402e-06 2.05822e-06 2.27137e-06 2.51193e-06 2.75858e-06 2.9483e-06
2.95235e-06 2.58847e-06 1.83866e-06 3.96882e-06 6.17449e-06 6.87487e-06 6.52251e-07 2.12949e-06 1.04123e-05 1.87222e-05 2.53569e-05 3.15753e-05
@@ -207,7 +207,7 @@
0.00228282 0.00228198 0.00223818 0.00221374 0.00218388 0.00211637 0.00193255 0.00175929 0.00156436 4.62478e-07 7.82051e-06 0.000910532
0.000980154 0.000982435 0.000976998 0.000971075 0.000965378 0.000960804 0.000956274 0.000951818 0.000947159 0.000941316 0.000932923 0.000906028
</DataArray>
- <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_Air" NumberOfComponents="1" format="ascii">
0.622333 0.765852 0.936529 0.972623 0.976361 0.976693 0.976722 0.976723 0.976722 0.976721 0.97672 0.97672
0.976716 0.976712 0.976709 0.619625 0.728147 0.925166 0.971737 0.976282 0.976685 0.976719 0.976721 0.97672
0.976719 0.976718 0.976718 0.976713 0.976707 0.976704 0.623388 0.701936 0.908488 0.970249 0.976144 0.976648
diff --git a/test/references/lensbox-reference.vtu b/test/references/lensbox-reference.vtu
index 6dcb24b845d02ee3373e721b93214d9fd6264b73..98339739ca3423cc547b2803edcd0ba3225d368e 100644
--- a/test/references/lensbox-reference.vtu
+++ b/test/references/lensbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1536" NumberOfPoints="1617">
- <PointData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_liqTrichloroethene">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" 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
@@ -140,7 +140,7 @@
3.4929e-05 3.91854e-08 6.66701e-14 5.416e-25 -1.54724e-33 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" 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
@@ -277,7 +277,7 @@
0.999965 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="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
153955 152690 152269 151338 151814 150519 151092 149819 150468 149207 149915 148662
149417 148169 148963 147719 148544 147303 148156 146918 147793 146556 147451 146216
147128 145894 146819 145586 146523 145291 146238 145007 145963 144733 145695 144466
@@ -414,7 +414,7 @@
101658 101585 101512 101439 101365 101291 101216 101139 101061 100982 100901 100817
100732 100645 100557 100466 100375 100282 100189 100094 100000
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
153955 152690 152269 151338 151814 150519 151092 149819 150468 149207 149915 148662
149417 148169 148963 147719 148544 147303 148156 146918 147793 146556 147451 146216
147128 145894 146819 145586 146523 145291 146238 145007 145963 144733 145695 144466
@@ -688,7 +688,7 @@
0.785143 0.000882787 1.49885e-09 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -825,7 +825,7 @@
1000 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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -962,7 +962,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" 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
@@ -1099,7 +1099,7 @@
1000 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="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" 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
diff --git a/test/references/lensbox_ifsolver-reference.vtu b/test/references/lensbox_ifsolver-reference.vtu
index 5aa498b53dc9addfac59896b8ad62f887cffe454..b46835991e1ad2b588503a6ce52a4a2968da4006 100644
--- a/test/references/lensbox_ifsolver-reference.vtu
+++ b/test/references/lensbox_ifsolver-reference.vtu
@@ -1031,7 +1031,7 @@
0 0 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="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" 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
@@ -1545,7 +1545,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
153955 152692 152269 151340 152692 151818 151340 150523 151818 151099 150523 149826
151099 150477 149826 149217 150477 149927 149217 148674 149927 149431 148674 148183
149431 148979 148183 147735 148979 148563 147735 147322 148563 148178 147322 146939
@@ -2059,7 +2059,7 @@
101760 101673 100533 100446 101673 101586 100446 100359 101586 101497 100359 100270
101497 101407 100270 100181 101407 101317 100181 100090 101317 101226 100090 100000
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -2573,7 +2573,7 @@
1000 1000 1000 1000 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="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" 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
@@ -3087,7 +3087,7 @@
1000 1000 1000 1000 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="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" 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
@@ -3601,7 +3601,7 @@
-0 -0 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="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
153955 152692 152269 151340 152692 151818 151340 150523 151818 151099 150523 149826
151099 150477 149826 149217 150477 149927 149217 148674 149927 149431 148674 148183
149431 148979 148183 147735 148979 148563 147735 147322 148563 148178 147322 146939
@@ -4115,7 +4115,7 @@
101760 101673 100533 100446 101673 101586 100446 100359 101586 101497 100359 100270
101497 101407 100270 100181 101407 101317 100181 100090 101317 101226 100090 100000
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -4629,7 +4629,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" 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
diff --git a/test/references/lensboxadaptive-reference.vtu b/test/references/lensboxadaptive-reference.vtu
index 56798c2d2a2740ac9f01c7ff31d99f941d1d95a4..5f1d10f30f2e6f97cd2b4744c5c3ee5290bcf6b6 100644
--- a/test/references/lensboxadaptive-reference.vtu
+++ b/test/references/lensboxadaptive-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="5055" NumberOfPoints="5069">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_liqSimpleH2O">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" 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
@@ -428,7 +428,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" 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
@@ -853,7 +853,7 @@
0 1.4013e-44 0 -0 -0 4.90771e-20 2.57608e-23 0 -0 -0 0 -0
1.11723e-09 8.04505e-11 2.27727e-12 2.50368e-11 9.15436e-23
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
153955 152690 152269 151338 151814 150519 151093 149820 150469 149208 149916 148663
149418 148170 148964 147720 148546 147305 148158 146920 147795 146559 147454 146219
147130 145896 146822 145589 146526 145294 146241 145010 145966 144736 145699 144469
@@ -1278,7 +1278,7 @@
104003 103981 104891 104585 104271 103380 102731 102769 102749 103653 103349 103037
102550 102225 101576 101927 101504
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
153955 152690 152269 151338 151814 150519 151093 149820 150469 149208 149916 148663
149418 148170 148964 147720 148546 147305 148158 146920 147795 146559 147454 146219
147130 145896 146822 145589 146526 145294 146241 145010 145966 144736 145699 144469
@@ -2128,7 +2128,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
2.51696e-05 1.81243e-06 5.13101e-08 5.64047e-07 0
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -2553,7 +2553,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -2978,7 +2978,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" 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
@@ -3403,7 +3403,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" 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
diff --git a/test/references/lenscc-reference.vtu b/test/references/lenscc-reference.vtu
index c553bc1e7407689d684719739f5b76e728c68fc5..f973994b381aecea6a251128bbb91f836f4a827a 100644
--- a/test/references/lenscc-reference.vtu
+++ b/test/references/lenscc-reference.vtu
@@ -263,7 +263,7 @@
131.039 105.413 60.0852 13.2658 0.254795 7.88749e-05 1.42535e-11 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" 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
@@ -393,7 +393,7 @@
0.975821 0.991067 0.996666 0.999387 0.999989 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
152500 151568 150802 150144 149565 149047 148576 148144 147745 147373 147024 146694
146381 146081 145793 145515 145246 144983 144727 144477 144230 143989 143750 143515
143284 143055 142828 142605 142385 142167 141952 141740 141531 141325 141122 140922
@@ -523,7 +523,7 @@
102497 102420 102346 102273 102199 102125 102051 101976 101902 101827 101752 101676
101599 101521 101441 101360 101277 101192 101106 101018 100929 100840 100749 100659
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -653,7 +653,7 @@
1000 1000 1000 1000 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="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" 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
@@ -783,7 +783,7 @@
950.67 992.551 998.926 999.963 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="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" 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 7.1918e-38 3.78599e-33 -1.74859e-32
@@ -913,7 +913,7 @@
0.0241793 0.00893257 0.00333371 0.000612571 1.13181e-05 3.50111e-09 6.21494e-16 6.44906e-29 -4.10091e-38 8.40779e-45 0 0
0 0 -0 -0 0 0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
152500 151568 150802 150144 149565 149047 148576 148144 147745 147373 147024 146694
146381 146081 145793 145515 145246 144983 144727 144477 144230 143989 143750 143515
143284 143055 142828 142605 142385 142167 141952 141740 141531 141325 141122 140922
@@ -1043,7 +1043,7 @@
102628 102526 102406 102286 102199 102125 102051 101976 101902 101827 101752 101676
101599 101521 101441 101360 101277 101192 101106 101018 100929 100840 100749 100659
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -1173,7 +1173,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" 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
diff --git a/test/references/lenscc_oilwet-reference.vtu b/test/references/lenscc_oilwet-reference.vtu
index 9f7a25a444e94a66886d538a95408627f35f8f9b..1484f8fc40f7b1dd50905ddd428087a860bda23d 100644
--- a/test/references/lenscc_oilwet-reference.vtu
+++ b/test/references/lenscc_oilwet-reference.vtu
@@ -263,7 +263,7 @@
339.578 321.623 307.089 294.526 283.054 272.068 261.083 249.633 237.204 223.165 206.711 186.85
162.321 131.541 86.5034 12.6536 0.0461824 4.26058e-07 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" 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
@@ -393,7 +393,7 @@
0.373837 0.424257 0.469718 0.512128 0.553035 0.593718 0.635332 0.678982 0.725711 0.776266 0.830468 0.885934
0.937011 0.975395 0.994308 0.999417 0.999998 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
100004 100011 100018 100025 100031 100038 100045 100051 100057 100063 100068 100074
100079 100083 100087 100091 100094 100097 100099 100101 100102 100103 100104 100104
100103 100102 100101 100099 100096 100094 100091 100087 100084 100080 100075 100071
@@ -523,7 +523,7 @@
100385 100354 100327 100301 100277 100254 100232 100211 100190 100170 100151 100133
100117 100105 100094 100084 100074 100064 100054 100044 100034 100024 100015 100005
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -653,7 +653,7 @@
1000 1000 1000 1000 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="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" 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
@@ -783,7 +783,7 @@
24.9495 39.2735 56.4049 76.6141 100.559 129.322 164.56 208.753 265.549 340.027 438.23 564.063
755.917 949.07 996.913 999.967 1000 1000 1000 1000 1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" 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
@@ -913,7 +913,7 @@
0.626163 0.575743 0.530282 0.487871 0.446965 0.406282 0.364668 0.321017 0.274289 0.223734 0.169532 0.114066
0.0629887 0.0246049 0.00569207 0.000583186 2.05022e-06 1.8912e-11 4.63362e-21 -4.60826e-34 1.84535e-38 0 0 0
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
100004 100011 100018 100025 100031 100038 100045 100051 100057 100063 100068 100074
100079 100083 100087 100091 100094 100097 100099 100101 100102 100103 100104 100104
100103 100102 100101 100099 100096 100094 100091 100087 100084 100080 100075 100071
@@ -1043,7 +1043,7 @@
100724 100676 100634 100596 100560 100527 100493 100461 100427 100393 100357 100320
100280 100236 100180 100096 100074 100064 100054 100044 100034 100024 100015 100005
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -1173,7 +1173,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" 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
diff --git a/test/references/lensccadaptive-reference.vtu b/test/references/lensccadaptive-reference.vtu
index bd13334661d7a58f51809333241581b64639533e..db3afb1a655764d620f5386b080ec06b5c9cb701 100644
--- a/test/references/lensccadaptive-reference.vtu
+++ b/test/references/lensccadaptive-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="5448" NumberOfPoints="5705">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_liqSimpleH2O">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" 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
@@ -459,7 +459,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" 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
@@ -915,7 +915,7 @@
0 0 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="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
152501 151571 150807 150982 150179 149472 150152 149575 149058 148847 148288 147784
149380 148691 148055 147747 147149 146581 147475 146948 146465 146052 145562 145108
148590 148161 147764 147325 146902 146510 147394 147047 146719 146145 145802 145477
@@ -1371,7 +1371,7 @@
104782 104696 104608 103550 103465 103378 104518 104428 104337 103289 103200 103111
102320 102235 102149 101092 101008 100922 102061 101973 101884 100834 100746 100658
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
152501 151571 150807 150982 150179 149472 150152 149575 149058 148847 148288 147784
149380 148691 148055 147747 147149 146581 147475 146948 146465 146052 145562 145108
148590 148161 147764 147325 146902 146510 147394 147047 146719 146145 145802 145477
@@ -2283,7 +2283,7 @@
0 0 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="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -2739,7 +2739,7 @@
1000 1000 1000 1000 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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -3195,7 +3195,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" 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
@@ -3651,7 +3651,7 @@
1000 1000 1000 1000 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="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" 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
diff --git a/test/references/lensccadaptivepointsource-reference.vtu b/test/references/lensccadaptivepointsource-reference.vtu
index 9cf2f03499b35742eac14c50b04505dc8d7b167b..2079b553d9643ef8f399b8b3edf6bb85a9c4739a 100644
--- a/test/references/lensccadaptivepointsource-reference.vtu
+++ b/test/references/lensccadaptivepointsource-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="5457" NumberOfPoints="5718">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_liqSimpleH2O">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" 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
@@ -460,7 +460,7 @@
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="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" 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
@@ -917,7 +917,7 @@
-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="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
152501 151573 150810 150983 150181 149475 150156 149580 149064 148851 148293 147790
149381 148692 148058 147748 147151 146585 147479 146953 146471 146056 145567 145114
148597 148168 147772 147331 146909 146518 147402 147056 146728 146153 145810 145486
@@ -1374,7 +1374,7 @@
103550 103464 103378 104518 104428 104337 103289 103200 103111 102320 102235 102149
101092 101007 100921 102061 101973 101884 100834 100746 100658
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
152501 151573 150810 150983 150181 149475 150156 149580 149064 148851 148293 147790
149381 148692 148058 147748 147151 146585 147479 146953 146471 146056 145567 145114
148597 148168 147772 147331 146909 146518 147402 147056 146728 146153 145810 145486
@@ -2288,7 +2288,7 @@
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="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -2745,7 +2745,7 @@
1000 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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -3202,7 +3202,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" 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
@@ -3659,7 +3659,7 @@
1000 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="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" 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
diff --git a/test/references/lensccmpfaadaptive-reference.vtu b/test/references/lensccmpfaadaptive-reference.vtu
index 50828b1f368a218fa74dc8c6bddacb5eb381f1e6..b0268b7ad29df2da6d17a28a07a31113d97bf70c 100644
--- a/test/references/lensccmpfaadaptive-reference.vtu
+++ b/test/references/lensccmpfaadaptive-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="5448" NumberOfPoints="5705">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_liqSimpleH2O">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" 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
@@ -459,7 +459,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqTrichloroethene" 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
@@ -915,7 +915,7 @@
0 -0 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="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
152500 151570 150805 150982 150178 149470 150149 149571 149054 148844 148285 147780
149380 148689 148053 147747 147148 146579 147473 146944 146461 146049 145558 145103
148585 148155 147757 147319 146896 146504 147386 147039 146710 146137 145793 145468
@@ -1371,7 +1371,7 @@
104786 104698 104609 103555 103468 103380 104519 104429 104338 103291 103201 103111
102326 102240 102152 101098 101012 100925 102063 101974 101884 100836 100747 100658
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqTrichloroethene" NumberOfComponents="1" format="ascii">
152500 151570 150805 150982 150178 149470 150149 149571 149054 148844 148285 147780
149380 148689 148053 147747 147148 146579 147473 146944 146461 146049 145558 145103
148585 148155 147757 147319 146896 146504 147386 147039 146710 146137 145793 145468
@@ -2283,7 +2283,7 @@
0 0 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="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -2739,7 +2739,7 @@
1000 1000 1000 1000 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="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqTrichloroethene" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
@@ -3195,7 +3195,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" 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
@@ -3651,7 +3651,7 @@
1000 1000 1000 1000 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="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqTrichloroethene" 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
diff --git a/test/references/md-boundary-1p2p-injection-2p-reference.vtu b/test/references/md-boundary-1p2p-injection-2p-reference.vtu
index 9ba7e63706cc3cf9d59a774bbfa7f3da6b1be4fd..11d4d8c9689f9d54d126311d22104f5e08b6f887 100644
--- a/test/references/md-boundary-1p2p-injection-2p-reference.vtu
+++ b/test/references/md-boundary-1p2p-injection-2p-reference.vtu
@@ -89,7 +89,7 @@
4.46405 1.59476 1.59963 1.60995 1.62234 1.63664 1.6362 1.62659 1.61918 1.61413 1.71018 1.71018
1.61413 1.61918 1.62659 1.6362
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 0.999999 0.999999 1 1 1 1 1 1
1 1 1 1 1 1 0.999987 0.999793 0.999793 0.999987 1 1
@@ -132,7 +132,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
3.55303e+06 3.65278e+06 3.73199e+06 3.7872e+06 3.81555e+06 3.81555e+06 3.7872e+06 3.73199e+06 3.65278e+06 3.55303e+06 3.54852e+06 3.69791e+06
3.83361e+06 3.95121e+06 4.04586e+06 4.11259e+06 4.14704e+06 4.14704e+06 4.11259e+06 4.04586e+06 3.95121e+06 3.83361e+06 3.69791e+06 3.54852e+06
3.61882e+06 3.80041e+06 3.97308e+06 4.1323e+06 4.2726e+06 4.38764e+06 4.47039e+06 4.51416e+06 4.51416e+06 4.47039e+06 4.38764e+06 4.2726e+06
@@ -175,7 +175,7 @@
4.11259e+06 4.04586e+06 3.95121e+06 3.83361e+06 3.69791e+06 3.54852e+06 3.55303e+06 3.65278e+06 3.73199e+06 3.7872e+06 3.81555e+06 3.81555e+06
3.7872e+06 3.73199e+06 3.65278e+06 3.55303e+06
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liqSimpleH2O" 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
@@ -218,7 +218,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liqSimpleH2O" NumberOfComponents="1" format="ascii">
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 999.967 999.967 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 999.993 999.632 996.73 996.73 999.632 999.993 1000
@@ -261,7 +261,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_gasCH4" NumberOfComponents="1" format="ascii">
2.8145e-11 2.73765e-11 2.67954e-11 2.64051e-11 3.46472e-11 3.46472e-11 2.64051e-11 2.67954e-11 2.73765e-11 2.8145e-11 2.81808e-11 2.70424e-11
2.60851e-11 2.53087e-11 2.49487e-11 3.14847e-09 6.16888e-07 6.16888e-07 3.14847e-09 2.49487e-11 2.53087e-11 2.60851e-11 2.70424e-11 2.81808e-11
2.76333e-11 2.6313e-11 2.51694e-11 2.41997e-11 3.35482e-11 9.23913e-08 1.31528e-05 0.000207004 0.000207004 1.31528e-05 9.23913e-08 3.35482e-11
@@ -304,7 +304,7 @@
3.14847e-09 2.49487e-11 2.53087e-11 2.60851e-11 2.70424e-11 2.81808e-11 2.8145e-11 2.73765e-11 2.67954e-11 2.64051e-11 3.46472e-11 3.46472e-11
2.64051e-11 2.67954e-11 2.73765e-11 2.8145e-11
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_gasCH4" NumberOfComponents="1" format="ascii">
3.55303e+06 3.65278e+06 3.732e+06 3.7872e+06 3.81556e+06 3.81556e+06 3.7872e+06 3.732e+06 3.65278e+06 3.55303e+06 3.54852e+06 3.69791e+06
3.83361e+06 3.95121e+06 4.04586e+06 4.11259e+06 4.14706e+06 4.14706e+06 4.11259e+06 4.04586e+06 3.95121e+06 3.83361e+06 3.69791e+06 3.54852e+06
3.61883e+06 3.80041e+06 3.97308e+06 4.1323e+06 4.2726e+06 4.38765e+06 4.47042e+06 4.51421e+06 4.51421e+06 4.47042e+06 4.38765e+06 4.2726e+06
@@ -347,7 +347,7 @@
4.11259e+06 4.04586e+06 3.95121e+06 3.83361e+06 3.69791e+06 3.54852e+06 3.55303e+06 3.65278e+06 3.732e+06 3.7872e+06 3.81556e+06 3.81556e+06
3.7872e+06 3.732e+06 3.65278e+06 3.55303e+06
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_gasCH4" NumberOfComponents="1" format="ascii">
24.2122 24.8919 25.4317 25.8079 26.0011 26.0011 25.8079 25.4317 24.8919 24.2122 24.1814 25.1994
26.1242 26.9256 27.5705 28.0253 28.2601 28.2601 28.0253 27.5705 26.9256 26.1242 25.1994 24.1814
24.6605 25.8979 27.0746 28.1596 29.1157 29.8997 30.4637 30.7621 30.7621 30.4637 29.8997 29.1157
@@ -390,7 +390,7 @@
28.0253 27.5705 26.9256 26.1242 25.1994 24.1814 24.2122 24.8919 25.4317 25.8079 26.0011 26.0011
25.8079 25.4317 24.8919 24.2122
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_gasCH4" NumberOfComponents="1" format="ascii">
1.12103e-15 1.06334e-15 1.0207e-15 9.92528e-16 1.66658e-15 1.66658e-15 9.92528e-16 1.0207e-15 1.06334e-15 1.12103e-15 1.12374e-15 1.03873e-15
9.69707e-16 9.15392e-16 8.90704e-16 9.0808e-12 2.14293e-07 2.14293e-07 9.0808e-12 8.90704e-16 9.15392e-16 9.69707e-16 1.03873e-15 1.12374e-15
1.08247e-15 9.85935e-16 9.05802e-16 8.40383e-16 1.56717e-15 5.72641e-09 7.34708e-05 0.0141143 0.0141143 7.34708e-05 5.72641e-09 1.56717e-15
diff --git a/test/references/mpnc_2p2c_box-reference.vtu b/test/references/mpnc_2p2c_box-reference.vtu
index ed5058ffe7500c8023e25e37cb5c01f913aca026..80abe88bf98b7af3284bd7b35defb5707b64f143 100644
--- a/test/references/mpnc_2p2c_box-reference.vtu
+++ b/test/references/mpnc_2p2c_box-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <PointData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Nitrogen">
+ <DataArray type="Float32" Name="S_Nitrogen" NumberOfComponents="1" format="ascii">
0.2 0.133819 0.2 0.19564 0.131111 0.193806 0.130149 0.193145 0.129709 0.192847 0.129497 0.192706
0.129389 0.192635 0.129318 0.19259 0.129236 0.192538 0.129078 0.192439 0.128721 0.192213 0.127896 0.191691
0.126003 0.190516 0.121707 0.187977 0.112638 0.183074 0.0980953 0.176024 0.0845145 0.170236 0.082409 0.169419
@@ -41,7 +41,7 @@
0.263503 0.263502 0.263487 0.26374 0.200114 0.200093 0.200093 0.200093 0.200093 0.200093 0.200093 0.200093
0.200112 0.263245 0.262928 0.262915 0.262906
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.8 0.866181 0.8 0.80436 0.868889 0.806194 0.869851 0.806855 0.870291 0.807153 0.870503 0.807294
0.870611 0.807365 0.870682 0.80741 0.870764 0.807462 0.870922 0.807561 0.871279 0.807787 0.872104 0.808309
0.873997 0.809484 0.878293 0.812023 0.887362 0.816926 0.901905 0.823976 0.915486 0.829764 0.917591 0.830581
@@ -79,7 +79,7 @@
0.736497 0.736498 0.736513 0.73626 0.799886 0.799907 0.799907 0.799907 0.799907 0.799907 0.799907 0.799907
0.799888 0.736755 0.737072 0.737085 0.737094
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
100000 109654 100000 102761 113070 104819 114556 105929 115254 106496 115589 106782
115759 106930 115867 107027 115990 107141 116226 107362 116763 107872 118003 109062
120813 111782 126989 117801 140025 130516 165527 155330 208669 197660 270090 258345
@@ -117,7 +117,7 @@
91445.6 91422.8 91366.8 91207.1 99906.2 99957.8 99957.9 99957.9 99957.9 99957.9 99957.9 99957.8
99911.6 92864.8 93114.1 93236.5 93275.6
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
88453 98695.2 88453 91256.1 102134 93331.6 103628 94447 104329 95017.4 104666 95304.4
104837 95453.7 104945 95551.1 105069 95664.7 105307 95886.9 105846 96398.8 107093 97593.7
109918 100325 116128 106368 129237 119128 154852 144007 198095 186389 259532 247082
@@ -155,7 +155,7 @@
79234.3 79211.5 79155.7 78993.2 88358.1 88409.9 88410 88410 88410 88410 88410 88409.9
88363.5 80656.4 80909.4 81031.9 81071.1
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
997.042 997.047 997.042 997.044 997.049 997.045 997.049 997.045 997.05 997.045 997.05 997.046
997.05 997.046 997.05 997.046 997.05 997.046 997.05 997.046 997.05 997.046 997.051 997.047
997.052 997.048 997.055 997.051 997.061 997.056 997.072 997.068 997.092 997.087 997.12 997.114
@@ -193,7 +193,7 @@
997.038 997.038 997.038 997.038 997.042 997.042 997.042 997.042 997.042 997.042 997.042 997.042
997.042 997.039 997.039 997.039 997.039
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
1.11726 1.22635 1.11726 1.14847 1.26496 1.17172 1.28175 1.18426 1.28963 1.19067 1.29343 1.1939
1.29535 1.19558 1.29657 1.19668 1.29796 1.19795 1.30063 1.20045 1.30669 1.20621 1.32071 1.21966
1.35246 1.2504 1.42225 1.31842 1.56956 1.4621 1.85775 1.74252 2.34527 2.22087 3.03936 2.90664
@@ -231,7 +231,7 @@
1.02059 1.02034 1.0197 1.0179 1.1162 1.11678 1.11679 1.11679 1.11679 1.11679 1.11679 1.11679
1.11626 1.03663 1.03945 1.04083 1.04127
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
355.503 540.266 355.503 365.95 549.104 370.412 552.271 372.029 553.722 372.761 554.423 373.108
554.782 373.283 555.016 373.394 555.288 373.521 555.811 373.766 556.996 374.322 559.74 375.608
566.07 378.519 580.645 384.866 612.328 397.351 665.818 415.829 718.868 431.477 727.374 433.723
@@ -269,7 +269,7 @@
227.252 227.254 227.278 226.85 355.232 355.284 355.284 355.284 355.284 355.284 355.284 355.284
355.237 227.688 228.227 228.25 228.265
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" NumberOfComponents="1" format="ascii">
1551.67 486.768 1551.67 1456.9 458.658 1418.17 448.928 1404.38 444.526 1398.18 442.414 1395.25
441.335 1393.77 440.633 1392.84 439.819 1391.77 438.256 1389.71 434.733 1385.05 426.665 1374.32
408.531 1350.32 369.218 1299.39 294.475 1204.5 196.412 1075.96 126.744 977.228 117.668 963.783
@@ -307,7 +307,7 @@
3387.7 3387.66 3387.14 3396.26 1554.21 1553.72 1553.72 1553.72 1553.72 1553.72 1553.72 1553.72
1554.16 3378.43 3367.04 3366.55 3366.23
</DataArray>
- <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" NumberOfComponents="1" format="ascii">
0.999983 0.999981 0.999983 0.999982 0.99998 0.999982 0.99998 0.999981 0.99998 0.999981 0.99998 0.999981
0.99998 0.999981 0.99998 0.999981 0.99998 0.999981 0.99998 0.999981 0.99998 0.999981 0.999979 0.999981
0.999979 0.99998 0.999978 0.999979 0.999975 0.999977 0.999971 0.999973 0.999963 0.999965 0.999952 0.999954
@@ -345,7 +345,7 @@
0.999984 0.999984 0.999984 0.999984 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983
0.999983 0.999984 0.999984 0.999984 0.999984
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
1.74479e-05 1.91874e-05 1.74479e-05 1.79455e-05 1.98031e-05 1.83163e-05 2.00708e-05 1.85162e-05 2.01965e-05 1.86185e-05 2.02569e-05 1.86699e-05
2.02875e-05 1.86967e-05 2.0307e-05 1.87142e-05 2.03292e-05 1.87346e-05 2.03717e-05 1.87744e-05 2.04685e-05 1.88663e-05 2.0692e-05 1.90807e-05
2.11982e-05 1.95708e-05 2.2311e-05 2.06555e-05 2.466e-05 2.29465e-05 2.92553e-05 2.74178e-05 3.70288e-05 3.50452e-05 4.80961e-05 4.59798e-05
@@ -383,7 +383,7 @@
1.59065e-05 1.59024e-05 1.58923e-05 1.58635e-05 1.7431e-05 1.74403e-05 1.74403e-05 1.74403e-05 1.74403e-05 1.74403e-05 1.74403e-05 1.74403e-05
1.7432e-05 1.61622e-05 1.62072e-05 1.62292e-05 1.62363e-05
</DataArray>
- <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Nitrogen" NumberOfComponents="1" format="ascii">
0.0206174 0.0187833 0.0206174 0.0200572 0.01821 0.0196591 0.0179715 0.019451 0.0178616 0.0193462 0.0178093 0.0192939
0.0177829 0.0192668 0.0177661 0.0192492 0.0177471 0.0192286 0.0177107 0.0191886 0.0176284 0.0190969 0.0174414 0.0188864
0.0170319 0.0184221 0.0161962 0.0174716 0.014676 0.0157547 0.0123993 0.0132193 0.00982178 0.010372 0.00757875 0.00792483
@@ -421,7 +421,7 @@
0.0225703 0.022576 0.02259 0.02263 0.020637 0.0206262 0.0206262 0.0206262 0.0206262 0.0206262 0.0206262 0.0206262
0.0206358 0.0222211 0.0221608 0.0221314 0.022122
</DataArray>
- <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Nitrogen" NumberOfComponents="1" format="ascii">
0.979383 0.981217 0.979383 0.979943 0.98179 0.980341 0.982029 0.980549 0.982138 0.980654 0.982191 0.980706
0.982217 0.980733 0.982234 0.980751 0.982253 0.980771 0.982289 0.980811 0.982372 0.980903 0.982559 0.981114
0.982968 0.981578 0.983804 0.982528 0.985324 0.984245 0.987601 0.986781 0.990178 0.989628 0.992421 0.992075
@@ -459,7 +459,7 @@
0.97743 0.977424 0.97741 0.97737 0.979363 0.979374 0.979374 0.979374 0.979374 0.979374 0.979374 0.979374
0.979364 0.977779 0.977839 0.977869 0.977878
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.999989 0.999988 0.999989 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988
0.999987 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988 0.999987 0.999988
0.999986 0.999987 0.999986 0.999987 0.999984 0.999985 0.999981 0.999982 0.999976 0.999977 0.999969 0.99997
@@ -497,7 +497,7 @@
0.99999 0.99999 0.99999 0.99999 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989
0.999989 0.99999 0.99999 0.99999 0.99999
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
1.12207e-05 1.23393e-05 1.12207e-05 1.15407e-05 1.27353e-05 1.17792e-05 1.29075e-05 1.19077e-05 1.29883e-05 1.19735e-05 1.30272e-05 1.20066e-05
1.30468e-05 1.20238e-05 1.30594e-05 1.2035e-05 1.30736e-05 1.20481e-05 1.3101e-05 1.20738e-05 1.31632e-05 1.21328e-05 1.33069e-05 1.22707e-05
1.36325e-05 1.25859e-05 1.43481e-05 1.32835e-05 1.58588e-05 1.47568e-05 1.8814e-05 1.76323e-05 2.38132e-05 2.25376e-05 3.09307e-05 2.95697e-05
@@ -535,7 +535,7 @@
1.02294e-05 1.02268e-05 1.02203e-05 1.02018e-05 1.12098e-05 1.12158e-05 1.12158e-05 1.12158e-05 1.12158e-05 1.12158e-05 1.12158e-05 1.12158e-05
1.12104e-05 1.03939e-05 1.04227e-05 1.04369e-05 1.04415e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Nitrogen" NumberOfComponents="1" format="ascii">
0.0316971 0.0289065 0.0316971 0.0308453 0.028033 0.0302397 0.0276694 0.0299231 0.027502 0.0297636 0.0274222 0.029684
0.027382 0.0296427 0.0273564 0.0296158 0.0273274 0.0295846 0.0272718 0.0295236 0.0271464 0.0293841 0.0268611 0.0290635
0.0262365 0.0283563 0.0249605 0.0269073 0.0226367 0.024286 0.019149 0.0204061 0.01519 0.016036 0.0117355 0.0122691
@@ -573,7 +573,7 @@
0.0346623 0.0346709 0.0346922 0.0347529 0.0317269 0.0317105 0.0317105 0.0317105 0.0317105 0.0317105 0.0317105 0.0317105
0.0317252 0.0341326 0.0340412 0.0339965 0.0339822
</DataArray>
- <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Nitrogen" NumberOfComponents="1" format="ascii">
0.968303 0.971093 0.968303 0.969155 0.971967 0.96976 0.972331 0.970077 0.972498 0.970236 0.972578 0.970316
0.972618 0.970357 0.972644 0.970384 0.972673 0.970415 0.972728 0.970476 0.972854 0.970616 0.973139 0.970937
0.973764 0.971644 0.975039 0.973093 0.977363 0.975714 0.980851 0.979594 0.98481 0.983964 0.988265 0.987731
diff --git a/test/references/mpnc_2p2c_tpfa-reference.vtu b/test/references/mpnc_2p2c_tpfa-reference.vtu
index 63aa164b178c521bf5a14cad9453b75551d94db6..c3f799b13446e3ac5d7ae84720bae44496c3e2b0 100644
--- a/test/references/mpnc_2p2c_tpfa-reference.vtu
+++ b/test/references/mpnc_2p2c_tpfa-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <CellData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Nitrogen">
+ <DataArray type="Float32" Name="S_Nitrogen" NumberOfComponents="1" format="ascii">
0.164716 0.162215 0.161231 0.160743 0.160501 0.160379 0.160307 0.160243 0.16014 0.159925 0.159441 0.15835
0.155881 0.150352 0.139995 0.12839 0.124611 0.131639 0.145596 0.16298 0.182878 0.206514 0.237739 0.288432
0.19856 0.197331 0.196711 0.196397 0.19624 0.196159 0.196112 0.196068 0.195997 0.195846 0.195507 0.19475
@@ -37,7 +37,7 @@
0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236349 0.236341
0.200067 0.200046 0.200046 0.200046 0.200046 0.200046 0.200046 0.200064 0.235723 0.235704 0.235668 0.235641
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.835284 0.837785 0.838769 0.839257 0.839499 0.839621 0.839693 0.839757 0.83986 0.840075 0.840559 0.84165
0.844119 0.849648 0.860005 0.87161 0.875389 0.868361 0.854404 0.83702 0.817122 0.793486 0.762261 0.711568
0.80144 0.802669 0.803289 0.803603 0.80376 0.803841 0.803888 0.803932 0.804003 0.804154 0.804493 0.80525
@@ -71,7 +71,7 @@
0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763651 0.763659
0.799933 0.799954 0.799954 0.799954 0.799954 0.799954 0.799954 0.799936 0.764277 0.764296 0.764332 0.764359
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
103625 107218 108988 109864 110296 110513 110639 110750 110928 111302 112139 114012
118121 126914 145060 179326 233840 305121 384931 465781 542818 613042 673856 721002
101308 103171 104290 104911 105241 105417 105524 105626 105795 106159 106984 108853
@@ -105,7 +105,7 @@
92516.5 92516.5 92516.5 92516.4 92516.2 92516 92515.8 92515.6 92515.8 92516.8 92519.5 92525.5
99931 99978.8 99978.9 99978.9 99978.9 99978.9 99978.8 99936.1 94276.9 94330.8 94411.6 94470.1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
92403.2 96017.9 97797 98677.2 99111.4 99329.7 99455.5 99567.9 99746.4 100122 100964 102846
106977 115817 134050 168412 222956 294180 373875 454574 531432 601432 661928 708497
89775.3 91649.5 92774.7 93398.7 93730.1 93906.4 94014 94116.5 94286.5 94651.3 95479.8 97356
@@ -139,7 +139,7 @@
80603 80603 80602.9 80602.9 80602.7 80602.5 80602.3 80602.1 80602.2 80603.2 80606 80612
88383.4 88431.3 88431.4 88431.4 88431.4 88431.4 88431.3 88388.4 82370 82424.1 82505.3 82564.1
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
997.044 997.046 997.047 997.047 997.047 997.047 997.047 997.047 997.048 997.048 997.048 997.049
997.051 997.055 997.063 997.078 997.103 997.135 997.171 997.207 997.242 997.273 997.301 997.322
997.043 997.044 997.044 997.045 997.045 997.045 997.045 997.045 997.045 997.045 997.046 997.047
@@ -173,7 +173,7 @@
997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039 997.039
997.042 997.042 997.042 997.042 997.042 997.042 997.042 997.042 997.04 997.04 997.04 997.04
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
1.15823 1.19882 1.21883 1.22873 1.23361 1.23607 1.23748 1.23875 1.24075 1.24498 1.25444 1.2756
1.32204 1.4214 1.62646 2.01368 2.62971 3.43523 4.33712 5.25076 6.12131 6.91488 7.6021 8.13488
1.13205 1.1531 1.16574 1.17276 1.17649 1.17847 1.17968 1.18084 1.18275 1.18686 1.19618 1.2173
@@ -207,7 +207,7 @@
1.0327 1.0327 1.03269 1.03269 1.03269 1.03269 1.03269 1.03269 1.03269 1.0327 1.03273 1.0328
1.11648 1.11702 1.11702 1.11702 1.11702 1.11702 1.11702 1.11654 1.05259 1.0532 1.05411 1.05477
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
446.797 453.875 456.682 458.078 458.773 459.125 459.33 459.515 459.81 460.43 461.823 464.977
472.176 488.6 520.511 558.1 570.773 547.389 503.086 451.728 397.879 340.341 274.176 187.886
358.929 361.872 363.362 364.118 364.499 364.694 364.809 364.915 365.086 365.451 366.273 368.111
@@ -241,7 +241,7 @@
276.872 276.872 276.872 276.872 276.872 276.872 276.872 276.871 276.871 276.872 276.873 276.888
355.345 355.393 355.393 355.393 355.393 355.393 355.393 355.35 278.104 278.142 278.213 278.265
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" NumberOfComponents="1" format="ascii">
888.639 850.251 835.447 828.169 824.57 822.751 821.694 820.741 819.224 816.041 808.931 793.045
757.814 682.603 554.977 431.488 395.51 464.054 621.888 861.872 1200.81 1700.34 2535.95 4360.15
1519.95 1493.2 1479.84 1473.1 1469.72 1468 1466.98 1466.04 1464.52 1461.3 1454.07 1438.02
@@ -275,7 +275,7 @@
2494.28 2494.28 2494.28 2494.28 2494.28 2494.28 2494.29 2494.29 2494.29 2494.29 2494.27 2494.04
1553.14 1552.7 1552.7 1552.7 1552.7 1552.7 1552.7 1553.1 2475.65 2475.08 2474 2473.22
</DataArray>
- <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" NumberOfComponents="1" format="ascii">
0.999982 0.999981 0.999981 0.999981 0.999981 0.999981 0.999981 0.999981 0.999981 0.999981 0.99998 0.99998
0.999979 0.999978 0.999974 0.999968 0.999958 0.999946 0.999931 0.999917 0.999903 0.99989 0.999879 0.999871
0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999982 0.999981 0.999981 0.999981
@@ -309,7 +309,7 @@
0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984 0.999984
0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999984 0.999984 0.999984 0.999984
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
1.81011e-05 1.87485e-05 1.90675e-05 1.92253e-05 1.93032e-05 1.93423e-05 1.93649e-05 1.9385e-05 1.9417e-05 1.94844e-05 1.96353e-05 1.99727e-05
2.07132e-05 2.22975e-05 2.55672e-05 3.17416e-05 4.15643e-05 5.44081e-05 6.87887e-05 8.33563e-05 9.72369e-05 0.00010989 0.000120847 0.000129342
1.76837e-05 1.80193e-05 1.8221e-05 1.83329e-05 1.83923e-05 1.84239e-05 1.84433e-05 1.84617e-05 1.84921e-05 1.85576e-05 1.87063e-05 1.90431e-05
@@ -343,7 +343,7 @@
1.60995e-05 1.60995e-05 1.60995e-05 1.60995e-05 1.60994e-05 1.60994e-05 1.60993e-05 1.60993e-05 1.60993e-05 1.60995e-05 1.61e-05 1.61011e-05
1.74355e-05 1.74441e-05 1.74441e-05 1.74441e-05 1.74441e-05 1.74441e-05 1.74441e-05 1.74364e-05 1.64167e-05 1.64264e-05 1.6441e-05 1.64515e-05
</DataArray>
- <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Nitrogen" NumberOfComponents="1" format="ascii">
0.0198882 0.0192147 0.0188992 0.018747 0.0186728 0.0186357 0.0186144 0.0185954 0.0185653 0.0185024 0.0183628 0.0180581
0.0174238 0.0162058 0.0141626 0.0114391 0.00875938 0.00670538 0.00531096 0.00438681 0.00376289 0.00333103 0.00302989 0.00283144
0.0203481 0.0199767 0.0197599 0.0196417 0.0195795 0.0195465 0.0195264 0.0195074 0.0194758 0.0194084 0.0192571 0.018923
@@ -377,7 +377,7 @@
0.0223058 0.0223058 0.0223058 0.0223058 0.0223058 0.0223059 0.0223059 0.022306 0.0223059 0.0223057 0.022305 0.0223036
0.0206318 0.0206218 0.0206218 0.0206218 0.0206218 0.0206218 0.0206218 0.0206307 0.0218842 0.0218715 0.0218526 0.0218389
</DataArray>
- <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Nitrogen" NumberOfComponents="1" format="ascii">
0.980112 0.980785 0.981101 0.981253 0.981327 0.981364 0.981386 0.981405 0.981435 0.981498 0.981637 0.981942
0.982576 0.983794 0.985837 0.988561 0.991241 0.993295 0.994689 0.995613 0.996237 0.996669 0.99697 0.997169
0.979652 0.980023 0.98024 0.980358 0.980421 0.980453 0.980474 0.980493 0.980524 0.980592 0.980743 0.981077
@@ -411,7 +411,7 @@
0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977694 0.977695 0.977696
0.979368 0.979378 0.979378 0.979378 0.979378 0.979378 0.979378 0.979369 0.978116 0.978128 0.978147 0.978161
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999987 0.999987 0.999987
0.999987 0.999986 0.999984 0.99998 0.999973 0.999965 0.999956 0.999946 0.999937 0.999929 0.999922 0.999917
0.999989 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988 0.999988
@@ -445,7 +445,7 @@
0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999 0.99999
0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989 0.999989
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
1.16407e-05 1.20571e-05 1.22622e-05 1.23637e-05 1.24138e-05 1.2439e-05 1.24535e-05 1.24664e-05 1.2487e-05 1.25303e-05 1.26274e-05 1.28444e-05
1.33206e-05 1.43395e-05 1.64422e-05 2.0413e-05 2.673e-05 3.49901e-05 4.42385e-05 5.36073e-05 6.25344e-05 7.0672e-05 7.77191e-05 8.31824e-05
1.13723e-05 1.15881e-05 1.17178e-05 1.17898e-05 1.1828e-05 1.18484e-05 1.18608e-05 1.18726e-05 1.18922e-05 1.19343e-05 1.203e-05 1.22465e-05
@@ -479,7 +479,7 @@
1.03535e-05 1.03535e-05 1.03535e-05 1.03535e-05 1.03535e-05 1.03534e-05 1.03534e-05 1.03534e-05 1.03534e-05 1.03535e-05 1.03538e-05 1.03545e-05
1.12127e-05 1.12182e-05 1.12182e-05 1.12182e-05 1.12182e-05 1.12182e-05 1.12182e-05 1.12133e-05 1.05575e-05 1.05637e-05 1.05731e-05 1.05799e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Nitrogen" NumberOfComponents="1" format="ascii">
0.0305883 0.0295633 0.0290831 0.0288512 0.0287382 0.0286817 0.0286492 0.0286203 0.0285745 0.0284785 0.0282658 0.0278016
0.0268343 0.0249752 0.021851 0.0176755 0.0135548 0.0103881 0.00823421 0.00680487 0.00583906 0.00517015 0.00470353 0.00439594
0.0312877 0.0307229 0.0303932 0.0302133 0.0301185 0.0300684 0.0300379 0.0300088 0.0299608 0.0298583 0.0296279 0.0291192
@@ -513,7 +513,7 @@
0.0342611 0.0342611 0.0342611 0.0342611 0.0342612 0.0342612 0.0342613 0.0342614 0.0342613 0.034261 0.0342599 0.0342578
0.031719 0.0317038 0.0317038 0.0317038 0.0317038 0.0317038 0.0317038 0.0317174 0.0336213 0.0336021 0.0335733 0.0335526
</DataArray>
- <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Nitrogen" NumberOfComponents="1" format="ascii">
0.969412 0.970437 0.970917 0.971149 0.971262 0.971318 0.971351 0.97138 0.971426 0.971521 0.971734 0.972198
0.973166 0.975025 0.978149 0.982324 0.986445 0.989612 0.991766 0.993195 0.994161 0.99483 0.995296 0.995604
0.968712 0.969277 0.969607 0.969787 0.969881 0.969932 0.969962 0.969991 0.970039 0.970142 0.970372 0.970881
diff --git a/test/references/obstaclebox-reference.vtu b/test/references/obstaclebox-reference.vtu
index d348c78d9a02e006b8e444be8c93f63bddcd1bf5..a83c4bad231065ecb67de6733a468588a55bc577 100644
--- a/test/references/obstaclebox-reference.vtu
+++ b/test/references/obstaclebox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -41,7 +41,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Nitrogen" 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
@@ -79,7 +79,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
100000 100043 100000 100023 100062 100039 100072 100046 100005 100002 100002 100000
100002 100000 100002 100000 100018 100015 100575 100543 100604 100574 100667 100637
100767 100736 100908 100875 101097 101063 101344 101306 101659 101618 102057 102010
@@ -117,7 +117,7 @@
99945.1 99962.7 99980.8 100000 100023 100051 100083 100120 100161 100204 100248 100292
100331 100365 100392 100408 100414
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
100000 100043 100000 100023 100062 100039 100072 100046 100005 100002 100002 100000
100002 100000 100002 100000 100018 100015 100575 100543 100604 100574 100667 100637
100767 100736 100908 100875 101097 101063 101344 101306 101659 101618 102057 102010
@@ -155,7 +155,7 @@
99945.1 99962.7 99980.8 100000 100023 100051 100083 100120 100161 100204 100248 100292
100331 100365 100392 100408 100414
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.049 997.049
@@ -193,7 +193,7 @@
997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
997.048 997.048 997.048 997.048 997.048
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
1.12601 1.12649 1.12601 1.12627 1.12671 1.12645 1.12682 1.12653 1.12607 1.12604 1.12603 1.12601
1.12603 1.12601 1.12603 1.12602 1.12622 1.12619 1.13249 1.13213 1.13281 1.13248 1.13353 1.13318
1.13465 1.1343 1.13624 1.13587 1.13837 1.13798 1.14115 1.14072 1.14469 1.14423 1.14917 1.14864
@@ -231,7 +231,7 @@
1.12539 1.12559 1.1258 1.12602 1.12628 1.12659 1.12695 1.12737 1.12782 1.12831 1.12881 1.1293
1.12974 1.13013 1.13042 1.13061 1.13067
</DataArray>
- <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
@@ -269,7 +269,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="lambda_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" NumberOfComponents="1" format="ascii">
56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
@@ -345,7 +345,7 @@
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="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.315483 0.315617 0.315483 0.315555 0.315678 0.315604 0.31571 0.315627 0.315498 0.31549 0.315488 0.315483
0.315488 0.315483 0.315488 0.315483 0.31554 0.315531 0.317297 0.317197 0.317388 0.317293 0.317587 0.317492
0.317902 0.317803 0.318347 0.318244 0.318944 0.318835 0.319722 0.319604 0.320717 0.320586 0.321983 0.321833
@@ -383,7 +383,7 @@
0.315309 0.315365 0.315422 0.315484 0.315557 0.315643 0.315745 0.315862 0.31599 0.316127 0.316266 0.316402
0.316528 0.316636 0.316718 0.31677 0.316788
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
1.14721e-05 1.1477e-05 1.14721e-05 1.14747e-05 1.14792e-05 1.14765e-05 1.14804e-05 1.14774e-05 1.14727e-05 1.14724e-05 1.14723e-05 1.14721e-05
1.14723e-05 1.14721e-05 1.14723e-05 1.14721e-05 1.14742e-05 1.14739e-05 1.15381e-05 1.15344e-05 1.15414e-05 1.15379e-05 1.15486e-05 1.15452e-05
1.15601e-05 1.15565e-05 1.15763e-05 1.15725e-05 1.1598e-05 1.1594e-05 1.16263e-05 1.1622e-05 1.16624e-05 1.16577e-05 1.17081e-05 1.17027e-05
@@ -421,7 +421,7 @@
1.14658e-05 1.14678e-05 1.14699e-05 1.14722e-05 1.14748e-05 1.1478e-05 1.14817e-05 1.14859e-05 1.14906e-05 1.14955e-05 1.15006e-05 1.15056e-05
1.15101e-05 1.1514e-05 1.1517e-05 1.15189e-05 1.15196e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Nitrogen" NumberOfComponents="1" format="ascii">
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.0100004 0.0100003
@@ -459,7 +459,7 @@
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
0.01 0.01 0.01 0.01 0.01
</DataArray>
- <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Nitrogen" NumberOfComponents="1" format="ascii">
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
diff --git a/test/references/obstaclecc-reference.vtu b/test/references/obstaclecc-reference.vtu
index 6003008ca475dc408d363df5651509c1a6f3dc2c..357a08ea9143dc87a2b27edc8c09e92e9eb5d8f3 100644
--- a/test/references/obstaclecc-reference.vtu
+++ b/test/references/obstaclecc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" 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.000122183 0.0664269 0.945884
0 0 0 0 0 0 0 0 0 0 0 0
@@ -37,7 +37,7 @@
0 0 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="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Nitrogen" 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 0.999878 0.933573 0.054116
1 1 1 1 1 1 1 1 1 1 1 1
@@ -71,7 +71,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
100021 100046 100060 100066 100004 100001 100001 100020 100684 100728 100818 100959
101160 101431 101787 102247 102831 103565 104480 105609 106984 108634 110626 146728
100011 100029 100040 100045 100002 100000 100000 100018 100649 100693 100781 100918
@@ -105,7 +105,7 @@
99872.9 99875.5 99881.1 99890.8 99905.6 99921.9 99939.3 99958.8 99980.6 100001 100024 100049
100079 100114 100155 100199 100247 100296 100345 100392 100433 100467 100491 100503
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Nitrogen" NumberOfComponents="1" format="ascii">
100021 100046 100060 100066 100004 100001 100001 100020 100684 100728 100818 100959
101160 101431 101787 102247 102831 103565 104480 105609 106984 108634 110626 146728
100011 100029 100040 100045 100002 100000 100000 100018 100649 100693 100781 100918
@@ -139,7 +139,7 @@
99872.9 99875.5 99881.1 99890.8 99905.6 99921.9 99939.3 99958.8 99980.6 100001 100024 100049
100079 100114 100155 100199 100247 100296 100345 100392 100433 100467 100491 100503
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
997.048 997.048 997.048 997.049 997.049 997.049 997.05 997.05 997.051 997.052 997.052 997.069
997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
@@ -173,7 +173,7 @@
997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048 997.048
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Nitrogen" NumberOfComponents="1" format="ascii">
1.12625 1.12653 1.12669 1.12676 1.12606 1.12602 1.12603 1.12624 1.13371 1.13421 1.13522 1.13681
1.13907 1.14213 1.14614 1.15131 1.15789 1.16616 1.17642 1.18883 1.20261 1.21483 1.23735 1.64531
1.12614 1.12634 1.12646 1.12652 1.12604 1.12601 1.12602 1.12621 1.13333 1.13381 1.1348 1.13635
@@ -207,7 +207,7 @@
1.12458 1.12461 1.12467 1.12478 1.12495 1.12513 1.12533 1.12555 1.12579 1.12603 1.12628 1.12657
1.12691 1.1273 1.12775 1.12825 1.12879 1.12935 1.1299 1.13042 1.13089 1.13127 1.13154 1.13168
</DataArray>
- <DataArray type="Float32" Name="lambda_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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.000149144 47.5714 1090.6
0 0 0 0 0 0 0 0 0 0 0 0
@@ -241,7 +241,7 @@
0 0 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="lambda_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Nitrogen" NumberOfComponents="1" format="ascii">
56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 54344.1 1665.21
56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7 56746.7
@@ -309,7 +309,7 @@
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 0.3 0.3
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.315549 0.315627 0.315672 0.315692 0.315496 0.315485 0.315486 0.315546 0.317639 0.317779 0.318063 0.318509
0.319142 0.319997 0.321121 0.322572 0.324437 0.327043 0.332898 0.359714 0.497574 0.999988 0.999988 0.999983
0.315518 0.315573 0.315609 0.315626 0.31549 0.315483 0.315483 0.315538 0.317531 0.317668 0.317945 0.31838
@@ -343,7 +343,7 @@
0.315082 0.31509 0.315107 0.315138 0.315185 0.315236 0.315291 0.315353 0.315421 0.315487 0.315557 0.315638
0.315733 0.315844 0.31597 0.31611 0.316261 0.316416 0.316571 0.316718 0.316848 0.316955 0.31703 0.317069
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
1.14745e-05 1.14774e-05 1.1479e-05 1.14797e-05 1.14726e-05 1.14722e-05 1.14722e-05 1.14744e-05 1.15505e-05 1.15556e-05 1.15659e-05 1.15822e-05
1.16052e-05 1.16363e-05 1.16771e-05 1.17298e-05 1.17969e-05 1.1881e-05 1.19849e-05 1.21058e-05 1.22146e-05 1.22212e-05 1.24521e-05 1.66355e-05
1.14734e-05 1.14754e-05 1.14767e-05 1.14773e-05 1.14724e-05 1.14721e-05 1.14721e-05 1.14741e-05 1.15466e-05 1.15516e-05 1.15617e-05 1.15775e-05
@@ -377,7 +377,7 @@
1.14575e-05 1.14578e-05 1.14585e-05 1.14596e-05 1.14613e-05 1.14631e-05 1.14652e-05 1.14674e-05 1.14699e-05 1.14723e-05 1.14748e-05 1.14777e-05
1.14812e-05 1.14852e-05 1.14898e-05 1.14949e-05 1.15004e-05 1.15061e-05 1.15117e-05 1.1517e-05 1.15218e-05 1.15256e-05 1.15284e-05 1.15298e-05
</DataArray>
- <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Nitrogen" NumberOfComponents="1" format="ascii">
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
0.01 0.01 0.01 0.01 0.0100007 0.0100095 0.0100995 0.0107965 0.0147422 0.0291778 0.0286524 0.0216025
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
@@ -411,7 +411,7 @@
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01 0.01
</DataArray>
- <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Nitrogen" NumberOfComponents="1" format="ascii">
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
0.99 0.99 0.99 0.99 0.989999 0.98999 0.9899 0.989204 0.985258 0.970822 0.971348 0.978397
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
diff --git a/test/references/outflowbox-reference.vtu b/test/references/outflowbox-reference.vtu
index 0fba0e9e0ab2e437223eda8c5108ec7c6d13539b..06a9a51733218cafe2738514c39a561799af23c5 100644
--- a/test/references/outflowbox-reference.vtu
+++ b/test/references/outflowbox-reference.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="40" NumberOfPoints="63">
- <PointData Scalars="p" Vectors="velocity_w (m/s)">
+ <PointData Scalars="p" Vectors="velocity_Water (m/s)">
<DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
200000 195000 200000 195000 190000 190000 185000 185000 180001 180001 175001 175001
170001 170001 165001 165001 160001 160001 155001 155001 150001 150001 145001 145001
@@ -19,7 +19,7 @@
70000.8 65000.9 60000.9 55001 50001 45001 40000.9 35000.9 30000.8 25000.7 20000.6 15000.5
10000.3 5000.18 0
</DataArray>
- <DataArray type="Float32" Name="velocity_w (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" format="ascii">
0.00997014 1.4509e-18 0 0.00997015 2.11437e-17 0 0.00997014 2.9018e-18 0 0.00997015 -3.62724e-19 0
0.00997017 2.69473e-17 0 0.00997017 3.26451e-18 0 0.0099702 6.52902e-18 0 0.0099702 7.25446e-19 0
0.00997022 5.3895e-17 0 0.00997022 3.62722e-19 0 0.00997024 5.67968e-17 0 0.00997024 -3.62722e-19 0
@@ -37,7 +37,7 @@
0.00997045 -3.26445e-18 0 0.00997047 0 0 0.00997049 -2.2139e-16 0 0.00997052 -2.18125e-16 0
0.00997054 2.539e-18 0 0.00997056 0 0 0.00997057 0 0
</DataArray>
- <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Water" NumberOfComponents="1" format="ascii">
0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998
0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998
0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.999981 0.999981 0.999981 0.999981
@@ -45,7 +45,7 @@
0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.99998 0.999981 0.999981
0.999981 0.999981 0.999981
</DataArray>
- <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_Water" NumberOfComponents="1" format="ascii">
2e-05 2e-05 2e-05 2e-05 1.99999e-05 1.99999e-05 1.99995e-05 1.99995e-05 1.99985e-05 1.99985e-05 1.99962e-05 1.99962e-05
1.99919e-05 1.99919e-05 1.99844e-05 1.99844e-05 1.99724e-05 1.99724e-05 1.99544e-05 1.99544e-05 1.99287e-05 1.99287e-05 1.98936e-05 1.98936e-05
1.98473e-05 1.98473e-05 1.97882e-05 1.97882e-05 1.97146e-05 1.97146e-05 1.96251e-05 1.96251e-05 1.95186e-05 1.95186e-05 1.9394e-05 1.9394e-05
@@ -53,7 +53,7 @@
1.99919e-05 1.99844e-05 1.99724e-05 1.99544e-05 1.99287e-05 1.98936e-05 1.98473e-05 1.97882e-05 1.97146e-05 1.96251e-05 1.95186e-05 1.9394e-05
1.92505e-05 1.90878e-05 1.90016e-05
</DataArray>
- <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Water" NumberOfComponents="1" format="ascii">
0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969
0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969
0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.99997 0.99997 0.99997 0.99997
@@ -61,7 +61,7 @@
0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.999969 0.99997 0.99997
0.99997 0.99997 0.99997
</DataArray>
- <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_Water" NumberOfComponents="1" format="ascii">
3.10994e-05 3.10994e-05 3.10994e-05 3.10994e-05 3.10992e-05 3.10992e-05 3.10986e-05 3.10986e-05 3.1097e-05 3.1097e-05 3.10935e-05 3.10935e-05
3.10868e-05 3.10868e-05 3.10752e-05 3.10752e-05 3.10565e-05 3.10565e-05 3.10285e-05 3.10285e-05 3.09886e-05 3.09886e-05 3.0934e-05 3.0934e-05
3.0862e-05 3.0862e-05 3.077e-05 3.077e-05 3.06556e-05 3.06556e-05 3.05165e-05 3.05165e-05 3.03508e-05 3.03508e-05 3.01571e-05 3.01571e-05
diff --git a/test/references/richardsanalyticalcc-reference.vtu b/test/references/richardsanalyticalcc-reference.vtu
index 1f3c3e4a208d75c551a1374c080c4478564c0a7e..8f450ee9849f587e5a5a165e24a96bbd0a8d4747 100644
--- a/test/references/richardsanalyticalcc-reference.vtu
+++ b/test/references/richardsanalyticalcc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="512" NumberOfPoints="1026">
- <CellData Scalars="S_n">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Air">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
4.35874e-07 4.35873e-07 4.35872e-07 4.3587e-07 4.35869e-07 4.35867e-07 4.35865e-07 4.35863e-07 4.35861e-07 4.35859e-07 4.35856e-07 4.35853e-07
4.3585e-07 4.35847e-07 4.35844e-07 4.3584e-07 4.35836e-07 4.35831e-07 4.35826e-07 4.35821e-07 4.35816e-07 4.3581e-07 4.35803e-07 4.35796e-07
4.35788e-07 4.3578e-07 4.35771e-07 4.35762e-07 4.35751e-07 4.3574e-07 4.35728e-07 4.35715e-07 4.357e-07 4.35685e-07 4.35668e-07 4.3565e-07
@@ -48,7 +48,7 @@
1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07
1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07 1.0572e-07
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -93,7 +93,7 @@
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="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -138,7 +138,7 @@
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="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
95641.3 95641.3 95641.3 95641.3 95641.3 95641.3 95641.4 95641.4 95641.4 95641.4 95641.4 95641.5
95641.5 95641.5 95641.6 95641.6 95641.6 95641.7 95641.7 95641.8 95641.8 95641.9 95642 95642
95642.1 95642.2 95642.3 95642.4 95642.5 95642.6 95642.7 95642.9 95643 95643.1 95643.3 95643.5
@@ -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="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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,7 +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="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardslensbox-reference-parallel.vtu b/test/references/richardslensbox-reference-parallel.vtu
index 61705ee731e35c4487af11be760ca9144eebe6ab..a0b9e3f680c9e9c369f0436fd8bccd7c38ae379a 100644
--- a/test/references/richardslensbox-reference-parallel.vtu
+++ b/test/references/richardslensbox-reference-parallel.vtu
@@ -2,7 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="192" NumberOfPoints="221">
- <PointData Scalars="S_w">
+ <PointData Scalars="S_Water">
<DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
@@ -23,8 +23,29 @@
0.0946392 0.0900827 0.0024663 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 0.00099992 0.228153
0.615224 0.63579 0.615224 0.228153 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 3.93768e-06 0.0814728
0.713034 0.932869 0.936509 0.932869 0.713034
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 9.35838e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 9.35838e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 9.35838e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17
+ 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17 -4.36236e-17
+ -4.36236e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 1.64268e-05 2.5133e-05
+ 1.64268e-05 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 0.00265965 0.0896917
+ 0.0941071 0.0896917 0.00265965 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 0.00107807 0.228323
+ 0.614878 0.636093 0.614878 0.228323 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 3.42956e-06 0.0806844
+ 0.713938 0.933379 0.936951 0.933379 0.713938
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -45,7 +66,7 @@
0.384776 0.36421 0.384776 0.771847 1 1 1 1 1 1 0.999996 0.918527
0.286966 0.0671314 0.0634913 0.0671314 0.286966
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
@@ -66,7 +87,7 @@
99733.6 99739 99733.6 99586.5 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.5 99323.1
99759.4 99835.3 99837.4 99835.3 99759.4
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -108,7 +129,7 @@
266.37 260.962 266.37 413.55 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.52 676.884
240.611 164.722 162.618 164.722 240.611
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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
@@ -129,7 +150,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardslensbox-reference.vtu b/test/references/richardslensbox-reference.vtu
index c2a5a6d5ce7680da904411b65e7915cef0b8b549..4c7c0131b3cf773ba8518407ff3d017f93de34b4 100644
--- a/test/references/richardslensbox-reference.vtu
+++ b/test/references/richardslensbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
@@ -41,7 +41,7 @@
0.713034 0.932869 0.936509 0.932869 0.713034 0.0814728 3.93768e-06 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -79,7 +79,7 @@
0.286966 0.0671314 0.0634913 0.0671314 0.286966 0.918527 0.999996 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
@@ -117,7 +117,7 @@
99759.4 99835.3 99837.4 99835.3 99759.4 99323.1 97470.5 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -193,7 +193,7 @@
240.611 164.722 162.618 164.722 240.611 676.884 2529.52 2529.62 2529.62 2529.62 2529.62 2529.62
2529.62 2529.62 2529.62 2529.62 2529.62
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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
@@ -231,7 +231,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardslenscc-reference-parallel.vtu b/test/references/richardslenscc-reference-parallel.vtu
index 5711d651d5d4a3ff77408112baa32bef81574c8d..a929fadbcb69384dce5d41f06c783f2059896bbc 100644
--- a/test/references/richardslenscc-reference-parallel.vtu
+++ b/test/references/richardslenscc-reference-parallel.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="192" NumberOfPoints="221">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17
@@ -21,7 +21,7 @@
9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 0.0033326 0.296918 0.339898 0.339898 0.296918
9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 9.35838e-17 2.85357e-06 0.0790732 0.814737 0.847266 0.847266 0.814737
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -39,7 +39,7 @@
1 1 1 1 1 1 1 0.996667 0.703082 0.660102 0.660102 0.703082
1 1 1 1 1 1 0.999997 0.920927 0.185263 0.152734 0.152734 0.185263
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
@@ -57,7 +57,7 @@
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97559.5 99627.1 99646.8 99646.8 99627.1
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.5 99308.3 99788.3 99798.9 99798.9 99788.3
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -93,7 +93,7 @@
2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2440.46 372.863 353.176 353.176 372.863
2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.54 691.737 211.699 201.127 201.127 211.699
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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
@@ -111,7 +111,7 @@
1000 1000 1000 1000 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="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardslenscc-reference.vtu b/test/references/richardslenscc-reference.vtu
index 4c88cf188052d9e7f431dc89f0978a3d10aaa771..2040c219897472fec20380d302103f7ff339fad3 100644
--- a/test/references/richardslenscc-reference.vtu
+++ b/test/references/richardslenscc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
@@ -37,7 +37,7 @@
9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 2.85357e-06 0.0790732 0.814737 0.847266 0.847266 0.814737
0.0790732 2.85357e-06 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17 9.02056e-17
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -71,7 +71,7 @@
1 1 1 1 1 1 0.999997 0.920927 0.185263 0.152734 0.152734 0.185263
0.920927 0.999997 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
@@ -105,7 +105,7 @@
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.5 99308.3 99788.3 99798.9 99798.9 99788.3
99308.3 97470.5 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -173,7 +173,7 @@
2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.54 691.737 211.699 201.127 201.127 211.699
691.737 2529.54 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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
@@ -207,7 +207,7 @@
1000 1000 1000 1000 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="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardsniconductionbox-reference.vtu b/test/references/richardsniconductionbox-reference.vtu
index ec965308abdd9a5d6955fac1e7f174aea9225c0a..9409b7f76786687015308ba5bc5929735d8a6349 100644
--- a/test/references/richardsniconductionbox-reference.vtu
+++ b/test/references/richardsniconductionbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="402">
- <PointData Scalars="S_n" Vectors="velocity">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Air" Vectors="velocity">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -39,7 +39,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -75,7 +75,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -111,7 +111,7 @@
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
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
@@ -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="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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,7 +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="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardsniconductioncc-reference.vtu b/test/references/richardsniconductioncc-reference.vtu
index eeaf7ce32e5f6e760f12fb89a9c735bdb7fb080a..f20f3c1d8df94f8a73a45e8bc9e00820c3980709 100644
--- a/test/references/richardsniconductioncc-reference.vtu
+++ b/test/references/richardsniconductioncc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="402">
- <CellData Scalars="S_n" Vectors="velocity">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Air" Vectors="velocity">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -22,7 +22,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="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -41,7 +41,7 @@
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="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -60,7 +60,7 @@
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="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
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
@@ -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="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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,7 +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="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardsniconvectionbox-reference.vtu b/test/references/richardsniconvectionbox-reference.vtu
index 2c7c622d542e032f6fc0869e5fb54ff56fe36b91..ff51b879bf1c2bdee8dc8763c8064ae68aee1096 100644
--- a/test/references/richardsniconvectionbox-reference.vtu
+++ b/test/references/richardsniconvectionbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="80" NumberOfPoints="162">
- <PointData Scalars="S_n" Vectors="velocity">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Air" Vectors="velocity">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -19,7 +19,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -35,7 +35,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -51,7 +51,7 @@
102170 102170 101899 101899 101628 101628 101357 101357 101085 101085 100814 100814
100543 100543 100271 100271 100000 100000
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
121579 121315 121579 121315 121051 121051 120787 120787 120522 120522 120258 120258
119994 119994 119730 119730 119465 119465 119201 119201 118936 118936 118672 118672
118407 118407 118141 118141 117876 117876 117610 117610 117343 117343 117075 117075
@@ -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="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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,7 +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="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardsniconvectioncc-reference.vtu b/test/references/richardsniconvectioncc-reference.vtu
index ee07ca796c08b72e943ce93015faac3e4ba3c761..eea54deed5a4abae333cd2f68f7e20956ce5d621 100644
--- a/test/references/richardsniconvectioncc-reference.vtu
+++ b/test/references/richardsniconvectioncc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="80" NumberOfPoints="162">
- <CellData Scalars="S_n" Vectors="velocity">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Air" Vectors="velocity">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -12,7 +12,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="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -21,7 +21,7 @@
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="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -30,7 +30,7 @@
105290 105019 104748 104476 104205 103934 103663 103391 103120 102849 102577 102306
102035 101763 101492 101221 100950 100678 100407 100136
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
121447 121183 120919 120654 120390 120126 119862 119597 119333 119069 118804 118539
118274 118009 117743 117476 117209 116942 116673 116405 116136 115866 115596 115326
115055 114784 114514 114243 113972 113700 113429 113158 112887 112615 112344 112073
@@ -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="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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,7 +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="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" 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
diff --git a/test/references/richardswelltracerbox-reference.vtu b/test/references/richardswelltracerbox-reference.vtu
index 24fd2a4aa6361427534020e12d16ede4af628c54..8da5f63d001e2af2a111be1b4ac962f53a96dbdd 100644
--- a/test/references/richardswelltracerbox-reference.vtu
+++ b/test/references/richardswelltracerbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1000" NumberOfPoints="1071">
- <PointData Scalars="S_w" Vectors="velocity_SimpleH2O (m/s)">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_SimpleH2O" Vectors="velocity_SimpleH2O (m/s)">
+ <DataArray type="Float32" Name="S_SimpleH2O" 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
@@ -95,7 +95,7 @@
0.0659598 0.0660826 0.0662806 0.066634 0.0673324 0.0685594 0.0703741 0.0728358 0.076515 0.0844592 0.102671 0.136716
0.194957 0.285667 0.4
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Gas" 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
@@ -187,7 +187,7 @@
0.93404 0.933917 0.933719 0.933366 0.932668 0.931441 0.929626 0.927164 0.923485 0.915541 0.897329 0.863284
0.805043 0.714333 0.6
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_SimpleH2O" NumberOfComponents="1" format="ascii">
109480 109417 108990 108927 109353 108863 109289 108799 109223 108733 109155 108666
109084 108595 109009 108520 108928 108441 108840 108353 108741 108256 108628 108144
108496 108013 108342 107859 108168 107683 107980 107492 107784 107294 107586 107095
@@ -279,7 +279,7 @@
99185.4 99187.1 99189.8 99194.5 99203.5 99218.2 99237.8 99261.1 99290.6 99339.7 99412.6 99489.2
99559.9 99621.4 99670
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Gas" NumberOfComponents="1" format="ascii">
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
@@ -463,7 +463,7 @@
814.573 812.878 810.179 805.463 796.505 781.823 762.218 738.891 709.374 660.272 587.385 510.802
440.121 378.606 329.977
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_SimpleH2O" 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
@@ -555,7 +555,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_SimpleH2O" 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
diff --git a/test/references/richardswelltracercc-reference.vtu b/test/references/richardswelltracercc-reference.vtu
index 7dc552a768594ef035f7cfd74747f17bb643c631..865dbf474fde774eb99f53060a392511e526a1f7 100644
--- a/test/references/richardswelltracercc-reference.vtu
+++ b/test/references/richardswelltracercc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1000" NumberOfPoints="1071">
- <CellData Scalars="S_w" Vectors="velocity_H2O (m/s)">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_SimpleH2O" Vectors="velocity_SimpleH2O (m/s)">
+ <DataArray type="Float32" Name="S_SimpleH2O" 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
@@ -89,7 +89,7 @@
0.0714643 0.0715986 0.0718261 0.0722481 0.073157 0.0747857 0.0775059 0.0837971 0.0995959 0.130492 0.185904 0.282961
0.44148 0.660322 0.874251 0.982461
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Gas" 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
@@ -175,7 +175,7 @@
0.928536 0.928401 0.928174 0.927752 0.926843 0.925214 0.922494 0.916203 0.900404 0.869508 0.814096 0.717039
0.55852 0.339678 0.125749 0.0175395
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_SimpleH2O" NumberOfComponents="1" format="ascii">
109202 109135 109068 109000 108929 108855 108777 108693 108601 108498 108380 108242
108080 107895 107695 107489 107280 107072 106868 106674 106501 106364 106268 106211
106190 106201 106243 106309 106396 106500 106616 106741 106872 107007 107145 107284
@@ -261,7 +261,7 @@
99248.5 99249.8 99251.9 99255.8 99263.9 99277.4 99297.7 99336.2 99402.7 99478.3 99551.4 99620
99684 99745.5 99808.6 99877.8
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Gas" NumberOfComponents="1" format="ascii">
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
@@ -433,7 +433,7 @@
751.471 750.195 748.056 744.162 736.082 722.558 702.298 663.794 597.258 521.69 448.615 380.031
315.962 254.532 191.421 122.176
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_SimpleH2O" 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
@@ -519,7 +519,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_SimpleH2O" 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
@@ -1035,7 +1035,7 @@
0.0285857 0.0286394 0.0287304 0.0288992 0.0292628 0.0299143 0.0310024 0.0335189 0.0398384 0.0521967 0.0743614 0.113184
0.176592 0.264129 0.3497 0.392984
</DataArray>
- <DataArray type="Float32" Name="x^H2O_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_SimpleH2O" 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
@@ -1121,7 +1121,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="x^D2O_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^D2O_SimpleH2O" NumberOfComponents="1" format="ascii">
5.38151e-37 1.21053e-34 2.17057e-32 3.00657e-30 2.97518e-28 1.78929e-26 4.365e-25 6.14067e-24 6.20647e-23 5.38605e-22 7.67378e-21 7.44331e-19
8.06387e-17 1.46951e-16 1.83224e-16 1.98008e-16 2.00569e-16 2.03161e-16 2.05806e-16 2.08545e-16 2.11512e-16 2.15116e-16 2.20095e-16 2.28403e-16
1.57321e-16 5.49236e-19 1.16639e-21 1.87374e-24 2.52656e-27 3.03946e-30 3.3928e-33 3.60834e-36 3.72377e-39 3.7765e-42 4.2039e-45 0
@@ -1207,7 +1207,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_SimpleH2O (m/s)" NumberOfComponents="3" format="ascii">
5.51478e-06 -1.85841e-08 0 5.56022e-06 -5.71563e-08 0 5.65459e-06 -1.00129e-07 0 5.80533e-06 -1.51097e-07 0
6.02484e-06 -2.14751e-07 0 6.3322e-06 -2.97527e-07 0 6.75576e-06 -4.08403e-07 0 7.33655e-06 -5.59584e-07 0
8.13186e-06 -7.65934e-07 0 9.21506e-06 -1.03939e-06 0 1.06595e-05 -1.36803e-06 0 1.24761e-05 -1.65969e-06 0
diff --git a/test/references/saltwaterintrusion-reference.vtu b/test/references/saltwaterintrusion-reference.vtu
index 3deaa92ec18afd48a117ccae5b510283831bad07..f89bbcda32bd1a40b2c2e6ee8815891f2465850b 100644
--- a/test/references/saltwaterintrusion-reference.vtu
+++ b/test/references/saltwaterintrusion-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="100" NumberOfPoints="126">
- <PointData Scalars="pressure" Vectors="velocity_H2O (m/s)">
- <DataArray type="Float32" Name="pressure" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="pressure" Vectors="velocity_Brine (m/s)">
+ <DataArray type="Float32" Name="p" NumberOfComponents="1" format="ascii">
590500 590285 492400 492299 590207 492235 590200 492207 590269 492202 590418 492216
590651 492253 590968 492318 591361 492418 591823 492559 592340 492748 592899 492988
593489 493284 594098 493636 594720 494046 595348 494504 595967 494988 596546 495423
@@ -55,7 +55,7 @@
308.084 294.356 254.183 188.678 96.3219 -25.7275 -181.171 -374.606 -611.69 -899.142 -1244.97 -1660.62
-2166.87 -2796.87 -3621.87 -4906.8 -5695.4 0
</DataArray>
- <DataArray type="Float32" Name="x_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_Brine" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 0.999837 0.999972 0.999289 0.999843 0.99832 0.999564
0.996948 0.999087 0.995283 0.998368 0.993478 0.997384 0.991682 0.996136 0.990016 0.994668 0.988562 0.993068
0.987356 0.991458 0.986399 0.989963 0.985661 0.988663 0.985088 0.987558 0.984586 0.986588 0.983922 0.985484
@@ -68,7 +68,7 @@
1 1 0.999999 0.999999 0.999997 0.999993 0.999987 0.999974 0.999952 0.999914 0.999851 0.999743
0.999549 0.99917 0.998632 0.99862 0.972024 0.97
</DataArray>
- <DataArray type="Float32" Name="x_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^NaCl_Brine" NumberOfComponents="1" format="ascii">
0 1.23038e-16 0 1.25424e-16 1.44703e-10 9.7583e-11 0.000163246 2.78637e-05 0.000711444 0.000156837 0.00167959 0.000436138
0.0030524 0.000912874 0.00471708 0.00163164 0.00652198 0.00261643 0.0083182 0.00386361 0.00998376 0.00533152 0.0114382 0.00693182
0.0126439 0.00854176 0.0136008 0.0100366 0.0143387 0.0113371 0.0149121 0.0124424 0.015414 0.0134121 0.0160783 0.0145161
@@ -81,7 +81,7 @@
6.70071e-08 2.18654e-07 5.41553e-07 1.30858e-06 3.02933e-06 6.57872e-06 1.34302e-05 2.60733e-05 4.84203e-05 8.62638e-05 0.000149084 0.000256678
0.000450905 0.000830349 0.00136774 0.00138014 0.0279759 0.03
</DataArray>
- <DataArray type="Float32" Name="X_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_Brine" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 0.999471 0.99991 0.997696 0.999491 0.994572 0.998587
0.990165 0.997045 0.984858 0.994726 0.979147 0.991562 0.97351 0.987574 0.968322 0.982909 0.963822 0.977857
0.960114 0.972811 0.957185 0.968158 0.954934 0.964134 0.95319 0.960732 0.951668 0.957761 0.949657 0.954394
@@ -94,7 +94,7 @@
1 0.999999 0.999998 0.999996 0.99999 0.999979 0.999956 0.999915 0.999843 0.99972 0.999517 0.999168
0.998539 0.997311 0.995577 0.995537 0.914605 0.908816
</DataArray>
- <DataArray type="Float32" Name="X_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^NaCl_Brine" NumberOfComponents="1" format="ascii">
0 3.99145e-16 0 4.06886e-16 4.69427e-10 3.16568e-10 0.000529391 9.03866e-05 0.00230431 0.000508614 0.00542828 0.00141348
0.00983488 0.00295539 0.0151423 0.00527386 0.0208527 0.00843838 0.0264905 0.0124262 0.0316784 0.0170914 0.0361777 0.022143
0.0398863 0.027189 0.0428155 0.0318425 0.0450659 0.035866 0.0468097 0.0392679 0.0483325 0.0422387 0.0503429 0.0456059
@@ -107,7 +107,7 @@
2.17377e-07 7.09331e-07 1.75684e-06 4.24513e-06 9.82734e-06 2.13416e-05 4.35676e-05 8.4579e-05 0.000157063 0.000279793 0.00048348 0.000832206
0.0014613 0.00268871 0.00442348 0.00446347 0.0853952 0.0911839
</DataArray>
- <DataArray type="Float32" Name="velocity_H2O (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Brine (m/s)" NumberOfComponents="3" format="ascii">
1.90517e-06 1.31733e-06 0 1.3318e-06 5.73367e-07 0 1.09948e-06 1.40499e-06 0 8.61489e-07 8.11376e-07 0
4.38221e-07 3.20212e-07 0 4.35845e-07 5.07866e-07 0 -1.93381e-07 3.1139e-07 0 1.14063e-07 4.45532e-07 0
-8.27179e-07 3.22407e-07 0 -1.42296e-07 4.44639e-07 0 -1.4806e-06 3.31012e-07 0 -3.95628e-07 4.62127e-07 0
diff --git a/test/references/steaminjectionbox-reference.vtu b/test/references/steaminjectionbox-reference.vtu
index 14e80b986649681f079fc1bca41ecdcaf02d61c3..8ef6bc12fab516b12ab62e0d38b3238b1889fd07 100644
--- a/test/references/steaminjectionbox-reference.vtu
+++ b/test/references/steaminjectionbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="231">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_liquid">
+ <DataArray type="Float32" Name="S_liquid" 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
@@ -25,7 +25,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_vapor" 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
@@ -47,7 +47,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liquid" NumberOfComponents="1" format="ascii">
179934 179932 176014 176011 179924 176003 179913 175992 179898 175976 179880 175958
179861 175939 179841 175919 179821 175898 179800 175877 179780 175856 172098 172096
172087 172074 172057 172038 172017 171996 171975 171953 171932 168189 168186 168176
@@ -69,7 +69,7 @@
105229 105227 105226 105224 101300 101300 101300 101300 101300 101300 101300 101300
101300 101300 101300
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_vapor" NumberOfComponents="1" format="ascii">
179934 179932 176014 176011 179924 176003 179913 175992 179898 175976 179880 175958
179861 175939 179841 175919 179821 175898 179800 175877 179780 175856 172098 172096
172087 172074 172057 172038 172017 171996 171975 171953 171932 168189 168186 168176
@@ -113,7 +113,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0
</DataArray>
- <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liquid" NumberOfComponents="1" format="ascii">
999.729 999.729 999.727 999.727 999.729 999.727 999.729 999.727 999.729 999.727 999.729 999.727
999.729 999.727 999.729 999.727 999.729 999.727 999.729 999.727 999.729 999.727 999.725 999.725
999.725 999.725 999.725 999.725 999.725 999.725 999.725 999.725 999.725 999.722 999.723 999.723
@@ -135,7 +135,7 @@
999.693 999.693 999.693 999.693 999.691 999.691 999.691 999.691 999.691 999.691 999.691 999.691
999.691 999.691 999.691
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_vapor" NumberOfComponents="1" format="ascii">
1.37955 1.37953 1.3495 1.34948 1.37948 1.34942 1.37939 1.34933 1.37928 1.34921 1.37914 1.34907
1.379 1.34892 1.37884 1.34877 1.37868 1.34861 1.37853 1.34845 1.37837 1.34829 1.31948 1.31946
1.31939 1.31929 1.31916 1.31901 1.31886 1.31869 1.31853 1.31837 1.3182 1.28945 1.28948 1.2894
@@ -157,7 +157,7 @@
0.806787 0.806775 0.806762 0.806748 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663 0.776663
0.776663 0.776663 0.776663
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liquid" NumberOfComponents="1" format="ascii">
764.381 764.381 764.378 764.378 764.381 764.378 764.381 764.378 764.381 764.378 764.381 764.378
764.381 764.378 764.381 764.378 764.381 764.378 764.381 764.378 764.381 764.378 764.378 764.376
764.376 764.376 764.376 764.376 764.376 764.376 764.376 764.376 764.376 764.642 764.382 764.374
@@ -179,7 +179,7 @@
764.341 764.341 764.341 764.341 764.339 764.339 764.339 764.339 764.339 764.339 764.339 764.339
764.339 764.339 764.339
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_vapor" 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
diff --git a/test/references/steaminjectioncc-reference.vtu b/test/references/steaminjectioncc-reference.vtu
index df76678bd218c9eee49f57c5f00048363c796623..cd493da1782353a5a926a13559cf85da90ef1efa 100644
--- a/test/references/steaminjectioncc-reference.vtu
+++ b/test/references/steaminjectioncc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="800" NumberOfPoints="861">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_liquid">
+ <DataArray type="Float32" Name="S_liquid" 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
@@ -72,7 +72,7 @@
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="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_vapor" 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
@@ -141,7 +141,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="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liquid" NumberOfComponents="1" format="ascii">
178915 178914 178912 178909 178906 178902 178897 178891 178885 178879 178872 178865
178857 178849 178842 178834 178826 178818 178810 178803 176954 176953 176951 176949
176945 176941 176936 176930 176924 176918 176911 176903 176896 176888 176880 176872
@@ -210,7 +210,7 @@
102283 102283 102283 102283 102283 102283 102283 102283 102283 102283 102283 102282
102282 102282 102282 102282 102282 102281 102281 102281
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_vapor" NumberOfComponents="1" format="ascii">
178915 178914 178912 178909 178906 178902 178897 178891 178885 178879 178872 178865
178857 178849 178842 178834 178826 178818 178810 178803 176954 176953 176951 176949
176945 176941 176936 176930 176924 176918 176911 176903 176896 176888 176880 176872
@@ -348,7 +348,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="rho_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_liquid" NumberOfComponents="1" format="ascii">
999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728
999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.728 999.727 999.727 999.727 999.727
999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727 999.727
@@ -417,7 +417,7 @@
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
999.692 999.692 999.692 999.692 999.692 999.692 999.692 999.692
</DataArray>
- <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_vapor" NumberOfComponents="1" format="ascii">
1.37174 1.37173 1.37172 1.3717 1.37167 1.37164 1.3716 1.37156 1.37151 1.37146 1.37141 1.37135
1.3713 1.37124 1.37118 1.37112 1.37106 1.371 1.37094 1.37088 1.35671 1.3567 1.35668 1.35666
1.35664 1.3566 1.35657 1.35652 1.35648 1.35643 1.35637 1.35632 1.35626 1.3562 1.35614 1.35608
@@ -486,7 +486,7 @@
0.784203 0.784203 0.784203 0.784202 0.784202 0.784201 0.7842 0.784199 0.784199 0.784198 0.784196 0.784195
0.784194 0.784193 0.784191 0.78419 0.784189 0.784187 0.784186 0.784185
</DataArray>
- <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_liquid" NumberOfComponents="1" format="ascii">
764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38
764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.38 764.379 764.379 764.379 764.379
764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379 764.379
@@ -555,7 +555,7 @@
764.34 764.34 764.34 764.34 764.34 764.34 764.34 764.34 764.339 764.339 764.339 764.339
764.339 764.339 764.339 764.339 764.339 764.339 764.339 764.339
</DataArray>
- <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_vapor" 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
diff --git a/test/references/test_boxrichardsevaporation-reference.vtu b/test/references/test_boxrichardsevaporation-reference.vtu
index f5611168cf5ea995526062cccd39c865ddbdc71a..d4e7ea05e48a69b8ed66fefee1542abad2a6361a 100644
--- a/test/references/test_boxrichardsevaporation-reference.vtu
+++ b/test/references/test_boxrichardsevaporation-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="100" NumberOfPoints="126">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
@@ -16,7 +16,7 @@
0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571695 0.0571695 0.0571695 0.0571695 0.0571695 0.0571695
0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
@@ -29,7 +29,7 @@
0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.94283 0.94283 0.94283 0.94283 0.94283 0.94283
1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
@@ -42,7 +42,7 @@
99000 99000 99000 99000 99000 99000 98999.9 98999.9 98999.9 98999.9 98999.9 98999.9
97470.4 97470.4 97470.4 97470.4 97470.4 97470.4
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -68,7 +68,7 @@
1000 1000 1000 1000 1000 1000 1000.07 1000.07 1000.07 1000.07 1000.07 1000.07
2529.62 2529.62 2529.62 2529.62 2529.62 2529.62
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
@@ -81,7 +81,7 @@
998.621 998.621 998.621 998.621 998.621 998.621 998.632 998.632 998.632 998.632 998.632 998.632
999.788 999.788 999.788 999.788 999.788 999.788
</DataArray>
- <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
diff --git a/test/references/test_ccrichardsevaporation-reference.vtu b/test/references/test_ccrichardsevaporation-reference.vtu
index fb9935370366c76464c1f230ace02211559caf43..5a0633ae591e06da8efc04060e642a5e4034ea40 100644
--- a/test/references/test_ccrichardsevaporation-reference.vtu
+++ b/test/references/test_ccrichardsevaporation-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="100" NumberOfPoints="126">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721
@@ -14,7 +14,7 @@
0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571721 0.0571703 0.0571703 0.0571703 0.0571703 0.0571703 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.942828
@@ -25,7 +25,7 @@
0.942828 0.942828 0.942828 0.942828 0.942828 0.942828 0.94283 0.94283 0.94283 0.94283 0.94283 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000
@@ -36,7 +36,7 @@
99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 99000 97470.4
97470.4 97470.4 97470.4 97470.4
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -58,7 +58,7 @@
1000 1000 1000 1000 1000 1000 1000.05 1000.05 1000.05 1000.05 1000.05 2529.62
2529.62 2529.62 2529.62 2529.62
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" NumberOfComponents="1" format="ascii">
998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621 998.621
@@ -69,7 +69,7 @@
998.621 998.621 998.621 998.621 998.621 998.621 998.627 998.627 998.627 998.627 998.627 999.369
999.369 999.369 999.369 999.369
</DataArray>
- <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047 0.000207047
@@ -102,7 +102,7 @@
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="x^air_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^air_Water" NumberOfComponents="1" format="ascii">
0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743
0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743
0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743 0.0204743
diff --git a/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp b/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
index 168a2a1993a54d98987645d4956122be42e2c582..b15963713e156963d6545f8f4db8242fe90f696f 100644
--- a/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
+++ b/test/references/test_embedded_1d3d_1p2c_richards2c_1d-reference.vtp
@@ -591,7 +591,7 @@
-78531.8 -78526.1 -78520.7 -78515.5 -78509.5 -78502.6 -78495.9 -78490.1 -78485.1 -78480.3 -78477.2 -78475.7
-78474.3 -78473.2 -78472.1 -78530.6 -78522.6 -78517.1 -78514 -78511.1 -78506 -78498.7
</DataArray>
- <DataArray type="Float32" Name="x_SimpleH2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^SimpleH2O_SimpleH2O" 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
@@ -738,7 +738,7 @@
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="x_D2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^D2O_SimpleH2O" NumberOfComponents="1" format="ascii">
3.54951e-09 2.8308e-09 2.10858e-09 1.64163e-09 1.32283e-09 1.12258e-09 1.01757e-09 9.85875e-10 9.85443e-10 9.94688e-10 1.00679e-09 1.02017e-09
1.03431e-09 1.04892e-09 1.06399e-09 1.07952e-09 1.09555e-09 1.11358e-09 1.13226e-09 1.15149e-09 1.17144e-09 1.19269e-09 1.21098e-09 1.22829e-09
1.24652e-09 1.26547e-09 1.28524e-09 1.44113e-09 1.61447e-09 1.7046e-09 1.75896e-09 1.8077e-09 1.85483e-09 1.89905e-09 1.94379e-09 1.99185e-09
@@ -885,7 +885,7 @@
1.09343e-09 8.79871e-10 7.42312e-10 6.48619e-10 5.7981e-10 5.23205e-10 4.68201e-10 4.16537e-10 3.67197e-10 3.25345e-10 2.91172e-10 2.62269e-10
2.40728e-10 2.25972e-10 2.18041e-10 1.23597e-09 1.25082e-09 1.20838e-09 1.07959e-09 9.87752e-10 9.3311e-10 8.98533e-10
</DataArray>
- <DataArray type="Float32" Name="X_SimpleH2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^SimpleH2O_SimpleH2O" 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
@@ -1032,7 +1032,7 @@
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="X_D2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^D2O_SimpleH2O" NumberOfComponents="1" format="ascii">
3.9439e-09 3.14533e-09 2.34287e-09 1.82404e-09 1.46981e-09 1.24731e-09 1.13064e-09 1.09542e-09 1.09494e-09 1.10521e-09 1.11865e-09 1.13352e-09
1.14923e-09 1.16546e-09 1.18221e-09 1.19946e-09 1.21728e-09 1.23731e-09 1.25807e-09 1.27944e-09 1.3016e-09 1.32521e-09 1.34553e-09 1.36476e-09
1.38503e-09 1.40607e-09 1.42805e-09 1.60125e-09 1.79385e-09 1.894e-09 1.9544e-09 2.00855e-09 2.06092e-09 2.11006e-09 2.15977e-09 2.21317e-09
diff --git a/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu b/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
index f0e435b95716b0c2d2420719decafe148b5d6406..4f48cf63393299128961afe0ffa08d2c1f26baa9 100644
--- a/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
+++ b/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="3198" NumberOfPoints="4179">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_SimpleH2O">
+ <DataArray type="Float32" Name="S_SimpleH2O" NumberOfComponents="1" format="ascii">
0.289507 0.289475 0.289424 0.289381 0.289366 0.289392 0.289451 0.289523 0.289587 0.289623 0.289493 0.289453
0.289389 0.289336 0.289316 0.289348 0.289417 0.289502 0.289575 0.289616 0.289475 0.289424 0.289338 0.289238
0.289279 0.289364 0.289472 0.289561 0.289609 0.289473 0.289415 0.289319 0.289181 0.289331 0.289458 0.28956
@@ -272,7 +272,7 @@
0.284962 0.284625 0.283504 0.283748 0.284354 0.284214 0.283449 0.283694 0.284284 0.284142 0.28417 0.284584
0.284911 0.284635 0.284092 0.284498 0.28482 0.284555
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Gas" NumberOfComponents="1" format="ascii">
0.710493 0.710525 0.710576 0.710619 0.710634 0.710608 0.710549 0.710477 0.710413 0.710377 0.710507 0.710547
0.710611 0.710664 0.710684 0.710652 0.710583 0.710498 0.710425 0.710384 0.710525 0.710576 0.710662 0.710762
0.710721 0.710636 0.710528 0.710439 0.710391 0.710527 0.710585 0.710681 0.710819 0.710669 0.710543 0.71044
@@ -541,7 +541,7 @@
0.715038 0.715375 0.716496 0.716252 0.715646 0.715786 0.716551 0.716306 0.715716 0.715858 0.71583 0.715416
0.715089 0.715365 0.715908 0.715502 0.71518 0.715445
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_SimpleH2O" NumberOfComponents="1" format="ascii">
47346.4 47332 47309.2 47289.7 47283.3 47294.9 47321.1 47353.5 47381.8 47398.1 47339.8 47322.1
47293.4 47269.7 47260.8 47275 47306 47344.1 47376.6 47394.9 47331.8 47309.1 47270.6 47225.8
47244.4 47282.5 47330.7 47370.2 47391.9 47330.9 47305.3 47262.1 47200.4 47267.5 47324.1 47369.9
@@ -810,7 +810,7 @@
45256.2 45096.7 44559.9 44677.6 44967.7 44900.8 44533.7 44651.4 44934.4 44866.5 44879.7 45076.9
45232.3 45101.5 44842.3 45036.3 45189.3 45063.1
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Gas" NumberOfComponents="1" format="ascii">
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
@@ -1348,7 +1348,7 @@
54743.8 54903.3 55440.1 55322.4 55032.3 55099.2 55466.3 55348.6 55065.6 55133.5 55120.3 54923.1
54767.7 54898.5 55157.7 54963.7 54810.7 54936.9
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_SimpleH2o" 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
@@ -1617,7 +1617,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000 1000 1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_SimpleH2O" NumberOfComponents="1" format="ascii">
0.0144809 0.0144682 0.0144481 0.0144309 0.0144253 0.0144355 0.0144585 0.0144872 0.0145122 0.0145267 0.0144751 0.0144594
0.0144341 0.0144133 0.0144055 0.0144179 0.0144452 0.0144789 0.0145076 0.0145239 0.014468 0.0144479 0.0144141 0.0143748
0.0143911 0.0144245 0.014467 0.014502 0.0145212 0.0144672 0.0144446 0.0144066 0.0143525 0.0144114 0.0144612 0.0145016
@@ -3500,7 +3500,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="x^SimpleH2O_D2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^D2O_SimpleH2O" NumberOfComponents="1" format="ascii">
5.3563e-12 1.41013e-11 1.43641e-11 7.59047e-12 3.47449e-12 7.26293e-13 1.01331e-13 1.12044e-14 1.06469e-15 9.78533e-17 5.10502e-11 1.47954e-10
1.67193e-10 8.97752e-11 4.11811e-11 7.58771e-12 9.21807e-13 9.0669e-14 7.79524e-15 6.5272e-16 4.33714e-10 1.38076e-09 1.81502e-09 4.56414e-10
7.13372e-11 7.23477e-12 6.32343e-13 4.96344e-14 3.83526e-15 2.7399e-09 9.43164e-09 1.26826e-08 3.05935e-09 3.58963e-11 3.00622e-12 2.23908e-13
diff --git a/test/references/test_embedded_1p_richards_box_3d.vtu b/test/references/test_embedded_1p_richards_box_3d.vtu
index f2cdbfa9e6378f4262a24bec075bad5f2a941b51..6489f37b46d901a690569b5205c37e91c56276d1 100644
--- a/test/references/test_embedded_1p_richards_box_3d.vtu
+++ b/test/references/test_embedded_1p_richards_box_3d.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1728" NumberOfPoints="2197">
- <PointData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.209039 0.209003 0.209033 0.208994 0.208832 0.208778 0.208817 0.208753 0.208919 0.208905 0.208648 0.20859
0.208849 0.208835 0.208533 0.208424 0.208855 0.208832 0.208527 0.208421 0.208957 0.208925 0.208653 0.208579
0.209137 0.209102 0.208867 0.208807 0.209367 0.209331 0.209123 0.209069 0.209617 0.209586 0.209396 0.209351
@@ -189,7 +189,7 @@
0.205115 0.205023 0.204765 0.204395 0.203991 0.203652 0.203467 0.203492 0.203718 0.20407 0.204434 0.204701
0.204799
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.790961 0.790997 0.790967 0.791006 0.791168 0.791222 0.791183 0.791247 0.791081 0.791095 0.791352 0.79141
0.791151 0.791165 0.791467 0.791576 0.791145 0.791167 0.791473 0.791579 0.791043 0.791075 0.791346 0.791421
0.790863 0.790898 0.791133 0.791193 0.790633 0.790669 0.790877 0.790931 0.790383 0.790414 0.790604 0.790649
@@ -375,7 +375,7 @@
0.794885 0.794977 0.795235 0.795605 0.796009 0.796348 0.796533 0.796508 0.796282 0.79593 0.795566 0.795299
0.795201
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
-20329.6 -20384.7 -20338.6 -20398.2 -20646 -20728.2 -20667.9 -20766.2 -20512 -20534.5 -20927.3 -21015.2
-20619.3 -20641.3 -21103.5 -21270.2 -20610.8 -20644.6 -21112 -21275.5 -20455 -20503.7 -20918.2 -21032.4
-20180.6 -20234.5 -20591.7 -20683.5 -19833.1 -19886.8 -20202.1 -20284.5 -19455.7 -19502.1 -19788.7 -19857.4
@@ -561,7 +561,7 @@
-26523.9 -26674.9 -27098.7 -27712.3 -28384.9 -28955.2 -29267.5 -29225.2 -28843.2 -28253.3 -27647.4 -27205
-27043.8
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -933,7 +933,7 @@
126524 126675 127099 127712 128385 128955 129268 129225 128843 128253 127647 127205
127044
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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
@@ -1119,7 +1119,7 @@
1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
1000
</DataArray>
- <DataArray type="Float32" Name="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
0.00100391 0.00100242 0.00100366 0.00100206 0.000995402 0.000993208 0.000994817 0.000992198 0.000998992 0.000998387 0.00098792 0.000985599
0.000996116 0.000995527 0.000983273 0.000978899 0.000996344 0.00099544 0.000983048 0.000978762 0.00100053 0.000999215 0.000988161 0.000985146
0.00100794 0.00100648 0.000996855 0.0009944 0.00101744 0.00101597 0.00100736 0.00100513 0.00102789 0.0010266 0.00101866 0.00101678
diff --git a/test/references/test_embedded_1p_richards_tpfa_3d.vtu b/test/references/test_embedded_1p_richards_tpfa_3d.vtu
index d4c5918f367b063422b0551b8b4d054ba80dfaf5..70760d751c1e4474042e8eea81a857757bca6794 100644
--- a/test/references/test_embedded_1p_richards_tpfa_3d.vtu
+++ b/test/references/test_embedded_1p_richards_tpfa_3d.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1728" NumberOfPoints="2197">
- <CellData Scalars="S_w">
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Water">
+ <DataArray type="Float32" Name="S_Water" NumberOfComponents="1" format="ascii">
0.208985 0.208914 0.20882 0.208792 0.208883 0.209067 0.209309 0.209583 0.20986 0.210105 0.210288 0.210385
0.208948 0.208853 0.208715 0.208664 0.208771 0.208967 0.209215 0.209503 0.209798 0.210061 0.210257 0.210361
0.208917 0.20879 0.20858 0.208491 0.208622 0.208816 0.209052 0.20936 0.20969 0.209987 0.210207 0.210323
@@ -149,7 +149,7 @@
0.204892 0.204672 0.204266 0.203742 0.203199 0.202766 0.202589 0.202789 0.203276 0.203821 0.204265 0.20451
0.205137 0.204946 0.204597 0.204154 0.203708 0.203369 0.203248 0.203403 0.203775 0.204212 0.204579 0.204785
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Air" NumberOfComponents="1" format="ascii">
0.791015 0.791086 0.79118 0.791208 0.791117 0.790933 0.790691 0.790417 0.79014 0.789895 0.789712 0.789615
0.791052 0.791147 0.791285 0.791336 0.791229 0.791033 0.790785 0.790497 0.790202 0.789939 0.789743 0.789639
0.791083 0.79121 0.79142 0.791509 0.791378 0.791184 0.790948 0.79064 0.79031 0.790013 0.789793 0.789677
@@ -295,7 +295,7 @@
0.795108 0.795328 0.795734 0.796258 0.796801 0.797234 0.797411 0.797211 0.796724 0.796179 0.795735 0.79549
0.794863 0.795054 0.795403 0.795846 0.796292 0.796631 0.796752 0.796597 0.796225 0.795789 0.795421 0.795215
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
-20412.6 -20520.9 -20663.6 -20706.3 -20566.9 -20287.2 -19920.8 -19506.5 -19090.9 -18724.7 -18453.3 -18309.2
-20469.2 -20614 -20823.6 -20901.6 -20738.2 -20439.1 -20062.6 -19627.5 -19183.6 -18790.5 -18499.4 -18345.1
-20515.9 -20708.9 -21031.3 -21167.8 -20966.4 -20669.2 -20309.8 -19843.2 -19345.6 -18901.5 -18573.9 -18401.1
@@ -441,7 +441,7 @@
-26890.3 -27253.1 -27925.9 -28803.5 -29722.7 -30462.4 -30765.8 -30422.5 -29591.8 -28670.4 -27928.1 -27520.4
-26487.9 -26801.3 -27376.7 -28113.4 -28861.5 -29432.8 -29639.2 -29375.6 -28748.5 -28017.2 -27407.2 -27066
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
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
@@ -733,7 +733,7 @@
126890 127253 127926 128803 129723 130462 130766 130422 129592 128670 127928 127520
126488 126801 127377 128113 128862 129433 129639 129376 128749 128017 127407 127066
</DataArray>
- <DataArray type="Float32" Name="density" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_Water" 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
@@ -879,7 +879,7 @@
1000 1000 1000 1000 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="mobility" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_Water" NumberOfComponents="1" format="ascii">
0.00100167 0.000998753 0.000994934 0.000993791 0.000997519 0.00100505 0.00101504 0.00102648 0.00103813 0.00104854 0.00105634 0.00106051
0.00100014 0.00099626 0.00099067 0.000988601 0.000992941 0.00100095 0.00101116 0.00102312 0.00103551 0.00104666 0.00105501 0.00105947
0.000998887 0.000993723 0.000985174 0.000981583 0.000986886 0.000994784 0.00100444 0.00101717 0.00103097 0.00104349 0.00105286 0.00105785
diff --git a/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu b/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu
index d4bfc3c3c71b7d9db750802f987203a043d20a5d..710a556d2825bf087e8ebbcef8549e74e0f13337 100644
--- a/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="400" NumberOfPoints="441">
- <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Air" Vectors="velocity_liquid (m/s)">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -39,7 +39,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -75,7 +75,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001
100001 100001 100001 100001 100001 100001 100001 100001 100003 100003 100003 100003
100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003
@@ -111,7 +111,7 @@
100043 100043 100043 100043 100043 100043 100043 100043 100043 100043 100043 100043
100043 100043 100043 100043
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
96317 96317 96317 96317 96317 96317 96317 96317 96317 96317 96317 96317
96317 96317 96317 96317 96317 96317 96317 96317 96319.2 96319.2 96319.2 96319.2
96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
index 03cf738c18cf30afeea5af39bf8649efc7d0c55f..394f836fd15dfdcde701a2de058cef9c8454229b 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="400" NumberOfPoints="441">
- <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_Air" Vectors="velocity_Water (m/s)">
+ <DataArray type="Float32" Name="S_Air" 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
@@ -39,7 +39,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_Water" 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
@@ -75,7 +75,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Air" NumberOfComponents="1" format="ascii">
100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001
100001 100001 100001 100001 100001 100001 100001 100001 100003 100003 100003 100003
100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003
@@ -111,7 +111,7 @@
100044 100044 100044 100044 100044 100044 100044 100044 100044 100044 100044 100044
100044 100044 100044 100044
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_Water" NumberOfComponents="1" format="ascii">
96317 96317 96317 96317 96317 96317 96317 96317 96317 96317 96317 96317
96317 96317 96317 96317 96317 96317 96317 96317 96319.2 96319.2 96319.2 96319.2
96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2 96319.2
@@ -327,7 +327,7 @@
55022.5 55022.5 55022.5 55022.5 55022.5 55022.6 55022.6 55022.5 55022.5 55022.5 55022.5 55022.5
55022.5 55022.5 55022.5 55022.5
</DataArray>
- <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_Water^H2O" NumberOfComponents="1" format="ascii">
-1.68053e-15 -1.7702e-15 -1.91706e-15 -2.07822e-15 -2.22191e-15 -2.33429e-15 -2.41475e-15 -2.46839e-15 -2.50086e-15 -2.51612e-15 -2.51609e-15 -2.50078e-15
-2.46827e-15 -2.41462e-15 -2.33417e-15 -2.22181e-15 -2.07813e-15 -1.91699e-15 -1.77016e-15 -1.6805e-15 -2.317e-15 -2.44948e-15 -2.66466e-15 -2.89815e-15
-3.10382e-15 -3.26287e-15 -3.37574e-15 -3.45058e-15 -3.49576e-15 -3.51698e-15 -3.51694e-15 -3.49564e-15 -3.45041e-15 -3.37556e-15 -3.2627e-15 -3.10367e-15
@@ -363,7 +363,7 @@
-4.0517e-15 -4.36073e-15 -4.5633e-15 -4.70411e-15 -4.79686e-15 -4.84339e-15 -4.84319e-15 -4.79623e-15 -4.70265e-15 -4.56262e-15 -4.36047e-15 -4.05151e-15
-3.48232e-15 -2.26867e-15 -5.23427e-17 -5.9388e-17
</DataArray>
- <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X_Water^Air" NumberOfComponents="1" format="ascii">
1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05
1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05
1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05
@@ -471,7 +471,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_Water^H2O" NumberOfComponents="1" format="ascii">
-2.70151e-15 -2.84566e-15 -3.08173e-15 -3.3408e-15 -3.5718e-15 -3.75245e-15 -3.88179e-15 -3.96802e-15 -4.02021e-15 -4.04474e-15 -4.04469e-15 -4.02008e-15
-3.96783e-15 -3.88158e-15 -3.75226e-15 -3.57163e-15 -3.34067e-15 -3.08163e-15 -2.84559e-15 -2.70146e-15 -3.72465e-15 -3.93763e-15 -4.28353e-15 -4.65887e-15
-4.98949e-15 -5.24517e-15 -5.42661e-15 -5.54692e-15 -5.61955e-15 -5.65366e-15 -5.65359e-15 -5.61936e-15 -5.54666e-15 -5.42632e-15 -5.2449e-15 -4.98926e-15
@@ -507,7 +507,7 @@
-6.51324e-15 -7.01002e-15 -7.33565e-15 -7.56201e-15 -7.71111e-15 -7.78591e-15 -7.78559e-15 -7.7101e-15 -7.55967e-15 -7.33456e-15 -7.00961e-15 -6.51294e-15
-5.59795e-15 -3.64696e-15 -8.41426e-17 -9.54682e-17
</DataArray>
- <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_Water^Air" NumberOfComponents="1" format="ascii">
1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05
1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50468e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05
1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05 1.50471e-05
@@ -723,7 +723,7 @@
293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15 293.15
293.15 293.15 293.15 293.15
</DataArray>
- <DataArray type="Float32" Name="velocity_liquid (m/s)" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_Water (m/s)" NumberOfComponents="3" 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
diff --git a/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu b/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
index be7cc1399c94a489366b0bc16a51e5ceed568aed..b95ddb397f0b46c422b9d3d994b4405c10e5cfb2 100644
--- a/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
+++ b/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
@@ -75,7 +75,7 @@
1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74 1618.74
1618.74 1618.74 1618.74 1618.74
</DataArray>
- <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_liqSimpleH2O" NumberOfComponents="1" format="ascii">
0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567
0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.499567 0.498705 0.498705 0.498705 0.498705
0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705 0.498705
@@ -111,7 +111,7 @@
0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966 0.483966
0.483966 0.483966 0.483966 0.483966
</DataArray>
- <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_liqSimpleH2O" NumberOfComponents="1" format="ascii">
98395 98395 98395 98395 98395 98395 98395 98395 98395 98395 98395 98395
98395 98395 98395 98395 98395 98395 98395 98395 98395.2 98395.2 98395.2 98395.2
98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2 98395.2
@@ -219,7 +219,7 @@
109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712 109.712
109.712 109.712 109.712 109.712
</DataArray>
- <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_gasAir" NumberOfComponents="1" format="ascii">
0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433
0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.500433 0.501295 0.501295 0.501295 0.501295
0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295 0.501295
@@ -255,7 +255,7 @@
0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034 0.516034
0.516034 0.516034 0.516034 0.516033
</DataArray>
- <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_gasAir" NumberOfComponents="1" format="ascii">
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000 100000 100000 100000 100000 100001 100001 100001 100001
100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001 100001