From 01642b1f5f5da810cc90b5c35f60ee8d2c4b4120 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Thu, 5 Nov 2015 14:04:06 +0100
Subject: [PATCH] [el1p2c] add FluidState to the default properties
Since ElOnePTwoC doesn't inherit from OnePTwoC, the FluidState has
to be set explicitly.
Reviewed by Natalie.
---
dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh | 9 +++++++++
dumux/implicit/1p2c/1p2cpropertydefaults.hh | 1 +
dumux/implicit/1p2c/1p2cvolumevariables.hh | 1 -
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh b/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh
index 2079aec02a..94d1b4c46e 100644
--- a/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh
+++ b/dumux/geomechanics/el1p2c/el1p2cpropertydefaults.hh
@@ -42,6 +42,7 @@
#include "el1p2cvolumevariables.hh"
#include "el1p2cindices.hh"
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
+#include <dumux/material/fluidstates/compositionalfluidstate.hh>
namespace Dumux
@@ -93,6 +94,14 @@ SET_TYPE_PROP(BoxElasticOnePTwoC, Indices, ElOnePTwoCIndices<TypeTag>);
//! Set the phaseIndex per default to zero (important for two-phase fluidsystems).
SET_INT_PROP(BoxElasticOnePTwoC, PhaseIdx, 0);
+SET_PROP(BoxElasticOnePTwoC, FluidState){
+ private:
+ typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
+ typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
+ public:
+ typedef Dumux::CompositionalFluidState<Scalar, FluidSystem> type;
+};
+
//! set default upwind weights to 1.0, i.e. fully upwind
SET_SCALAR_PROP(BoxElasticOnePTwoC, ImplicitMassUpwindWeight, 1.0);
SET_SCALAR_PROP(BoxElasticOnePTwoC, ImplicitMobilityUpwindWeight, 1.0);
diff --git a/dumux/implicit/1p2c/1p2cpropertydefaults.hh b/dumux/implicit/1p2c/1p2cpropertydefaults.hh
index 38bf6fa731..6eee873a01 100644
--- a/dumux/implicit/1p2c/1p2cpropertydefaults.hh
+++ b/dumux/implicit/1p2c/1p2cpropertydefaults.hh
@@ -40,6 +40,7 @@
#include <dumux/material/spatialparams/implicitspatialparams1p.hh>
#include <dumux/material/fluidmatrixinteractions/diffusivitymillingtonquirk.hh>
#include <dumux/material/fluidmatrixinteractions/1p/thermalconductivityaverage.hh>
+#include <dumux/material/fluidstates/compositionalfluidstate.hh>
namespace Dumux
{
diff --git a/dumux/implicit/1p2c/1p2cvolumevariables.hh b/dumux/implicit/1p2c/1p2cvolumevariables.hh
index 807475142b..233b182860 100644
--- a/dumux/implicit/1p2c/1p2cvolumevariables.hh
+++ b/dumux/implicit/1p2c/1p2cvolumevariables.hh
@@ -25,7 +25,6 @@
#define DUMUX_1P2C_VOLUME_VARIABLES_HH
#include <dumux/implicit/common/implicitvolumevariables.hh>
-#include <dumux/material/fluidstates/compositionalfluidstate.hh>
#include "1p2cproperties.hh"
--
GitLab