Harmonize input file names and CMakeLists.txt

exercises/exercise-basic/CMakeLists.txt

 # 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()

exercises/exercise-biomineralization/CMakeLists.txt

 # 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()

exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt

-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()

exercises/exercise-coupling-ff-pm/models/CMakeLists.txt

-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()

exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt

-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)

exercises/exercise-fluidsystem/CMakeLists.txt

@@ -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)

exercises/exercise-fractures/CMakeLists.txt

-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

exercises/exercise-grids/CMakeLists.txt

 # 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)

exercises/exercise-mainfile/CMakeLists.txt

 # 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()

exercises/exercise-properties/CMakeLists.txt

 # 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()

exercises/exercise-runtimeparams/CMakeLists.txt

 # 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()

exercises/solution/exercise-basic/CMakeLists.txt

 # 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()

exercises/solution/exercise-biomineralization/CMakeLists.txt

 # 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()

exercises/solution/exercise-coupling-ff-pm/interface/CMakeLists.txt

-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()

exercises/solution/exercise-coupling-ff-pm/models/CMakeLists.txt

-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()

exercises/solution/exercise-coupling-ff-pm/turbulence/CMakeLists.txt

-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()