From 0aac389625108276a4e1d42328e6b9595d714bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Gl=C3=A4ser?= <dennis.glaeser@iws.uni-stuttgart.de>
Date: Mon, 25 Jun 2018 18:05:12 +0200
Subject: [PATCH] [poroelastic][test] use new porosity law
---
.../poroelastic/volumevariables.hh | 2 +-
.../geomechanics/poroelastic/spatialparams.hh | 11 ++++++++--
test/references/poroelasticbox-reference.vtu | 22 +++++++++----------
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/dumux/geomechanics/poroelastic/volumevariables.hh b/dumux/geomechanics/poroelastic/volumevariables.hh
index cd285e7501..ffd25b5c4c 100644
--- a/dumux/geomechanics/poroelastic/volumevariables.hh
+++ b/dumux/geomechanics/poroelastic/volumevariables.hh
@@ -93,7 +93,7 @@ public:
//! Return the average porosity \f$\mathrm{[-]}\f$ within the scv
Scalar porosity() const
- { return solidState_.porosity()*divU_; }
+ { return solidState_.porosity(); }
//! Returns the divergence of u within this scv
Scalar divU() const
diff --git a/test/geomechanics/poroelastic/spatialparams.hh b/test/geomechanics/poroelastic/spatialparams.hh
index cf9675f3da..2b04311bb0 100644
--- a/test/geomechanics/poroelastic/spatialparams.hh
+++ b/test/geomechanics/poroelastic/spatialparams.hh
@@ -25,6 +25,7 @@
#include <dumux/geomechanics/lameparams.hh>
#include <dumux/material/spatialparams/fvporoelastic.hh>
+#include <dumux/material/fluidmatrixinteractions/porositydeformation.hh>
namespace Dumux {
@@ -63,8 +64,14 @@ public:
{ return lameParams_; }
//! Return the porosity of the porous medium
- Scalar porosityAtPos(const GlobalPosition& globalPos) const
- { return 0.3; }
+ template< class ElemSol >
+ Scalar porosity(const Element& element,
+ const SubControlVolume& scv,
+ const ElemSol& elemSol) const
+ {
+ PorosityDeformation<Scalar> poroLaw;
+ return poroLaw.evaluatePorosity(this->fvGridGeometry(), element, scv, elemSol, /*refPoro*/0.3);
+ }
//! Return the biot coefficient of the porous medium
Scalar biotCoefficientAtPos(const GlobalPosition& globalPos) const
diff --git a/test/references/poroelasticbox-reference.vtu b/test/references/poroelasticbox-reference.vtu
index 086a6febbe..12b6fbc488 100644
--- a/test/references/poroelasticbox-reference.vtu
+++ b/test/references/poroelasticbox-reference.vtu
@@ -17,17 +17,17 @@
-0.757736
</DataArray>
<DataArray type="Float32" Name="porosity" NumberOfComponents="1" format="ascii">
- 0.309054 1.29488 0.341098 0.936259 1.7962 1.21561 1.6182 1.06868 0.827126 0.538561 -0.277743 -0.186956
- -1.2777 -0.846167 -1.79406 -1.20271 -1.63214 -1.13507 -0.8557 -0.680316 -0.309803 -0.343143 0.255164 0.207341
- 0.154823 0.0985919 0.0403662 -0.0189445 -0.0786844 -0.138329 -0.197353 -0.256421 -0.257624 0.0695975 -0.604713 -0.972531
- -0.915482 -0.475777 0.158464 0.724521 0.985262 0.819339 0.266846 -0.0717973 -0.14579 -1.18927 -1.73234 -1.58335
- -0.81182 0.276152 1.25383 1.73624 1.52668 0.691113 0.144493 -0.308432 -1.3225 -1.83327 -1.64871 -0.838892
- 0.288805 1.30612 1.8269 1.65409 0.854439 0.308448 -0.355987 -0.953169 -1.23636 -1.08621 -0.546401 0.191653
- 0.861361 1.22249 1.15275 0.694345 0.357352 -0.270326 -0.222174 -0.169685 -0.110815 -0.0459431 0.0221643 0.0898809
- 0.154241 0.214274 0.271829 0.272684 -0.0838091 0.591249 0.958375 0.904428 0.471554 -0.154051 -0.712533 -0.96903
- -0.802824 -0.252349 0.0865348 0.137605 1.17327 1.71521 1.57109 0.809294 -0.26761 -1.23706 -1.71704 -1.51093
- -0.681962 -0.135322 0.228069 1.23229 1.74988 1.58854 0.81477 -0.27222 -1.25382 -1.75139 -1.57028 -0.773961
- -0.227321
+ 0.609054 1.59488 0.641098 1.23626 2.0962 1.51561 1.9182 1.36868 1.12713 0.838561 0.0222568 0.113044
+ 0 0 0 0 0 0 0 0 0 0 0.555164 0.507341
+ 0.454823 0.398592 0.340366 0.281055 0.221316 0.161671 0.102647 0.0435787 0.0423759 0.369597 0 0
+ 0 0 0.458464 1.02452 1.28526 1.11934 0.566846 0.228203 0.15421 0 0 0
+ 0 0.576152 1.55383 2.03624 1.82668 0.991113 0.444493 0 0 0 0 0
+ 0.588805 1.60612 2.1269 1.95409 1.15444 0.608448 0 0 0 0 0 0.491653
+ 1.16136 1.52249 1.45275 0.994345 0.657352 0.0296742 0.0778257 0.130315 0.189185 0.254057 0.322164 0.389881
+ 0.454241 0.514274 0.571829 0.572684 0.216191 0.891249 1.25837 1.20443 0.771554 0.145949 0 0
+ 0 0.0476512 0.386535 0.437605 1.47327 2.01521 1.87109 1.10929 0.0323899 0 0 0
+ 0 0.164678 0.528069 1.53229 2.04988 1.88854 1.11477 0.0277798 0 0 0 0
+ 0.0726792
</DataArray>
<DataArray type="Float32" Name="u" NumberOfComponents="3" format="ascii">
0 0 0 0 0 0 0 0 0 0.0481153 0.363957 0
--
GitLab