diff --git a/CHANGELOG b/CHANGELOG index 7edc594e0ddf0beaeb8be6ead21042a96b4acfe6..98476b5b0fa459e3664ac145b8d1a09a41665c51 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/dumux/common/basicproperties.hh b/dumux/common/basicproperties.hh index 39dd19af28020e92f24aa0796c939a0781ad3f00..e99725717581404cd20b0b0caa456b661b90839f 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 849355c38be12e051de00643b1259a795a254755..886acf8a0d75197b4d0c13ca3bc4f9203b9c25ea 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