From 89ce63882bb1b26bd821505d7d5c40db398b7d38 Mon Sep 17 00:00:00 2001
From: Katharina Heck <katharina.heck@iws.uni-stuttgart.de>
Date: Wed, 2 Oct 2019 15:20:38 +0200
Subject: [PATCH] [biomin] naming conventions
---
exercises/exercise-biomineralization/CMakeLists.txt | 2 +-
exercises/exercise-biomineralization/README.md | 4 ++--
exercises/exercise-biomineralization/biominproblem.hh | 8 ++++----
.../{exercisebiomin.cc => main.cc} | 0
.../{exercise_biomin.input => params.input} | 0
.../solution/exercise-biomineralization/CMakeLists.txt | 2 +-
.../solution/exercise-biomineralization/biominproblem.hh | 8 ++++----
.../{exercisebiomin.cc => main.cc} | 0
.../{exercisebiomin_solution.input => params.input} | 0
9 files changed, 12 insertions(+), 12 deletions(-)
rename exercises/exercise-biomineralization/{exercisebiomin.cc => main.cc} (100%)
rename exercises/exercise-biomineralization/{exercise_biomin.input => params.input} (100%)
rename exercises/solution/exercise-biomineralization/{exercisebiomin.cc => main.cc} (100%)
rename exercises/solution/exercise-biomineralization/{exercisebiomin_solution.input => params.input} (100%)
diff --git a/exercises/exercise-biomineralization/CMakeLists.txt b/exercises/exercise-biomineralization/CMakeLists.txt
index 1a3e189d..67e8dc13 100644
--- a/exercises/exercise-biomineralization/CMakeLists.txt
+++ b/exercises/exercise-biomineralization/CMakeLists.txt
@@ -1,6 +1,6 @@
# executables for exercisebiomin
dune_add_test(NAME exercise_biomin
- SOURCES exercisebiomin.cc
+ SOURCES main.cc
CMD_ARGS -TimeLoop.TEnd 1e5)
# add tutorial to the common target
diff --git a/exercises/exercise-biomineralization/README.md b/exercises/exercise-biomineralization/README.md
index 6980306b..329fc531 100644
--- a/exercises/exercise-biomineralization/README.md
+++ b/exercises/exercise-biomineralization/README.md
@@ -19,8 +19,8 @@ Disclaimer: Please note, that this is not a realistic scenario. One does not wan
### 1. Getting familiar with the code
Locate all the files you will need for this exercise
-* The __main file__ : `exercisebiomin.cc`
-* The __input file__: `exercisebiomin.input`
+* The __main file__ : `main.cc`
+* The __input file__: `params.input`
* The __problem file__ : `biominproblem.hh`
* The __spatial parameters file__: `biominspatialparams.hh`
diff --git a/exercises/exercise-biomineralization/biominproblem.hh b/exercises/exercise-biomineralization/biominproblem.hh
index ab0a787a..7eed331b 100644
--- a/exercises/exercise-biomineralization/biominproblem.hh
+++ b/exercises/exercise-biomineralization/biominproblem.hh
@@ -48,7 +48,7 @@ namespace Dumux {
#include <dumux/material/components/co2tables.inc>
template <class TypeTag>
-class ExerciseFourBioMinProblem;
+class BioMinProblem;
namespace Properties {
//! Create new type tag for the problem
@@ -60,7 +60,7 @@ struct ExerciseFourBioMinCCTpfa { using InheritsFrom = std::tuple<ExerciseFourBi
//! Set the problem property
template<class TypeTag>
-struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = BioMinProblem<TypeTag>; };
//! Set grid and the grid creator to be used
template<class TypeTag>
@@ -106,7 +106,7 @@ struct EnableGridFluxVariablesCache<TypeTag, TTag::ExerciseFourBioMin> { static
* \brief Problem biomineralization (MICP) in an experimental setup.
*/
template <class TypeTag>
-class ExerciseFourBioMinProblem : public PorousMediumFlowProblem<TypeTag>
+class BioMinProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
@@ -166,7 +166,7 @@ class ExerciseFourBioMinProblem : public PorousMediumFlowProblem<TypeTag>
* \param fvGridGeometry The finite volume grid geometry
*/
public:
- ExerciseFourBioMinProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ BioMinProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
: ParentType(fvGridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
diff --git a/exercises/exercise-biomineralization/exercisebiomin.cc b/exercises/exercise-biomineralization/main.cc
similarity index 100%
rename from exercises/exercise-biomineralization/exercisebiomin.cc
rename to exercises/exercise-biomineralization/main.cc
diff --git a/exercises/exercise-biomineralization/exercise_biomin.input b/exercises/exercise-biomineralization/params.input
similarity index 100%
rename from exercises/exercise-biomineralization/exercise_biomin.input
rename to exercises/exercise-biomineralization/params.input
diff --git a/exercises/solution/exercise-biomineralization/CMakeLists.txt b/exercises/solution/exercise-biomineralization/CMakeLists.txt
index fe0a3993..035fe93d 100644
--- a/exercises/solution/exercise-biomineralization/CMakeLists.txt
+++ b/exercises/solution/exercise-biomineralization/CMakeLists.txt
@@ -1,6 +1,6 @@
# executables for exercisebiomin
dune_add_test(NAME exercise_biomin_solution
- SOURCES exercisebiomin.cc
+ SOURCES main.cc
CMD_ARGS -TimeLoop.TEnd 1e5)
# add tutorial to the common target
diff --git a/exercises/solution/exercise-biomineralization/biominproblem.hh b/exercises/solution/exercise-biomineralization/biominproblem.hh
index 756b7537..94857d1d 100644
--- a/exercises/solution/exercise-biomineralization/biominproblem.hh
+++ b/exercises/solution/exercise-biomineralization/biominproblem.hh
@@ -49,7 +49,7 @@ namespace Dumux {
#include <dumux/material/components/co2tables.inc>
template <class TypeTag>
-class ExerciseFourBioMinProblem;
+class BioMinProblem;
namespace Properties {
//! Create new type tag for the problem
@@ -61,7 +61,7 @@ struct ExerciseFourBioMinCCTpfa { using InheritsFrom = std::tuple<ExerciseFourBi
//! Set the problem property
template<class TypeTag>
-struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = BioMinProblem<TypeTag>; };
//! Set grid and the grid creator to be used
template<class TypeTag>
@@ -108,7 +108,7 @@ struct EnableGridFluxVariablesCache<TypeTag, TTag::ExerciseFourBioMin> { static
* \brief Problem biomineralization (MICP) in an experimental setup.
*/
template <class TypeTag>
-class ExerciseFourBioMinProblem : public PorousMediumFlowProblem<TypeTag>
+class BioMinProblem : public PorousMediumFlowProblem<TypeTag>
{
using ParentType = PorousMediumFlowProblem<TypeTag>;
@@ -169,7 +169,7 @@ class ExerciseFourBioMinProblem : public PorousMediumFlowProblem<TypeTag>
* \param fvGridGeometry The finite volume grid geometry
*/
public:
- ExerciseFourBioMinProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
+ BioMinProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
: ParentType(fvGridGeometry)
{
name_ = getParam<std::string>("Problem.Name");
diff --git a/exercises/solution/exercise-biomineralization/exercisebiomin.cc b/exercises/solution/exercise-biomineralization/main.cc
similarity index 100%
rename from exercises/solution/exercise-biomineralization/exercisebiomin.cc
rename to exercises/solution/exercise-biomineralization/main.cc
diff --git a/exercises/solution/exercise-biomineralization/exercisebiomin_solution.input b/exercises/solution/exercise-biomineralization/params.input
similarity index 100%
rename from exercises/solution/exercise-biomineralization/exercisebiomin_solution.input
rename to exercises/solution/exercise-biomineralization/params.input
--
GitLab