diff --git a/dumux/porousmediumflow/2p1c/vtkoutputfields.hh b/dumux/porousmediumflow/2p1c/vtkoutputfields.hh index eb35ec319c9269259cc02be66514ad8532e7288b..2cd6ee93b9c70b7ace01e6ab9f9533642de3c535 100644 --- a/dumux/porousmediumflow/2p1c/vtkoutputfields.hh +++ b/dumux/porousmediumflow/2p1c/vtkoutputfields.hh @@ -42,7 +42,7 @@ public: TwoPVtkOutputFields::init(vtk); // output additional to TwoP output: - vtk.addVolumeVariable([](const auto& v){ return v.priVars().state(); }, "phasePresence"); + 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 0f55d3ad4efc68b7c03ac688c066e53dd6977656..cf006918463457623ba8b0e896390cdff9aeca0e 100644 --- a/dumux/porousmediumflow/2pnc/vtkoutputfields.hh +++ b/dumux/porousmediumflow/2pnc/vtkoutputfields.hh @@ -62,7 +62,7 @@ public: "X^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i)); } - vtk.addVolumeVariable([](const auto& v){ return v.priVars().state(); }, "phasePresence"); + vtk.addVolumeVariable([](const auto& v){ return v.priVars().state(); }, "phase presence"); } }; diff --git a/dumux/porousmediumflow/richards/vtkoutputfields.hh b/dumux/porousmediumflow/richards/vtkoutputfields.hh index 082ea7874e78251d11c1200cecd4c7f535376bfd..729877cc44ea2fd724e21bae1d5eff510395cebc 100644 --- a/dumux/porousmediumflow/richards/vtkoutputfields.hh +++ b/dumux/porousmediumflow/richards/vtkoutputfields.hh @@ -59,7 +59,7 @@ public: 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"); + vtk.addVolumeVariable([](const auto& v){ return v.priVars().state(); }, "phase presence"); } }; diff --git a/test/references/2pncdiffusioncc-reference.vtu b/test/references/2pncdiffusioncc-reference.vtu index 481b775621559b456929e6db00bf6cbf5645af5a..5257cb2d8b7951877f783191671800e2af8a0e68 100644 --- a/test/references/2pncdiffusioncc-reference.vtu +++ b/test/references/2pncdiffusioncc-reference.vtu @@ -463,7 +463,7 @@ 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 0.806618 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 diff --git a/test/references/fuelcell2pncbox-reference.vtu b/test/references/fuelcell2pncbox-reference.vtu index 9eac68fdce135d4d9e9e5f8f47a752abbc0dbb70..ae77b532c8600651d2c89f8a5100385aed3b236c 100644 --- a/test/references/fuelcell2pncbox-reference.vtu +++ b/test/references/fuelcell2pncbox-reference.vtu @@ -273,7 +273,7 @@ 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/fuelcell2pncboxni-reference.vtu b/test/references/fuelcell2pncboxni-reference.vtu index ea62f06dcbd9d0b37486720da93e7cf0c4d6e398..8af36216f00c797eff40919d26f364342a41f3b1 100644 --- a/test/references/fuelcell2pncboxni-reference.vtu +++ b/test/references/fuelcell2pncboxni-reference.vtu @@ -273,7 +273,7 @@ 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 41.0288 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/fuelcell2pnccc-reference.vtu b/test/references/fuelcell2pnccc-reference.vtu index 274dcb4b7bb1c3c7b2898dc3d4de583db7d40f0a..496fc6b80012de59e8fd89c52273d6131c952870 100644 --- a/test/references/fuelcell2pnccc-reference.vtu +++ b/test/references/fuelcell2pnccc-reference.vtu @@ -237,7 +237,7 @@ 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 38.8036 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/richardsanalyticalcc-reference.vtu b/test/references/richardsanalyticalcc-reference.vtu index 29f04639dd4479dc7d1bf0d2ad0646d7d0e9285c..1f3c3e4a208d75c551a1374c080c4478564c0a7e 100644 --- a/test/references/richardsanalyticalcc-reference.vtu +++ b/test/references/richardsanalyticalcc-reference.vtu @@ -453,7 +453,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 0.4 0.4 0.4 0.4 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/richardslensbox-reference-parallel.vtu b/test/references/richardslensbox-reference-parallel.vtu index 02ed3bbbc3cd341ce6ff5383b869a0fb6a77dfc2..61705ee731e35c4487af11be760ca9144eebe6ab 100644 --- a/test/references/richardslensbox-reference-parallel.vtu +++ b/test/references/richardslensbox-reference-parallel.vtu @@ -234,7 +234,7 @@ 0.24609 0.254316 0.24609 0.0912612 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 1.57507e-06 0.0325891 0.285214 0.373147 0.374603 0.373147 0.285214 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/richardslensbox-reference.vtu b/test/references/richardslensbox-reference.vtu index be2f29b326237fd79a23fe09360920db6497fa30..c2a5a6d5ce7680da904411b65e7915cef0b8b549 100644 --- a/test/references/richardslensbox-reference.vtu +++ b/test/references/richardslensbox-reference.vtu @@ -421,7 +421,7 @@ 0.285214 0.373147 0.374603 0.373147 0.285214 0.0325891 1.57507e-06 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 3.60822e-17 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/richardslenscc-reference-parallel.vtu b/test/references/richardslenscc-reference-parallel.vtu index e9fc09f28a3329ee09848e5f157458f73151a1c7..5711d651d5d4a3ff77408112baa32bef81574c8d 100644 --- a/test/references/richardslenscc-reference-parallel.vtu +++ b/test/references/richardslenscc-reference-parallel.vtu @@ -201,7 +201,7 @@ 3.74335e-17 3.74335e-17 3.74335e-17 3.74335e-17 3.74335e-17 3.74335e-17 3.74335e-17 0.00133304 0.118767 0.135959 0.135959 0.118767 3.74335e-17 3.74335e-17 3.74335e-17 3.74335e-17 3.74335e-17 3.74335e-17 1.14143e-06 0.0316293 0.325895 0.338906 0.338906 0.325895 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/richardsniconductionbox-reference.vtu b/test/references/richardsniconductionbox-reference.vtu index 2af9e3266c22df16912f99f5426e21c0293a3390..ec965308abdd9a5d6955fac1e7f174aea9225c0a 100644 --- a/test/references/richardsniconductionbox-reference.vtu +++ b/test/references/richardsniconductionbox-reference.vtu @@ -327,7 +327,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 0.4 0.4 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" 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 diff --git a/test/references/richardsniconductioncc-reference.vtu b/test/references/richardsniconductioncc-reference.vtu index 5e6d2c747a4e07dbbe48d1276611cb92e7ae4d22..eeaf7ce32e5f6e760f12fb89a9c735bdb7fb080a 100644 --- a/test/references/richardsniconductioncc-reference.vtu +++ b/test/references/richardsniconductioncc-reference.vtu @@ -212,7 +212,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 0.4 0.4 0.4 0.4 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" 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 diff --git a/test/references/richardsniconvectionbox-reference.vtu b/test/references/richardsniconvectionbox-reference.vtu index 428925cd496f029fedadfc526e3761a92fe1d8bc..2c7c622d542e032f6fc0869e5fb54ff56fe36b91 100644 --- a/test/references/richardsniconvectionbox-reference.vtu +++ b/test/references/richardsniconvectionbox-reference.vtu @@ -179,7 +179,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 0.4 0.4 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" 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 diff --git a/test/references/richardsniconvectioncc-reference.vtu b/test/references/richardsniconvectioncc-reference.vtu index 911019e5367d0629b45ad773d2a444616ce0a944..ee07ca796c08b72e943ce93015faac3e4ba3c761 100644 --- a/test/references/richardsniconvectioncc-reference.vtu +++ b/test/references/richardsniconvectioncc-reference.vtu @@ -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 0.4 0.4 0.4 0.4 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" 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 diff --git a/test/references/saltflushbox2pncmin-reference.vtu b/test/references/saltflushbox2pncmin-reference.vtu index 38e78e51fc149a5f4945e6eb9b92df4f81e67489..c16943559194599467c3e451e7e1b8395bab9106 100644 --- a/test/references/saltflushbox2pncmin-reference.vtu +++ b/test/references/saltflushbox2pncmin-reference.vtu @@ -399,7 +399,7 @@ -286076 -273270 -254469 -229480 -169979 -106362 -47575.2 207.205 3204.7 3186.77 3175.63 3172.2 3170.24 3168.72 3167.2 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 3 3 3 3 3 3 3 3 diff --git a/test/references/saltflushtpfa2pncmin-reference.vtu b/test/references/saltflushtpfa2pncmin-reference.vtu index c4e3aa8dd6a8e4895fb932c23c3cad4b39555bbe..809b0e90f197f8f45712ca166b34990e885fcf3d 100644 --- a/test/references/saltflushtpfa2pncmin-reference.vtu +++ b/test/references/saltflushtpfa2pncmin-reference.vtu @@ -345,7 +345,7 @@ 3736.46 3725.21 -32610 -301602 -295444 -283547 -264163 -236857 -202662 -163855 -93279.7 -32213.2 3196.33 3186.88 3175.42 3172.37 3171.01 3169.84 3168.83 3168.02 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 1 1 1 1 1 1 1 1 1 1 3 3 3 3 3 3 3 3 3 3 1 1 1 1 1 1 1 1 1 1 3 3 3 3 diff --git a/test/references/steaminjectionbox-reference.vtu b/test/references/steaminjectionbox-reference.vtu index bfd6ee45a7da620be33ff270606962bec1f8668a..14e80b986649681f079fc1bca41ecdcaf02d61c3 100644 --- a/test/references/steaminjectionbox-reference.vtu +++ b/test/references/steaminjectionbox-reference.vtu @@ -223,7 +223,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 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 diff --git a/test/references/test_boxrichardsevaporation-reference.vtu b/test/references/test_boxrichardsevaporation-reference.vtu index cc64082d7cfe96248d6ff7c0ba89550c7ceffcd8..f5611168cf5ea995526062cccd39c865ddbdc71a 100644 --- a/test/references/test_boxrichardsevaporation-reference.vtu +++ b/test/references/test_boxrichardsevaporation-reference.vtu @@ -146,7 +146,7 @@ 0.0228688 0.0228688 0.0228688 0.0228688 0.0228688 0.0228688 0.0228678 0.0228678 0.0228678 0.0228678 0.0228678 0.0228678 0 0 0 0 0 0 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/test_ccrichardsevaporation-reference.vtu b/test/references/test_ccrichardsevaporation-reference.vtu index 2dfa91b996be3e3b865f19f8684bf168c9c5c40a..fb9935370366c76464c1f230ace02211559caf43 100644 --- a/test/references/test_ccrichardsevaporation-reference.vtu +++ b/test/references/test_ccrichardsevaporation-reference.vtu @@ -124,7 +124,7 @@ 0.0228688 0.0228688 0.0228688 0.0228688 0.0228688 0.0228688 0.0228681 0.0228681 0.0228681 0.0228681 0.0228681 0 0 0 0 0 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/test_embedded_1p_richards_box_3d.vtu b/test/references/test_embedded_1p_richards_box_3d.vtu index b1f889ccf4bde4037f67e067f6e8d9e197f9bb08..f2cdbfa9e6378f4262a24bec075bad5f2a941b51 100644 --- a/test/references/test_embedded_1p_richards_box_3d.vtu +++ b/test/references/test_embedded_1p_richards_box_3d.vtu @@ -1863,7 +1863,7 @@ 0.0615345 0.0615069 0.0614296 0.0613184 0.0611974 0.0610956 0.0610401 0.0610476 0.0611155 0.061221 0.0613301 0.0614103 0.0614396 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/test_embedded_1p_richards_tpfa_3d.vtu b/test/references/test_embedded_1p_richards_tpfa_3d.vtu index aa42e76f7e83680ff6e2f46146d7e676861e4b99..d4c5918f367b063422b0551b8b4d054ba80dfaf5 100644 --- a/test/references/test_embedded_1p_richards_tpfa_3d.vtu +++ b/test/references/test_embedded_1p_richards_tpfa_3d.vtu @@ -1463,7 +1463,7 @@ 0.0614675 0.0614015 0.0612799 0.0611226 0.0609596 0.0608297 0.0607767 0.0608367 0.0609827 0.0611464 0.0612795 0.0613531 0.0615411 0.0614838 0.0613791 0.0612461 0.0611123 0.0610108 0.0609743 0.061021 0.0611324 0.0612634 0.0613736 0.0614355 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 diff --git a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu index 8172835a1cca9873dba33103abe348141637ad2a..9c31f19e8337e2332f29f377d0bc9a7d30243506 100644 --- a/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu +++ b/test/references/test_stokes1p2cnidarcy2p2cnihorizontal_darcy-reference.vtu @@ -163,7 +163,7 @@ 0.989398 0.989708 0.989978 0.990175 0.990336 0.990464 0.990551 0.99058 0.997089 0.996608 0.996299 0.996066 0.995875 0.995712 0.995577 0.995556 </DataArray> - <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii"> + <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii"> 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3