From 0db32574d255ee8f8b20099308e6f0951dbedb7c Mon Sep 17 00:00:00 2001 From: Simon Scholz Date: Thu, 8 Nov 2018 14:55:28 +0100 Subject: [PATCH 1/2] [richardsnc] harmonize sources, input and executables --- .../richardsnc/implicit/CMakeLists.txt | 24 +++++++++---------- .../{test_richardsnc_fv.cc => main.cc} | 2 +- .../{test_richardsnc.input => params.input} | 0 ...ichardswelltracerproblem.hh => problem.hh} | 2 +- ...racerspatialparams.hh => spatialparams.hh} | 0 ....vtu => test_richardsnc_box-reference.vtu} | 0 ...vtu => test_richardsnc_tpfa-reference.vtu} | 0 7 files changed, 14 insertions(+), 14 deletions(-) rename test/porousmediumflow/richardsnc/implicit/{test_richardsnc_fv.cc => main.cc} (99%) rename test/porousmediumflow/richardsnc/implicit/{test_richardsnc.input => params.input} (100%) rename test/porousmediumflow/richardsnc/implicit/{richardswelltracerproblem.hh => problem.hh} (99%) rename test/porousmediumflow/richardsnc/implicit/{richardswelltracerspatialparams.hh => spatialparams.hh} (100%) rename test/references/{richardswelltracerbox-reference.vtu => test_richardsnc_box-reference.vtu} (100%) rename test/references/{richardswelltracercc-reference.vtu => test_richardsnc_tpfa-reference.vtu} (100%) diff --git a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt index 39096375f2..da4898c23f 100644 --- a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt +++ b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt @@ -1,26 +1,26 @@ -add_input_file_links() +add_input_file_links(FILES params.input) -dune_add_test(SOURCES test_richardsnc_fv.cc - NAME test_richardsnc_box +dune_add_test(NAME test_richardsnc_box + SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBox COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardswelltracerbox-reference.vtu + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsnc_box-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box-00035.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box test_richardsnc.input -Problem.Name test_richardsnc_box") + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box params.input -Problem.Name test_richardsnc_box") -dune_add_test(SOURCES test_richardsnc_fv.cc - NAME test_richardsnc_tpfa +dune_add_test(NAME test_richardsnc_tpfa + SOURCES main.cc COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCC COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardswelltracercc-reference.vtu + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsnc_tpfa-reference.vtu ${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa-00033.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa test_richardsnc.input -Problem.Name test_richardsnc_tpfa") + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_tpfa params.input -Problem.Name test_richardsnc_tpfa") #install sources install(FILES -richardswelltracerproblem.hh -richardswelltracerspatialparams.hh -test_richardsnc_fv.cc +problem.hh +spatialparams.hh +main.cc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/porousmediumflow/richardsnc/implicit) diff --git a/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc b/test/porousmediumflow/richardsnc/implicit/main.cc similarity index 99% rename from test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc rename to test/porousmediumflow/richardsnc/implicit/main.cc index ff649d03be..70d6dcdc8d 100644 --- a/test/porousmediumflow/richardsnc/implicit/test_richardsnc_fv.cc +++ b/test/porousmediumflow/richardsnc/implicit/main.cc @@ -23,7 +23,7 @@ */ #include -#include "richardswelltracerproblem.hh" +#include "problem.hh" #include #include diff --git a/test/porousmediumflow/richardsnc/implicit/test_richardsnc.input b/test/porousmediumflow/richardsnc/implicit/params.input similarity index 100% rename from test/porousmediumflow/richardsnc/implicit/test_richardsnc.input rename to test/porousmediumflow/richardsnc/implicit/params.input diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh b/test/porousmediumflow/richardsnc/implicit/problem.hh similarity index 99% rename from test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh rename to test/porousmediumflow/richardsnc/implicit/problem.hh index 8f6784989c..9372c56f01 100644 --- a/test/porousmediumflow/richardsnc/implicit/richardswelltracerproblem.hh +++ b/test/porousmediumflow/richardsnc/implicit/problem.hh @@ -33,7 +33,7 @@ #include #include -#include "richardswelltracerspatialparams.hh" +#include "spatialparams.hh" namespace Dumux { diff --git a/test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh b/test/porousmediumflow/richardsnc/implicit/spatialparams.hh similarity index 100% rename from test/porousmediumflow/richardsnc/implicit/richardswelltracerspatialparams.hh rename to test/porousmediumflow/richardsnc/implicit/spatialparams.hh diff --git a/test/references/richardswelltracerbox-reference.vtu b/test/references/test_richardsnc_box-reference.vtu similarity index 100% rename from test/references/richardswelltracerbox-reference.vtu rename to test/references/test_richardsnc_box-reference.vtu diff --git a/test/references/richardswelltracercc-reference.vtu b/test/references/test_richardsnc_tpfa-reference.vtu similarity index 100% rename from test/references/richardswelltracercc-reference.vtu rename to test/references/test_richardsnc_tpfa-reference.vtu -- GitLab From 415077462d8e6888f823317687e74dcc186f0550 Mon Sep 17 00:00:00 2001 From: Simon Scholz Date: Thu, 8 Nov 2018 14:55:41 +0100 Subject: [PATCH 2/2] [richards] harmonize sources, input and executables --- .../richards/implicit/CMakeLists.txt | 190 +----------------- .../implicit/analytical/CMakeLists.txt | 18 ++ .../{ => analytical}/RichardsAnalytical.m | 0 .../main.cc} | 2 +- .../params.input} | 0 .../problem.hh} | 2 +- .../spatialparams.hh} | 0 .../richards/implicit/lens/CMakeLists.txt | 107 ++++++++++ .../{test_richardslens_fv.cc => lens/main.cc} | 2 +- .../params.input} | 0 .../problem.hh} | 2 +- .../spatialparams.hh} | 0 .../implicit/nonisothermal/CMakeLists.txt | 8 + .../nonisothermal/conduction/CMakeLists.txt | 28 +++ .../conduction/main.cc} | 2 +- .../conduction/params.input} | 0 .../conduction/problem.hh} | 2 +- .../nonisothermal/convection/CMakeLists.txt | 27 +++ .../convection/main.cc} | 2 +- .../convection/params.input} | 0 .../convection/problem.hh} | 2 +- .../nonisothermal/evaporation/CMakeLists.txt | 28 +++ .../evaporation/main.cc} | 2 +- .../evaporation/params.input} | 0 .../evaporation/problem.hh} | 2 +- .../spatialparams.hh} | 0 ...st_richards_analytical_tpfa-reference.vtu} | 0 ...u => test_richards_lens_box-reference.vtu} | 0 ..._richards_lens_box_parallel-reference.vtu} | 0 ... => test_richards_lens_tpfa-reference.vtu} | 0 ...richards_lens_tpfa_parallel-reference.vtu} | 0 ...t_richardsni_conduction_box-reference.vtu} | 0 ..._richardsni_conduction_tpfa-reference.vtu} | 0 ...t_richardsni_convection_box-reference.vtu} | 0 ..._richardsni_convection_tpfa-reference.vtu} | 0 ..._richardsni_evaporation_box-reference.vtu} | 0 ...richardsni_evaporation_tpfa-reference.vtu} | 0 37 files changed, 229 insertions(+), 197 deletions(-) create mode 100644 test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt rename test/porousmediumflow/richards/implicit/{ => analytical}/RichardsAnalytical.m (100%) rename test/porousmediumflow/richards/implicit/{test_ccrichardsanalytical.cc => analytical/main.cc} (99%) rename test/porousmediumflow/richards/implicit/{test_ccrichardsanalytical.input => analytical/params.input} (100%) rename test/porousmediumflow/richards/implicit/{richardsanalyticalproblem.hh => analytical/problem.hh} (99%) rename test/porousmediumflow/richards/implicit/{richardsanalyticalspatialparams.hh => analytical/spatialparams.hh} (100%) create mode 100644 test/porousmediumflow/richards/implicit/lens/CMakeLists.txt rename test/porousmediumflow/richards/implicit/{test_richardslens_fv.cc => lens/main.cc} (99%) rename test/porousmediumflow/richards/implicit/{test_richardslens.input => lens/params.input} (100%) rename test/porousmediumflow/richards/implicit/{richardslensproblem.hh => lens/problem.hh} (99%) rename test/porousmediumflow/richards/implicit/{richardslensspatialparams.hh => lens/spatialparams.hh} (100%) create mode 100644 test/porousmediumflow/richards/implicit/nonisothermal/CMakeLists.txt create mode 100644 test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt rename test/porousmediumflow/richards/implicit/{test_richardsniconvection_fv.cc => nonisothermal/conduction/main.cc} (99%) rename test/porousmediumflow/richards/implicit/{test_richardsniconduction.input => nonisothermal/conduction/params.input} (100%) rename test/porousmediumflow/richards/implicit/{richardsniconductionproblem.hh => nonisothermal/conduction/problem.hh} (99%) create mode 100644 test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt rename test/porousmediumflow/richards/implicit/{test_richardsniconduction_fv.cc => nonisothermal/convection/main.cc} (99%) rename test/porousmediumflow/richards/implicit/{test_richardsniconvection.input => nonisothermal/convection/params.input} (100%) rename test/porousmediumflow/richards/implicit/{richardsniconvectionproblem.hh => nonisothermal/convection/problem.hh} (99%) create mode 100644 test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt rename test/porousmediumflow/richards/implicit/{test_richardsnievaporation_fv.cc => nonisothermal/evaporation/main.cc} (99%) rename test/porousmediumflow/richards/implicit/{test_richardsnievaporation.input => nonisothermal/evaporation/params.input} (100%) rename test/porousmediumflow/richards/implicit/{richardsnievaporationproblem.hh => nonisothermal/evaporation/problem.hh} (99%) rename test/porousmediumflow/richards/implicit/{richardsnispatialparams.hh => nonisothermal/spatialparams.hh} (100%) rename test/references/{richardsanalyticalcc-reference.vtu => test_richards_analytical_tpfa-reference.vtu} (100%) rename test/references/{richardslensbox-reference.vtu => test_richards_lens_box-reference.vtu} (100%) rename test/references/{richardslensbox-reference-parallel.vtu => test_richards_lens_box_parallel-reference.vtu} (100%) rename test/references/{richardslenscc-reference.vtu => test_richards_lens_tpfa-reference.vtu} (100%) rename test/references/{richardslenscc-reference-parallel.vtu => test_richards_lens_tpfa_parallel-reference.vtu} (100%) rename test/references/{richardsniconductionbox-reference.vtu => test_richardsni_conduction_box-reference.vtu} (100%) rename test/references/{richardsniconductioncc-reference.vtu => test_richardsni_conduction_tpfa-reference.vtu} (100%) rename test/references/{richardsniconvectionbox-reference.vtu => test_richardsni_convection_box-reference.vtu} (100%) rename test/references/{richardsniconvectioncc-reference.vtu => test_richardsni_convection_tpfa-reference.vtu} (100%) rename test/references/{test_boxrichardsevaporation-reference.vtu => test_richardsni_evaporation_box-reference.vtu} (100%) rename test/references/{test_ccrichardsevaporation-reference.vtu => test_richardsni_evaporation_tpfa-reference.vtu} (100%) diff --git a/test/porousmediumflow/richards/implicit/CMakeLists.txt b/test/porousmediumflow/richards/implicit/CMakeLists.txt index 80f797fe43..c8564e2962 100644 --- a/test/porousmediumflow/richards/implicit/CMakeLists.txt +++ b/test/porousmediumflow/richards/implicit/CMakeLists.txt @@ -1,187 +1,3 @@ -add_input_file_links() - -# isothermal tests -add_executable(test_richards_tpfa EXCLUDE_FROM_ALL test_richardslens_fv.cc) -target_compile_definitions(test_richards_tpfa PUBLIC TYPETAG=RichardsLensCC) - -add_executable(test_richards_box EXCLUDE_FROM_ALL test_richardslens_fv.cc) -target_compile_definitions(test_richards_box PUBLIC TYPETAG=RichardsLensBox) - -dune_add_test(TARGET test_richards_box - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_richards_box-00007.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_box test_richardslens.input -Problem.Name test_richards_box") - -dune_add_test(TARGET test_richards_tpfa - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa-00007.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa test_richardslens.input -Problem.Name test_richards_tpfa") - -dune_add_test(NAME test_richards_box_parallel_yasp - TARGET test_richards_box - CMAKE_GUARD MPI_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} - --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference-parallel.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_box_parallel_yasp-00007.vtu - ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_box_parallel_yasp-00007.pvtu - --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_box test_richardslens.input -Problem.Name test_richards_box_parallel_yasp -Grid.Overlap 0") - -dune_add_test(NAME test_richards_tpfa_parallel_yasp - TARGET test_richards_tpfa - CMAKE_GUARD MPI_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} - --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference-parallel.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_tpfa_parallel_yasp-00007.vtu - ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_tpfa_parallel_yasp-00007.pvtu - --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa test_richardslens.input -Problem.Name test_richards_tpfa_parallel_yasp -Grid.Overlap 1") - -# TODO: there is a small difference because of the precision loss when writing and reading to and from vtk with single precision -# This is why we need a bit higher saturation threshold since pc-sw is very sensitive to pressure for saturations close to 0 -dune_add_test(NAME test_richards_tpfa_parallel_yasp_restart - TARGET test_richards_tpfa - CMAKE_GUARD MPI_FOUND - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"S_liq":1e-3,"water content":1e-3} - --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference-parallel.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_tpfa_parallel_yasp_restart-00004.vtu - ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_tpfa_parallel_yasp_restart-00004.pvtu - --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa test_richardslens.input -Problem.Name test_richards_tpfa_parallel_yasp_restart -Grid.Overlap 1 -Restart.Time 536.797 -Restart.File s0002-test_richards_tpfa_parallel_yasp-00003.pvtu -TimeLoop.DtInitial 408.68") - -# the restart test has to run after the test that produces the corresponding vtu file -set_tests_properties(test_richards_tpfa_parallel_yasp_restart PROPERTIES DEPENDS test_richards_tpfa_parallel_yasp) - -dune_add_test(NAME test_richards_box_parallel_ug - SOURCES test_richardslens_fv.cc - CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )" - COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::UGGrid<2> - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} - --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_box_parallel_ug-00007.pvtu - --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_box_parallel_ug test_richardslens.input -Problem.Name test_richards_box_parallel_ug") - -dune_add_test(NAME test_richards_tpfa_parallel_ug - SOURCES test_richardslens_fv.cc - CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )" - COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::UGGrid<2> - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} - --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_tpfa_parallel_ug-00007.pvtu - --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa_parallel_ug test_richardslens.input -Problem.Name test_richards_tpfa_parallel_ug") - -dune_add_test(NAME test_richards_box_parallel_alu - SOURCES test_richardslens_fv.cc - CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )" - COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming> - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} - --files ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_box_parallel_alu-00007.pvtu - --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_box_parallel_alu test_richardslens.input -Problem.Name test_richards_box_parallel_alu") - -dune_add_test(NAME test_richards_tpfa_parallel_alu - SOURCES test_richardslens_fv.cc - CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )" - COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming> - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} - --files ${CMAKE_SOURCE_DIR}/test/references/richardslenscc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_tpfa_parallel_alu-00007.pvtu - --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_tpfa_parallel_alu test_richardslens.input -Problem.Name test_richards_tpfa_parallel_alu") - -# comparison to analytical solution - only with cc -dune_add_test(SOURCES test_ccrichardsanalytical.cc - NAME test_ccrichardsanalytical - COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCC - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardsanalyticalcc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsanalytical-00001.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsanalytical test_ccrichardsanalytical.input -Problem.Name test_ccrichardsanalytical") -# non-isothermal tests -dune_add_test(SOURCES test_richardsniconvection_fv.cc - NAME test_boxrichardsniconvection - COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBox - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardsniconvectionbox-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsniconvection-00044.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsniconvection test_richardsniconvection.input -Problem.Name test_boxrichardsniconvection" - ) - -dune_add_test(SOURCES test_richardsniconvection_fv.cc - NAME test_ccrichardsniconvection - COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCC - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardsniconvectioncc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsniconvection-00043.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsniconvection test_richardsniconvection.input -Problem.Name test_ccrichardsniconvection") - -dune_add_test(SOURCES test_richardsniconduction_fv.cc - NAME test_boxrichardsniconduction - COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBox - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardsniconductionbox-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsniconduction-00024.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsniconduction test_richardsniconduction.input -Problem.Name test_boxrichardsniconduction" - ) - -dune_add_test(SOURCES test_richardsniconduction_fv.cc - NAME test_ccrichardsniconduction - COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCC - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/richardsniconductioncc-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsniconduction-00024.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsniconduction test_richardsniconduction.input -Problem.Name test_ccrichardsniconduction" - ) - -dune_add_test(SOURCES test_richardsnievaporation_fv.cc - NAME test_richardsnievaporation_tpfa - COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationCC - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/test_ccrichardsevaporation-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_ccrichardsnievaporation-00043.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnievaporation_tpfa test_richardsnievaporation.input -Problem.Name test_ccrichardsnievaporation" - ) - -dune_add_test(SOURCES test_richardsnievaporation_fv.cc - NAME test_richardsnievaporation_box - COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationBox - COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py - CMD_ARGS --script fuzzy - --files ${CMAKE_SOURCE_DIR}/test/references/test_boxrichardsevaporation-reference.vtu - ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichardsnievaporation-00043.vtu - --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnievaporation_box test_richardsnievaporation.input -Problem.Name test_boxrichardsnievaporation" - ) - - -#install sources -install(FILES -richardsanalyticalproblem.hh -richardsanalyticalspatialparams.hh -richardslensproblem.hh -richardslensspatialparams.hh -richardsniconductionproblem.hh -richardsniconvectionproblem.hh -richardsnievaporationproblem.hh -richardsnispatialparams.hh -test_richardslens_fv.cc -test_richardsniconduction_fv.cc -test_richardsniconvection_fv.cc -test_richardsnievaporation_fv.cc -test_ccrichardsanalytical.cc -DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards) +add_subdirectory(analytical) +add_subdirectory(lens) +add_subdirectory(nonisothermal) diff --git a/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt new file mode 100644 index 0000000000..741eea2d02 --- /dev/null +++ b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt @@ -0,0 +1,18 @@ +add_input_file_links(FILES params.input) + +# comparison to analytical solution - only with tpfa +dune_add_test(NAME test_richards_analytical_tpfa + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCC + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_analytical_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richards_analytical_tpfa-00001.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_analytical_tpfa params.input -Problem.Name test_richards_analytical_tpfa") + +#install sources +install(FILES +problem.hh +spatialparams.hh +main.cc +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/analytical) diff --git a/test/porousmediumflow/richards/implicit/RichardsAnalytical.m b/test/porousmediumflow/richards/implicit/analytical/RichardsAnalytical.m similarity index 100% rename from test/porousmediumflow/richards/implicit/RichardsAnalytical.m rename to test/porousmediumflow/richards/implicit/analytical/RichardsAnalytical.m diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc b/test/porousmediumflow/richards/implicit/analytical/main.cc similarity index 99% rename from test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc rename to test/porousmediumflow/richards/implicit/analytical/main.cc index 68b566589c..963addeee9 100644 --- a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.cc +++ b/test/porousmediumflow/richards/implicit/analytical/main.cc @@ -23,7 +23,7 @@ */ #include -#include "richardsanalyticalproblem.hh" +#include "problem.hh" #include #include diff --git a/test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input b/test/porousmediumflow/richards/implicit/analytical/params.input similarity index 100% rename from test/porousmediumflow/richards/implicit/test_ccrichardsanalytical.input rename to test/porousmediumflow/richards/implicit/analytical/params.input diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/analytical/problem.hh similarity index 99% rename from test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh rename to test/porousmediumflow/richards/implicit/analytical/problem.hh index acef90639f..9a13cdba62 100644 --- a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh +++ b/test/porousmediumflow/richards/implicit/analytical/problem.hh @@ -40,7 +40,7 @@ #include #include -#include "richardsanalyticalspatialparams.hh" +#include "spatialparams.hh" namespace Dumux { diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh b/test/porousmediumflow/richards/implicit/analytical/spatialparams.hh similarity index 100% rename from test/porousmediumflow/richards/implicit/richardsanalyticalspatialparams.hh rename to test/porousmediumflow/richards/implicit/analytical/spatialparams.hh diff --git a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt new file mode 100644 index 0000000000..aa2be73b0c --- /dev/null +++ b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt @@ -0,0 +1,107 @@ +add_input_file_links(FILES params.input) + +# isothermal tests +add_executable(test_richards_lens_tpfa EXCLUDE_FROM_ALL main.cc) +target_compile_definitions(test_richards_lens_tpfa PUBLIC TYPETAG=RichardsLensCC) + +add_executable(test_richards_lens_box EXCLUDE_FROM_ALL main.cc) +target_compile_definitions(test_richards_lens_box PUBLIC TYPETAG=RichardsLensBox) + +dune_add_test(TARGET test_richards_lens_box + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box-00007.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box params.input -Problem.Name test_richards_lens_box") + +dune_add_test(TARGET test_richards_lens_tpfa + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa-00007.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa params.input -Problem.Name test_richards_lens_tpfa") + +dune_add_test(NAME test_richards_lens_box_parallel_yasp + TARGET test_richards_lens_box + CMAKE_GUARD MPI_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box_parallel-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_lens_box_parallel_yasp-00007.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_yasp-00007.pvtu + --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box params.input -Problem.Name test_richards_lens_box_parallel_yasp -Grid.Overlap 0") + +dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp + TARGET test_richards_lens_tpfa + CMAKE_GUARD MPI_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa_parallel-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_lens_tpfa_parallel_yasp-00007.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_yasp-00007.pvtu + --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa params.input -Problem.Name test_richards_lens_tpfa_parallel_yasp -Grid.Overlap 1") + +# TODO: there is a small difference because of the precision loss when writing and reading to and from vtk with single precision +# This is why we need a bit higher saturation threshold since pc-sw is very sensitive to pressure for saturations close to 0 +dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart + TARGET test_richards_lens_tpfa + CMAKE_GUARD MPI_FOUND + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"S_liq":1e-3,"water content":1e-3} + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa_parallel-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-test_richards_lens_tpfa_parallel_yasp_restart-00004.vtu + ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_yasp_restart-00004.pvtu + --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa params.input -Problem.Name test_richards_lens_tpfa_parallel_yasp_restart -Grid.Overlap 1 -Restart.Time 536.797 -Restart.File s0002-test_richards_lens_tpfa_parallel_yasp-00003.pvtu -TimeLoop.DtInitial 408.68") + +# the restart test has to run after the test that produces the corresponding vtu file +set_tests_properties(test_richards_lens_tpfa_parallel_yasp_restart PROPERTIES DEPENDS test_richards_lens_tpfa_parallel_yasp) + +dune_add_test(NAME test_richards_lens_box_parallel_ug + SOURCES main.cc + CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )" + COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::UGGrid<2> + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_ug-00007.pvtu + --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_ug params.input -Problem.Name test_richards_lens_box_parallel_ug") + +dune_add_test(NAME test_richards_lens_tpfa_parallel_ug + SOURCES main.cc + CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )" + COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::UGGrid<2> + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_ug-00007.pvtu + --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_parallel_ug params.input -Problem.Name test_richards_lens_tpfa_parallel_ug") + +dune_add_test(NAME test_richards_lens_box_parallel_alu + SOURCES main.cc + CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )" + COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming> + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_box_parallel_alu-00007.pvtu + --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_alu params.input -Problem.Name test_richards_lens_box_parallel_alu") + +dune_add_test(NAME test_richards_lens_tpfa_parallel_alu + SOURCES main.cc + CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )" + COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming> + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100} + --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/s0002-test_richards_lens_tpfa_parallel_alu-00007.pvtu + --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_parallel_alu params.input -Problem.Name test_richards_lens_tpfa_parallel_alu") + +#install sources +install(FILES +problem.hh +spatialparams.hh +main.cc +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/lens) diff --git a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc b/test/porousmediumflow/richards/implicit/lens/main.cc similarity index 99% rename from test/porousmediumflow/richards/implicit/test_richardslens_fv.cc rename to test/porousmediumflow/richards/implicit/lens/main.cc index c145f63b0d..3bc2d04606 100644 --- a/test/porousmediumflow/richards/implicit/test_richardslens_fv.cc +++ b/test/porousmediumflow/richards/implicit/lens/main.cc @@ -47,7 +47,7 @@ #include #include -#include "richardslensproblem.hh" +#include "problem.hh" //////////////////////// // the main function diff --git a/test/porousmediumflow/richards/implicit/test_richardslens.input b/test/porousmediumflow/richards/implicit/lens/params.input similarity index 100% rename from test/porousmediumflow/richards/implicit/test_richardslens.input rename to test/porousmediumflow/richards/implicit/lens/params.input diff --git a/test/porousmediumflow/richards/implicit/richardslensproblem.hh b/test/porousmediumflow/richards/implicit/lens/problem.hh similarity index 99% rename from test/porousmediumflow/richards/implicit/richardslensproblem.hh rename to test/porousmediumflow/richards/implicit/lens/problem.hh index 68c601f412..253fddd798 100644 --- a/test/porousmediumflow/richards/implicit/richardslensproblem.hh +++ b/test/porousmediumflow/richards/implicit/lens/problem.hh @@ -42,7 +42,7 @@ #include #include -#include "richardslensspatialparams.hh" +#include "spatialparams.hh" namespace Dumux { diff --git a/test/porousmediumflow/richards/implicit/richardslensspatialparams.hh b/test/porousmediumflow/richards/implicit/lens/spatialparams.hh similarity index 100% rename from test/porousmediumflow/richards/implicit/richardslensspatialparams.hh rename to test/porousmediumflow/richards/implicit/lens/spatialparams.hh diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/CMakeLists.txt new file mode 100644 index 0000000000..d38897000d --- /dev/null +++ b/test/porousmediumflow/richards/implicit/nonisothermal/CMakeLists.txt @@ -0,0 +1,8 @@ +add_subdirectory(conduction) +add_subdirectory(convection) +add_subdirectory(evaporation) + +#install sources +install(FILES +spatialparams.hh +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/nonisothermal) diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt new file mode 100644 index 0000000000..5aeb30ccca --- /dev/null +++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt @@ -0,0 +1,28 @@ +add_input_file_links(FILES params.input) + +# non-isothermal tests +dune_add_test(NAME test_richardsni_conduction_box + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBox + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_conduction_box-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_box-00024.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_box params.input -Problem.Name test_richardsni_conduction_box" + ) + +dune_add_test(NAME test_richardsni_conduction_tpfa + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCC + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_conduction_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_tpfa-00024.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_tpfa params.input -Problem.Name test_richardsni_conduction_tpfa" + ) + +#install sources +install(FILES +problem.hh +main.cc +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/nonisothermal/conduction) diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc similarity index 99% rename from test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc rename to test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc index 59879c9d36..590519745c 100644 --- a/test/porousmediumflow/richards/implicit/test_richardsniconvection_fv.cc +++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/main.cc @@ -23,7 +23,7 @@ */ #include -#include "richardsniconvectionproblem.hh" +#include "problem.hh" #include #include diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconduction.input b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/params.input similarity index 100% rename from test/porousmediumflow/richards/implicit/test_richardsniconduction.input rename to test/porousmediumflow/richards/implicit/nonisothermal/conduction/params.input diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh similarity index 99% rename from test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh rename to test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh index 9cffd77bec..b2d3a1f097 100644 --- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/problem.hh @@ -36,7 +36,7 @@ #include #include #include -#include "richardsnispatialparams.hh" +#include "../spatialparams.hh" namespace Dumux { diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt new file mode 100644 index 0000000000..32568736cf --- /dev/null +++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt @@ -0,0 +1,27 @@ +add_input_file_links(FILES params.input) + +# non-isothermal tests +dune_add_test(NAME test_richardsni_convection_box + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBox + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_convection_box-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_box-00044.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_box params.input -Problem.Name test_richardsni_convection_box" + ) + +dune_add_test(NAME test_richardsni_convection_tpfa + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCC + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_convection_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_tpfa-00043.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_tpfa params.input -Problem.Name test_richardsni_convection_tpfa") + +#install sources +install(FILES +problem.hh +main.cc +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/nonisothermal/convection) diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc b/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc similarity index 99% rename from test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc rename to test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc index 3b41a9ac59..590519745c 100644 --- a/test/porousmediumflow/richards/implicit/test_richardsniconduction_fv.cc +++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/main.cc @@ -23,7 +23,7 @@ */ #include -#include "richardsniconductionproblem.hh" +#include "problem.hh" #include #include diff --git a/test/porousmediumflow/richards/implicit/test_richardsniconvection.input b/test/porousmediumflow/richards/implicit/nonisothermal/convection/params.input similarity index 100% rename from test/porousmediumflow/richards/implicit/test_richardsniconvection.input rename to test/porousmediumflow/richards/implicit/nonisothermal/convection/params.input diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh similarity index 99% rename from test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh rename to test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh index 532f64f4b0..a70b9c0df5 100644 --- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/problem.hh @@ -37,7 +37,7 @@ #include #include #include -#include "richardsnispatialparams.hh" +#include "../spatialparams.hh" namespace Dumux { /** diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt new file mode 100644 index 0000000000..71c29289c7 --- /dev/null +++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt @@ -0,0 +1,28 @@ +add_input_file_links(FILES params.input) + +# non-isothermal tests +dune_add_test(NAME test_richardsni_evaporation_tpfa + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationCC + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_evaporation_tpfa-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_tpfa-00043.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_tpfa params.input -Problem.Name test_richardsni_evaporation_tpfa" + ) + +dune_add_test(NAME test_richardsni_evaporation_box + SOURCES main.cc + COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationBox + COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py + CMD_ARGS --script fuzzy + --files ${CMAKE_SOURCE_DIR}/test/references/test_richardsni_evaporation_box-reference.vtu + ${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_box-00043.vtu + --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_box params.input -Problem.Name test_richardsni_evaporation_box" + ) + +#install sources +install(FILES +problem.hh +main.cc +DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dumux/test/implicit/richards/nonisothermal/evaporation) diff --git a/test/porousmediumflow/richards/implicit/test_richardsnievaporation_fv.cc b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc similarity index 99% rename from test/porousmediumflow/richards/implicit/test_richardsnievaporation_fv.cc rename to test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc index cf93612ae3..26b2d59c05 100644 --- a/test/porousmediumflow/richards/implicit/test_richardsnievaporation_fv.cc +++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/main.cc @@ -23,7 +23,7 @@ */ #include -#include "richardsnievaporationproblem.hh" +#include "problem.hh" #include #include diff --git a/test/porousmediumflow/richards/implicit/test_richardsnievaporation.input b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/params.input similarity index 100% rename from test/porousmediumflow/richards/implicit/test_richardsnievaporation.input rename to test/porousmediumflow/richards/implicit/nonisothermal/evaporation/params.input diff --git a/test/porousmediumflow/richards/implicit/richardsnievaporationproblem.hh b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh similarity index 99% rename from test/porousmediumflow/richards/implicit/richardsnievaporationproblem.hh rename to test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh index 037d5c0ccb..fb110fa818 100644 --- a/test/porousmediumflow/richards/implicit/richardsnievaporationproblem.hh +++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/problem.hh @@ -36,7 +36,7 @@ #include #include #include -#include "richardsnispatialparams.hh" +#include "../spatialparams.hh" namespace Dumux { diff --git a/test/porousmediumflow/richards/implicit/richardsnispatialparams.hh b/test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh similarity index 100% rename from test/porousmediumflow/richards/implicit/richardsnispatialparams.hh rename to test/porousmediumflow/richards/implicit/nonisothermal/spatialparams.hh diff --git a/test/references/richardsanalyticalcc-reference.vtu b/test/references/test_richards_analytical_tpfa-reference.vtu similarity index 100% rename from test/references/richardsanalyticalcc-reference.vtu rename to test/references/test_richards_analytical_tpfa-reference.vtu diff --git a/test/references/richardslensbox-reference.vtu b/test/references/test_richards_lens_box-reference.vtu similarity index 100% rename from test/references/richardslensbox-reference.vtu rename to test/references/test_richards_lens_box-reference.vtu diff --git a/test/references/richardslensbox-reference-parallel.vtu b/test/references/test_richards_lens_box_parallel-reference.vtu similarity index 100% rename from test/references/richardslensbox-reference-parallel.vtu rename to test/references/test_richards_lens_box_parallel-reference.vtu diff --git a/test/references/richardslenscc-reference.vtu b/test/references/test_richards_lens_tpfa-reference.vtu similarity index 100% rename from test/references/richardslenscc-reference.vtu rename to test/references/test_richards_lens_tpfa-reference.vtu diff --git a/test/references/richardslenscc-reference-parallel.vtu b/test/references/test_richards_lens_tpfa_parallel-reference.vtu similarity index 100% rename from test/references/richardslenscc-reference-parallel.vtu rename to test/references/test_richards_lens_tpfa_parallel-reference.vtu diff --git a/test/references/richardsniconductionbox-reference.vtu b/test/references/test_richardsni_conduction_box-reference.vtu similarity index 100% rename from test/references/richardsniconductionbox-reference.vtu rename to test/references/test_richardsni_conduction_box-reference.vtu diff --git a/test/references/richardsniconductioncc-reference.vtu b/test/references/test_richardsni_conduction_tpfa-reference.vtu similarity index 100% rename from test/references/richardsniconductioncc-reference.vtu rename to test/references/test_richardsni_conduction_tpfa-reference.vtu diff --git a/test/references/richardsniconvectionbox-reference.vtu b/test/references/test_richardsni_convection_box-reference.vtu similarity index 100% rename from test/references/richardsniconvectionbox-reference.vtu rename to test/references/test_richardsni_convection_box-reference.vtu diff --git a/test/references/richardsniconvectioncc-reference.vtu b/test/references/test_richardsni_convection_tpfa-reference.vtu similarity index 100% rename from test/references/richardsniconvectioncc-reference.vtu rename to test/references/test_richardsni_convection_tpfa-reference.vtu diff --git a/test/references/test_boxrichardsevaporation-reference.vtu b/test/references/test_richardsni_evaporation_box-reference.vtu similarity index 100% rename from test/references/test_boxrichardsevaporation-reference.vtu rename to test/references/test_richardsni_evaporation_box-reference.vtu diff --git a/test/references/test_ccrichardsevaporation-reference.vtu b/test/references/test_richardsni_evaporation_tpfa-reference.vtu similarity index 100% rename from test/references/test_ccrichardsevaporation-reference.vtu rename to test/references/test_richardsni_evaporation_tpfa-reference.vtu -- GitLab