Commit 10796c01 authored by Kilian Weishaupt's avatar Kilian Weishaupt
Browse files

Merge branch 'feature/fs304-remove-type-tags' into 'master'

[properties] remove TypeTags "ImplicitModel" and "ExplicitModel"

The TypeTags haven't been used apart from one internal inheritance.
See FS#304 for details.

See merge request !61
parents d74539ca 5880d92e
......@@ -23,14 +23,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
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment