From a18bd49acedc2968c84d9da1842fdaaae626952b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Tue, 22 May 2018 11:31:53 +0200
Subject: [PATCH] [poroelastic][problem] respect dumux conventions, use M_PI
and use default neumann bc
---
test/geomechanics/poroelastic/problem.hh | 29 +++++++++++++-----------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/test/geomechanics/poroelastic/problem.hh b/test/geomechanics/poroelastic/problem.hh
index c98f3c495c..887e4313ef 100644
--- a/test/geomechanics/poroelastic/problem.hh
+++ b/test/geomechanics/poroelastic/problem.hh
@@ -70,6 +70,7 @@ class PoroElasticProblem : public GeomechanicsFVProblem<TypeTag>
using Indices = typename GET_PROP_TYPE(TypeTag, ModelTraits)::Indices;
using BoundaryTypes = typename GET_PROP_TYPE(TypeTag, BoundaryTypes);
using PrimaryVariables = typename GET_PROP_TYPE(TypeTag, PrimaryVariables);
+ using NumEqVector = typename GET_PROP_TYPE(TypeTag, NumEqVector);
using ElementVolumeVariables = typename GET_PROP_TYPE(TypeTag, GridVolumeVariables)::LocalView;
using FVGridGeometry = typename GET_PROP_TYPE(TypeTag, FVGridGeometry);
@@ -81,6 +82,7 @@ class PoroElasticProblem : public GeomechanicsFVProblem<TypeTag>
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
+ static constexpr Scalar pi = M_PI;
static constexpr int dim = GridView::dimension;
static constexpr int dimWorld = GridView::dimensionworld;
using GradU = Dune::FieldMatrix<Scalar, dim, dimWorld>;
@@ -88,16 +90,20 @@ class PoroElasticProblem : public GeomechanicsFVProblem<TypeTag>
public:
//! The constructor
PoroElasticProblem(std::shared_ptr<const FVGridGeometry> fvGridGeometry)
- : ParentType(fvGridGeometry) {}
+ : ParentType(fvGridGeometry)
+ {}
//! The temperature in the domain
- static constexpr Scalar temperature() { return 273.15; }
+ static constexpr Scalar temperature()
+ { return 273.15; }
+
//! Evaluate the initial value for a control volume.
- PrimaryVariables initialAtPos(const GlobalPosition& globalPos) const { return PrimaryVariables(0.0); }
+ PrimaryVariables initialAtPos(const GlobalPosition& globalPos) const
+ { return PrimaryVariables(0.0); }
+
//! Evaluate the boundary conditions for a Dirichlet boundary segment.
- PrimaryVariables dirichletAtPos(const GlobalPosition& globalPos) const { return PrimaryVariables(0.0); }
- //! Evaluate the boundary conditions for a Neumannboundary segment.
- PrimaryVariables neumannAtPos(const GlobalPosition& globalPos) const { return PrimaryVariables(0.0); }
+ PrimaryVariables dirichletAtPos(const GlobalPosition& globalPos) const
+ { return PrimaryVariables(0.0); }
/*!
* \brief Returns the effective fluid density
@@ -137,15 +143,14 @@ public:
* \brief Evaluate the source term for all phases within a given
* sub-control-volume.
*/
- PrimaryVariables source(const Element& element,
- const FVElementGeometry& fvGeometry,
- const ElementVolumeVariables& elemVolVars,
- const SubControlVolume& scv) const
+ NumEqVector source(const Element& element,
+ const FVElementGeometry& fvGeometry,
+ const ElementVolumeVariables& elemVolVars,
+ const SubControlVolume& scv) const
{
using std::sin;
using std::cos;
- static const Scalar pi = 3.14159265358979323846;
const auto ipGlobal = scv.center();
const auto x = ipGlobal[0];
const auto y = ipGlobal[1];
@@ -184,7 +189,6 @@ public:
{
using std::sin;
- static const Scalar pi = 3.14159265358979323846;
const auto x = globalPos[0];
const auto y = globalPos[1];
@@ -202,7 +206,6 @@ public:
using std::sin;
using std::cos;
- static const Scalar pi = 3.14159265358979323846;
const auto x = globalPos[0];
const auto y = globalPos[1];
--
GitLab