Commit 9dd18ae7 authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

implicit branch: start adapting CMake/CTest. Use the correct names for the box...

implicit branch: start adapting CMake/CTest. Use the correct names for the box tests. Move reference solutions to a separate directory. Build cell centered tests (do not actually test them yet).

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/branches/implicit@9793 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent bb0e3a30
......@@ -384,71 +384,37 @@ add_subdirectory("tutorial")
# copy the testing script
make_directory(bin)
make_directory(references)
file(COPY test/references/ DESTINATION references)
file(COPY bin/runTest.sh DESTINATION bin)
file(COPY bin/fuzzycomparevtu.py DESTINATION bin)
file(COPY test/boxmodels/1p/1ptest-reference.vtu DESTINATION references)
file(COPY test/boxmodels/1p/test_1p.input DESTINATION test/boxmodels/1p)
file(COPY test/boxmodels/1p2c/outflow-reference.vtu DESTINATION references)
file(COPY test/boxmodels/1p2c/test_1p2c.input DESTINATION test/boxmodels/1p2c)
file(COPY test/boxmodels/2p/lens-reference.vtu DESTINATION references)
file(COPY test/boxmodels/2p/test_2p.input DESTINATION test/boxmodels/2p)
file(COPY test/boxmodels/2pni/injection2pni-reference.vtu DESTINATION references)
file(COPY test/boxmodels/2pni/test_2pni.input DESTINATION test/boxmodels/2pni)
file(COPY test/boxmodels/2p2c/injection-reference.vtu DESTINATION references)
file(COPY test/boxmodels/2p2c/test_2p2c.input DESTINATION test/boxmodels/2p2c)
file(COPY test/boxmodels/2p2cni/waterair-reference.vtu DESTINATION references)
file(COPY test/boxmodels/2p2cni/test_2p2cni.input DESTINATION test/boxmodels/2p2cni)
file(COPY test/boxmodels/3p3c/infiltration-reference.vtu DESTINATION references)
file(COPY test/boxmodels/3p3c/test_3p3c.input DESTINATION test/boxmodels/3p3c)
file(COPY test/boxmodels/3p3cni/column3p3cni-reference.vtu DESTINATION references)
file(COPY test/boxmodels/3p3cni/test_3p3cni.input DESTINATION test/boxmodels/3p3cni)
file(COPY test/boxmodels/co2/co2-reference.vtu DESTINATION references)
file(COPY test/boxmodels/co2/test_co2.input DESTINATION test/boxmodels/co2)
file(COPY test/boxmodels/co2ni/co2ni-reference.vtu DESTINATION references)
file(COPY test/boxmodels/co2ni/test_co2ni.input DESTINATION test/boxmodels/co2ni)
file(COPY test/boxmodels/mpnc/obstacle-reference.vtu DESTINATION references)
file(COPY test/boxmodels/mpnc/test_mpnc.input DESTINATION test/boxmodels/mpnc)
file(COPY test/boxmodels/mpnc/forchheimer1p-reference.vtp DESTINATION references)
file(COPY test/boxmodels/mpnc/test_forchheimer1p.input DESTINATION test/boxmodels/mpnc)
file(COPY test/boxmodels/mpnc/forchheimer2p-reference.vtu DESTINATION references)
file(COPY test/boxmodels/mpnc/test_forchheimer2p.input DESTINATION test/boxmodels/mpnc)
if(MPI_FOUND)
file(COPY test/boxmodels/richards/richardslens-reference-parallel.vtu DESTINATION references)
else(MPI_FOUND)
file(COPY test/boxmodels/richards/richardslens-reference.vtu DESTINATION references)
endif(MPI_FOUND)
file(COPY test/boxmodels/richards/test_richards.input DESTINATION test/boxmodels/richards)
file(COPY test/decoupled/1p/diffusion-reference.vtu DESTINATION references)
file(COPY test/decoupled/1p/test_1p-reference.vtu DESTINATION references)
file(COPY test/implicit/1p/test_box1p.input DESTINATION test/implicit/1p)
file(COPY test/implicit/1p2c/test_box1p2c.input DESTINATION test/implicit/1p2c)
file(COPY test/implicit/2p/test_box2p.input DESTINATION test/implicit/2p)
file(COPY test/implicit/2pni/test_box2pni.input DESTINATION test/implicit/2pni)
file(COPY test/implicit/2p2c/test_box2p2c.input DESTINATION test/implicit/2p2c)
file(COPY test/implicit/2p2cni/test_box2p2cni.input DESTINATION test/implicit/2p2cni)
file(COPY test/implicit/3p3c/test_box3p3c.input DESTINATION test/implicit/3p3c)
file(COPY test/implicit/3p3cni/test_box3p3cni.input DESTINATION test/implicit/3p3cni)
file(COPY test/implicit/co2/test_co2.input DESTINATION test/implicit/co2)
file(COPY test/implicit/co2ni/test_co2ni.input DESTINATION test/implicit/co2ni)
file(COPY test/implicit/mpnc/test_boxmpnc.input DESTINATION test/implicit/mpnc)
file(COPY test/implicit/mpnc/test_forchheimer1p.input DESTINATION test/implicit/mpnc)
file(COPY test/implicit/mpnc/test_forchheimer2p.input DESTINATION test/implicit/mpnc)
file(COPY test/implicit/richards/test_boxrichards.input DESTINATION test/implicit/richards)
file(COPY test/decoupled/1p/test_1p.input DESTINATION test/decoupled/1p/)
file(COPY test/decoupled/2p/test_transport-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p/test_transport.input DESTINATION test/decoupled/2p)
file(COPY test/decoupled/2p/test_impes-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p/test_impes.input DESTINATION test/decoupled/2p)
file(COPY test/decoupled/2p/test_mpfao2p-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p/test_mpfal2p-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p/test_mpfal2padaptive-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p/test_mpfa2p.input DESTINATION test/decoupled/2p)
file(COPY test/decoupled/2p/test_2padaptive-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p/test_impesadaptive.input DESTINATION test/decoupled/2p)
file(COPY test/decoupled/2p2c/test_adaptive2p2c-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p2c/test_adaptive2p2c.input DESTINATION test/decoupled/2p2c)
file(COPY test/decoupled/2p2c/test_dec2p2c-reference.vtu DESTINATION references)
file(COPY test/decoupled/2p2c/test_dec2p2c.input DESTINATION test/decoupled/2p2c)
file(COPY test/decoupled/2p2c/test_multiphysics2p2c-reference.vtu DESTINATION references)
file(COPY test/common/generalproblem/generallens_box-reference.vtu DESTINATION references)
file(COPY test/common/generalproblem/generallens_decoupled-reference.vtu DESTINATION references)
file(COPY test/common/generalproblem/test_generalproblem2p.input DESTINATION test/common/generalproblem)
file(COPY tutorial/tutorial_coupled.input DESTINATION tutorial)
file(COPY tutorial/tutorial_decoupled.input DESTINATION tutorial)
if(SUPERLU_FOUND)
file(COPY test/freeflow/stokes/stokes-reference.vtu DESTINATION references)
file(COPY test/freeflow/stokes/test_stokes.input DESTINATION test/freeflow/stokes)
file(COPY test/freeflow/stokes2c/stokes2c-reference.vtu DESTINATION references)
file(COPY test/freeflow/stokes2c/test_stokes2c.input DESTINATION test/freeflow/stokes2c)
file(COPY test/freeflow/stokes2cni/stokes2cni-reference.vtu DESTINATION references)
file(COPY test/freeflow/stokes2cni/test_stokes2cni.input DESTINATION test/freeflow/stokes2cni)
file(COPY test/freeflow/navierstokes/navierstokes-reference.vtu DESTINATION references)
file(COPY test/freeflow/navierstokes/test_navierstokes.input DESTINATION test/freeflow/navierstokes)
endif(SUPERLU_FOUND)
......@@ -466,24 +432,24 @@ add_test(test_ncpflash test/material/ncpflash/test_ncpflash)
add_test(test_pengrobinson test/material/pengrobinson/test_pengrobinson)
add_test(test_tabulation test/material/tabulation/test_tabulation)
add_test(test_1p bin/runTest.sh references/1ptest-reference.vtu 1ptest-00002.vtu test/boxmodels/1p/test_1p -Grid.File test/boxmodels/1p/grids/test_1p_2d.dgf -TimeManager.TEnd 1 -TimeManager.DtInitial 1)
add_test(test_1p2c bin/runTest.sh references/outflow-reference.vtu outflow-00010.vtu test/boxmodels/1p2c/test_1p2c -Grid.File test/boxmodels/1p2c/grids/test_1p2c.dgf -TimeManager.TEnd 100 -TimeManager.DtInitial 1)
add_test(test_2p bin/runTest.sh references/lens-reference.vtu lens-00009.vtu test/boxmodels/2p/test_2p -Grid.File test/boxmodels/2p/grids/test_2p.dgf -TimeManager.TEnd 3000 -TimeManager.DtInitial 250)
add_test(test_2pni bin/runTest.sh references/injection2pni-reference.vtu injection2pni-00009.vtu test/boxmodels/2pni/test_2pni -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_2p2c bin/runTest.sh references/injection-reference.vtu injection-00009.vtu test/boxmodels/2p2c/test_2p2c -Grid.File test/boxmodels/2p2c/grids/test_2p2c.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_2p2cni bin/runTest.sh references/waterair-reference.vtu waterair-00010.vtu test/boxmodels/2p2cni/test_2p2cni -Grid.File test/boxmodels/2p2cni/grids/test_2p2cni.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_3p3c bin/runTest.sh references/infiltration-reference.vtu infiltration-00007.vtu test/boxmodels/3p3c/test_3p3c -Grid.File test/boxmodels/3p3c/grids/test_3p3c_coarse.dgf -TimeManager.TEnd 8.64e5 -TimeManager.DtInitial 8.64e4)
add_test(test_3p3cni bin/runTest.sh references/column3p3cni-reference.vtu columnxylol-00060.vtu test/boxmodels/3p3cni/test_3p3cni -Grid.File test/boxmodels/3p3cni/grids/column.dgf)
add_test(test_co2 bin/runTest.sh references/co2-reference.vtu heterogeneous-00020.vtu test/boxmodels/co2/test_co2 -Grid.File test/boxmodels/co2/grids/heterogeneousSmall.dgf)
add_test(test_restart bin/runTest.sh references/co2-reference.vtu heterogeneous-00020.vtu test/boxmodels/co2/test_co2 -Grid.File test/boxmodels/co2/grids/heterogeneousSmall.dgf -Restart 42008.6 -TimeManager.DtInitial 23452.1)
add_test(test_co2ni bin/runTest.sh references/co2ni-reference.vtu heterogeneousni-00020.vtu test/boxmodels/co2ni/test_co2ni -Grid.File test/boxmodels/co2ni/grids/heterogeneousSmall.dgf)
add_test(test_mpnc bin/runTest.sh references/obstacle-reference.vtu obstacle-00010.vtu test/boxmodels/mpnc/test_mpnc -Grid.File test/boxmodels/mpnc/grids/obstacle_24x16.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_forchheimer1p bin/runTest.sh references/forchheimer1p-reference.vtp test_forchheimer1p-00002.vtp test/boxmodels/mpnc/test_forchheimer1p -Grid.File test/boxmodels/mpnc/grids/forchheimer1d.dgf)
add_test(test_forchheimer2p bin/runTest.sh references/forchheimer2p-reference.vtu test_forchheimer2p-00009.vtu test/boxmodels/mpnc/test_forchheimer2p -Grid.File test/boxmodels/mpnc/grids/obstacle_24x16.dgf)
add_test(test_box1p bin/runTest.sh references/1ptestbox-reference.vtu 1ptestbox-00002.vtu test/implicit/1p/test_box1p -Grid.File test/implicit/1p/grids/test_1p_2d.dgf -TimeManager.TEnd 1 -TimeManager.DtInitial 1)
add_test(test_box1p2c bin/runTest.sh references/outflowbox-reference.vtu outflowbox-00010.vtu test/implicit/1p2c/test_box1p2c -Grid.File test/implicit/1p2c/grids/test_1p2c.dgf -TimeManager.TEnd 100 -TimeManager.DtInitial 1)
add_test(test_box2p bin/runTest.sh references/lensbox-reference.vtu lensbox-00009.vtu test/implicit/2p/test_box2p -Grid.File test/implicit/2p/grids/test_2p.dgf -TimeManager.TEnd 3000 -TimeManager.DtInitial 250)
add_test(test_box2pni bin/runTest.sh references/injection2pnibox-reference.vtu injection2pnibox-00009.vtu test/implicit/2pni/test_box2pni -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_box2p2c bin/runTest.sh references/injectionbox-reference.vtu injectionbox-00009.vtu test/implicit/2p2c/test_box2p2c -Grid.File test/implicit/2p2c/grids/test_2p2c.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_box2p2cni bin/runTest.sh references/waterairbox-reference.vtu waterairbox-00010.vtu test/implicit/2p2cni/test_box2p2cni -Grid.File test/implicit/2p2cni/grids/test_2p2cni.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_box3p3c bin/runTest.sh references/infiltrationbox-reference.vtu infiltrationbox-00007.vtu test/implicit/3p3c/test_box3p3c -Grid.File test/implicit/3p3c/grids/test_3p3c_coarse.dgf -TimeManager.TEnd 8.64e5 -TimeManager.DtInitial 8.64e4)
add_test(test_box3p3cni bin/runTest.sh references/column3p3cnibox-reference.vtu columnxylolbox-00060.vtu test/implicit/3p3cni/test_box3p3cni -Grid.File test/implicit/3p3cni/grids/column.dgf)
add_test(test_co2 bin/runTest.sh references/co2-reference.vtu heterogeneous-00020.vtu test/implicit/co2/test_co2 -Grid.File test/implicit/co2/grids/heterogeneousSmall.dgf)
add_test(test_restart bin/runTest.sh references/co2-reference.vtu heterogeneous-00020.vtu test/implicit/co2/test_co2 -Grid.File test/implicit/co2/grids/heterogeneousSmall.dgf -Restart 42008.6 -TimeManager.DtInitial 23452.1)
add_test(test_co2ni bin/runTest.sh references/co2ni-reference.vtu heterogeneousni-00020.vtu test/implicit/co2ni/test_co2ni -Grid.File test/implicit/co2ni/grids/heterogeneousSmall.dgf)
add_test(test_boxmpnc bin/runTest.sh references/obstaclebox-reference.vtu obstaclebox-00010.vtu test/implicit/mpnc/test_boxmpnc -Grid.File test/implicit/mpnc/grids/obstacle_24x16.dgf -TimeManager.TEnd 1e4 -TimeManager.DtInitial 250)
add_test(test_forchheimer1p bin/runTest.sh references/forchheimer1p-reference.vtp test_forchheimer1p-00002.vtp test/implicit/mpnc/test_forchheimer1p -Grid.File test/implicit/mpnc/grids/forchheimer1d.dgf)
add_test(test_forchheimer2p bin/runTest.sh references/forchheimer2p-reference.vtu test_forchheimer2p-00009.vtu test/implicit/mpnc/test_forchheimer2p -Grid.File test/implicit/mpnc/grids/obstacle_24x16.dgf)
if(MPI_FOUND)
add_test(test_richards bin/runTest.sh references/richardslens-reference-parallel.vtu s0002-p0000-richardslens-00008.vtu ${MPIEXEC} -np 2 test/boxmodels/richards/test_richards -Grid.File test/boxmodels/richards/grids/richardslens-24x16.dgf -TimeManager.TEnd 3000 -TimeManager.DtInitial 100)
add_test(test_boxrichards bin/runTest.sh references/richardslensbox-reference-parallel.vtu s0002-p0000-richardslensbox-00008.vtu ${MPIEXEC} -np 2 test/implicit/richards/test_boxrichards -Grid.File test/implicit/richards/grids/richardslens-24x16.dgf -TimeManager.TEnd 3000 -TimeManager.DtInitial 100)
else(MPI_FOUND)
add_test(test_richards bin/runTest.sh references/richardslens-reference.vtu richardslens-00008.vtu test/boxmodels/richards/test_richards -Grid.File test/boxmodels/richards/grids/richardslens-24x16.dgf -TimeManager.TEnd 3000 -TimeManager.DtInitial 100)
add_test(test_boxrichards bin/runTest.sh references/richardslensbox-reference.vtu richardslensbox-00008.vtu test/implicit/richards/test_boxrichards -Grid.File test/implicit/richards/grids/richardslens-24x16.dgf -TimeManager.TEnd 3000 -TimeManager.DtInitial 100)
endif(MPI_FOUND)
add_test(test_diffusion bin/runTest.sh references/diffusion-reference.vtu mimeticdiffusion-00001.vtu test/decoupled/1p/test_diffusion 3)
......
......@@ -36,9 +36,9 @@ namespace Dumux
* This implements gravity (if desired) and a function returning the temperature.
*/
template<class TypeTag>
class StokesProblem : public BoxProblem<TypeTag>
class StokesProblem : public ImplicitProblem<TypeTag>
{
typedef BoxProblem<TypeTag> ParentType;
typedef ImplicitProblem<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Problem) Implementation;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
......
......@@ -26,8 +26,8 @@
#define DUMUX_STOKES_VOLUME_VARIABLES_HH
#include "stokesproperties.hh"
#include "dumux/implicit/common/implicitvolumevariables.hh"
#include <dumux/implicit/common/implicitvolumevariables.hh>
#include <dumux/material/fluidstates/immisciblefluidstate.hh>
namespace Dumux
......@@ -40,9 +40,9 @@ namespace Dumux
* finite volume in the Stokes box model.
*/
template <class TypeTag>
class StokesVolumeVariables : public BoxVolumeVariables<TypeTag>
class StokesVolumeVariables : public ImplicitVolumeVariables<TypeTag>
{
typedef BoxVolumeVariables<TypeTag> ParentType;
typedef ImplicitVolumeVariables<TypeTag> ParentType;
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
......
add_subdirectory("boxmodels")
add_subdirectory("implicit")
add_subdirectory("common")
add_subdirectory("decoupled")
add_subdirectory("freeflow")
......
# build target for the onephase-onecomponent test problem
add_executable("test_1p" test_1p.cc)
target_link_libraries("test_1p" ${DumuxLinkLibraries})
add_executable("test_box1p" test_box1p.cc)
target_link_libraries("test_box1p" ${DumuxLinkLibraries})
add_executable("test_cc1p" test_cc1p.cc)
target_link_libraries("test_cc1p" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_1p"
add_custom_command(TARGET "test_box1p"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
add_executable("test_1p2c" test_1p2c.cc)
target_link_libraries("test_1p2c" ${DumuxLinkLibraries})
add_executable("test_box1p2c" test_box1p2c.cc)
target_link_libraries("test_box1p2c" ${DumuxLinkLibraries})
add_executable("test_cc1p2c" test_cc1p2c.cc)
target_link_libraries("test_cc1p2c" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_1p2c"
add_custom_command(TARGET "test_box1p2c"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
# build target for the simple twophase lens problem
add_executable("test_2p" test_2p.cc)
target_link_libraries("test_2p" ${DumuxLinkLibraries})
add_executable("test_box2p" test_box2p.cc)
target_link_libraries("test_box2p" ${DumuxLinkLibraries})
add_executable("test_cc2p" test_cc2p.cc)
target_link_libraries("test_cc2p" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_2p"
add_custom_command(TARGET "test_box2p"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
# build target for the twophase-twocomponent test problem
add_executable("test_2p2c" test_2p2c.cc)
target_link_libraries("test_2p2c" ${DumuxLinkLibraries})
add_executable("test_box2p2c" test_box2p2c.cc)
target_link_libraries("test_box2p2c" ${DumuxLinkLibraries})
add_executable("test_cc2p2c" test_cc2p2c.cc)
target_link_libraries("test_cc2p2c" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_2p2c"
add_custom_command(TARGET "test_box2p2c"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
# build target for the 2p2cni test problem
add_executable("test_2p2cni" test_2p2cni.cc)
target_link_libraries("test_2p2cni" ${DumuxLinkLibraries})
add_executable("test_box2p2cni" test_box2p2cni.cc)
target_link_libraries("test_box2p2cni" ${DumuxLinkLibraries})
add_executable("test_cc2p2cni" test_cc2p2cni.cc)
target_link_libraries("test_cc2p2cni" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_2p2cni"
add_custom_command(TARGET "test_box2p2cni"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
add_executable("test_2pni" test_2pni.cc)
target_link_libraries("test_2pni" ${DumuxLinkLibraries})
add_executable("test_box2pni" test_box2pni.cc)
target_link_libraries("test_box2pni" ${DumuxLinkLibraries})
add_executable("test_cc2pni" test_cc2pni.cc)
target_link_libraries("test_cc2pni" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
......@@ -7,7 +10,7 @@ include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_2pni"
add_custom_command(TARGET "test_box2pni"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
add_executable("test_3p3c" test_3p3c.cc)
target_link_libraries("test_3p3c" ${DumuxLinkLibraries})
add_executable("test_box3p3c" test_box3p3c.cc)
target_link_libraries("test_box3p3c" ${DumuxLinkLibraries})
add_executable("test_cc3p3c" test_cc3p3c.cc)
target_link_libraries("test_cc3p3c" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
......@@ -7,7 +10,7 @@ include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_3p3c"
add_custom_command(TARGET "test_box3p3c"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
add_executable("test_3p3cni" test_3p3cni.cc)
target_link_libraries("test_3p3cni" ${DumuxLinkLibraries})
add_executable("test_box3p3cni" test_box3p3cni.cc)
target_link_libraries("test_box3p3cni" ${DumuxLinkLibraries})
add_executable("test_cc3p3cni" test_cc3p3cni.cc)
target_link_libraries("test_cc3p3cni" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
......@@ -7,7 +10,7 @@ include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_3p3cni"
add_custom_command(TARGET "test_box3p3cni"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
# build target for the twophase-twocomponent test problem
add_executable("test_mpnc" test_mpnc.cc)
target_link_libraries("test_mpnc" ${DumuxLinkLibraries})
add_executable("test_boxmpnc" test_boxmpnc.cc)
target_link_libraries("test_boxmpnc" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_mpnc"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
"${CMAKE_CURRENT_SOURCE_DIR}/grids"
"${CMAKE_CURRENT_BINARY_DIR}/grids")
add_executable("test_ccmpnc" test_ccmpnc.cc)
target_link_libraries("test_ccmpnc" ${DumuxLinkLibraries})
# build target for the one-phase forchheimer test problem
add_executable("test_forchheimer1p" test_forchheimer1p.cc)
target_link_libraries("test_forchheimer1p" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_forchheimer1p"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
"${CMAKE_CURRENT_SOURCE_DIR}/grids"
"${CMAKE_CURRENT_BINARY_DIR}/grids")
# build target for the two-phase forchheimer test problem
add_executable("test_forchheimer2p" test_forchheimer2p.cc)
target_link_libraries("test_forchheimer2p" ${DumuxLinkLibraries})
......@@ -39,9 +18,9 @@ link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_forchheimer2p"
add_custom_command(TARGET "test_mpnc"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
"${CMAKE_CURRENT_SOURCE_DIR}/grids"
"${CMAKE_CURRENT_BINARY_DIR}/grids")
\ No newline at end of file
"${CMAKE_CURRENT_BINARY_DIR}/grids")
......@@ -4,15 +4,18 @@ if (MPI_FOUND)
endif (MPI_FOUND)
# build target for the twophase-twocomponent test problem
add_executable("test_richards" test_richards.cc)
target_link_libraries("test_richards" ${DumuxLinkLibraries})
add_executable("test_boxrichards" test_boxrichards.cc)
target_link_libraries("test_boxrichards" ${DumuxLinkLibraries})
add_executable("test_ccrichards" test_ccrichards.cc)
target_link_libraries("test_ccrichards" ${DumuxLinkLibraries})
# add required libraries and includes to the build flags
link_directories(${DumuxLinkDirectories})
include_directories(${DumuxIncludeDirectories})
# make sure the grids are present in the build directory
add_custom_command(TARGET "test_richards"
add_custom_command(TARGET "test_boxrichards"
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_directory
......
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