From d4da92f87730caf3c4cc5652ff2fd7a266d144a2 Mon Sep 17 00:00:00 2001
From: Benjamin Faigle <Benjamin.Faigle@iws.uni-stuttgart.de>
Date: Tue, 6 Apr 2010 13:11:09 +0000
Subject: [PATCH] miniworkshop-solution

---
 examples/tutorialproblem_coupled.hh | 47 ++++++++++++++---------------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/examples/tutorialproblem_coupled.hh b/examples/tutorialproblem_coupled.hh
index d3404692b..55e8a2010 100644
--- a/examples/tutorialproblem_coupled.hh
+++ b/examples/tutorialproblem_coupled.hh
@@ -18,10 +18,12 @@
 #define DUMUX_TUTORIALPROBLEM_COUPLED_HH
 
 // fluid properties
-#include <dumux/new_material/components/simpleh2o.hh>
-#include <dumux/new_material/components/simplednapl.hh>
 #include <dumux/new_material/fluidsystems/h2o_n2_system.hh>
 
+//#include <dumux/new_material/components/simpleh2o.hh>		// special case of 2p model!
+//#include <dumux/new_material/components/simplednapl.hh>	// special case of 2p model!
+
+
 // the numerical model
 #include <dumux/boxmodels/2p/2pboxmodel.hh>
 
@@ -29,7 +31,7 @@
 #include <dune/grid/yaspgrid.hh>
 #include <dune/grid/io/file/dgfparser/dgfs.hh>
 
-// the soil to be used
+// assign parameters dependent on space (e.g. soil properties)
 #include "tutorialspatialparameters_coupled.hh"
 
 namespace Dumux
@@ -70,37 +72,32 @@ SET_PROP(TutorialProblemCoupled, Grid) /*@\label{tutorial-coupled:set-grid}@*/
     }
 };
 
-// Set the wetting and non-wetting phases
-SET_PROP(TutorialProblemCoupled, WettingPhase) /*@\label{tutorial-coupled:set-wetting}@*/
+// Select fluid system
+SET_PROP(TutorialProblemCoupled,   FluidSystem)
 {
-private:
-    typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
-public:
-    typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
-};
-SET_PROP(TutorialProblemCoupled, NonwettingPhase)/*@\label{tutorial-coupled:set-nonwetting}@*/
-{
-private:
-    typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
-public:
-    typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleDNAPL<Scalar> > type;
+    //typedef Dune::Brine_CO2_System<TypeTag, Dune::IFP::CO2Tables> type;
+    typedef Dumux::H2O_N2_System<TypeTag> type;
 };
 
-
-//SET_PROP(TutorialProblemCoupled,   FluidSystem)
+//// Set the wetting and non-wetting phases - special case of 2p model!
+//SET_PROP(TutorialProblemCoupled, WettingPhase) /*@\label{tutorial-coupled:set-wetting}@*/
 //{
-//    //typedef Dune::Brine_CO2_System<TypeTag, Dune::IFP::CO2Tables> type;
-//    typedef Dumux::H2O_N2_System<TypeTag> type;
+//private:
+//    typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+//public:
+//    typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
+//};
+//SET_PROP(TutorialProblemCoupled, NonwettingPhase)/*@\label{tutorial-coupled:set-nonwetting}@*/
+//{
+//private:
+//    typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
+//public:
+//    typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleDNAPL<Scalar> > type;
 //};
 
 // Set the soil properties
 SET_PROP(TutorialProblemCoupled, SpatialParameters) /*@\label{tutorial-coupled:set-soil}@*/
 {
-private:
-    typedef typename GET_PROP_TYPE(TypeTag, PTAG(Grid)) Grid;
-    typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar;
-    
-public:
     typedef Dumux::TutorialSpatialParameters<TypeTag> type;
 };