diff --git a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationBrooksCorey.cpp b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationBrooksCorey.cpp
index 5a2bbf997ea791b8d4823980a8751dcbdd6f1a3e..18c532aac79525438f8ec070ffd214d98e417e12 100644
--- a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationBrooksCorey.cpp
+++ b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationBrooksCorey.cpp
@@ -58,8 +58,8 @@ PropertyDataType SaturationBrooksCorey::value(
PropertyDataType SaturationBrooksCorey::dValue(
VariableArray const& variable_array, Variable const primary_variable,
- ParameterLib::SpatialPosition const& pos, double const t,
- double const dt) const
+ ParameterLib::SpatialPosition const& /*pos*/, double const /*t*/,
+ double const /*dt*/) const
{
if (primary_variable != Variable::capillary_pressure)
{
@@ -68,25 +68,22 @@ PropertyDataType SaturationBrooksCorey::dValue(
"respect to capillary pressure only.");
}
- const double s_L_res = residual_liquid_saturation_;
- const double s_L_max = 1.0 - residual_gas_saturation_;
const double p_b = entry_pressure_;
- const double p_cap = std::max(
- p_b,
- std::get<double>(
- variable_array[static_cast<int>(Variable::capillary_pressure)]));
+ const double p_cap = std::get<double>(
+ variable_array[static_cast<int>(Variable::capillary_pressure)]);
- auto const s_L = std::visit(
- [&variable_array, &pos, t, dt](auto&& scale) -> double {
- return scale->property(PropertyType::saturation)
- .template value<double>(variable_array, pos, t, dt);
- },
- scale_);
+ if (p_cap <= p_b)
+ {
+ return 0.;
+ }
+ const double s_L_res = residual_liquid_saturation_;
+ const double s_L_max = 1.0 - residual_gas_saturation_;
const double lambda = exponent_;
- const double ds_L_d_s_eff = 1. / (s_L_max - s_L_res);
- return -lambda / p_cap * s_L * ds_L_d_s_eff;
+ const double ds_eff_dp_cap =
+ -lambda * std::pow(p_b, lambda) / std::pow(p_cap, lambda + 1);
+ return ds_eff_dp_cap * (s_L_max - s_L_res);
}
PropertyDataType SaturationBrooksCorey::d2Value(
@@ -109,6 +106,11 @@ PropertyDataType SaturationBrooksCorey::d2Value(
std::get<double>(
variable_array[static_cast<int>(Variable::capillary_pressure)]));
+ if (p_cap <= p_b)
+ {
+ return 0.;
+ }
+
const double s_L_res = residual_liquid_saturation_;
const double s_L_max = 1.0 - residual_gas_saturation_;
diff --git a/ProcessLib/TwoPhaseFlowWithPP/Tests.cmake b/ProcessLib/TwoPhaseFlowWithPP/Tests.cmake
index d7fce0c2925f96c9511bd6ad19fdc0ae71e34910..0d39eeb37fc1bfb3c9621e04b893fe7f67067b5a 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/Tests.cmake
+++ b/ProcessLib/TwoPhaseFlowWithPP/Tests.cmake
@@ -33,7 +33,7 @@ AddTest(
REQUIREMENTS NOT OGS_USE_MPI
RUNTIME 12
DIFF_DATA
- mcwt_1000.vtu twophaseflow_ts_519_t_1000.000000.vtu SATURATION1 saturation 1e-2 1e-4
- mcwt_1000.vtu twophaseflow_ts_519_t_1000.000000.vtu PRESSURE1 capillary_pressure 10 1e-3
- mcwt_1000.vtu twophaseflow_ts_519_t_1000.000000.vtu PRESSURE2 gas_pressure 10 1e-3
+ twophaseflow_ts_627_t_1000.000000.vtu twophaseflow_ts_627_t_1000.000000.vtu saturation saturation 1e-3 1e-4
+ twophaseflow_ts_627_t_1000.000000.vtu twophaseflow_ts_627_t_1000.000000.vtu capillary_pressure capillary_pressure 1e-3 1e-4
+ twophaseflow_ts_627_t_1000.000000.vtu twophaseflow_ts_627_t_1000.000000.vtu gas_pressure gas_pressure 1e-3 1e-4
)
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/TwoPhase_mcwt_line.prj b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/TwoPhase_mcwt_line.prj
index 64a453965ce5753c70a05141e22753590803ec84..500247c2e12d73a8cacc4bca8463db0e3a73e3cf 100644
--- a/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/TwoPhase_mcwt_line.prj
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/TwoPhase_mcwt_line.prj
@@ -143,9 +143,10 @@
<process ref="GW23">
<nonlinear_solver>basic_newton</nonlinear_solver>
<convergence_criterion>
- <type>DeltaX</type>
+ <type>PerComponentDeltaX</type>
<norm_type>NORM2</norm_type>
- <abstol>1.e-6</abstol>
+ <abstols>1e-05 1e-05</abstols>
+ <reltols>1e-08 1e-08</reltols>
</convergence_criterion>
<time_discretization>
<type>BackwardEuler</type>
@@ -165,19 +166,19 @@
</pair>
<pair>
<repeat>100</repeat>
- <delta_t>1</delta_t>
+ <delta_t>0.5</delta_t>
</pair>
<pair>
<repeat>100</repeat>
- <delta_t>2</delta_t>
+ <delta_t>1</delta_t>
</pair>
<pair>
<repeat>100</repeat>
- <delta_t>5</delta_t>
+ <delta_t>2</delta_t>
</pair>
<pair>
<repeat>100</repeat>
- <delta_t>10</delta_t>
+ <delta_t>5</delta_t>
</pair>
</timesteps>
</time_stepping>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/mcwt_1000.vtu b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/mcwt_1000.vtu
deleted file mode 100644
index b2db028e79ce87ffdc2c7bb3b1c268da6a8f59a6..0000000000000000000000000000000000000000
--- a/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/mcwt_1000.vtu
+++ /dev/null
@@ -1,554 +0,0 @@
-<?xml version="1.0"?>
-<!-- Time step: 192 | Time: 1.000000000000e+004 -->
-<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
- <UnstructuredGrid>
- <Piece NumberOfPoints="260" NumberOfCells="259">
- <Points>
- <DataArray type="Float64" NumberOfComponents="3" format="ascii">
- 0.000000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.300000000000e+000 0.000000000000e+000 0.000000000000e+000
- 2.600000000000e+000 0.000000000000e+000 0.000000000000e+000
- 9.999999999990e-003 0.000000000000e+000 0.000000000000e+000
- 1.999999999998e-002 0.000000000000e+000 0.000000000000e+000
- 2.999999999997e-002 0.000000000000e+000 0.000000000000e+000
- 3.999999999996e-002 0.000000000000e+000 0.000000000000e+000
- 4.999999999995e-002 0.000000000000e+000 0.000000000000e+000
- 5.999999999994e-002 0.000000000000e+000 0.000000000000e+000
- 6.999999999993e-002 0.000000000000e+000 0.000000000000e+000
- 7.999999999992e-002 0.000000000000e+000 0.000000000000e+000
- 8.999999999991e-002 0.000000000000e+000 0.000000000000e+000
- 9.999999999990e-002 0.000000000000e+000 0.000000000000e+000
- 1.099999999999e-001 0.000000000000e+000 0.000000000000e+000
- 1.199999999999e-001 0.000000000000e+000 0.000000000000e+000
- 1.299999999999e-001 0.000000000000e+000 0.000000000000e+000
- 1.399999999999e-001 0.000000000000e+000 0.000000000000e+000
- 1.499999999999e-001 0.000000000000e+000 0.000000000000e+000
- 1.599999999998e-001 0.000000000000e+000 0.000000000000e+000
- 1.699999999998e-001 0.000000000000e+000 0.000000000000e+000
- 1.799999999998e-001 0.000000000000e+000 0.000000000000e+000
- 1.899999999998e-001 0.000000000000e+000 0.000000000000e+000
- 1.999999999998e-001 0.000000000000e+000 0.000000000000e+000
- 2.099999999998e-001 0.000000000000e+000 0.000000000000e+000
- 2.199999999998e-001 0.000000000000e+000 0.000000000000e+000
- 2.299999999998e-001 0.000000000000e+000 0.000000000000e+000
- 2.399999999998e-001 0.000000000000e+000 0.000000000000e+000
- 2.499999999998e-001 0.000000000000e+000 0.000000000000e+000
- 2.599999999997e-001 0.000000000000e+000 0.000000000000e+000
- 2.699999999997e-001 0.000000000000e+000 0.000000000000e+000
- 2.799999999997e-001 0.000000000000e+000 0.000000000000e+000
- 2.899999999997e-001 0.000000000000e+000 0.000000000000e+000
- 2.999999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.099999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.199999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.299999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.399999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.499999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.599999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.699999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.799999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.899999999997e-001 0.000000000000e+000 0.000000000000e+000
- 3.999999999997e-001 0.000000000000e+000 0.000000000000e+000
- 4.099999999997e-001 0.000000000000e+000 0.000000000000e+000
- 4.199999999997e-001 0.000000000000e+000 0.000000000000e+000
- 4.299999999996e-001 0.000000000000e+000 0.000000000000e+000
- 4.399999999996e-001 0.000000000000e+000 0.000000000000e+000
- 4.499999999996e-001 0.000000000000e+000 0.000000000000e+000
- 4.599999999996e-001 0.000000000000e+000 0.000000000000e+000
- 4.699999999996e-001 0.000000000000e+000 0.000000000000e+000
- 4.799999999996e-001 0.000000000000e+000 0.000000000000e+000
- 4.899999999996e-001 0.000000000000e+000 0.000000000000e+000
- 4.999999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.099999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.199999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.299999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.399999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.499999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.599999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.699999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.799999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.899999999996e-001 0.000000000000e+000 0.000000000000e+000
- 5.999999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.099999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.199999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.299999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.399999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.499999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.599999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.699999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.799999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.899999999996e-001 0.000000000000e+000 0.000000000000e+000
- 6.999999999996e-001 0.000000000000e+000 0.000000000000e+000
- 7.099999999997e-001 0.000000000000e+000 0.000000000000e+000
- 7.199999999997e-001 0.000000000000e+000 0.000000000000e+000
- 7.299999999997e-001 0.000000000000e+000 0.000000000000e+000
- 7.399999999997e-001 0.000000000000e+000 0.000000000000e+000
- 7.499999999997e-001 0.000000000000e+000 0.000000000000e+000
- 7.599999999998e-001 0.000000000000e+000 0.000000000000e+000
- 7.699999999998e-001 0.000000000000e+000 0.000000000000e+000
- 7.799999999998e-001 0.000000000000e+000 0.000000000000e+000
- 7.899999999998e-001 0.000000000000e+000 0.000000000000e+000
- 7.999999999998e-001 0.000000000000e+000 0.000000000000e+000
- 8.099999999998e-001 0.000000000000e+000 0.000000000000e+000
- 8.199999999999e-001 0.000000000000e+000 0.000000000000e+000
- 8.299999999999e-001 0.000000000000e+000 0.000000000000e+000
- 8.399999999999e-001 0.000000000000e+000 0.000000000000e+000
- 8.499999999999e-001 0.000000000000e+000 0.000000000000e+000
- 8.599999999999e-001 0.000000000000e+000 0.000000000000e+000
- 8.699999999999e-001 0.000000000000e+000 0.000000000000e+000
- 8.800000000000e-001 0.000000000000e+000 0.000000000000e+000
- 8.900000000000e-001 0.000000000000e+000 0.000000000000e+000
- 9.000000000000e-001 0.000000000000e+000 0.000000000000e+000
- 9.100000000000e-001 0.000000000000e+000 0.000000000000e+000
- 9.200000000000e-001 0.000000000000e+000 0.000000000000e+000
- 9.300000000000e-001 0.000000000000e+000 0.000000000000e+000
- 9.400000000001e-001 0.000000000000e+000 0.000000000000e+000
- 9.500000000001e-001 0.000000000000e+000 0.000000000000e+000
- 9.600000000001e-001 0.000000000000e+000 0.000000000000e+000
- 9.700000000001e-001 0.000000000000e+000 0.000000000000e+000
- 9.800000000001e-001 0.000000000000e+000 0.000000000000e+000
- 9.900000000001e-001 0.000000000000e+000 0.000000000000e+000
- 1.000000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.010000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.020000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.030000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.040000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.050000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.060000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.070000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.080000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.090000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.100000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.110000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.120000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.130000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.140000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.150000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.160000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.170000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.180000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.190000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.200000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.210000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.220000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.230000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.240000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.250000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.260000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.270000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.280000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.290000000000e+000 0.000000000000e+000 0.000000000000e+000
- 1.310077519380e+000 0.000000000000e+000 0.000000000000e+000
- 1.320155038760e+000 0.000000000000e+000 0.000000000000e+000
- 1.330232558139e+000 0.000000000000e+000 0.000000000000e+000
- 1.340310077519e+000 0.000000000000e+000 0.000000000000e+000
- 1.350387596899e+000 0.000000000000e+000 0.000000000000e+000
- 1.360465116279e+000 0.000000000000e+000 0.000000000000e+000
- 1.370542635658e+000 0.000000000000e+000 0.000000000000e+000
- 1.380620155038e+000 0.000000000000e+000 0.000000000000e+000
- 1.390697674418e+000 0.000000000000e+000 0.000000000000e+000
- 1.400775193798e+000 0.000000000000e+000 0.000000000000e+000
- 1.410852713178e+000 0.000000000000e+000 0.000000000000e+000
- 1.420930232557e+000 0.000000000000e+000 0.000000000000e+000
- 1.431007751937e+000 0.000000000000e+000 0.000000000000e+000
- 1.441085271317e+000 0.000000000000e+000 0.000000000000e+000
- 1.451162790697e+000 0.000000000000e+000 0.000000000000e+000
- 1.461240310076e+000 0.000000000000e+000 0.000000000000e+000
- 1.471317829456e+000 0.000000000000e+000 0.000000000000e+000
- 1.481395348836e+000 0.000000000000e+000 0.000000000000e+000
- 1.491472868216e+000 0.000000000000e+000 0.000000000000e+000
- 1.501550387596e+000 0.000000000000e+000 0.000000000000e+000
- 1.511627906975e+000 0.000000000000e+000 0.000000000000e+000
- 1.521705426355e+000 0.000000000000e+000 0.000000000000e+000
- 1.531782945735e+000 0.000000000000e+000 0.000000000000e+000
- 1.541860465115e+000 0.000000000000e+000 0.000000000000e+000
- 1.551937984495e+000 0.000000000000e+000 0.000000000000e+000
- 1.562015503874e+000 0.000000000000e+000 0.000000000000e+000
- 1.572093023254e+000 0.000000000000e+000 0.000000000000e+000
- 1.582170542634e+000 0.000000000000e+000 0.000000000000e+000
- 1.592248062014e+000 0.000000000000e+000 0.000000000000e+000
- 1.602325581393e+000 0.000000000000e+000 0.000000000000e+000
- 1.612403100773e+000 0.000000000000e+000 0.000000000000e+000
- 1.622480620153e+000 0.000000000000e+000 0.000000000000e+000
- 1.632558139533e+000 0.000000000000e+000 0.000000000000e+000
- 1.642635658913e+000 0.000000000000e+000 0.000000000000e+000
- 1.652713178292e+000 0.000000000000e+000 0.000000000000e+000
- 1.662790697672e+000 0.000000000000e+000 0.000000000000e+000
- 1.672868217052e+000 0.000000000000e+000 0.000000000000e+000
- 1.682945736432e+000 0.000000000000e+000 0.000000000000e+000
- 1.693023255812e+000 0.000000000000e+000 0.000000000000e+000
- 1.703100775192e+000 0.000000000000e+000 0.000000000000e+000
- 1.713178294571e+000 0.000000000000e+000 0.000000000000e+000
- 1.723255813951e+000 0.000000000000e+000 0.000000000000e+000
- 1.733333333331e+000 0.000000000000e+000 0.000000000000e+000
- 1.743410852711e+000 0.000000000000e+000 0.000000000000e+000
- 1.753488372091e+000 0.000000000000e+000 0.000000000000e+000
- 1.763565891470e+000 0.000000000000e+000 0.000000000000e+000
- 1.773643410850e+000 0.000000000000e+000 0.000000000000e+000
- 1.783720930230e+000 0.000000000000e+000 0.000000000000e+000
- 1.793798449610e+000 0.000000000000e+000 0.000000000000e+000
- 1.803875968990e+000 0.000000000000e+000 0.000000000000e+000
- 1.813953488370e+000 0.000000000000e+000 0.000000000000e+000
- 1.824031007749e+000 0.000000000000e+000 0.000000000000e+000
- 1.834108527129e+000 0.000000000000e+000 0.000000000000e+000
- 1.844186046509e+000 0.000000000000e+000 0.000000000000e+000
- 1.854263565889e+000 0.000000000000e+000 0.000000000000e+000
- 1.864341085269e+000 0.000000000000e+000 0.000000000000e+000
- 1.874418604649e+000 0.000000000000e+000 0.000000000000e+000
- 1.884496124028e+000 0.000000000000e+000 0.000000000000e+000
- 1.894573643408e+000 0.000000000000e+000 0.000000000000e+000
- 1.904651162788e+000 0.000000000000e+000 0.000000000000e+000
- 1.914728682168e+000 0.000000000000e+000 0.000000000000e+000
- 1.924806201548e+000 0.000000000000e+000 0.000000000000e+000
- 1.934883720927e+000 0.000000000000e+000 0.000000000000e+000
- 1.944961240307e+000 0.000000000000e+000 0.000000000000e+000
- 1.955038759687e+000 0.000000000000e+000 0.000000000000e+000
- 1.965116279067e+000 0.000000000000e+000 0.000000000000e+000
- 1.975193798447e+000 0.000000000000e+000 0.000000000000e+000
- 1.985271317827e+000 0.000000000000e+000 0.000000000000e+000
- 1.995348837207e+000 0.000000000000e+000 0.000000000000e+000
- 2.005426356587e+000 0.000000000000e+000 0.000000000000e+000
- 2.015503875967e+000 0.000000000000e+000 0.000000000000e+000
- 2.025581395347e+000 0.000000000000e+000 0.000000000000e+000
- 2.035658914726e+000 0.000000000000e+000 0.000000000000e+000
- 2.045736434106e+000 0.000000000000e+000 0.000000000000e+000
- 2.055813953486e+000 0.000000000000e+000 0.000000000000e+000
- 2.065891472866e+000 0.000000000000e+000 0.000000000000e+000
- 2.075968992246e+000 0.000000000000e+000 0.000000000000e+000
- 2.086046511626e+000 0.000000000000e+000 0.000000000000e+000
- 2.096124031006e+000 0.000000000000e+000 0.000000000000e+000
- 2.106201550386e+000 0.000000000000e+000 0.000000000000e+000
- 2.116279069766e+000 0.000000000000e+000 0.000000000000e+000
- 2.126356589146e+000 0.000000000000e+000 0.000000000000e+000
- 2.136434108526e+000 0.000000000000e+000 0.000000000000e+000
- 2.146511627905e+000 0.000000000000e+000 0.000000000000e+000
- 2.156589147285e+000 0.000000000000e+000 0.000000000000e+000
- 2.166666666665e+000 0.000000000000e+000 0.000000000000e+000
- 2.176744186045e+000 0.000000000000e+000 0.000000000000e+000
- 2.186821705425e+000 0.000000000000e+000 0.000000000000e+000
- 2.196899224805e+000 0.000000000000e+000 0.000000000000e+000
- 2.206976744185e+000 0.000000000000e+000 0.000000000000e+000
- 2.217054263565e+000 0.000000000000e+000 0.000000000000e+000
- 2.227131782945e+000 0.000000000000e+000 0.000000000000e+000
- 2.237209302325e+000 0.000000000000e+000 0.000000000000e+000
- 2.247286821705e+000 0.000000000000e+000 0.000000000000e+000
- 2.257364341084e+000 0.000000000000e+000 0.000000000000e+000
- 2.267441860464e+000 0.000000000000e+000 0.000000000000e+000
- 2.277519379844e+000 0.000000000000e+000 0.000000000000e+000
- 2.287596899224e+000 0.000000000000e+000 0.000000000000e+000
- 2.297674418604e+000 0.000000000000e+000 0.000000000000e+000
- 2.307751937984e+000 0.000000000000e+000 0.000000000000e+000
- 2.317829457364e+000 0.000000000000e+000 0.000000000000e+000
- 2.327906976744e+000 0.000000000000e+000 0.000000000000e+000
- 2.337984496123e+000 0.000000000000e+000 0.000000000000e+000
- 2.348062015503e+000 0.000000000000e+000 0.000000000000e+000
- 2.358139534883e+000 0.000000000000e+000 0.000000000000e+000
- 2.368217054263e+000 0.000000000000e+000 0.000000000000e+000
- 2.378294573643e+000 0.000000000000e+000 0.000000000000e+000
- 2.388372093023e+000 0.000000000000e+000 0.000000000000e+000
- 2.398449612403e+000 0.000000000000e+000 0.000000000000e+000
- 2.408527131783e+000 0.000000000000e+000 0.000000000000e+000
- 2.418604651162e+000 0.000000000000e+000 0.000000000000e+000
- 2.428682170542e+000 0.000000000000e+000 0.000000000000e+000
- 2.438759689922e+000 0.000000000000e+000 0.000000000000e+000
- 2.448837209302e+000 0.000000000000e+000 0.000000000000e+000
- 2.458914728682e+000 0.000000000000e+000 0.000000000000e+000
- 2.468992248062e+000 0.000000000000e+000 0.000000000000e+000
- 2.479069767442e+000 0.000000000000e+000 0.000000000000e+000
- 2.489147286821e+000 0.000000000000e+000 0.000000000000e+000
- 2.499224806201e+000 0.000000000000e+000 0.000000000000e+000
- 2.509302325581e+000 0.000000000000e+000 0.000000000000e+000
- 2.519379844961e+000 0.000000000000e+000 0.000000000000e+000
- 2.529457364341e+000 0.000000000000e+000 0.000000000000e+000
- 2.539534883721e+000 0.000000000000e+000 0.000000000000e+000
- 2.549612403101e+000 0.000000000000e+000 0.000000000000e+000
- 2.559689922481e+000 0.000000000000e+000 0.000000000000e+000
- 2.569767441860e+000 0.000000000000e+000 0.000000000000e+000
- 2.579844961240e+000 0.000000000000e+000 0.000000000000e+000
- 2.589922480620e+000 0.000000000000e+000 0.000000000000e+000
- </DataArray>
- </Points>
- <Cells>
- <DataArray type="Int32" Name="connectivity" format="ascii">
- 0 3
- 3 4
- 4 5
- 5 6
- 6 7
- 7 8
- 8 9
- 9 10
- 10 11
- 11 12
- 12 13
- 13 14
- 14 15
- 15 16
- 16 17
- 17 18
- 18 19
- 19 20
- 20 21
- 21 22
- 22 23
- 23 24
- 24 25
- 25 26
- 26 27
- 27 28
- 28 29
- 29 30
- 30 31
- 31 32
- 32 33
- 33 34
- 34 35
- 35 36
- 36 37
- 37 38
- 38 39
- 39 40
- 40 41
- 41 42
- 42 43
- 43 44
- 44 45
- 45 46
- 46 47
- 47 48
- 48 49
- 49 50
- 50 51
- 51 52
- 52 53
- 53 54
- 54 55
- 55 56
- 56 57
- 57 58
- 58 59
- 59 60
- 60 61
- 61 62
- 62 63
- 63 64
- 64 65
- 65 66
- 66 67
- 67 68
- 68 69
- 69 70
- 70 71
- 71 72
- 72 73
- 73 74
- 74 75
- 75 76
- 76 77
- 77 78
- 78 79
- 79 80
- 80 81
- 81 82
- 82 83
- 83 84
- 84 85
- 85 86
- 86 87
- 87 88
- 88 89
- 89 90
- 90 91
- 91 92
- 92 93
- 93 94
- 94 95
- 95 96
- 96 97
- 97 98
- 98 99
- 99 100
- 100 101
- 101 102
- 102 103
- 103 104
- 104 105
- 105 106
- 106 107
- 107 108
- 108 109
- 109 110
- 110 111
- 111 112
- 112 113
- 113 114
- 114 115
- 115 116
- 116 117
- 117 118
- 118 119
- 119 120
- 120 121
- 121 122
- 122 123
- 123 124
- 124 125
- 125 126
- 126 127
- 127 128
- 128 129
- 129 130
- 130 131
- 131 1
- 1 132
- 132 133
- 133 134
- 134 135
- 135 136
- 136 137
- 137 138
- 138 139
- 139 140
- 140 141
- 141 142
- 142 143
- 143 144
- 144 145
- 145 146
- 146 147
- 147 148
- 148 149
- 149 150
- 150 151
- 151 152
- 152 153
- 153 154
- 154 155
- 155 156
- 156 157
- 157 158
- 158 159
- 159 160
- 160 161
- 161 162
- 162 163
- 163 164
- 164 165
- 165 166
- 166 167
- 167 168
- 168 169
- 169 170
- 170 171
- 171 172
- 172 173
- 173 174
- 174 175
- 175 176
- 176 177
- 177 178
- 178 179
- 179 180
- 180 181
- 181 182
- 182 183
- 183 184
- 184 185
- 185 186
- 186 187
- 187 188
- 188 189
- 189 190
- 190 191
- 191 192
- 192 193
- 193 194
- 194 195
- 195 196
- 196 197
- 197 198
- 198 199
- 199 200
- 200 201
- 201 202
- 202 203
- 203 204
- 204 205
- 205 206
- 206 207
- 207 208
- 208 209
- 209 210
- 210 211
- 211 212
- 212 213
- 213 214
- 214 215
- 215 216
- 216 217
- 217 218
- 218 219
- 219 220
- 220 221
- 221 222
- 222 223
- 223 224
- 224 225
- 225 226
- 226 227
- 227 228
- 228 229
- 229 230
- 230 231
- 231 232
- 232 233
- 233 234
- 234 235
- 235 236
- 236 237
- 237 238
- 238 239
- 239 240
- 240 241
- 241 242
- 242 243
- 243 244
- 244 245
- 245 246
- 246 247
- 247 248
- 248 249
- 249 250
- 250 251
- 251 252
- 252 253
- 253 254
- 254 255
- 255 256
- 256 257
- 257 258
- 258 259
- 259 2
- </DataArray>
- <DataArray type="Int32" Name="offsets" format="ascii">
- 2 4 6 8 10 12 14 16 18 20 22 24 26 28 30 32 34 36 38 40 42 44 46 48 50 52 54 56 58 60 62 64 66 68 70 72 74 76 78 80 82 84 86 88 90 92 94 96 98 100 102 104 106 108 110 112 114 116 118 120 122 124 126 128 130 132 134 136 138 140 142 144 146 148 150 152 154 156 158 160 162 164 166 168 170 172 174 176 178 180 182 184 186 188 190 192 194 196 198 200 202 204 206 208 210 212 214 216 218 220 222 224 226 228 230 232 234 236 238 240 242 244 246 248 250 252 254 256 258 260 262 264 266 268 270 272 274 276 278 280 282 284 286 288 290 292 294 296 298 300 302 304 306 308 310 312 314 316 318 320 322 324 326 328 330 332 334 336 338 340 342 344 346 348 350 352 354 356 358 360 362 364 366 368 370 372 374 376 378 380 382 384 386 388 390 392 394 396 398 400 402 404 406 408 410 412 414 416 418 420 422 424 426 428 430 432 434 436 438 440 442 444 446 448 450 452 454 456 458 460 462 464 466 468 470 472 474 476 478 480 482 484 486 488 490 492 494 496 498 500 502 504 506 508 510 512 514 516 518
- </DataArray>
- <DataArray type="UInt8" Name="types" 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 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 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 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 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 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 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 3 3 3 3 3 3 3
- </DataArray>
- </Cells>
- <PointData Scalars="PRESSURE1">
- <DataArray type="Float64" Name="PRESSURE1" format="ascii">
- 5.000000000000E+03 5.000000000000E+04 5.000000000000E+04 5.656000000000E+03 5.809500000000E+03 5.920000000000E+03 6.011000000000E+03 6.090800000000E+03 6.163300000000E+03 6.230900000000E+03 6.295000000000E+03 6.356500000000E+03 6.416300000000E+03 6.474900000000E+03 6.532800000000E+03 6.590300000000E+03 6.647800000000E+03 6.705600000000E+03 6.764000000000E+03 6.823100000000E+03 6.883400000000E+03 6.945000000000E+03 7.008300000000E+03 7.073500000000E+03 7.141000000000E+03 7.211200000000E+03 7.284300000000E+03 7.360900000000E+03 7.441500000000E+03 7.526700000000E+03 7.617100000000E+03 7.713700000000E+03 7.817300000000E+03 7.929300000000E+03 8.051200000000E+03 8.184900000000E+03 8.332900000000E+03 8.498700000000E+03 8.686800000000E+03 8.903700000000E+03 9.158800000000E+03 9.466900000000E+03 9.852100000000E+03 1.035900000000E+04 1.107000000000E+04 1.221300000000E+04 2.475800000000E+04 4.962900000000E+04 5.000000000000E+04 5.000300000000E+04 4.999900000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04 5.000000000000E+04
- </DataArray>
- <DataArray type="Float64" Name="PRESSURE2" format="ascii">
- 2.000000000000E+05 2.017100000000E+05 2.017100000000E+05 2.006500000000E+05 2.007900000000E+05 2.008900000000E+05 2.009700000000E+05 2.010300000000E+05 2.010900000000E+05 2.011400000000E+05 2.011800000000E+05 2.012200000000E+05 2.012500000000E+05 2.012900000000E+05 2.013200000000E+05 2.013500000000E+05 2.013700000000E+05 2.014000000000E+05 2.014200000000E+05 2.014400000000E+05 2.014600000000E+05 2.014800000000E+05 2.015000000000E+05 2.015200000000E+05 2.015300000000E+05 2.015500000000E+05 2.015600000000E+05 2.015800000000E+05 2.015900000000E+05 2.016000000000E+05 2.016100000000E+05 2.016200000000E+05 2.016300000000E+05 2.016400000000E+05 2.016500000000E+05 2.016600000000E+05 2.016700000000E+05 2.016700000000E+05 2.016800000000E+05 2.016800000000E+05 2.016900000000E+05 2.016900000000E+05 2.017000000000E+05 2.017000000000E+05 2.017000000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05 2.017100000000E+05
- </DataArray>
- <DataArray type="Float64" Name="SATURATION1" format="ascii">
- 9.927200000000E-01 1.000000000000E-02 1.000000000000E-02 7.783000000000E-01 7.405800000000E-01 7.132700000000E-01 6.918600000000E-01 6.738800000000E-01 6.581200000000E-01 6.439400000000E-01 6.309100000000E-01 6.187500000000E-01 6.072800000000E-01 5.963400000000E-01 5.858200000000E-01 5.756500000000E-01 5.657400000000E-01 5.560300000000E-01 5.464900000000E-01 5.370600000000E-01 5.277000000000E-01 5.183800000000E-01 5.090600000000E-01 4.997200000000E-01 4.903300000000E-01 4.808400000000E-01 4.712400000000E-01 4.614900000000E-01 4.515500000000E-01 4.414000000000E-01 4.309900000000E-01 4.202800000000E-01 4.092200000000E-01 3.977500000000E-01 3.858200000000E-01 3.733300000000E-01 3.601900000000E-01 3.462900000000E-01 3.314800000000E-01 3.155500000000E-01 2.982400000000E-01 2.791700000000E-01 2.577600000000E-01 2.332100000000E-01 2.046100000000E-01 1.512600000000E-01 3.567300000000E-02 8.005100000000E-03 1.009400000000E-02 9.974800000000E-03 1.000700000000E-02 9.998200000000E-03 1.000000000000E-02 9.999900000000E-03 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02 1.000000000000E-02
- </DataArray>
- </PointData>
- <CellData>
- </CellData>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/twophaseflow_ts_0_t_0.000000.vtu b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/twophaseflow_ts_0_t_0.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..8b87b28768c9697b96cdd7f7b7d35ba1d1aadca9
--- /dev/null
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/twophaseflow_ts_0_t_0.000000.vtu
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64" compressor="vtkZLibDataCompressor">
+ <UnstructuredGrid>
+ <FieldData>
+ <DataArray type="Int8" Name="OGS_VERSION" NumberOfTuples="21" format="appended" RangeMin="45" RangeMax="103" offset="0" />
+ </FieldData>
+ <Piece NumberOfPoints="260" NumberOfCells="259" >
+ <PointData>
+ <DataArray type="Float64" Name="capillary_pressure" format="appended" RangeMin="50000" RangeMax="50000" offset="84" />
+ <DataArray type="Float64" Name="gas_pressure" format="appended" RangeMin="0" RangeMax="0" offset="172" />
+ <DataArray type="Float64" Name="saturation" format="appended" RangeMin="0" RangeMax="0" offset="248" />
+ </PointData>
+ <CellData>
+ <DataArray type="Int32" Name="MaterialIDs" format="appended" RangeMin="0" RangeMax="0" offset="324" />
+ </CellData>
+ <Points>
+ <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="2.6" offset="392" />
+ </Points>
+ <Cells>
+ <DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="2752" />
+ <DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="3428" />
+ <DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="4048" />
+ </Cells>
+ </Piece>
+ </UnstructuredGrid>
+ <AppendedData encoding="base64">
+ _AQAAAAAAAAAAgAAAAAAAABUAAAAAAAAAHQAAAAAAAAA=eF4z0zPRM9A1NDI20U03MTKxSEs2NjMEADCqBLc=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eF5jZh7xAACLpAMK
+ </AppendedData>
+</VTKFile>
diff --git a/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/twophaseflow_ts_627_t_1000.000000.vtu b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/twophaseflow_ts_627_t_1000.000000.vtu
new file mode 100644
index 0000000000000000000000000000000000000000..c44cb46ea65c02c5ec65e137b22b59606bdb2606
--- /dev/null
+++ b/Tests/Data/Parabolic/TwoPhaseFlowPP/McWhorter/twophaseflow_ts_627_t_1000.000000.vtu
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64" compressor="vtkZLibDataCompressor">
+ <UnstructuredGrid>
+ <FieldData>
+ <DataArray type="Int8" Name="OGS_VERSION" NumberOfTuples="21" format="appended" RangeMin="45" RangeMax="103" offset="0" />
+ </FieldData>
+ <Piece NumberOfPoints="260" NumberOfCells="259" >
+ <PointData>
+ <DataArray type="Float64" Name="capillary_pressure" format="appended" RangeMin="5000" RangeMax="50000" offset="84" />
+ <DataArray type="Float64" Name="gas_pressure" format="appended" RangeMin="200000" RangeMax="201707.43156" offset="720" />
+ <DataArray type="Float64" Name="saturation" format="appended" RangeMin="0.0071963732823" RangeMax="0.99273668833" offset="1792" />
+ </PointData>
+ <CellData>
+ <DataArray type="Int32" Name="MaterialIDs" format="appended" RangeMin="0" RangeMax="0" offset="2428" />
+ </CellData>
+ <Points>
+ <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="2.6" offset="2496" />
+ </Points>
+ <Cells>
+ <DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="4856" />
+ <DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="5532" />
+ <DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="6152" />
+ </Cells>
+ </Piece>
+ </UnstructuredGrid>
+ <AppendedData encoding="base64">
+ _AQAAAAAAAAAAgAAAAAAAABUAAAAAAAAAHQAAAAAAAAA=eF4z0zPRM9A1NDI20U03MTKxSEs2NjMEADCqBLc=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eF5jZh7xAACLpAMK
+ </AppendedData>
+</VTKFile>
diff --git a/Tests/MaterialLib/TestMPLSaturationBrooksCorey.cpp b/Tests/MaterialLib/TestMPLSaturationBrooksCorey.cpp
index 8fa663cbac3bb1ba0f807cc028fedf29201cfc83..7231d9d06a6603e597772ad71e7aefae9472a5b8 100644
--- a/Tests/MaterialLib/TestMPLSaturationBrooksCorey.cpp
+++ b/Tests/MaterialLib/TestMPLSaturationBrooksCorey.cpp
@@ -1,6 +1,5 @@
/**
* \file
- *
* \copyright
* Copyright (c) 2012-2021, OpenGeoSys Community (http://www.opengeosys.org)
* Distributed under a Modified BSD License.
@@ -10,74 +9,62 @@
*/
#include <gtest/gtest.h>
-#include <sstream>
-
#include "MaterialLib/MPL/Medium.h"
#include "MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationBrooksCorey.h"
#include "TestMPL.h"
#include "Tests/TestTools.h"
+namespace MPL = MaterialPropertyLib;
+
TEST(MaterialPropertyLib, SaturationBrooksCorey)
{
- const double ref_lambda = 2.5;
- const double ref_residual_liquid_saturation = 0.12;
- const double ref_residual_gas_saturation = 0.06;
- const double ref_entry_pressure = 5678.54;
-
- const double max_saturation = 1. - ref_residual_gas_saturation;
+ double const residual_liquid_saturation = 0.1;
+ double const residual_gas_saturation = 0.05;
+ double const exponent = 3.0;
+ double const p_b = 5000;
+ MPL::Property const& pressure_saturation =
+ MPL::SaturationBrooksCorey{"saturation", residual_liquid_saturation,
+ residual_gas_saturation, exponent, p_b};
- std::stringstream m;
- m << "<medium>\n";
- m << "<phases></phases>\n";
- m << "<properties>\n";
- m << " <property>\n";
- m << " <name>saturation</name>\n";
- m << " <type>SaturationBrooksCorey</type>\n";
- m << " <residual_liquid_saturation>" << ref_residual_liquid_saturation
- << "</residual_liquid_saturation>\n";
- m << " <residual_gas_saturation>" << ref_residual_gas_saturation
- << "</residual_gas_saturation>\n";
- m << " <lambda>" << ref_lambda << "</lambda>\n";
- m << " <entry_pressure>" << ref_entry_pressure << "</entry_pressure>\n";
- m << " </property> \n";
- m << "</properties>\n";
- m << "</medium>\n";
-
- auto const& medium = Tests::createTestMaterial(m.str());
-
- MaterialPropertyLib::VariableArray variable_array;
+ MPL::VariableArray variable_array;
ParameterLib::SpatialPosition const pos;
double const t = std::numeric_limits<double>::quiet_NaN();
double const dt = std::numeric_limits<double>::quiet_NaN();
- for (double p_cap = 1.0; p_cap < 1.0e10; p_cap *= 1.5)
+ double const p_0 = -1e6;
+ double const p_max = 4000;
+ int const n_steps = 10000;
+ for (int i = 0; i <= n_steps; ++i)
{
- variable_array[static_cast<int>(
- MaterialPropertyLib::Variable::capillary_pressure)] = p_cap;
+ double const p_L = p_0 + i * (p_max - p_0) / n_steps;
+ variable_array[static_cast<int>(MPL::Variable::capillary_pressure)] =
+ -p_L;
+ double const S = pressure_saturation.template value<double>(
+ variable_array, pos, t, dt);
+
+ double const dS = pressure_saturation.template dValue<double>(
+ variable_array, MPL::Variable::capillary_pressure, pos, t, dt);
+
+ double const dS2 = pressure_saturation.template d2Value<double>(
+ variable_array, MPL::Variable::capillary_pressure,
+ MPL::Variable::capillary_pressure, pos, t, dt);
- auto s_L =
- medium->property(MaterialPropertyLib::PropertyType::saturation)
- .template value<double>(variable_array, pos, t, dt);
- auto ds_L_dp_cap =
- medium->property(MaterialPropertyLib::PropertyType::saturation)
- .template dValue<double>(
- variable_array,
- MaterialPropertyLib::Variable::capillary_pressure, pos, t,
- dt);
+ double const eps = 1e-2;
+ variable_array[static_cast<int>(MPL::Variable::capillary_pressure)] =
+ -p_L - eps;
+ double const S_minus = pressure_saturation.template value<double>(
+ variable_array, pos, t, dt);
+ variable_array[static_cast<int>(MPL::Variable::capillary_pressure)] =
+ -p_L + eps;
+ double const S_plus = pressure_saturation.template value<double>(
+ variable_array, pos, t, dt);
- const double s_eff =
- std::pow(ref_entry_pressure / std::max(p_cap, ref_entry_pressure),
- ref_lambda);
- const double s_ref =
- s_eff * (max_saturation - ref_residual_liquid_saturation) +
- ref_residual_liquid_saturation;
- const double ds_eff_dpc =
- -ref_lambda / std::max(p_cap, ref_entry_pressure) * s_ref;
- const double ds_L_ds_eff =
- 1. / (max_saturation - ref_residual_liquid_saturation);
- const double ds_L_dpc = ds_L_ds_eff * ds_eff_dpc;
+ double const DS = (S_plus - S_minus) / 2 / eps;
+ double const DS2 = (S_plus - 2 * S + S_minus) / (eps * eps);
- ASSERT_NEAR(s_L, s_ref, 1.e-10);
- ASSERT_NEAR(ds_L_dp_cap, ds_L_dpc, 1.e-10);
+ ASSERT_LE(std::abs(dS - DS), 1e-9)
+ << "for capillary pressure " << -p_L << " and saturation " << S;
+ ASSERT_LE(std::abs(dS2 - DS2), 1e-9)
+ << "for capillary pressure " << -p_L << " and saturation " << S;
}
}