[tests][2pncmin] corrected source term. Previously physically wrong, units did...

[tests][2pncmin] corrected source term. Previously physically wrong, units did not balance. Updated reference

test/porousmediumflow/2pncmin/implicit/isothermal/CMakeLists.txt

@@ -8,7 +8,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS      --script fuzzy
                             --files ${CMAKE_SOURCE_DIR}/test/references/test_2pncmin_dissolution_box-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box-00044.vtu
+                                    ${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box-00043.vtu
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box -ParameterFile params.input -Problem.Name test_2pncmin_dissolution_box")
 
 dune_add_test(NAME test_2pncmin_dissolution_box_restart
@@ -18,7 +18,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box_restart
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_2pncmin_dissolution_box-reference.vtu
                                ${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box_restart-00005.vtu
-                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box params.input -Problem.Name test_2pncmin_dissolution_box_restart -TimeLoop.DtInitial 50000 -Restart.Time 756290 -Restart.File test_2pncmin_dissolution_box-00039.vtu")
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box params.input -Problem.Name test_2pncmin_dissolution_box_restart -TimeLoop.DtInitial 50000 -Restart.Time 772823 -Restart.File test_2pncmin_dissolution_box-00038.vtu")
 
 # the restart test has to run after the test that produces the corresponding vtu file
 set_tests_properties(test_2pncmin_dissolution_box_restart PROPERTIES DEPENDS test_2pncmin_dissolution_box)
@@ -30,5 +30,5 @@ dune_add_test(NAME test_2pncmin_dissolution_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS      --script fuzzy
                             --files ${CMAKE_SOURCE_DIR}/test/references/test_2pncmin_dissolution_tpfa-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_tpfa-00043.vtu
+                                    ${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_tpfa-00042.vtu
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_tpfa -ParameterFile params.input -Problem.Name test_2pncmin_dissolution_tpfa")

test/porousmediumflow/2pncmin/implicit/isothermal/problem.hh

@@ -376,7 +376,8 @@ public:
         using std::abs;
         Scalar precipSalt = volVars.porosity() * volVars.molarDensity(liquidPhaseIdx)
                                                * volVars.saturation(liquidPhaseIdx)
-                                               * abs(moleFracNaCl_wPhase - moleFracNaCl_Max_wPhase);
+                                               * abs(moleFracNaCl_wPhase - moleFracNaCl_Max_wPhase)
+                                               / timeStepSize_;
         if (moleFracNaCl_wPhase < moleFracNaCl_Max_wPhase)
             precipSalt *= -1;
 

test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh

@@ -454,7 +454,8 @@ public:
         using std::abs;
         Scalar precipSalt = volVars.porosity() * volVars.molarDensity(liquidPhaseIdx)
                                                * volVars.saturation(liquidPhaseIdx)
-                                               * abs(moleFracNaCl_wPhase - moleFracNaCl_Max_wPhase);
+                                               * abs(moleFracNaCl_wPhase - moleFracNaCl_Max_wPhase)
+                                               / timeStepSize_;
         if (moleFracNaCl_wPhase < moleFracNaCl_Max_wPhase)
             precipSalt *= -1;
 

test/references/test_2pncminni_salinization_box-reference.vtu

@@ -4,76 +4,76 @@
     <Piece NumberOfCells="10" NumberOfPoints="18">
       <PointData Scalars="S_liq" Vectors="velocity_liq (m/s)">
         <DataArray type="Float32" Name="S_liq" NumberOfComponents="1" format="ascii">
-          0.371984 0.371984 0.354842 0.354842 0.371984 0.354842 0.32817 0.32817 0.32817 0.315198 0.315198 0.315198
-          0.300464 0.300464 0.300464 0.283892 0.283892 0.283892
+          0.371984 0.371984 0.354843 0.354843 0.371984 0.354843 0.328174 0.328174 0.328174 0.315211 0.315211 0.315211
+          0.300497 0.300497 0.300497 0.283998 0.283998 0.283998
         </DataArray>
         <DataArray type="Float32" Name="p_liq" NumberOfComponents="1" format="ascii">
-          92441.6 92441.6 92339 92339 92441.6 92339 92142.7 92142.7 92142.7 92022.2 92022.2 92022.2
-          91852.1 91852.1 91852.1 91585.9 91585.9 91585.9
+          92441.6 92441.6 92339 92339 92441.6 92339 92142.7 92142.7 92142.7 92022.3 92022.3 92022.3
+          91852.6 91852.6 91852.6 91588 91588 91588
         </DataArray>
         <DataArray type="Float32" Name="rho_liq" NumberOfComponents="1" format="ascii">
           1012.93 1012.93 1012.93 1012.93 1012.93 1012.93 1012.94 1012.94 1012.94 1013.27 1013.27 1013.27
-          1021.11 1021.11 1021.11 1200.29 1200.29 1200.29
+          1021.12 1021.12 1021.12 1201.64 1201.64 1201.64
         </DataArray>
         <DataArray type="Float32" Name="mob_liq" NumberOfComponents="1" format="ascii">
-          6.36616 6.36616 4.25205 4.25205 6.36616 4.25205 1.94592 1.94592 1.94592 1.1998 1.1998 1.1998
-          0.596671 0.596671 0.596671 0.112089 0.112089 0.112089
+          6.36632 6.36632 4.25221 4.25221 6.36632 4.25221 1.94624 1.94624 1.94624 1.20048 1.20048 1.20048
+          0.597725 0.597725 0.597725 0.11228 0.11228 0.11228
         </DataArray>
         <DataArray type="Float32" Name="S_gas" NumberOfComponents="1" format="ascii">
-          0.628016 0.628016 0.645158 0.645158 0.628016 0.645158 0.67183 0.67183 0.67183 0.684802 0.684802 0.684802
-          0.699536 0.699536 0.699536 0.716108 0.716108 0.716108
+          0.628016 0.628016 0.645157 0.645157 0.628016 0.645157 0.671826 0.671826 0.671826 0.684789 0.684789 0.684789
+          0.699503 0.699503 0.699503 0.716002 0.716002 0.716002
         </DataArray>
         <DataArray type="Float32" Name="p_gas" NumberOfComponents="1" format="ascii">
           100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002 100002
           100002 100002 100002 100001 100001 100001
         </DataArray>
         <DataArray type="Float32" Name="rho_gas" NumberOfComponents="1" format="ascii">
-          1.21011 1.21011 1.21011 1.21011 1.21011 1.21011 1.2101 1.2101 1.2101 1.21009 1.21009 1.21009
+          1.21011 1.21011 1.2101 1.2101 1.21011 1.2101 1.21009 1.21009 1.21009 1.21009 1.21009 1.21009
           1.21011 1.21011 1.21011 1.21071 1.21071 1.21071
         </DataArray>
         <DataArray type="Float32" Name="mob_gas" NumberOfComponents="1" format="ascii">
-          39279.6 39279.6 41574.1 41574.1 39279.6 41574.1 45232.9 45232.9 45232.9 47144.6 47144.6 47144.6
-          49756.9 49756.9 49756.9 52734.6 52734.6 52734.6
+          39279.5 39279.5 41574 41574 39279.5 41574 45232.2 45232.2 45232.2 47142.3 47142.3 47142.3
+          49750.6 49750.6 49750.6 52716.7 52716.7 52716.7
         </DataArray>
         <DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
-          7560.12 7560.12 7662.67 7662.67 7560.12 7662.67 7858.9 7858.9 7858.9 7979.38 7979.38 7979.38
-          8149.4 8149.4 8149.4 8415.26 8415.26 8415.26
+          7560.12 7560.12 7662.66 7662.66 7560.12 7662.66 7858.87 7858.87 7858.87 7979.25 7979.25 7979.25
+          8148.96 8148.96 8148.96 8413.16 8413.16 8413.16
         </DataArray>
         <DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
           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.399753 0.399753 0.399753
+          0.4 0.4 0.4 0.399882 0.399882 0.399882
         </DataArray>
         <DataArray type="Float32" Name="x^H2O_liq" NumberOfComponents="1" format="ascii">
           0.993731 0.993731 0.993731 0.993731 0.993731 0.993731 0.993726 0.993726 0.993726 0.993572 0.993572 0.993572
-          0.98994 0.98994 0.98994 0.902257 0.902257 0.902257
+          0.989937 0.989937 0.989937 0.901552 0.901552 0.901552
         </DataArray>
         <DataArray type="Float32" Name="x^Air_liq" NumberOfComponents="1" format="ascii">
-          1.6965e-05 1.6965e-05 1.69647e-05 1.69647e-05 1.6965e-05 1.69647e-05 1.69639e-05 1.69639e-05 1.69639e-05 1.69636e-05 1.69636e-05 1.69636e-05
-          1.69642e-05 1.69642e-05 1.69642e-05 1.69866e-05 1.69866e-05 1.69866e-05
+          1.69646e-05 1.69646e-05 1.69643e-05 1.69643e-05 1.69646e-05 1.69643e-05 1.69634e-05 1.69634e-05 1.69634e-05 1.69631e-05 1.69631e-05 1.69631e-05
+          1.69638e-05 1.69638e-05 1.69638e-05 1.69863e-05 1.69863e-05 1.69863e-05
         </DataArray>
         <DataArray type="Float32" Name="x^NaCl_liq" NumberOfComponents="1" format="ascii">
-          0.00625221 0.00625221 0.00625235 0.00625235 0.00625221 0.00625235 0.00625695 0.00625695 0.00625695 0.0064111 0.0064111 0.0064111
-          0.0100428 0.0100428 0.0100428 0.097726 0.097726 0.097726
+          0.00625221 0.00625221 0.00625235 0.00625235 0.00625221 0.00625235 0.00625695 0.00625695 0.00625695 0.00641112 0.00641112 0.00641112
+          0.0100457 0.0100457 0.0100457 0.0984311 0.0984311 0.0984311
         </DataArray>
         <DataArray type="Float32" Name="rhoMolar_liq" NumberOfComponents="1" format="ascii">
-          55447.9 55447.9 55447.8 55447.8 55447.9 55447.8 55447.8 55447.8 55447.8 55447.1 55447.1 55447.1
-          55430.9 55430.9 55430.9 54642.6 54642.6 54642.6
+          55447.8 55447.8 55447.8 55447.8 55447.8 55447.8 55447.8 55447.8 55447.8 55447.1 55447.1 55447.1
+          55430.8 55430.8 55430.8 54633 54633 54633
         </DataArray>
         <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
-          0.0149479 0.0149479 0.0149487 0.0149487 0.0149479 0.0149487 0.0149508 0.0149508 0.0149508 0.0149493 0.0149493 0.0149493
-          0.0148954 0.0148954 0.0148954 0.0135767 0.0135767 0.0135767
+          0.0149489 0.0149489 0.0149496 0.0149496 0.0149489 0.0149496 0.0149519 0.0149519 0.0149519 0.0149504 0.0149504 0.0149504
+          0.0148965 0.0148965 0.0148965 0.0135672 0.0135672 0.0135672
         </DataArray>
         <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
-          0.985052 0.985052 0.985051 0.985051 0.985052 0.985051 0.985049 0.985049 0.985049 0.985051 0.985051 0.985051
-          0.985105 0.985105 0.985105 0.986423 0.986423 0.986423
+          0.985051 0.985051 0.98505 0.98505 0.985051 0.98505 0.985048 0.985048 0.985048 0.98505 0.98505 0.98505
+          0.985103 0.985103 0.985103 0.986433 0.986433 0.986433
         </DataArray>
         <DataArray type="Float32" Name="x^NaCl_gas" NumberOfComponents="1" format="ascii">
           -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0 -0
           -0 -0 -0 -0 -0 -0
         </DataArray>
         <DataArray type="Float32" Name="rhoMolar_gas" NumberOfComponents="1" format="ascii">
-          42.0233 42.0233 42.0231 42.0231 42.0233 42.0231 42.0228 42.0228 42.0228 42.0227 42.0227 42.0227
-          42.0225 42.0225 42.0225 42.0222 42.0222 42.0222
+          42.0231 42.0231 42.023 42.023 42.0231 42.023 42.0226 42.0226 42.0226 42.0225 42.0225 42.0225
+          42.0223 42.0223 42.0223 42.022 42.022 42.022
         </DataArray>
         <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii">
           3 3 3 3 3 3 3 3 3 3 3 3
@@ -81,29 +81,29 @@
         </DataArray>
         <DataArray type="Float32" Name="precipitateVolumeFraction^NaCl" NumberOfComponents="1" format="ascii">
           0 0 0 0 0 0 0 0 0 0 0 0
-          0 0 0 0.000246746 0.000246746 0.000246746
+          0 0 0 0.000118297 0.000118297 0.000118297
         </DataArray>
         <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
-          286.213 286.213 286.214 286.214 286.213 286.214 286.216 286.216 286.216 286.217 286.217 286.217
-          286.218 286.218 286.218 286.218 286.218 286.218
+          286.214 286.214 286.215 286.215 286.214 286.215 286.217 286.217 286.217 286.218 286.218 286.218
+          286.219 286.219 286.219 286.22 286.22 286.22
         </DataArray>
         <DataArray type="Float32" Name="velocity_liq (m/s)" NumberOfComponents="3" format="ascii">
-          -2.96447e-22 2.38548e-09 0 -5.92894e-22 2.38548e-09 0 -4.95004e-22 4.64498e-09 0 -7.42505e-22 4.64498e-09 0
-          -8.89342e-22 2.38548e-09 0 -9.90007e-22 4.64498e-09 0 -2.26535e-22 8.4126e-09 0 -6.56951e-22 8.4126e-09 0
-          -1.08737e-21 8.4126e-09 0 -2.23481e-22 1.05503e-08 0 -6.56475e-22 1.05503e-08 0 -1.08947e-21 1.05503e-08 0
-          -1.66671e-22 1.104e-08 0 -2.01397e-22 1.104e-08 0 -2.36123e-22 1.104e-08 0 5.20911e-23 1.09002e-08 0
-          2.60456e-23 1.09002e-08 0 0 1.09002e-08 0
+          -1.38963e-22 2.3853e-09 0 1.57492e-22 2.3853e-09 0 -8.97228e-23 4.64412e-09 0 -8.97228e-23 4.64412e-09 0
+          4.53946e-22 2.3853e-09 0 -8.97228e-23 4.64412e-09 0 -5.3811e-23 8.40782e-09 0 -5.3811e-23 8.40782e-09 0
+          -5.3811e-23 8.40782e-09 0 -2.81706e-23 1.05383e-08 0 -2.81706e-23 1.05383e-08 0 -2.81706e-23 1.05383e-08 0
+          -2.5837e-23 1.10092e-08 0 -1.19201e-23 1.10092e-08 0 1.99672e-24 1.10092e-08 0 1.36688e-23 1.08545e-08 0
+          8.44536e-24 1.08545e-08 0 3.22192e-24 1.08545e-08 0
         </DataArray>
         <DataArray type="Float32" Name="velocity_gas (m/s)" NumberOfComponents="3" format="ascii">
-          0 -2.41187e-09 0 -4.57275e-18 -2.41187e-09 0 -4.83987e-18 -4.70772e-09 0 -4.83987e-18 -4.70772e-09 0
-          -9.14549e-18 -2.41187e-09 0 -4.83987e-18 -4.70772e-09 0 -6.31896e-18 -7.86737e-09 0 -1.21113e-17 -7.86737e-09 0
-          -1.79037e-17 -7.86737e-09 0 -1.20744e-17 1.09526e-08 0 -3.12836e-17 1.09526e-08 0 -5.04928e-17 1.09526e-08 0
-          -2.08467e-17 6.65984e-07 0 -2.08475e-17 6.65984e-07 0 -2.08482e-17 6.65984e-07 0 -9.80292e-18 1.30133e-06 0
-          -7.35219e-18 1.30133e-06 0 -4.90146e-18 1.30133e-06 0
+          7.08774e-18 -2.41298e-09 0 3.62961e-18 -2.41298e-09 0 4.99109e-18 -4.71036e-09 0 9.52845e-19 -4.71036e-09 0
+          1.71477e-19 -2.41298e-09 0 -3.0854e-18 -4.71036e-09 0 5.59483e-19 -7.87089e-09 0 3.29107e-20 -7.87089e-09 0
+          -4.93661e-19 -7.87089e-09 0 -5.67903e-18 1.09679e-08 0 -3.91255e-18 1.09679e-08 0 -2.14607e-18 1.09679e-08 0
+          -5.57915e-18 6.71252e-07 0 -5.65121e-18 6.71252e-07 0 -5.72328e-18 6.71252e-07 0 4.87011e-18 1.31183e-06 0
+          -2.90876e-18 1.31183e-06 0 -1.06876e-17 1.31183e-06 0
         </DataArray>
         <DataArray type="Float32" Name="Permeability" NumberOfComponents="1" format="ascii">
           1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13 1e-13
-          9.99332e-14 9.99332e-14 9.99332e-14 9.97997e-14 9.97997e-14 9.97997e-14
+          9.9968e-14 9.9968e-14 9.9968e-14 9.99039e-14 9.99039e-14 9.99039e-14
         </DataArray>
       </PointData>
       <CellData Scalars="process rank">