From 5c2709d14490afefc1b256cd377cc4388eae21f3 Mon Sep 17 00:00:00 2001
From: Benjamin Faigle <benjamin.faigle@posteo.de>
Date: Thu, 4 Aug 2011 12:31:01 +0000
Subject: [PATCH] prepare defaultcomponents to work with brine_co2_system
introduce new property for elaborate version to calculate fluid properties
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6374 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/material/fluidsystems/defaultcomponents.hh | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/dumux/material/fluidsystems/defaultcomponents.hh b/dumux/material/fluidsystems/defaultcomponents.hh
index fcceeb112b..fae746695e 100644
--- a/dumux/material/fluidsystems/defaultcomponents.hh
+++ b/dumux/material/fluidsystems/defaultcomponents.hh
@@ -54,6 +54,7 @@ NEW_PROP_TAG(DefaultComponents);
//! system
NEW_PROP_TAG(Components);
+NEW_PROP_TAG(EnableComplicatedFluidSystem);
NEW_PROP_TAG(Scalar);
SET_PROP_DEFAULT(DefaultComponents)
@@ -69,7 +70,7 @@ public:
typedef Dumux::CH4<Scalar> CH4;
typedef Dumux::SimpleCO2<Scalar> SimpleCO2;
typedef Dumux::SimpleH2O<Scalar> SimpleH2O;
- typedef Dumux::Brine<Scalar, H2O> Brine;
+ typedef Dumux::TabulatedComponent<Scalar, Dumux::Brine<Scalar, H2O>> Brine;
static void init()
{
@@ -86,6 +87,19 @@ SET_PROP_DEFAULT(Components)
: public GET_PROP(TypeTag, PTAG(DefaultComponents))
{};
+//! Enables detailed description of fluidsystems
+/*
+ * Complicated but detailed members of fluidsystems (e.g. phase viscosity,
+ * phase density) can be simplified for efficiency reasons with this property.
+ * Typically, such high demands on accuracy are not needed, so this property
+ * is set to "false" as the default.
+ *
+ * To enable it, use
+ * SET_BOOL_PROP(MyTypeTag, EnableComplicatedFluidSystem, true);
+ */
+
+SET_PROP_DEFAULT(EnableComplicatedFluidSystem)
+{ static const bool value = false;};
}; // namespace Properties
}; // namespace Dumux
--
GitLab