From fd62a2b0268111192a624ca91faf41de04304deb 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:21:48 +0200
Subject: [PATCH] [elastic][volvars] respect dumux conventions
---
dumux/geomechanics/elastic/volumevariables.hh | 21 +++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/dumux/geomechanics/elastic/volumevariables.hh b/dumux/geomechanics/elastic/volumevariables.hh
index c355f2f1a1..34d98f5bcc 100644
--- a/dumux/geomechanics/elastic/volumevariables.hh
+++ b/dumux/geomechanics/elastic/volumevariables.hh
@@ -82,15 +82,24 @@ public:
};
//! Return the average porosity \f$\mathrm{[-]}\f$ within the control volume.
- Scalar solidDensity() const { return solidState_.density(); }
+ Scalar solidDensity() const
+ { return solidState_.density(); }
+
//! Returns the permeability within the control volume in \f$[m^2]\f$.
- Scalar displacement(unsigned int dir) const { return priVars_[ Indices::momentum(dir) ]; }
+ Scalar displacement(unsigned int dir) const
+ { return priVars_[ Indices::momentum(dir) ]; }
+
//! Return a component of primary variable vector for a given index
- Scalar priVar(const int pvIdx) const { return priVars_[pvIdx]; }
+ Scalar priVar(const int pvIdx) const
+ { return priVars_[pvIdx]; }
+
//! Return the vector of primary variables
- const PrimaryVariables& priVars() const { return priVars_; }
+ const PrimaryVariables& priVars() const
+ { return priVars_; }
+
//! TODO We don't know yet how to interpret extrusion for mechanics
- static constexpr Scalar extrusionFactor() { return 1.0; }
+ static constexpr Scalar extrusionFactor()
+ { return 1.0; }
private:
//! sets the temperature in the solid state for non-isothermal models
@@ -111,6 +120,6 @@ private:
SolidState solidState_;
};
-}
+} // end namespace Dumux
#endif
--
GitLab