From fccc190bba382b638808e347bfcc2b995120d8ac Mon Sep 17 00:00:00 2001
From: Thomas Fetzer <thomas.fetzer@iws.uni-stuttgart.de>
Date: Fri, 4 Sep 2015 08:18:11 +0000
Subject: [PATCH] [3p3c] - changed naming of mole fractions x^alpha_kappa to
 x^kappa_alpha - added zeroThreshold for the kuevette problem, because the
 non-wetting   phase already disappaered at the end of the simulation

reviewed by timok



git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15436 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 dumux/implicit/3p3c/3p3cmodel.hh              |   4 +-
 test/implicit/3p3c/CMakeLists.txt             |   5 +-
 test/references/column3p3cnibox-reference.vtu |  24 +--
 test/references/column3p3cnicc-reference.vtu  |  18 +-
 test/references/infiltrationbox-reference.vtu |  18 +-
 test/references/infiltrationcc-reference.vtu  |  18 +-
 .../kuevette3p3cnibox-reference.vtu           |  18 +-
 .../references/kuevette3p3cnicc-reference.vtu | 184 +++++++++---------
 8 files changed, 146 insertions(+), 143 deletions(-)

diff --git a/dumux/implicit/3p3c/3p3cmodel.hh b/dumux/implicit/3p3c/3p3cmodel.hh
index 32a34332a6..2ec7a4c63a 100644
--- a/dumux/implicit/3p3c/3p3cmodel.hh
+++ b/dumux/implicit/3p3c/3p3cmodel.hh
@@ -414,9 +414,9 @@ public:
             {
                 std::ostringstream oss;
                 oss << "x^"
-                    << FluidSystem::phaseName(i)
+                    << FluidSystem::componentName(j)
                     << "_"
-                    << FluidSystem::componentName(j);
+                    << FluidSystem::phaseName(i);
                 writer.attachDofData(*moleFraction[i][j], oss.str().c_str(), isBox);
             }
         }
diff --git a/test/implicit/3p3c/CMakeLists.txt b/test/implicit/3p3c/CMakeLists.txt
index 17975ea9f3..dd0ce3e8f8 100644
--- a/test/implicit/3p3c/CMakeLists.txt
+++ b/test/implicit/3p3c/CMakeLists.txt
@@ -30,12 +30,15 @@ add_dumux_test(test_cc3p3cnicolumnxylol test_cc3p3cnicolumnxylol test_cc3p3cnico
                          ${CMAKE_CURRENT_BINARY_DIR}/columnxylolcc-00054.vtu
                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_cc3p3cnicolumnxylol")
 
+# the zeroThreshold for the non-wetting phase are quite high, because the non-wetting
+# phase is not present at the end of the simulation
 add_dumux_test(test_box3p3cnikuevette test_box3p3cnikuevette test_box3p3cnikuevette.cc
                python ${CMAKE_SOURCE_DIR}/bin/runtest.py
                  --script fuzzy
                  --files ${CMAKE_SOURCE_DIR}/test/references/kuevette3p3cnibox-reference.vtu
                          ${CMAKE_CURRENT_BINARY_DIR}/kuevettebox-00013.vtu
-                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3p3cnikuevette")
+                 --command "${CMAKE_CURRENT_BINARY_DIR}/test_box3p3cnikuevette"
+                 --zeroThreshold {"x^mesitylene_n":1e-9,"x^Air_n":1e-9,"x^H2O_n":1e-9})
 
 # with Dune 2.3 we have 14 time steps, with Dune 2.4 we have 12
 # remove this code if support for Dune 2.3 is dropped
diff --git a/test/references/column3p3cnibox-reference.vtu b/test/references/column3p3cnibox-reference.vtu
index b9caef6b97..296e113f27 100644
--- a/test/references/column3p3cnibox-reference.vtu
+++ b/test/references/column3p3cnibox-reference.vtu
@@ -210,7 +210,7 @@
           1.1949 1.1949 1.19265 1.19265 1.1723 1.1723 1.20045 1.20045 1.29004 1.29004 0.644193 0.644193
           0.593191 0.593191
         </DataArray>
-        <DataArray type="Float32" Name="x^w_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_w" 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.999945 0.999945 0.999621 0.999621 0.999365 0.999365 0.999952 0.999952
           1 1
         </DataArray>
-        <DataArray type="Float32" Name="x^w_xylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_w" 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
@@ -254,9 +254,9 @@
           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.62567e-05 2.62567e-05 2.62567e-05 2.62567e-05 2.62567e-05 2.62567e-05 2.62567e-05 2.62567e-05 2.62574e-05 2.62574e-05 2.62655e-05 2.62655e-05
           2.63671e-05 2.63671e-05 2.76023e-05 2.76023e-05 4.3287e-05 4.3287e-05 0.000374854 0.000374854 0.000635214 0.000635214 4.80611e-05 4.80611e-05
-          6.24415e-31 -1.28444e-30
+          -6.89663e-31 7.72488e-30
         </DataArray>
-        <DataArray type="Float32" Name="x^w_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_w" 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.37387e-05 1.37387e-05 1.3542e-05 1.3542e-05 1.18018e-05 1.18018e-05 3.95798e-06 3.95798e-06 3.12096e-11 3.12096e-11 2.98917e-11 2.98917e-11
           2.58639e-11 2.58639e-11
         </DataArray>
-        <DataArray type="Float32" Name="x^n_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_n" 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^n_xylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_n" 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
@@ -323,9 +323,9 @@
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 1 1
           1 1 1 1 1 1 1 1 1 1 0.0593977 0.0593977
-          7.58148e-28 -1.55953e-27
+          -8.3737e-28 9.37934e-27
         </DataArray>
-        <DataArray type="Float32" Name="x^n_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_n" 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^g_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_g" 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.0283528 0.0283528 0.0296688 0.0296688 0.046853 0.046853 0.439521 0.439521 0.762513 0.762513 0.98205 0.98205
           0.999997 0.999997
         </DataArray>
-        <DataArray type="Float32" Name="x^g_xylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_g" 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
@@ -392,9 +392,9 @@
           0.00983708 0.00983708 0.00983701 0.00983701 0.00983695 0.00983695 0.0098369 0.0098369 0.00983686 0.00983686 0.00983683 0.00983683
           0.0098368 0.0098368 0.00983677 0.00983677 0.00983673 0.00983673 0.00983672 0.00983672 0.00983693 0.00983693 0.00983993 0.00983993
           0.009878 0.009878 0.0103407 0.0103407 0.0162166 0.0162166 0.140428 0.140428 0.237483 0.237483 0.0179472 0.0179472
-          2.32879e-28 -4.79039e-28
+          -2.57214e-28 2.88104e-27
         </DataArray>
-        <DataArray type="Float32" Name="x^g_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_g" 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 5c94f06e42..4a19c32528 100644
--- a/test/references/column3p3cnicc-reference.vtu
+++ b/test/references/column3p3cnicc-reference.vtu
@@ -111,7 +111,7 @@
           1.19489 1.19491 1.19494 1.19495 1.19497 1.19498 1.19499 1.195 1.19501 1.19502 1.19502 1.19503
           1.19503 1.19504 1.19504 1.19505 1.19505 1.19502 1.19468 1.19124 1.16472 1.27034 1.29029 0.592557
         </DataArray>
-        <DataArray type="Float32" Name="x^w_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_w" 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.999936 0.999414 0.999365 1
         </DataArray>
-        <DataArray type="Float32" Name="x^w_xylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_w" 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.62567e-05
           2.62567e-05 2.62567e-05 2.62567e-05 2.62568e-05 2.62583e-05 2.62751e-05 2.64569e-05 2.83964e-05 5.26522e-05 0.00058533 0.000635344 9.91944e-16
         </DataArray>
-        <DataArray type="Float32" Name="x^w_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_w" 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.3748e-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.37543e-05 1.37546e-05 1.37549e-05 1.37551e-05 1.37553e-05 1.37554e-05 1.37556e-05 1.37557e-05 1.37558e-05 1.37558e-05 1.37559e-05 1.3756e-05
           1.3756e-05 1.37561e-05 1.37561e-05 1.37562e-05 1.3756e-05 1.37533e-05 1.37233e-05 1.3422e-05 1.11337e-05 7.2775e-07 2.59286e-11 2.68682e-11
         </DataArray>
-        <DataArray type="Float32" Name="x^n_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_n" 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^n_xylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_n" 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 1.20566e-12
         </DataArray>
-        <DataArray type="Float32" Name="x^n_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_n" 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^g_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_g" 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.0282378 0.0282372 0.0282367 0.0282363 0.0282359 0.0282356 0.0282353 0.0282351 0.0282349 0.0282348 0.0282346 0.0282345
           0.0282344 0.0282343 0.0282342 0.0282342 0.0282357 0.0282539 0.0284515 0.0304898 0.0572732 0.70192 0.762517 0.999997
         </DataArray>
-        <DataArray type="Float32" Name="x^g_xylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^xylene_g" 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.00983845 0.00983823 0.00983805 0.0098379 0.00983777 0.00983766 0.00983757 0.00983749 0.00983743 0.00983737 0.00983733 0.00983729
           0.00983725 0.00983721 0.00983717 0.00983719 0.00983771 0.00984395 0.00991204 0.0106386 0.0197259 0.219245 0.23748 3.70374e-13
         </DataArray>
-        <DataArray type="Float32" Name="x^g_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_g" 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/infiltrationbox-reference.vtu b/test/references/infiltrationbox-reference.vtu
index 5894f157d0..ced88e3ea7 100644
--- a/test/references/infiltrationbox-reference.vtu
+++ b/test/references/infiltrationbox-reference.vtu
@@ -183,7 +183,7 @@
           1.22375 1.22372 1.2237 1.22368 1.22366 1.22364 1.22362 1.22361 1.2236 1.22361 1.22365 1.2237
           1.22442
         </DataArray>
-        <DataArray type="Float32" Name="x^w_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_w" 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^w_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
           4.50629e-09 4.50268e-09 3.76482e-09 3.7613e-09 4.50226e-09 3.76085e-09 4.50047e-09 3.75903e-09 4.49962e-09 3.9344e-09 4.65788e-09 3.77412e-08
           4.6555e-09 3.76896e-08 4.4941e-09 3.92685e-09 4.49121e-09 3.74972e-09 4.48962e-09 3.74801e-09 4.48785e-09 3.74626e-09 4.486e-09 3.74441e-09
           4.48416e-09 3.74255e-09 4.48231e-09 3.7407e-09 4.48047e-09 3.73884e-09 4.47862e-09 3.73699e-09 4.47678e-09 3.73513e-09 4.47493e-09 3.73328e-09
@@ -223,7 +223,7 @@
           3.02224e-09 3.0222e-09 3.02217e-09 3.02213e-09 3.0221e-09 3.02207e-09 3.02205e-09 3.02203e-09 3.02201e-09 3.02201e-09 3.02202e-09 3.02178e-09
           3.02334e-09
         </DataArray>
-        <DataArray type="Float32" Name="x^w_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
           2.72214e-05 2.72248e-05 2.27051e-05 2.27099e-05 2.72271e-05 2.2712e-05 2.72285e-05 2.27136e-05 2.72325e-05 2.27164e-05 2.72669e-05 2.27525e-05
           2.7267e-05 2.27526e-05 2.72329e-05 2.27168e-05 2.72298e-05 2.27149e-05 2.72293e-05 2.27142e-05 2.72286e-05 2.27135e-05 2.72279e-05 2.27128e-05
           2.72272e-05 2.27121e-05 2.72266e-05 2.27115e-05 2.72259e-05 2.27108e-05 2.72253e-05 2.27102e-05 2.72248e-05 2.27096e-05 2.72242e-05 2.27091e-05
@@ -243,7 +243,7 @@
           1.81787e-05 1.81783e-05 1.8178e-05 1.81777e-05 1.81774e-05 1.81771e-05 1.81769e-05 1.81767e-05 1.81766e-05 1.81766e-05 1.81773e-05 1.81781e-05
           1.81888e-05
         </DataArray>
-        <DataArray type="Float32" Name="x^n_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_n" 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^n_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_n" NumberOfComponents="1" format="ascii">
           0.00132302 0.00132196 0.00110533 0.0011043 0.00132184 0.00110417 0.00132131 0.00110363 0.00132107 0.00115512 0.00136753 0.0110806
           0.00136683 0.0110655 0.00131944 0.0011529 0.0013186 0.0011009 0.00131813 0.0011004 0.00131761 0.00109988 0.00131707 0.00109934
           0.00131653 0.00109879 0.00131598 0.00109825 0.00131544 0.0010977 0.0013149 0.00109716 0.00131436 0.00109662 0.00131382 0.00109607
@@ -283,7 +283,7 @@
           0.000887315 0.000887304 0.000887293 0.000887283 0.000887274 0.000887265 0.000887258 0.000887252 0.000887248 0.000887247 0.000887249 0.000887178
           0.000887638
         </DataArray>
-        <DataArray type="Float32" Name="x^n_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_n" 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^g_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
           0.00824008 0.00823906 0.00986295 0.00986087 0.00823835 0.00985997 0.00823794 0.00985932 0.00823675 0.0098581 0.00822645 0.00984252
           0.00822641 0.00984246 0.00823661 0.00985791 0.00823754 0.00985876 0.00823769 0.00985903 0.00823793 0.00985936 0.00823813 0.00985966
           0.00823834 0.00985995 0.00823853 0.00986022 0.00823871 0.00986049 0.00823889 0.00986075 0.00823907 0.009861 0.00823924 0.00986125
@@ -323,7 +323,7 @@
           0.0122886 0.0122888 0.0122891 0.0122893 0.0122895 0.0122896 0.0122898 0.0122899 0.01229 0.01229 0.0122896 0.012289
           0.0122818
         </DataArray>
-        <DataArray type="Float32" Name="x^g_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
           1e-06 9.99075e-07 1e-06 9.98855e-07 9.98896e-07 9.98646e-07 9.98448e-07 9.98096e-07 9.98116e-07 1.04453e-06 1.03193e-06 1.00039e-05
           1.0314e-06 9.99023e-06 9.96875e-07 1.04251e-06 9.96347e-07 9.95568e-07 9.96012e-07 9.9514e-07 9.95648e-07 9.94709e-07 9.95264e-07 9.94248e-07
           9.94878e-07 9.93784e-07 9.94492e-07 9.93319e-07 9.94105e-07 9.92853e-07 9.93717e-07 9.92386e-07 9.93329e-07 9.91919e-07 9.9294e-07 9.91452e-07
@@ -343,7 +343,7 @@
           1.00019e-06 1.00019e-06 1.0002e-06 1.00021e-06 1.00021e-06 1.00022e-06 1.00022e-06 1.00022e-06 1.00023e-06 1.00022e-06 1.00019e-06 1.00007e-06
           1e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^g_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
           0.991759 0.99176 0.990136 0.990138 0.991761 0.990139 0.991761 0.99014 0.991762 0.990141 0.991773 0.990147
           0.991773 0.990148 0.991762 0.990141 0.991761 0.99014 0.991761 0.99014 0.991761 0.99014 0.991761 0.990139
           0.991761 0.990139 0.99176 0.990139 0.99176 0.990139 0.99176 0.990138 0.99176 0.990138 0.99176 0.990138
diff --git a/test/references/infiltrationcc-reference.vtu b/test/references/infiltrationcc-reference.vtu
index e22b35ff1f..5224b93a7e 100644
--- a/test/references/infiltrationcc-reference.vtu
+++ b/test/references/infiltrationcc-reference.vtu
@@ -147,7 +147,7 @@
           1.22439 1.22438 1.22437 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^w_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_w" 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^w_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
           4.13462e-09 4.13276e-09 4.13089e-09 4.12903e-09 4.12716e-09 4.1253e-09 4.12345e-09 4.12159e-09 4.11974e-09 4.11789e-09 4.11604e-09 4.11419e-09
           4.11234e-09 4.11049e-09 4.10863e-09 4.10678e-09 4.10493e-09 4.10308e-09 4.10123e-09 4.09938e-09 4.09752e-09 4.09567e-09 4.09382e-09 4.09197e-09
           4.09012e-09 4.08826e-09 4.08641e-09 4.08456e-09 4.08271e-09 4.08086e-09 4.07901e-09 4.07715e-09 4.0753e-09 4.07345e-09 4.0716e-09 4.06975e-09
@@ -179,7 +179,7 @@
           3.02328e-09 3.02327e-09 3.02325e-09 3.02324e-09 3.02322e-09 3.0232e-09 3.02319e-09 3.02317e-09 3.02316e-09 3.02314e-09 3.02313e-09 3.02311e-09
           3.0231e-09 3.02308e-09 3.02306e-09 3.02301e-09
         </DataArray>
-        <DataArray type="Float32" Name="x^w_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
           2.4954e-05 2.49368e-05 2.49195e-05 2.49023e-05 2.48851e-05 2.48714e-05 2.4861e-05 2.48507e-05 2.48403e-05 2.483e-05 2.48196e-05 2.48092e-05
           2.47988e-05 2.47885e-05 2.47781e-05 2.47676e-05 2.47572e-05 2.47468e-05 2.47364e-05 2.47259e-05 2.47155e-05 2.47051e-05 2.46946e-05 2.46841e-05
           2.46737e-05 2.46632e-05 2.46527e-05 2.46422e-05 2.46318e-05 2.46213e-05 2.46108e-05 2.46003e-05 2.45898e-05 2.45793e-05 2.45688e-05 2.45583e-05
@@ -195,7 +195,7 @@
           1.81883e-05 1.81881e-05 1.8188e-05 1.81879e-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^n_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_n" 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^n_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_n" NumberOfComponents="1" format="ascii">
           0.0012139 0.00121336 0.00121281 0.00121226 0.00121171 0.00121117 0.00121062 0.00121008 0.00120954 0.00120899 0.00120845 0.00120791
           0.00120736 0.00120682 0.00120627 0.00120573 0.00120519 0.00120464 0.0012041 0.00120356 0.00120301 0.00120247 0.00120192 0.00120138
           0.00120084 0.00120029 0.00119975 0.00119921 0.00119866 0.00119812 0.00119758 0.00119703 0.00119649 0.00119594 0.0011954 0.00119486
@@ -227,7 +227,7 @@
           0.00088762 0.000887616 0.000887611 0.000887607 0.000887602 0.000887598 0.000887593 0.000887589 0.000887584 0.00088758 0.000887575 0.00088757
           0.000887566 0.000887561 0.000887557 0.00088754
         </DataArray>
-        <DataArray type="Float32" Name="x^n_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_n" 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^g_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
           0.00898206 0.00898822 0.00899438 0.00900055 0.0090067 0.00901164 0.00901537 0.00901908 0.00902281 0.00902653 0.00903027 0.00903401
           0.00903776 0.00904151 0.00904527 0.00904904 0.00905281 0.00905659 0.00906037 0.00906416 0.00906796 0.00907176 0.00907557 0.00907938
           0.00908319 0.00908701 0.00909084 0.00909467 0.00909851 0.00910235 0.00910619 0.00911004 0.0091139 0.00911776 0.00912162 0.00912548
@@ -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.0122832
           0.0122833 0.0122834 0.0122835 0.0122836
         </DataArray>
-        <DataArray type="Float32" Name="x^g_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
           1.00014e-06 1.00038e-06 1.00061e-06 1.00084e-06 1.00108e-06 1.00117e-06 1.00114e-06 1.0011e-06 1.00106e-06 1.00103e-06 1.00099e-06 1.00095e-06
           1.00092e-06 1.00088e-06 1.00085e-06 1.00081e-06 1.00078e-06 1.00075e-06 1.00071e-06 1.00068e-06 1.00065e-06 1.00061e-06 1.00058e-06 1.00055e-06
           1.00052e-06 1.00048e-06 1.00045e-06 1.00042e-06 1.00039e-06 1.00036e-06 1.00032e-06 1.00029e-06 1.00026e-06 1.00023e-06 1.0002e-06 1.00017e-06
@@ -275,7 +275,7 @@
           1.00001e-06 1.00001e-06 1.00002e-06 1.00002e-06 1.00002e-06 1.00002e-06 1.00003e-06 1.00003e-06 1.00003e-06 1.00003e-06 1.00004e-06 1.00004e-06
           1.00004e-06 1.00004e-06 1.00005e-06 1.00003e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^g_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
           0.991017 0.991011 0.991005 0.990998 0.990992 0.990987 0.990984 0.99098 0.990976 0.990972 0.990969 0.990965
           0.990961 0.990957 0.990954 0.99095 0.990946 0.990942 0.990939 0.990935 0.990931 0.990927 0.990923 0.99092
           0.990916 0.990912 0.990908 0.990904 0.990901 0.990897 0.990893 0.990889 0.990885 0.990881 0.990877 0.990874
diff --git a/test/references/kuevette3p3cnibox-reference.vtu b/test/references/kuevette3p3cnibox-reference.vtu
index 9468c75989..19bf2ad1e6 100644
--- a/test/references/kuevette3p3cnibox-reference.vtu
+++ b/test/references/kuevette3p3cnibox-reference.vtu
@@ -210,7 +210,7 @@
           34.6911 36.5857 34.6841 36.5689 34.6508 36.5281 34.4993 36.4267 33.9024 36.217 32.0233 35.9997
           27.589 36.7073
         </DataArray>
-        <DataArray type="Float32" Name="x^w_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
           0.99973 0.999493 0.999698 0.999559 0.999664 0.999556 0.999644 0.999548 0.999637 0.999544 0.999635 0.999542
           0.999635 0.999542 0.999635 0.999542 0.999635 0.999542 0.999635 0.999542 0.999635 0.999542 0.999635 0.999542
           0.999635 0.999542 0.999635 0.999542 0.999635 0.999542 0.999635 0.999542 0.999635 0.999542 0.999635 0.999542
@@ -233,7 +233,7 @@
           0.999635 0.999544 0.999635 0.999545 0.999636 0.999548 0.999642 0.999554 0.999659 0.999566 0.999696 0.999578
           0.999733 0.999536
         </DataArray>
-        <DataArray type="Float32" Name="x^w_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
           3.13274e-09 6.03486e-09 3.92892e-09 6.36282e-09 3.96712e-09 6.58947e-09 3.85039e-09 6.70161e-09 3.67089e-09 6.75528e-09 3.45926e-09 6.77187e-09
           3.22864e-09 6.76193e-09 2.98683e-09 6.73295e-09 2.74188e-09 6.69104e-09 2.50543e-09 6.64158e-09 2.29065e-09 6.59099e-09 2.0964e-09 6.54929e-09
           1.92156e-09 6.51503e-09 1.76495e-09 6.48695e-09 1.62534e-09 6.464e-09 1.50147e-09 6.44526e-09 1.39202e-09 6.42995e-09 1.2957e-09 6.41745e-09
@@ -256,7 +256,7 @@
           6.32834e-10 5.21501e-10 6.1189e-10 4.63747e-10 5.77879e-10 4.08515e-10 5.23721e-10 3.5153e-10 4.3682e-10 2.86863e-10 2.83011e-10 2.0171e-10
           1.78054e-16 3.83952e-11
         </DataArray>
-        <DataArray type="Float32" Name="x^w_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
           0.000270445 0.000507218 0.000301902 0.000440599 0.000336003 0.000443513 0.000355679 0.000451996 0.000362661 0.000456183 0.000364612 0.000457585
           0.000365057 0.000457969 0.000365109 0.00045805 0.000365089 0.000458027 0.000365073 0.000457963 0.000365071 0.000457888 0.00036507 0.000457829
           0.000365069 0.000457784 0.000365068 0.000457751 0.000365068 0.000457725 0.000365067 0.000457705 0.000365067 0.000457691 0.000365066 0.000457679
@@ -279,7 +279,7 @@
           0.000364953 0.000455752 0.00036471 0.000454689 0.000363558 0.000452143 0.000358473 0.000445933 0.00034076 0.000433674 0.000303776 0.000421774
           0.000266816 0.000463598
         </DataArray>
-        <DataArray type="Float32" Name="x^n_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_n" 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^n_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_n" NumberOfComponents="1" format="ascii">
           6.56572e-06 0.00119311 4.55393e-05 0.000738083 0.00011558 0.000785016 0.000160665 0.000860986 0.00017111 0.000899876 0.000166105 0.000912959
           0.000156073 0.000914607 0.000144499 0.000911321 0.000132609 0.00090547 0.000121145 0.000898293 0.000110756 0.000890886 0.000101364 0.000884811
           9.29094e-05 0.000879853 8.53368e-05 0.000875813 7.85866e-05 0.000872528 7.2597e-05 0.000869857 6.73049e-05 0.000867686 6.26476e-05 0.000865919
@@ -325,7 +325,7 @@
           3.05642e-05 6.92474e-05 2.94449e-05 6.1018e-05 2.73279e-05 5.25778e-05 2.28798e-05 4.28257e-05 1.39993e-05 3.12028e-05 3.51547e-06 1.95191e-05
           2.98371e-13 5.44735e-06
         </DataArray>
-        <DataArray type="Float32" Name="x^n_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_n" 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^g_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
           0.0381662 0.000569241 0.00763023 0.000920956 0.00324494 0.000899014 0.00233575 0.000837248 0.00211241 0.000809104 0.00205655 0.000801079
           0.00204398 0.00079889 0.00204249 0.000798425 0.00204305 0.000798559 0.0020435 0.00079892 0.00204355 0.000799344 0.00204357 0.000799676
           0.00204358 0.000799928 0.00204358 0.000800119 0.00204359 0.000800263 0.0020436 0.000800372 0.0020436 0.000800454 0.00204361 0.000800517
@@ -371,7 +371,7 @@
           0.0020459 0.000811353 0.00205276 0.00081796 0.00208551 0.000835898 0.00223546 0.000880767 0.00298189 0.000974368 0.00717206 0.00108504
           0.0471718 0.000767126
         </DataArray>
-        <DataArray type="Float32" Name="x^g_mesitylene" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
           3.35077e-08 6.45486e-08 4.20237e-08 6.80566e-08 4.24323e-08 7.0481e-08 4.11838e-08 7.16805e-08 3.92639e-08 7.22546e-08 3.70003e-08 7.24321e-08
           3.45337e-08 7.23259e-08 3.19473e-08 7.2016e-08 2.93273e-08 7.15678e-08 2.67982e-08 7.10389e-08 2.4501e-08 7.04978e-08 2.24233e-08 7.00519e-08
           2.05532e-08 6.96855e-08 1.88781e-08 6.93853e-08 1.73849e-08 6.91399e-08 1.60599e-08 6.89394e-08 1.48893e-08 6.87758e-08 1.3859e-08 6.86422e-08
@@ -394,7 +394,7 @@
           6.76965e-09 5.57867e-09 6.54561e-09 4.96087e-09 6.18179e-09 4.37004e-09 5.60245e-09 3.76045e-09 4.67284e-09 3.06869e-09 3.02748e-09 2.15778e-09
           1.90471e-15 4.1073e-10
         </DataArray>
-        <DataArray type="Float32" Name="x^g_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
           0.961834 0.999431 0.99237 0.999079 0.996755 0.999101 0.997664 0.999163 0.997888 0.999191 0.997943 0.999199
           0.997956 0.999201 0.997957 0.999201 0.997957 0.999201 0.997956 0.999201 0.997956 0.999201 0.997956 0.9992
           0.997956 0.9992 0.997956 0.9992 0.997956 0.9992 0.997956 0.9992 0.997956 0.999199 0.997956 0.999199
diff --git a/test/references/kuevette3p3cnicc-reference.vtu b/test/references/kuevette3p3cnicc-reference.vtu
index 4224fca7b3..f6507ba253 100644
--- a/test/references/kuevette3p3cnicc-reference.vtu
+++ b/test/references/kuevette3p3cnicc-reference.vtu
@@ -4,7 +4,7 @@
     <Piece NumberOfCells="120" NumberOfPoints="242">
       <CellData Scalars="Sw">
         <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
-          0.13263 0.132513 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511
+          0.132647 0.132514 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511
           0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511
           0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511
           0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511
@@ -13,7 +13,7 @@
           0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511
           0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511
           0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511
-          0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132506 0.132393
+          0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.132511 0.13251 0.132504 0.132378
         </DataArray>
         <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
@@ -28,7 +28,7 @@
           0 0 0 0 0 0 0 0 0 0 0 0
         </DataArray>
         <DataArray type="Float32" Name="Sg" NumberOfComponents="1" format="ascii">
-          0.86737 0.867487 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489
+          0.867353 0.867486 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489
           0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489
           0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489
           0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489
@@ -37,43 +37,43 @@
           0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489
           0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489
           0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489
-          0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867494 0.867607
+          0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.867489 0.86749 0.867496 0.867622
         </DataArray>
         <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
-          2.85613e+06 2.85613e+06 2.85612e+06 2.85612e+06 2.85612e+06 2.85611e+06 2.85611e+06 2.85611e+06 2.8561e+06 2.8561e+06 2.8561e+06 2.85609e+06
-          2.85609e+06 2.85609e+06 2.85608e+06 2.85608e+06 2.85608e+06 2.85608e+06 2.85607e+06 2.85607e+06 2.85607e+06 2.85606e+06 2.85606e+06 2.85606e+06
-          2.85605e+06 2.85605e+06 2.85605e+06 2.85604e+06 2.85604e+06 2.85604e+06 2.85603e+06 2.85603e+06 2.85603e+06 2.85602e+06 2.85602e+06 2.85602e+06
-          2.85601e+06 2.85601e+06 2.85601e+06 2.856e+06 2.856e+06 2.856e+06 2.85599e+06 2.85599e+06 2.85599e+06 2.85598e+06 2.85598e+06 2.85598e+06
+          2.85613e+06 2.85613e+06 2.85613e+06 2.85612e+06 2.85612e+06 2.85612e+06 2.85611e+06 2.85611e+06 2.85611e+06 2.8561e+06 2.8561e+06 2.8561e+06
+          2.85609e+06 2.85609e+06 2.85609e+06 2.85608e+06 2.85608e+06 2.85608e+06 2.85607e+06 2.85607e+06 2.85607e+06 2.85606e+06 2.85606e+06 2.85606e+06
+          2.85605e+06 2.85605e+06 2.85605e+06 2.85604e+06 2.85604e+06 2.85604e+06 2.85604e+06 2.85603e+06 2.85603e+06 2.85603e+06 2.85602e+06 2.85602e+06
+          2.85602e+06 2.85601e+06 2.85601e+06 2.85601e+06 2.856e+06 2.856e+06 2.856e+06 2.85599e+06 2.85599e+06 2.85599e+06 2.85598e+06 2.85598e+06
           2.85598e+06 2.85597e+06 2.85597e+06 2.85597e+06 2.85596e+06 2.85596e+06 2.85596e+06 2.85595e+06 2.85595e+06 2.85595e+06 2.85594e+06 2.85594e+06
-          2.85594e+06 2.85593e+06 2.85593e+06 2.85593e+06 2.85592e+06 2.85592e+06 2.85592e+06 2.85591e+06 2.85591e+06 2.85591e+06 2.8559e+06 2.8559e+06
-          2.8559e+06 2.85589e+06 2.85589e+06 2.85589e+06 2.85588e+06 2.85588e+06 2.85588e+06 2.85588e+06 2.85587e+06 2.85587e+06 2.85587e+06 2.85586e+06
+          2.85594e+06 2.85593e+06 2.85593e+06 2.85593e+06 2.85592e+06 2.85592e+06 2.85592e+06 2.85592e+06 2.85591e+06 2.85591e+06 2.85591e+06 2.8559e+06
+          2.8559e+06 2.8559e+06 2.85589e+06 2.85589e+06 2.85589e+06 2.85588e+06 2.85588e+06 2.85588e+06 2.85587e+06 2.85587e+06 2.85587e+06 2.85586e+06
           2.85586e+06 2.85586e+06 2.85585e+06 2.85585e+06 2.85585e+06 2.85584e+06 2.85584e+06 2.85584e+06 2.85583e+06 2.85583e+06 2.85583e+06 2.85582e+06
-          2.85582e+06 2.85582e+06 2.85581e+06 2.85581e+06 2.85581e+06 2.8558e+06 2.8558e+06 2.8558e+06 2.85579e+06 2.85579e+06 2.85579e+06 2.85578e+06
+          2.85582e+06 2.85582e+06 2.85582e+06 2.85581e+06 2.85581e+06 2.85581e+06 2.8558e+06 2.8558e+06 2.8558e+06 2.85579e+06 2.85579e+06 2.85579e+06
           2.85578e+06 2.85578e+06 2.85578e+06 2.85577e+06 2.85577e+06 2.85577e+06 2.85576e+06 2.85576e+06 2.85576e+06 2.85575e+06 2.85575e+06 2.85574e+06
         </DataArray>
         <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
-          2.85613e+06 2.85613e+06 2.85612e+06 2.85612e+06 2.85612e+06 2.85611e+06 2.85611e+06 2.85611e+06 2.8561e+06 2.8561e+06 2.8561e+06 2.85609e+06
-          2.85609e+06 2.85609e+06 2.85608e+06 2.85608e+06 2.85608e+06 2.85608e+06 2.85607e+06 2.85607e+06 2.85607e+06 2.85606e+06 2.85606e+06 2.85606e+06
-          2.85605e+06 2.85605e+06 2.85605e+06 2.85604e+06 2.85604e+06 2.85604e+06 2.85603e+06 2.85603e+06 2.85603e+06 2.85602e+06 2.85602e+06 2.85602e+06
-          2.85601e+06 2.85601e+06 2.85601e+06 2.856e+06 2.856e+06 2.856e+06 2.85599e+06 2.85599e+06 2.85599e+06 2.85598e+06 2.85598e+06 2.85598e+06
+          2.85613e+06 2.85613e+06 2.85613e+06 2.85612e+06 2.85612e+06 2.85612e+06 2.85611e+06 2.85611e+06 2.85611e+06 2.8561e+06 2.8561e+06 2.8561e+06
+          2.85609e+06 2.85609e+06 2.85609e+06 2.85608e+06 2.85608e+06 2.85608e+06 2.85607e+06 2.85607e+06 2.85607e+06 2.85606e+06 2.85606e+06 2.85606e+06
+          2.85605e+06 2.85605e+06 2.85605e+06 2.85604e+06 2.85604e+06 2.85604e+06 2.85604e+06 2.85603e+06 2.85603e+06 2.85603e+06 2.85602e+06 2.85602e+06
+          2.85602e+06 2.85601e+06 2.85601e+06 2.85601e+06 2.856e+06 2.856e+06 2.856e+06 2.85599e+06 2.85599e+06 2.85599e+06 2.85598e+06 2.85598e+06
           2.85598e+06 2.85597e+06 2.85597e+06 2.85597e+06 2.85596e+06 2.85596e+06 2.85596e+06 2.85595e+06 2.85595e+06 2.85595e+06 2.85594e+06 2.85594e+06
-          2.85594e+06 2.85593e+06 2.85593e+06 2.85593e+06 2.85592e+06 2.85592e+06 2.85592e+06 2.85591e+06 2.85591e+06 2.85591e+06 2.8559e+06 2.8559e+06
-          2.8559e+06 2.85589e+06 2.85589e+06 2.85589e+06 2.85588e+06 2.85588e+06 2.85588e+06 2.85588e+06 2.85587e+06 2.85587e+06 2.85587e+06 2.85586e+06
+          2.85594e+06 2.85593e+06 2.85593e+06 2.85593e+06 2.85592e+06 2.85592e+06 2.85592e+06 2.85592e+06 2.85591e+06 2.85591e+06 2.85591e+06 2.8559e+06
+          2.8559e+06 2.8559e+06 2.85589e+06 2.85589e+06 2.85589e+06 2.85588e+06 2.85588e+06 2.85588e+06 2.85587e+06 2.85587e+06 2.85587e+06 2.85586e+06
           2.85586e+06 2.85586e+06 2.85585e+06 2.85585e+06 2.85585e+06 2.85584e+06 2.85584e+06 2.85584e+06 2.85583e+06 2.85583e+06 2.85583e+06 2.85582e+06
-          2.85582e+06 2.85582e+06 2.85581e+06 2.85581e+06 2.85581e+06 2.8558e+06 2.8558e+06 2.8558e+06 2.85579e+06 2.85579e+06 2.85579e+06 2.85578e+06
+          2.85582e+06 2.85582e+06 2.85582e+06 2.85581e+06 2.85581e+06 2.85581e+06 2.8558e+06 2.8558e+06 2.8558e+06 2.85579e+06 2.85579e+06 2.85579e+06
           2.85578e+06 2.85578e+06 2.85578e+06 2.85577e+06 2.85577e+06 2.85577e+06 2.85576e+06 2.85576e+06 2.85576e+06 2.85575e+06 2.85575e+06 2.85574e+06
         </DataArray>
         <DataArray type="Float32" Name="pg" NumberOfComponents="1" format="ascii">
-          2.85699e+06 2.85698e+06 2.85698e+06 2.85698e+06 2.85698e+06 2.85697e+06 2.85697e+06 2.85697e+06 2.85696e+06 2.85696e+06 2.85696e+06 2.85695e+06
-          2.85695e+06 2.85695e+06 2.85694e+06 2.85694e+06 2.85694e+06 2.85693e+06 2.85693e+06 2.85693e+06 2.85692e+06 2.85692e+06 2.85692e+06 2.85691e+06
-          2.85691e+06 2.85691e+06 2.8569e+06 2.8569e+06 2.8569e+06 2.85689e+06 2.85689e+06 2.85689e+06 2.85688e+06 2.85688e+06 2.85688e+06 2.85688e+06
+          2.85699e+06 2.85699e+06 2.85698e+06 2.85698e+06 2.85698e+06 2.85697e+06 2.85697e+06 2.85697e+06 2.85696e+06 2.85696e+06 2.85696e+06 2.85695e+06
+          2.85695e+06 2.85695e+06 2.85694e+06 2.85694e+06 2.85694e+06 2.85693e+06 2.85693e+06 2.85693e+06 2.85693e+06 2.85692e+06 2.85692e+06 2.85692e+06
+          2.85691e+06 2.85691e+06 2.85691e+06 2.8569e+06 2.8569e+06 2.8569e+06 2.85689e+06 2.85689e+06 2.85689e+06 2.85688e+06 2.85688e+06 2.85688e+06
           2.85687e+06 2.85687e+06 2.85687e+06 2.85686e+06 2.85686e+06 2.85686e+06 2.85685e+06 2.85685e+06 2.85685e+06 2.85684e+06 2.85684e+06 2.85684e+06
-          2.85683e+06 2.85683e+06 2.85683e+06 2.85682e+06 2.85682e+06 2.85682e+06 2.85681e+06 2.85681e+06 2.85681e+06 2.8568e+06 2.8568e+06 2.8568e+06
-          2.85679e+06 2.85679e+06 2.85679e+06 2.85678e+06 2.85678e+06 2.85678e+06 2.85678e+06 2.85677e+06 2.85677e+06 2.85677e+06 2.85676e+06 2.85676e+06
+          2.85683e+06 2.85683e+06 2.85683e+06 2.85682e+06 2.85682e+06 2.85682e+06 2.85682e+06 2.85681e+06 2.85681e+06 2.85681e+06 2.8568e+06 2.8568e+06
+          2.8568e+06 2.85679e+06 2.85679e+06 2.85679e+06 2.85678e+06 2.85678e+06 2.85678e+06 2.85677e+06 2.85677e+06 2.85677e+06 2.85676e+06 2.85676e+06
           2.85676e+06 2.85675e+06 2.85675e+06 2.85675e+06 2.85674e+06 2.85674e+06 2.85674e+06 2.85673e+06 2.85673e+06 2.85673e+06 2.85672e+06 2.85672e+06
-          2.85672e+06 2.85671e+06 2.85671e+06 2.85671e+06 2.8567e+06 2.8567e+06 2.8567e+06 2.85669e+06 2.85669e+06 2.85669e+06 2.85668e+06 2.85668e+06
+          2.85672e+06 2.85672e+06 2.85671e+06 2.85671e+06 2.85671e+06 2.8567e+06 2.8567e+06 2.8567e+06 2.85669e+06 2.85669e+06 2.85669e+06 2.85668e+06
           2.85668e+06 2.85668e+06 2.85667e+06 2.85667e+06 2.85667e+06 2.85666e+06 2.85666e+06 2.85666e+06 2.85665e+06 2.85665e+06 2.85665e+06 2.85664e+06
-          2.85664e+06 2.85664e+06 2.85663e+06 2.85663e+06 2.85663e+06 2.85662e+06 2.85662e+06 2.85662e+06 2.85661e+06 2.85661e+06 2.85661e+06 2.8566e+06
+          2.85664e+06 2.85664e+06 2.85663e+06 2.85663e+06 2.85663e+06 2.85662e+06 2.85662e+06 2.85662e+06 2.85662e+06 2.85661e+06 2.85661e+06 2.85661e+06
         </DataArray>
         <DataArray type="Float32" Name="rhow" NumberOfComponents="1" format="ascii">
           997.385 997.385 997.385 997.385 997.385 997.385 997.385 997.385 997.385 997.385 997.385 997.385
@@ -100,18 +100,18 @@
           863.055 863.055 863.055 863.055 863.055 863.055 863.055 863.055 863.055 863.055 863.055 863.055
         </DataArray>
         <DataArray type="Float32" Name="rhog" NumberOfComponents="1" format="ascii">
-          32.915 32.915 32.915 32.9149 32.9149 32.9148 32.9148 32.9148 32.9147 32.9147 32.9147 32.9146
-          32.9146 32.9145 32.9145 32.9145 32.9144 32.9144 32.9144 32.9143 32.9143 32.9142 32.9142 32.9142
-          32.9141 32.9141 32.9141 32.914 32.914 32.9139 32.9139 32.9139 32.9138 32.9138 32.9138 32.9137
-          32.9137 32.9137 32.9136 32.9136 32.9135 32.9135 32.9135 32.9134 32.9134 32.9134 32.9133 32.9133
-          32.9132 32.9132 32.9132 32.9131 32.9131 32.9131 32.913 32.913 32.9129 32.9129 32.9129 32.9128
-          32.9128 32.9128 32.9127 32.9127 32.9126 32.9126 32.9126 32.9125 32.9125 32.9125 32.9124 32.9124
-          32.9123 32.9123 32.9123 32.9122 32.9122 32.9122 32.9121 32.9121 32.9121 32.912 32.912 32.9119
-          32.9119 32.9119 32.9118 32.9118 32.9118 32.9117 32.9117 32.9116 32.9116 32.9116 32.9115 32.9115
-          32.9115 32.9114 32.9114 32.9114 32.9113 32.9113 32.9112 32.9112 32.9112 32.9111 32.9111 32.9111
-          32.911 32.911 32.9109 32.9109 32.9109 32.9108 32.9108 32.9108 32.9107 32.9107 32.9106 32.9106
+          32.9151 32.915 32.915 32.9149 32.9149 32.9149 32.9148 32.9148 32.9147 32.9147 32.9147 32.9146
+          32.9146 32.9146 32.9145 32.9145 32.9144 32.9144 32.9144 32.9143 32.9143 32.9143 32.9142 32.9142
+          32.9142 32.9141 32.9141 32.914 32.914 32.914 32.9139 32.9139 32.9139 32.9138 32.9138 32.9137
+          32.9137 32.9137 32.9136 32.9136 32.9136 32.9135 32.9135 32.9134 32.9134 32.9134 32.9133 32.9133
+          32.9133 32.9132 32.9132 32.9131 32.9131 32.9131 32.913 32.913 32.913 32.9129 32.9129 32.9128
+          32.9128 32.9128 32.9127 32.9127 32.9127 32.9126 32.9126 32.9126 32.9125 32.9125 32.9124 32.9124
+          32.9124 32.9123 32.9123 32.9123 32.9122 32.9122 32.9121 32.9121 32.9121 32.912 32.912 32.912
+          32.9119 32.9119 32.9118 32.9118 32.9118 32.9117 32.9117 32.9117 32.9116 32.9116 32.9116 32.9115
+          32.9115 32.9114 32.9114 32.9114 32.9113 32.9113 32.9113 32.9112 32.9112 32.9111 32.9111 32.9111
+          32.911 32.911 32.911 32.9109 32.9109 32.9108 32.9108 32.9108 32.9107 32.9107 32.9107 32.9106
         </DataArray>
-        <DataArray type="Float32" Name="x^w_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
           0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628
           0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628
           0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628
@@ -123,31 +123,31 @@
           0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628
           0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628 0.999628
         </DataArray>
-        <DataArray type="Float32" Name="x^w_mesitylene" NumberOfComponents="1" format="ascii">
-          2.99855e-09 2.99839e-09 2.9965e-09 3.00136e-09 2.99476e-09 3.00009e-09 3.00071e-09 2.99451e-09 3.0028e-09 2.99552e-09 2.99908e-09 2.99627e-09
-          3.0004e-09 2.99868e-09 2.99546e-09 3.00238e-09 2.99443e-09 2.9998e-09 2.99769e-09 2.99837e-09 2.99973e-09 2.99616e-09 2.99879e-09 2.99821e-09
-          2.99811e-09 3.00005e-09 2.99562e-09 2.9983e-09 2.99932e-09 2.99778e-09 2.99734e-09 2.99914e-09 2.99731e-09 2.99935e-09 2.99564e-09 3.00051e-09
-          2.99657e-09 2.99981e-09 2.99196e-09 3.00308e-09 2.99737e-09 2.99908e-09 2.99516e-09 3.00124e-09 2.9968e-09 2.99813e-09 2.99888e-09 2.99662e-09
-          2.99974e-09 2.99669e-09 2.99816e-09 2.99755e-09 2.9988e-09 2.99736e-09 2.99774e-09 2.99716e-09 3.00038e-09 2.99657e-09 2.99731e-09 2.99909e-09
-          2.99679e-09 2.99779e-09 2.99891e-09 2.99574e-09 2.99716e-09 3.00042e-09 2.9966e-09 2.99836e-09 2.99748e-09 2.99889e-09 2.99859e-09 2.99324e-09
-          3.00489e-09 2.99412e-09 2.99625e-09 2.99792e-09 3.00017e-09 2.99512e-09 3.00043e-09 2.99291e-09 3.00254e-09 2.99389e-09 3.00463e-09 2.9925e-09
-          2.99922e-09 2.99338e-09 3.00126e-09 2.9973e-09 2.9954e-09 3.00276e-09 2.99057e-09 3.00258e-09 2.99545e-09 3.00226e-09 2.99329e-09 3.00123e-09
-          2.99376e-09 2.99932e-09 2.99068e-09 3.00528e-09 2.98555e-09 3.00769e-09 2.99529e-09 2.99883e-09 2.99781e-09 2.99866e-09 2.99642e-09 2.99923e-09
-          3.00193e-09 2.98672e-09 3.00327e-09 2.99508e-09 3.00097e-09 2.99521e-09 2.99755e-09 3.00096e-09 2.99509e-09 2.99485e-09 2.9983e-09 2.99757e-09
+        <DataArray type="Float32" Name="x^mesitylene_w" NumberOfComponents="1" format="ascii">
+          2.99801e-09 2.99026e-09 3.00772e-09 2.99701e-09 2.9986e-09 2.99802e-09 3.00203e-09 2.99329e-09 3.00294e-09 2.99343e-09 3.00009e-09 2.99871e-09
+          2.99528e-09 3.00085e-09 2.99668e-09 2.99873e-09 3.0049e-09 2.99385e-09 2.99593e-09 2.9999e-09 2.99816e-09 2.99808e-09 2.9993e-09 2.99196e-09
+          3.00053e-09 3.00123e-09 2.99681e-09 3.00143e-09 2.99588e-09 2.99834e-09 2.99874e-09 2.99288e-09 3.00241e-09 2.99674e-09 2.99957e-09 2.9965e-09
+          3.00213e-09 2.9956e-09 2.99722e-09 2.99648e-09 3.00119e-09 2.99744e-09 2.99439e-09 3.00144e-09 2.99467e-09 3.00057e-09 2.99858e-09 2.99611e-09
+          2.99944e-09 2.99758e-09 2.99072e-09 3.01044e-09 2.99358e-09 2.99685e-09 3.00043e-09 2.99574e-09 2.99896e-09 2.99723e-09 2.99729e-09 2.99679e-09
+          2.99692e-09 3.00328e-09 2.98738e-09 3.00954e-09 2.99385e-09 2.99991e-09 2.99579e-09 2.99848e-09 2.99652e-09 2.99526e-09 2.9997e-09 2.99834e-09
+          2.99854e-09 2.99609e-09 2.99886e-09 2.99961e-09 2.99604e-09 2.99781e-09 3.00018e-09 2.9936e-09 3.00166e-09 2.9954e-09 2.9993e-09 2.99585e-09
+          2.9968e-09 2.99913e-09 2.99408e-09 3.00092e-09 2.997e-09 2.9997e-09 2.99583e-09 2.99759e-09 2.99819e-09 2.99703e-09 2.9981e-09 2.99737e-09
+          2.99703e-09 2.99759e-09 2.99748e-09 2.99841e-09 2.99686e-09 2.99835e-09 2.99705e-09 2.99702e-09 2.99733e-09 3.00256e-09 2.99049e-09 2.99848e-09
+          2.99954e-09 2.99621e-09 2.99768e-09 2.99788e-09 2.99774e-09 2.99622e-09 2.99838e-09 2.9974e-09 2.99679e-09 2.99819e-09 2.997e-09 2.99748e-09
         </DataArray>
-        <DataArray type="Float32" Name="x^w_Air" NumberOfComponents="1" format="ascii">
-          0.000372299 0.000372298 0.000372298 0.000372297 0.000372297 0.000372296 0.000372296 0.000372295 0.000372295 0.000372295 0.000372294 0.000372294
-          0.000372293 0.000372293 0.000372293 0.000372292 0.000372292 0.000372291 0.000372291 0.00037229 0.00037229 0.00037229 0.000372289 0.000372289
-          0.000372288 0.000372288 0.000372287 0.000372287 0.000372287 0.000372286 0.000372286 0.000372285 0.000372285 0.000372285 0.000372284 0.000372284
-          0.000372283 0.000372283 0.000372282 0.000372282 0.000372282 0.000372281 0.000372281 0.00037228 0.00037228 0.00037228 0.000372279 0.000372279
-          0.000372278 0.000372278 0.000372277 0.000372277 0.000372277 0.000372276 0.000372276 0.000372275 0.000372275 0.000372275 0.000372274 0.000372274
-          0.000372273 0.000372273 0.000372272 0.000372272 0.000372272 0.000372271 0.000372271 0.00037227 0.00037227 0.00037227 0.000372269 0.000372269
-          0.000372268 0.000372268 0.000372267 0.000372267 0.000372267 0.000372266 0.000372266 0.000372265 0.000372265 0.000372265 0.000372264 0.000372264
-          0.000372263 0.000372263 0.000372262 0.000372262 0.000372262 0.000372261 0.000372261 0.00037226 0.00037226 0.00037226 0.000372259 0.000372259
-          0.000372258 0.000372258 0.000372257 0.000372257 0.000372257 0.000372256 0.000372256 0.000372255 0.000372255 0.000372255 0.000372254 0.000372254
-          0.000372253 0.000372253 0.000372252 0.000372252 0.000372252 0.000372251 0.000372251 0.00037225 0.00037225 0.000372249 0.000372249 0.000372248
+        <DataArray type="Float32" Name="x^Air_w" NumberOfComponents="1" format="ascii">
+          0.000372299 0.000372298 0.000372298 0.000372297 0.000372297 0.000372296 0.000372296 0.000372296 0.000372295 0.000372295 0.000372294 0.000372294
+          0.000372294 0.000372293 0.000372293 0.000372292 0.000372292 0.000372291 0.000372291 0.000372291 0.00037229 0.00037229 0.000372289 0.000372289
+          0.000372289 0.000372288 0.000372288 0.000372287 0.000372287 0.000372286 0.000372286 0.000372286 0.000372285 0.000372285 0.000372284 0.000372284
+          0.000372284 0.000372283 0.000372283 0.000372282 0.000372282 0.000372281 0.000372281 0.000372281 0.00037228 0.00037228 0.000372279 0.000372279
+          0.000372279 0.000372278 0.000372278 0.000372277 0.000372277 0.000372276 0.000372276 0.000372276 0.000372275 0.000372275 0.000372274 0.000372274
+          0.000372273 0.000372273 0.000372273 0.000372272 0.000372272 0.000372271 0.000372271 0.000372271 0.00037227 0.00037227 0.000372269 0.000372269
+          0.000372268 0.000372268 0.000372268 0.000372267 0.000372267 0.000372266 0.000372266 0.000372266 0.000372265 0.000372265 0.000372264 0.000372264
+          0.000372263 0.000372263 0.000372263 0.000372262 0.000372262 0.000372261 0.000372261 0.000372261 0.00037226 0.00037226 0.000372259 0.000372259
+          0.000372258 0.000372258 0.000372258 0.000372257 0.000372257 0.000372256 0.000372256 0.000372256 0.000372255 0.000372255 0.000372254 0.000372254
+          0.000372253 0.000372253 0.000372253 0.000372252 0.000372252 0.000372251 0.000372251 0.000372251 0.00037225 0.00037225 0.000372249 0.000372248
         </DataArray>
-        <DataArray type="Float32" Name="x^n_H2O" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^H2O_n" 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,19 +159,19 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           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^n_mesitylene" NumberOfComponents="1" format="ascii">
-          0.000237217 0.000237202 0.000237052 0.000237436 0.000236914 0.000237336 0.000237385 0.000236895 0.000237551 0.000236974 0.000237256 0.000237034
-          0.000237361 0.000237225 0.00023697 0.000237517 0.000236888 0.000237313 0.000237147 0.0002372 0.000237308 0.000237025 0.000237234 0.000237187
-          0.00023718 0.000237333 0.000236982 0.000237194 0.000237275 0.000237154 0.000237119 0.000237261 0.000237117 0.000237278 0.000236985 0.000237369
-          0.000237058 0.000237314 0.000236693 0.000237573 0.000237121 0.000237257 0.000236946 0.000237427 0.000237077 0.000237182 0.000237241 0.000237062
-          0.000237309 0.000237067 0.000237184 0.000237136 0.000237235 0.00023712 0.00023715 0.000237105 0.000237359 0.000237058 0.000237116 0.000237258
-          0.000237076 0.000237155 0.000237244 0.000236992 0.000237105 0.000237363 0.000237061 0.0002372 0.00023713 0.000237242 0.000237218 0.000236795
-          0.000237717 0.000236864 0.000237033 0.000237165 0.000237344 0.000236944 0.000237364 0.000236769 0.00023753 0.000236846 0.000237696 0.000236736
-          0.000237268 0.000236806 0.000237429 0.000237116 0.000236966 0.000237548 0.000236584 0.000237534 0.00023697 0.000237509 0.000236799 0.000237427
-          0.000236836 0.000237276 0.000236592 0.000237748 0.000236187 0.000237938 0.000236957 0.000237237 0.000237157 0.000237224 0.000237047 0.000237269
-          0.000237483 0.000236279 0.000237589 0.000236941 0.000237407 0.000236952 0.000237137 0.000237406 0.000236942 0.000236923 0.000237195 0.000237136
+        <DataArray type="Float32" Name="x^mesitylene_n" NumberOfComponents="1" format="ascii">
+          0.000237173 0.000236559 0.00023794 0.000237092 0.000237218 0.000237172 0.00023749 0.000236798 0.000237561 0.000236809 0.000237336 0.000237227
+          0.000236956 0.000237396 0.000237066 0.000237229 0.000237717 0.000236842 0.000237007 0.000237322 0.000237183 0.000237177 0.000237274 0.000236693
+          0.000237371 0.000237426 0.000237077 0.000237442 0.000237003 0.000237198 0.000237229 0.000236766 0.00023752 0.000237071 0.000237295 0.000237052
+          0.000237498 0.000236981 0.00023711 0.000237051 0.000237423 0.000237127 0.000236886 0.000237444 0.000236908 0.000237375 0.000237217 0.000237022
+          0.000237285 0.000237138 0.000236595 0.000238155 0.000236822 0.000237081 0.000237364 0.000236992 0.000237247 0.000237111 0.000237115 0.000237076
+          0.000237086 0.000237589 0.000236332 0.000238084 0.000236843 0.000237322 0.000236997 0.000237209 0.000237055 0.000236955 0.000237306 0.000237198
+          0.000237215 0.000237021 0.00023724 0.000237299 0.000237016 0.000237157 0.000237344 0.000236824 0.000237461 0.000236966 0.000237274 0.000237001
+          0.000237076 0.000237261 0.000236861 0.000237403 0.000237092 0.000237306 0.000237 0.000237139 0.000237187 0.000237095 0.00023718 0.000237122
+          0.000237095 0.000237139 0.000237131 0.000237204 0.000237082 0.000237199 0.000237097 0.000237094 0.000237119 0.000237533 0.000236578 0.00023721
+          0.000237294 0.00023703 0.000237147 0.000237162 0.000237152 0.000237031 0.000237202 0.000237125 0.000237076 0.000237187 0.000237092 0.000237129
         </DataArray>
-        <DataArray type="Float32" Name="x^n_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_n" 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,31 +183,31 @@
           1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10 1e-10
           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^g_H2O" NumberOfComponents="1" format="ascii">
-          0.00140893 0.00140894 0.00140894 0.00140894 0.00140894 0.00140895 0.00140895 0.00140895 0.00140895 0.00140895 0.00140895 0.00140896
+        <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
+          0.00140893 0.00140894 0.00140894 0.00140894 0.00140894 0.00140895 0.00140895 0.00140895 0.00140895 0.00140895 0.00140895 0.00140895
           0.00140896 0.00140896 0.00140896 0.00140896 0.00140896 0.00140896 0.00140897 0.00140897 0.00140897 0.00140897 0.00140897 0.00140897
-          0.00140898 0.00140898 0.00140898 0.00140898 0.00140898 0.00140898 0.00140898 0.00140899 0.00140899 0.00140899 0.00140899 0.00140899
-          0.00140899 0.001409 0.001409 0.001409 0.001409 0.001409 0.001409 0.001409 0.00140901 0.00140901 0.00140901 0.00140901
-          0.00140901 0.00140901 0.00140901 0.00140902 0.00140902 0.00140902 0.00140902 0.00140902 0.00140902 0.00140903 0.00140903 0.00140903
-          0.00140903 0.00140903 0.00140903 0.00140903 0.00140904 0.00140904 0.00140904 0.00140904 0.00140904 0.00140904 0.00140905 0.00140905
-          0.00140905 0.00140905 0.00140905 0.00140905 0.00140905 0.00140906 0.00140906 0.00140906 0.00140906 0.00140906 0.00140906 0.00140907
+          0.00140897 0.00140898 0.00140898 0.00140898 0.00140898 0.00140898 0.00140898 0.00140899 0.00140899 0.00140899 0.00140899 0.00140899
+          0.00140899 0.00140899 0.001409 0.001409 0.001409 0.001409 0.001409 0.001409 0.00140901 0.00140901 0.00140901 0.00140901
+          0.00140901 0.00140901 0.00140901 0.00140902 0.00140902 0.00140902 0.00140902 0.00140902 0.00140902 0.00140902 0.00140903 0.00140903
+          0.00140903 0.00140903 0.00140903 0.00140903 0.00140904 0.00140904 0.00140904 0.00140904 0.00140904 0.00140904 0.00140904 0.00140905
+          0.00140905 0.00140905 0.00140905 0.00140905 0.00140905 0.00140906 0.00140906 0.00140906 0.00140906 0.00140906 0.00140906 0.00140906
           0.00140907 0.00140907 0.00140907 0.00140907 0.00140907 0.00140907 0.00140908 0.00140908 0.00140908 0.00140908 0.00140908 0.00140908
-          0.00140909 0.00140909 0.00140909 0.00140909 0.00140909 0.00140909 0.00140909 0.0014091 0.0014091 0.0014091 0.0014091 0.0014091
-          0.0014091 0.0014091 0.00140911 0.00140911 0.00140911 0.00140911 0.00140911 0.00140911 0.00140912 0.00140912 0.00140912 0.00140913
+          0.00140908 0.00140909 0.00140909 0.00140909 0.00140909 0.00140909 0.00140909 0.0014091 0.0014091 0.0014091 0.0014091 0.0014091
+          0.0014091 0.0014091 0.00140911 0.00140911 0.00140911 0.00140911 0.00140911 0.00140911 0.00140911 0.00140912 0.00140912 0.00140913
         </DataArray>
-        <DataArray type="Float32" Name="x^g_mesitylene" NumberOfComponents="1" format="ascii">
-          3.47149e-08 3.47131e-08 3.46912e-08 3.47475e-08 3.46711e-08 3.47329e-08 3.47401e-08 3.46684e-08 3.47644e-08 3.46801e-08 3.47214e-08 3.4689e-08
-          3.47368e-08 3.47169e-08 3.46797e-08 3.47598e-08 3.46678e-08 3.473e-08 3.47057e-08 3.47135e-08 3.47294e-08 3.4688e-08 3.47186e-08 3.47118e-08
-          3.47107e-08 3.47332e-08 3.4682e-08 3.4713e-08 3.47248e-08 3.47071e-08 3.4702e-08 3.4723e-08 3.47018e-08 3.47254e-08 3.46826e-08 3.47389e-08
-          3.46933e-08 3.47309e-08 3.464e-08 3.47688e-08 3.47027e-08 3.47226e-08 3.46772e-08 3.47477e-08 3.46964e-08 3.47118e-08 3.47205e-08 3.46943e-08
-          3.47306e-08 3.46952e-08 3.47123e-08 3.47053e-08 3.47199e-08 3.47031e-08 3.47076e-08 3.47009e-08 3.47382e-08 3.46942e-08 3.47027e-08 3.47235e-08
-          3.46969e-08 3.47085e-08 3.47215e-08 3.46848e-08 3.47013e-08 3.47391e-08 3.46949e-08 3.47154e-08 3.47051e-08 3.47215e-08 3.47181e-08 3.46562e-08
-          3.47912e-08 3.46664e-08 3.46911e-08 3.47105e-08 3.47367e-08 3.46782e-08 3.47397e-08 3.46526e-08 3.47642e-08 3.46641e-08 3.47885e-08 3.46481e-08
-          3.47259e-08 3.46584e-08 3.47496e-08 3.47038e-08 3.46818e-08 3.47671e-08 3.46261e-08 3.47651e-08 3.46826e-08 3.47615e-08 3.46577e-08 3.47496e-08
-          3.46632e-08 3.47276e-08 3.46276e-08 3.47967e-08 3.45683e-08 3.48247e-08 3.46811e-08 3.47221e-08 3.47104e-08 3.47203e-08 3.46944e-08 3.47269e-08
-          3.47582e-08 3.45822e-08 3.47739e-08 3.46791e-08 3.47473e-08 3.46807e-08 3.47078e-08 3.47473e-08 3.46794e-08 3.46767e-08 3.47166e-08 3.47082e-08
+        <DataArray type="Float32" Name="x^mesitylene_g" NumberOfComponents="1" format="ascii">
+          3.47086e-08 3.46189e-08 3.48211e-08 3.46972e-08 3.47156e-08 3.47089e-08 3.47554e-08 3.46542e-08 3.4766e-08 3.4656e-08 3.47331e-08 3.47172e-08
+          3.46775e-08 3.4742e-08 3.46938e-08 3.47175e-08 3.47891e-08 3.46611e-08 3.46853e-08 3.47313e-08 3.47111e-08 3.47102e-08 3.47244e-08 3.46395e-08
+          3.47387e-08 3.47469e-08 3.46957e-08 3.47492e-08 3.46851e-08 3.47135e-08 3.47182e-08 3.46504e-08 3.47608e-08 3.46952e-08 3.4728e-08 3.46925e-08
+          3.47577e-08 3.46822e-08 3.4701e-08 3.46925e-08 3.47469e-08 3.47036e-08 3.46684e-08 3.47501e-08 3.46717e-08 3.474e-08 3.4717e-08 3.46885e-08
+          3.47271e-08 3.47055e-08 3.46262e-08 3.48545e-08 3.46594e-08 3.46973e-08 3.47388e-08 3.46844e-08 3.47218e-08 3.47019e-08 3.47026e-08 3.46968e-08
+          3.46983e-08 3.47721e-08 3.4588e-08 3.48445e-08 3.46629e-08 3.47331e-08 3.46855e-08 3.47167e-08 3.46941e-08 3.46795e-08 3.47309e-08 3.47152e-08
+          3.47176e-08 3.46893e-08 3.47214e-08 3.47301e-08 3.46888e-08 3.47093e-08 3.47368e-08 3.46607e-08 3.4754e-08 3.46816e-08 3.47267e-08 3.46868e-08
+          3.46979e-08 3.47249e-08 3.46665e-08 3.47458e-08 3.47003e-08 3.47317e-08 3.4687e-08 3.47073e-08 3.47143e-08 3.47009e-08 3.47134e-08 3.4705e-08
+          3.47011e-08 3.47075e-08 3.47063e-08 3.47171e-08 3.46992e-08 3.47165e-08 3.47015e-08 3.47012e-08 3.47048e-08 3.47654e-08 3.46257e-08 3.47182e-08
+          3.47306e-08 3.4692e-08 3.47091e-08 3.47115e-08 3.47099e-08 3.46923e-08 3.47174e-08 3.47061e-08 3.4699e-08 3.47153e-08 3.47015e-08 3.47072e-08
         </DataArray>
-        <DataArray type="Float32" Name="x^g_Air" NumberOfComponents="1" format="ascii">
+        <DataArray type="Float32" Name="x^Air_g" NumberOfComponents="1" format="ascii">
           0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591
           0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591
           0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591 0.998591
-- 
GitLab