diff --git a/dumux/material/fluidsystems/h2oairfluidsystem.hh b/dumux/material/fluidsystems/h2oairfluidsystem.hh
index 28fdc4ae9c582183d240145137e358c027dbf10f..7889d400ef7b60de358c4677e1eeacae92407ff8 100644
--- a/dumux/material/fluidsystems/h2oairfluidsystem.hh
+++ b/dumux/material/fluidsystems/h2oairfluidsystem.hh
@@ -364,20 +364,12 @@ public:
using Base::density;
template <class FluidState>
static Scalar density(const FluidState &fluidState,
- int phaseIdx)
+ const int phaseIdx)
{
assert(0 <= phaseIdx && phaseIdx < numPhases);
- Scalar T = fluidState.temperature(phaseIdx);
- Scalar p;
- if (isCompressible(phaseIdx))
- p = fluidState.pressure(phaseIdx);
- else {
- // random value which will hopefully cause things to blow
- // up if it is used in a calculation!
- p = - 1e100;
- Valgrind::SetUndefined(p);
- }
+ const Scalar T = fluidState.temperature(phaseIdx);
+ const Scalar p = fluidState.pressure(phaseIdx);
Scalar sumMoleFrac = 0;
@@ -392,8 +384,8 @@ public:
else
{
// See: Ochs 2008 (2.6)
- Scalar rholH2O = H2O::liquidDensity(T, p);
- Scalar clH2O = rholH2O/H2O::molarMass();
+ const Scalar rholH2O = H2O::liquidDensity(T, p);
+ const Scalar clH2O = rholH2O/H2O::molarMass();
return
clH2O
@@ -412,11 +404,11 @@ public:
* fluidState.averageMolarMass(nPhaseIdx)
/ std::max(1e-5, sumMoleFrac);
- Scalar partialPressureH2O =
+ const Scalar partialPressureH2O =
fluidState.moleFraction(nPhaseIdx, H2OIdx) *
fluidState.pressure(nPhaseIdx);
- Scalar partialPressureAir =
+ const Scalar partialPressureAir =
fluidState.moleFraction(nPhaseIdx, AirIdx) *
fluidState.pressure(nPhaseIdx);
diff --git a/test/boxmodels/mpnc/forchheimer1p-reference.vtp b/test/boxmodels/mpnc/forchheimer1p-reference.vtp
index be49a2e057b1326fe0bd3ddca4a86b6e87cf029f..e33689f7fd6f388cb87f5d84c56c9f1de4bc8858 100644
--- a/test/boxmodels/mpnc/forchheimer1p-reference.vtp
+++ b/test/boxmodels/mpnc/forchheimer1p-reference.vtp
@@ -2,8 +2,8 @@
<VTKFile type="PolyData" version="0.1" byte_order="LittleEndian">
<PolyData>
<Piece NumberOfLines="100" NumberOfPoints="101">
- <PointData Scalars="S_l">
- <DataArray type="Float32" Name="S_l" NumberOfComponents="1" format="ascii">
+ <PointData Scalars="S_liquid">
+ <DataArray type="Float32" Name="S_liquid" NumberOfComponents="1" format="ascii">
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
@@ -14,81 +14,81 @@
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 1 1
</DataArray>
- <DataArray type="Float32" Name="S_g" NumberOfComponents="1" format="ascii">
- 0 0 0 0 0 0 0 0 0 0 1.11022e-16 0
+ <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 -6.66134e-16 -6.66134e-16 0 0 8.88178e-16 0 0 0 0 0
- 0 0 0 0 0 1.66533e-15 1.66533e-15 7.77156e-16 -1.77636e-15 0 0 -1.33227e-15
- -1.33227e-15 0 0 -8.88178e-16 0 0 2.66454e-15 0 0 -2.88658e-15 0 2.77556e-15
- 0 -1.11022e-15 0 0 0 5.55112e-16 0 0 9.99201e-16 -8.88178e-16 0 0
- -8.88178e-16 8.88178e-16 0 0 0 0 0 0 0 0 3.33067e-16 0
- 0 0 -6.66134e-16 0 0 5.55112e-16 0 0 0 0 0 -8.88178e-16
0 0 0 0 0
</DataArray>
- <DataArray type="Float32" Name="p_l" NumberOfComponents="1" format="ascii">
- 4.2e+06 4.15905e+06 4.1181e+06 4.07715e+06 4.0362e+06 3.99524e+06 3.95429e+06 3.91333e+06 3.87237e+06 3.83142e+06 3.79046e+06 3.7495e+06
- 3.70854e+06 3.66758e+06 3.62661e+06 3.58565e+06 3.54468e+06 3.50372e+06 3.46275e+06 3.42178e+06 3.38082e+06 3.33984e+06 3.29887e+06 3.2579e+06
- 3.21693e+06 3.17596e+06 3.13498e+06 3.094e+06 3.05303e+06 3.01205e+06 2.97107e+06 2.93009e+06 2.88911e+06 2.84813e+06 2.80714e+06 2.76616e+06
- 2.72517e+06 2.68419e+06 2.6432e+06 2.60221e+06 2.56122e+06 2.52023e+06 2.47924e+06 2.43825e+06 2.39726e+06 2.35626e+06 2.31527e+06 2.27427e+06
- 2.23327e+06 2.19227e+06 2.15127e+06 2.11027e+06 2.06927e+06 2.02827e+06 1.98727e+06 1.94626e+06 1.90526e+06 1.86425e+06 1.82324e+06 1.78223e+06
- 1.74122e+06 1.70021e+06 1.6592e+06 1.61819e+06 1.57717e+06 1.53616e+06 1.49514e+06 1.45413e+06 1.41311e+06 1.37209e+06 1.33107e+06 1.29005e+06
- 1.24903e+06 1.208e+06 1.16698e+06 1.12596e+06 1.08493e+06 1.0439e+06 1.00288e+06 961846 920816 879785 838753 797720
- 756685 715650 674614 633577 592539 551499 510459 469418 428375 387332 346288 305242
- 264196 223148 182100 141050 100000
- </DataArray>
- <DataArray type="Float32" Name="p_g" NumberOfComponents="1" format="ascii">
- 4.2e+06 4.15905e+06 4.1181e+06 4.07715e+06 4.0362e+06 3.99524e+06 3.95429e+06 3.91333e+06 3.87237e+06 3.83142e+06 3.79046e+06 3.7495e+06
- 3.70854e+06 3.66758e+06 3.62661e+06 3.58565e+06 3.54468e+06 3.50372e+06 3.46275e+06 3.42178e+06 3.38082e+06 3.33984e+06 3.29887e+06 3.2579e+06
- 3.21693e+06 3.17596e+06 3.13498e+06 3.094e+06 3.05303e+06 3.01205e+06 2.97107e+06 2.93009e+06 2.88911e+06 2.84813e+06 2.80714e+06 2.76616e+06
- 2.72517e+06 2.68419e+06 2.6432e+06 2.60221e+06 2.56122e+06 2.52023e+06 2.47924e+06 2.43825e+06 2.39726e+06 2.35626e+06 2.31527e+06 2.27427e+06
- 2.23327e+06 2.19227e+06 2.15127e+06 2.11027e+06 2.06927e+06 2.02827e+06 1.98727e+06 1.94626e+06 1.90526e+06 1.86425e+06 1.82324e+06 1.78223e+06
- 1.74122e+06 1.70021e+06 1.6592e+06 1.61819e+06 1.57717e+06 1.53616e+06 1.49514e+06 1.45413e+06 1.41311e+06 1.37209e+06 1.33107e+06 1.29005e+06
- 1.24903e+06 1.208e+06 1.16698e+06 1.12596e+06 1.08493e+06 1.0439e+06 1.00288e+06 961846 920816 879785 838753 797720
- 756685 715650 674614 633577 592539 551499 510459 469418 428375 387332 346288 305242
- 264196 223148 182100 141050 100000
- </DataArray>
- <DataArray type="Float32" Name="rho_l" NumberOfComponents="1" format="ascii">
- 998.893 998.875 998.856 998.838 998.819 998.801 998.783 998.764 998.746 998.727 998.709 998.69
- 998.672 998.653 998.635 998.617 998.598 998.58 998.561 998.543 998.524 998.506 998.487 998.469
- 998.451 998.432 998.414 998.395 998.377 998.358 998.34 998.322 998.303 998.285 998.266 998.248
- 998.229 998.211 998.192 998.174 998.155 998.137 998.119 998.1 998.082 998.063 998.045 998.026
- 998.008 997.989 997.971 997.953 997.934 997.916 997.897 997.879 997.86 997.842 997.823 997.805
- 997.786 997.768 997.75 997.731 997.713 997.694 997.676 997.657 997.639 997.62 997.602 997.583
- 997.565 997.546 997.528 997.509 997.491 997.473 997.454 997.436 997.417 997.399 997.38 997.362
- 997.343 997.325 997.306 997.288 997.269 997.251 997.232 997.214 997.195 997.177 997.159 997.14
- 997.122 997.103 997.085 997.066 997.048
- </DataArray>
- <DataArray type="Float32" Name="rho_g" NumberOfComponents="1" format="ascii">
- 46.8618 46.4049 45.948 45.4911 45.0341 44.5772 44.1202 43.6633 43.2063 42.7493 42.2923 41.8353
- 41.3783 40.9212 40.4642 40.0071 39.5501 39.093 38.6359 38.1788 37.7217 37.2646 36.8074 36.3503
- 35.8931 35.4359 34.9788 34.5216 34.0644 33.6072 33.1499 32.6927 32.2354 31.7782 31.3209 30.8636
- 30.4063 29.949 29.4917 29.0344 28.577 28.1197 27.6623 27.2049 26.7475 26.2902 25.8327 25.3753
- 24.9179 24.4604 24.003 23.5455 23.0881 22.6306 22.1731 21.7156 21.258 20.8005 20.3429 19.8854
- 19.4278 18.9702 18.5127 18.0551 17.5974 17.1398 16.6822 16.2245 15.7669 15.3092 14.8515 14.3938
- 13.9361 13.4784 13.0207 12.5629 12.1052 11.6474 11.1896 10.7319 10.2741 9.81626 9.35844 8.90061
- 8.44277 7.98492 7.52705 7.06918 6.61129 6.15339 5.69548 5.23756 4.77963 4.32169 3.86373 3.40576
- 2.94778 2.48979 2.03179 1.57378 1.11576
- </DataArray>
- <DataArray type="Float32" Name="lambda_l" NumberOfComponents="1" format="ascii">
- 1124.29 1124.28 1124.27 1124.26 1124.26 1124.25 1124.24 1124.23 1124.23 1124.22 1124.21 1124.21
- 1124.2 1124.19 1124.18 1124.18 1124.17 1124.16 1124.16 1124.15 1124.14 1124.13 1124.13 1124.12
- 1124.11 1124.11 1124.1 1124.09 1124.08 1124.08 1124.07 1124.06 1124.06 1124.05 1124.04 1124.03
- 1124.03 1124.02 1124.01 1124.01 1124 1123.99 1123.98 1123.98 1123.97 1123.96 1123.95 1123.95
- 1123.94 1123.93 1123.93 1123.92 1123.91 1123.9 1123.9 1123.89 1123.88 1123.88 1123.87 1123.86
- 1123.85 1123.85 1123.84 1123.83 1123.83 1123.82 1123.81 1123.8 1123.8 1123.79 1123.78 1123.78
- 1123.77 1123.76 1123.75 1123.75 1123.74 1123.73 1123.73 1123.72 1123.71 1123.7 1123.7 1123.69
- 1123.68 1123.67 1123.67 1123.66 1123.65 1123.65 1123.64 1123.63 1123.62 1123.62 1123.61 1123.6
- 1123.6 1123.59 1123.58 1123.57 1123.57
- </DataArray>
- <DataArray type="Float32" Name="lambda_g" NumberOfComponents="1" format="ascii">
- 0 0 0 0 0 0 0 0 0 0 -4.92199e-14 0
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 -9.84399e-14 0 0 0 0 0
- 0 0 0 0 0 -9.84399e-14 -9.84399e-14 -9.84399e-14 0 0 0 0
- 0 0 0 0 0 0 -9.84399e-14 0 0 0 0 -1.4766e-13
- 0 0 0 0 0 -1.4766e-13 0 0 -4.92199e-14 0 0 0
- 0 -9.84399e-14 0 0 0 0 0 0 0 0 -4.92199e-14 0
- 0 0 0 0 0 -1.4766e-13 0 0 0 0 0 0
+ <DataArray type="Float32" Name="p_liquid" NumberOfComponents="1" format="ascii">
+ 4.2e+06 4.159e+06 4.118e+06 4.077e+06 4.036e+06 3.995e+06 3.954e+06 3.913e+06 3.872e+06 3.831e+06 3.79e+06 3.749e+06
+ 3.708e+06 3.667e+06 3.626e+06 3.585e+06 3.544e+06 3.503e+06 3.462e+06 3.421e+06 3.38e+06 3.339e+06 3.298e+06 3.257e+06
+ 3.216e+06 3.175e+06 3.134e+06 3.093e+06 3.052e+06 3.011e+06 2.97e+06 2.929e+06 2.888e+06 2.847e+06 2.806e+06 2.765e+06
+ 2.724e+06 2.683e+06 2.642e+06 2.601e+06 2.56e+06 2.519e+06 2.478e+06 2.437e+06 2.396e+06 2.355e+06 2.314e+06 2.273e+06
+ 2.232e+06 2.191e+06 2.15e+06 2.109e+06 2.068e+06 2.027e+06 1.986e+06 1.945e+06 1.904e+06 1.863e+06 1.822e+06 1.781e+06
+ 1.74e+06 1.699e+06 1.658e+06 1.617e+06 1.576e+06 1.535e+06 1.494e+06 1.453e+06 1.412e+06 1.371e+06 1.33e+06 1.289e+06
+ 1.248e+06 1.207e+06 1.166e+06 1.125e+06 1.084e+06 1.043e+06 1.002e+06 961000 920000 879000 838000 797000
+ 756000 715000 674000 633000 592000 551000 510000 469000 428000 387000 346000 305000
+ 264000 223000 182000 141000 100000
+ </DataArray>
+ <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
+ 4.2e+06 4.159e+06 4.118e+06 4.077e+06 4.036e+06 3.995e+06 3.954e+06 3.913e+06 3.872e+06 3.831e+06 3.79e+06 3.749e+06
+ 3.708e+06 3.667e+06 3.626e+06 3.585e+06 3.544e+06 3.503e+06 3.462e+06 3.421e+06 3.38e+06 3.339e+06 3.298e+06 3.257e+06
+ 3.216e+06 3.175e+06 3.134e+06 3.093e+06 3.052e+06 3.011e+06 2.97e+06 2.929e+06 2.888e+06 2.847e+06 2.806e+06 2.765e+06
+ 2.724e+06 2.683e+06 2.642e+06 2.601e+06 2.56e+06 2.519e+06 2.478e+06 2.437e+06 2.396e+06 2.355e+06 2.314e+06 2.273e+06
+ 2.232e+06 2.191e+06 2.15e+06 2.109e+06 2.068e+06 2.027e+06 1.986e+06 1.945e+06 1.904e+06 1.863e+06 1.822e+06 1.781e+06
+ 1.74e+06 1.699e+06 1.658e+06 1.617e+06 1.576e+06 1.535e+06 1.494e+06 1.453e+06 1.412e+06 1.371e+06 1.33e+06 1.289e+06
+ 1.248e+06 1.207e+06 1.166e+06 1.125e+06 1.084e+06 1.043e+06 1.002e+06 961000 920000 879000 838000 797000
+ 756000 715000 674000 633000 592000 551000 510000 469000 428000 387000 346000 305000
+ 264000 223000 182000 141000 100000
+ </DataArray>
+ <DataArray type="Float32" Name="rho_liquid" 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
+ 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+ 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+ 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+ 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+ 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+ 1000 1000 1000 1000 1000
+ </DataArray>
+ <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
+ 48.2852 47.8139 47.3425 46.8712 46.3998 45.9285 45.4571 44.9857 44.5144 44.043 43.5717 43.1003
+ 42.629 42.1576 41.6863 41.2149 40.7435 40.2722 39.8008 39.3295 38.8581 38.3868 37.9154 37.444
+ 36.9727 36.5013 36.03 35.5586 35.0873 34.6159 34.1446 33.6732 33.2018 32.7305 32.2591 31.7878
+ 31.3164 30.8451 30.3737 29.9024 29.431 28.9596 28.4883 28.0169 27.5456 27.0742 26.6029 26.1315
+ 25.6602 25.1888 24.7174 24.2461 23.7747 23.3034 22.832 22.3607 21.8893 21.4179 20.9466 20.4752
+ 20.0039 19.5325 19.0612 18.5898 18.1185 17.6471 17.1757 16.7044 16.233 15.7617 15.2903 14.819
+ 14.3476 13.8763 13.4049 12.9335 12.4622 11.9908 11.5195 11.0481 10.5768 10.1054 9.63405 9.1627
+ 8.69134 8.21999 7.74863 7.27727 6.80592 6.33456 5.86321 5.39185 4.9205 4.44914 3.97778 3.50643
+ 3.03507 2.56372 2.09236 1.621 1.14965
+ </DataArray>
+ <DataArray type="Float32" Name="lambda_liquid" 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
+ 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+ 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+ 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000 1000
+ 1000 1000 1000 1000 1000 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="lambda_gas" NumberOfComponents="1" format="ascii">
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 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="porosity" NumberOfComponents="1" format="ascii">
@@ -102,7 +102,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_l^H2O" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_liquid^H2O" 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
@@ -113,7 +113,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
</DataArray>
- <DataArray type="Float32" Name="x_l^N2" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="x_liquid^Air" 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
@@ -124,48 +124,48 @@
1e-05 1e-05 1e-05 1e-05 1e-05 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_g^H2O" NumberOfComponents="1" format="ascii">
- 0.000754694 0.000762125 0.000769703 0.000777434 0.000785323 0.000793373 0.00080159 0.000809979 0.000818546 0.000827296 0.000836235 0.00084537
- 0.000854708 0.000864253 0.000874015 0.000884 0.000894216 0.000904672 0.000915375 0.000926334 0.00093756 0.000949061 0.000960848 0.000972931
- 0.000985323 0.000998035 0.00101108 0.00102447 0.00103822 0.00105235 0.00106686 0.00108178 0.00109713 0.00111291 0.00112916 0.00114589
- 0.00116312 0.00118088 0.0011992 0.00121808 0.00123758 0.00125771 0.0012785 0.0013 0.00132223 0.00134523 0.00136905 0.00139373
- 0.00141931 0.00144586 0.00147341 0.00150204 0.0015318 0.00156277 0.00159501 0.00162862 0.00166367 0.00170026 0.00173851 0.00177851
- 0.0018204 0.0018643 0.00191039 0.0019588 0.00200974 0.0020634 0.00212001 0.00217981 0.00224308 0.00231014 0.00238133 0.00245705
- 0.00253775 0.00262393 0.00271617 0.00281513 0.00292158 0.00303641 0.00316063 0.00329545 0.00344229 0.00360283 0.00377908 0.00397347
- 0.00418895 0.00442914 0.00469856 0.00500289 0.00534938 0.00574745 0.00620954 0.00675244 0.00739939 0.00818346 0.00915342 0.0103843
- 0.0119976 0.0142045 0.0174065 0.0224722 0.0316972
- </DataArray>
- <DataArray type="Float32" Name="x_g^N2" NumberOfComponents="1" format="ascii">
- 0.0205467 0.020749 0.0209554 0.0211658 0.0213806 0.0215998 0.0218235 0.0220519 0.0222851 0.0225233 0.0227667 0.0230154
- 0.0232696 0.0235295 0.0237953 0.0240671 0.0243453 0.0246299 0.0249213 0.0252197 0.0255253 0.0258384 0.0261593 0.0264883
- 0.0268257 0.0271717 0.0275269 0.0278914 0.0282658 0.0286503 0.0290455 0.0294517 0.0298695 0.0302993 0.0307417 0.0311971
- 0.0316663 0.0321499 0.0326484 0.0331626 0.0336934 0.0342414 0.0348075 0.0353927 0.0359979 0.0366242 0.0372727 0.0379446
- 0.0386412 0.0393638 0.040114 0.0408934 0.0417037 0.0425467 0.0434246 0.0443395 0.0452938 0.0462901 0.0473312 0.0484203
- 0.0495607 0.0507561 0.0520107 0.0533289 0.0547157 0.0561766 0.0577177 0.0593457 0.0610683 0.062894 0.0648322 0.0668937
- 0.0690907 0.071437 0.0739483 0.0766426 0.0795408 0.0826669 0.0860489 0.0897194 0.0937172 0.0980879 0.102886 0.108179
- 0.114045 0.120584 0.127919 0.136205 0.145638 0.156476 0.169056 0.183837 0.20145 0.222797 0.249204 0.282714
- 0.326637 0.386721 0.473895 0.611811 0.862962
- </DataArray>
- <DataArray type="Float32" Name="velocity_l" NumberOfComponents="1" format="ascii">
- 0.00459088 0.00459093 0.00459101 0.0045911 0.00459118 0.00459127 0.00459135 0.00459143 0.00459152 0.0045916 0.00459169 0.00459177
- 0.00459186 0.00459194 0.00459203 0.00459211 0.0045922 0.00459228 0.00459237 0.00459245 0.00459254 0.00459262 0.00459271 0.00459279
- 0.00459288 0.00459296 0.00459305 0.00459313 0.00459322 0.0045933 0.00459338 0.00459347 0.00459355 0.00459364 0.00459372 0.00459381
- 0.00459389 0.00459398 0.00459406 0.00459415 0.00459423 0.00459432 0.0045944 0.00459449 0.00459457 0.00459466 0.00459474 0.00459483
- 0.00459491 0.004595 0.00459508 0.00459517 0.00459525 0.00459534 0.00459542 0.00459551 0.00459559 0.00459568 0.00459576 0.00459585
- 0.00459593 0.00459602 0.0045961 0.00459619 0.00459627 0.00459636 0.00459644 0.00459653 0.00459661 0.0045967 0.00459678 0.00459687
- 0.00459695 0.00459704 0.00459712 0.00459721 0.00459729 0.00459738 0.00459746 0.00459755 0.00459764 0.00459772 0.0045978 0.00459789
- 0.00459798 0.00459806 0.00459815 0.00459823 0.00459832 0.0045984 0.00459849 0.00459857 0.00459866 0.00459874 0.00459883 0.00459891
- 0.004599 0.00459908 0.00459917 0.00459925 0.0045993
- </DataArray>
- <DataArray type="Float32" Name="velocity_g" NumberOfComponents="1" format="ascii">
- 0 0 0 0 0 0 0 0 0 0 -1.00802e-19 -1.00802e-19
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 -2.01704e-19 -2.01704e-19 0 0 0 0
- 0 0 0 0 0 -2.01759e-19 -4.03523e-19 -4.03533e-19 -2.01769e-19 0 0 0
- 0 0 0 0 0 0 -2.01824e-19 -2.01824e-19 0 0 0 -3.02774e-19
- -3.02774e-19 0 0 0 0 -3.02819e-19 -3.02819e-19 0 -1.00947e-19 -1.00947e-19 0 0
- 0 -2.0192e-19 -2.0192e-19 0 0 0 0 0 0 0 -1.00982e-19 -1.00982e-19
- 0 0 0 0 0 -3.03e-19 -3.03e-19 0 0 0 0 0
+ <DataArray type="Float32" Name="x_gas^H2O" NumberOfComponents="1" format="ascii">
+ 0.000754694 0.000762134 0.000769722 0.000777463 0.000785361 0.000793421 0.000801648 0.000810047 0.000818625 0.000827386 0.000836336 0.000845483
+ 0.000854831 0.000864389 0.000874163 0.00088416 0.000894389 0.000904857 0.000915573 0.000926546 0.000937786 0.000949301 0.000961102 0.000973201
+ 0.000985608 0.000998335 0.0010114 0.0010248 0.00103857 0.00105271 0.00106724 0.00108218 0.00109755 0.00111335 0.00112962 0.00114637
+ 0.00116363 0.00118141 0.00119974 0.00121865 0.00123817 0.00125832 0.00127914 0.00130066 0.00132292 0.00134595 0.0013698 0.00139451
+ 0.00142012 0.0014467 0.00147429 0.00150295 0.00153274 0.00156375 0.00159603 0.00162967 0.00166477 0.0017014 0.00173969 0.00177974
+ 0.00182168 0.00186564 0.00191177 0.00196024 0.00201124 0.00206496 0.00212163 0.0021815 0.00224484 0.00231197 0.00238324 0.00245905
+ 0.00253984 0.00262611 0.00271845 0.00281752 0.00292409 0.00303904 0.00316339 0.00329835 0.00344534 0.00360605 0.00378248 0.00397706
+ 0.00419274 0.00443317 0.00470284 0.00500745 0.00535425 0.00575266 0.00621513 0.00675845 0.00740588 0.00819048 0.00916103 0.0103925
+ 0.0120065 0.014214 0.017416 0.0224802 0.0316972
+ </DataArray>
+ <DataArray type="Float32" Name="x_gas^Air" NumberOfComponents="1" format="ascii">
+ 0.0172002 0.0173698 0.0175427 0.0177192 0.0178992 0.0180829 0.0182704 0.0184618 0.0186573 0.018857 0.019061 0.0192694
+ 0.0194825 0.0197003 0.0199231 0.0201509 0.020384 0.0206226 0.0208668 0.0211169 0.0213731 0.0216355 0.0219045 0.0221802
+ 0.022463 0.0227531 0.0230507 0.0233563 0.0236701 0.0239924 0.0243236 0.0246641 0.0250142 0.0253744 0.0257452 0.026127
+ 0.0265202 0.0269255 0.0273433 0.0277743 0.0282192 0.0286785 0.029153 0.0296434 0.0301507 0.0306756 0.0312191 0.0317822
+ 0.032366 0.0329717 0.0336005 0.0342537 0.0349328 0.0356394 0.0363751 0.0371419 0.0379417 0.0387767 0.0396493 0.0405621
+ 0.0415178 0.0425197 0.0435712 0.044676 0.0458382 0.0470626 0.0483541 0.0497185 0.0511622 0.0526922 0.0543166 0.0560442
+ 0.0578854 0.0598517 0.0619563 0.0642142 0.066643 0.0692627 0.0720968 0.0751728 0.0785229 0.0821855 0.0862065 0.0906412
+ 0.0955569 0.101036 0.107183 0.114125 0.122029 0.131109 0.141649 0.154032 0.168787 0.186669 0.208789 0.236856
+ 0.27364 0.323951 0.396929 0.512348 0.72241
+ </DataArray>
+ <DataArray type="Float32" Name="velocity_liquid" NumberOfComponents="1" format="ascii">
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ 0.0040908 0.0040908 0.0040908 0.0040908 0.0040908
+ </DataArray>
+ <DataArray type="Float32" Name="velocity_gas" NumberOfComponents="1" format="ascii">
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 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>
</PointData>
diff --git a/test/boxmodels/mpnc/forchheimer1pproblem.hh b/test/boxmodels/mpnc/forchheimer1pproblem.hh
index a8a0398a6cbedda78bdd62833a41ee5774b78ea8..42f89407cab2b9fd680acf50d4d9f509d2865608 100644
--- a/test/boxmodels/mpnc/forchheimer1pproblem.hh
+++ b/test/boxmodels/mpnc/forchheimer1pproblem.hh
@@ -34,7 +34,7 @@
#include <dumux/boxmodels/mpnc/mpncmodel.hh>
#include <dumux/boxmodels/common/porousmediaboxproblem.hh>
-#include <dumux/material/fluidsystems/h2on2fluidsystem.hh>
+#include <dumux/material/fluidsystems/h2oairfluidsystem.hh>
#include <dumux/material/constraintsolvers/computefromreferencephase.hh>
#include <dumux/material/fluidstates/compositionalfluidstate.hh>
@@ -64,7 +64,7 @@ SET_PROP(Forchheimer1pProblem, FluidSystem)
{ private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
- typedef Dumux::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
+ typedef Dumux::FluidSystems::H2OAir<Scalar, Dumux::SimpleH2O<Scalar>, /*useComplexRelations=*/false> type;
};
// Enable smooth upwinding?
@@ -126,9 +126,6 @@ SET_BOOL_PROP(Forchheimer1pProblem, MPNCVtkAddVelocities, true);
* -> mu = 1e-03 ; cE =0.55; rho = 1000; K = 1e-12; a = mu /( cE *rho* sqrt(K) );
* -> gradP = -41e5; v = - a /2 + sqrt (a^2/4-sqrt(K)*gradP/(rho *cE))
*
- * For an exact comparison of the calculated velocities a water component with constant
- * properties has to be chosen. I.e. change from TabulatedH2O to SimpleH2O
- * in the h2on2fluidsystem.
*
* To run the simulation execute the following line in shell:
* <tt>./test_forchheimer1p</tt>