Merge branch 'fix/exercise-properties' into 'master'

[exercise][properties] move to correct folder

See merge request !42

exercises/exercise-properties/CMakeLists.txt

 # the compositional two-phase simulation program
-dune_add_test(NAME exercise2
-              SOURCES exercise2.cc
+dune_add_test(NAME exercise_properties
+              SOURCES exercise_properties.cc
               COMPILE_DEFINITIONS TYPETAG=Injection2p2pcCCProblem
-              CMD_ARGS exercise2.input)
+              CMD_ARGS exercise_properties.input)
 
 # add tutorial to the common target
-add_dependencies(test_exercises exercise2)
+add_dependencies(test_exercises exercise_properties)
 
 # add a symlink for the input file
-dune_symlink_to_source_files(FILES "exercise2.input")
+dune_symlink_to_source_files(FILES "exercise_properties.input")

exercises/solution/CMakeLists.txt

-add_subdirectory(ex2)
-
 add_subdirectory(exercise-basic)
 add_subdirectory(exercise-fluidsystem)
 add_subdirectory(exercise-grids)
 add_subdirectory(exercise-mainfile)
+add_subdirectory(exercise-properties)
 add_subdirectory(exercise-runtimeparams)

exercises/solution/ex2/CMakeLists.txt

-# the compositional two-phase simulation program
-dune_add_test(NAME exercise2_solution
-              SOURCES exercise2_solution.cc
-              CMD_ARGS exercise2.input -Problem.OnlyPlotMaterialLaws false)
-
-# add tutorial to the common target
-add_dependencies(test_exercises exercise2_solution)
-
-# add a symlink for the input file
-dune_symlink_to_source_files(FILES "exercise2.input")

exercises/solution/exercise-properties/CMakeLists.txt

+# the compositional two-phase simulation program
+dune_add_test(NAME exercise_properties_solution
+              SOURCES exercise_properties_solution.cc
+              CMD_ARGS exercise_properties.input -Problem.OnlyPlotMaterialLaws false)
+
+# 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")