Commit 64b31b59 authored by Timo Koch's avatar Timo Koch

Merge branch 'cleanup/input-file-names-and-cmakelists' into 'master'

Harmonize input file names and CMakeLists.txt

Closes #4

See merge request !62
parents c91156ca 9c9c98ab
Pipeline #751 passed with stage
in 25 seconds
# the immiscible two-phase simulation program
dune_add_test(NAME exercise_basic_2p
SOURCES exercise_basic_2p.cc
CMD_ARGS exercise_basic.input)
SOURCES exercise_basic_2p.cc)
# the compositional two-phase two-component simulation program
dune_add_test(NAME exercise_basic_2p2c
SOURCES exercise_basic_2p2c.cc
CMD_ARGS exercise_basic.input)
SOURCES exercise_basic_2p2c.cc)
# here, add the two-phase non-isothermal simulation program
# add exercise to the common target
add_dependencies(test_exercises exercise_basic_2p exercise_basic_2p2c)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_basic.input")
# add a symlink for each input file
add_input_file_links()
# executables for exercisebiomin
dune_add_test(NAME exercisebiomin
SOURCES exercisebiomin.cc
CMD_ARGS exercisebiomin.input)
SOURCES exercisebiomin.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercisebiomin)
# add symlinks for the input files
add_input_file_links(FILES "exercisebiomin.input")
# add a symlink for each input file
add_input_file_links()
add_input_file_links()
# executables for ex_interface_coupling_ff-pm
dune_add_test(NAME ex_interface_coupling_ff-pm
SOURCES ex_interface_coupling_ff-pm.cc
CMD_ARGS ex_interface_coupling_ff-pm.input)
SOURCES ex_interface_coupling_ff-pm.cc)
# add tutorial to the common target
add_dependencies(test_exercises ex_interface_coupling_ff-pm)
# add a symlink for each input file
add_input_file_links()
add_input_file_links()
# executables for ex_interface_coupling_ff-pm
dune_add_test(NAME ex_models_coupling_ff-pm
SOURCES ex_models_coupling_ff-pm.cc
CMD_ARGS ex_models_coupling_ff-pm.input)
SOURCES ex_models_coupling_ff-pm.cc)
# add tutorial to the common target
add_dependencies(test_exercises ex_models_coupling_ff-pm)
# add a symlink for each input file
add_input_file_links()
add_input_file_links()
# executables for ex_interface_coupling_ff-pm
dune_add_test(NAME ex_turbulence_coupling_ff-pm
SOURCES ex_turbulence_coupling_ff-pm.cc
CMD_ARGS ex_turbulence_coupling_ff-pm.input)
SOURCES ex_turbulence_coupling_ff-pm.cc)
# add a symlink for each input file
add_input_file_links()
# add tutorial to the common target
add_dependencies(test_exercises ex_turbulence_coupling_ff-pm)
......@@ -3,18 +3,18 @@
dune_add_test(NAME exercise-fluidsystem_a
SOURCES exercise-fluidsystem.cc
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoP
COMPILE_ONLY # for testing purposes, ignore for the exercise
CMD_ARGS exercise-fluidsystem_a.input)
COMPILE_ONLY) # for testing purposes, ignore for the exercise
#part b: 2p2cproblem
dune_add_test(NAME exercise-fluidsystem_b
SOURCES exercise-fluidsystem.cc
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoPTwoC
COMPILE_ONLY # for testing purposes, ignore for the exercise
CMD_ARGS exercise-fluidsystem_b.input)
COMPILE_ONLY) # for testing purposes, ignore for the exercise
# add exercises to the common target
add_dependencies(test_exercises exercise-fluidsystem_a exercise-fluidsystem_b)
# add symlinks for the input files
# add a symlink for each input file
add_input_file_links()
# add a symlink for the grids folder
dune_symlink_to_source_files(FILES grids)
dune_symlink_to_source_files(FILES "grids" "exercise_fractures.input")
dune_add_test(NAME exercise_fractures
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
SOURCES exercise_fractures.cc
COMMAND ./exercise_fractures
CMD_ARGS exercise_fractures.input)
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
SOURCES exercise_fractures.cc)
set(CMAKE_BUILD_TYPE Release)
# add a symlink for each input file
add_input_file_links()
# add a symlink for the grids folder
dune_symlink_to_source_files(FILES grids)
#install sources
install(FILES
......
# the grid exercise simulation program
dune_add_test(NAME exercise_grids
SOURCES exercise_grids.cc
CMD_ARGS exercise_grids.input)
SOURCES exercise_grids.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_grids)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_grids.input")
# add a symlink for each input file
add_input_file_links()
# add a symlink for the grids folder
dune_symlink_to_source_files(FILES grids)
# the one-phase simulation program
dune_add_test(NAME exercise_1p_a
SOURCES exercise_1p_a.cc
CMD_ARGS exercise_1p_a.input)
SOURCES exercise_1p_a.cc)
dune_add_test(NAME exercise_1p_b
SOURCES exercise_1p_b.cc
CMD_ARGS exercise_1p_b.input)
SOURCES exercise_1p_b.cc)
dune_add_test(NAME exercise_1p_c
SOURCES exercise_1p_c.cc
CMD_ARGS exercise_1p_c.input)
SOURCES exercise_1p_c.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_1p_a exercise_1p_b exercise_1p_c)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_1p_a.input" "exercise_1p_b.input" "exercise_1p_c.input")
# add a symlink for each input file
add_input_file_links()
# the property exercise simulation program
dune_add_test(NAME exercise_properties
SOURCES exercise_properties.cc
CMD_ARGS exercise_properties.input)
SOURCES exercise_properties.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_properties)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_properties.input")
# add a symlink for each input file
add_input_file_links()
# the runtime parameter exercise simulation program
dune_add_test(NAME exercise_runtimeparams
SOURCES exercise_runtimeparams.cc
CMD_ARGS exercise_runtimeparams.input)
SOURCES exercise_runtimeparams.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_runtimeparams)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_runtimeparams.input")
# add a symlink for each input file
add_input_file_links()
# the two-phase non-isothermal simulation program
dune_add_test(NAME exercise_basic_2pni_solution
SOURCES exercise_basic_2pni.cc
CMD_ARGS exercise_basic.input)
SOURCES exercise_basic_2pni.cc)
# add exercise to the common target
add_dependencies(test_exercises exercise_basic_2pni_solution)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_basic.input")
# add a symlink for each input file
add_input_file_links()
# executables for exercisebiomin
dune_add_test(NAME exercisebiomin_solution
SOURCES exercisebiomin.cc
CMD_ARGS exercisebiomin_solution.input)
SOURCES exercisebiomin.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercisebiomin_solution)
# add symlinks for the input files
add_input_file_links(FILES "exercisebiomin.input")
# add a symlink for each input file
add_input_file_links()
add_input_file_links()
dune_add_test(NAME orig_ex_interface_coupling_ff-pm
SOURCES ex_interface_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=0
CMD_ARGS ex_interface_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=0)
dune_add_test(NAME sol_a_ex_interface_coupling_ff-pm
SOURCES ex_interface_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=1
CMD_ARGS ex_interface_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=1)
dune_add_test(NAME sol_b_ex_interface_coupling_ff-pm
SOURCES ex_interface_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=2
CMD_ARGS ex_interface_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=2)
dune_add_test(NAME sol_c_ex_interface_coupling_ff-pm
SOURCES ex_interface_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=3
CMD_ARGS ex_interface_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=3)
# add exercise to the common target
add_dependencies(test_exercises sol_a_ex_interface_coupling_ff-pm sol_b_ex_interface_coupling_ff-pm sol_b_ex_interface_coupling_ff-pm)
# add a symlink for each input file
add_input_file_links()
add_input_file_links()
dune_add_test(NAME orig_ex_models_coupling_ff-pm
SOURCES ex_models_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=0
CMD_ARGS ex_models_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=0)
dune_add_test(NAME sol_a_ex_models_coupling_ff-pm
SOURCES ex_models_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=1
CMD_ARGS ex_models_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=1)
dune_add_test(NAME sol_b_ex_models_coupling_ff-pm
SOURCES ex_models_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=2
CMD_ARGS ex_models_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=2)
dune_add_test(NAME sol_c_ex_models_coupling_ff-pm
SOURCES ex_models_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=3
CMD_ARGS ex_models_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=3)
# add exercise to the common target
add_dependencies(test_exercises sol_a_ex_models_coupling_ff-pm sol_b_ex_models_coupling_ff-pm sol_b_ex_models_coupling_ff-pm)
# add a symlink for each input file
add_input_file_links()
add_input_file_links()
dune_add_test(NAME orig_turbulence_coupling_ff-pm
SOURCES ex_turbulence_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=0
CMD_ARGS ex_turbulence_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=0)
dune_add_test(NAME sol_a_ex_turbulence_coupling_ff-pm
SOURCES ex_turbulence_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=1
CMD_ARGS ex_turbulence_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=1)
dune_add_test(NAME sol_b_ex_turbulence_coupling_ff-pm
SOURCES ex_turbulence_coupling_ff-pm.cc
COMPILE_DEFINITIONS EXNUMBER=2
CMD_ARGS ex_turbulence_coupling_ff-pm.input)
COMPILE_DEFINITIONS EXNUMBER=2)
# add exercise to the common target
add_dependencies(test_exercises sol_a_ex_turbulence_coupling_ff-pm sol_b_ex_turbulence_coupling_ff-pm sol_b_ex_turbulence_coupling_ff-pm)
# add a symlink for each input file
add_input_file_links()
......@@ -2,17 +2,15 @@
#part a: 2pproblem
dune_add_test(NAME exercise-fluidsystem_a_solution
SOURCES exercise-fluidsystem.cc
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoP
CMD_ARGS exercise-fluidsystem_a_solution.input)
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoP)
#part b: 2p2cproblem
dune_add_test(NAME exercise-fluidsystem_b_solution
SOURCES exercise-fluidsystem.cc
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoPTwoC
CMD_ARGS exercise-fluidsystem_b_solution.input)
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoPTwoC)
# add exercises to the common target
add_dependencies(test_exercises exercise-fluidsystem_a exercise-fluidsystem_b)
# add symlinks for the input files
# add a symlink for each input file
add_input_file_links()
dune_symlink_to_source_files(FILES "grids" "exercise_fractures.input" "exercise_fractures_a.input" "exercise_fractures_b.input" "exercise_fractures_c.input")
# executable for the exercise
add_executable(exercise_fractures_solution EXCLUDE_FROM_ALL exercise_fractures.cc)
dune_add_test(NAME exercise_fractures_solution_a
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
TARGET exercise_fractures_solution
COMMAND ./exercise_fractures_solution
CMD_ARGS exercise_fractures_a.input)
CMD_ARGS exercise_fractures_solution_a.input)
dune_add_test(NAME exercise_fractures_solution_b
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
TARGET exercise_fractures_solution
COMMAND ./exercise_fractures_solution
CMD_ARGS exercise_fractures_b.input)
CMD_ARGS exercise_fractures_solution_b.input)
dune_add_test(NAME exercise_fractures_solution_c
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
TARGET exercise_fractures_solution
COMMAND ./exercise_fractures_solution
CMD_ARGS exercise_fractures_c.input)
CMD_ARGS exercise_fractures_solution_c.input)
set(CMAKE_BUILD_TYPE Release)
# add a symlink for each input file
add_input_file_links()
# add a symlink for the grids folder
dune_symlink_to_source_files(FILES grids)
#install sources
install(FILES
......
# the grid exercise simulation program
dune_add_test(NAME exercise_grids_solution
SOURCES exercise_grids_solution.cc
CMD_ARGS exercise_grids_solution.input)
SOURCES exercise_grids_solution.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_grids_solution)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_grids_solution.input")
# add a symlink for each input file
add_input_file_links()
# add a symlink for the grids folder
dune_symlink_to_source_files(FILES grids)
# the one-phase simulation program
dune_add_test(NAME exercise_1p_a_solution
SOURCES exercise_1p_a_solution.cc
COMPILE_DEFINITIONS TYPETAG=OnePIncompressible
CMD_ARGS exercise_1p_a.input)
COMPILE_DEFINITIONS TYPETAG=OnePIncompressible)
# here, add the two-phase non-isothermal simulation program
# add tutorial to the common target
add_dependencies(test_exercises exercise_1p_a_solution)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_1p_a.input")
# add a symlink for each input file
add_input_file_links()
# the solution to the properties exercise
dune_add_test(NAME exercise_properties_solution
SOURCES exercise_properties_solution.cc
CMD_ARGS exercise_properties_solution.input)
SOURCES exercise_properties_solution.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_properties_solution)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_properties_solution.input")
# add a symlink for each input file
add_input_file_links()
# the runtime parameter exercise simulation program
dune_add_test(NAME exercise_runtimeparams_solution
SOURCES exercise_runtimeparams_solution.cc
CMD_ARGS exercise_runtimeparams_solution.input)
SOURCES exercise_runtimeparams_solution.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_runtimeparams_solution)
# add a symlink for the input file
dune_symlink_to_source_files(FILES "exercise_runtimeparams_solution.input")
# add a symlink for each input file
add_input_file_links()
Markdown is supported
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