From 67094b280703d74d034bcd9ed11ec3d88a6ede46 Mon Sep 17 00:00:00 2001
From: Timo Koch <timo.koch@iws.uni-stuttgart.de>
Date: Fri, 20 Jul 2018 18:18:33 +0200
Subject: [PATCH] [richardsnc] assert that numPhases matches in model and
fluidsystem
---
dumux/porousmediumflow/richardsnc/model.hh | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dumux/porousmediumflow/richardsnc/model.hh b/dumux/porousmediumflow/richardsnc/model.hh
index 6d032023de..6d246c8e59 100644
--- a/dumux/porousmediumflow/richardsnc/model.hh
+++ b/dumux/porousmediumflow/richardsnc/model.hh
@@ -141,9 +141,6 @@ public:
using type = RichardsNCModelTraits<FluidSystem::numComponents, GET_PROP_VALUE(TypeTag, UseMoles), GET_PROP_VALUE(TypeTag, ReplaceCompEqIdx)>;
};
- //! The default phase index to access the fluid system
-SET_INT_PROP(RichardsNC, PhaseIdx, 0);
-
//! Define that per default mole fractions are used in the balance equations
SET_BOOL_PROP(RichardsNC, UseMoles, true);
@@ -166,6 +163,11 @@ private:
using MT = typename GET_PROP_TYPE(TypeTag, ModelTraits);
using PT = typename GET_PROP_TYPE(TypeTag, SpatialParams)::PermeabilityType;
+ static_assert(FSY::numComponents == MT::numComponents(), "Number of components mismatch between model and fluid system");
+ static_assert(FST::numComponents == MT::numComponents(), "Number of components mismatch between model and fluid state");
+ static_assert(FSY::numPhases == MT::numPhases(), "Number of phases mismatch between model and fluid system");
+ static_assert(FST::numPhases == MT::numPhases(), "Number of phases mismatch between model and fluid state");
+
using Traits = RichardsVolumeVariablesTraits<PV, FSY, FST, SSY, SST, PT, MT>;
public:
using type = RichardsNCVolumeVariables<Traits>;
--
GitLab