[output] Harmonize porousmediumflow output

* consistent ordering of component/phase names: x^componentName_phaseName
* consistent use of underline: S_w, p_w, etc.
* change respective data field names in reference solutions

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)));
     }
 };
 

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");
     }
 };
 

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");

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");
     }

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");
     }

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)

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");

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));
         }
     }
 };

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));
         }
     }
 };

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");

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));
 
     }
 };

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");
     }

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));
     }
 };
 

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

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

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

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

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

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

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