OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

miniworkshop-solution

Browse Source
This commit is contained in:
Benjamin Faigle 2010-04-06 13:11:09 +00:00 committed by Andreas Lauser
parent acc1d8557c
commit d4da92f877
1 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
examples/tutorialproblem_coupled.hh
View File

@ -18,10 +18,12 @@
#define DUMUX_TUTORIALPROBLEM_COUPLED_HH #define DUMUX_TUTORIALPROBLEM_COUPLED_HH
// fluid properties // 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/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 // the numerical model
#include <dumux/boxmodels/2p/2pboxmodel.hh> #include <dumux/boxmodels/2p/2pboxmodel.hh>
@ -29,7 +31,7 @@
#include <dune/grid/yaspgrid.hh> #include <dune/grid/yaspgrid.hh>
#include <dune/grid/io/file/dgfparser/dgfs.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" #include "tutorialspatialparameters_coupled.hh"
namespace Dumux namespace Dumux
@ -70,37 +72,32 @@ SET_PROP(TutorialProblemCoupled, Grid) /*@\label{tutorial-coupled:set-grid}@*/
} }
}; };
// Set the wetting and non-wetting phases // Select fluid system
SET_PROP(TutorialProblemCoupled, WettingPhase) /*@\label{tutorial-coupled:set-wetting}@*/ SET_PROP(TutorialProblemCoupled, FluidSystem)
{ {
private: //typedef Dune::Brine_CO2_System<TypeTag, Dune::IFP::CO2Tables> type;
typedef typename GET_PROP_TYPE(TypeTag, PTAG(Scalar)) Scalar; typedef Dumux::H2O_N2_System<TypeTag> type;
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 wetting and non-wetting phases - special case of 2p model!
//SET_PROP(TutorialProblemCoupled, FluidSystem) //SET_PROP(TutorialProblemCoupled, WettingPhase) /*@\label{tutorial-coupled:set-wetting}@*/
//{ //{
// //typedef Dune::Brine_CO2_System<TypeTag, Dune::IFP::CO2Tables> type; //private:
// typedef Dumux::H2O_N2_System<TypeTag> type; // 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 the soil properties
SET_PROP(TutorialProblemCoupled, SpatialParameters) /*@\label{tutorial-coupled:set-soil}@*/ 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; typedef Dumux::TutorialSpatialParameters<TypeTag> type;
}; };