From f5198d1969314d7c006c23740304e9d6cac41a00 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 15 Dec 2017 13:45:57 +0100
Subject: [PATCH] [3p][test] Remove unsed code
---
.../3p/implicit/3pnispatialparams.hh | 27 +++----------------
.../implicit/infiltration3pspatialparams.hh | 6 ++---
2 files changed, 7 insertions(+), 26 deletions(-)
diff --git a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
index 9a75e54ef6..1c0af5293c 100644
--- a/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/3pnispatialparams.hh
@@ -24,7 +24,6 @@
#ifndef DUMUX_THREEPNI_SPATIAL_PARAMS_HH
#define DUMUX_THREEPNI_SPATIAL_PARAMS_HH
-#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
#include <dumux/material/spatialparams/implicit.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
@@ -75,9 +74,6 @@ class ThreePNISpatialParams : public ImplicitSpatialParams<TypeTag>
using Grid = typename GET_PROP_TYPE(TypeTag, Grid);
using GridView = typename GET_PROP_TYPE(TypeTag, GridView);
using Scalar = typename GET_PROP_TYPE(TypeTag, Scalar);
-
- using SolutionVector = typename GET_PROP_TYPE(TypeTag, SolutionVector);
-
using FVElementGeometry = typename GET_PROP_TYPE(TypeTag, FVElementGeometry);
using SubControlVolume = typename GET_PROP_TYPE(TypeTag, SubControlVolume);
using Element = typename GridView::template Codim<0>::Entity;
@@ -92,10 +88,10 @@ public:
using PermeabilityType = Scalar;
using MaterialLaw = typename GET_PROP_TYPE(TypeTag, MaterialLaw);
- using MaterialLawParams = typename MaterialLaw::Params;
+ using MaterialLawParams = typename MaterialLaw::Params;
ThreePNISpatialParams(const Problem& problem)
- : ParentType(problem)
+ : ParentType(problem)
{
permeability_ = 1e-10;
porosity_ = 0.4;
@@ -103,7 +99,6 @@ public:
// heat conductivity of granite
lambdaSolid_ = 2.8;
-
// residual saturations
materialParams_.setSwr(0.12);
materialParams_.setSnr(0.10);
@@ -119,26 +114,12 @@ public:
materialParams_.setRhoBulk(1500.);
}
- ~ThreePNISpatialParams()
- {}
-
-
- /*!
- * \brief Update the spatial parameters with the flow solution
- * after a timestep.
- *
- * \param globalSolution the global solution vector
- */
- void update(const SolutionVector &globalSolution)
- {
- }
-
/*!
* \brief Returns the scalar intrinsic permeability \f$[m^2]\f$
*
* \param globalPos The global position
*/
- Scalar permeabilityAtPos(const GlobalPosition& globalPos) const
+ PermeabilityType permeabilityAtPos(const GlobalPosition& globalPos) const
{
return permeability_;
}
@@ -208,6 +189,6 @@ private:
Scalar lambdaSolid_;
};
-}
+} // end namespace Dumux
#endif
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
index 86d28bb06d..c73d014eec 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pspatialparams.hh
@@ -25,13 +25,13 @@
#ifndef DUMUX_INFILTRATION_THREEP_SPATIAL_PARAMS_HH
#define DUMUX_INFILTRATION_THREEP_SPATIAL_PARAMS_HH
-#include <dumux/porousmediumflow/3p3c/implicit/indices.hh>
#include <dumux/material/spatialparams/implicit.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3p.hh>
#include <dumux/material/fluidmatrixinteractions/3p/regularizedparkervangen3pparams.hh>
#include <dumux/material/fluidmatrixinteractions/3p/efftoabslaw.hh>
#include <dumux/io/gnuplotinterface.hh>
#include <dumux/io/plotmateriallaw3p.hh>
+
namespace Dumux
{
@@ -98,7 +98,7 @@ public:
* \param gridView The grid view
*/
InfiltrationThreePSpatialParams(const Problem& problem)
- : ParentType(problem)
+ : ParentType(problem)
{
// intrinsic permeabilities
fineK_ = getParam<Scalar>("SpatialParams.permeability");
@@ -201,6 +201,6 @@ private:
static constexpr Scalar eps_ = 1e-6;
};
-}
+} // end namespace Dumux
#endif
--
GitLab