Merge branch 'fix/compatible-with-book' into 'master'

Fix/compatible with book

See merge request !113

lecture/mm/heatpipe/heatpipe.input

 [TimeLoop]
 DtInitial = 1 # [s]
 TEnd = 2.2e12 # [s]
-EpisodeLength = 1.e11
+EpisodeLength = 1.e10
 
 [Grid]
 File = ./grids/heatpipe.dgf
@@ -21,3 +21,6 @@ EnableGravity = false
 SolidHeatCapacity = 700
 SolidDensity = 2600
 SolidThermalConductivity = 2.8
+
+[Newton]
+MaxRelativeShift = 1e-6

lecture/mm/heatpipe/heatpipeproblem.hh

@@ -55,6 +55,10 @@ struct Problem<TypeTag, TTag::HeatPipeTypeTag> { using type = HeatPipeProblem<Ty
 template<class TypeTag>
 struct FluidSystem<TypeTag, TTag::HeatPipeTypeTag> { using type = FluidSystems::H2OAir<GetPropType<TypeTag, Properties::Scalar>>; };
 
+// pn-sw formulation
+template<class TypeTag>
+struct Formulation<TypeTag, TTag::HeatPipeTypeTag> { static constexpr auto value = TwoPFormulation::p1s0; };
+
 // Set the spatial parameters
 template<class TypeTag>
 struct SpatialParams<TypeTag, TTag::HeatPipeTypeTag>
@@ -117,7 +121,7 @@ public:
         // we could use another phase presence (onlyWater) on the left, here simplified for better
         // convergence behavior
         values[Indices::pressureIdx] = 1.013e5;
-        values[Indices::switchIdx] = 0.01;
+        values[Indices::switchIdx] = 0.99;
         values[Indices::temperatureIdx] = 341.75;
         values.setState(Indices::bothPhases);
 

lecture/mm/remediationscenarios/remediationscenariosexercise.input

@@ -23,7 +23,7 @@ AirScenario = 0
 
 # steam scenario, Do not change!
 WaterFluxS = -0.3435
-AirFluxS = -0.000001
+AirFluxS = -0.0000001
 ContaminantFluxS = -0.0000001
 HeatFluxS = -15150.0
 

lecture/mm/remediationscenarios/remediationscenariosproblem.hh

@@ -381,7 +381,7 @@ private:
         values[pressureIdx] = 1e5 ;
         values[switch1Idx] = 0.12;
         values[switch2Idx] = 1.e-6;
-        values[temperatureIdx] = 293.0;
+        values[temperatureIdx] = 293.15;
 
         if (isInContaminationZone(globalPos))
             values[switch2Idx] = 0.07;

lecture/references/fractures-matrix-reference.vtu

@@ -855,56 +855,56 @@
           0.250002 0.25 0.25 0.25 0.249999 0.250001 0.250001 0.249999 0.250001 0.249999 0.249999 0.25
           0.250002 0.249999 0.25 0.25 0.25 0.25 0.249999 0.25 0.25 0.25 0.25 0.249946
           0.25 0.25 0.24994 0.25 0.25 0.249998 0.249999 0.25 0.25 0.249999 0.250001 0.25
-          0.249942 0.25 0.249999 0.25 0.249824 4.27812e-34 -4.26153e-34 4.30267e-09 4.15488e-12 1.07945e-06 6.02577e-05 1.16498e-05
-          1.46317e-16 1.12302e-23 9.07788e-08 1.341e-13 8.0636e-10 2.20674e-06 2.33146e-07 1.50918e-12 2.81926e-09 8.13642e-05 0.000221657 3.70131e-05
+          0.249942 0.25 0.249999 0.25 0.249824 4.27441e-34 -4.25786e-34 4.30267e-09 4.15488e-12 1.07945e-06 6.02577e-05 1.16498e-05
+          1.46317e-16 1.12039e-23 9.07788e-08 1.341e-13 8.0636e-10 2.20674e-06 2.33146e-07 1.50918e-12 2.81926e-09 8.13642e-05 0.000221657 3.70131e-05
           5.31912e-05 0.000120886 0.000225195 0.000120811 4.71347e-05 7.62594e-06 1.26683e-05 1.20722e-06 3.20774e-08 5.30673e-09 7.53658e-06 5.97875e-07
-          3.9957e-09 8.36659e-19 2.78146e-30 1.4325e-28 4.45186e-17 3.80004e-21 4.61565e-33 5.6961e-36 -2.29569e-38 1.54433e-34 3.43514e-31 2.79527e-30
-          8.13755e-37 -3.86484e-33 5.87409e-11 7.61485e-12 6.25002e-15 1.70435e-16 5.03903e-12 2.76486e-16 7.38462e-23 5.09409e-23 -1.39499e-33 -2.41845e-30
-          -1.58704e-33 -1.28897e-30 -4.35609e-29 -4.01323e-33 5.92722e-36 1.85908e-05 1.96173e-06 0.00011091 5.01268e-05 3.07969e-06 1.15843e-07 1.56961e-07
+          3.9957e-09 8.36659e-19 2.00015e-30 2.04048e-28 4.45186e-17 3.80004e-21 3.30662e-33 4.11974e-36 -1.89476e-38 2.86197e-34 5.09591e-31 1.89699e-30
+          1.91045e-36 -2.19161e-33 5.87409e-11 7.61485e-12 6.25002e-15 1.70435e-16 5.03903e-12 2.76486e-16 7.38483e-23 5.09424e-23 -4.49904e-34 1.5766e-31
+          -5.12103e-34 2.23144e-30 -5.18779e-29 -7.39214e-34 4.2945e-35 1.85908e-05 1.96173e-06 0.00011091 5.01268e-05 3.07969e-06 1.15843e-07 1.56961e-07
           2.29527e-05 7.64239e-06 5.13064e-06 8.06774e-07 2.34667e-07 4.49848e-05 5.77096e-05 2.9529e-05 3.70136e-06 1.35486e-05 9.86453e-05 5.70087e-05
           2.87872e-07 8.18578e-09 1.68191e-11 4.80894e-09 2.55054e-05 5.60886e-06 2.01605e-06 3.99546e-07 1.1828e-09 1.12349e-12 2.02353e-09 2.71517e-17
-          2.53777e-12 2.56442e-09 7.43129e-17 -2.31085e-32 -1.37521e-32 3.21521e-24 1.41874e-35 1.37684e-23 2.1852e-32 5.4437e-13 9.9905e-17 6.113e-12
-          1.04907e-16 3.66037e-32 1.08835e-23 4.68567e-35 1.25027e-23 6.40967e-32 5.64221e-35 0 1.29705e-38 0 -1.38966e-37 0
-          0 0 0 -0 -0 0 0 -1.44442e-37 -2.34054e-37 -6.53288e-38 0 -3.36976e-38
-          -4.75274e-37 0 0 0 0 0 0 0 0 -0 -0 -0
+          2.53777e-12 2.56442e-09 7.43129e-17 -2.05245e-32 -1.10661e-32 3.21519e-24 5.97136e-35 1.37683e-23 2.83888e-32 5.4437e-13 9.9905e-17 6.113e-12
+          1.04907e-16 2.47813e-32 1.08835e-23 -3.19786e-35 1.25027e-23 2.74452e-32 -8.784e-35 0 1.2969e-38 0 -1.38276e-37 0
+          0 0 0 -0 -0 0 0 4.02908e-37 7.03887e-37 -6.49453e-38 0 -3.34268e-38
+          -4.45517e-37 0 0 0 0 0 0 0 0 -0 -0 -0
           -0 -0 -0 0 -0 -0 -0 -0 -0 -0 -0 -0
           -0 0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0
-          -3.21137e-37 0 0 2.87417e-35 -4.46e-37 0 0 0 0 0 0 -4.9212e-37
-          -4.37178e-37 0 0 0 -2.89108e-37 0 0 0 0 0 0 0
+          -2.956e-37 0 0 5.6835e-35 -4.29377e-37 0 0 0 0 0 0 -5.8099e-37
+          -5.68211e-37 0 0 0 -3.76669e-37 0 0 0 0 0 0 0
           0 -0 -0 0 -0 -0 -0 -0 -0 -0 -0 -0
-          -0 -0 -0 0 -0 -0 -0 -0 -0 -0 -0 1.76308e-35
+          -0 -0 -0 0 -0 -0 -0 -0 -0 -0 -0 1.76288e-35
           2.10681e-05 2.75292e-05 6.75956e-06 9.59988e-06 9.14777e-05 5.02016e-05 7.04039e-08 5.96848e-08 1.69378e-06 2.01023e-05 5.87284e-06 1.14512e-09
           4.55173e-07 0.000109667 6.74876e-05 6.89769e-05 8.6972e-05 2.55793e-05 7.7782e-06 3.05819e-05 5.85762e-06 5.23053e-07 3.00303e-05 3.65918e-06
-          9.26695e-07 2.51789e-07 8.07661e-13 8.88837e-13 1.3536e-17 5.88124e-29 9.5158e-12 7.01347e-09 5.32662e-16 4.9028e-32 4.90496e-35 -7.28641e-34
-          1.82515e-22 -1.14478e-30 3e-32 6.76518e-09 1.19081e-11 5.08362e-16 6.84888e-16 4.95164e-09 9.21487e-12 3.6003e-16 2.06213e-22 3.11547e-22
-          8.51693e-32 1.08561e-22 6.1348e-32 2.97248e-07 1.87423e-05 4.61588e-06 7.26445e-05 5.1156e-05 3.6195e-07 2.41094e-08 3.59305e-10 2.12739e-06
+          9.26695e-07 2.51789e-07 8.07661e-13 8.88837e-13 1.3536e-17 3.41412e-29 9.5158e-12 7.01347e-09 5.32662e-16 2.38656e-32 -1.90097e-35 -7.58988e-34
+          1.82515e-22 -1.19677e-30 6.79249e-32 6.76518e-09 1.19081e-11 5.08362e-16 6.84888e-16 4.95164e-09 9.21487e-12 3.6003e-16 2.06213e-22 3.11547e-22
+          1.92832e-31 1.08561e-22 1.3972e-31 2.97248e-07 1.87423e-05 4.61588e-06 7.26445e-05 5.1156e-05 3.6195e-07 2.41094e-08 3.59305e-10 2.12739e-06
           2.07622e-05 1.02013e-07 3.83836e-08 9.77731e-05 8.39714e-05 0.000137418 0.000116313 9.46955e-05 1.0182e-05 5.01132e-05 1.1393e-05 1.47825e-06
-          1.19819e-06 1.39292e-05 5.80532e-05 4.26221e-06 1.65349e-06 1.19445e-13 6.75655e-10 6.8851e-19 1.87815e-10 3.78839e-13 4.05539e-14 3.27574e-31
-          4.12711e-18 6.08123e-34 -6.43434e-37 -1.56883e-33 -2.12024e-29 1.16987e-19 2.6006e-30 2.43457e-33 2.83485e-08 7.13067e-11 4.57804e-08 1.51359e-10
-          1.07474e-14 1.2215e-20 5.14728e-31 7.04293e-20 3.4337e-14 -1.21187e-29 -5.49979e-37 -1.15233e-36 0 0 0 -6.68983e-37
-          0 0 0 0 0 0 2.12319e-35 1.03861e-34 -1.62599e-36 0 1.09905e-34 -1.0224e-36
+          1.19819e-06 1.39292e-05 5.80532e-05 4.26221e-06 1.65349e-06 1.19445e-13 6.75655e-10 6.8851e-19 1.87815e-10 3.78839e-13 4.05539e-14 6.3735e-30
+          4.12711e-18 3.39314e-33 1.63567e-37 6.26278e-34 -1.95821e-29 1.16987e-19 3.37271e-30 2.92718e-33 2.83485e-08 7.13067e-11 4.57804e-08 1.51359e-10
+          1.07474e-14 1.2215e-20 5.66148e-31 7.04293e-20 3.4337e-14 -1.12452e-29 -6.29111e-37 -1.18015e-36 0 0 0 -5.94122e-37
+          0 0 0 0 0 0 7.41493e-35 1.99672e-34 -1.52748e-36 0 1.17783e-34 -1.05245e-36
           0 0 0 0 0 0 -0 -0 -0 0 -0 -0
           -0 -0 -0 -0 -0 -0 -0 -0 0 0 -0 -0
-          -0 -0 -0 -0 -0 -0 -0 -0 -5.14968e-38 0 -1.10092e-37 4.74858e-36
-          -3.68161e-36 -3.16658e-38 0 0 0 0 0 0 -2.6605e-35 -1.70536e-36 -4.05865e-33 -3.62941e-36
+          -0 -0 -0 -0 -0 -0 -0 -0 -5.12854e-38 0 -1.09949e-37 3.41662e-36
+          -3.7121e-36 -3.17796e-38 0 0 0 0 0 0 3.72295e-34 -1.37438e-36 -3.6851e-33 -3.60146e-36
           0 0 0 0 0 0 -0 -0 0 0 -0 -0
           -0 -0 -0 -0 -0 -0 -0 0 0 0 0 -0
           -0 -0 -0 -0 -0 -0 -0 0.000100878 0.000142191 5.91381e-05 0.000163599 0.000104977
           0.000120871 2.18874e-05 5.43963e-05 1.92038e-07 2.08165e-06 1.65454e-05 7.104e-05 2.46892e-05 3.91542e-06 0.000142796 0.000166971 9.58121e-05
           0.000183414 0.000138314 4.39111e-05 1.01367e-06 1.31531e-05 9.52147e-05 3.62575e-05 6.24865e-06 5.78759e-06 1.96392e-09 1.38231e-12 4.20524e-10
-          7.03476e-08 1.89993e-07 1.89732e-09 2.33031e-17 6.10606e-29 3.27248e-32 8.08719e-19 1.488e-13 1.44857e-12 2.4897e-17 5.14582e-30 2.24258e-29
-          2.09091e-08 3.73634e-07 5.34749e-11 3.86647e-07 3.31263e-09 4.33157e-09 6.74804e-15 5.0539e-17 4.82375e-29 4.0579e-12 9.42017e-17 1.53901e-16
+          7.03476e-08 1.89993e-07 1.89732e-09 2.33031e-17 2.48885e-29 1.35658e-32 8.08719e-19 1.488e-13 1.44857e-12 2.4897e-17 7.91656e-30 3.68545e-30
+          2.09091e-08 3.73634e-07 5.34749e-11 3.86647e-07 3.31263e-09 4.33157e-09 6.74804e-15 5.0539e-17 -6.30224e-29 4.0579e-12 9.42017e-17 1.53901e-16
           0.000134717 0.000123992 7.69089e-05 0.000100299 0.000123164 5.92654e-05 3.41241e-05 6.24159e-06 1.88054e-05 1.38702e-05 2.94804e-06 8.77682e-05
           0.000105194 0.000103481 4.85351e-05 6.37629e-05 0.00019625 0.000166009 1.92499e-06 3.69335e-07 3.40886e-05 0.000124858 5.55282e-05 6.91551e-06
-          1.30656e-05 4.40932e-07 5.70224e-09 7.27161e-12 1.56307e-07 1.39798e-09 6.83063e-08 6.52686e-13 2.88765e-10 4.44115e-12 3.22697e-16 8.07632e-24
-          8.58291e-23 9.81739e-18 3.13833e-29 -1.25456e-32 -1.04534e-32 5.65752e-09 3.42372e-12 1.18729e-06 2.14129e-11 2.75216e-08 1.15147e-16 1.81728e-15
-          1.32589e-23 3.99457e-32 8.12892e-11 1.06975e-21 1.01617e-14 8.0057e-36 4.28921e-33 -1.66484e-37 6.02173e-33 -3.18459e-36 -7.49983e-36 1.40724e-38
-          -2.69165e-38 0 0 0 2.41991e-32 7.55798e-36 -4.16259e-37 6.94841e-36 1.1574e-23 3.28975e-32 6.44559e-36 2.9388e-38
-          -2.76313e-37 0 -2.96695e-37 0 0 0 0 0 -0 0 0 -0
+          1.30656e-05 4.40932e-07 5.70224e-09 7.27161e-12 1.56307e-07 1.39798e-09 6.83063e-08 6.52686e-13 2.88765e-10 4.44115e-12 3.22697e-16 8.07628e-24
+          8.58291e-23 9.81739e-18 3.18248e-30 1.20749e-32 -4.008e-31 5.65752e-09 3.42372e-12 1.18729e-06 2.14129e-11 2.75216e-08 1.15147e-16 1.81728e-15
+          1.32589e-23 -1.33389e-30 8.12892e-11 1.06975e-21 1.01617e-14 -9.99959e-37 4.82531e-33 -1.68761e-37 -7.66421e-34 -3.68617e-36 -1.33286e-35 1.40642e-38
+          -2.76274e-38 0 0 0 -2.39226e-32 -1.67261e-35 -4.27221e-37 -1.07066e-35 1.15738e-23 -3.28188e-32 -8.39661e-36 2.93785e-38
+          -2.86259e-37 0 -3.07634e-37 0 0 0 0 0 -0 0 0 -0
           -0 -0 -0 -0 0 0 0 0 0 0 -0 0
-          -0 -0 -0 -0 -0 2.06586e-32 5.57899e-36 -9.05752e-36 -5.94699e-36 -4.98391e-37 -7.69736e-37 1.55823e-38
-          -2.48546e-37 0 0 1.844e-38 0 0 0 -1.64879e-36 1.03752e-34 0 -4.54787e-37 6.52217e-35
-          5.35645e-31 1.40513e-20 4.31254e-34 0 0 0 0 -2.3403e-36 -2.96881e-38 0 0 0
+          -0 -0 -0 -0 -0 -4.27308e-33 -6.00061e-36 5.37588e-36 -3.82917e-34 -6.49996e-37 -7.77485e-37 1.55059e-38
+          -2.57979e-37 0 0 1.84287e-38 0 0 0 -2.34626e-36 -1.40517e-33 0 -4.74678e-37 5.78414e-35
+          5.66796e-31 1.40513e-20 3.87656e-34 0 0 0 0 -2.4424e-36 -2.97851e-38 0 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>