From b57ff46ec5e3b24a6eb000e46cf7dad4fef0853b Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Wed, 18 Jul 2018 23:17:31 +0200
Subject: [PATCH] [exercise][properties] move to correct folder
---
exercises/exercise-properties/CMakeLists.txt | 10 +++++-----
.../{exercise2.cc => exercise_properties.cc} | 0
.../{exercise2.input => exercise_properties.input} | 0
exercises/solution/CMakeLists.txt | 3 +--
exercises/solution/ex2/CMakeLists.txt | 10 ----------
exercises/solution/exercise-properties/CMakeLists.txt | 10 ++++++++++
.../exercise_properties_solution.cc} | 0
.../exercise_properties_solution.input} | 0
.../injection2p2cproblem.hh | 0
.../injection2p2cspatialparams.hh | 0
.../{ex2 => exercise-properties}/mylocalresidual.hh | 0
.../{ex2 => exercise-properties}/mymateriallaw.hh | 0
12 files changed, 16 insertions(+), 17 deletions(-)
rename exercises/exercise-properties/{exercise2.cc => exercise_properties.cc} (100%)
rename exercises/exercise-properties/{exercise2.input => exercise_properties.input} (100%)
delete mode 100644 exercises/solution/ex2/CMakeLists.txt
create mode 100644 exercises/solution/exercise-properties/CMakeLists.txt
rename exercises/solution/{ex2/exercise2_solution.cc => exercise-properties/exercise_properties_solution.cc} (100%)
rename exercises/solution/{ex2/exercise2.input => exercise-properties/exercise_properties_solution.input} (100%)
rename exercises/solution/{ex2 => exercise-properties}/injection2p2cproblem.hh (100%)
rename exercises/solution/{ex2 => exercise-properties}/injection2p2cspatialparams.hh (100%)
rename exercises/solution/{ex2 => exercise-properties}/mylocalresidual.hh (100%)
rename exercises/solution/{ex2 => exercise-properties}/mymateriallaw.hh (100%)
diff --git a/exercises/exercise-properties/CMakeLists.txt b/exercises/exercise-properties/CMakeLists.txt
index d700163f..0cc953b2 100644
--- a/exercises/exercise-properties/CMakeLists.txt
+++ b/exercises/exercise-properties/CMakeLists.txt
@@ -1,11 +1,11 @@
# 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")
diff --git a/exercises/exercise-properties/exercise2.cc b/exercises/exercise-properties/exercise_properties.cc
similarity index 100%
rename from exercises/exercise-properties/exercise2.cc
rename to exercises/exercise-properties/exercise_properties.cc
diff --git a/exercises/exercise-properties/exercise2.input b/exercises/exercise-properties/exercise_properties.input
similarity index 100%
rename from exercises/exercise-properties/exercise2.input
rename to exercises/exercise-properties/exercise_properties.input
diff --git a/exercises/solution/CMakeLists.txt b/exercises/solution/CMakeLists.txt
index 385db3ff..50ac3c62 100644
--- a/exercises/solution/CMakeLists.txt
+++ b/exercises/solution/CMakeLists.txt
@@ -1,7 +1,6 @@
-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)
diff --git a/exercises/solution/ex2/CMakeLists.txt b/exercises/solution/ex2/CMakeLists.txt
deleted file mode 100644
index fe1e8746..00000000
--- a/exercises/solution/ex2/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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")
diff --git a/exercises/solution/exercise-properties/CMakeLists.txt b/exercises/solution/exercise-properties/CMakeLists.txt
new file mode 100644
index 00000000..fec78d7b
--- /dev/null
+++ b/exercises/solution/exercise-properties/CMakeLists.txt
@@ -0,0 +1,10 @@
+# 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")
diff --git a/exercises/solution/ex2/exercise2_solution.cc b/exercises/solution/exercise-properties/exercise_properties_solution.cc
similarity index 100%
rename from exercises/solution/ex2/exercise2_solution.cc
rename to exercises/solution/exercise-properties/exercise_properties_solution.cc
diff --git a/exercises/solution/ex2/exercise2.input b/exercises/solution/exercise-properties/exercise_properties_solution.input
similarity index 100%
rename from exercises/solution/ex2/exercise2.input
rename to exercises/solution/exercise-properties/exercise_properties_solution.input
diff --git a/exercises/solution/ex2/injection2p2cproblem.hh b/exercises/solution/exercise-properties/injection2p2cproblem.hh
similarity index 100%
rename from exercises/solution/ex2/injection2p2cproblem.hh
rename to exercises/solution/exercise-properties/injection2p2cproblem.hh
diff --git a/exercises/solution/ex2/injection2p2cspatialparams.hh b/exercises/solution/exercise-properties/injection2p2cspatialparams.hh
similarity index 100%
rename from exercises/solution/ex2/injection2p2cspatialparams.hh
rename to exercises/solution/exercise-properties/injection2p2cspatialparams.hh
diff --git a/exercises/solution/ex2/mylocalresidual.hh b/exercises/solution/exercise-properties/mylocalresidual.hh
similarity index 100%
rename from exercises/solution/ex2/mylocalresidual.hh
rename to exercises/solution/exercise-properties/mylocalresidual.hh
diff --git a/exercises/solution/ex2/mymateriallaw.hh b/exercises/solution/exercise-properties/mymateriallaw.hh
similarity index 100%
rename from exercises/solution/ex2/mymateriallaw.hh
rename to exercises/solution/exercise-properties/mymateriallaw.hh
--
GitLab