From 4b4287483de5d5b2410125120a3162d0fdd26e2c Mon Sep 17 00:00:00 2001
From: Simon Emmert <simon.emmert@iws.uni-stuttgart.de>
Date: Thu, 12 Mar 2020 09:53:19 +0100
Subject: [PATCH] [tests][2pncminni] rename forgotten fvGridGeometry occurences
 to gridGeometry

---
 .../2pncmin/implicit/nonisothermal/main.cc     | 18 +++++++++---------
 .../2pncmin/implicit/nonisothermal/problem.hh  | 12 ++++++------
 .../implicit/nonisothermal/spatialparams.hh    | 18 +++++++++---------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/main.cc b/test/porousmediumflow/2pncmin/implicit/nonisothermal/main.cc
index 46d94b6e06..e8602b480e 100644
--- a/test/porousmediumflow/2pncmin/implicit/nonisothermal/main.cc
+++ b/test/porousmediumflow/2pncmin/implicit/nonisothermal/main.cc
@@ -105,13 +105,13 @@ int main(int argc, char** argv) try
     const auto& leafGridView = gridManager.grid().leafGridView();
 
     // create the finite volume grid geometry
-    using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
-    auto fvGridGeometry = std::make_shared<FVGridGeometry>(leafGridView);
-    fvGridGeometry->update();
+    using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
+    auto gridGeometry = std::make_shared<GridGeometry>(leafGridView);
+    gridGeometry->update();
 
     // the problem (initial and boundary conditions)
     using Problem = GetPropType<TypeTag, Properties::Problem>;
-    auto problem = std::make_shared<Problem>(fvGridGeometry);
+    auto problem = std::make_shared<Problem>(gridGeometry);
 
     // get some time loop parameters
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
@@ -124,7 +124,7 @@ int main(int argc, char** argv) try
 
     // the solution vector
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
-    SolutionVector x(fvGridGeometry->numDofs());
+    SolutionVector x(gridGeometry->numDofs());
     if (restartTime > 0)
     {
         using IOFields = GetPropType<TypeTag, Properties::IOFields>;
@@ -134,7 +134,7 @@ int main(int argc, char** argv) try
         using SolidSystem = GetPropType<TypeTag, Properties::SolidSystem>;
         const auto fileName = getParam<std::string>("Restart.File");
         const auto pvName = createPVNameFunction<IOFields, PrimaryVariables, ModelTraits, FluidSystem, SolidSystem>();
-        loadSolution(x, fileName, pvName, *fvGridGeometry);
+        loadSolution(x, fileName, pvName, *gridGeometry);
     }
     else
         problem->applyInitialSolution(x);
@@ -142,7 +142,7 @@ int main(int argc, char** argv) try
 
     // the grid variables
     using GridVariables = GetPropType<TypeTag, Properties::GridVariables>;
-    auto gridVariables = std::make_shared<GridVariables>(problem, fvGridGeometry);
+    auto gridVariables = std::make_shared<GridVariables>(problem, gridGeometry);
     gridVariables->init(x);
 
     // initialize the vtk output module
@@ -163,11 +163,11 @@ int main(int argc, char** argv) try
 
     // the assembler with time loop for instationary problem
     using Assembler = FVAssembler<TypeTag, DiffMethod::numeric>;
-    auto assembler = std::make_shared<Assembler>(problem, fvGridGeometry, gridVariables, timeLoop);
+    auto assembler = std::make_shared<Assembler>(problem, gridGeometry, gridVariables, timeLoop);
 
     // the linear solver
     using LinearSolver = AMGBiCGSTABBackend<LinearSolverTraits<GridGeometry>>;
-    auto linearSolver = std::make_shared<LinearSolver>(leafGridView, fvGridGeometry->dofMapper());
+    auto linearSolver = std::make_shared<LinearSolver>(leafGridView, gridGeometry->dofMapper());
 
     // the non-linear solver
     using NewtonSolver = NewtonSolver<Assembler, LinearSolver>;
diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh b/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh
index fc7e484d82..40950b1b0d 100644
--- a/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh
+++ b/test/porousmediumflow/2pncmin/implicit/nonisothermal/problem.hh
@@ -91,9 +91,9 @@ struct SolidSystem<TypeTag, TTag::Salinization>
 template<class TypeTag>
 struct SpatialParams<TypeTag, TTag::Salinization>
 {
-    using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
+    using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-    using type = SalinizationSpatialParams<FVGridGeometry, Scalar>;
+    using type = SalinizationSpatialParams<GridGeometry, Scalar>;
 };
 
 // Set properties here to override the default property settings
@@ -188,7 +188,7 @@ class SalinizationProblem : public PorousMediumFlowProblem<TypeTag>
     using ElementFluxVariablesCache = typename GridVariables::GridFluxVariablesCache::LocalView;
     using ElementVolumeVariables = typename GetPropType<TypeTag, Properties::GridVolumeVariables>::LocalView;
     using Element = typename GridView::template Codim<0>::Entity;
-    using FVGridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
+    using GridGeometry = GetPropType<TypeTag, Properties::GridGeometry>;
     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
     using FVElementGeometry = typename GetPropType<TypeTag, Properties::GridGeometry>::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
@@ -197,8 +197,8 @@ class SalinizationProblem : public PorousMediumFlowProblem<TypeTag>
     using FluidState = GetPropType<TypeTag, Properties::FluidState>;
 
 public:
-    SalinizationProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
-    : ParentType(fvGridGeometry)
+    SalinizationProblem(std::shared_ptr<const GridGeometry> gridGeometry)
+    : ParentType(gridGeometry)
     {
         //Fluidsystem
         nTemperature_           = getParam<int>("FluidSystem.NTemperature");
@@ -220,7 +220,7 @@ public:
 
         unsigned int codim = GetPropType<TypeTag, Properties::GridGeometry>::discMethod == DiscretizationMethod::box ? dim : 0;
 
-        permeability_.resize(fvGridGeometry->gridView().size(codim));
+        permeability_.resize(gridGeometry->gridView().size(codim));
         FluidSystem::init(/*Tmin=*/temperatureLow_,
                           /*Tmax=*/temperatureHigh_,
                           /*nT=*/nTemperature_,
diff --git a/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh b/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh
index 1a47d8bdd2..276f8764c3 100644
--- a/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh
+++ b/test/porousmediumflow/2pncmin/implicit/nonisothermal/spatialparams.hh
@@ -42,18 +42,18 @@ namespace Dumux {
  * \brief Spatial parameters for the salinization problem, where evaporation
  * from a porous medium saturated wit brine and air leads to precipitation of salt.
  */
-template<class FVGridGeometry, class Scalar>
+template<class GridGeometry, class Scalar>
 class SalinizationSpatialParams
-: public FVSpatialParams<FVGridGeometry, Scalar,
-                         SalinizationSpatialParams<FVGridGeometry, Scalar>>
+: public FVSpatialParams<GridGeometry, Scalar,
+                         SalinizationSpatialParams<GridGeometry, Scalar>>
 {
-    using GridView = typename FVGridGeometry::GridView;
-    using FVElementGeometry = typename FVGridGeometry::LocalView;
+    using GridView = typename GridGeometry::GridView;
+    using FVElementGeometry = typename GridGeometry::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using Element = typename GridView::template Codim<0>::Entity;
 
-    using ParentType = FVSpatialParams<FVGridGeometry, Scalar,
-                                       SalinizationSpatialParams<FVGridGeometry, Scalar>>;
+    using ParentType = FVSpatialParams<GridGeometry, Scalar,
+                                       SalinizationSpatialParams<GridGeometry, Scalar>>;
 
     using EffectiveLaw = RegularizedVanGenuchten<Scalar>;
 
@@ -66,8 +66,8 @@ public:
     using MaterialLaw = EffToAbsLaw<EffectiveLaw>;
     using MaterialLawParams = typename MaterialLaw::Params;
 
-    SalinizationSpatialParams(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
-    : ParentType(fvGridGeometry)
+    SalinizationSpatialParams(std::shared_ptr<const GridGeometry> gridGeometry)
+    : ParentType(gridGeometry)
     {
         solubilityLimit_       = getParam<Scalar>("SpatialParams.SolubilityLimit", 0.26);
         referencePorosity_     = getParam<Scalar>("SpatialParams.referencePorosity", 0.11);
-- 
GitLab