Reverting previous commits and going back to revision 6808. There is no need to rush things. We agreed on first having the meeting and then porting the change to the non-MpNc-models. Moreover, the change has not been carried out according to what has been discussed at the meeting. E.g. there was no completeState functionality of the models, and the simple models also introduced parameter caches, although it was thought to not necessarily having to do so.

This commit is contained in:
Bernd Flemisch 2011-11-01 16:55:36 +00:00 committed by Andreas Lauser
parent 710ee0ae4e
commit 89ff5ad8fc
2 changed files with 2 additions and 2 deletions

View File

@ -83,7 +83,7 @@ public: typedef Dumux::LiquidPhase<Scalar, Dumux::H2O<Scalar> > type; /*@\label{
}; };
// Set the non-wetting phase // Set the non-wetting phase
SET_PROP(TutorialProblemCoupled, NonWettingPhase) SET_PROP(TutorialProblemCoupled, NonwettingPhase)
{ {
private: typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar; private: typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
public: typedef Dumux::LiquidPhase<Scalar, Dumux::Oil<Scalar> > type; /*@\label{tutorial-coupled:nonwettingPhase}@*/ public: typedef Dumux::LiquidPhase<Scalar, Dumux::Oil<Scalar> > type; /*@\label{tutorial-coupled:nonwettingPhase}@*/

View File

@ -93,7 +93,7 @@ public:
}; };
// Set the non-wetting phase // Set the non-wetting phase
SET_PROP(TutorialProblemDecoupled, NonWettingPhase) SET_PROP(TutorialProblemDecoupled, NonwettingPhase)
{ {
private: private:
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar; typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;