[exercise-biomineralization]

removed TypeTag ending

exercises/exercise-biomineralization/biominproblem.hh

@@ -53,29 +53,29 @@ namespace Properties
 //! Create new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFourBioMinTypeTag { using InheritsFrom = std::tuple<BioMinSpatialparams, TwoPNCMin>; };
-struct ExerciseFourBioMinCCTpfaTypeTag { using InheritsFrom = std::tuple<ExerciseFourBioMinTypeTag, CCTpfaModel>; };
+struct ExerciseFourBioMin { using InheritsFrom = std::tuple<BioMinSpatialparams, TwoPNCMin>; };
+struct ExerciseFourBioMinCCTpfa { using InheritsFrom = std::tuple<ExerciseFourBioMin, CCTpfaModel>; };
 } // end namespace TTag
 
 //! Set the problem property
 template<class TypeTag>
-struct Problem<TypeTag, TTag::ExerciseFourBioMinTypeTag> { using type = ExerciseFourBioMinProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; };
 
 //! Set grid and the grid creator to be used
 #if HAVE_DUNE_ALUGRID
 template<class TypeTag>
-struct Grid<TypeTag, TTag::ExerciseFourBioMinTypeTag> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
+struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
 #elif HAVE_UG
 template<class TypeTag>
-struct Grid<TypeTag, TTag::ExerciseFourBioMinTypeTag> { using type = Dune::UGGrid<2>; };
+struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::UGGrid<2>; };
 #else
 template<class TypeTag>
-struct Grid<TypeTag, TTag::ExerciseFourBioMinTypeTag> { using type = Dune::YaspGrid<2>; };
+struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::YaspGrid<2>; };
 #endif // HAVE_DUNE_ALUGRID
 
 //! Set the fluid system type
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::ExerciseFourBioMinTypeTag>
+struct FluidSystem<TypeTag, TTag::ExerciseFourBioMin>
 {
 private:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -86,7 +86,7 @@ public:
 };
 
 template<class TypeTag>
-struct SolidSystem<TypeTag, TTag::ExerciseFourBioMinTypeTag>
+struct SolidSystem<TypeTag, TTag::ExerciseFourBioMin>
 {
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using type = SolidSystems::BiominSolidPhase<Scalar>;
@@ -94,11 +94,11 @@ struct SolidSystem<TypeTag, TTag::ExerciseFourBioMinTypeTag>
 
 
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::ExerciseFourBioMinTypeTag> { static constexpr bool value = false; };
+struct EnableFVGridGeometryCache<TypeTag, TTag::ExerciseFourBioMin> { static constexpr bool value = false; };
 template<class TypeTag>
-struct EnableGridVolumeVariablesCache<TypeTag, TTag::ExerciseFourBioMinTypeTag> { static constexpr bool value = false; };
+struct EnableGridVolumeVariablesCache<TypeTag, TTag::ExerciseFourBioMin> { static constexpr bool value = false; };
 template<class TypeTag>
-struct EnableGridFluxVariablesCache<TypeTag, TTag::ExerciseFourBioMinTypeTag> { static constexpr bool value = false; };
+struct EnableGridFluxVariablesCache<TypeTag, TTag::ExerciseFourBioMin> { static constexpr bool value = false; };
 
 } // end namespace properties
 /*!

exercises/exercise-biomineralization/exercisebiomin.cc

@@ -59,7 +59,7 @@ int main(int argc, char** argv) try
     using namespace Dumux;
 
     // define the type tag for this problem
-    using TypeTag = Properties::TTag::ExerciseFourBioMinCCTpfaTypeTag;
+    using TypeTag = Properties::TTag::ExerciseFourBioMinCCTpfa;
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

exercises/exercise-biomineralization/fluidsystems/biomin.hh

@@ -333,7 +333,6 @@ public:
         if (phaseIdx == liquidPhaseIdx)
         {
             // assume brine with viscosity effect of Ca for the liquid phase.
-            //F Scalar salinity = fluidState.massFraction(liquidPhaseIdx, CaIdx);
             Scalar result = Brine::liquidViscosity(temperature, pressure);
 
             Valgrind::CheckDefined(result);

exercises/solution/exercise-biomineralization/biominproblem.hh

@@ -54,29 +54,29 @@ namespace Properties
 //! Create new type tag for the problem
 // Create new type tags
 namespace TTag {
-struct ExerciseFourBioMinTypeTag { using InheritsFrom = std::tuple<BioMinSpatialparams, TwoPNCMin>; };
-struct ExerciseFourBioMinCCTpfaTypeTag { using InheritsFrom = std::tuple<ExerciseFourBioMinTypeTag, CCTpfaModel>; };
+struct ExerciseFourBioMin { using InheritsFrom = std::tuple<BioMinSpatialparams, TwoPNCMin>; };
+struct ExerciseFourBioMinCCTpfa { using InheritsFrom = std::tuple<ExerciseFourBioMin, CCTpfaModel>; };
 } // end namespace TTag
 
 //! Set the problem property
 template<class TypeTag>
-struct Problem<TypeTag, TTag::ExerciseFourBioMinTypeTag> { using type = ExerciseFourBioMinProblem<TypeTag>; };
+struct Problem<TypeTag, TTag::ExerciseFourBioMin> { using type = ExerciseFourBioMinProblem<TypeTag>; };
 
 //! Set grid and the grid creator to be used
 #if HAVE_DUNE_ALUGRID
 template<class TypeTag>
-struct Grid<TypeTag, TTag::ExerciseFourBioMinTypeTag> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
+struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::ALUGrid</*dim=*/2, 2, Dune::cube, Dune::nonconforming>; };
 #elif HAVE_UG
 template<class TypeTag>
-struct Grid<TypeTag, TTag::ExerciseFourBioMinTypeTag> { using type = Dune::UGGrid<2>; };
+struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::UGGrid<2>; };
 #else
 template<class TypeTag>
-struct Grid<TypeTag, TTag::ExerciseFourBioMinTypeTag> { using type = Dune::YaspGrid<2>; };
+struct Grid<TypeTag, TTag::ExerciseFourBioMin> { using type = Dune::YaspGrid<2>; };
 #endif // HAVE_DUNE_ALUGRID
 
 //! Set the fluid system type
 template<class TypeTag>
-struct FluidSystem<TypeTag, TTag::ExerciseFourBioMinTypeTag>
+struct FluidSystem<TypeTag, TTag::ExerciseFourBioMin>
 {
 private:
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -87,7 +87,7 @@ public:
 };
 
 template<class TypeTag>
-struct SolidSystem<TypeTag, TTag::ExerciseFourBioMinTypeTag>
+struct SolidSystem<TypeTag, TTag::ExerciseFourBioMin>
 {
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
     using type = SolidSystems::BiominSolidPhase<Scalar>;
@@ -95,11 +95,11 @@ struct SolidSystem<TypeTag, TTag::ExerciseFourBioMinTypeTag>
 
 
 template<class TypeTag>
-struct EnableFVGridGeometryCache<TypeTag, TTag::ExerciseFourBioMinTypeTag> { static constexpr bool value = false; };
+struct EnableFVGridGeometryCache<TypeTag, TTag::ExerciseFourBioMin> { static constexpr bool value = false; };
 template<class TypeTag>
-struct EnableGridVolumeVariablesCache<TypeTag, TTag::ExerciseFourBioMinTypeTag> { static constexpr bool value = false; };
+struct EnableGridVolumeVariablesCache<TypeTag, TTag::ExerciseFourBioMin> { static constexpr bool value = false; };
 template<class TypeTag>
-struct EnableGridFluxVariablesCache<TypeTag, TTag::ExerciseFourBioMinTypeTag> { static constexpr bool value = false; };
+struct EnableGridFluxVariablesCache<TypeTag, TTag::ExerciseFourBioMin> { static constexpr bool value = false; };
 
 } // end namespace properties
 /*!

exercises/solution/exercise-biomineralization/exercisebiomin.cc

@@ -59,7 +59,7 @@ int main(int argc, char** argv) try
     using namespace Dumux;
 
     // define the type tag for this problem
-    using TypeTag = Properties::TTag::ExerciseFourBioMinCCTpfaTypeTag;
+    using TypeTag = Properties::TTag::ExerciseFourBioMinCCTpfa;
 
     // initialize MPI, finalize is done automatically on exit
     const auto& mpiHelper = Dune::MPIHelper::instance(argc, argv);

exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh

@@ -333,7 +333,6 @@ public:
         if (phaseIdx == liquidPhaseIdx)
         {
             // assume brine with viscosity effect of Ca for the liquid phase.
-            //F Scalar salinity = fluidState.massFraction(liquidPhaseIdx, CaIdx);
             Scalar result = Brine::liquidViscosity(temperature, pressure);
 
             Valgrind::CheckDefined(result);