mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-12-24 16:30:02 -06:00
change the 2p(ni) and 2p2c(ni) models to the generic capillary pressure laws
also change the 2p model to "smart primary variables" and rate vectors and make the 2p and 2p2c test problems model agnostic
This commit is contained in:
parent
57e9f74f3a
commit
f4f7190c72
@ -34,6 +34,7 @@
|
||||
// include material laws
|
||||
#include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh> /*@\label{tutorial-coupled:rawLawInclude}@*/
|
||||
#include <dumux/material/fluidmatrixinteractions/2p/efftoabslaw.hh>
|
||||
#include <dumux/material/fluidmatrixinteractions/Mp/2padapter.hh>
|
||||
|
||||
namespace Dumux {
|
||||
//forward declaration
|
||||
@ -57,9 +58,15 @@ private:
|
||||
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
|
||||
// select material law to be used
|
||||
typedef RegularizedBrooksCorey<Scalar> RawMaterialLaw; /*@\label{tutorial-coupled:rawlaw}@*/
|
||||
public:
|
||||
// adapter for absolute law
|
||||
typedef EffToAbsLaw<RawMaterialLaw> type; /*@\label{tutorial-coupled:eff2abs}@*/
|
||||
typedef EffToAbsLaw<RawMaterialLaw> TwoPMaterialLaw; /*@\label{tutorial-coupled:eff2abs}@*/
|
||||
|
||||
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
|
||||
enum { wPhaseIdx = FluidSystem::wPhaseIdx };
|
||||
|
||||
public:
|
||||
typedef TwoPAdapter<wPhaseIdx, TwoPMaterialLaw> type;
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user