diff --git a/test/implicit/2p2c/CMakeLists.txt b/test/implicit/2p2c/CMakeLists.txt index 2034c07b2193725e81c63d648149946a3cf4ba10..013e45c525808fd0fb7bd2c733cf4bd411431ba8 100644 --- a/test/implicit/2p2c/CMakeLists.txt +++ b/test/implicit/2p2c/CMakeLists.txt @@ -19,11 +19,13 @@ add_dumux_test(test_box2p2cni test_box2p2cni test_box2p2cni.cc ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py ${CMAKE_SOURCE_DIR}/test/references/waterairbox-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/waterairbox-00010.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_box2p2cni) + ${CMAKE_CURRENT_BINARY_DIR}/test_box2p2cni + -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_box2p2cni_reference.input) add_dumux_test(test_cc2p2cni test_cc2p2cni test_cc2p2cni.cc ${CMAKE_SOURCE_DIR}/bin/runTest.sh ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py ${CMAKE_SOURCE_DIR}/test/references/wateraircc-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/wateraircc-00010.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_cc2p2cni) + ${CMAKE_CURRENT_BINARY_DIR}/test_cc2p2cni + -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_cc2p2cni_reference.input) diff --git a/test/implicit/2p2c/test_box2p2cni.cc b/test/implicit/2p2c/test_box2p2cni.cc index d353c04b9719c06e81b45bd7a567340a0142e5f7..b2da809fd49e4c0cfa843fe2cbd34082bb83ae5a 100644 --- a/test/implicit/2p2c/test_box2p2cni.cc +++ b/test/implicit/2p2c/test_box2p2cni.cc @@ -44,7 +44,8 @@ void usage(const char *progName, const std::string &errorMsg) "\t-TimeManager.TEnd End of the simulation [s] \n" "\t-TimeManager.DtInitial Initial timestep size [s] \n" "\t-Grid.File Name of the file containing the grid \n" - "\t definition in DGF format\n"; + "\t definition in DGF format\n" + "\t-Output.PlotFluidMatrixInteractions Interactive output via gnuplot\n"; std::cout << errorMessageOut << "\n"; diff --git a/test/implicit/2p2c/test_box2p2cni.input b/test/implicit/2p2c/test_box2p2cni.input index 39459a96722f8ace1a650f56d4e653db900a3db2..c391abd0049752dc0467d1dd885c628399c54efb 100644 --- a/test/implicit/2p2c/test_box2p2cni.input +++ b/test/implicit/2p2c/test_box2p2cni.input @@ -8,3 +8,5 @@ File = ./grids/test_2p2cni.dgf [Problem] Name = waterairbox +[Output] +PlotFluidMatrixInteractions = true diff --git a/test/implicit/2p2c/test_box2p2cni_reference.input b/test/implicit/2p2c/test_box2p2cni_reference.input new file mode 100644 index 0000000000000000000000000000000000000000..b166d6eaa212352498d5972827fe1e63620a73d9 --- /dev/null +++ b/test/implicit/2p2c/test_box2p2cni_reference.input @@ -0,0 +1,12 @@ +[TimeManager] +DtInitial = 250 # [s] +TEnd = 1e4 # [s] + +[Grid] +File = ./grids/test_2p2cni.dgf + +[Problem] +Name = waterairbox + +[Output] +PlotFluidMatrixInteractions = false diff --git a/test/implicit/2p2c/test_cc2p2cni.input b/test/implicit/2p2c/test_cc2p2cni.input index 25f2200be867bb88df22866a1a8e904f5fbb1f91..35d29d8ef157bc87b42f82983a7b497a3c62280a 100644 --- a/test/implicit/2p2c/test_cc2p2cni.input +++ b/test/implicit/2p2c/test_cc2p2cni.input @@ -8,3 +8,5 @@ File = ./grids/test_2p2cni.dgf [Problem] Name = wateraircc +[Output] +PlotFluidMatrixInteractions = true diff --git a/test/implicit/2p2c/test_cc2p2cni_reference.input b/test/implicit/2p2c/test_cc2p2cni_reference.input new file mode 100644 index 0000000000000000000000000000000000000000..7edffc9adebf47f1bebfbaf334e76e611a7d6c8d --- /dev/null +++ b/test/implicit/2p2c/test_cc2p2cni_reference.input @@ -0,0 +1,12 @@ +[TimeManager] +DtInitial = 250 # [s] +TEnd = 1e4 # [s] + +[Grid] +File = ./grids/test_2p2cni.dgf + +[Problem] +Name = wateraircc + +[Output] +PlotFluidMatrixInteractions = false diff --git a/test/implicit/2p2c/waterairspatialparams.hh b/test/implicit/2p2c/waterairspatialparams.hh index 0406868fe694ef32c0c5da940b51246e1ee757c4..cf2e65a3ff57579039a232b1f61bcd91798b3b52 100644 --- a/test/implicit/2p2c/waterairspatialparams.hh +++ b/test/implicit/2p2c/waterairspatialparams.hh @@ -115,6 +115,9 @@ public: coarseMaterialParams_.setPe(1e4); fineMaterialParams_.setLambda(2.0); coarseMaterialParams_.setLambda(2.0); + + plotFluidMatrixInteractions_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Output, + PlotFluidMatrixInteractions); } /*! @@ -126,18 +129,18 @@ public: PlotMaterialLaw<TypeTag> plotMaterialLaw; PlotEffectiveDiffusivityModel<TypeTag> plotEffectiveDiffusivityModel; PlotThermalConductivityModel<TypeTag> plotThermalConductivityModel; - plotMaterialLaw.plotpcsw(fineMaterialParams_, 0.1, 1.0, "fine"); - plotMaterialLaw.plotpcsw(coarseMaterialParams_, 0.1, 1.0, "coarse"); - plotMaterialLaw.plotkr(fineMaterialParams_, 0.1, 1.0, "fine", false/*interactive*/); - plotMaterialLaw.plotkr(coarseMaterialParams_, 0.1, 1.0, "coarse", false/*interactive*/); + plotMaterialLaw.plotpcsw(fineMaterialParams_, 0.2, 1.0, "fine", plotFluidMatrixInteractions_); + plotMaterialLaw.plotpcsw(coarseMaterialParams_, 0.2, 1.0, "coarse", plotFluidMatrixInteractions_); + plotMaterialLaw.plotkr(fineMaterialParams_, 0.2, 1.0, "fine", plotFluidMatrixInteractions_); + plotMaterialLaw.plotkr(coarseMaterialParams_, 0.2, 1.0, "coarse", plotFluidMatrixInteractions_); - plotEffectiveDiffusivityModel.plotdeff(finePorosity_, 0.0, 1.0, "fine"); - plotEffectiveDiffusivityModel.plotdeff(coarsePorosity_, 0.0, 1.0, "coarse"); + plotEffectiveDiffusivityModel.plotdeff(finePorosity_, 0.0, 1.0, "fine", plotFluidMatrixInteractions_); + plotEffectiveDiffusivityModel.plotdeff(coarsePorosity_, 0.0, 1.0, "coarse", plotFluidMatrixInteractions_); plotThermalConductivityModel.plotlambdaeff(finePorosity_, 2700.0, lambdaSolid_, - 0.0, 1.0, "fine"); + 0.0, 1.0, "fine", plotFluidMatrixInteractions_); plotThermalConductivityModel.plotlambdaeff(coarsePorosity_, 2700.0, lambdaSolid_, - 0.0, 1.0, "coarse"); + 0.0, 1.0, "coarse", plotFluidMatrixInteractions_); } /*! @@ -259,6 +262,8 @@ private: MaterialLawParams fineMaterialParams_; MaterialLawParams coarseMaterialParams_; + + bool plotFluidMatrixInteractions_; }; }