From 5880d92e4b64e0c66e762d8485400c879e2a9b61 Mon Sep 17 00:00:00 2001
From: Bernd Flemisch <bernd@iws.uni-stuttgart.de>
Date: Tue, 2 Feb 2016 09:58:36 +0100
Subject: [PATCH] [properties] remove TypeTags "ImplicitModel" and
"ExplicitModel"
The TypeTags haven't been used apart from one internal inheritance.
See FS#304 for details.
---
CHANGELOG | 8 ++++++--
dumux/common/basicproperties.hh | 21 ++-------------------
dumux/implicit/properties.hh | 2 +-
3 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9dc7545a4b..be57304c99 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,14 +19,18 @@ Differences Between DuMuX 2.8 and DuMuX 2.9
* IMMEDIATE INTERFACE CHANGES not allowing/requiring a deprecation period:
- For the multidomain models, the notation of the boundary condition types
- has changed. This is especially important for all momentum boundary conditions.
- In general:
+ has changed. This is especially important for all momentum boundary
+ conditions. In general:
couplingInflow -> couplingNeumann
couplingOutflow -> couplingDirichlet
But for the momentum balances:
couplingInflow -> couplingDirichlet
couplingOutflow -> couplingNeumann
+ - The TypeTags "ImplicitModel" and "ExplicitModel" have been deleted. They
+ haven't been used apart from one internal inheritance. See FS#304 for
+ details.
+
* Deprecated PROPERTY and PARAMETER NAMES, to be removed after 2.9: BEWARE: The
compiler will not print any warning if a deprecated property or parameter name
is used. However, a run-time warning should appear in the summary lines after
diff --git a/dumux/common/basicproperties.hh b/dumux/common/basicproperties.hh
index 39dd19af28..e997257175 100644
--- a/dumux/common/basicproperties.hh
+++ b/dumux/common/basicproperties.hh
@@ -40,29 +40,14 @@ namespace Properties
{
///////////////////////////////////
// Type tag definitions:
-//
-// NumericModel
-// |
-// +-> ImplicitModel
-// |
-// \-> ExplicitModel
///////////////////////////////////
//! Type tag for all models.
NEW_TYPE_TAG(NumericModel);
-//! Type tag for all fully coupled models.
-NEW_TYPE_TAG(ImplicitModel, INHERITS_FROM(NumericModel));
-
-//! Type tag for all decoupled models.
-NEW_TYPE_TAG(ExplicitModel, INHERITS_FROM(NumericModel));
-
-
-///////////////////////////////////
+/////////////////////////////////////////////
// Property names which are always available:
-//
-// Scalar
-///////////////////////////////////
+/////////////////////////////////////////////
//! Property to specify the type of scalar values.
NEW_PROP_TAG(Scalar);
@@ -109,8 +94,6 @@ NEW_PROP_TAG(VtkMultiWriter);
///////////////////////////////////
// Default values for properties:
-//
-// Scalar -> double
///////////////////////////////////
//! Set the default type of scalar values to double
diff --git a/dumux/implicit/properties.hh b/dumux/implicit/properties.hh
index 849355c38b..886acf8a0d 100644
--- a/dumux/implicit/properties.hh
+++ b/dumux/implicit/properties.hh
@@ -45,7 +45,7 @@ namespace Properties
//////////////////////////////////////////////////////////////////
//! The type tag for fully-implicit models
-NEW_TYPE_TAG(ImplicitBase, INHERITS_FROM(NewtonMethod, LinearSolverTypeTag, ImplicitModel, GridAdapt));
+NEW_TYPE_TAG(ImplicitBase, INHERITS_FROM(NewtonMethod, LinearSolverTypeTag, NumericModel, GridAdapt));
//////////////////////////////////////////////////////////////////
// Property tags
--
GitLab