diff --git a/dumux/porousmediumflow/1pnc/vtkoutputfields.hh b/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
index bdfbce9d64912df30c371bf835d99aa902bf5636..c2b3b3b1a3235488164d54b4f36049b9e1fd94dc 100644
--- a/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/1pnc/vtkoutputfields.hh
@@ -49,11 +49,11 @@ public:
for (int i = 0; i < VolumeVariables::numComponents(); ++i)
vtk.addVolumeVariable([i](const auto& volVars){ return volVars.moleFraction(Indices::fluidSystemPhaseIdx, i); },
- "x_" + std::string(FluidSystem::componentName(i)));
+ "x^" + std::string(FluidSystem::componentName(i)) + "_" + std::string(FluidSystem::phaseName(Indices::fluidSystemPhaseIdx)));
for (int i = 0; i < VolumeVariables::numComponents(); ++i)
vtk.addVolumeVariable([i](const auto& volVars){ return volVars.massFraction(Indices::fluidSystemPhaseIdx, i); },
- "X_" + std::string(FluidSystem::componentName(i)));
+ "X^" + std::string(FluidSystem::componentName(i))+ "_" + std::string(FluidSystem::phaseName(Indices::fluidSystemPhaseIdx)));
}
};
diff --git a/dumux/porousmediumflow/2p/vtkoutputfields.hh b/dumux/porousmediumflow/2p/vtkoutputfields.hh
index fea024af3354a45691583e913bb70bdaece70b0c..281333441fdce55a652380c7e5538e80d47d8fa5 100644
--- a/dumux/porousmediumflow/2p/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/2p/vtkoutputfields.hh
@@ -42,15 +42,15 @@ public:
vtk.addVolumeVariable([](const VolumeVariables& v){ return v.porosity(); }, "porosity");
vtk.addVolumeVariable([](const VolumeVariables& v){ return v.capillaryPressure(); }, "pc");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(FS::phase0Idx); }, "Sw");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(FS::phase0Idx); }, "pw");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(FS::phase0Idx); }, "rhoW");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.mobility(FS::phase0Idx); }, "mobW");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(FS::phase0Idx); }, "S_w");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(FS::phase0Idx); }, "p_w");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(FS::phase0Idx); }, "rho_w");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.mobility(FS::phase0Idx); }, "mob_w");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(FS::phase1Idx); }, "Sn");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(FS::phase1Idx); }, "pn");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(FS::phase1Idx); }, "rhoN");
- vtk.addVolumeVariable([](const VolumeVariables& v){ return v.mobility(FS::phase1Idx); }, "mobN");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.saturation(FS::phase1Idx); }, "S_n");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.pressure(FS::phase1Idx); }, "p_n");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.density(FS::phase1Idx); }, "rho_n");
+ vtk.addVolumeVariable([](const VolumeVariables& v){ return v.mobility(FS::phase1Idx); }, "mob_n");
}
};
diff --git a/dumux/porousmediumflow/2p2c/vtkoutputfields.hh b/dumux/porousmediumflow/2p2c/vtkoutputfields.hh
index c947f2a3f968d05d10d4b7ef9f7c7cd2d959e9d3..d3a15b5b3c31ea765e8f02affd9342bdca7e8f37 100644
--- a/dumux/porousmediumflow/2p2c/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/2p2c/vtkoutputfields.hh
@@ -40,23 +40,23 @@ public:
using FluidSystem = typename VolumeVariables::FluidSystem;
// register standardized vtk output fields
- vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase1Idx); }, "Sn");
- vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase0Idx); }, "Sw");
- vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase1Idx); }, "pn");
- vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase0Idx); }, "pw");
+ vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase1Idx); }, "S_n");
+ vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase0Idx); }, "S_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase1Idx); }, "p_n");
+ vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase0Idx); }, "p_w");
vtk.addVolumeVariable([](const auto& v){ return v.capillaryPressure(); }, "pc");
- vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase0Idx); }, "rhoW");
- vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase1Idx); }, "rhoN");
- vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase0Idx); }, "mobW");
- vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase1Idx); }, "mobN");
+ vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase0Idx); }, "rho_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase1Idx); }, "rho_n");
+ vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase0Idx); }, "mob_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase1Idx); }, "mob_n");
for (int i = 0; i < VolumeVariables::numPhases(); ++i)
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
- vtk.addVolumeVariable([i,j](const auto& v){ return v.massFraction(i,j); },"X_"+ FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j));
+ vtk.addVolumeVariable([i,j](const auto& v){ return v.massFraction(i,j); },"X^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
for (int i = 0; i < VolumeVariables::numPhases(); ++i)
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
- vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x_"+ FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j));
+ vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
vtk.addVolumeVariable([](const auto& v){ return v.porosity(); }, "porosity");
vtk.addVolumeVariable([](const auto& v){ return v.priVars().state(); }, "phase presence");
diff --git a/dumux/porousmediumflow/2pnc/vtkoutputfields.hh b/dumux/porousmediumflow/2pnc/vtkoutputfields.hh
index c39ab91536a13fb53fc66cd822961d7c1378dd5a..1d103425f949584b51253446a725efc9ba395549 100644
--- a/dumux/porousmediumflow/2pnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/2pnc/vtkoutputfields.hh
@@ -49,11 +49,11 @@ public:
for (int i = 0; i < VolumeVariables::numPhases(); ++i)
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },
- "x_"+ FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j));
+ "x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
vtk.addVolumeVariable([j](const auto& v){ return v.molarity(FluidSystem::phase0Idx,j); },
- "m_"+ FluidSystem::phaseName(FluidSystem::phase0Idx) + "^" + FluidSystem::componentName(j));
+ "m^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(FluidSystem::phase0Idx));
vtk.addVolumeVariable([](const auto& v){ return v.priVars().state(); }, "phasePresence");
}
diff --git a/dumux/porousmediumflow/3p/vtkoutputfields.hh b/dumux/porousmediumflow/3p/vtkoutputfields.hh
index 8fb983196a0a4d381bb6781a2cc6a95ca7a25d90..74f96a023196f6aa29a526dfed5f6237365a31b7 100644
--- a/dumux/porousmediumflow/3p/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/3p/vtkoutputfields.hh
@@ -39,15 +39,15 @@ public:
using FluidSystem = typename VtkOutputModule::VolumeVariables::FluidSystem;
// register standardized vtk output fields
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "sw");
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"sn");
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"sg");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"pw");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"pn");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"pg");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rhow");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rhon");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rhog");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "S_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"S_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"S_g");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"p_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"p_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"p_g");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rho_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rho_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rho_g");
vtk.addVolumeVariable( [](const auto& v){ return v.porosity(); },"porosity");
vtk.addVolumeVariable( [](const auto& v){ return v.permeability(); },"permeability");
}
diff --git a/dumux/porousmediumflow/3p3c/vtkoutputfields.hh b/dumux/porousmediumflow/3p3c/vtkoutputfields.hh
index d8d4c37b45f62e8ef3f9fca5e61716042a96d374..ed996a98e0f295018af1b150722fdbbcd12fad92 100644
--- a/dumux/porousmediumflow/3p3c/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/3p3c/vtkoutputfields.hh
@@ -40,15 +40,15 @@ public:
using FluidSystem = typename VolumeVariables::FluidSystem;
// register standardized vtk output fields
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "Sw");
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"Sn");
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"Sg");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"pw");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"pn");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"pg");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rhow");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rhon");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rhog");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "S_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"S_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"S_g");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"p_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"p_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"p_g");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rho_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rho_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rho_g");
for (int i = 0; i < VolumeVariables::numPhases(); ++i)
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
diff --git a/dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh b/dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh
index eb3719d7a8f4465996da5cb0e2868ecdc10c1520..df921d7e70363211ffddef51d1926607c3eeee02 100644
--- a/dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/3pwateroil/vtkoutputfields.hh
@@ -41,28 +41,26 @@ public:
using FluidSystem = typename VolumeVariables::FluidSystem;
// register standardized vtk output fields
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "sw");
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"sn");
- vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"sg");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"pw");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"pn");
- vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"pg");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rhow");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rhon");
- vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rhog");
- vtk.addVolumeVariable( [](const auto& v){ return
- v.mobility(FluidSystem::wPhaseIdx); },"MobW");
- vtk.addVolumeVariable( [](const auto& v){ return v.mobility(FluidSystem::nPhaseIdx); },"MobN");
- vtk.addVolumeVariable( [](const auto& v){ return v.mobility(FluidSystem::gPhaseIdx); },"MobG");
- vtk.addVolumeVariable( [](const auto& v){ return
- v.viscosity(FluidSystem::wPhaseIdx); },"ViscosW");
- vtk.addVolumeVariable( [](const auto& v){ return v.viscosity(FluidSystem::nPhaseIdx); },"ViscosN");
- vtk.addVolumeVariable( [](const auto& v){ return v.viscosity(FluidSystem::gPhaseIdx); },"ViscosG");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::wPhaseIdx); }, "S_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::nPhaseIdx); },"S_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.saturation(FluidSystem::gPhaseIdx); },"S_g");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::wPhaseIdx); },"p_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::nPhaseIdx); },"p_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.pressure(FluidSystem::gPhaseIdx); },"p_g");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::wPhaseIdx); },"rho_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::nPhaseIdx); },"rho_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.density(FluidSystem::gPhaseIdx); },"rho_g");
+ vtk.addVolumeVariable( [](const auto& v){ return v.mobility(FluidSystem::wPhaseIdx); },"mob_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.mobility(FluidSystem::nPhaseIdx); },"mob_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.mobility(FluidSystem::gPhaseIdx); },"mob_g");
+ vtk.addVolumeVariable( [](const auto& v){ return v.viscosity(FluidSystem::wPhaseIdx); },"viscos_w");
+ vtk.addVolumeVariable( [](const auto& v){ return v.viscosity(FluidSystem::nPhaseIdx); },"viscos_n");
+ vtk.addVolumeVariable( [](const auto& v){ return v.viscosity(FluidSystem::gPhaseIdx); },"viscos_g");
for (int i = 0; i < VolumeVariables::numPhases(); ++i)
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },
- "x^" + FluidSystem::phaseName(i) + "_" + FluidSystem::componentName(j));
+ "x^" + FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
vtk.addVolumeVariable( [](const auto& v){ return v.porosity(); },"porosity");
vtk.addVolumeVariable( [](const auto& v){ return v.priVars().state(); },"phase presence");
diff --git a/dumux/porousmediumflow/mineralization/vtkoutputfields.hh b/dumux/porousmediumflow/mineralization/vtkoutputfields.hh
index f07b5d9d4bd3f311a368ab9ad8b4b4ea43fb9320..fc482af544e471b723f8839e8a15f07059ab4806 100644
--- a/dumux/porousmediumflow/mineralization/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/mineralization/vtkoutputfields.hh
@@ -46,7 +46,7 @@ public:
// additional output
for (int i = 0; i < SolidSystem::numComponents - SolidSystem::numInertComponents; ++i)
{
- vtk.addVolumeVariable([i](const auto& v){ return v.solidVolumeFraction(i); },"precipitateVolumeFraction_"+ SolidSystem::componentName(i));
+ vtk.addVolumeVariable([i](const auto& v){ return v.solidVolumeFraction(i); },"precipitateVolumeFraction^"+ SolidSystem::componentName(i));
}
}
};
diff --git a/dumux/porousmediumflow/mpnc/vtkoutputfields.hh b/dumux/porousmediumflow/mpnc/vtkoutputfields.hh
index 3d229fed7c39fa67baa19741c63b1fd590f8c0d3..b62a0a634361939bb13ee3738672d613702aae6f 100644
--- a/dumux/porousmediumflow/mpnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/mpnc/vtkoutputfields.hh
@@ -48,7 +48,7 @@ public:
vtk.addVolumeVariable([i](const auto& v){ return v.mobility(i); },"lambda_"+ FluidSystem::phaseName(i));
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
- vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x_"+ FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j));
+ vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
}
}
};
diff --git a/dumux/porousmediumflow/richards/vtkoutputfields.hh b/dumux/porousmediumflow/richards/vtkoutputfields.hh
index baf1139d791672d174141a6ab3f14a535097c88f..082ea7874e78251d11c1200cecd4c7f535376bfd 100644
--- a/dumux/porousmediumflow/richards/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/richards/vtkoutputfields.hh
@@ -41,10 +41,10 @@ public:
{
using FluidSystem = typename VtkOutputModule::VolumeVariables::FluidSystem;
- vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::liquidPhaseIdx); }, "Sw");
- vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::gasPhaseIdx); }, "Sn");
- vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::liquidPhaseIdx); }, "pw");
- vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::gasPhaseIdx); }, "pn");
+ vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::liquidPhaseIdx); }, "S_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::gasPhaseIdx); }, "S_n");
+ vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::liquidPhaseIdx); }, "p_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::gasPhaseIdx); }, "p_n");
vtk.addVolumeVariable([](const auto& v){ return v.capillaryPressure(); }, "pc");
vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::liquidPhaseIdx); }, "density");
vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::liquidPhaseIdx); }, "mobility");
@@ -56,7 +56,7 @@ public:
if(gravity)
vtk.addVolumeVariable([](const auto& v){ return v.pressureHead(FluidSystem::liquidPhaseIdx); }, "pressure head");
if (enableWaterDiffusionInAir)
- vtk.addVolumeVariable([](const auto& v){ return v.moleFraction(1, 0); }, "x^w_air");
+ vtk.addVolumeVariable([](const auto& v){ return v.moleFraction(1, 0); }, "x^air_w");
vtk.addVolumeVariable([](const auto& v){ return v.waterContent(FluidSystem::liquidPhaseIdx); },"water content");
vtk.addVolumeVariable([](const auto& v){ return v.priVars().state(); }, "phasePresence");
diff --git a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
index dbf43f0a00fa051be21924ced6a905231b45d7b3..d9f16161a37ed8f6863edc89a9d5251f2c0c5241 100644
--- a/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/richardsnc/vtkoutputfields.hh
@@ -41,10 +41,10 @@ public:
using VolumeVariables = typename VtkOutputModule::VolumeVariables;
using FluidSystem = typename VolumeVariables::FluidSystem;
- vtk.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::liquidPhaseIdx); }, "Sw");
- vtk.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::gasPhaseIdx); }, "Sn");
- vtk.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::liquidPhaseIdx); }, "pw");
- vtk.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::gasPhaseIdx); }, "pn");
+ vtk.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::liquidPhaseIdx); }, "S_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.saturation(VolumeVariables::gasPhaseIdx); }, "S_n");
+ vtk.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::liquidPhaseIdx); }, "p_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.pressure(VolumeVariables::gasPhaseIdx); }, "p_n");
vtk.addVolumeVariable([](const auto& v){ return v.capillaryPressure(); }, "pc");
vtk.addVolumeVariable([](const auto& v){ return v.density(VolumeVariables::liquidPhaseIdx); }, "density");
vtk.addVolumeVariable([](const auto& v){ return v.mobility(VolumeVariables::liquidPhaseIdx); }, "mobility");
@@ -59,7 +59,7 @@ public:
for (int compIdx = 0; compIdx < VolumeVariables::numComponents(); ++compIdx)
vtk.addVolumeVariable([compIdx](const auto& v){ return v.moleFraction(VolumeVariables::liquidPhaseIdx, compIdx); },
- "x^" + FluidSystem::phaseName(VolumeVariables::liquidPhaseIdx) + "_" + FluidSystem::componentName(compIdx));
+ "x^" + FluidSystem::componentName(compIdx) + "_" + FluidSystem::phaseName(VolumeVariables::liquidPhaseIdx));
}
};
diff --git a/dumux/porousmediumflow/tracer/vtkoutputfields.hh b/dumux/porousmediumflow/tracer/vtkoutputfields.hh
index f8b3aa6c0d589cedb2226d26d5327a37a8474121..417b3d015a0deea0709f5595426524d885b96ba0 100644
--- a/dumux/porousmediumflow/tracer/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/tracer/vtkoutputfields.hh
@@ -45,9 +45,9 @@ public:
for (int compIdx = 0; compIdx < VolumeVariables::numComponents(); ++compIdx)
{
vtk.addVolumeVariable( [compIdx](const auto& v){ return v.moleFraction(0, compIdx); },
- "x_" + std::string(FluidSystem::componentName(compIdx)));
+ "x^" + std::string(FluidSystem::componentName(compIdx)));
vtk.addVolumeVariable( [compIdx](const auto& v){ return v.massFraction(0, compIdx); },
- "X_" + std::string(FluidSystem::componentName(compIdx)));
+ "X^" + std::string(FluidSystem::componentName(compIdx)));
}
vtk.addVolumeVariable( [](const auto& v){ return v.density(); }, "rho");
}
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/vtkoutputfields.hh b/test/porousmediumflow/2p2c/implicit/mpnccomparison/vtkoutputfields.hh
index 038c4b4a814f47291f9b84850da206a32b85ae16..e161c32264bcb24472aa179715f8a42d1a7a4568 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/vtkoutputfields.hh
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/vtkoutputfields.hh
@@ -41,23 +41,23 @@ public:
// register standardized vtk output fields
vtk.addVolumeVariable([](const auto& v){ return v.porosity(); }, "porosity");
- vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase1Idx); }, "Sn");
- vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase0Idx); }, "Sw");
- vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase1Idx); }, "pn");
- vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase0Idx); }, "pw");
+ vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase1Idx); }, "S_n");
+ vtk.addVolumeVariable([](const auto& v){ return v.saturation(FluidSystem::phase0Idx); }, "S_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase1Idx); }, "p_n");
+ vtk.addVolumeVariable([](const auto& v){ return v.pressure(FluidSystem::phase0Idx); }, "p_w");
- vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase0Idx); }, "rhoW");
- vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase1Idx); }, "rhoN");
- vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase0Idx); }, "mobW");
- vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase1Idx); }, "mobN");
+ vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase0Idx); }, "rho_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.density(FluidSystem::phase1Idx); }, "rho_n");
+ vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase0Idx); }, "mob_w");
+ vtk.addVolumeVariable([](const auto& v){ return v.mobility(FluidSystem::phase1Idx); }, "mob_n");
for (int i = 0; i < VolumeVariables::numPhases(); ++i)
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
- vtk.addVolumeVariable([i,j](const auto& v){ return v.massFraction(i,j); },"X_"+ FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j));
+ vtk.addVolumeVariable([i,j](const auto& v){ return v.massFraction(i,j); },"X^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
for (int i = 0; i < VolumeVariables::numPhases(); ++i)
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
- vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x_"+ FluidSystem::phaseName(i) + "^" + FluidSystem::componentName(j));
+ vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
}
};
diff --git a/test/references/1p2cniboxconduction-reference.vtu b/test/references/1p2cniboxconduction-reference.vtu
index 14ea1dccbdc68a27ff52915b1b27285c72c63f88..7e9c6ab835c1fe348f71cb190753bf5d45e24a70 100644
--- a/test/references/1p2cniboxconduction-reference.vtu
+++ b/test/references/1p2cniboxconduction-reference.vtu
@@ -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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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 9205c727fece99debb5323dfb47977c3528f596b..348c88967ccd011f226f11911aade69c75ea26d6 100644
--- a/test/references/1p2cniboxconvection-reference.vtu
+++ b/test/references/1p2cniboxconvection-reference.vtu
@@ -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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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 010f91d2419e239afedfb53a8a5f69ad19ba41ad..19a46e53e37e0d1f72e776ba9fa51849d666235c 100644
--- a/test/references/1p2cniccconduction-reference.vtu
+++ b/test/references/1p2cniccconduction-reference.vtu
@@ -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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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 b5fab5e160c653e2222e4481329a7a01e650279f..0236ae9d902077b1b90332dc21fbcd9dbf812dc1 100644
--- a/test/references/1p2cniccconvection-reference.vtu
+++ b/test/references/1p2cniccconvection-reference.vtu
@@ -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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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 351f7d486290ff257d4ca24467e0dfe7a5980faf..2a49571b586baea8d9eee52a80952f72830dc624 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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 e6c7c6c1961235004236553f8693c487fdc5859f..d0560b9b93c23f4599e613399c37938575fc166b 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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 ab2b0bc1172ef236df810a04db5e3d25c3fc0cda..3729e02bbe08c4d7477a6385a26fded0a5fd0291 100644
--- a/test/references/1p2ctestcc-reference.vtu
+++ b/test/references/1p2ctestcc-reference.vtu
@@ -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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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 28a66e52c14a1181671de389c2f7aacd79cda112..6b0db83b63d860a49d53d115f4f2b2b4368fe23e 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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/2cnistokes2p2cni-pm-reference.vtu b/test/references/2cnistokes2p2cni-pm-reference.vtu
index 5f8793edb3c20b4e97814eab8c38380adfe8ea3a..7d2e9f2ca13b4bef50b9def934d21bdb39180109 100644
--- a/test/references/2cnistokes2p2cni-pm-reference.vtu
+++ b/test/references/2cnistokes2p2cni-pm-reference.vtu
@@ -8,7 +8,7 @@
0.0101045 0.0103706 0.0133566 0.0133566 0.0133566 0.0133566 0.0133566 0.0133566 0.0133566 0.0251665 0.0251664 0.0251664
0.0251663 0.0251663 0.0251662 0.0251661 0.131067 0.131067 0.131067 0.131066 0.131066 0.131065 0.131065
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.989896 0.989896 0.989629 0.989629 0.989896 0.989629 0.989896 0.989629 0.989896 0.989629 0.989896 0.989629
0.989896 0.989629 0.986643 0.986643 0.986643 0.986643 0.986643 0.986643 0.986643 0.974833 0.974834 0.974834
0.974834 0.974834 0.974834 0.974834 0.868933 0.868933 0.868933 0.868934 0.868934 0.868935 0.868935
diff --git a/test/references/2pboxdfm_2d_quads-reference.vtu b/test/references/2pboxdfm_2d_quads-reference.vtu
index 77d9aab08cfe921d232edbdf098481a4f070d3da..49afcf9474dcab3ba24f570227015897a6e41762 100644
--- a/test/references/2pboxdfm_2d_quads-reference.vtu
+++ b/test/references/2pboxdfm_2d_quads-reference.vtu
@@ -275,7 +275,7 @@
12452.9 11631.3 12355.2 11534.2 11631.3 10356.6 11534.2 10298.1 10356.6 10000.7 10298.1 10000.4
10000.7 10000 10000.4 10000
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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
@@ -411,7 +411,7 @@
0.708778 0.786114 0.717172 0.796364 0.786114 0.944497 0.796364 0.95321 0.944497 0.999884 0.95321 0.999932
0.999884 1 0.999932 1
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
109810 109810 109320 109382 109810 109810 109382 109432 109810 109810 109432 109465
109810 109810 109465 109481 109810 109810 109481 109484 109810 109810 109484 109481
109810 109810 109481 109476 109810 109810 109476 109473 109810 109810 109473 109470
@@ -547,7 +547,7 @@
102297 101677 101811 101189 101677 101098 101189 100607 101098 100753 100607 100266
100753 100490 100266 100000
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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
@@ -683,7 +683,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_w" 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
@@ -819,7 +819,7 @@
172.917 298.512 184.161 319.222 298.512 755.524 319.222 790.558 755.524 999.433 790.558 999.669
999.433 1000 999.669 1000
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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 4.61003e-37
@@ -955,7 +955,7 @@
0.291222 0.213886 0.282828 0.203636 0.213886 0.0555027 0.203636 0.0467904 0.0555027 0.000116215 0.0467904 6.77642e-05
0.000116215 0 6.77642e-05 0
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
119810 119810 119320 119382 119810 119810 119382 119432 119810 119810 119432 119465
119810 119810 119465 119481 119810 119810 119481 119484 119810 119810 119484 119481
119810 119810 119481 119476 119810 119810 119476 119473 119810 119810 119473 119470
@@ -1091,7 +1091,7 @@
114750 113308 114166 112723 113308 111454 112723 110905 111454 110753 110905 110266
110753 110490 110266 110000
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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
@@ -1227,7 +1227,7 @@
1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460 1460
1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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/2pboxdfm_2d_trias-reference.vtu b/test/references/2pboxdfm_2d_trias-reference.vtu
index cabf0dbe8f5186b2e3eb90653a0b59efb2d70933..ed946df93f95528abecff88ac502b1c6ef2419cc 100644
--- a/test/references/2pboxdfm_2d_trias-reference.vtu
+++ b/test/references/2pboxdfm_2d_trias-reference.vtu
@@ -45,7 +45,7 @@
15603.9 13447.8 13850.5 12749.5 13447.8 15603.9 11809.1 11452 10146 11809.1 13447.8 11452
10000 10146 11452 12749.5 11452 13447.8 10000 10000 11452 10000 11452 12749.5
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
1 1 1 1 0.999995 1 0.999927 1 1 0.999927 0.999946 1
0.999927 1 0.999995 0.999927 0.999995 0.999754 1 0.999661 1 0.898395 1 0.999661
1 0.999946 0.999661 0.898395 0.999661 0.999946 0.898395 0.999636 1 1 0.999636 1
@@ -66,7 +66,7 @@
0.516782 0.633431 0.607448 0.684465 0.633431 0.516782 0.768005 0.805248 0.976578 0.768005 0.633431 0.805248
1 0.976578 0.805248 0.684465 0.805248 0.633431 1 1 0.805248 1 0.805248 0.684465
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
109810 109262 109810 109810 108861 109262 108567 109810 109262 108567 108872 109810
108567 109262 108861 108567 108861 108507 109810 109404 109810 109233 109810 109404
109810 108872 109404 109233 109404 108872 109233 109282 109810 109810 109282 109810
@@ -87,7 +87,7 @@
107510 105924 107632 103344 105924 107510 105761 103313 104359 105761 105924 103313
102452 104359 103313 103344 103313 105924 100000 102452 103313 100000 103313 103344
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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
@@ -108,7 +108,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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
1000 1000 1000 1000 999.976 1000 999.642 1000 1000 999.642 999.735 1000
999.642 1000 999.976 999.642 999.976 998.799 1000 998.345 1000 589.111 1000 998.345
1000 999.735 998.345 589.111 998.345 999.735 589.111 998.225 1000 1000 998.225 1000
@@ -129,7 +129,7 @@
28.4539 93.4949 73.8374 143.241 93.4949 28.4539 264.404 338.03 890.548 264.404 93.4949 338.03
1000 890.548 338.03 143.241 338.03 93.4949 1000 1000 338.03 1000 338.03 143.241
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0 4.56525e-14 0 0 4.91868e-06 4.56525e-14 7.3485e-05 0 4.56525e-14 7.3485e-05 5.43468e-05 0
7.3485e-05 4.56525e-14 4.91868e-06 7.3485e-05 4.91868e-06 0.000246223 0 0.000339423 0 0.101605 0 0.000339423
0 5.43468e-05 0.000339423 0.101605 0.000339423 5.43468e-05 0.101605 0.000364057 0 0 0.000364057 0
@@ -150,7 +150,7 @@
0.483218 0.366569 0.392552 0.315535 0.366569 0.483218 0.231995 0.194752 0.0234223 0.231995 0.366569 0.194752
0 0.0234223 0.194752 0.315535 0.194752 0.366569 0 0 0.194752 0 0.194752 0.315535
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
119810 119262 119810 119810 118861 119262 118567 119810 119262 118567 118872 119810
118567 119262 118861 118567 118861 118508 119810 119406 119810 119917 119810 119406
119810 118872 119406 119917 119406 118872 119917 119284 119810 119810 119284 119810
@@ -171,7 +171,7 @@
123114 119372 121482 116093 119372 123114 117570 114765 114505 117570 119372 114765
112452 114505 114765 116093 114765 119372 110000 112452 114765 110000 114765 116093
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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
@@ -192,7 +192,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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
0 6.07431e-37 0 0 7.57283e-13 6.07431e-37 2.52517e-09 0 6.07431e-37 2.52517e-09 1.02146e-09 0
2.52517e-09 6.07431e-37 7.57283e-13 2.52517e-09 7.57283e-13 9.49807e-08 0 2.48798e-07 0 6.26162 0 2.48798e-07
0 1.02146e-09 2.48798e-07 6.26162 2.48798e-07 1.02146e-09 6.26162 3.06991e-07 0 0 3.06991e-07 0
diff --git a/test/references/2pboxdfm_3d_tets-reference.vtu b/test/references/2pboxdfm_3d_tets-reference.vtu
index 17f598426dbf93913a89be9225beae92d87c4565..02aec09b08d0a4c4f4f4349bb76b44af984146f2 100644
--- a/test/references/2pboxdfm_3d_tets-reference.vtu
+++ b/test/references/2pboxdfm_3d_tets-reference.vtu
@@ -409,7 +409,7 @@
10000 10000 10000 10000 10000.2 10000.1 10156.6 10000.1 10000.1 10000.2 10156.6 10000
10000.2 10000.1 10000 10000 10000 10000.1 10000 10000
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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
@@ -612,7 +612,7 @@
1 1 1 1 0.999971 0.999989 0.974915 0.999977 0.999989 0.999971 0.974915 1
0.999971 0.999989 1 1 1 0.999989 1 1
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
108226 109810 108226 109810 109810 108226 109810 109810 109810 108226 109810 107522
109810 109810 108226 109810 109810 109810 108226 107522 109810 109810 109810 107522
109810 109810 109810 107522 108226 108226 109810 107490 108226 108226 107490 107522
@@ -815,7 +815,7 @@
100000 100000 101491 100205 100237 101708 100431 103062 101708 100237 100431 100205
100237 101708 100000 100205 100000 101708 101491 100205
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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
@@ -1018,7 +1018,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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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
@@ -1221,7 +1221,7 @@
1000 1000 1000 1000 999.858 999.946 883.135 999.888 999.946 999.858 883.135 1000
999.858 999.946 1000 1000 1000 999.946 1000 1000
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 3.29259e-10
0 0 0 0 0 0 0 3.29259e-10 0 0 0 3.29259e-10
0 0 0 3.29259e-10 0 0 0 1.70586e-14 0 0 1.70586e-14 3.29259e-10
@@ -1424,7 +1424,7 @@
0 0 0 9.02857e-16 2.91793e-05 1.11179e-05 0.0250851 2.29974e-05 1.11179e-05 2.91793e-05 0.0250851 9.02857e-16
2.91793e-05 1.11179e-05 0 9.02857e-16 0 1.11179e-05 0 9.02857e-16
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
118226 119810 118226 119810 119810 118226 119810 119810 119810 118226 119810 117522
119810 119810 118226 119810 119810 119810 118226 117522 119810 119810 119810 117522
119810 119810 119810 117522 118226 118226 119810 117490 118226 118226 117490 117522
@@ -1627,7 +1627,7 @@
110000 110000 111491 110205 110238 111708 110587 113062 111708 110238 110587 110205
110238 111708 110000 110205 110000 111708 111491 110205
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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
@@ -1830,7 +1830,7 @@
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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 2.27158e-25
0 0 0 0 0 0 0 2.27158e-25 0 0 0 2.27158e-25
0 0 0 2.27158e-25 0 0 0 3.1905e-38 0 0 3.1905e-38 2.27158e-25
diff --git a/test/references/2pdfm-reference.vtu b/test/references/2pdfm-reference.vtu
index 6f941b19cf0d7d5bd3428e279b9695e588555c94..6f2557566dc08bc24ef0e71e98abfaa4b0c01378 100644
--- a/test/references/2pdfm-reference.vtu
+++ b/test/references/2pdfm-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1883" NumberOfPoints="980">
- <PointData Scalars="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.0152079 0 5.49811e-07 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0.326542 0.285021 0 0 0 0 0.35585 0 0.216695 0 0
@@ -87,7 +87,7 @@
7.60108e-16 8.62105e-05 0 0 0.000132628 5.31774e-18 0 0 0 0 0.000481945 1
0.000288549 1 0 0 1 0.000321633 0 0
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.984792 1 0.999999 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 0.673458 0.714979 1 1 1 1 0.64415 1 0.783305 1 1
@@ -171,7 +171,7 @@
1 0.999914 1 1 0.999867 1 1 1 1 1 0.999518 0
0.999711 0 1 1 0 0.999678 1 1
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
22782.3 22479.9 22766.7 21909.9 11230.2 10971.3 10971.3 10444.4 14860.1 14992.2 14083.8 13853.1
14706.3 13609.6 13041.2 15769 14615.2 15678.8 13000.3 15477.4 13501.2 12416.5 15591.5 16645.6
16416.3 15607.3 14564.9 12447.1 12171 14177.3 16595.7 16634.9 12845.7 13557.7 17332.6 17573.1
@@ -255,7 +255,7 @@
16480.2 18572.4 2443.71 2001 19859.8 21157.8 21094.5 21503.9 2686.06 2001 20389.6 30002
20187.4 30002 2001 2816.88 30002 18587 4019.1 2001
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
20767 20479.9 20766.7 19909.9 9230.22 8971.3 8971.25 8444.39 12860.1 12992.2 12083.8 11853.1
12706.3 11609.6 11041.2 13769 12615.2 13678.8 11000.3 13477.4 11501.2 10416.5 13591.5 14645.6
14416.3 13170.2 12199.6 10447.1 10171 12177.3 14595.7 14142.9 10845.7 11297.9 15332.6 15573.1
diff --git a/test/references/2pncdiffusioncc-reference.vtu b/test/references/2pncdiffusioncc-reference.vtu
index 9889ea81d7f16183774cfa5fdbbcf911d6dad971..b57ccd87f32e11953fa5280ca86d24eb15a42990 100644
--- a/test/references/2pncdiffusioncc-reference.vtu
+++ b/test/references/2pncdiffusioncc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="250" NumberOfPoints="306">
- <CellData Scalars="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.974758 0.981796 0.994366 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
@@ -26,7 +26,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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.0252419 0.0182042 0.00563372 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
@@ -49,7 +49,7 @@
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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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
@@ -72,7 +72,7 @@
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
100102 100101 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100
100100 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100
100100 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100 100100
@@ -118,7 +118,7 @@
100 100 100 100 100 100 100 100 100 100 100 100
100 100 100 100 100 100 100 100 100 100
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
@@ -141,7 +141,7 @@
998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191 998.191
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
1.14085 1.14085 1.14084 0.949721 0.936339 0.935911 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
@@ -164,7 +164,7 @@
0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898 0.935898
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
885.667 915.685 971.27 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
@@ -187,7 +187,7 @@
997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019 997.019
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
2.44456 0.922077 0.0276024 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
@@ -233,7 +233,7 @@
0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2 0.2
</DataArray>
- <DataArray type="Float32" Name="x_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
0.999988 0.999988 0.999988 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
@@ -256,7 +256,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 0.99999 0.99999
</DataArray>
- <DataArray type="Float32" Name="x_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
1.22313e-05 1.22313e-05 1.22311e-05 1.01505e-05 1.00048e-05 1.00001e-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
@@ -279,7 +279,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 1e-05 1e-05
</DataArray>
- <DataArray type="Float32" Name="x_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
0.0234767 0.0234768 0.0234771 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
@@ -302,7 +302,7 @@
0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772 0.0234772
</DataArray>
- <DataArray type="Float32" Name="x_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
0.976523 0.976523 0.976523 0.810409 0.798777 0.798405 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
@@ -325,7 +325,7 @@
0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394 0.798394
</DataArray>
- <DataArray type="Float32" Name="m_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^H2O_w" NumberOfComponents="1" format="ascii">
55407.6 55407.6 55407.6 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8
55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8
55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8
@@ -348,7 +348,7 @@
55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8
55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8 55407.8
</DataArray>
- <DataArray type="Float32" Name="m_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^N2_w" NumberOfComponents="1" format="ascii">
0.677718 0.677714 0.677707 0.562421 0.554349 0.554091 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083
0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083
0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083 0.554083
diff --git a/test/references/3pniconductionbox-reference.vtu b/test/references/3pniconductionbox-reference.vtu
index a73f803f8221f8ba351bd4587ffd73e9021a1d2b..f9835c8136c7a7f9021c71e4d2c58d7c4fd4f5e6 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="sw" Vectors="velocity_w (m/s)">
- <DataArray type="Float32" Name="sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w" Vectors="velocity_w (m/s)">
+ <DataArray type="Float32" Name="S_w" 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="sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/3pniconductioncc-reference.vtu b/test/references/3pniconductioncc-reference.vtu
index 578395b47d825c97d49d0b72b4be5642b2790a71..65d4779a05107678472cfdf8b42a49b748113341 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="sw" Vectors="velocityW">
- <DataArray type="Float32" Name="sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w" Vectors="velocityW">
+ <DataArray type="Float32" Name="S_w" 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="sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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="velocityW" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_w" 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="velocityN" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_n" 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="velocityG" NumberOfComponents="3" format="ascii">
+ <DataArray type="Float32" Name="velocity_g" 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 4d19b713d1a7267bf4783d5cdcd188735b69cb7f..f765bcaed56a8561f1b5c877532b607296ac748e 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="sw" Vectors="velocity_w (m/s)">
- <DataArray type="Float32" Name="sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w" Vectors="velocity_w (m/s)">
+ <DataArray type="Float32" Name="S_w" 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="sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/3pniconvectioncc-reference.vtu b/test/references/3pniconvectioncc-reference.vtu
index e9092906b322d8803c3c88f2e029c1038499dbfd..0bc92e7712a878dc93fe1776c0a891e2d227cb77 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="sw" Vectors="velocity_w (m/s)">
- <DataArray type="Float32" Name="sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w" Vectors="velocity_w (m/s)">
+ <DataArray type="Float32" Name="S_w" 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="sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/3pwateroilbox-reference.vtu b/test/references/3pwateroilbox-reference.vtu
index 6dcac1e41ce073457c85aa68bfd287ce1bfe44c0..a3a207bc5c7c1d2b08179f3fddd8aaf5a2a8b01d 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="sw">
- <DataArray type="Float32" Name="sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.700458 0.700477 0.700435 0.700461 0.700524 0.700521 0.700579 0.700583 0.700626 0.700633 0.700662 0.700668
0.700686 0.700691 0.700699 0.700703 0.700705 0.700708 0.700705 0.700707 0.7007 0.700702 0.700691 0.700693
0.70068 0.700681 0.700667 0.700668 0.700652 0.700653 0.700637 0.700637 0.70062 0.700621 0.700604 0.700604
@@ -214,7 +214,7 @@
0.700006 0.700005 0.700005 0.700005 0.700004 0.700004 0.700003 0.700003 0.700003 0.700002 0.700002 0.700002
0.700001 0.700001 0.700001 0.7 0.7
</DataArray>
- <DataArray type="Float32" Name="sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.299542 0.299523 0.299565 0.299539 0.299476 0.299479 0.299421 0.299417 0.299374 0.299367 0.299338 0.299332
0.299314 0.299309 0.299301 0.299297 0.299295 0.299292 0.299295 0.299293 0.2993 0.299298 0.299309 0.299307
0.29932 0.299319 0.299333 0.299332 0.299348 0.299347 0.299363 0.299363 0.299379 0.299379 0.299396 0.299396
@@ -425,7 +425,7 @@
0.299994 0.299995 0.299995 0.299995 0.299996 0.299996 0.299997 0.299997 0.299997 0.299998 0.299998 0.299998
0.299999 0.299999 0.299999 0.3 0.3
</DataArray>
- <DataArray type="Float32" Name="sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
4.18409e+06 4.19073e+06 4.16633e+06 4.17554e+06 4.20709e+06 4.19644e+06 4.22609e+06 4.21796e+06 4.24265e+06 4.23508e+06 4.25505e+06 4.24732e+06
4.26335e+06 4.25526e+06 4.26816e+06 4.25971e+06 4.27019e+06 4.26143e+06 4.27007e+06 4.26105e+06 4.26831e+06 4.2591e+06 4.26533e+06 4.25596e+06
4.26142e+06 4.25194e+06 4.25685e+06 4.24728e+06 4.25178e+06 4.24215e+06 4.24636e+06 4.23668e+06 4.2407e+06 4.23098e+06 4.23487e+06 4.22512e+06
@@ -847,7 +847,7 @@
3.63489e+06 3.63475e+06 3.63461e+06 3.63448e+06 3.63435e+06 3.63422e+06 3.6341e+06 3.63397e+06 3.63385e+06 3.63373e+06 3.63361e+06 3.63349e+06
3.63338e+06 3.63326e+06 3.63315e+06 3.63304e+06 3.63299e+06
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
4.18409e+06 4.19073e+06 4.16633e+06 4.17554e+06 4.20709e+06 4.19644e+06 4.22609e+06 4.21796e+06 4.24266e+06 4.23508e+06 4.25506e+06 4.24732e+06
4.26335e+06 4.25526e+06 4.26816e+06 4.25971e+06 4.27019e+06 4.26143e+06 4.27007e+06 4.26105e+06 4.26831e+06 4.2591e+06 4.26533e+06 4.25596e+06
4.26143e+06 4.25194e+06 4.25685e+06 4.24728e+06 4.25178e+06 4.24215e+06 4.24636e+06 4.23668e+06 4.2407e+06 4.23098e+06 4.23487e+06 4.22512e+06
@@ -1058,7 +1058,7 @@
3.63489e+06 3.63475e+06 3.63462e+06 3.63448e+06 3.63435e+06 3.63422e+06 3.6341e+06 3.63398e+06 3.63385e+06 3.63373e+06 3.63361e+06 3.6335e+06
3.63338e+06 3.63326e+06 3.63315e+06 3.63304e+06 3.63299e+06
</DataArray>
- <DataArray type="Float32" Name="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
4.18409e+06 4.19073e+06 4.16633e+06 4.17554e+06 4.20709e+06 4.19644e+06 4.22609e+06 4.21796e+06 4.24266e+06 4.23508e+06 4.25506e+06 4.24732e+06
4.26335e+06 4.25526e+06 4.26816e+06 4.25971e+06 4.27019e+06 4.26143e+06 4.27007e+06 4.26105e+06 4.26831e+06 4.2591e+06 4.26533e+06 4.25596e+06
4.26143e+06 4.25194e+06 4.25685e+06 4.24728e+06 4.25178e+06 4.24215e+06 4.24636e+06 4.23668e+06 4.2407e+06 4.23098e+06 4.23487e+06 4.22512e+06
@@ -1269,7 +1269,7 @@
3.63489e+06 3.63475e+06 3.63462e+06 3.63448e+06 3.63435e+06 3.63422e+06 3.6341e+06 3.63398e+06 3.63385e+06 3.63373e+06 3.63361e+06 3.6335e+06
3.63338e+06 3.63326e+06 3.63315e+06 3.63304e+06 3.63299e+06
</DataArray>
- <DataArray type="Float32" Name="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
999.614 999.617 999.606 999.61 999.625 999.62 999.633 999.629 999.641 999.637 999.646 999.643
999.65 999.646 999.652 999.648 999.653 999.649 999.653 999.649 999.652 999.648 999.651 999.646
999.649 999.645 999.647 999.643 999.645 999.64 999.642 999.638 999.64 999.635 999.637 999.633
@@ -1480,7 +1480,7 @@
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 999.366
</DataArray>
- <DataArray type="Float32" Name="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
943.002 943.062 942.841 942.924 943.21 943.114 943.382 943.308 943.532 943.464 943.645 943.575
943.72 943.646 943.763 943.687 943.782 943.702 943.781 943.699 943.765 943.681 943.738 943.653
943.702 943.616 943.661 943.574 943.615 943.528 943.566 943.478 943.515 943.426 943.462 943.373
@@ -1691,7 +1691,7 @@
938.026 938.025 938.023 938.022 938.021 938.02 938.019 938.018 938.017 938.015 938.014 938.013
938.012 938.011 938.01 938.009 938.009
</DataArray>
- <DataArray type="Float32" Name="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
0.0194969 0.0194971 0.0194968 0.019497 0.0194974 0.0194974 0.0194977 0.0194977 0.019498 0.019498 0.0194982 0.0194982
0.0194983 0.0194983 0.0194984 0.0194984 0.0194984 0.0194984 0.0194984 0.0194984 0.0194984 0.0194984 0.0194983 0.0194984
0.0194983 0.0194983 0.0194982 0.0194982 0.0194981 0.0194981 0.019498 0.019498 0.0194979 0.0194979 0.0194978 0.0194978
@@ -1902,7 +1902,7 @@
0.0194941 0.0194941 0.0194941 0.0194941 0.0194941 0.0194941 0.0194941 0.0194941 0.0194941 0.0194941 0.0194941 0.0194941
0.0194941 0.0194941 0.0194941 0.0194941 0.0194941
</DataArray>
- <DataArray type="Float32" Name="MobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
197.98 198.003 197.952 197.984 198.059 198.056 198.124 198.13 198.182 198.189 198.224 198.231
198.253 198.258 198.269 198.274 198.276 198.28 198.276 198.278 198.27 198.272 198.26 198.261
198.246 198.247 198.23 198.231 198.213 198.213 198.194 198.194 198.175 198.175 198.155 198.154
@@ -2113,7 +2113,7 @@
197.421 197.42 197.42 197.419 197.419 197.418 197.418 197.417 197.417 197.417 197.416 197.416
197.415 197.415 197.415 197.414 197.414
</DataArray>
- <DataArray type="Float32" Name="MobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
8.89449e-05 8.89357e-05 8.89568e-05 8.89439e-05 8.89123e-05 8.89137e-05 8.88849e-05 8.88825e-05 8.88609e-05 8.88577e-05 8.8843e-05 8.884e-05
8.88311e-05 8.88286e-05 8.88242e-05 8.88222e-05 8.88213e-05 8.88198e-05 8.88215e-05 8.88203e-05 8.8824e-05 8.88232e-05 8.88283e-05 8.88277e-05
8.88339e-05 8.88334e-05 8.88405e-05 8.88401e-05 8.88478e-05 8.88475e-05 8.88555e-05 8.88553e-05 8.88637e-05 8.88635e-05 8.8872e-05 8.88719e-05
@@ -2324,7 +2324,7 @@
8.91702e-05 8.91704e-05 8.91706e-05 8.91707e-05 8.91709e-05 8.91711e-05 8.91713e-05 8.91715e-05 8.91717e-05 8.91718e-05 8.9172e-05 8.91722e-05
8.91723e-05 8.91725e-05 8.91727e-05 8.91728e-05 8.91729e-05
</DataArray>
- <DataArray type="Float32" Name="MobG" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_g" 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="ViscosW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="viscos_w" NumberOfComponents="1" format="ascii">
0.000954764 0.00095476 0.000954769 0.000954764 0.000954751 0.000954753 0.000954741 0.000954742 0.000954732 0.000954733 0.000954725 0.000954727
0.000954721 0.000954722 0.000954719 0.00095472 0.000954717 0.000954719 0.000954717 0.000954719 0.000954718 0.00095472 0.00095472 0.000954722
0.000954722 0.000954724 0.000954724 0.000954726 0.000954727 0.000954729 0.00095473 0.000954732 0.000954733 0.000954735 0.000954736 0.000954738
@@ -2746,7 +2746,7 @@
0.000954936 0.000954936 0.000954936 0.000954936 0.000954936 0.000954936 0.000954936 0.000954936 0.000954936 0.000954937 0.000954937 0.000954937
0.000954937 0.000954937 0.000954937 0.000954937 0.000954937
</DataArray>
- <DataArray type="Float32" Name="ViscosN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="viscos_n" NumberOfComponents="1" format="ascii">
1746.72 1746.69 1746.74 1746.7 1746.63 1746.63 1746.56 1746.56 1746.51 1746.5 1746.47 1746.46
1746.44 1746.43 1746.42 1746.41 1746.41 1746.41 1746.41 1746.41 1746.42 1746.42 1746.43 1746.43
1746.44 1746.44 1746.46 1746.46 1746.48 1746.48 1746.5 1746.49 1746.52 1746.52 1746.54 1746.54
@@ -2957,7 +2957,7 @@
1747.29 1747.29 1747.29 1747.29 1747.29 1747.29 1747.29 1747.29 1747.29 1747.29 1747.3 1747.3
1747.3 1747.3 1747.3 1747.3 1747.3
</DataArray>
- <DataArray type="Float32" Name="ViscosG" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="viscos_g" NumberOfComponents="1" format="ascii">
6.08815e-09 6.07855e-09 6.11406e-09 6.10064e-09 6.05501e-09 6.07038e-09 6.0279e-09 6.03953e-09 6.00446e-09 6.01521e-09 5.98703e-09 5.99795e-09
5.97543e-09 5.9868e-09 5.96872e-09 5.98057e-09 5.96589e-09 5.97817e-09 5.96606e-09 5.9787e-09 5.96851e-09 5.98143e-09 5.97267e-09 5.98582e-09
5.97812e-09 5.99145e-09 5.98452e-09 5.998e-09 5.99162e-09 6.00523e-09 5.99924e-09 6.01294e-09 6.00722e-09 6.02101e-09 6.01545e-09 6.02932e-09
@@ -3168,7 +3168,7 @@
7.0069e-09 7.00717e-09 7.00743e-09 7.00768e-09 7.00793e-09 7.00818e-09 7.00842e-09 7.00866e-09 7.00889e-09 7.00912e-09 7.00935e-09 7.00958e-09
7.00981e-09 7.01003e-09 7.01025e-09 7.01046e-09 7.01056e-09
</DataArray>
- <DataArray type="Float32" Name="x^w_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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^w_heavyoil" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^heavyoil_w" 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^n_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" 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^n_heavyoil" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^heavyoil_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
@@ -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^g_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
0.000633783 0.000632783 0.000636481 0.000635083 0.000630333 0.000631933 0.00062751 0.000628721 0.000625069 0.000626188 0.000623254 0.00062439
0.000622046 0.00062323 0.000621348 0.000622582 0.000621054 0.000622332 0.000621071 0.000622386 0.000621326 0.000622671 0.000621759 0.000623128
0.000622326 0.000623714 0.000622993 0.000624396 0.000623732 0.000625149 0.000624525 0.000625952 0.000625356 0.000626792 0.000626213 0.000627658
@@ -4223,7 +4223,7 @@
0.000729432 0.00072946 0.000729487 0.000729513 0.000729539 0.000729565 0.00072959 0.000729615 0.000729639 0.000729663 0.000729687 0.000729711
0.000729734 0.000729757 0.00072978 0.000729802 0.000729812
</DataArray>
- <DataArray type="Float32" Name="x^g_heavyoil" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^heavyoil_g" 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/cc2pcornerpoint-reference.vtu b/test/references/cc2pcornerpoint-reference.vtu
index fc413fa086e360c9a32975159afeffa16df5f807..a009cc2d792bdf747c221e50e6f40dc7703b2a28 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.285556 0.652038 0.702397 0.96918
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
184557 119320 121961 116546
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
1000 1000 1000 1000
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
22.5775 249.234 311.805 943.527
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.714444 0.347962 0.297603 0.0308204
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
187171 121411 123985 117961
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
1460 1460 1460 1460
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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/co2box-reference.vtu b/test/references/co2box-reference.vtu
index 9df3f76aeb48500795212ac354bf7e1ca0d1f1ac..c3a38fd81e8ff84f419c83a1226847c7c3639c4f 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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
@@ -2874,7 +2874,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="X_l^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Brine_l" NumberOfComponents="1" format="ascii">
0.998484 0.999653 0.968921 0.996052 0.999967 0.999915 0.966381 0.966386 0.999968 0.999997 0.999474 0.999995
1 1 1 1 0.999998 0.994322 0.966372 0.966373 0.978095 0.966362 0.966364 0.998216
0.999878 1 0.999992 1 1 1 1 1 1 1 1 1
@@ -3193,7 +3193,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1
</DataArray>
- <DataArray type="Float32" Name="X_l^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2_l" NumberOfComponents="1" format="ascii">
0.00151614 0.000346671 0.031079 0.00394791 3.32095e-05 8.52462e-05 0.033619 0.0336142 3.23535e-05 2.56344e-06 0.00052603 4.6514e-06
3.2163e-07 1.76947e-07 2.03484e-08 1.13546e-08 1.93779e-06 0.00567766 0.0336281 0.0336266 0.0219049 0.0336377 0.0336357 0.00178438
0.000121638 1.14902e-07 8.0218e-06 4.95541e-07 1.16657e-09 6.54024e-10 6.82231e-11 3.71317e-11 4.229e-12 2.47189e-12 2.53631e-13 1.7358e-13
@@ -3512,7 +3512,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="X_g^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Brine_g" NumberOfComponents="1" format="ascii">
0.00245413 0.00244968 0.00245422 0.00244899 0.00245037 0.00245305 0.00245087 0.00244688 0.00244496 0.00244839 0.00244464 0.00245156
0.00245058 0.00244636 0.00244954 0.00244451 0.00244195 0.00244433 0.00244708 0.00244448 0.00244122 0.00244329 0.00244123 0.00243997
0.00243888 0.00243946 0.00243642 0.0024338 0.00244815 0.00244245 0.00244676 0.00244064 0.00244531 0.00244 0.00244386 0.00243923
@@ -3831,7 +3831,7 @@
0.00213444 0.00213876 0.00214305 0.00214198 0.00213751 0.00213655 0.00213811 0.00213614 0.00213591 0.00213304 0.00213126 0.00213294
0.00212914 0.0021296
</DataArray>
- <DataArray type="Float32" Name="X_g^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2_g" NumberOfComponents="1" format="ascii">
0.997546 0.99755 0.997546 0.997551 0.99755 0.997547 0.997549 0.997553 0.997555 0.997552 0.997555 0.997548
0.997549 0.997554 0.99755 0.997555 0.997558 0.997556 0.997553 0.997555 0.997559 0.997557 0.997559 0.99756
0.997561 0.997561 0.997564 0.997566 0.997552 0.997558 0.997553 0.997559 0.997555 0.99756 0.997556 0.997561
@@ -4150,7 +4150,7 @@
0.997866 0.997861 0.997857 0.997858 0.997863 0.997863 0.997862 0.997864 0.997864 0.997867 0.997869 0.997867
0.997871 0.99787
</DataArray>
- <DataArray type="Float32" Name="x_l^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Brine_l" NumberOfComponents="1" format="ascii">
0.999333 0.999847 0.986087 0.99826 0.999985 0.999963 0.984928 0.984931 0.999986 0.999999 0.999769 0.999998
1 1 1 1 0.999999 0.997495 0.984924 0.984925 0.990245 0.98492 0.984921 0.999214
0.999946 1 0.999996 1 1 1 1 1 1 1 1 1
@@ -4469,7 +4469,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1
</DataArray>
- <DataArray type="Float32" Name="x_l^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2_l" NumberOfComponents="1" format="ascii">
0.000667463 0.000152517 0.0139127 0.00174039 1.46079e-05 3.74985e-05 0.0150716 0.0150694 1.42314e-05 1.12756e-06 0.00023145 2.04598e-06
1.41473e-07 7.78326e-08 8.95053e-09 4.99446e-09 8.52366e-07 0.00250536 0.0150757 0.015075 0.00975487 0.0150801 0.0150792 0.000785668
5.35078e-05 5.05414e-08 3.52851e-06 2.1797e-07 5.13132e-10 2.87681e-10 3.00089e-11 1.63329e-11 1.86018e-12 1.08729e-12 1.11563e-13 7.63514e-14
@@ -4788,7 +4788,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="x_g^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Brine_g" NumberOfComponents="1" format="ascii">
0.00556192 0.00555187 0.00556213 0.0055503 0.00555343 0.00555949 0.00555456 0.00554555 0.0055412 0.00554896 0.00554048 0.00555611
0.0055539 0.00554436 0.00555155 0.0055402 0.00553441 0.00553977 0.00554599 0.00554012 0.00553276 0.00553743 0.00553278 0.00552993
0.00552747 0.00552877 0.00552192 0.00551598 0.00554842 0.00553554 0.00554526 0.00553144 0.00554199 0.00553 0.00553872 0.00552827
@@ -5107,7 +5107,7 @@
0.00483935 0.00484913 0.00485883 0.0048564 0.0048463 0.00484413 0.00484764 0.00484319 0.00484267 0.0048362 0.00483216 0.00483596
0.00482737 0.0048284
</DataArray>
- <DataArray type="Float32" Name="x_g^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2_g" NumberOfComponents="1" format="ascii">
0.994438 0.994448 0.994438 0.99445 0.994447 0.99444 0.994445 0.994454 0.994459 0.994451 0.99446 0.994444
0.994446 0.994456 0.994448 0.99446 0.994466 0.99446 0.994454 0.99446 0.994467 0.994463 0.994467 0.99447
0.994473 0.994471 0.994478 0.994484 0.994452 0.994464 0.994455 0.994469 0.994458 0.99447 0.994461 0.994472
diff --git a/test/references/co2cc-reference.vtu b/test/references/co2cc-reference.vtu
index 2ad973753df9eaae26ea3e1a461b3804463837be..8faecf1e4fef6f1d9ba470735f7b63eb572e2848 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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
@@ -2775,7 +2775,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="X_l^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Brine_l" NumberOfComponents="1" format="ascii">
0.99734 0.999802 0.96638 0.999965 0.999542 0.999988 0.999999 1 0.999998 0.994201 0.96636 0.966366
0.966345 0.993828 0.999519 1 0.999966 0.999998 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 0.966352 0.966332
@@ -3083,7 +3083,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="X_l^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2_l" NumberOfComponents="1" format="ascii">
0.00266011 0.000198277 0.0336205 3.4906e-05 0.000458354 1.15547e-05 7.00595e-07 4.37592e-08 2.1941e-06 0.00579899 0.03364 0.0336339
0.0336551 0.00617171 0.000481025 1.40729e-07 3.35622e-05 2.31733e-06 2.15486e-09 9.95381e-11 4.75417e-12 2.47353e-13 1.19586e-14 5.42073e-16
7.7333e-09 1.82352e-11 3.60229e-10 1.37881e-07 1.1122e-12 9.42793e-14 7.82968e-15 1.56694e-12 2.50317e-11 2.40839e-13 0.0336478 0.0336681
@@ -3391,7 +3391,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="X_g^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Brine_g" NumberOfComponents="1" format="ascii">
0.0024536 0.00245451 0.00245169 0.00245083 0.002449 0.0024538 0.00245175 0.00245024 0.0024477 0.00244788 0.00244972 0.00244637
0.00244705 0.00244434 0.00244407 0.00244556 0.00244287 0.00244058 0.00244895 0.00244771 0.00244684 0.00244609 0.00244491 0.00244333
0.00244358 0.00244103 0.00244163 0.00243823 0.00244144 0.00244049 0.00243792 0.00243743 0.00243542 0.00243347 0.00244377 0.00244437
@@ -3699,7 +3699,7 @@
0.0021421 0.00214071 0.00213891 0.00213731 0.00213588 0.002146 0.002145 0.0021445 0.00214104 0.00213994 0.00213911 0.0021403
0.00213903 0.00213954 0.00213472 0.00213356 0.00213473 0.00213369 0.0021332
</DataArray>
- <DataArray type="Float32" Name="X_g^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2_g" NumberOfComponents="1" format="ascii">
0.997546 0.997545 0.997548 0.997549 0.997551 0.997546 0.997548 0.99755 0.997552 0.997552 0.99755 0.997554
0.997553 0.997556 0.997556 0.997554 0.997557 0.997559 0.997551 0.997552 0.997553 0.997554 0.997555 0.997557
0.997556 0.997559 0.997558 0.997562 0.997559 0.997559 0.997562 0.997563 0.997565 0.997567 0.997556 0.997556
@@ -4007,7 +4007,7 @@
0.997858 0.997859 0.997861 0.997863 0.997864 0.997854 0.997855 0.997855 0.997859 0.99786 0.997861 0.99786
0.997861 0.99786 0.997865 0.997866 0.997865 0.997866 0.997867
</DataArray>
- <DataArray type="Float32" Name="x_l^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Brine_l" NumberOfComponents="1" format="ascii">
0.998828 0.999913 0.984928 0.999985 0.999798 0.999995 1 1 0.999999 0.997441 0.984919 0.984922
0.984912 0.997276 0.999788 1 0.999985 0.999999 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 0.984915 0.984906
@@ -4315,7 +4315,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="x_l^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2_l" NumberOfComponents="1" format="ascii">
0.00117183 8.72245e-05 0.0150723 1.53542e-05 0.000201665 5.08253e-06 3.08166e-07 1.92481e-08 9.65105e-07 0.00255908 0.0150812 0.0150784
0.0150881 0.00272412 0.000211642 6.19017e-08 1.4763e-05 1.01931e-06 9.47846e-10 4.37832e-11 2.09119e-12 1.08801e-13 5.26016e-15 2.38438e-16
3.40159e-09 8.021e-12 1.58452e-10 6.06488e-08 4.89216e-13 4.147e-14 3.44399e-15 6.89238e-13 1.10105e-11 1.05936e-13 0.0150847 0.015094
@@ -4623,7 +4623,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="x_g^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Brine_g" NumberOfComponents="1" format="ascii">
0.00556072 0.00556278 0.00555641 0.00555447 0.00555033 0.00556117 0.00555655 0.00555314 0.00554739 0.00554781 0.00555195 0.0055444
0.00554593 0.0055398 0.00553919 0.00554256 0.00553647 0.0055313 0.00555021 0.00554741 0.00554545 0.00554375 0.00554108 0.00553753
0.00553809 0.00553232 0.00553369 0.005526 0.00553324 0.00553109 0.00552529 0.00552419 0.00551964 0.00551525 0.00553851 0.00553988
@@ -4931,7 +4931,7 @@
0.00485668 0.00485352 0.00484945 0.00484585 0.00484261 0.00486548 0.00486323 0.0048621 0.00485427 0.00485179 0.00484992 0.00485261
0.00484974 0.00485089 0.00483999 0.00483737 0.00484001 0.00483765 0.00483655
</DataArray>
- <DataArray type="Float32" Name="x_g^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2_g" NumberOfComponents="1" format="ascii">
0.994439 0.994437 0.994444 0.994446 0.99445 0.994439 0.994443 0.994447 0.994453 0.994452 0.994448 0.994456
0.994454 0.99446 0.994461 0.994457 0.994464 0.994469 0.99445 0.994453 0.994455 0.994456 0.994459 0.994462
0.994462 0.994468 0.994466 0.994474 0.994467 0.994469 0.994475 0.994476 0.99448 0.994485 0.994461 0.99446
diff --git a/test/references/co2nibox-reference.vtu b/test/references/co2nibox-reference.vtu
index 5409e871890150a8f6276b3eff82379e7e0e8e77..30e87a5c45d566f1a2ad17c60995253931f44ecc 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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
@@ -2874,7 +2874,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="X_l^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Brine_l" NumberOfComponents="1" format="ascii">
0.998537 0.999656 0.969382 0.996008 0.999968 0.99992 0.966434 0.966575 0.999969 0.999998 0.999486 0.999996
1 1 1 1 0.999998 0.99434 0.966234 0.96652 0.978552 0.966184 0.966496 0.998309
0.999888 1 0.999993 1 1 1 1 1 1 1 1 1
@@ -3193,7 +3193,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1
</DataArray>
- <DataArray type="Float32" Name="X_l^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2_l" NumberOfComponents="1" format="ascii">
0.001463 0.000344476 0.0306177 0.00399192 3.19636e-05 8.0304e-05 0.0335658 0.0334255 3.06173e-05 2.35693e-06 0.000514277 4.25707e-06
2.84739e-07 1.55572e-07 1.73434e-08 9.52275e-09 1.75701e-06 0.00565984 0.0337662 0.0334798 0.0214482 0.0338164 0.0335038 0.00169146
0.00011185 9.94884e-08 7.13372e-06 4.24183e-07 9.5317e-10 5.22007e-10 5.32587e-11 2.81724e-11 3.1462e-12 1.78184e-12 1.79415e-13 1.18646e-13
@@ -3512,7 +3512,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="X_g^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Brine_g" NumberOfComponents="1" format="ascii">
0.00245869 0.00245118 0.00249104 0.00245457 0.00245098 0.00245274 0.0024609 0.00248273 0.00244585 0.00244901 0.00244748 0.00245123
0.00245042 0.00244704 0.00244946 0.00244522 0.00244274 0.00245487 0.002421 0.00247219 0.00246815 0.00240948 0.00246594 0.00244329
0.00243984 0.00244023 0.00243722 0.00243457 0.00244813 0.00244317 0.00244676 0.00244138 0.00244523 0.00244068 0.00244371 0.00243987
@@ -3831,7 +3831,7 @@
0.00213529 0.00213889 0.00214309 0.00214201 0.00213763 0.00213665 0.00213811 0.00213617 0.00213598 0.00213389 0.00213207 0.00213294
0.00212969 0.0021303
</DataArray>
- <DataArray type="Float32" Name="X_g^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2_g" NumberOfComponents="1" format="ascii">
0.997541 0.997549 0.997509 0.997545 0.997549 0.997547 0.997539 0.997517 0.997554 0.997551 0.997553 0.997549
0.99755 0.997553 0.997551 0.997555 0.997557 0.997545 0.997579 0.997528 0.997532 0.997591 0.997534 0.997557
0.99756 0.99756 0.997563 0.997565 0.997552 0.997557 0.997553 0.997559 0.997555 0.997559 0.997556 0.99756
@@ -4150,7 +4150,7 @@
0.997865 0.997861 0.997857 0.997858 0.997862 0.997863 0.997862 0.997864 0.997864 0.997866 0.997868 0.997867
0.99787 0.99787
</DataArray>
- <DataArray type="Float32" Name="x_l^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Brine_l" NumberOfComponents="1" format="ascii">
0.999356 0.999848 0.986297 0.99824 0.999986 0.999965 0.984953 0.985017 0.999987 0.999999 0.999774 0.999998
1 1 1 1 0.999999 0.997503 0.984861 0.984992 0.990451 0.984838 0.984981 0.999255
0.999951 1 0.999997 1 1 1 1 1 1 1 1 1
@@ -4469,7 +4469,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1
</DataArray>
- <DataArray type="Float32" Name="x_l^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2_l" NumberOfComponents="1" format="ascii">
0.000644047 0.000151552 0.0137026 0.00175984 1.40599e-05 3.53244e-05 0.0150473 0.0149832 1.34677e-05 1.03673e-06 0.000226277 1.87253e-06
1.25246e-07 6.84305e-08 7.62872e-09 4.18871e-09 7.72844e-07 0.00249747 0.0151388 0.015008 0.00954899 0.0151618 0.0150189 0.000744717
4.92019e-05 4.37613e-08 3.13787e-06 1.86583e-07 4.19264e-10 2.29612e-10 2.34265e-11 1.2392e-11 1.3839e-12 7.83767e-13 7.89181e-14 5.21878e-14
@@ -4788,7 +4788,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0
</DataArray>
- <DataArray type="Float32" Name="x_g^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Brine_g" NumberOfComponents="1" format="ascii">
0.00557222 0.00555526 0.0056453 0.00556292 0.0055548 0.00555878 0.00557722 0.00562654 0.0055432 0.00555036 0.0055469 0.00555536
0.00555354 0.00554591 0.00555136 0.00554179 0.00553619 0.0055636 0.00548707 0.00560271 0.0055936 0.00546105 0.00558861 0.00553742
0.00552963 0.00553052 0.00552371 0.00551774 0.00554836 0.00553717 0.00554526 0.0055331 0.0055418 0.00553154 0.00553838 0.00552971
@@ -5107,7 +5107,7 @@
0.00484129 0.00484942 0.00485891 0.00485647 0.00484656 0.00484434 0.00484764 0.00484326 0.00484283 0.00483811 0.00483399 0.00483596
0.00482862 0.00482998
</DataArray>
- <DataArray type="Float32" Name="x_g^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2_g" NumberOfComponents="1" format="ascii">
0.994428 0.994445 0.994355 0.994437 0.994445 0.994441 0.994423 0.994373 0.994457 0.99445 0.994453 0.994445
0.994446 0.994454 0.994449 0.994458 0.994464 0.994436 0.994513 0.994397 0.994406 0.994539 0.994411 0.994463
0.99447 0.994469 0.994476 0.994482 0.994452 0.994463 0.994455 0.994467 0.994458 0.994468 0.994462 0.99447
diff --git a/test/references/co2nicc-reference.vtu b/test/references/co2nicc-reference.vtu
index 078985c34ed744cc8738908b16dfe1d559573538..97c30b9aa4719eab9e17a63df526b748bdc52f8d 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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
@@ -2775,7 +2775,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="X_l^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Brine_l" NumberOfComponents="1" format="ascii">
0.997347 0.999802 0.96659 0.999965 0.99954 0.999988 0.999999 1 0.999998 0.994192 0.966385 0.966533
0.966335 0.993793 0.999516 1 0.999966 0.999998 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 0.966534 0.966249
@@ -3083,7 +3083,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="X_l^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2_l" NumberOfComponents="1" format="ascii">
0.00265271 0.000198319 0.0334104 3.50669e-05 0.000459645 1.15862e-05 7.04087e-07 4.40702e-08 2.21073e-06 0.00580776 0.0336152 0.0334671
0.033665 0.0062067 0.000483948 1.42153e-07 3.38155e-05 2.33878e-06 2.17466e-09 1.00656e-10 4.8168e-12 2.5107e-13 1.21623e-14 5.52522e-16
7.82884e-09 1.85343e-11 3.65436e-10 1.39401e-07 1.13265e-12 9.61675e-14 8.00408e-15 1.59533e-12 2.54426e-11 2.45797e-13 0.0334661 0.0337512
@@ -3391,7 +3391,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="X_g^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Brine_g" NumberOfComponents="1" format="ascii">
0.00245916 0.00245555 0.00249206 0.00245178 0.0024508 0.00245425 0.00245211 0.00245063 0.00244854 0.00245737 0.00245467 0.00247843
0.00244544 0.00245237 0.0024455 0.00244639 0.00244378 0.00244151 0.0024494 0.00244822 0.00244733 0.00244649 0.00244528 0.00244375
0.00244443 0.00244198 0.00244255 0.00243918 0.00244228 0.00244129 0.00243878 0.00243822 0.00243626 0.00243427 0.00247857 0.00242887
@@ -3699,7 +3699,7 @@
0.00214264 0.00214119 0.00213932 0.00213774 0.0021363 0.00214604 0.00214504 0.00214453 0.00214113 0.00214002 0.00213915 0.00214035
0.00213909 0.00213968 0.00213515 0.00213395 0.00213504 0.00213426 0.00213359
</DataArray>
- <DataArray type="Float32" Name="X_g^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^CO2_g" NumberOfComponents="1" format="ascii">
0.997541 0.997544 0.997508 0.997548 0.997549 0.997546 0.997548 0.997549 0.997551 0.997543 0.997545 0.997522
0.997555 0.997548 0.997554 0.997554 0.997556 0.997558 0.997551 0.997552 0.997553 0.997554 0.997555 0.997556
0.997556 0.997558 0.997557 0.997561 0.997558 0.997559 0.997561 0.997562 0.997564 0.997566 0.997521 0.997571
@@ -4007,7 +4007,7 @@
0.997857 0.997859 0.997861 0.997862 0.997864 0.997854 0.997855 0.997855 0.997859 0.99786 0.997861 0.99786
0.997861 0.99786 0.997865 0.997866 0.997865 0.997866 0.997866
</DataArray>
- <DataArray type="Float32" Name="x_l^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Brine_l" NumberOfComponents="1" format="ascii">
0.998831 0.999913 0.985024 0.999985 0.999798 0.999995 1 1 0.999999 0.997437 0.98493 0.984998
0.984907 0.99726 0.999787 1 0.999985 0.999999 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 0.984998 0.984868
@@ -4315,7 +4315,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="x_l^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2_l" NumberOfComponents="1" format="ascii">
0.00116857 8.72431e-05 0.0149763 1.54249e-05 0.000202233 5.09639e-06 3.09702e-07 1.93849e-08 9.72422e-07 0.00256296 0.0150698 0.0150022
0.0150926 0.00273963 0.000212929 6.2528e-08 1.48745e-05 1.02874e-06 9.56554e-10 4.42747e-11 2.11873e-12 1.10437e-13 5.34976e-15 2.43034e-16
3.44362e-09 8.15255e-12 1.60742e-10 6.13174e-08 4.98209e-13 4.23005e-14 3.5207e-15 7.01728e-13 1.11913e-11 1.08117e-13 0.0150017 0.015132
@@ -4623,7 +4623,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="x_g^Brine" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Brine_g" NumberOfComponents="1" format="ascii">
0.00557328 0.00556514 0.00564761 0.00555662 0.0055544 0.00556219 0.00555736 0.00555401 0.00554929 0.00556924 0.00556314 0.00561681
0.00554228 0.00555794 0.00554241 0.00554444 0.00553855 0.00553341 0.00555122 0.00554856 0.00554655 0.00554467 0.00554193 0.00553846
0.00554 0.00553446 0.00553576 0.00552813 0.00553514 0.0055329 0.00552724 0.00552598 0.00552154 0.00551704 0.00561713 0.00550484
@@ -4931,7 +4931,7 @@
0.00485789 0.00485461 0.00485039 0.00484681 0.00484356 0.00486559 0.00486332 0.00486216 0.00485447 0.00485198 0.00485 0.00485272
0.00484986 0.00485119 0.00484095 0.00483824 0.00484071 0.00483894 0.00483744
</DataArray>
- <DataArray type="Float32" Name="x_g^CO2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^CO2_g" NumberOfComponents="1" format="ascii">
0.994427 0.994435 0.994352 0.994443 0.994446 0.994438 0.994443 0.994446 0.994451 0.994431 0.994437 0.994383
0.994458 0.994442 0.994458 0.994456 0.994461 0.994467 0.994449 0.994451 0.994453 0.994455 0.994458 0.994462
0.99446 0.994466 0.994464 0.994472 0.994465 0.994467 0.994473 0.994474 0.994478 0.994483 0.994383 0.994495
diff --git a/test/references/column3p3cnibox-reference.vtu b/test/references/column3p3cnibox-reference.vtu
index 7ebff335398d65044bda1773cdb7c3d21b9ece9c..59554e185a6a93de6bc373977da539cdb0cc5a66 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="Sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/column3p3cnicc-reference.vtu b/test/references/column3p3cnicc-reference.vtu
index 250a9084cd4301889e0fdc7f250c502be2c86e02..c4e9fee7db369da170b97d35afe792a76a32da40 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="Sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/combustion-reference.vtp b/test/references/combustion-reference.vtp
index db74d7cec389a6bcc8a864a9b8173f334a74930c..ccdd59325bb992af6b0d0c82e6cb74cd30c39255 100644
--- a/test/references/combustion-reference.vtp
+++ b/test/references/combustion-reference.vtp
@@ -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_w^SimpleH2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^SimpleH2O_w" 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_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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_n^SimpleH2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^SimpleH2O_n" 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_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" 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 0c5da736c085d2887e82504466e0716e719113ef..2a749f8f1e75da6b1062773da2e7e5eeaf6f40d5 100644
--- a/test/references/evaporationatmosphere-reference.vtu
+++ b/test/references/evaporationatmosphere-reference.vtu
@@ -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_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" 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_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" 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
diff --git a/test/references/fracturebox2p-reference.vtu b/test/references/fracturebox2p-reference.vtu
index 252871f545650a69531bd49394ba624e07c2c3ef..c863d3de6508b980e219ad30c9fee88cda1ef827 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 cf6f812df3db3fe67563083533495581cc12a09b..559a51f516f24f01a0567ff28ac36ff14506cf4c 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 0bb78c563d21df7460a36dc7f156b6eac5b7eda9..91a85d2b0e68a8955591cf46498d28520adeff4e 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 fdb2e34e7c1653941235af086f2dfb69fdb3ce64..734246274ca2e8e01d9fee5eb44947c8d685b6aa 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 da8cfe981a0c5373c1fa898bca46795b611645d8..384b36223c45577fff95b666684ebab1c5f1def7 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 4cbb47e0d8bf69990fd541e6593642b14174890c..a47d62de5fb86fe852274f4abffa4281fb240079 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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/fuelcell2pncbox-reference.vtu b/test/references/fuelcell2pncbox-reference.vtu
index b96a8846362afc0ccf23f2aeaa45b08377a77016..c1a6eda37f23c57363aa39a65ccc7665bdb2619b 100644
--- a/test/references/fuelcell2pncbox-reference.vtu
+++ b/test/references/fuelcell2pncbox-reference.vtu
@@ -33,7 +33,7 @@
14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3
14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3 14005.3
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.30002 0.30002 0.300017 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017 0.30002 0.300017
@@ -48,7 +48,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
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
@@ -63,7 +63,7 @@
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
@@ -78,7 +78,7 @@
993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
302.595 302.595 302.589 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589 302.595 302.589
@@ -93,7 +93,7 @@
302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561
302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561 302.561
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.69998 0.69998 0.699983 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983 0.69998 0.699983
@@ -108,7 +108,7 @@
0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7 0.7
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
99999.6 99999.6 99999.7 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7 99999.6 99999.7
@@ -123,7 +123,7 @@
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
1.0976 1.0976 1.10151 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151
1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151
1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151 1.0976 1.10151
@@ -138,7 +138,7 @@
1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907
1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907 1.11907
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
9071.99 9071.99 9035.61 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61 9071.99 9035.61
@@ -153,7 +153,7 @@
8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85
8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85 8875.85
</DataArray>
- <DataArray type="Float32" Name="x_l^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_l" NumberOfComponents="1" format="ascii">
0.999989 0.999989 0.999988 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988 0.999989 0.999988
@@ -168,7 +168,7 @@
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
</DataArray>
- <DataArray type="Float32" Name="x_l^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_l" NumberOfComponents="1" format="ascii">
7.16836e-06 7.16836e-06 6.91411e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06 7.16836e-06 6.91411e-06
@@ -183,7 +183,7 @@
5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06
5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06 5.77192e-06
</DataArray>
- <DataArray type="Float32" Name="x_l^O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^O2_l" NumberOfComponents="1" format="ascii">
4.3001e-06 4.3001e-06 4.78303e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06 4.3001e-06 4.78303e-06
@@ -198,7 +198,7 @@
6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06 6.95249e-06
</DataArray>
- <DataArray type="Float32" Name="x_g^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
@@ -213,7 +213,7 @@
0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
</DataArray>
- <DataArray type="Float32" Name="x_g^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_g" NumberOfComponents="1" format="ascii">
0.712624 0.712624 0.687348 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348 0.712624 0.687348
@@ -228,7 +228,7 @@
0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799
0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799 0.573799
</DataArray>
- <DataArray type="Float32" Name="x_g^O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^O2_g" NumberOfComponents="1" format="ascii">
0.225069 0.225069 0.250346 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346 0.225069 0.250346
@@ -243,7 +243,7 @@
0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895
0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895 0.363895
</DataArray>
- <DataArray type="Float32" Name="m_l^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^H2O_l" NumberOfComponents="1" format="ascii">
55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
@@ -258,7 +258,7 @@
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
</DataArray>
- <DataArray type="Float32" Name="m_l^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^N2_l" NumberOfComponents="1" format="ascii">
0.395279 0.395279 0.381259 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259
0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259
0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259 0.395279 0.381259
@@ -273,7 +273,7 @@
0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276
0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276 0.318276
</DataArray>
- <DataArray type="Float32" Name="m_l^O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^O2_l" NumberOfComponents="1" format="ascii">
0.237117 0.237117 0.263746 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746
0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746
0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746 0.237117 0.263746
diff --git a/test/references/fuelcell2pnccc-reference.vtu b/test/references/fuelcell2pnccc-reference.vtu
index 3a9883ed6eaa9b4c05d47f695d593afc0ddfa2eb..f49e58b37b4110fd2a3d843d9bb0a89972f95c66 100644
--- a/test/references/fuelcell2pnccc-reference.vtu
+++ b/test/references/fuelcell2pnccc-reference.vtu
@@ -29,7 +29,7 @@
14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4 14005.4
14005.4 14005.4 14005.4 14005.4 14005.4 14005.4
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019
0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300019 0.300015 0.300015 0.300015
0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015 0.300015
@@ -42,7 +42,7 @@
0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002 0.300002
0.300002 0.300002 0.300002 0.300002 0.300002 0.300002
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
@@ -55,7 +55,7 @@
114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005 114005
114005 114005 114005 114005 114005 114005
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403 993.403
@@ -68,7 +68,7 @@
993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404 993.404
993.404 993.404 993.404 993.404 993.404 993.404
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592
302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.592 302.587 302.587 302.587
302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587 302.587
@@ -81,7 +81,7 @@
302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564 302.564
302.564 302.564 302.564 302.564 302.564 302.564
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981
0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699981 0.699985 0.699985 0.699985
0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985 0.699985
@@ -94,7 +94,7 @@
0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998 0.699998
0.699998 0.699998 0.699998 0.699998 0.699998 0.699998
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6
99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.6 99999.7 99999.7 99999.7
99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7 99999.7
@@ -107,7 +107,7 @@
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924
1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.09924 1.10315 1.10315 1.10315
1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315 1.10315
@@ -120,7 +120,7 @@
1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742 1.11742
1.11742 1.11742 1.11742 1.11742 1.11742 1.11742
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67
9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9056.67 9020.45 9020.45 9020.45
9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45 9020.45
@@ -133,7 +133,7 @@
8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66 8890.66
8890.66 8890.66 8890.66 8890.66 8890.66 8890.66
</DataArray>
- <DataArray type="Float32" Name="x_l^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_l" 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
@@ -146,7 +146,7 @@
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
</DataArray>
- <DataArray type="Float32" Name="x_l^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_l" NumberOfComponents="1" format="ascii">
7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06
7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 7.06157e-06 6.80754e-06 6.80754e-06 6.80754e-06
6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06 6.80754e-06
@@ -159,7 +159,7 @@
5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06
5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06 5.87961e-06
</DataArray>
- <DataArray type="Float32" Name="x_l^O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^O2_l" NumberOfComponents="1" format="ascii">
4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06
4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.50294e-06 4.98544e-06 4.98544e-06 4.98544e-06
4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06 4.98544e-06
@@ -172,7 +172,7 @@
6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06
6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06 6.74795e-06
</DataArray>
- <DataArray type="Float32" Name="x_g^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_g" NumberOfComponents="1" format="ascii">
0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063
0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623063 0.0623062 0.0623062 0.0623062
0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062 0.0623062
@@ -185,7 +185,7 @@
0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
0.062306 0.062306 0.062306 0.062306 0.062306 0.062306
</DataArray>
- <DataArray type="Float32" Name="x_g^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_g" NumberOfComponents="1" format="ascii">
0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008
0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.702008 0.676753 0.676753 0.676753
0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753 0.676753
@@ -198,7 +198,7 @@
0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504 0.584504
0.584504 0.584504 0.584504 0.584504 0.584504 0.584504
</DataArray>
- <DataArray type="Float32" Name="x_g^O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^O2_g" NumberOfComponents="1" format="ascii">
0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686
0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.235686 0.26094 0.26094 0.26094
0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094 0.26094
@@ -211,7 +211,7 @@
0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319 0.35319
0.35319 0.35319 0.35319 0.35319 0.35319 0.35319
</DataArray>
- <DataArray type="Float32" Name="m_l^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^H2O_l" NumberOfComponents="1" format="ascii">
55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5 55141.5
@@ -224,7 +224,7 @@
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
55141.4 55141.4 55141.4 55141.4 55141.4 55141.4
</DataArray>
- <DataArray type="Float32" Name="m_l^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^N2_l" NumberOfComponents="1" format="ascii">
0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939
0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.38939 0.375382 0.375382 0.375382
0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382 0.375382
@@ -237,7 +237,7 @@
0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214 0.324214
0.324214 0.324214 0.324214 0.324214 0.324214 0.324214
</DataArray>
- <DataArray type="Float32" Name="m_l^O2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^O2_l" NumberOfComponents="1" format="ascii">
0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302
0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.248302 0.274908 0.274908 0.274908
0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908 0.274908
diff --git a/test/references/generalizeddirichlet-reference.vtp b/test/references/generalizeddirichlet-reference.vtp
index a6db8f3a5fd7fdaf1792a072ea01f19c4b362b3f..ede61fa12e55be55e9fb1bc9248bfc76b85e8a92 100644
--- a/test/references/generalizeddirichlet-reference.vtp
+++ b/test/references/generalizeddirichlet-reference.vtp
@@ -2,8 +2,8 @@
<VTKFile type="PolyData" version="0.1" byte_order="LittleEndian">
<PolyData>
<Piece NumberOfLines="100" NumberOfPoints="101">
- <PointData Scalars="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.21989 0.232707 0.243682 0.253351 0.262038 0.269954 0.277249 0.284031 0.290382 0.296366 0.302033 0.307425
0.312575 0.317513 0.322262 0.326844 0.331275 0.335573 0.33975 0.343819 0.347793 0.35168 0.35549 0.359232
0.362914 0.366543 0.370127 0.373673 0.377187 0.380677 0.384147 0.387606 0.391059 0.394514 0.397976 0.401453
@@ -14,7 +14,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.78011 0.767293 0.756318 0.746649 0.737962 0.730046 0.722751 0.715969 0.709618 0.703634 0.697967 0.692575
0.687425 0.682487 0.677738 0.673156 0.668725 0.664427 0.66025 0.656181 0.652207 0.64832 0.64451 0.640768
0.637086 0.633457 0.629873 0.626327 0.622813 0.619323 0.615853 0.612394 0.608941 0.605486 0.602024 0.598547
@@ -25,7 +25,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
201197 201196 201195 201192 201190 201186 201182 201178 201173 201168 201163 201157
201151 201145 201138 201131 201124 201116 201109 201101 201093 201084 201075 201067
201057 201048 201038 201029 201019 201008 200998 200987 200976 200965 200954 200942
@@ -36,7 +36,7 @@
200192 200180 200168 200156 200144 200132 200120 200108 200096 200084 200072 200060
200048 200036 200024 200012 200000
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
200631 200625 200620 200614 200608 200601 200594 200587 200580 200572 200564 200556
200548 200539 200531 200522 200512 200503 200493 200484 200473 200463 200453 200442
200431 200420 200408 200397 200385 200373 200361 200348 200335 200322 200309 200296
diff --git a/test/references/generallens_box-reference.vtu b/test/references/generallens_box-reference.vtu
index bfa5db43aa0a6496d3c87fc22ef0232d098d8a15..41d5a3beba67bd8272f701ea4f5bb7087ee168eb 100644
--- a/test/references/generallens_box-reference.vtu
+++ b/test/references/generallens_box-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1536" NumberOfPoints="1617">
- <PointData Scalars="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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 @@
5.89372e-19 -5.13402e-30 -9.4627e-38 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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 @@
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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
153955 152689 152269 151338 151813 150518 151091 149818 150467 149206 149913 148660
149415 148167 148960 147716 148542 147301 148153 146915 147790 146553 147448 146213
147124 145890 146815 145582 146519 145287 146234 145003 145959 144728 145691 144461
@@ -414,7 +414,7 @@
101723 101646 101569 101492 101414 101336 101257 101176 101095 101012 100927 100841
100753 100663 100572 100479 100385 100289 100193 100097 100000
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
153955 152689 152269 151338 151813 150518 151091 149818 150467 149206 149913 148660
149415 148167 148960 147716 148542 147301 148153 146915 147790 146553 147448 146213
147124 145890 146815 145582 146519 145287 146234 145003 145959 144728 145691 144461
diff --git a/test/references/generallens_cc-reference.vtu b/test/references/generallens_cc-reference.vtu
index 48037a4ff8bdc83e12c31bc8242959671f889a53..7bb283d1ed84837668638ea54e9bfd99e4dbe321 100644
--- a/test/references/generallens_cc-reference.vtu
+++ b/test/references/generallens_cc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="1536" NumberOfPoints="1617">
- <CellData Scalars="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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
@@ -133,7 +133,7 @@
0.00384322 3.15868e-05 1.65407e-09 1.10416e-17 3.26868e-28 -2.56401e-36 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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
@@ -263,7 +263,7 @@
0.996157 0.999968 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
152499 151566 150798 150139 149559 149038 148566 148133 147733 147359 147009 146677
146362 146061 145772 145493 145222 144958 144701 144449 144202 143959 143720 143484
143252 143022 142796 142572 142352 142135 141920 141709 141501 141297 141095 140897
@@ -393,7 +393,7 @@
102652 102512 102437 102362 102286 102210 102134 102057 101979 101901 101821 101741
101659 101576 101491 101405 101316 101226 101135 101042 100948 100853 100757 100661
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
152499 151566 150798 150139 149559 149038 148566 148133 147733 147359 147009 146677
146362 146061 145772 145493 145222 144958 144701 144449 144202 143959 143720 143484
143252 143022 142796 142572 142352 142135 141920 141709 141501 141297 141095 140897
diff --git a/test/references/infiltration3pbox-reference.vtu b/test/references/infiltration3pbox-reference.vtu
index e0a89ebfae5760cd61fbcca06848dd98b7cc460a..5ccc1ca0962831ff9b7a3223818e146044f7e965 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="sw">
- <DataArray type="Float32" Name="sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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 4415cf588793d4f9d2380dcd27f173b39f29c8d4..b6e9cc957fdda3dc36e8b3e497c35d126071ab88 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="sw">
- <DataArray type="Float32" Name="sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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 90ef5ceaab0add1e212702f6f9956e0a97a82917..18fdd77e20f251a5ee13c50d330fa530ac3ad233 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="Sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/infiltrationcc-reference.vtu b/test/references/infiltrationcc-reference.vtu
index 66ad1814b7aa02cef303a553c25959904e734d4e..75f09eff69b7d44c42ce1237c4b2bb69f65efd34 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="Sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/injection2pnibox-cube-reference.vtu b/test/references/injection2pnibox-cube-reference.vtu
index 88e6d3f449b1790b43fc2a2442afd5203f6f4964..40c961b0692e94f2ef83a67e1caf0efbf824a206 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 0931e2e40929d44b8ff8007e0a2de1d353a98017..446e4f216003e68c3d42fec07c2dd881a6e1ee82 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 afa9355a6cbab1674b66352cabf2f476fe4667c9..1b610b3bb472b225efb15ac7cc9e18646181360b 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 29bd961d8ac45383c8f6d2f56aeae4d14ff444fe..8c734a0c03e0dd46009b098cf0cf2bcf05783e26 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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/injectionbox-reference.vtu b/test/references/injectionbox-reference.vtu
index 9c5804ae21536dff0713e798764575edc0438890..f125a69d01a91be56cc183b154e037d36bad30c0 100644
--- a/test/references/injectionbox-reference.vtu
+++ b/test/references/injectionbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <PointData Scalars="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
2.6391e+07 2.63933e+07 2.63667e+07 2.63688e+07 2.63953e+07 2.63708e+07 2.63973e+07 2.63727e+07 2.63992e+07 2.63746e+07 2.64011e+07 2.63765e+07
2.64029e+07 2.63783e+07 2.64048e+07 2.63802e+07 2.64066e+07 2.6382e+07 2.64084e+07 2.63838e+07 2.64102e+07 2.63856e+07 2.6412e+07 2.63874e+07
2.64138e+07 2.63892e+07 2.64157e+07 2.6391e+07 2.64175e+07 2.63929e+07 2.64193e+07 2.63947e+07 2.64212e+07 2.63965e+07 2.6423e+07 2.63984e+07
@@ -117,7 +117,7 @@
2.60131e+07 2.60146e+07 2.60162e+07 2.60178e+07 2.60193e+07 2.60208e+07 2.60223e+07 2.60237e+07 2.6025e+07 2.60263e+07 2.60274e+07 2.60285e+07
2.60293e+07 2.603e+07 2.60306e+07 2.60309e+07 2.6031e+07
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
2.6381e+07 2.63833e+07 2.63567e+07 2.63588e+07 2.63853e+07 2.63608e+07 2.63873e+07 2.63627e+07 2.63892e+07 2.63646e+07 2.63911e+07 2.63665e+07
2.63929e+07 2.63683e+07 2.63948e+07 2.63702e+07 2.63966e+07 2.6372e+07 2.63984e+07 2.63738e+07 2.64002e+07 2.63756e+07 2.6402e+07 2.63774e+07
2.64038e+07 2.63792e+07 2.64057e+07 2.6381e+07 2.64075e+07 2.63829e+07 2.64093e+07 2.63847e+07 2.64112e+07 2.63865e+07 2.6413e+07 2.63884e+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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
1003.43 1003.43 1003.42 1003.42 1003.43 1003.42 1003.43 1003.42 1003.43 1003.42 1003.43 1003.42
1003.43 1003.42 1003.43 1003.42 1003.43 1003.42 1003.43 1003.42 1003.44 1003.43 1003.44 1003.43
1003.44 1003.43 1003.44 1003.43 1003.44 1003.43 1003.44 1003.43 1003.44 1003.43 1003.44 1003.43
@@ -231,7 +231,7 @@
1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.28 1003.28 1003.28 1003.28
1003.28 1003.28 1003.28 1003.28 1003.28
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
269.697 269.697 269.448 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448
269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448
269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448 269.697 269.448
@@ -269,7 +269,7 @@
265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717 265.717
265.717 265.717 265.717 265.717 265.717
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
1523.32 1523.32 1523.33 1523.33 1523.32 1523.33 1523.32 1523.33 1523.32 1523.33 1523.32 1523.33
1523.32 1523.33 1523.32 1523.33 1523.32 1523.33 1523.32 1523.32 1523.32 1523.32 1523.31 1523.32
1523.31 1523.32 1523.31 1523.32 1523.31 1523.32 1523.31 1523.32 1523.31 1523.32 1523.31 1523.32
@@ -307,7 +307,7 @@
1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46
1523.46 1523.46 1523.45 1523.45 1523.45
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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
@@ -345,7 +345,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="X_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
0.996198 0.996198 0.996202 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202
0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202
0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202 0.996198 0.996202
@@ -383,7 +383,7 @@
0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254 0.996254
0.996254 0.996254 0.996254 0.996254 0.996254
</DataArray>
- <DataArray type="Float32" Name="X_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
0.00380198 0.00380198 0.00379848 0.00379847 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848
0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848
0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848 0.00380198 0.00379848
@@ -421,7 +421,7 @@
0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594 0.00374594
0.00374594 0.00374594 0.00374594 0.00374594 0.00374594
</DataArray>
- <DataArray type="Float32" Name="X_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
0.000179521 0.000179505 0.000179687 0.000179673 0.000179491 0.000179659 0.000179478 0.000179646 0.000179465 0.000179633 0.000179452 0.00017962
0.00017944 0.000179607 0.000179427 0.000179595 0.000179415 0.000179583 0.000179403 0.00017957 0.00017939 0.000179558 0.000179378 0.000179546
0.000179366 0.000179533 0.000179353 0.000179521 0.000179341 0.000179508 0.000179328 0.000179496 0.000179316 0.000179484 0.000179303 0.000179471
@@ -459,7 +459,7 @@
0.000182136 0.000182125 0.000182114 0.000182103 0.000182092 0.000182082 0.000182071 0.000182061 0.000182052 0.000182043 0.000182035 0.000182028
0.000182022 0.000182017 0.000182014 0.000182011 0.000182011
</DataArray>
- <DataArray type="Float32" Name="X_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
0.94974 0.949657 0.949739 0.949664 0.949584 0.949592 0.949514 0.949522 0.949445 0.949454 0.949378 0.949387
0.949312 0.949321 0.949246 0.949255 0.94918 0.949189 0.949115 0.949124 0.94905 0.949059 0.948985 0.948994
0.94892 0.948929 0.948854 0.948863 0.948789 0.948798 0.948723 0.948732 0.948657 0.948666 0.948591 0.948599
@@ -497,7 +497,7 @@
0.94932 0.949263 0.949205 0.949148 0.949092 0.949037 0.948984 0.948933 0.948884 0.948838 0.948796 0.948759
0.948727 0.948702 0.948683 0.948671 0.948667
</DataArray>
- <DataArray type="Float32" Name="x_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
0.997552 0.997552 0.997554 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554
0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554
0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554 0.997552 0.997554
@@ -535,7 +535,7 @@
0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588 0.997588
0.997588 0.997588 0.997588 0.997588 0.997588
</DataArray>
- <DataArray type="Float32" Name="x_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
0.00244834 0.00244834 0.00244609 0.00244608 0.00244834 0.00244608 0.00244834 0.00244608 0.00244834 0.00244608 0.00244834 0.00244609
0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609
0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609 0.00244834 0.00244609
@@ -573,7 +573,7 @@
0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221 0.00241221
0.00241221 0.00241221 0.00241221 0.00241221 0.00241221
</DataArray>
- <DataArray type="Float32" Name="x_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
0.000279123 0.000279099 0.000279381 0.000279359 0.000279078 0.000279338 0.000279057 0.000279318 0.000279037 0.000279298 0.000279017 0.000279278
0.000278997 0.000279258 0.000278978 0.000279239 0.000278959 0.00027922 0.00027894 0.0002792 0.00027892 0.000279181 0.000278901 0.000279162
0.000278882 0.000279143 0.000278863 0.000279124 0.000278844 0.000279104 0.000278824 0.000279085 0.000278805 0.000279066 0.000278785 0.000279046
@@ -611,7 +611,7 @@
0.000283189 0.000283172 0.000283155 0.000283138 0.000283121 0.000283105 0.000283089 0.000283073 0.000283059 0.000283045 0.000283033 0.000283022
0.000283012 0.000283004 0.000282999 0.000282995 0.000282994
</DataArray>
- <DataArray type="Float32" Name="x_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
0.94964 0.949557 0.94964 0.949564 0.949484 0.949492 0.949414 0.949423 0.949346 0.949354 0.949279 0.949287
0.949212 0.949221 0.949146 0.949155 0.949081 0.94909 0.949016 0.949024 0.94895 0.948959 0.948885 0.948894
0.94882 0.948829 0.948755 0.948764 0.948689 0.948698 0.948624 0.948632 0.948557 0.948566 0.948491 0.9485
diff --git a/test/references/injectioncc-reference.vtu b/test/references/injectioncc-reference.vtu
index 334c78fed9649e3045853154a670b5fb19a32ff7..83c5ebf22f6b1bdec0ee00c6b7ff5d93ef488fac 100644
--- a/test/references/injectioncc-reference.vtu
+++ b/test/references/injectioncc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="384" NumberOfPoints="425">
- <CellData Scalars="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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
@@ -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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
2.638e+07 2.63821e+07 2.6384e+07 2.63859e+07 2.63878e+07 2.63897e+07 2.63915e+07 2.63933e+07 2.63951e+07 2.63969e+07 2.63987e+07 2.64005e+07
2.64023e+07 2.64041e+07 2.64059e+07 2.64077e+07 2.64095e+07 2.64113e+07 2.64131e+07 2.64148e+07 2.64164e+07 2.64179e+07 2.64191e+07 2.64198e+07
2.63556e+07 2.63575e+07 2.63595e+07 2.63614e+07 2.63632e+07 2.63651e+07 2.63669e+07 2.63687e+07 2.63705e+07 2.63723e+07 2.63741e+07 2.63759e+07
@@ -105,7 +105,7 @@
2.60144e+07 2.60157e+07 2.6017e+07 2.60185e+07 2.60199e+07 2.60215e+07 2.6023e+07 2.60246e+07 2.60262e+07 2.60277e+07 2.60293e+07 2.60309e+07
2.60324e+07 2.60339e+07 2.60353e+07 2.60367e+07 2.60381e+07 2.60393e+07 2.60404e+07 2.60414e+07 2.60422e+07 2.60428e+07 2.60433e+07 2.60435e+07
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
2.637e+07 2.63721e+07 2.6374e+07 2.63759e+07 2.63778e+07 2.63797e+07 2.63815e+07 2.63833e+07 2.63851e+07 2.63869e+07 2.63887e+07 2.63905e+07
2.63923e+07 2.63941e+07 2.63959e+07 2.63977e+07 2.63995e+07 2.64013e+07 2.64031e+07 2.64048e+07 2.64064e+07 2.64079e+07 2.64091e+07 2.64098e+07
2.63456e+07 2.63475e+07 2.63495e+07 2.63514e+07 2.63532e+07 2.63551e+07 2.63569e+07 2.63587e+07 2.63605e+07 2.63623e+07 2.63641e+07 2.63659e+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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
1003.42 1003.42 1003.42 1003.43 1003.43 1003.43 1003.43 1003.43 1003.43 1003.43 1003.43 1003.43
1003.43 1003.43 1003.43 1003.43 1003.44 1003.44 1003.44 1003.44 1003.44 1003.44 1003.44 1003.44
1003.41 1003.41 1003.41 1003.42 1003.42 1003.42 1003.42 1003.42 1003.42 1003.42 1003.42 1003.42
@@ -207,7 +207,7 @@
1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.27 1003.28 1003.28 1003.28 1003.28 1003.28
1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28 1003.28
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
269.572 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573
269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.573 269.572 269.572 269.572 269.571
269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324 269.324
@@ -241,7 +241,7 @@
265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842
265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842 265.842
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
1523.33 1523.33 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32 1523.32
1523.32 1523.32 1523.32 1523.32 1523.32 1523.31 1523.31 1523.31 1523.31 1523.31 1523.31 1523.31
1523.34 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33 1523.33
@@ -275,7 +275,7 @@
1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.46 1523.45
1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45 1523.45
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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
@@ -309,7 +309,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="X_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962
0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962 0.9962
0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203 0.996203
@@ -343,7 +343,7 @@
0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252
0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252 0.996252
</DataArray>
- <DataArray type="Float32" Name="X_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023
0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380023 0.00380022 0.00380022 0.00380021
0.00379672 0.00379672 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673 0.00379673
@@ -377,7 +377,7 @@
0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477
0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477 0.0037477
</DataArray>
- <DataArray type="Float32" Name="X_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
0.000179596 0.000179582 0.000179568 0.000179555 0.000179543 0.00017953 0.000179518 0.000179505 0.000179493 0.000179481 0.000179469 0.000179456
0.000179444 0.000179432 0.00017942 0.000179407 0.000179395 0.000179383 0.000179371 0.000179359 0.000179348 0.000179338 0.00017933 0.000179325
0.000179763 0.000179749 0.000179736 0.000179723 0.000179711 0.000179698 0.000179686 0.000179673 0.000179661 0.000179649 0.000179636 0.000179624
@@ -411,7 +411,7 @@
0.000182126 0.000182117 0.000182108 0.000182098 0.000182087 0.000182077 0.000182066 0.000182055 0.000182044 0.000182033 0.000182022 0.000182011
0.000182 0.00018199 0.00018198 0.00018197 0.000181961 0.000181952 0.000181944 0.000181938 0.000181932 0.000181927 0.000181924 0.000181923
</DataArray>
- <DataArray type="Float32" Name="X_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
0.949698 0.949624 0.949554 0.949485 0.949418 0.949351 0.949285 0.94922 0.949155 0.94909 0.949026 0.948961
0.948897 0.948832 0.948767 0.948703 0.948638 0.948574 0.94851 0.948447 0.948388 0.948333 0.948289 0.948263
0.949701 0.94963 0.949561 0.949493 0.949426 0.94936 0.949294 0.949229 0.949164 0.949099 0.949035 0.94897
@@ -445,7 +445,7 @@
0.949716 0.94967 0.94962 0.949568 0.949513 0.949458 0.949402 0.949345 0.949287 0.949229 0.949172 0.949115
0.949059 0.949005 0.948952 0.948901 0.948853 0.948808 0.948768 0.948732 0.948702 0.948679 0.948663 0.948655
</DataArray>
- <DataArray type="Float32" Name="x_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553
0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553 0.997553
0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555 0.997555
@@ -479,7 +479,7 @@
0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587
0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587 0.997587
</DataArray>
- <DataArray type="Float32" Name="x_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244722 0.00244722 0.00244722
0.00244722 0.00244722 0.00244722 0.00244722 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.00244721 0.0024472
0.00244495 0.00244495 0.00244495 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496 0.00244496
@@ -513,7 +513,7 @@
0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334
0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334 0.00241334
</DataArray>
- <DataArray type="Float32" Name="x_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
0.00027924 0.000279218 0.000279198 0.000279177 0.000279158 0.000279138 0.000279119 0.000279099 0.00027908 0.000279061 0.000279042 0.000279023
0.000279004 0.000278985 0.000278966 0.000278947 0.000278928 0.000278909 0.000278891 0.000278872 0.000278855 0.000278839 0.000278827 0.000278819
0.0002795 0.000279479 0.000279458 0.000279438 0.000279419 0.000279399 0.00027938 0.000279361 0.000279341 0.000279322 0.000279303 0.000279284
@@ -547,7 +547,7 @@
0.000283174 0.00028316 0.000283146 0.00028313 0.000283114 0.000283097 0.00028308 0.000283063 0.000283046 0.000283029 0.000283012 0.000282995
0.000282978 0.000282962 0.000282946 0.000282931 0.000282917 0.000282904 0.000282891 0.000282881 0.000282872 0.000282865 0.00028286 0.000282858
</DataArray>
- <DataArray type="Float32" Name="x_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
0.949598 0.949525 0.949454 0.949385 0.949318 0.949252 0.949186 0.949121 0.949056 0.948991 0.948926 0.948862
0.948797 0.948732 0.948668 0.948603 0.948539 0.948474 0.94841 0.948348 0.948288 0.948234 0.94819 0.948163
0.949601 0.94953 0.949461 0.949393 0.949326 0.94926 0.949194 0.949129 0.949064 0.949 0.948935 0.94887
diff --git a/test/references/kuevette3p3cnibox-reference.vtu b/test/references/kuevette3p3cnibox-reference.vtu
index f23c750ca277d8dc0f57f22dce535ee21f784c8f..8f6b6d9cd833389f5d926e6c18f131a214ca296e 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="Sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/kuevette3p3cnicc-reference.vtu b/test/references/kuevette3p3cnicc-reference.vtu
index 464fe84c615d319f27e751ae0c5f11558dae7f4b..4df4bb9509852e13fb3e22dbb4ae3856aa6c2257 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="Sg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_g" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pg" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_g" 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="rhow" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhon" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="rhog" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_g" 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
diff --git a/test/references/lensbox-reference.vtu b/test/references/lensbox-reference.vtu
index 87758fe97756131a60322dfe55f793dfb2b64422..6dcb24b845d02ee3373e721b93214d9fd6264b73 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 6b1e825acc30f1ccd00feea4def0bc8a0d7dadec..5aa498b53dc9addfac59896b8ad62f887cffe454 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 9add4f5d5cc758e9f61a6eb10fc1513d9653227b..56798c2d2a2740ac9f01c7ff31d99f941d1d95a4 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 9e52e4c687ba38a5c4450cd66713a3f7b2376bfa..c553bc1e7407689d684719739f5b76e728c68fc5 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 3d94aba1947f2767c45cb73c7fbd413f9dd162b1..9f7a25a444e94a66886d538a95408627f35f8f9b 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 5e20fe76e48a50e98a1b2d9639571bd93bcbf4d5..bd13334661d7a58f51809333241581b64639533e 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 883905fa674a645e171d1fd5b657ade58bbb11cd..9cf2f03499b35742eac14c50b04505dc8d7b167b 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 e7cee9976c58a74041e2c9dabe94719060290632..50828b1f368a218fa74dc8c6bddacb5eb381f1e6 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 3c0a46a226d152c725d4dc2117b4de9d1a0dd928..9ba7e63706cc3cf9d59a774bbfa7f3da6b1be4fd 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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
@@ -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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/mpnc_2p2c_box-reference.vtu b/test/references/mpnc_2p2c_box-reference.vtu
index ff3be12f3c33fd97f621de3baadba64227e1a191..ed5058ffe7500c8023e25e37cb5c01f913aca026 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_n" 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_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_n" 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_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" 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_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" 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 774180bb16d4df65ca9a0003d28a81c5b6b30fbc..63aa164b178c521bf5a14cad9453b75551d94db6 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_n" 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_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_n" 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_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" 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_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" 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 8083bc2667fa784d6e212cc8dd024b7bb76cea3b..d348c78d9a02e006b8e444be8c93f63bddcd1bf5 100644
--- a/test/references/obstaclebox-reference.vtu
+++ b/test/references/obstaclebox-reference.vtu
@@ -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_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" 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_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" 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 d866cc6b5025f27f09437f5a446178390632ba0d..6003008ca475dc408d363df5651509c1a6f3dc2c 100644
--- a/test/references/obstaclecc-reference.vtu
+++ b/test/references/obstaclecc-reference.vtu
@@ -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_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" 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_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" 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 0a407d79f479d68619ce64f7e152889131973bd4..0fba0e9e0ab2e437223eda8c5108ec7c6d13539b 100644
--- a/test/references/outflowbox-reference.vtu
+++ b/test/references/outflowbox-reference.vtu
@@ -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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" 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 ca2cf0fb0a74084459c25848e8fc633715aab808..29f04639dd4479dc7d1bf0d2ad0646d7d0e9285c 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="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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
diff --git a/test/references/richardslensbox-reference-parallel.vtu b/test/references/richardslensbox-reference-parallel.vtu
index d87fc45bff0c88a0c851f83e03a2e5feeaa04bc0..44574f7de93f8aee23b11ec4d357ecf65563705c 100644
--- a/test/references/richardslensbox-reference-parallel.vtu
+++ b/test/references/richardslensbox-reference-parallel.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="192" NumberOfPoints="221">
- <PointData Scalars="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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
@@ -24,7 +24,7 @@
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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_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
@@ -45,7 +45,7 @@
0.385122 0.363907 0.385122 0.771677 1 1 1 1 1 1 0.999997 0.919316
0.286062 0.066621 0.0630491 0.066621 0.286062
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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 +66,7 @@
99733.5 99739.1 99733.5 99586.6 97470.4 97470.4 97470.4 97470.4 97470.4 97470.4 97470.5 99318.4
99759.6 99835.6 99837.6 99835.6 99759.6
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/richardslensbox-reference.vtu b/test/references/richardslensbox-reference.vtu
index 09a0681c86ef0f41111ede43157baf9dc927c087..0b74a7c245ce9a8f3244f63ef6c1a260c88b7fa8 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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
@@ -41,7 +41,7 @@
0.713938 0.933379 0.936951 0.933379 0.713938 0.0806844 3.42956e-06 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
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_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
@@ -79,7 +79,7 @@
0.286062 0.066621 0.0630491 0.066621 0.286062 0.919316 0.999997 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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.6 99835.6 99837.6 99835.6 99759.6 99318.4 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/richardslenscc-reference-parallel.vtu b/test/references/richardslenscc-reference-parallel.vtu
index e41093ec1eebeff455f35fe348a1625599b00496..e9fc09f28a3329ee09848e5f157458f73151a1c7 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_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
@@ -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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/richardslenscc-reference.vtu b/test/references/richardslenscc-reference.vtu
index d4c9077382a7eb62456319c9668f13b60600eadf..4c88cf188052d9e7f431dc89f0978a3d10aaa771 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <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
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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_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
@@ -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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/richardsniconductionbox-reference.vtu b/test/references/richardsniconductionbox-reference.vtu
index 7b46a8ddad22780fa13068aad97bee4f01aaab88..49b8b1c5d0b92936d5fcad5963e1dcde6a040d9d 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="Sn" Vectors="velocity">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n" Vectors="velocity">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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
diff --git a/test/references/richardsniconductioncc-reference.vtu b/test/references/richardsniconductioncc-reference.vtu
index 937bdfe5998d2078620f9187fe309eb0705866b9..fd5e45f7ae861445add988291b9a75ca0ce5715a 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="Sn" Vectors="velocity">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n" Vectors="velocity">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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
diff --git a/test/references/richardsniconvectionbox-reference.vtu b/test/references/richardsniconvectionbox-reference.vtu
index 3c22cab033424c91ff5611d63b344375d7cc8d02..ce88f5894c3559c79578afc782317092265995c0 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="Sn" Vectors="velocity">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n" Vectors="velocity">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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
diff --git a/test/references/richardsniconvectioncc-reference.vtu b/test/references/richardsniconvectioncc-reference.vtu
index 624dc10b51617dd05ba4462632dd442bcd952288..f37040fdc62ac0154924d815607a402ebd59e9ac 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="Sn" Vectors="velocity">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n" Vectors="velocity">
+ <DataArray type="Float32" Name="S_n" 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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
diff --git a/test/references/richardswelltracerbox-reference.vtu b/test/references/richardswelltracerbox-reference.vtu
index c06ebde6acc1afacd5f5d77b30f71c128210f774..1e23f144bbb024d2ea57c20c1863a9be9fb4da07 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="Sw" Vectors="velocity_SimpleH2O (m/s)">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w" Vectors="velocity_SimpleH2O (m/s)">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
@@ -1199,7 +1199,7 @@
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">
0 4.40022e-34 0 1.16839e-33 3.8932e-32 1.22037e-31 2.63812e-30 1.00452e-29 1.31911e-28 6.24494e-28 4.53834e-27 2.63418e-26
1.03659e-25 6.23889e-25 1.56903e-24 8.85024e-24 1.69161e-23 8.66094e-23 1.4134e-22 6.57456e-22 1.00924e-21 4.35416e-21 9.59529e-21 3.87121e-20
4.66686e-19 2.30597e-18 2.46347e-17 1.99321e-16 5.32236e-17 3.79027e-16 7.05029e-17 4.6906e-16 7.61886e-17 4.95173e-16 7.77263e-17 4.97768e-16
diff --git a/test/references/richardswelltracercc-reference.vtu b/test/references/richardswelltracercc-reference.vtu
index 7d7fd4d0d6629fa8af00aca7cea7e13a5918ec02..8168013b101ffa0057453c0534397cd49fcec157 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="Sw" Vectors="velocity_H2O (m/s)">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w" Vectors="velocity_H2O (m/s)">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
@@ -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^H2O_D2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^D2O_H2O" 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
diff --git a/test/references/rosi2c-soil-reference.vtu b/test/references/rosi2c-soil-reference.vtu
index 09420c431b2cc7d487d167965fa269b0bc0ffa33..ba44d9c362c81fe171dcf76e9f0dd8242b2217e6 100644
--- a/test/references/rosi2c-soil-reference.vtu
+++ b/test/references/rosi2c-soil-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="8000" NumberOfPoints="9261">
- <CellData Scalars="Sw" Vectors="velocity_H2O (m/s)">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w" Vectors="velocity_H2O (m/s)">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.199094 0.19905 0.198967 0.198854 0.198725 0.198597 0.19849 0.198421 0.198399 0.198426 0.198496 0.198602
0.198735 0.198882 0.199033 0.199176 0.199301 0.199402 0.199472 0.199508 0.199058 0.19901 0.198919 0.198794
0.198649 0.198504 0.198384 0.198309 0.198288 0.19832 0.198398 0.198514 0.198658 0.198818 0.19898 0.199133
@@ -672,7 +672,7 @@
0.198205 0.198143 0.198024 0.197855 0.197648 0.197419 0.197189 0.19698 0.196815 0.196715 0.196694 0.196758
0.196896 0.19709 0.197316 0.197547 0.19776 0.197936 0.198061 0.198126
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.800906 0.80095 0.801033 0.801146 0.801275 0.801403 0.80151 0.801579 0.801601 0.801574 0.801504 0.801398
0.801265 0.801118 0.800967 0.800824 0.800699 0.800598 0.800528 0.800492 0.800942 0.80099 0.801081 0.801206
0.801351 0.801496 0.801616 0.801691 0.801712 0.80168 0.801602 0.801486 0.801342 0.801182 0.80102 0.800867
@@ -1341,7 +1341,7 @@
0.801795 0.801857 0.801976 0.802145 0.802352 0.802581 0.802811 0.80302 0.803185 0.803285 0.803306 0.803242
0.803104 0.80291 0.802684 0.802453 0.80224 0.802064 0.801939 0.801874
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
-36994.6 -37075.1 -37228.1 -37437.3 -37677.6 -37915.8 -38115.2 -38243.9 -38284.1 -38234.2 -38102.9 -37905.1
-37659 -37385.7 -37107 -36843.4 -36612.3 -36427.6 -36299.2 -36233.4 -37060.5 -37148.7 -37317.2 -37549.6
-37819.1 -38088.3 -38313.1 -38454.3 -38493.6 -38433.4 -38286.6 -38069.6 -37801.5 -37505.2 -37204.4 -36921.2
@@ -2010,7 +2010,7 @@
-38649.1 -38765 -38989.6 -39308.8 -39700.8 -40135.9 -40576.3 -40978.4 -41296.8 -41490.1 -41529.6 -41407.3
-41140.3 -40766.1 -40333.5 -39892.6 -39487.8 -39154.5 -38918.6 -38796.5
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/saltflushbox2pncmin-reference.vtu b/test/references/saltflushbox2pncmin-reference.vtu
index fbebc4d66127bcdb9d8e4edb74ffca493688ded4..d39e5de0d1f26c1e47a19765e8f25923d73f1790 100644
--- a/test/references/saltflushbox2pncmin-reference.vtu
+++ b/test/references/saltflushbox2pncmin-reference.vtu
@@ -47,7 +47,7 @@
499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 548.81 616.637 958.196 1140.83
1142.68 1148.56 7500
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.95 0.969886 0.95 0.954755 0.979775 0.965969 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 0.985626 0.952206 0.937125 0.911718 0.911659 0.87214 0.837018 0.725414
@@ -69,7 +69,7 @@
1 1 1 1 1 1 1 1 0.863197 0.725325 0.41756 0.353477
0.352981 0.351419 0.2
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
1.29995e+07 1.29991e+07 1.29995e+07 1.29901e+07 1.2982e+07 1.29727e+07 1.29608e+07 1.29512e+07 1.28844e+07 1.28761e+07 1.26579e+07 1.26511e+07
1.23827e+07 1.23747e+07 1.20968e+07 1.20881e+07 1.18057e+07 1.17967e+07 1.15124e+07 1.15031e+07 1.13994e+07 1.139e+07 1.13562e+07 1.13467e+07
1.13127e+07 1.13032e+07 1.12687e+07 1.12592e+07 1.12225e+07 1.12142e+07 1.11716e+07 1.11616e+07 1.11084e+07 1.10989e+07 1.10457e+07 1.10323e+07
@@ -91,7 +91,7 @@
1.23324e+07 1.20256e+07 1.17228e+07 1.14216e+07 1.13062e+07 1.12623e+07 1.12186e+07 1.11742e+07 1.11355e+07 1.10737e+07 1.10273e+07 1.1014e+07
1.10071e+07 1.10019e+07 1.09925e+07
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
998.008 998.513 998.008 998.158 999.166 998.672 978.643 977.993 940.73 939.397 942.376 941.002
944.473 943.133 947.132 945.9 950.413 949.346 954.296 953.427 962.545 962.078 970.408 970.364
976.891 977.251 981.644 982.38 984.431 984.428 984.41 984.406 984.384 984.38 984.358 984.352
@@ -113,7 +113,7 @@
938.86 940.881 943.846 947.776 957.228 967.24 976.406 983.809 984.395 984.369 984.35 984.345
984.342 984.34 947.795
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
4371.14 4548.01 4371.14 4377.89 4465.47 4372.47 3162.67 3171.86 2955.17 2955.39 2954.9 2955.12
2954.57 2954.77 2954.17 2954.34 2953.7 2953.85 2953.2 2953.3 2952.28 2952.33 2951.58 2951.58
2951.11 2951.09 2950.83 2950.8 2758.05 2317.85 2137.48 1857.67 1857.06 1477.67 1192.18 551.751
@@ -135,7 +135,7 @@
2955.45 2955.1 2954.63 2954.04 2952.84 2951.84 2951.14 2950.72 1400.58 551.377 16.22 4.01709
3.96538 3.8059 0
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.05 0.0301141 0.05 0.045245 0.0202245 0.034031 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0.0143737 0.0477939 0.0628746 0.0882824 0.0883408 0.12786 0.162982 0.274586
@@ -157,7 +157,7 @@
0 0 0 0 0 0 0 0 0.136803 0.274675 0.58244 0.646523
0.647019 0.648581 0.8
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
1.3e+07 1.29996e+07 1.3e+07 1.29907e+07 1.29825e+07 1.29732e+07 1.29613e+07 1.29517e+07 1.28849e+07 1.28766e+07 1.26584e+07 1.26516e+07
1.23832e+07 1.23752e+07 1.20973e+07 1.20886e+07 1.18062e+07 1.17972e+07 1.15129e+07 1.15036e+07 1.13999e+07 1.13905e+07 1.13567e+07 1.13472e+07
1.13132e+07 1.13037e+07 1.12692e+07 1.12597e+07 1.1223e+07 1.12148e+07 1.11722e+07 1.11621e+07 1.11089e+07 1.10995e+07 1.10463e+07 1.10329e+07
@@ -179,7 +179,7 @@
1.23329e+07 1.20261e+07 1.17233e+07 1.14221e+07 1.13067e+07 1.12628e+07 1.12191e+07 1.11747e+07 1.1136e+07 1.10744e+07 1.10282e+07 1.10151e+07
1.10082e+07 1.1003e+07 1.1e+07
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
107.068 107.067 107.068 106.991 106.928 106.848 -3748.69 -3896.38 -7923.7 -8163.91 -7611.86 -7859.67
-7215.38 -7456.92 -6716.41 -6938.37 -6104.36 -6296.76 -5383.23 -5539.76 -3883.4 -3967.33 -2457.16 -2464.45
-1280.13 -1214.26 -415.865 -281.921 92.3761 92.3074 91.9526 91.8688 91.4257 91.3473 90.9038 90.7924
@@ -201,7 +201,7 @@
-8226 -7841.3 -7286.09 -6556.22 -4839.44 -3024.55 -1361.67 -17.2639 91.6515 91.1379 90.7536 90.6447
90.5871 90.5435 90.6021
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
17.6984 3.76007 17.6984 13.0704 1.08947 5.47796 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0.371135 15.5633 35.6382 98.3864 98.6043 294.253 598.092 2657.9
@@ -223,7 +223,7 @@
0 0 0 0 0 0 0 0 358.725 2659.81 19583.5 25110.6
25156.2 25298.2 39947.1
</DataArray>
- <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
0.998841 0.996945 0.998841 0.998272 0.994171 0.99625 0.990231 0.992657 0.9876 0.990186 0.984242 0.98691
0.979974 0.982574 0.974602 0.976992 0.968013 0.970084 0.96025 0.961935 0.944103 0.945007 0.928749 0.928828
0.916078 0.915369 0.906774 0.905332 0.901302 0.901303 0.901307 0.901308 0.901313 0.901313 0.901318 0.90132
@@ -245,7 +245,7 @@
0.990854 0.986712 0.980735 0.972878 0.954396 0.934858 0.916956 0.902483 0.90131 0.901316 0.90132 0.901321
0.901322 0.901322 0.828569
</DataArray>
- <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
0.0011285 0.00112854 0.0011285 0.00112768 0.00112711 0.0011262 -0.0403793 -0.0419692 -0.085324 -0.08791 -0.0819669 -0.0846347
-0.0776986 -0.0802989 -0.0723269 -0.0747165 -0.0657379 -0.0678093 -0.0579747 -0.0596598 -0.0418283 -0.0427318 -0.0264741 -0.0265526
-0.0138029 -0.0130938 -0.00449867 -0.00305669 0.00097279 0.00097205 0.000968231 0.000967329 0.000962558 0.000961714 0.00095694 0.000955741
@@ -267,7 +267,7 @@
-0.0885785 -0.084437 -0.0784598 -0.0706025 -0.0521205 -0.0325824 -0.0146807 -0.000207536 0.000964989 0.00095946 0.000955323 0.00095415
0.00095353 0.000953061 0.000955504
</DataArray>
- <DataArray type="Float32" Name="x_liquid^NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^NaCl_liquid" NumberOfComponents="1" format="ascii">
3.08286e-05 0.00192665 3.08286e-05 0.000600458 0.00470226 0.00262359 0.0501478 0.0493123 0.0977244 0.0977244 0.0977248 0.0977248
0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
@@ -289,7 +289,7 @@
0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
0.0977248 0.0977248 0.170476
</DataArray>
- <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
0.0319348 0.0318752 0.0319348 0.0319396 0.0318283 0.0319178 0.0317542 0.0318556 0.0318575 0.0319615 0.0323174 0.0324222
0.0328922 0.033001 0.0334851 0.0335914 0.0340786 0.0341778 0.0346667 0.0347556 0.0344216 0.034483 0.0339905 0.0340218
0.0336557 0.0336579 0.0334439 0.0334191 0.033379 0.0334036 0.0335311 0.0335613 0.0337222 0.0337509 0.0339137 0.0339548
@@ -311,7 +311,7 @@
0.0333932 0.0341019 0.0347708 0.0354017 0.0350838 0.0344994 0.0339705 0.0335671 0.03364 0.0338276 0.0339692 0.0340096
0.034031 0.0340472 0.0313075
</DataArray>
- <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
0.968065 0.968125 0.968065 0.96806 0.968172 0.968082 -34.7422 -36.137 -73.8477 -76.1348 -72.2117 -74.6015
-69.9724 -72.3611 -66.6743 -68.9268 -62.0941 -64.0999 -56.1566 -57.8356 -40.9181 -41.8366 -25.9965 -26.0954
-13.606 -12.9178 -4.4518 -3.02742 0.966621 0.966596 0.966469 0.966439 0.966278 0.966249 0.966086 0.966045
@@ -333,7 +333,7 @@
-80.0959 -78.2987 -74.6354 -68.9319 -51.4068 -32.2614 -14.5926 -0.207111 0.96636 0.966172 0.966031 0.96599
0.965969 0.965953 0.968693
</DataArray>
- <DataArray type="Float32" Name="x_gas^NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^NaCl_gas" NumberOfComponents="1" format="ascii">
2.37143e-12 1.48209e-10 2.37143e-12 4.62223e-11 3.62199e-10 2.02231e-10 3.86905e-09 3.80741e-09 7.58442e-09 7.5893e-09 7.72018e-09 7.72427e-09
7.89172e-09 7.89685e-09 8.07824e-09 8.08407e-09 8.27738e-09 8.28374e-09 8.4883e-09 8.49517e-09 8.57243e-09 8.57952e-09 8.60503e-09 8.61222e-09
8.6381e-09 8.64538e-09 8.67182e-09 8.67919e-09 8.70755e-09 8.71395e-09 8.74717e-09 8.75505e-09 8.79698e-09 8.80444e-09 8.84687e-09 8.85759e-09
@@ -355,7 +355,7 @@
7.92393e-09 8.12606e-09 8.33597e-09 8.55576e-09 8.64312e-09 8.67678e-09 8.71056e-09 8.74515e-09 8.77556e-09 8.82442e-09 8.86134e-09 8.87186e-09
8.87743e-09 8.88165e-09 1.54978e-08
</DataArray>
- <DataArray type="Float32" Name="m_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^H2O_liquid" NumberOfComponents="1" format="ascii">
51477.4 51405.7 51477.4 51455.9 51296.2 51378.1 51095.5 51227.9 50126.6 50254 49956.7 50088.2
49740.8 49869 49470.3 49588.1 49139.4 49241.6 48750.2 48833.4 47949.2 47993.8 47187.5 47191.2
46557.9 46522.5 46095 46023.1 45822.2 45822.1 45821.5 45821.4 45820.7 45820.6 45819.9 45819.8
@@ -377,7 +377,7 @@
50276.6 50066.6 49766 49372.5 48456.9 47488.7 46599.8 45880 45821.1 45820.3 45819.7 45819.5
45819.4 45819.4 40557.1
</DataArray>
- <DataArray type="Float32" Name="m_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^Air_liquid" NumberOfComponents="1" format="ascii">
58.1597 58.191 58.1597 58.1264 58.1553 58.0796 -2083.56 -2165.9 -4330.71 -4461.62 -4160.35 -4295.42
-3943.77 -4075.45 -3671.28 -3792.3 -3337.06 -3442 -2943.28 -3028.68 -2124.38 -2170.21 -1345.09 -1349.07
-701.506 -665.475 -228.685 -155.389 49.4566 49.4189 49.2239 49.1778 48.9343 48.8913 48.6476 48.5864
@@ -399,7 +399,7 @@
-4494.53 -4284.4 -3981.33 -3583 -2646.28 -1655.11 -746.074 -10.5506 49.0584 48.7762 48.565 48.5052
48.4735 48.4496 46.7704
</DataArray>
- <DataArray type="Float32" Name="m_liquid^NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^NaCl_liquid" NumberOfComponents="1" format="ascii">
1.58882 99.3445 1.58882 30.9506 242.622 135.302 2587.61 2544.85 4960.1 4959.72 4960.17 4959.78
4960.25 4959.87 4960.46 4960.11 4960.82 4960.52 4961.32 4961.08 4963.25 4963.12 4965.16 4965.13
4966.67 4966.75 4967.74 4967.9 4968.33 4968.31 4968.23 4968.21 4968.11 4968.09 4967.99 4967.97
@@ -443,7 +443,7 @@
1 1 1 1 1 1 1 1 3 3 3 3
3 3 3
</DataArray>
- <DataArray type="Float32" Name="precipitateVolumeFraction_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="precipitateVolumeFraction^NaCl" NumberOfComponents="1" format="ascii">
0 8.75474e-12 0 8.75474e-12 9.46029e-11 9.55498e-11 0.000161565 0.00017243 0.047506 0.0474897 0.0524814 0.052481
0.0524924 0.0524906 0.0525021 0.0524986 0.0525095 0.0525073 0.0525176 0.0525135 0.00461579 0.00459889 0.00463046 0.00461312
0.00463986 0.00462356 0.00464531 0.00463193 0.00466322 0.00468069 0.00470538 0.0047054 0.00470641 0.00470643 0.0047079 0.00470793
diff --git a/test/references/saltflushtpfa2pncmin-reference.vtu b/test/references/saltflushtpfa2pncmin-reference.vtu
index bf7606d5b298e8b0d972f85895cdbc2babb75584..8e947f34a0b31a380772f3deeae6f8ca9c3bc524 100644
--- a/test/references/saltflushtpfa2pncmin-reference.vtu
+++ b/test/references/saltflushtpfa2pncmin-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="231">
- <CellData Scalars="Sw" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w" Vectors="velocity_liquid (m/s)">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.965011 0.971902 1 1 1 1 1 1 1 1 1 1
0.987701 0.927475 0.898434 0.812309 0.459262 0.37794 0.37739 0.372943 0.953387 0.962149 1 1
1 1 1 1 1 1 1 1 0.978569 0.911874 0.871158 0.722084
@@ -22,7 +22,7 @@
0.939155 0.934241 1 1 1 1 1 1 1 1 1 1
0.943361 0.813077 0.525056 0.362679 0.360032 0.359928 0.35976 0.3568
</DataArray>
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.0349889 0.0280977 0 0 0 0 0 0 0 0 0 0
0.012299 0.0725254 0.101567 0.187691 0.540738 0.62206 0.62261 0.627057 0.0466127 0.037851 0 0
0 0 0 0 0 0 0 0 0.0214312 0.0881262 0.128842 0.277916
@@ -41,7 +41,7 @@
0.0608445 0.0657593 0 0 0 0 0 0 0 0 0 0
0.0566393 0.186923 0.474944 0.637321 0.639968 0.640072 0.64024 0.6432
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
1.30029e+07 1.29931e+07 1.29738e+07 1.28564e+07 1.26384e+07 1.24035e+07 1.21597e+07 1.1911e+07 1.16596e+07 1.14069e+07 1.12617e+07 1.12244e+07
1.11865e+07 1.115e+07 1.11001e+07 1.10466e+07 1.10155e+07 1.10111e+07 1.1007e+07 1.10021e+07 1.29973e+07 1.29848e+07 1.2966e+07 1.28508e+07
1.26333e+07 1.23964e+07 1.21515e+07 1.19022e+07 1.16505e+07 1.13975e+07 1.12522e+07 1.12149e+07 1.11772e+07 1.11409e+07 1.10907e+07 1.10357e+07
@@ -60,7 +60,7 @@
1.29725e+07 1.29336e+07 1.29008e+07 1.28363e+07 1.26364e+07 1.23642e+07 1.20997e+07 1.18395e+07 1.15815e+07 1.13246e+07 1.11776e+07 1.11405e+07
1.11046e+07 1.10715e+07 1.10278e+07 1.10146e+07 1.10098e+07 1.10058e+07 1.10023e+07 1.09995e+07
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
1.30034e+07 1.29936e+07 1.29743e+07 1.28569e+07 1.26389e+07 1.2404e+07 1.21602e+07 1.19114e+07 1.16601e+07 1.14074e+07 1.12622e+07 1.12249e+07
1.1187e+07 1.11506e+07 1.11006e+07 1.10472e+07 1.10164e+07 1.10121e+07 1.10081e+07 1.10032e+07 1.29978e+07 1.29853e+07 1.29665e+07 1.28513e+07
1.26338e+07 1.23969e+07 1.2152e+07 1.19027e+07 1.1651e+07 1.1398e+07 1.12527e+07 1.12154e+07 1.11777e+07 1.11415e+07 1.10912e+07 1.10363e+07
@@ -98,7 +98,7 @@
519.847 521.584 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687
518.374 570.803 783.907 1108.1 1117.22 1117.59 1118.17 1128.68
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
998.819 1000 942.176 944.102 946.451 949.405 953.002 957.205 961.869 966.742 974.773 980.797
984.416 984.401 984.38 984.358 984.345 984.343 984.342 984.34 998.192 998.923 951.542 940.759
943.043 946.076 949.895 954.437 959.517 964.844 973.698 980.462 984.412 984.397 984.377 984.354
@@ -117,7 +117,7 @@
997.992 998 993.792 936.389 937.42 939.334 942.425 946.748 952.134 958.219 969.306 978.81
984.382 984.369 984.35 984.345 984.343 984.341 984.34 984.339
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
107.1 107.024 -7668.2 -7312.76 -6874.28 -6325.35 -5659.31 -4883 -4022.88 -3124.15 -1660.32 -566.509
92.0766 91.7727 91.3568 90.9113 90.6549 90.6196 90.5858 90.5452 107.05 106.95 -6961.21 -7916.26
-7489.68 -6926.47 -6220.45 -5383.1 -4447.83 -3467.2 -1854.34 -626.577 91.999 91.6968 91.2784 90.8212
@@ -136,7 +136,7 @@
106.843 106.519 -1238.87 -8704.43 -8505.58 -8142.46 -7567.16 -6769.05 -5778.62 -4661.29 -2644.95 -920.917
91.3943 91.1185 90.7566 90.6496 90.6096 90.5761 90.5469 90.5236
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
4291.57 3944.96 2954.95 2954.65 2954.29 2953.87 2953.39 2952.87 2952.36 2951.89 2951.25 2950.88
2787.3 2027.72 1722.81 1017.7 32.7111 7.25832 7.16899 6.47657 4329.89 4177.94 2954.97 2955.17
2954.8 2954.33 2953.79 2953.2 2952.6 2952.06 2951.32 2950.9 2660.27 1859.3 1469.05 537.898
@@ -155,7 +155,7 @@
4123.3 3990.92 4043.67 2955.89 2955.71 2955.37 2954.86 2954.21 2953.47 2952.73 2951.66 2950.99
2210.73 1022.81 80.8292 5.07061 4.74855 4.73623 4.71639 4.37646
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
5.96404 3.03567 0 0 0 0 0 0 0 0 0 0
0.224149 54.7098 149.212 899.908 16308.2 22937.2 22985.7 23376.2 14.3073 7.58781 0 0
0 0 0 0 0 0 0 0 1.31769 97.8785 300.955 2749.14
@@ -193,7 +193,7 @@
0.11 0.11 0.109982 0.076047 0.0575331 0.0575254 0.0575123 0.0575028 0.0574952 0.0574887 0.105431 0.105429
0.105369 0.105296 0.105295 0.105294 0.105293 0.105291 0.105289 0.105282
</DataArray>
- <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
0.995716 0.99001 0.984849 0.981022 0.976302 0.970392 0.963222 0.954865 0.945605 0.93593 0.920171 0.908396
0.901306 0.901309 0.901313 0.901318 0.901321 0.901321 0.901322 0.901322 0.998163 0.995237 0.990908 0.987519
0.982927 0.976864 0.969263 0.960248 0.95018 0.939623 0.92226 0.909042 0.901307 0.90131 0.901314 0.901319
@@ -212,7 +212,7 @@
0.998841 0.998727 0.997159 0.996005 0.993863 0.989954 0.983761 0.975169 0.964506 0.952478 0.930771 0.912211
0.901313 0.901316 0.90132 0.901321 0.901321 0.901322 0.901322 0.901322
</DataArray>
- <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
0.00112892 0.00112825 -0.0825735 -0.0787469 -0.0740265 -0.068117 -0.0609467 -0.0525895 -0.0433298 -0.0336546 -0.0178958 -0.00612041
0.000969566 0.000966294 0.000961817 0.00095702 0.00095426 0.00095388 0.000953517 0.000953079 0.00112833 0.00112732 -0.0749627 -0.0852439
-0.0806516 -0.0745884 -0.0669877 -0.0579732 -0.0479047 -0.0373477 -0.0199846 -0.00676708 0.00096873 0.000965477 0.000960972 0.00095605
@@ -231,7 +231,7 @@
0.00112608 0.0011226 -0.0133607 -0.093729 -0.0915882 -0.087679 -0.0814857 -0.0728936 -0.0622312 -0.0502026 -0.0284958 -0.00993578
0.00096222 0.000959251 0.000955355 0.000954203 0.000953773 0.000953413 0.000953098 0.000952847
</DataArray>
- <DataArray type="Float32" Name="x_liquid^NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^NaCl_liquid" NumberOfComponents="1" format="ascii">
0.00315553 0.0088619 0.0977244 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.000708328 0.00363554 0.0840543 0.0977247
0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
@@ -250,7 +250,7 @@
3.26369e-05 0.000149954 0.0162021 0.097724 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248 0.0977248
</DataArray>
- <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
0.0318266 0.0316682 0.0315499 0.0317142 0.0321061 0.032516 0.032923 0.0333188 0.0337069 0.0341012 0.0339591 0.033636
0.0334864 0.0335961 0.0337474 0.0339109 0.0340058 0.0340189 0.0340314 0.0340465 0.0319187 0.0318556 0.0317631 0.0319381
0.032337 0.0327515 0.0331517 0.0335313 0.0338965 0.0342638 0.0340649 0.0336885 0.0335144 0.0336236 0.0337761 0.0339442
@@ -269,7 +269,7 @@
0.0320012 0.0320938 0.0321249 0.0322491 0.0326887 0.0332771 0.0337917 0.0342326 0.0346125 0.0349562 0.0346089 0.0340316
0.0337337 0.0338347 0.0339681 0.0340078 0.0340226 0.034035 0.0340459 0.0340546
</DataArray>
- <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
0.968173 0.968332 -70.9746 -68.3035 -65.3168 -61.2406 -55.893 -49.2358 -41.441 -32.9006 -17.7204 -6.08057
0.966514 0.966404 0.966253 0.966089 0.965994 0.965981 0.965969 0.965953 0.968081 0.968144 -64.4717 -73.971
-71.1912 -67.097 -61.4743 -54.3161 -45.8523 -36.541 -19.8054 -6.72873 0.966486 0.966376 0.966224 0.966056
@@ -288,7 +288,7 @@
0.967999 0.967906 -11.5489 -81.4263 -80.8249 -79.0788 -75.0992 -68.6569 -59.9197 -49.4345 -28.4288 -9.94541
0.966266 0.966165 0.966032 0.965992 0.965977 0.965965 0.965954 0.965945
</DataArray>
- <DataArray type="Float32" Name="x_gas^NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^NaCl_gas" NumberOfComponents="1" format="ascii">
2.42669e-10 6.82021e-10 7.53216e-09 7.60095e-09 7.73207e-09 7.87847e-09 8.03647e-09 8.20427e-09 8.38112e-09 8.5668e-09 8.67722e-09 8.70608e-09
8.73553e-09 8.76411e-09 8.80353e-09 8.84615e-09 8.87087e-09 8.87428e-09 8.87755e-09 8.88149e-09 5.44961e-11 2.79973e-10 6.48242e-09 7.60424e-09
7.73521e-09 7.88298e-09 8.04187e-09 8.21031e-09 8.38768e-09 8.57383e-09 8.68454e-09 8.71345e-09 8.74281e-09 8.77128e-09 8.811e-09 8.85482e-09
@@ -307,7 +307,7 @@
2.51575e-12 1.15937e-11 1.25585e-09 7.61283e-09 7.73329e-09 7.90356e-09 8.0763e-09 8.25378e-09 8.43762e-09 8.62904e-09 8.74253e-09 8.77161e-09
8.79997e-09 8.82628e-09 8.86105e-09 8.87138e-09 8.87524e-09 8.87849e-09 8.88132e-09 8.88358e-09
</DataArray>
- <DataArray type="Float32" Name="m_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^H2O_liquid" NumberOfComponents="1" format="ascii">
51358.1 51124.3 49992.6 49801.5 49564.3 49268 48909.1 48491.2 48028.3 47544.4 46760.2 46174.8
45821.7 45821.3 45820.6 45820 45819.6 45819.5 45819.4 45819.4 51452 51338.7 50600.9 50122
49891.3 49587.6 49207.6 48757.4 48254.6 47727.2 46863.7 46206.7 45821.6 45821.2 45820.5 45819.8
@@ -326,7 +326,7 @@
51476.7 51471.3 51544.1 50540.1 50430.8 50232.9 49922.4 49493.5 48961.9 48362.4 47284.6 46362.9
45820.7 45820.3 45819.7 45819.5 45819.5 45819.4 45819.4 45819.4
</DataArray>
- <DataArray type="Float32" Name="m_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^Air_liquid" NumberOfComponents="1" format="ascii">
58.2288 58.2632 -4191.57 -3997.58 -3758.14 -3458.39 -3094.67 -2670.67 -2200.77 -1709.62 -909.409 -311.107
49.292 49.125 48.8965 48.6517 48.5108 48.4914 48.4728 48.4505 58.1614 58.1522 -3827.98 -4326.6
-4093.71 -3786.26 -3400.83 -2943.64 -2432.82 -1897.04 -1015.5 -343.972 49.2494 49.0833 48.8534 48.6021
@@ -345,7 +345,7 @@
58.0342 57.8553 -690.628 -4756.07 -4647.38 -4449.06 -4135.11 -3699.62 -3159.09 -2549.06 -1447.63 -504.983
48.9171 48.7655 48.5667 48.5078 48.4859 48.4675 48.4515 48.4386
</DataArray>
- <DataArray type="Float32" Name="m_liquid^NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="m^NaCl_liquid" NumberOfComponents="1" format="ascii">
162.759 457.63 4960.66 4960.99 4961.24 4961.61 4962.13 4962.79 4963.54 4964.33 4966.07 4967.46
4968.26 4968.19 4968.1 4968 4967.94 4967.93 4967.92 4967.91 36.5119 187.537 4292.24 4960.06
4960.3 4960.71 4961.29 4962.05 4962.92 4963.84 4965.79 4967.36 4968.24 4968.17 4968.08 4967.98
@@ -383,7 +383,7 @@
3 3 1 1 1 1 1 1 1 1 1 1
3 3 3 3 3 3 3 3
</DataArray>
- <DataArray type="Float32" Name="precipitateVolumeFraction_NaCl" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="precipitateVolumeFraction^NaCl" NumberOfComponents="1" format="ascii">
1.75112e-11 1.15125e-10 0.00675665 0.052462 0.0524843 0.0524949 0.0525045 0.0525126 0.0525186 0.0525238 0.00462611 0.00463376
0.00465183 0.00470437 0.00470498 0.00470581 0.00470694 0.00470863 0.00471149 0.00471766 1.75112e-11 1.14988e-10 0.00110951 0.0519256
0.0524811 0.0524915 0.0525004 0.052509 0.0525155 0.0525211 0.00461146 0.00462107 0.00464866 0.00470439 0.004705 0.00470583
diff --git a/test/references/steaminjectionbox-reference.vtu b/test/references/steaminjectionbox-reference.vtu
index feca2fc2a7f2e369f1266dd2a48269993a8dfc4f..620badca7a349545ebe8cc4a27961cde19ea3774 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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 70ac918116b56e90a4386bafe509082f4d480acd..42ddf315ace161c643092bd039c93af4bbe58b37 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" 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="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" 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="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" 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="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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_1pncmin-00064_batch.vtu b/test/references/test_1pncmin-00064_batch.vtu
index fded8904a871791d0f2aeaa0af18254c147cc9f8..7b94de43b8b0340a9d615ffb34f406b756afdabf 100644
--- a/test/references/test_1pncmin-00064_batch.vtu
+++ b/test/references/test_1pncmin-00064_batch.vtu
@@ -15,16 +15,16 @@
<DataArray type="Float32" Name="delp" NumberOfComponents="1" format="ascii">
100000 100000 100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="x_N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
0.536 0.536 0.536 0.536 0.536 0.536
</DataArray>
- <DataArray type="Float32" Name="x_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
0.464 0.464 0.464 0.464 0.464 0.464
</DataArray>
- <DataArray type="Float32" Name="X_N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
0.642382 0.642382 0.642382 0.642382 0.642382 0.642382
</DataArray>
- <DataArray type="Float32" Name="X_H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
0.357618 0.357618 0.357618 0.357618 0.357618 0.357618
</DataArray>
<DataArray type="Float32" Name="precipVolFrac_CaO" NumberOfComponents="1" format="ascii">
diff --git a/test/references/test_boxrichardsevaporation-reference.vtu b/test/references/test_boxrichardsevaporation-reference.vtu
index ac8cb7b8b07f22e4a35ed3cecc40e78c942001ad..067cc9d766268599d5b6bcae44b22a443085d22a 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/test_ccrichardsevaporation-reference.vtu b/test/references/test_ccrichardsevaporation-reference.vtu
index 2047c2d055404a8b69ebfe8e2efe5498f41cfe09..be01c2a2c05a7882a37a0f3db8383486ac8da9fb 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
@@ -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^w_air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^air_w" 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_3d-reference.vtu b/test/references/test_embedded_1d3d_1p2c_richards2c_3d-reference.vtu
index ede4614fc8e716fa23a542eb5499a5eb71c44fb9..d40d07c1d68067572307dc5c59fbbf6174d798c4 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/test_embedded_1p_richards_box_3d.vtu b/test/references/test_embedded_1p_richards_box_3d.vtu
index dfa66a8b9ec69477c8b610cacd38bde1bb289ec5..b1f889ccf4bde4037f67e067f6e8d9e197f9bb08 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/test_embedded_1p_richards_tpfa_3d.vtu b/test/references/test_embedded_1p_richards_tpfa_3d.vtu
index 817cd32921c6d84bf10c7141e8e0343665dabcc1..aa42e76f7e83680ff6e2f46146d7e676861e4b99 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="Sw">
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_w">
+ <DataArray type="Float32" Name="S_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu b/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu
index 7c4f5bc0b4dfae1ccaccbeba4aa4e2379e0ec173..2f66edddb19d6e603e511f116a807be36fe58453 100644
--- a/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cdarcy2p2chorizontal_darcy-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="64" NumberOfPoints="81">
- <CellData Scalars="Sn" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.377422 0.377422 0.377422 0.377421 0.377421 0.377421 0.377421 0.377421 0.87225 0.87225 0.87225 0.87225
0.87225 0.87225 0.87225 0.87225 0.953604 0.953603 0.953602 0.953602 0.953601 0.953601 0.953601 0.9536
0.973905 0.973901 0.973896 0.973893 0.97389 0.973887 0.973885 0.973883 0.982539 0.982522 0.982509 0.982498
@@ -11,7 +11,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.622578 0.622578 0.622578 0.622579 0.622579 0.622579 0.622579 0.622579 0.12775 0.12775 0.12775 0.12775
0.12775 0.12775 0.12775 0.12775 0.0463964 0.046397 0.0463977 0.0463982 0.0463986 0.046399 0.0463993 0.0463995
0.0260946 0.0260995 0.0261039 0.0261075 0.0261104 0.0261129 0.0261151 0.0261168 0.0174613 0.0174779 0.0174915 0.0175022
@@ -19,7 +19,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002
100002 100002 100002 100002 100001 100001 100001 100001 100001 100001 100001 100001
100001 100001 100001 100001 100001 100001 100001 100001 100000 100000 100000 100000
@@ -27,7 +27,7 @@
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
98503.8 98503.8 98503.8 98503.8 98503.8 98503.8 98503.8 98503.8 97797 97797 97797 97797
97797 97797 97797 97797 97324.7 97324.7 97324.7 97324.7 97324.7 97324.7 97324.7 97324.7
96994.4 96994.6 96994.7 96994.8 96994.8 96994.9 96994.9 96995 96711.2 96711.9 96712.6 96713
@@ -43,7 +43,7 @@
4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49 4302.49
4302.49 4302.49 4302.49 4302.49
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051
997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051
997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.051 997.05 997.05 997.05 997.05
@@ -51,7 +51,7 @@
628.517 647.342 661.237 672.15 681.269 689.17 696.17 702.234 140.491 165.19 182.192 195.534
206.696 216.37 224.954 232.696
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
1.15428 1.15428 1.15428 1.15428 1.15428 1.15428 1.15428 1.15428 1.15427 1.15427 1.15427 1.15427
1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427 1.15427
1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426 1.15426
@@ -59,7 +59,7 @@
1.15941 1.15915 1.15896 1.1588 1.15868 1.15856 1.15847 1.15838 1.16626 1.16591 1.16567 1.16549
1.16533 1.16519 1.16507 1.16496
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
243.306 243.306 243.306 243.306 243.306 243.307 243.307 243.307 2.25177 2.25177 2.25178 2.25178
2.25179 2.25179 2.2518 2.2518 0.101914 0.101919 0.101923 0.101927 0.10193 0.101932 0.101935 0.101936
0.0150021 0.0150119 0.0150209 0.0150281 0.0150341 0.0150392 0.0150436 0.0150469 0.00336369 0.00337637 0.00338686 0.00339514
@@ -67,7 +67,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
9036.5 9036.5 9036.49 9036.48 9036.47 9036.46 9036.46 9036.45 45130.6 45130.6 45130.5 45130.5
45130.5 45130.5 45130.5 45130.5 53066.8 53066.8 53066.7 53066.7 53066.6 53066.6 53066.6 53066.5
54566.3 54566 54565.8 54565.6 54565.4 54565.3 54565.1 54565.1 54956.9 54956.4 54955.9 54955.5
@@ -75,7 +75,7 @@
54850.3 54867.2 54879.6 54889.4 54897.5 54904.6 54910.9 54916.3 54417.2 54438.9 54453.9 54465.7
54475.6 54484.1 54491.7 54498.6
</DataArray>
- <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
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.999978 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.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978 0.999978
@@ -83,7 +83,7 @@
0.630352 0.649232 0.663169 0.674114 0.68326 0.691185 0.698205 0.704288 0.140878 0.16565 0.182702 0.196083
0.207278 0.216981 0.225591 0.233356
</DataArray>
- <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15464e-05 2.15462e-05 2.15462e-05 2.15462e-05 2.15462e-05
2.15462e-05 2.15462e-05 2.15462e-05 2.15462e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05 2.15461e-05
2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05 2.1546e-05
@@ -91,7 +91,7 @@
2.18069e-05 2.17935e-05 2.17837e-05 2.1776e-05 2.17695e-05 2.17639e-05 2.1759e-05 2.17547e-05 2.21515e-05 2.21342e-05 2.21223e-05 2.21129e-05
2.21051e-05 2.20983e-05 2.20922e-05 2.20867e-05
</DataArray>
- <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
0.0199835 0.0199835 0.0199835 0.0199835 0.0199835 0.0199835 0.0199835 0.0199835 0.0199837 0.0199837 0.0199837 0.0199837
0.0199837 0.0199837 0.0199837 0.0199837 0.0199838 0.0199838 0.0199838 0.0199838 0.0199838 0.0199838 0.0199838 0.0199838
0.0199839 0.0199839 0.0199839 0.0199839 0.0199839 0.0199839 0.0199839 0.0199839 0.0199839 0.0199839 0.0199839 0.0199839
@@ -99,7 +99,7 @@
0.012541 0.0129196 0.0131991 0.0134188 0.0136023 0.0137614 0.0139024 0.0140245 0.00278644 0.00327737 0.00361547 0.00388087
0.00410299 0.00429555 0.00446644 0.0046206
</DataArray>
- <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016
0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016
0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016 0.980016
@@ -107,7 +107,7 @@
0.987459 0.98708 0.986801 0.986581 0.986398 0.986239 0.986098 0.985976 0.997214 0.996723 0.996385 0.996119
0.995897 0.995704 0.995534 0.995379
</DataArray>
- <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987 0.999987
@@ -115,7 +115,7 @@
0.63036 0.64924 0.663177 0.674122 0.683268 0.691193 0.698214 0.704296 0.140886 0.165658 0.182711 0.196092
0.207287 0.21699 0.225599 0.233364
</DataArray>
- <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34035e-05 1.34034e-05 1.34034e-05 1.34034e-05 1.34034e-05
1.34034e-05 1.34034e-05 1.34034e-05 1.34034e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05
1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34033e-05 1.34032e-05 1.34032e-05 1.34032e-05 1.34032e-05
@@ -123,7 +123,7 @@
1.35656e-05 1.35573e-05 1.35512e-05 1.35464e-05 1.35424e-05 1.35389e-05 1.35358e-05 1.35331e-05 1.37807e-05 1.37698e-05 1.37623e-05 1.37564e-05
1.37515e-05 1.37472e-05 1.37434e-05 1.374e-05
</DataArray>
- <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
0.0317389 0.0317389 0.0317389 0.0317389 0.0317389 0.0317389 0.0317389 0.0317389 0.0317391 0.0317391 0.0317391 0.0317391
0.0317391 0.0317391 0.0317391 0.0317391 0.0317393 0.0317393 0.0317393 0.0317393 0.0317393 0.0317393 0.0317393 0.0317393
0.0317394 0.0317394 0.0317394 0.0317394 0.0317394 0.0317394 0.0317394 0.0317394 0.0317395 0.0317395 0.0317395 0.0317395
@@ -131,7 +131,7 @@
0.0200076 0.0206069 0.0210493 0.0213967 0.021687 0.0219385 0.0221613 0.0223544 0.00447173 0.005258 0.00579925 0.00622395
0.00657929 0.00688726 0.00716052 0.00740698
</DataArray>
- <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261
0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261
0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.968261 0.96826 0.96826 0.96826 0.96826
diff --git a/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu b/test/references/test_stokes1p2cdarcy2p2cvertical_darcy-reference.vtu
index 39442a953770bcb46a52ec54942f0056d7b4e720..d4bfc3c3c71b7d9db750802f987203a043d20a5d 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="Sn" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
+ <DataArray type="Float32" Name="S_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
@@ -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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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_horizontal_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_darcy-reference.vtu
index d05543adddcea6f229400daeed08e17c75323ba2..cd2f8fc51aead65bfa3ad21ec4c820eeb335c8e5 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cni_horizontal_darcy-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="400" NumberOfPoints="441">
- <CellData Scalars="Sn" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
+ <DataArray type="Float32" Name="S_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
@@ -39,7 +39,7 @@
1.02762 1.02625 1.02507 1.02405 1.02317 1.0224 1.02173 1.02114 1.02063 1.02017 1.01976 1.0194
1.01907 1.01879 1.01869 1.02071
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
-6.66041e-07 -6.66893e-07 -6.68526e-07 -6.70833e-07 -6.73579e-07 -6.76642e-07 -6.79761e-07 -6.82743e-07 -6.85447e-07 -6.87726e-07 -6.89517e-07 -6.90756e-07
-6.91515e-07 -6.91808e-07 -6.91763e-07 -6.91454e-07 -6.9102e-07 -6.90606e-07 -6.90244e-07 -6.90058e-07 -6.87642e-07 -6.88685e-07 -6.90715e-07 -6.93538e-07
-6.9695e-07 -7.00691e-07 -7.0452e-07 -7.08178e-07 -7.11457e-07 -7.14219e-07 -7.16369e-07 -7.17862e-07 -7.18722e-07 -7.19047e-07 -7.18921e-07 -7.18514e-07
@@ -75,7 +75,7 @@
-0.0276196 -0.0262508 -0.0250707 -0.0240503 -0.0231654 -0.0223983 -0.0217299 -0.021144 -0.0206275 -0.0201695 -0.0197614 -0.0193966
-0.0190713 -0.0187926 -0.0186921 -0.020714
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003
100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003
100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003 100003
@@ -111,7 +111,7 @@
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.5
96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.5 96318.4 96318.4 96318.4 96318.4
96318.4 96318.4 96318.4 96318.4 96318.4 96318.4 96318.4 96318.4 96318.4 96318.4 96318.4 96318.4
diff --git a/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cni_vertical_darcy-reference.vtu
index ab77fbfcba7c2d5824d67385619239654a98c271..52c295133bfbc8244e537b8cc52d8a8767308834 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="Sn" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
+ <DataArray type="Float32" Name="S_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
@@ -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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
index 2973fca6f6cb2eb9cd6a239d1d942ab093c80f51..69b3f139cda29d9ff1dadfc8f941333770873b34 100644
--- a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
+++ b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="64" NumberOfPoints="81">
- <CellData Scalars="Sn" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n" Vectors="velocity_liquid (m/s)">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0.231385 0.231385 0.231385 0.231385 0.231385 0.231385 0.231386 0.231386 0.81699 0.816991 0.816992 0.816993
0.816995 0.816996 0.816997 0.816997 0.937394 0.937393 0.937393 0.937393 0.937393 0.937393 0.937393 0.937393
0.966181 0.966171 0.966161 0.966154 0.966149 0.966145 0.966142 0.966141 0.977391 0.977355 0.977326 0.977304
@@ -11,7 +11,7 @@
0.990183 0.989913 0.989734 0.989611 0.989514 0.989435 0.989377 0.989365 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
0.768615 0.768615 0.768615 0.768615 0.768615 0.768615 0.768614 0.768614 0.18301 0.183009 0.183008 0.183007
0.183005 0.183004 0.183003 0.183003 0.0626058 0.0626066 0.0626071 0.0626073 0.0626071 0.062607 0.0626068 0.0626067
0.0338189 0.0338294 0.0338387 0.0338458 0.0338512 0.0338554 0.0338583 0.0338592 0.0226087 0.0226453 0.0226744 0.0226962
@@ -19,7 +19,7 @@
0.0098169 0.0100865 0.0102658 0.0103888 0.0104861 0.0105647 0.0106231 0.0106348 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002
100002 100002 100002 100002 100001 100001 100001 100001 100001 100001 100001 100001
100001 100001 100001 100001 100001 100001 100001 100001 100000 100000 100000 100000
@@ -27,7 +27,7 @@
100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
100000 100000 100000 100000
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
98656.1 98656.1 98656.1 98656.1 98656.1 98656.1 98656.1 98656.1 97947.7 97947.7 97947.7 97947.7
97947.7 97947.7 97947.7 97947.7 97474.9 97474.9 97474.9 97474.9 97474.9 97474.9 97474.9 97474.9
97151.4 97151.5 97151.7 97151.8 97151.9 97152 97152 97152 96899.8 96900.9 96901.8 96902.4
@@ -43,7 +43,7 @@
3721.5 3705.54 3694.93 3687.65 3681.89 3677.24 3673.79 3673.09 4302.49 4302.49 4302.49 4302.49
4302.49 4302.49 4302.49 4302.49
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
999.385 999.387 999.389 999.392 999.395 999.397 999.399 999.4 999.352 999.355 999.36 999.367
999.373 999.379 999.383 999.385 999.308 999.315 999.327 999.34 999.352 999.363 999.37 999.373
999.262 999.276 999.297 999.319 999.338 999.353 999.363 999.368 999.214 999.244 999.275 999.304
@@ -51,7 +51,7 @@
999.123 999.192 999.25 999.289 999.321 999.346 999.364 999.369 271.637 328.166 369.156 400.862
427.757 450.965 469.479 472.911
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
1.21091 1.21095 1.21104 1.21115 1.21127 1.21137 1.21145 1.21149 1.20961 1.20973 1.20993 1.21018
1.21043 1.21065 1.2108 1.21089 1.20787 1.20816 1.20862 1.20913 1.20961 1.21002 1.2103 1.21044
1.20607 1.20665 1.20746 1.2083 1.20904 1.20964 1.21005 1.21025 1.2044 1.2054 1.2066 1.20773
@@ -59,7 +59,7 @@
1.20177 1.20377 1.20562 1.20715 1.2084 1.20939 1.21007 1.2103 1.20645 1.20833 1.20996 1.2113
1.21238 1.21324 1.21381 1.21398
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
343.953 343.854 343.675 343.447 343.208 342.993 342.833 342.747 4.84628 4.84274 4.83663 4.82926
4.82189 4.81553 4.81091 4.8085 0.196026 0.195689 0.195147 0.19454 0.193968 0.193496 0.193164 0.192996
0.0276645 0.027594 0.0274806 0.0273594 0.0272498 0.0271622 0.0271024 0.0270724 0.00689197 0.0068937 0.00687431 0.00685044
@@ -67,7 +67,7 @@
0.000176107 0.000203369 0.00022206 0.000234863 0.000245211 0.000253779 0.000260338 0.000261533 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" NumberOfComponents="1" format="ascii">
3377.47 3377.55 3377.7 3377.89 3378.08 3378.26 3378.39 3378.46 41239.6 41242.1 41246.4 41251.6
41256.8 41261.3 41264.5 41266.2 52669 52676.4 52688.2 52701.5 52714.1 52724.6 52731.9 52735.7
55280.5 55295.4 55317 55339.2 55359.2 55375.2 55386.2 55391.5 55915 55939.6 55971.4 56001.6
@@ -75,7 +75,7 @@
56257 56304.9 56351.2 56391.8 56425.1 56451.4 56469.3 56475.2 55904.7 56009 56091.8 56158.2
56212.3 56255.7 56286.7 56294.4
</DataArray>
- <DataArray type="Float32" Name="X_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_liquid" NumberOfComponents="1" format="ascii">
0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973
0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973
0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973
@@ -83,7 +83,7 @@
0.999974 0.999974 0.999973 0.999973 0.999973 0.999973 0.999973 0.999973 0.271852 0.328404 0.369403 0.401116
0.428015 0.451227 0.469744 0.473176
</DataArray>
- <DataArray type="Float32" Name="X_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Air_liquid" NumberOfComponents="1" format="ascii">
2.73787e-05 2.73849e-05 2.73963e-05 2.74107e-05 2.74258e-05 2.74394e-05 2.74496e-05 2.74551e-05 2.72119e-05 2.72272e-05 2.72538e-05 2.72859e-05
2.73182e-05 2.73463e-05 2.73667e-05 2.73774e-05 2.69907e-05 2.70272e-05 2.70856e-05 2.71512e-05 2.72134e-05 2.72651e-05 2.73017e-05 2.73203e-05
2.67639e-05 2.68363e-05 2.69391e-05 2.7045e-05 2.71402e-05 2.72171e-05 2.72701e-05 2.72957e-05 2.65575e-05 2.66802e-05 2.68307e-05 2.69735e-05
@@ -91,7 +91,7 @@
2.6239e-05 2.64804e-05 2.67079e-05 2.68999e-05 2.70593e-05 2.71864e-05 2.72738e-05 2.73026e-05 2.64496e-05 2.67163e-05 2.69466e-05 2.71367e-05
2.72931e-05 2.74179e-05 2.75041e-05 2.75283e-05
</DataArray>
- <DataArray type="Float32" Name="X_gas^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
0.00934677 0.00934064 0.00932954 0.00931545 0.00930064 0.00928733 0.00927736 0.00927204 0.0095113 0.00949608 0.00946975 0.00943795
0.00940606 0.00937846 0.00935839 0.0093479 0.00973271 0.00969589 0.00963722 0.00957163 0.00950971 0.00945839 0.00942227 0.00940396
0.00996364 0.0098895 0.00978483 0.00967792 0.00958251 0.00950592 0.00945338 0.00942812 0.0101937 0.0100498 0.00989512 0.00974995
@@ -99,7 +99,7 @@
0.0106014 0.0102915 0.0100212 0.00982455 0.00966342 0.00953639 0.00944963 0.00942121 0.00291118 0.00339167 0.00370131 0.00393503
0.00412614 0.00428917 0.00442145 0.00444178
</DataArray>
- <DataArray type="Float32" Name="X_gas^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
0.990653 0.990659 0.99067 0.990685 0.990699 0.990713 0.990723 0.990728 0.990489 0.990504 0.99053 0.990562
0.990594 0.990622 0.990642 0.990652 0.990267 0.990304 0.990363 0.990428 0.99049 0.990542 0.990578 0.990596
0.990036 0.990111 0.990215 0.990322 0.990417 0.990494 0.990547 0.990572 0.989806 0.98995 0.990105 0.99025
@@ -107,7 +107,7 @@
0.989399 0.989709 0.989979 0.990175 0.990337 0.990464 0.99055 0.990579 0.997089 0.996608 0.996299 0.996065
0.995874 0.995711 0.995579 0.995558
</DataArray>
- <DataArray type="Float32" Name="x_liquid^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_liquid" NumberOfComponents="1" format="ascii">
0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983
0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983
0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983
@@ -115,7 +115,7 @@
0.999984 0.999984 0.999983 0.999983 0.999983 0.999983 0.999983 0.999983 0.271862 0.328414 0.369413 0.401126
0.428026 0.451237 0.469755 0.473186
</DataArray>
- <DataArray type="Float32" Name="x_liquid^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_liquid" NumberOfComponents="1" format="ascii">
1.70317e-05 1.70356e-05 1.70426e-05 1.70516e-05 1.7061e-05 1.70694e-05 1.70758e-05 1.70792e-05 1.69279e-05 1.69374e-05 1.6954e-05 1.6974e-05
1.69941e-05 1.70115e-05 1.70242e-05 1.70309e-05 1.67903e-05 1.6813e-05 1.68493e-05 1.68901e-05 1.69288e-05 1.6961e-05 1.69838e-05 1.69953e-05
1.66492e-05 1.66942e-05 1.67582e-05 1.68241e-05 1.68833e-05 1.69311e-05 1.69641e-05 1.698e-05 1.65208e-05 1.65972e-05 1.66908e-05 1.67796e-05
@@ -123,7 +123,7 @@
1.63227e-05 1.64728e-05 1.66144e-05 1.67338e-05 1.6833e-05 1.6912e-05 1.69664e-05 1.69843e-05 1.64542e-05 1.662e-05 1.67632e-05 1.68814e-05
1.69787e-05 1.70563e-05 1.71099e-05 1.71249e-05
</DataArray>
- <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
0.0149404 0.0149307 0.014913 0.0148906 0.0148671 0.0148459 0.0148301 0.0148216 0.0152019 0.0151777 0.0151359 0.0150853
0.0150346 0.0149908 0.0149589 0.0149422 0.0155537 0.0154952 0.015402 0.0152978 0.0151994 0.0151178 0.0150604 0.0150313
0.0159205 0.0158028 0.0156365 0.0154666 0.015315 0.0151933 0.0151098 0.0150697 0.0162859 0.0160574 0.0158117 0.0155811
@@ -131,7 +131,7 @@
0.0169331 0.0164411 0.0160119 0.0156996 0.0154436 0.0152418 0.0151039 0.0150587 0.00467156 0.00544102 0.00593663 0.00631061
0.00661632 0.00687706 0.00708859 0.00712109
</DataArray>
- <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
0.98506 0.985069 0.985087 0.985109 0.985133 0.985154 0.98517 0.985178 0.984798 0.984822 0.984864 0.984915
0.984965 0.985009 0.985041 0.985058 0.984446 0.984505 0.984598 0.984702 0.984801 0.984882 0.98494 0.984969
0.984079 0.984197 0.984363 0.984533 0.984685 0.984807 0.98489 0.98493 0.983714 0.983943 0.984188 0.984419
diff --git a/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu b/test/references/test_stokes1pdarcy2pvertical_darcy-reference.vtu
index c4e03a1ef0f147e61792f9df793c16452736a79c..be7cc1399c94a489366b0bc16a51e5ceed568aed 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="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" 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="Sn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_n" 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="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" 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
diff --git a/test/references/tracer-constvel-explicit-box-reference.vtu b/test/references/tracer-constvel-explicit-box-reference.vtu
index 7dd93704d506e5877cba76d13b88004feafcb344..c3574152cc14244288791d33079068fec567135f 100644
--- a/test/references/tracer-constvel-explicit-box-reference.vtu
+++ b/test/references/tracer-constvel-explicit-box-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="2500" NumberOfPoints="2601">
- <PointData Scalars="x_tracer_0" Vectors="velocity_Groundwater (m/s)">
- <DataArray type="Float32" Name="x_tracer_0" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="x^tracer_0" Vectors="velocity_Groundwater (m/s)">
+ <DataArray type="Float32" Name="x^tracer_0" NumberOfComponents="1" format="ascii">
1.06546e-11 1.12097e-11 1.26252e-11 1.3302e-11 1.28154e-11 1.52378e-11 1.53189e-11 1.82254e-11 1.85181e-11 2.20078e-11 2.21942e-11 2.63169e-11
2.61328e-11 3.0898e-11 3.01378e-11 3.55242e-11 3.40391e-11 4.00045e-11 3.76962e-11 4.41856e-11 4.09981e-11 4.79502e-11 4.38616e-11 5.1213e-11
4.62276e-11 5.39154e-11 4.80574e-11 5.60206e-11 4.93292e-11 5.75086e-11 5.00344e-11 5.83725e-11 5.01761e-11 5.8616e-11 4.97665e-11 5.82513e-11
@@ -222,7 +222,7 @@
4.54808e-11 4.73856e-11 4.88266e-11 4.97665e-11 5.01761e-11 5.00344e-11 4.93292e-11 4.80574e-11 4.62276e-11 4.38616e-11 4.09981e-11 3.76962e-11
3.40391e-11 3.01378e-11 2.61328e-11 2.21942e-11 1.85181e-11 1.53189e-11 1.28154e-11 1.12097e-11 1.06546e-11
</DataArray>
- <DataArray type="Float32" Name="X_tracer_0" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_0" NumberOfComponents="1" format="ascii">
1.77577e-13 1.86829e-13 2.10421e-13 2.217e-13 2.1359e-13 2.53963e-13 2.55315e-13 3.03756e-13 3.08636e-13 3.66796e-13 3.69903e-13 4.38615e-13
4.35547e-13 5.14966e-13 5.02297e-13 5.9207e-13 5.67319e-13 6.66742e-13 6.2827e-13 7.36426e-13 6.83302e-13 7.9917e-13 7.31026e-13 8.5355e-13
7.7046e-13 8.98591e-13 8.00957e-13 9.33677e-13 8.22153e-13 9.58476e-13 8.33907e-13 9.72875e-13 8.36268e-13 9.76933e-13 8.29441e-13 9.70854e-13
@@ -441,7 +441,7 @@
7.58013e-13 7.89759e-13 8.13777e-13 8.29441e-13 8.36268e-13 8.33907e-13 8.22153e-13 8.00957e-13 7.7046e-13 7.31026e-13 6.83302e-13 6.2827e-13
5.67319e-13 5.02297e-13 4.35547e-13 3.69903e-13 3.08636e-13 2.55315e-13 2.1359e-13 1.86829e-13 1.77577e-13
</DataArray>
- <DataArray type="Float32" Name="x_tracer_1" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^tracer_1" NumberOfComponents="1" format="ascii">
3.91668e-38 3.94469e-27 1.94187e-34 4.69796e-24 2.04232e-22 1.14892e-19 3.64552e-20 1.30854e-17 7.42469e-19 1.95735e-16 5.20238e-18 1.10143e-15
1.9878e-17 3.59413e-15 5.16985e-17 8.34844e-15 1.0312e-16 1.53938e-14 1.69148e-16 2.40035e-14 2.38242e-16 3.29088e-14 2.9623e-16 4.06707e-14
3.31048e-16 4.60487e-14 3.36319e-16 4.82657e-14 3.12671e-16 4.71268e-14 2.66778e-16 4.29987e-14 2.08823e-16 3.66776e-14 1.49433e-16 2.91912e-14
@@ -660,7 +660,7 @@
2.91607e-17 5.66278e-17 9.7082e-17 1.49433e-16 2.08823e-16 2.66778e-16 3.12671e-16 3.36319e-16 3.31048e-16 2.9623e-16 2.38242e-16 1.69148e-16
1.0312e-16 5.16985e-17 1.9878e-17 5.20238e-18 7.42469e-19 3.64552e-20 2.04232e-22 3.94469e-27 3.91668e-38
</DataArray>
- <DataArray type="Float32" Name="X_tracer_1" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_1" NumberOfComponents="1" format="ascii">
6.52779e-40 6.57448e-29 3.23645e-36 7.82993e-26 3.40387e-24 1.91487e-21 6.07586e-22 2.1809e-19 1.23745e-20 3.26225e-18 8.67064e-20 1.83572e-17
3.313e-19 5.99022e-17 8.61641e-19 1.39141e-16 1.71866e-18 2.56563e-16 2.81913e-18 4.00058e-16 3.97071e-18 5.4848e-16 4.93716e-18 6.77845e-16
5.51747e-18 7.67479e-16 5.60532e-18 8.04428e-16 5.21119e-18 7.85446e-16 4.4463e-18 7.16645e-16 3.48038e-18 6.11294e-16 2.49054e-18 4.8652e-16
diff --git a/test/references/tracer-constvel-explicit-cc-reference.vtu b/test/references/tracer-constvel-explicit-cc-reference.vtu
index 2161ac8f279e57c000e311f971c03fe49d5d2f68..125e27b8434ae7a0eedb9e3030aa830b8d9cdbae 100644
--- a/test/references/tracer-constvel-explicit-cc-reference.vtu
+++ b/test/references/tracer-constvel-explicit-cc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="2500" NumberOfPoints="2601">
- <CellData Scalars="x_tracer_0" Vectors="velocity_Groundwater (m/s)">
- <DataArray type="Float32" Name="x_tracer_0" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="x^tracer_0" Vectors="velocity_Groundwater (m/s)">
+ <DataArray type="Float32" Name="x^tracer_0" NumberOfComponents="1" format="ascii">
9.27761e-12 1.0364e-11 1.24067e-11 1.52134e-11 1.85685e-11 2.22573e-11 2.60813e-11 2.9867e-11 3.34704e-11 3.67771e-11 3.97001e-11 4.21771e-11
4.41659e-11 4.56408e-11 4.65895e-11 4.70103e-11 4.69101e-11 4.63039e-11 4.52135e-11 4.36681e-11 4.17045e-11 3.93683e-11 3.67152e-11 3.38131e-11
3.07434e-11 2.75994e-11 2.44605e-11 2.13838e-11 1.84183e-11 1.56076e-11 1.29902e-11 1.05989e-11 8.45941e-12 6.58903e-12 4.99546e-12 3.67598e-12
@@ -214,7 +214,7 @@
4.70103e-11 4.65895e-11 4.56408e-11 4.41659e-11 4.21771e-11 3.97001e-11 3.67771e-11 3.34704e-11 2.9867e-11 2.60813e-11 2.22573e-11 1.85685e-11
1.52134e-11 1.24067e-11 1.0364e-11 9.27761e-12
</DataArray>
- <DataArray type="Float32" Name="X_tracer_0" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_0" NumberOfComponents="1" format="ascii">
1.54627e-13 1.72734e-13 2.06778e-13 2.53556e-13 3.09475e-13 3.70955e-13 4.34688e-13 4.97784e-13 5.57841e-13 6.12951e-13 6.61668e-13 7.02952e-13
7.36098e-13 7.6068e-13 7.76492e-13 7.83505e-13 7.81836e-13 7.71732e-13 7.53558e-13 7.27801e-13 6.95075e-13 6.56138e-13 6.1192e-13 5.63551e-13
5.1239e-13 4.59991e-13 4.07676e-13 3.56397e-13 3.06972e-13 2.60127e-13 2.16504e-13 1.76649e-13 1.4099e-13 1.09817e-13 8.32577e-14 6.12663e-14
@@ -425,7 +425,7 @@
7.83505e-13 7.76492e-13 7.6068e-13 7.36098e-13 7.02952e-13 6.61668e-13 6.12951e-13 5.57841e-13 4.97784e-13 4.34688e-13 3.70955e-13 3.09475e-13
2.53556e-13 2.06778e-13 1.72734e-13 1.54627e-13
</DataArray>
- <DataArray type="Float32" Name="x_tracer_1" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^tracer_1" NumberOfComponents="1" format="ascii">
3.39592e-31 4.95507e-23 6.1184e-20 2.71311e-18 2.75983e-17 1.29425e-16 3.82411e-16 8.34044e-16 1.46712e-15 2.19523e-15 2.88932e-15 3.41841e-15
3.68681e-15 3.65641e-15 3.3504e-15 2.84084e-15 2.22599e-15 1.60511e-15 1.05726e-15 6.28933e-16 3.32203e-16 1.51845e-16 5.76165e-17 1.68146e-17
3.14006e-18 3.6859e-19 3.99015e-20 3.97799e-21 3.64389e-22 3.05736e-23 2.34064e-24 1.62753e-25 1.02237e-26 5.76612e-28 2.89927e-29 1.28917e-30
@@ -636,7 +636,7 @@
2.84084e-15 3.3504e-15 3.65641e-15 3.68681e-15 3.41841e-15 2.88932e-15 2.19523e-15 1.46712e-15 8.34044e-16 3.82411e-16 1.29425e-16 2.75983e-17
2.71311e-18 6.1184e-20 4.95507e-23 3.39592e-31
</DataArray>
- <DataArray type="Float32" Name="X_tracer_1" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_1" NumberOfComponents="1" format="ascii">
5.65987e-33 8.25844e-25 1.01973e-21 4.52185e-20 4.59972e-19 2.15708e-18 6.37352e-18 1.39007e-17 2.44521e-17 3.65872e-17 4.81553e-17 5.69735e-17
6.14469e-17 6.09402e-17 5.58401e-17 4.73473e-17 3.70998e-17 2.67518e-17 1.7621e-17 1.04822e-17 5.53671e-18 2.53075e-18 9.60275e-19 2.80244e-19
5.23344e-20 6.14317e-21 6.65025e-22 6.62998e-23 6.07315e-24 5.0956e-25 3.90106e-26 2.71256e-27 1.70395e-28 9.6102e-30 4.83212e-31 2.14861e-32
diff --git a/test/references/tracer-constvel-implicit-box-reference.vtu b/test/references/tracer-constvel-implicit-box-reference.vtu
index c2a25bbc302baeaca41e91555be9345369502489..0cfbea3fb28ab483e7da525be006588fb7086217 100644
--- a/test/references/tracer-constvel-implicit-box-reference.vtu
+++ b/test/references/tracer-constvel-implicit-box-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="2500" NumberOfPoints="2601">
- <PointData Scalars="x_tracer_0" Vectors="velocity_Groundwater (m/s)">
- <DataArray type="Float32" Name="x_tracer_0" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="x^tracer_0" Vectors="velocity_Groundwater (m/s)">
+ <DataArray type="Float32" Name="x^tracer_0" NumberOfComponents="1" format="ascii">
1.20888e-11 1.26673e-11 1.40921e-11 1.47864e-11 1.43363e-11 1.67666e-11 1.69265e-11 1.98075e-11 2.02159e-11 2.3632e-11 2.39681e-11 2.79566e-11
2.79575e-11 3.25181e-11 3.19833e-11 3.70892e-11 3.58766e-11 4.1484e-11 3.95028e-11 4.55585e-11 4.27593e-11 4.92067e-11 4.55721e-11 5.23546e-11
4.7891e-11 5.49542e-11 4.96852e-11 5.69773e-11 5.09387e-11 5.84109e-11 5.16472e-11 5.92529e-11 5.18157e-11 5.95094e-11 5.14563e-11 5.91928e-11
@@ -222,7 +222,7 @@
4.53658e-11 4.70289e-11 4.82587e-11 4.90192e-11 4.92814e-11 4.90237e-11 4.82328e-11 4.69045e-11 4.50462e-11 4.2679e-11 3.98407e-11 3.65892e-11
3.30058e-11 2.91982e-11 2.53021e-11 2.14807e-11 1.79212e-11 1.48278e-11 1.24091e-11 1.08584e-11 1.03223e-11
</DataArray>
- <DataArray type="Float32" Name="X_tracer_0" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_0" NumberOfComponents="1" format="ascii">
2.01481e-13 2.11122e-13 2.34868e-13 2.4644e-13 2.38939e-13 2.79444e-13 2.82109e-13 3.30124e-13 3.36931e-13 3.93867e-13 3.99469e-13 4.65943e-13
4.65959e-13 5.41969e-13 5.33055e-13 6.18153e-13 5.97944e-13 6.91399e-13 6.58381e-13 7.59308e-13 7.12656e-13 8.20111e-13 7.59535e-13 8.72576e-13
7.98184e-13 9.15903e-13 8.28086e-13 9.49622e-13 8.48978e-13 9.73516e-13 8.60787e-13 9.87549e-13 8.63595e-13 9.91823e-13 8.57605e-13 9.86546e-13
@@ -441,7 +441,7 @@
7.56097e-13 7.83815e-13 8.04311e-13 8.16986e-13 8.21356e-13 8.17062e-13 8.03879e-13 7.81741e-13 7.5077e-13 7.11317e-13 6.64012e-13 6.0982e-13
5.50097e-13 4.86637e-13 4.21702e-13 3.58012e-13 2.98687e-13 2.4713e-13 2.06819e-13 1.80973e-13 1.72038e-13
</DataArray>
- <DataArray type="Float32" Name="x_tracer_1" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^tracer_1" NumberOfComponents="1" format="ascii">
1.565e-36 1.03412e-25 5.28353e-33 8.37969e-23 3.13141e-21 1.19841e-18 3.63539e-19 8.92007e-17 5.46171e-18 9.92977e-16 3.10848e-17 4.57794e-15
1.02771e-16 1.30129e-14 2.41244e-16 2.74093e-14 4.47456e-16 4.71332e-14 6.97942e-16 6.99823e-14 9.51495e-16 9.28669e-14 1.16213e-15 1.12601e-13
1.29222e-15 1.26558e-13 1.32159e-15 1.33092e-13 1.25068e-15 1.31705e-13 1.09809e-15 1.23e-13 8.94298e-16 1.08477e-13 6.73523e-16 9.02071e-14
@@ -660,7 +660,7 @@
3.6405e-17 6.43208e-17 1.01863e-16 1.46601e-16 1.93413e-16 2.35074e-16 2.63694e-16 2.72722e-16 2.58986e-16 2.24076e-16 1.74441e-16 1.19871e-16
7.06137e-17 3.40711e-17 1.25008e-17 3.06126e-18 3.86224e-19 1.28083e-20 -8.3015e-23 5.91923e-26 -4.90516e-30
</DataArray>
- <DataArray type="Float32" Name="X_tracer_1" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_1" NumberOfComponents="1" format="ascii">
2.60833e-38 1.72353e-27 8.80588e-35 1.39661e-24 5.21901e-23 1.99734e-20 6.05898e-21 1.48668e-18 9.10284e-20 1.65496e-17 5.1808e-19 7.6299e-17
1.71285e-18 2.16881e-16 4.02073e-18 4.56822e-16 7.4576e-18 7.85554e-16 1.16324e-17 1.16637e-15 1.58582e-17 1.54778e-15 1.93688e-17 1.87668e-15
2.1537e-17 2.10931e-15 2.20265e-17 2.21821e-15 2.08446e-17 2.19508e-15 1.83016e-17 2.05001e-15 1.4905e-17 1.80795e-15 1.12254e-17 1.50345e-15
diff --git a/test/references/tracer-constvel-implicit-cc-reference.vtu b/test/references/tracer-constvel-implicit-cc-reference.vtu
index 88166c35459bc871cd7a4d6624f27ed3a02abe5a..2d31cf8b19d8be481f385dfb85a0f86aaae7c5e2 100644
--- a/test/references/tracer-constvel-implicit-cc-reference.vtu
+++ b/test/references/tracer-constvel-implicit-cc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="2500" NumberOfPoints="2601">
- <CellData Scalars="x_tracer_0" Vectors="velocity_Groundwater (m/s)">
- <DataArray type="Float32" Name="x_tracer_0" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="x^tracer_0" Vectors="velocity_Groundwater (m/s)">
+ <DataArray type="Float32" Name="x^tracer_0" NumberOfComponents="1" format="ascii">
9.98038e-12 1.10776e-11 1.31345e-11 1.59494e-11 1.9299e-11 2.29646e-11 2.67477e-11 3.04784e-11 3.40181e-11 3.72587e-11 4.012e-11 4.25455e-11
4.44984e-11 4.59574e-11 4.69135e-11 4.73675e-11 4.73278e-11 4.68095e-11 4.58337e-11 4.44273e-11 4.26237e-11 4.04633e-11 3.79951e-11 3.52789e-11
3.23871e-11 2.94031e-11 2.63974e-11 2.342e-11 2.05142e-11 1.77189e-11 1.50702e-11 1.26007e-11 1.03385e-11 8.30651e-12 6.5205e-12 4.98832e-12
@@ -214,7 +214,7 @@
4.73675e-11 4.69135e-11 4.59574e-11 4.44984e-11 4.25455e-11 4.012e-11 3.72587e-11 3.40181e-11 3.04784e-11 2.67477e-11 2.29646e-11 1.9299e-11
1.59494e-11 1.31345e-11 1.10776e-11 9.98038e-12
</DataArray>
- <DataArray type="Float32" Name="X_tracer_0" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_0" NumberOfComponents="1" format="ascii">
1.6634e-13 1.84626e-13 2.18908e-13 2.65824e-13 3.21651e-13 3.82743e-13 4.45795e-13 5.07974e-13 5.66969e-13 6.20978e-13 6.68666e-13 7.09092e-13
7.4164e-13 7.65956e-13 7.81892e-13 7.89458e-13 7.88797e-13 7.80158e-13 7.63895e-13 7.40455e-13 7.10395e-13 6.74388e-13 6.33252e-13 5.87982e-13
5.39785e-13 4.90051e-13 4.39956e-13 3.90334e-13 3.41903e-13 2.95315e-13 2.51171e-13 2.10012e-13 1.72309e-13 1.38442e-13 1.08675e-13 8.31386e-14
@@ -425,7 +425,7 @@
7.89458e-13 7.81892e-13 7.65956e-13 7.4164e-13 7.09092e-13 6.68666e-13 6.20978e-13 5.66969e-13 5.07974e-13 4.45795e-13 3.82743e-13 3.21651e-13
2.65824e-13 2.18908e-13 1.84626e-13 1.6634e-13
</DataArray>
- <DataArray type="Float32" Name="x_tracer_1" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^tracer_1" NumberOfComponents="1" format="ascii">
9.59682e-30 6.47672e-22 4.48752e-19 1.33817e-17 1.05472e-16 4.18989e-16 1.10777e-15 2.24065e-15 3.74803e-15 5.43419e-15 7.03561e-15 8.29358e-15
9.01558e-15 9.11162e-15 8.60217e-15 7.6016e-15 6.28515e-15 4.84885e-15 3.47167e-15 2.28698e-15 1.36799e-15 7.28032e-16 3.33396e-16 1.23476e-16
3.18748e-17 5.72765e-18 9.75882e-19 1.5741e-19 2.39807e-20 3.43995e-21 4.62882e-22 5.81673e-23 6.79085e-24 7.32164e-25 7.24014e-26 6.51503e-27
@@ -636,7 +636,7 @@
7.6016e-15 8.60217e-15 9.11162e-15 9.01558e-15 8.29358e-15 7.03561e-15 5.43419e-15 3.74803e-15 2.24065e-15 1.10777e-15 4.18989e-16 1.05472e-16
1.33817e-17 4.48752e-19 6.47672e-22 9.59682e-30
</DataArray>
- <DataArray type="Float32" Name="X_tracer_1" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_1" NumberOfComponents="1" format="ascii">
1.59947e-31 1.07945e-23 7.4792e-21 2.23028e-19 1.75787e-18 6.98316e-18 1.84628e-17 3.73441e-17 6.24672e-17 9.05699e-17 1.1726e-16 1.38226e-16
1.5026e-16 1.5186e-16 1.4337e-16 1.26693e-16 1.04752e-16 8.08142e-17 5.78611e-17 3.81163e-17 2.27998e-17 1.21339e-17 5.5566e-18 2.05793e-18
5.31246e-19 9.54608e-20 1.62647e-20 2.6235e-21 3.99678e-22 5.73325e-23 7.71469e-24 9.69455e-25 1.13181e-25 1.22027e-26 1.20669e-27 1.08584e-28
diff --git a/test/references/tracer-sequential-transport-reference.vtu b/test/references/tracer-sequential-transport-reference.vtu
index 5666edb9bb5a8feec5d58b1821638b02ab709d1d..74e27b5eb6eabab1c0082f84aae23be45b5f6447 100644
--- a/test/references/tracer-sequential-transport-reference.vtu
+++ b/test/references/tracer-sequential-transport-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="2500" NumberOfPoints="2601">
- <CellData Scalars="x_tracer_0" Vectors="velocity_Groundwater (m/s)">
- <DataArray type="Float32" Name="x_tracer_0" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="x^tracer_0" Vectors="velocity_Groundwater (m/s)">
+ <DataArray type="Float32" Name="x^tracer_0" NumberOfComponents="1" format="ascii">
2.50468e-11 2.55786e-11 2.45958e-11 3.96359e-12 1.61904e-14 4.17954e-10 1.88905e-15 6.23649e-16 7.41016e-18 3.03097e-18 1.59963e-11 5.08641e-10
2.59435e-10 2.58697e-12 3.41529e-10 2.66201e-19 1.12872e-10 1.02254e-11 8.75145e-10 8.38877e-12 9.23308e-10 1.92903e-11 1.61749e-10 7.88538e-10
7.13977e-10 1.4116e-11 2.16079e-11 2.53995e-12 4.37433e-10 4.93932e-15 1.01188e-11 4.01725e-11 4.88887e-12 6.31969e-11 1.58099e-10 2.63913e-14
@@ -214,7 +214,7 @@
3.8149e-24 1.93092e-23 5.38689e-20 5.442e-19 2.63823e-18 2.74714e-19 2.96745e-19 2.61456e-19 4.48102e-17 3.68616e-15 9.62048e-16 3.43464e-17
3.84133e-17 1.55783e-16 1.52386e-18 1.3212e-17
</DataArray>
- <DataArray type="Float32" Name="X_tracer_0" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^tracer_0" NumberOfComponents="1" format="ascii">
4.17447e-13 4.2631e-13 4.0993e-13 6.60598e-14 2.69839e-16 6.9659e-12 3.14842e-17 1.03942e-17 1.23503e-19 5.05161e-20 2.66604e-13 8.47736e-12
4.32392e-12 4.31162e-14 5.69215e-12 4.43668e-21 1.88121e-12 1.70423e-13 1.45858e-11 1.39813e-13 1.53885e-11 3.21505e-13 2.69581e-12 1.31423e-11
1.18996e-11 2.35267e-13 3.60132e-13 4.23325e-14 7.29054e-12 8.2322e-17 1.68647e-13 6.69542e-13 8.14811e-14 1.05328e-12 2.63499e-12 4.39855e-16
diff --git a/test/references/waterairbox-reference.vtu b/test/references/waterairbox-reference.vtu
index 67b8d67f1d1b387f69d0b99df1b55fe928d147bb..05b93afc87c4f40a8d7c54a599e4489e50933d90 100644
--- a/test/references/waterairbox-reference.vtu
+++ b/test/references/waterairbox-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="4096" NumberOfPoints="4225">
- <PointData Scalars="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
@@ -358,7 +358,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
@@ -713,7 +713,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
9.92e+06 9.9209e+06 9.91387e+06 9.91478e+06 9.92181e+06 9.9157e+06 9.92274e+06 9.91662e+06 9.92367e+06 9.91756e+06 9.92462e+06 9.9185e+06
9.92558e+06 9.91946e+06 9.92655e+06 9.92043e+06 9.92754e+06 9.92142e+06 9.92854e+06 9.92242e+06 9.92957e+06 9.92345e+06 9.93062e+06 9.9245e+06
9.9317e+06 9.92558e+06 9.93282e+06 9.92668e+06 9.93397e+06 9.92783e+06 9.93516e+06 9.92902e+06 9.93641e+06 9.93027e+06 9.93772e+06 9.93158e+06
@@ -1068,7 +1068,7 @@
9.53433e+06 9.53385e+06 9.53335e+06 9.53283e+06 9.53229e+06 9.53175e+06 9.53118e+06 9.53061e+06 9.53003e+06 9.52944e+06 9.52884e+06 9.52823e+06
9.5276e+06
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
9.91e+06 9.9109e+06 9.90387e+06 9.90478e+06 9.91181e+06 9.9057e+06 9.91274e+06 9.90662e+06 9.91367e+06 9.90756e+06 9.91462e+06 9.9085e+06
9.91558e+06 9.90946e+06 9.91655e+06 9.91043e+06 9.91754e+06 9.91142e+06 9.91854e+06 9.91242e+06 9.91957e+06 9.91345e+06 9.92062e+06 9.9145e+06
9.9217e+06 9.91558e+06 9.92282e+06 9.91668e+06 9.92397e+06 9.91783e+06 9.92516e+06 9.91902e+06 9.92641e+06 9.92027e+06 9.92772e+06 9.92158e+06
@@ -1778,7 +1778,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
996.524 996.524 996.529 996.529 996.525 996.529 996.525 996.53 996.526 996.53 996.526 996.531
996.526 996.531 996.527 996.531 996.527 996.532 996.528 996.532 996.528 996.533 996.529 996.533
996.529 996.534 996.529 996.534 996.53 996.534 996.531 996.535 996.531 996.535 996.532 996.536
@@ -2133,7 +2133,7 @@
996.821 996.821 996.821 996.82 996.82 996.82 996.82 996.82 996.819 996.819 996.819 996.819
996.818
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
0.0510122 0.0510106 0.0509622 0.0509623 0.0510106 0.0509623 0.0510106 0.0509624 0.0510107 0.0509624 0.0510107 0.0509624
0.0510107 0.0509625 0.0510108 0.0509625 0.0510108 0.0509626 0.0510109 0.0509626 0.0510109 0.0509626 0.0510109 0.0509627
0.051011 0.0509627 0.051011 0.0509628 0.0510111 0.0509628 0.0510112 0.0509629 0.0510134 0.0509633 0.0510796 0.0509748
@@ -2488,7 +2488,7 @@
0.0479096 0.0479096 0.0479096 0.0479096 0.0479096 0.0479096 0.0479095 0.0479095 0.0479095 0.0479095 0.0479095 0.0479094
0.047908
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
1523.7 1523.68 1523.18 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18
1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18
1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18 1523.68 1523.18
@@ -2843,7 +2843,7 @@
1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54 1490.54
1490.52
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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
@@ -3198,7 +3198,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0
</DataArray>
- <DataArray type="Float32" Name="X_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" 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
@@ -3553,7 +3553,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1
</DataArray>
- <DataArray type="Float32" Name="X_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
0 7.27664e-37 0 7.63352e-38 4.74341e-35 5.03745e-36 3.02359e-33 3.26013e-34 1.88403e-31 2.06599e-32 1.14555e-29 1.27945e-30
6.77988e-28 7.72405e-29 3.89406e-26 4.53235e-27 2.16293e-24 2.57635e-25 1.15719e-22 1.41331e-23 5.93623e-21 7.4499e-22 2.90468e-19 3.75507e-20
1.34758e-17 1.7998e-18 5.88629e-16 8.15111e-17 2.4009e-14 3.46307e-15 9.05433e-13 1.36899e-13 3.11899e-11 4.98957e-12 9.66424e-10 1.66011e-10
@@ -3908,7 +3908,7 @@
-0 -0 0 0 -0 0 -0 -0 0 0 -0 -0
0
</DataArray>
- <DataArray type="Float32" Name="X_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
0.00074076 0.000740669 0.00074045 0.000740383 0.000740601 0.000740315 0.000740532 0.000740246 0.000740463 0.000740177 0.000740393 0.000740107
0.000740322 0.000740036 0.00074025 0.000739964 0.000740177 0.000739891 0.000740102 0.000739817 0.000740026 0.000739741 0.000739949 0.000739664
0.000739869 0.000739584 0.000739786 0.000739502 0.000739701 0.000739418 0.000739613 0.00073933 0.000739509 0.000739236 0.00073907 0.000739081
@@ -4263,7 +4263,7 @@
0.000721176 0.000721212 0.00072125 0.000721289 0.000721329 0.00072137 0.000721412 0.000721455 0.000721499 0.000721544 0.000721589 0.000721635
0.00072166
</DataArray>
- <DataArray type="Float32" Name="X_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
0 7.49803e-34 0 7.86936e-35 4.88727e-32 5.1926e-33 3.11501e-30 3.36023e-31 1.94081e-28 2.12922e-29 1.17996e-26 1.31849e-27
6.98286e-25 7.95894e-26 4.01026e-23 4.66972e-24 2.22724e-21 2.65417e-22 1.19148e-19 1.45586e-20 6.1115e-18 7.67337e-19 2.99012e-16 3.86729e-17
1.38707e-14 1.85339e-15 6.05811e-13 8.39287e-14 2.4707e-11 3.56537e-12 9.31642e-10 1.40927e-10 3.20882e-08 5.1357e-09 9.93666e-07 1.70837e-07
@@ -4618,7 +4618,7 @@
-0 -0 0 0 -0 0 -0 -0 0 0 -0 -0
0
</DataArray>
- <DataArray type="Float32" Name="x_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" 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
@@ -4973,7 +4973,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1
</DataArray>
- <DataArray type="Float32" Name="x_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
0 4.67954e-37 0 4.90905e-38 3.05044e-35 3.23954e-36 1.94445e-33 2.09656e-34 1.2116e-31 1.32862e-32 7.36694e-30 8.22804e-31
4.36008e-28 4.96727e-29 2.50424e-26 2.91472e-27 1.39096e-24 1.65683e-25 7.44177e-23 9.08889e-24 3.81754e-21 4.79097e-22 1.86797e-19 2.41485e-20
8.66618e-18 1.15744e-18 3.78542e-16 5.24191e-17 1.544e-14 2.22707e-15 5.82276e-13 8.80389e-14 2.00579e-11 3.20875e-12 6.21499e-10 1.0676e-10
@@ -5328,7 +5328,7 @@
-0 -0 0 0 -0 0 -0 -0 0 0 -0 -0
0
</DataArray>
- <DataArray type="Float32" Name="x_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
0.00074076 0.000740669 0.00074045 0.000740383 0.000740601 0.000740315 0.000740532 0.000740246 0.000740463 0.000740177 0.000740393 0.000740107
0.000740322 0.000740036 0.00074025 0.000739964 0.000740177 0.000739891 0.000740102 0.000739817 0.000740026 0.000739741 0.000739949 0.000739664
0.000739869 0.000739584 0.000739786 0.000739502 0.000739701 0.000739418 0.000739613 0.00073933 0.000739521 0.000739238 0.000739424 0.000739142
@@ -5683,7 +5683,7 @@
0.000721176 0.000721212 0.00072125 0.000721289 0.000721329 0.00072137 0.000721412 0.000721455 0.000721499 0.000721544 0.000721589 0.000721635
0.00072166
</DataArray>
- <DataArray type="Float32" Name="x_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
0 4.82192e-34 0 5.06072e-35 3.14296e-32 3.33932e-33 2.00323e-30 2.16093e-31 1.24812e-28 1.36928e-29 7.58823e-27 8.47907e-28
4.49062e-25 5.11832e-26 2.57896e-23 3.00306e-24 1.43232e-21 1.70688e-22 7.66228e-20 9.36249e-21 3.93025e-18 4.93468e-19 1.92292e-16 2.48702e-17
8.92014e-15 1.1919e-15 3.89592e-13 5.39739e-14 1.58889e-11 2.29286e-12 5.99132e-10 9.06288e-11 2.0636e-08 3.30273e-09 6.39325e-07 1.09873e-07
diff --git a/test/references/wateraircc-reference.vtu b/test/references/wateraircc-reference.vtu
index 10a7f02d3a904d3794939118d18ee24940fa3dd0..f0fabf8cc0f4ba080f715a80188a5eba899faef2 100644
--- a/test/references/wateraircc-reference.vtu
+++ b/test/references/wateraircc-reference.vtu
@@ -2,8 +2,8 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="4096" NumberOfPoints="4225">
- <CellData Scalars="Sn">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ <CellData Scalars="S_n">
+ <DataArray type="Float32" Name="S_n" 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.00453813 0.0995865
0.163644 0.166523 0.166678 0.166698 0.166703 0.166699 0.16677 0.168653 0.195872 0.195061 0.194464 0.194306
@@ -347,7 +347,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="S_w" 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 0.995462 0.900414
0.836356 0.833477 0.833322 0.833302 0.833297 0.833301 0.83323 0.831347 0.804128 0.804939 0.805536 0.805694
@@ -691,7 +691,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_n" NumberOfComponents="1" format="ascii">
9.91737e+06 9.91825e+06 9.91914e+06 9.92004e+06 9.92095e+06 9.92187e+06 9.9228e+06 9.92375e+06 9.92471e+06 9.92569e+06 9.92669e+06 9.92772e+06
9.92877e+06 9.92986e+06 9.93098e+06 9.93215e+06 9.93338e+06 9.93466e+06 9.93602e+06 9.93747e+06 9.93903e+06 9.94072e+06 9.94263e+06 9.946e+06
9.9492e+06 9.95144e+06 9.95313e+06 9.95429e+06 9.95495e+06 9.95511e+06 9.95477e+06 9.95389e+06 9.95263e+06 9.95175e+06 9.95086e+06 9.94988e+06
@@ -1035,7 +1035,7 @@
9.53857e+06 9.53818e+06 9.53777e+06 9.53733e+06 9.53688e+06 9.53641e+06 9.53592e+06 9.53541e+06 9.5349e+06 9.53436e+06 9.53382e+06 9.53327e+06
9.5327e+06 9.53213e+06 9.53156e+06 9.53097e+06
</DataArray>
- <DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="p_w" NumberOfComponents="1" format="ascii">
9.90737e+06 9.90825e+06 9.90914e+06 9.91004e+06 9.91095e+06 9.91187e+06 9.9128e+06 9.91375e+06 9.91471e+06 9.91569e+06 9.91669e+06 9.91772e+06
9.91877e+06 9.91986e+06 9.92098e+06 9.92215e+06 9.92338e+06 9.92466e+06 9.92602e+06 9.92747e+06 9.92903e+06 9.93072e+06 9.9326e+06 9.93531e+06
9.93799e+06 9.94021e+06 9.94189e+06 9.94305e+06 9.94371e+06 9.94387e+06 9.94353e+06 9.94264e+06 9.94112e+06 9.94025e+06 9.93936e+06 9.93839e+06
@@ -1723,7 +1723,7 @@
10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000
10000 10000 10000 10000
</DataArray>
- <DataArray type="Float32" Name="rhoW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_w" NumberOfComponents="1" format="ascii">
996.526 996.527 996.527 996.528 996.528 996.528 996.529 996.529 996.53 996.53 996.53 996.531
996.531 996.532 996.532 996.533 996.533 996.534 996.534 996.535 996.538 996.575 997.065 997.066
997.066 997.067 997.068 997.068 997.068 997.068 997.064 996.655 962.513 958.944 958.788 958.782
@@ -2067,7 +2067,7 @@
996.82 996.819 996.819 996.819 996.819 996.819 996.818 996.818 996.818 996.818 996.818 996.817
996.817 996.817 996.817 996.816
</DataArray>
- <DataArray type="Float32" Name="rhoN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="rho_n" NumberOfComponents="1" format="ascii">
0.0509864 0.0509864 0.0509865 0.0509865 0.0509865 0.0509866 0.0509866 0.0509866 0.0509867 0.0509867 0.0509868 0.0509868
0.0509868 0.0509869 0.0509869 0.050987 0.0509878 0.0510121 0.0517184 0.0697898 0.469495 7.84273 106.993 107.028
107.061 107.086 107.104 107.116 107.123 107.125 107.118 106.754 89.2475 88.0152 87.9554 87.9452
@@ -2411,7 +2411,7 @@
0.0479301 0.0479301 0.0479301 0.04793 0.04793 0.04793 0.04793 0.04793 0.04793 0.04793 0.0479299 0.0479299
0.0479299 0.0479299 0.0479299 0.0479298
</DataArray>
- <DataArray type="Float32" Name="mobW" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_w" NumberOfComponents="1" format="ascii">
1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43
1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.43 1523.46 1489.81 895.529
610.237 599.268 598.68 598.604 598.588 598.604 598.438 602.692 1158.04 1224.25 1231.58 1232.95
@@ -2755,7 +2755,7 @@
1490.81 1490.81 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8 1490.8
1490.8 1490.8 1490.8 1490.8
</DataArray>
- <DataArray type="Float32" Name="mobN" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="mob_n" 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.0199118 197.881
840.515 883.891 886.271 886.582 886.646 886.584 887.662 914.587 1238.13 1212.77 1201.75 1198.93
@@ -3099,7 +3099,7 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="X_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_w" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 0.999994 0.99989 0.99849 0.998489
0.998489 0.998488 0.998488 0.998488 0.998488 0.998488 0.998488 0.998502 0.998658 0.998636 0.998635 0.998635
@@ -3443,7 +3443,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="X_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_w" NumberOfComponents="1" format="ascii">
1.71024e-39 1.20489e-37 8.30067e-36 5.59404e-34 3.68339e-32 2.36468e-30 1.4762e-28 8.93313e-27 5.22138e-25 2.9357e-23 1.58038e-21 8.10306e-20
3.93337e-18 1.79532e-16 7.6453e-15 3.01071e-13 1.08543e-11 3.54231e-10 1.03341e-08 2.65713e-07 5.9142e-06 0.000110106 0.00151025 0.00151074
0.00151117 0.00151151 0.00151176 0.00151194 0.00151204 0.00151206 0.00151188 0.00149823 0.00134222 0.00136396 0.00136484 0.00136474
@@ -3787,7 +3787,7 @@
0 0 0 -0 -0 0 0 0 0 0 0 -0
-0 -0 0 -0
</DataArray>
- <DataArray type="Float32" Name="X_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^H2O_n" NumberOfComponents="1" format="ascii">
0.000740561 0.000740495 0.000740429 0.000740362 0.000740295 0.000740227 0.000740158 0.000740088 0.000740016 0.000739944 0.00073987 0.000739794
0.000739716 0.000739636 0.000739553 0.000739466 0.000739372 0.000739151 0.00073544 0.00066786 0.000503788 0.000476837 0.00047534 0.000475211
0.000475174 0.00047507 0.00047499 0.000474935 0.000474904 0.000474898 0.000475165 0.000502319 0.00686749 0.00815793 0.00822106 0.00822377
@@ -4131,7 +4131,7 @@
0.000721184 0.000721213 0.000721244 0.000721277 0.000721311 0.000721346 0.000721383 0.000721421 0.00072146 0.0007215 0.000721541 0.000721582
0.000721624 0.000721667 0.000721711 0.000721755
</DataArray>
- <DataArray type="Float32" Name="X_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="X^N2_n" NumberOfComponents="1" format="ascii">
1.76276e-36 1.24178e-34 8.55404e-33 5.76427e-31 3.79513e-29 2.43619e-27 1.5207e-25 9.20153e-24 5.37774e-22 3.02331e-20 1.62739e-18 8.34319e-17
4.04951e-15 1.84813e-13 7.86928e-12 3.09856e-10 1.11695e-08 3.6441e-07 1.05776e-05 0.000246984 0.00414682 0.0730765 0.999525 0.999525
0.999525 0.999525 0.999525 0.999525 0.999525 0.999525 0.999525 0.999498 0.993133 0.991842 0.991779 0.991776
@@ -4475,7 +4475,7 @@
0 0 0 -0 -0 0 0 0 0 0 0 -0
-0 -0 0 -0
</DataArray>
- <DataArray type="Float32" Name="x_w^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_w" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 0.999996 0.999929 0.999028 0.999028
0.999028 0.999027 0.999027 0.999027 0.999027 0.999027 0.999027 0.999036 0.999136 0.999122 0.999122 0.999122
@@ -4819,7 +4819,7 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="x_w^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_w" NumberOfComponents="1" format="ascii">
1.09984e-39 7.74856e-38 5.33809e-36 3.59748e-34 2.36875e-32 1.5207e-30 9.4933e-29 5.74482e-27 3.35783e-25 1.88792e-23 1.01633e-21 5.21101e-20
2.52952e-18 1.15455e-16 4.91662e-15 1.93617e-13 6.9803e-12 2.27803e-10 6.64575e-09 1.70878e-07 3.80338e-06 7.08107e-05 0.00097175 0.000972069
0.000972344 0.000972563 0.000972727 0.000972841 0.000972905 0.00097292 0.000972804 0.000964013 0.000863587 0.000877576 0.000878148 0.00087808
@@ -5163,7 +5163,7 @@
0 0 0 -0 -0 0 0 0 0 0 0 -0
-0 -0 0 -0
</DataArray>
- <DataArray type="Float32" Name="x_n^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^H2O_n" NumberOfComponents="1" format="ascii">
0.000740561 0.000740495 0.000740429 0.000740362 0.000740295 0.000740227 0.000740158 0.000740088 0.000740016 0.000739944 0.00073987 0.000739794
0.000739716 0.000739636 0.000739553 0.000739466 0.000739376 0.000739281 0.000739181 0.000739074 0.000738958 0.000738819 0.000738953 0.000738753
0.000738696 0.000738534 0.00073841 0.000738324 0.000738276 0.000738267 0.000738682 0.000780883 0.0106383 0.0126283 0.0127256 0.0127298
@@ -5507,7 +5507,7 @@
0.000721184 0.000721213 0.000721244 0.000721277 0.000721311 0.000721346 0.000721383 0.000721421 0.00072146 0.0007215 0.000721541 0.000721582
0.000721624 0.000721667 0.000721711 0.000721755
</DataArray>
- <DataArray type="Float32" Name="x_n^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x^N2_n" NumberOfComponents="1" format="ascii">
1.13362e-36 7.9858e-35 5.50103e-33 3.70695e-31 2.44061e-29 1.56669e-27 9.77947e-26 5.91743e-24 3.45838e-22 1.94427e-20 1.04656e-18 5.36544e-17
2.6042e-15 1.18851e-13 5.06067e-12 1.99265e-10 7.18308e-09 2.3439e-07 6.83699e-06 0.000175769 0.00391165 0.0728145 0.999261 0.999261
0.999261 0.999261 0.999262 0.999262 0.999262 0.999262 0.999261 0.999219 0.989362 0.987372 0.987274 0.98727