Commit 726fd26e authored by Martin Schneider's avatar Martin Schneider
Browse files

Added ctests for mm test problems

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux-lecture/trunk@14472 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent a08567d0
add_dumux_test(buckleyleverettexercise buckleyleverettexercise buckleyleverettexercise.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/buckleyleverett-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/buckleyleverett-00063.vtu
${CMAKE_CURRENT_BINARY_DIR}/buckleyleverettexercise
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/buckleyleverettexercise.input)
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/buckleyleverettexercise.input
-Grid.NumberOfCellsX 20)
# headers for installation and headercheck
install(FILES
......
add_dumux_test(co2plumeshapeexercise co2plumeshapeexercise co2plumeshapeexercise.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/CO2_PlumeShape-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/CO2_PlumeShape-00077.vtu
${CMAKE_CURRENT_BINARY_DIR}/co2plumeshapeexercise
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/co2plumeshapeexercise.input)
......
add_dumux_test(columnxyleneexercise columnxyleneexercise columnxyleneexercise.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/columnxylol-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/columnxylol-00039.vtu
${CMAKE_CURRENT_BINARY_DIR}/columnxyleneexercise
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/columnxyleneexercise.input
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/column.dgf)
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/column.dgf
-TimeManager.OutputInterval 100)
# headers for installation and headercheck
install(FILES
......
......@@ -3,6 +3,7 @@
[TimeManager]
DtInitial = 1 # [s]
TEnd = 3600 # [s]
OutputInterval = 1
[Grid]
File = ./grids/column.dgf
......
......@@ -288,46 +288,16 @@ public:
}
/*
bool shouldWriteOutput() const
{
return
this->timeManager().timeStepIndex() == 0 ||
this->timeManager().timeStepIndex() == 10 ||
this->timeManager().timeStepIndex() == 20 ||
this->timeManager().timeStepIndex() == 50 ||
this->timeManager().timeStepIndex() == 100 ||
this->timeManager().timeStepIndex() == 200 ||
this->timeManager().timeStepIndex() == 300 ||
this->timeManager().timeStepIndex() == 400 ||
this->timeManager().timeStepIndex() == 500 ||
this->timeManager().timeStepIndex() == 600 ||
this->timeManager().timeStepIndex() == 700 ||
this->timeManager().timeStepIndex() == 800 ||
this->timeManager().timeStepIndex() == 900 ||
this->timeManager().timeStepIndex() == 1000 ||
this->timeManager().timeStepIndex() == 1100 ||
this->timeManager().timeStepIndex() == 1200 ||
this->timeManager().timeStepIndex() == 1300 ||
this->timeManager().timeStepIndex() == 1400 ||
this->timeManager().timeStepIndex() == 1500 ||
this->timeManager().timeStepIndex() == 1600 ||
this->timeManager().timeStepIndex() == 1700 ||
this->timeManager().timeStepIndex() == 1800 ||
this->timeManager().timeStepIndex() == 1900 ||
this->timeManager().timeStepIndex() == 2000 ||
this->timeManager().timeStepIndex() == 2100 ||
this->timeManager().timeStepIndex() == 2200 ||
this->timeManager().timeStepIndex() == 2300 ||
this->timeManager().timeStepIndex() == 2400 ||
this->timeManager().timeStepIndex() == 2500 ||
this->timeManager().timeStepIndex() == 2600 ||
this->timeManager().timeStepIndex() == 2700 ||
this->timeManager().timeStepIndex() == 2800 ||
this->timeManager().timeStepIndex() == 2900 ||
this->timeManager().willBeFinished();
int outputInterval = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, TimeManager, OutputInterval);
return (this->timeManager().timeStepIndex() % outputInterval == 0 ||
this->timeManager().willBeFinished());
}
*/
private:
......
add_dumux_test(convmixexercise convmixexercise convmixexercise.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/convmix-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/convmix-00065.vtu
${CMAKE_CURRENT_BINARY_DIR}/convmixexercise
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/convmixexercise.input)
......@@ -7,4 +11,4 @@ install(FILES
convmixco2tables.hh
convmixproblem.hh
convmixspatialparameters.hh
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lecture/mm/convmix)
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lecture/mm/convectivemixing)
add_dumux_test(heatpipe heatpipe heatpipe.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/heatpipe-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/heatpipe-00300.vtu
${CMAKE_CURRENT_BINARY_DIR}/heatpipe
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/heatpipe.input
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/heatpipe.dgf)
......
add_dumux_test(henry1p2c henry1p2c henry1p2c.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/Henry1p2c-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/Henry1p2c-00058.vtu
${CMAKE_CURRENT_BINARY_DIR}/henry1p2c
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/henry1p2c.input
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/henry.dgf)
......
add_dumux_test(henry2p henry2p henry2p.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/Henry2p-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/Henry2p-00082.vtu
${CMAKE_CURRENT_BINARY_DIR}/henry2p
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/henry2p.input
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/henry.dgf)
......
add_dumux_test(mcwhorterexercise mcwhorterexercise mcwhorterexercise.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/McWhorter-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/McWhorter-00099.vtu
${CMAKE_CURRENT_BINARY_DIR}/mcwhorterexercise
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/mcwhorterexercise.input)
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/mcwhorterexercise.input
-Grid.NumberOfCellsX 20)
# headers for installation and headercheck
install(FILES
......
add_dumux_test(naplinfiltrationexercise naplinfiltrationexercise naplinfiltrationexercise.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/infiltration-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/infiltration-00082.vtu
${CMAKE_CURRENT_BINARY_DIR}/naplinfiltrationexercise
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/naplinfiltrationexercise.input
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/naplinfiltrationexercise.dgf)
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/naplinfiltrationexercise.dgf
-TimeManager.TEnd 4.0e7
-Newton.MaxSteps 6)
# headers for installation and headercheck
install(FILES
......
add_dumux_test(remediationscenariosexercise remediationscenariosexercise remediationscenariosexercise.cc
${dumux_INCLUDE_DIRS}/bin/runTest.sh
${dumux_INCLUDE_DIRS}/bin/fuzzycomparevtu.py
${CMAKE_SOURCE_DIR}/lecture/references/kuevette3p3cni-reference.vtu
${CMAKE_CURRENT_BINARY_DIR}/kuevette3p3cni-00015.vtu
${CMAKE_CURRENT_BINARY_DIR}/remediationscenariosexercise
-ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/remediationscenariosexercise.input
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/kuevette.dgf)
-Grid.File ${CMAKE_CURRENT_SOURCE_DIR}/grids/kuevette.dgf
-TimeManager.TEnd 6000
-TimeManager.OutputInterval 100)
# headers for installation and headercheck
install(FILES
......
......@@ -3,7 +3,8 @@
[TimeManager]
DtInitial = 1 # [s]
TEnd = 2592000 # [s]
MaxTimeStepSize = 25 # [s]
MaxTimeStepSize = 5 # [s]
OutputInterval = 1
[Grid]
File = ./grids/kuevette.dgf
......
......@@ -321,6 +321,15 @@ public:
else return wgPhaseOnly;
}
bool shouldWriteOutput() const
{
int outputInterval = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, int, TimeManager, OutputInterval);
return (this->timeManager().timeStepIndex() % outputInterval == 0 ||
this->timeManager().willBeFinished());
}
private:
// internal method for the initial condition (reused for the
......
Supports Markdown
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