Skip to content
Snippets Groups Projects
Commit 4fcef7e1 authored by Katharina Heck's avatar Katharina Heck
Browse files

[feature] add restart facility for mpnc and adapt reference solution to output of fugacities

parent 4fc94947
No related branches found
No related tags found
1 merge request!1210[feature] add restart facility for mpnc
Expand all Hide whitespace changes
Inline Side-by-side
dumux/porousmediumflow/mpnc/model.hh
+ 20
− 0
View file @ 4fcef7e1
......@@ -153,6 +153,26 @@ struct MPNCModelTraits
//! Per default, we use the indices without offset
using Indices = MPNCIndices< numPhases(), numEq() >;
template <class FluidSystem>
static std::string primaryVariableName(int pvIdx, int state=0)
{
if (pvIdx < numComponents())
return "fugacity^"+ FluidSystem::componentName(pvIdx);
else if (pvIdx < numEq()-1)
return "S_"+ FluidSystem::phaseName(pvIdx - numComponents());
else
{
switch (pressureFormulation())
{
case MpNcPressureFormulation::mostWettingFirst :
return "p_"+ FluidSystem::phaseName(0);
case MpNcPressureFormulation::leastWettingFirst :
return "p_"+ FluidSystem::phaseName(numPhases()-1);
default: DUNE_THROW(Dune::InvalidStateException, "Invalid formulation ");
}
}
}
};
/*!
......
dumux/porousmediumflow/mpnc/vtkoutputfields.hh
+ 5
− 1
View file @ 4fcef7e1
......@@ -48,8 +48,12 @@ public:
vtk.addVolumeVariable([i](const auto& v){ return v.mobility(i); },"mob_"+ FluidSystem::phaseName(i));
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },"x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
vtk.addVolumeVariable([i,j](const auto& v){ return v.moleFraction(i,j); },
"x^"+ FluidSystem::componentName(j) + "_" + FluidSystem::phaseName(i));
}
for (int j = 0; j < VolumeVariables::numComponents(); ++j)
vtk.addVolumeVariable([j](const auto& v){ return v.fugacity(j); },
"fugacity^"+ FluidSystem::componentName(j));
}
};
......
test/porousmediumflow/mpnc/implicit/test_mpnc.input
+ 0
− 1
View file @ 4fcef7e1
......@@ -11,4 +11,3 @@ ResidualReduction = 1e-12
[Problem]
Name = obstacle
test/references/evaporationatmosphere-reference.vtu
+ 530
− 448
View file @ 4fcef7e1
This diff is collapsed.
test/references/obstaclebox-reference.vtu
+ 76
− 0
View file @ 4fcef7e1
......@@ -497,6 +497,82 @@
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
0.99 0.99 0.99 0.99 0.99
</DataArray>
<DataArray type="Float32" Name="fugacity^H2O" NumberOfComponents="1" format="ascii">
1000 1000.43 1000 1000.23 1000.62 1000.39 1000.72 1000.46 1000.05 1000.02 1000.02 1000
1000.02 1000 1000.02 1000 1000.18 1000.15 1005.75 1005.43 1006.04 1005.74 1006.67 1006.37
1007.67 1007.36 1009.08 1008.75 1010.97 1010.63 1013.44 1013.06 1016.59 1016.18 1020.6 1020.13
1026.23 1025.6 1041.65 1039.93 1142.62 1132.6 1769.28 1713.33 3169.71 3169.71 3169.71 3169.71
3169.75 3169.75 1000 1000.13 1000.23 1000.28 1000.01 1000 1000 1000 1000.14 1005.1
1005.4 1006.02 1006.98 1008.33 1010.15 1012.51 1015.51 1019.29 1024.35 1035.98 1108.32 1605.7
3169.71 3169.71 3169.75 1000 1000.07 1000.13 1000.16 1000.01 1000 1000 1000 1000.13
1004.74 1005.03 1005.62 1006.54 1007.83 1009.55 1011.78 1014.61 1018.15 1022.68 1031.03 1074.76
1410.16 3169.71 3169.71 3169.75 1000 1000.02 1000.05 1000.07 1000 1000 1000 1000
1000.11 1004.36 1004.63 1005.19 1006.05 1007.25 1008.85 1010.92 1013.53 1016.76 1020.76 1026.31
1041.04 1124.02 1595.78 3169.71 3169.75 999.972 999.978 999.99 999.997 1000 1000 1000
1000 1000.1 1003.96 1004.22 1004.73 1005.52 1006.62 1008.08 1009.96 1012.3 1015.2 1018.76
1024.05 1046.09 1243.56 2479.89 3169.71 3169.71 999.921 999.923 999.928 999.932 999.999 1000
1000 1000 1000.09 1003.56 1003.78 1004.25 1004.96 1005.95 1007.26 1008.92 1010.99 1013.51
1016.56 1020.43 1028.8 1078.6 1382.36 2193.11 1577.58 999.859 999.86 999.862 999.864 999.997
1000 1000 1000 1000.08 1003.14 1003.34 1003.75 1004.39 1005.26 1006.41 1007.85 1009.63
1011.78 1014.31 1017.28 1021.11 1030.26 1073.76 1190.81 1079.42 999.787 999.787 999.789 999.791
999.994 1000 1000 1000 1000.06 1002.72 1002.9 1003.26 1003.81 1004.57 1005.56 1006.79
1008.29 1010.07 1012.12 1014.42 1016.91 1019.73 1024.88 1035.12 1026.9 999.704 999.704 999.706
999.707 999.991 1000 1000 1000 1000.05 1002.31 1002.47 1002.78 1003.25 1003.9 1004.74
1005.77 1007.01 1008.45 1010.08 1011.84 1013.62 1015.29 1016.77 1018.05 1017.9 999.608 999.608
999.61 999.612 999.988 1000 1000 1000 1000.04 1001.91 1002.04 1002.31 1002.71 1003.26
1003.96 1004.82 1005.83 1006.98 1008.25 1009.59 1010.91 1012.1 1013.04 1013.65 1013.84 999.497
999.497 999.499 999.501 999.984 1000 1000 1000 1000.03 1001.51 1001.63 1001.86 1002.2
1002.66 1003.25 1003.95 1004.77 1005.69 1006.68 1007.7 1008.69 1009.56 1010.25 1010.69 1010.84
999.368 999.369 999.371 999.374 999.978 1000 1000 1000 1000.02 1001.12 1001.23 1001.43
1001.72 1002.12 1002.6 1003.18 1003.85 1004.58 1005.36 1006.15 1006.9 1007.56 1008.08 1008.41
1008.52 999.219 999.222 999.225 999.227 999.972 999.999 1000 1000 1000.01 1000.74 1000.84
1001.02 1001.28 1001.62 1002.04 1002.52 1003.07 1003.67 1004.3 1004.92 1005.51 1006.02 1006.42
1006.67 1006.75 999.045 999.052 999.069 999.057 999.948 999.978 999.983 999.985 999.984 1000.35
1000.46 1000.65 1000.89 1001.19 1001.55 1001.97 1002.44 1002.95 1003.47 1003.98 1004.46 1004.88
1005.2 1005.4 1005.47 998.837 998.849 998.89 999.01 999.088 999.252 999.403 999.559 999.74
999.929 1000.11 1000.3 1000.54 1000.82 1001.15 1001.53 1001.95 1002.41 1002.87 1003.32 1003.74
1004.1 1004.37 1004.55 1004.61 998.585 998.6 998.652 998.737 998.846 998.979 999.127 999.283
999.451 999.627 999.808 1000 1000.23 1000.51 1000.83 1001.2 1001.61 1002.04 1002.48 1002.92
1003.31 1003.65 1003.92 1004.08 1004.14
</DataArray>
<DataArray type="Float32" Name="fugacity^N2" NumberOfComponents="1" format="ascii">
99000 99042.3 99000 99022.6 99061.2 99038.2 99071.3 99045.3 99004.8 99002.4 99001.6 99000.1
99001.6 99000 99001.8 99000.2 99017.9 99015.3 99569.4 99537.9 99597.9 99568.2 99660.5 99630.4
99759.2 99728.2 99898.8 99866.5 100086 100052 100330 100293 100642 100601 101036 100990
101528 101474 102134 102068 102812 102731 103169 103102 102956 102904 107488 106385
0 0 99000 99013 99022.8 99027.6 99001.5 99000 99000 99000.2 99013.8 99504.7
99534.6 99595.5 99690.7 99824.9 100005 100238 100535 100908 101370 101932 102557 102902
102378 105513 0 99000 99007 99012.6 99015.5 99000.8 99000 99000 99000.1 99012.5
99469.3 99498 99556.3 99647.1 99774.9 99945.6 100166 100446 100796 101226 101744 102327
102699 101606 103805 0 99000 99002.5 99005.2 99006.8 99000.4 99000 99000 99000.1
99011.2 99431.8 99458.8 99513.5 99598.6 99717.9 99876.6 100081 100339 100659 101050 101521
102071 102635 102815 99396.2 0 98997.2 98997.8 98999 98999.7 99000.1 99000 99000
99000.1 99010 99392.5 99417.4 99467.9 99546.1 99655.3 99800.1 99985.6 100218 100504 100852
101268 101751 102175 101840 104747 94800.9 98992.2 98992.4 98992.9 98993.2 98999.9 99000
99000 99000.1 99008.7 99352 99374.6 99420.3 99490.9 99589.1 99718.4 99883.1 100088 100338
100638 100994 101411 101876 102237 101375 101507 98986 98986.1 98986.3 98986.6 98999.7
99000 99000 99000.1 99007.6 99310.8 99331.1 99371.7 99434.3 99520.9 99634.3 99777.6 99953.8
100166 100417 100707 101034 101379 101618 101585 101677 98978.9 98979 98979.1 98979.3
98999.4 99000 99000 99000.1 99006.4 99269.6 99287.4 99323 99377.7 99452.8 99550.4 99672.5
99821 99996.9 100200 100427 100669 100900 101076 101162 101196 98970.7 98970.7 98970.9
98971 98999.1 99000 99000 99000.1 99005.2 99228.7 99244.2 99275.1 99322.1 99386.3 99469.1
99571.4 99694.1 99836.8 99997.8 100172 100348 100511 100638 100715 100741 98961.2 98961.2
98961.4 98961.5 98998.8 99000 99000 99000 99004.1 99188.6 99202 99228.4 99268.5 99322.9
99392.2 99476.9 99576.9 99691.2 99817.1 99949.4 100080 100198 100290 100348 100368 98950.2
98950.2 98950.4 98950.6 98998.4 99000 99000 99000 99003 99149.5 99161 99183.7 99217.9
99263.7 99321.4 99391.1 99472.1 99563.1 99661.3 99762.3 99860 99946.7 100015 100058 100073
98937.5 98937.5 98937.7 98938 98997.9 99000 99000 99000 99001.8 99111.2 99121.4 99141.2
99170.6 99209.4 99257.7 99315.2 99381 99453.8 99531 99609.1 99683.4 99748.6 99799.7 99832.1
99843.3 98922.7 98923 98923.3 98923.4 98997.2 98999.9 99000 99000 99000.6 99073.3 99083
99101.2 99127.1 99160.7 99201.7 99249.8 99304.2 99363.5 99425.5 99487.2 99545.3 99595.9 99635.1
99660 99668.5 98905.5 98906.1 98907.9 98906.6 98994.9 98997.8 98998.3 98998.5 98998.4 99034.4
99045.8 99063.9 99087.8 99117.8 99153.7 99195.3 99241.8 99291.8 99343.5 99394.5 99441.9 99482.8
99514.4 99534.4 99541.3 98884.8 98886 98890.1 98902 98909.7 98926 98940.9 98956.3 98974.3
98992.9 99011.1 99030.1 99053.1 99081 99114 99151.7 99193.5 99238.2 99283.9 99328.7 99370
99405.6 99432.9 99450.1 99456 98859.9 98861.4 98866.5 98875 98885.7 98898.9 98913.6 98929
98945.6 98963 98981 99000.5 99023.2 99050.5 99082.5 99119 99159.2 99202.1 99245.9 99288.6
99328 99361.8 99387.7 99404.1 99409.7
</DataArray>
</PointData>
<CellData Scalars="process rank">
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
......
test/references/obstaclecc-reference.vtu
+ 68
− 0
View file @ 4fcef7e1
......@@ -444,6 +444,74 @@
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99 0.99
</DataArray>
<DataArray type="Float32" Name="fugacity^H2O" NumberOfComponents="1" format="ascii">
1000.21 1000.46 1000.6 1000.66 1000.04 1000.01 1000.01 1000.2 1006.84 1007.28 1008.18 1009.59
1011.6 1014.31 1017.87 1022.47 1028.38 1036.64 1055.2 1140.2 1577.18 3169.71 3169.71 3169.69
1000.11 1000.29 1000.4 1000.45 1000.02 1000 1000 1000.18 1006.49 1006.93 1007.81 1009.18
1011.14 1013.77 1017.23 1021.68 1027.38 1035.2 1052.14 1130.12 1550.86 3169.71 3169.71 3169.7
1000.07 1000.18 1000.26 1000.3 1000.01 1000 1000 1000.16 1006.09 1006.51 1007.34 1008.65
1010.51 1013 1016.26 1020.43 1025.72 1032.78 1046.88 1111.43 1494.16 3169.71 3169.71 3169.7
1000.04 1000.11 1000.16 1000.18 1000.01 1000 1000 1000.15 1005.64 1006.03 1006.81 1008.02
1009.74 1012.04 1015.03 1018.82 1023.56 1029.64 1040.25 1086.06 1402.14 3169.71 3169.71 3169.7
1000.02 1000.05 1000.08 1000.09 1000.01 1000 1000 1000.13 1005.15 1005.5 1006.21 1007.32
1008.87 1010.93 1013.6 1016.94 1021.07 1026.1 1032.66 1046.72 1113.9 1453.74 1864.77 1922.47
999.98 999.99 1000 1000.01 1000 1000 1000 1000.11 1004.63 1004.94 1005.58 1006.56
1007.93 1009.74 1012.06 1014.93 1018.43 1022.58 1027.44 1033.69 1047.31 1100.16 1214.31 1272.17
999.921 999.926 999.932 999.936 999.999 1000 1000 1000.1 1004.09 1004.37 1004.92 1005.78
1006.97 1008.53 1010.49 1012.91 1015.8 1019.17 1022.96 1027.14 1032.11 1041.11 1060.25 1074.31
999.851 999.854 999.857 999.859 999.996 1000 1000 1000.08 1003.55 1003.79 1004.27 1005
1006.01 1007.33 1008.97 1010.96 1013.31 1015.99 1018.95 1022.06 1025.19 1028.36 1032.03 1034.7
999.772 999.773 999.776 999.777 999.994 1000 1000 1000.07 1003.03 1003.23 1003.63 1004.25
1005.1 1006.19 1007.54 1009.16 1011.03 1013.14 1015.42 1017.76 1020.02 1022.02 1023.61 1024.53
999.681 999.683 999.685 999.687 999.99 1000 1000 1000.06 1002.51 1002.68 1003.02 1003.54
1004.24 1005.14 1006.23 1007.53 1009.01 1010.65 1012.4 1014.16 1015.82 1017.26 1018.32 1018.89
999.577 999.579 999.583 999.586 999.987 1000 1000 1000.04 1002.02 1002.16 1002.45 1002.88
1003.46 1004.19 1005.07 1006.11 1007.27 1008.55 1009.88 1011.2 1012.44 1013.48 1014.24 1014.65
999.457 999.462 999.468 999.474 999.982 1000 1000 1000.03 1001.55 1001.67 1001.92 1002.28
1002.76 1003.35 1004.07 1004.89 1005.81 1006.8 1007.82 1008.83 1009.75 1010.52 1011.08 1011.37
999.319 999.326 999.34 999.353 999.977 1000 1000 1000.02 1001.09 1001.21 1001.43 1001.74
1002.14 1002.63 1003.22 1003.88 1004.62 1005.4 1006.19 1006.96 1007.66 1008.24 1008.66 1008.88
999.156 999.17 999.197 999.23 999.952 999.985 999.989 999.995 1000.64 1000.77 1000.98 1001.25
1001.6 1002.03 1002.52 1003.07 1003.67 1004.3 1004.94 1005.55 1006.1 1006.56 1006.88 1007.05
998.962 998.984 999.032 999.124 999.317 999.492 999.673 999.882 1000.15 1000.36 1000.58 1000.84
1001.16 1001.53 1001.96 1002.44 1002.96 1003.5 1004.04 1004.55 1005.01 1005.38 1005.65 1005.78
998.729 998.755 998.811 998.908 999.056 999.219 999.393 999.588 999.806 1000.01 1000.24 1000.49
1000.79 1001.14 1001.55 1001.99 1002.47 1002.96 1003.45 1003.92 1004.33 1004.67 1004.91 1005.03
</DataArray>
<DataArray type="Float32" Name="fugacity^N2" NumberOfComponents="1" format="ascii">
99021 99045.4 99059.3 99065.7 99004.1 99000.9 99001 99019.8 99676.7 99720.6 99809.8 99949.6
100148 100417 100769 101224 101802 102529 103425 104468 105407 105464 107457 143558
99011.2 99028.5 99039.5 99044.8 99002.2 99000.1 99000.2 99017.5 99642.9 99685.8 99772.8 99909.1
100103 100364 100706 101146 101704 102403 103262 104262 105157 105138 107151 135648
99006.6 99017.8 99025.5 99029.4 99001.4 99000 99000.2 99015.9 99603.2 99644.1 99727 99856.8
100040 100287 100610 101023 101543 102189 102978 103889 104684 104422 106161 132873
99003.9 99010.5 99015.4 99017.9 99000.9 99000 99000.2 99014.4 99558.4 99596.5 99673.8 99794.4
99964.4 100192 100487 100863 101331 101905 102597 103387 104048 103403 104694 125355
99002.3 99004.9 99007.4 99008.9 99000.5 99000 99000.1 99012.9 99509.6 99544.4 99614.8 99724.3
99878 100083 100346 100677 101085 101578 102161 102825 103509 103945 104200 104296
98998 98999.1 99000.3 99001.1 99000.2 99000 99000.1 99011.3 99458 99489.2 99552 99649.3
99785.2 99964.7 100194 100479 100824 101235 101708 102234 102781 103268 103580 103708
98992.2 98992.6 98993.3 98993.7 98999.9 99000 99000.1 99009.8 99405.1 99432.4 99487.4 99572.2
99689.8 99844.1 100039 100278 100564 100897 101273 101678 102088 102461 102735 102869
98985.3 98985.5 98985.9 98986.1 98999.6 99000 99000.1 99008.3 99351.9 99375.5 99422.8 99495.4
99595.4 99725.5 99888.1 100085 100318 100583 100876 101183 101487 101757 101960 102066
98977.4 98977.6 98977.8 98977.9 98999.4 99000 99000.1 99006.9 99299.5 99319.6 99359.7 99421
99504.8 99612.8 99746.4 99906.4 100092 100301 100526 100758 100982 101177 101323 101400
98968.4 98968.6 98968.8 98969 98999 99000 99000.1 99005.5 99248.8 99265.7 99299.4 99350.6
99420 99508.7 99617.2 99745.5 99892.3 100055 100227 100402 100567 100708 100813 100868
98958.1 98958.4 98958.7 98959 98998.7 99000 99000 99004.2 99200 99214.3 99242.6 99285.2
99342.5 99414.8 99502.4 99604.7 99720.2 99846.2 99977.9 100109 100231 100335 100410 100450
98946.3 98946.7 98947.4 98948 98998.2 99000 99000 99002.9 99153.4 99165.7 99189.8 99225.5
99272.9 99332.1 99402.8 99484.5 99575.5 99673.5 99774.5 99873.7 99964.8 100041 100097 100126
98932.5 98933.3 98934.7 98936 98997.7 99000 99000 99001.5 99108.3 99119.8 99141.1 99171.8
99211.6 99260.7 99318.5 99384.5 99457.1 99534.3 99613 99689.2 99758.5 99816.1 99857.4 99879.1
98916.4 98917.8 98920.5 98923.8 98995.3 98998.5 98998.9 98999.5 99063.4 99076.2 99096.7 99124.2
99158.8 99200.5 99249.1 99303.8 99363.4 99426 99489.1 99549.6 99604.1 99649 99681.1 99697.8
98897.2 98899.4 98904.2 98913.3 98932.4 98949.7 98967.6 98988.4 99015.2 99035.2 99057 99083
99114.4 99151.5 99194.1 99241.6 99292.8 99346.2 99399.5 99450.2 99495.5 99532.6 99559 99572.7
98874.2 98876.7 98882.3 98891.9 98906.6 98922.6 98940 98959.2 98980.8 99001.3 99023.3 99048.7
99078.5 99113.3 99153 99197 99244.1 99293 99341.6 99387.6 99428.5 99461.9 99485.6 99497.9
</DataArray>
<DataArray type="Float32" Name="process rank" NumberOfComponents="1" format="ascii">
0 0 0 0 0 0 0 0 0 0 0 0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment