From 118e56b21050a89f6640b9f238e85ee8de94754b Mon Sep 17 00:00:00 2001
From: Gabriele Seitz <gabriele.seitz@iws.uni-stuttgart.de>
Date: Fri, 20 Oct 2017 15:26:14 +0200
Subject: [PATCH] [1pncmin] minor beautifications
---
.../1pnc/implicit/properties.hh | 2 --
.../1pncmin/implicit/indices.hh | 2 --
.../1pncmin/implicit/localresidual.hh | 1 -
.../porousmediumflow/1pncmin/implicit/model.hh | 1 -
.../1pncmin/implicit/volumevariables.hh | 18 ++----------------
.../1pncmin/implicit/thermochemproblem.hh | 4 +---
.../implicit/thermochemspatialparams.hh | 1 -
7 files changed, 3 insertions(+), 26 deletions(-)
diff --git a/dumux/porousmediumflow/1pnc/implicit/properties.hh b/dumux/porousmediumflow/1pnc/implicit/properties.hh
index a496fbc7b7..53377625ab 100644
--- a/dumux/porousmediumflow/1pnc/implicit/properties.hh
+++ b/dumux/porousmediumflow/1pnc/implicit/properties.hh
@@ -64,10 +64,8 @@ NEW_PROP_TAG(SpatialParams); //!< The type of the spatial parameters
NEW_PROP_TAG(EffectiveDiffusivityModel); //!< The employed model for the computation of the effective diffusivity
NEW_PROP_TAG(FluidSystem); //!< Type of the multi-component relations
NEW_PROP_TAG(FluidState); //!< Type of the fluid state to be used
-//NEW_PROP_TAG(VtkAddVelocity); //!< Returns whether velocity vectors are written into the vtk output
NEW_PROP_TAG(ProblemEnableGravity); //!< Returns whether gravity is considered in the problem
NEW_PROP_TAG(UseMoles); //!< Defines whether mole (true) or mass (false) fractions are used
-//NEW_PROP_TAG(BaseFluxVariables); //! The base flux variables
NEW_PROP_TAG(SpatialParamsForchCoeff); //!< Property for the forchheimer coefficient
NEW_PROP_TAG(TauTortuosity); //!< Tortuosity value (tau) used in macroscopic diffusion
diff --git a/dumux/porousmediumflow/1pncmin/implicit/indices.hh b/dumux/porousmediumflow/1pncmin/implicit/indices.hh
index 4c5a2085c1..3005bc5392 100644
--- a/dumux/porousmediumflow/1pncmin/implicit/indices.hh
+++ b/dumux/porousmediumflow/1pncmin/implicit/indices.hh
@@ -41,8 +41,6 @@ template <class TypeTag, int PVOffset = 0>
{
};
-// \}
-
}
#endif
diff --git a/dumux/porousmediumflow/1pncmin/implicit/localresidual.hh b/dumux/porousmediumflow/1pncmin/implicit/localresidual.hh
index 199f4b53ef..a42f7cae9e 100644
--- a/dumux/porousmediumflow/1pncmin/implicit/localresidual.hh
+++ b/dumux/porousmediumflow/1pncmin/implicit/localresidual.hh
@@ -43,7 +43,6 @@ template<class TypeTag>
class OnePNCMinLocalResidual: public CompositionalLocalResidual<TypeTag>
{
protected:
-// typedef OnePNCLocalResidual<TypeTag> ParentType;
using ParentType = CompositionalLocalResidual<TypeTag>;
using ThisType = OnePNCMinLocalResidual<TypeTag>;
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
diff --git a/dumux/porousmediumflow/1pncmin/implicit/model.hh b/dumux/porousmediumflow/1pncmin/implicit/model.hh
index 76aaaad761..74f4ada80e 100644
--- a/dumux/porousmediumflow/1pncmin/implicit/model.hh
+++ b/dumux/porousmediumflow/1pncmin/implicit/model.hh
@@ -29,7 +29,6 @@
#include "indices.hh"
#include "localresidual.hh"
-// #include <dumux/material/constants.hh>
#include <dumux/porousmediumflow/1pnc/implicit/model.hh>
#include <dumux/porousmediumflow/implicit/velocityoutput.hh>
diff --git a/dumux/porousmediumflow/1pncmin/implicit/volumevariables.hh b/dumux/porousmediumflow/1pncmin/implicit/volumevariables.hh
index c89706b53d..56b3fd9771 100644
--- a/dumux/porousmediumflow/1pncmin/implicit/volumevariables.hh
+++ b/dumux/porousmediumflow/1pncmin/implicit/volumevariables.hh
@@ -61,8 +61,6 @@ class OnePNCMinVolumeVariables : public OnePNCVolumeVariables<TypeTag>
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
using Indices = typename GET_PROP_TYPE(TypeTag, Indices);
-// typedef typename GET_PROP_TYPE(TypeTag, PrimaryVariables) PrimaryVariables;
-
enum
{
dim = GridView::dimension,
@@ -107,10 +105,7 @@ public:
{
ParentType::update(elemSol, problem, element, scv);
- /////////////
// calculate the remaining quantities
- /////////////
-
auto&& priVars = isBox ? elemSol[scv.index()] : elemSol[0];
// porosity evaluation
@@ -124,8 +119,7 @@ public:
}
-
-// energy related quantities not contained in the fluid state
+ // energy related quantities not contained in the fluid state
asImp_().updateEnergy_(elemSol, problem, element, scv);
}
@@ -143,22 +137,14 @@ public:
Scalar t = BaseType::temperature(elemSol, problem, element, scv);
fluidState.setTemperature(t);
- /////////////
// set the saturations
- /////////////
-
fluidState.setSaturation(phaseIdx, 1.0 );
- /////////////
// set the pressures of the fluid phase
- /////////////
const auto& priVars = ParentType::extractDofPriVars(elemSol, scv);
fluidState.setPressure(phaseIdx, priVars[pressureIdx]);
- /////////////
// calculate the phase compositions
- /////////////
-
typename FluidSystem::ParameterCache paramCache;
Dune::FieldVector<Scalar, numComponents> moleFrac;
@@ -240,7 +226,7 @@ public:
if (phaseIdx < 1)
return this->fluidState_.molarDensity(phaseIdx);
else if (phaseIdx >= 1){
- /*Attention: sPhaseIdx of the fluidsystem and the model can be different.*/
+ //Attention: sPhaseIdx of the fluidsystem and the model can be different.
return FluidSystem::precipitateMolarDensity(phaseIdx);
}
else
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
index 096892ed35..a5723cf70b 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemproblem.hh
@@ -97,8 +97,6 @@ class ThermoChemProblem : public ImplicitPorousMediaProblem<TypeTag>
enum
{
-// replaceCompEqIdx = GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx),
-
numComponents = FluidSystem::numComponents,
numSComponents = FluidSystem::numSComponents,
@@ -379,7 +377,7 @@ public:
Scalar solidDensityAverage = moleFracCaO_sPhase*volVars.molarDensity(cPhaseIdx)
+ moleFracCaO2H2_sPhase* volVars.molarDensity(hPhaseIdx);
-// //discharge or hydration
+ //discharge or hydration
if (T < Teq){
Scalar krh =0.08; //0.006
diff --git a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh b/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
index be276f5637..ffc5948460 100644
--- a/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
+++ b/test/porousmediumflow/1pncmin/implicit/thermochemspatialparams.hh
@@ -64,7 +64,6 @@ class ThermoChemSpatialParams : public ImplicitSpatialParamsOneP<TypeTag>
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
using CoordScalar = typename GridView::ctype;
using FluidSystem = typename GET_PROP_TYPE(TypeTag, FluidSystem);
-
using ElementSolutionVector = typename GET_PROP_TYPE(TypeTag, ElementSolutionVector);
enum {
--
GitLab