minimal changes which are required to make it compile with the local-AD opm-material module

This commit is contained in:
Andreas Lauser 2015-05-21 16:18:20 +02:00
parent 216508ef13
commit 8e1d8ff5ea
2 changed files with 3 additions and 4 deletions

View File

@ -40,7 +40,6 @@ class Co2InjectionFlash : public Opm::NcpFlash<Scalar, FluidSystem>
typedef Opm::NcpFlash<Scalar, FluidSystem> ParentType;
typedef typename FluidSystem::ParameterCache ParameterCache;
typedef typename ParentType::ComponentVector ComponentVector;
enum { numPhases = FluidSystem::numPhases };
@ -48,7 +47,7 @@ public:
/*!
* \brief Guess initial values for all quantities.
*/
template <class FluidState>
template <class FluidState, class ComponentVector>
static void guessInitial(FluidState &fluidState, ParameterCache &paramCache,
const ComponentVector &globalMolarities)
{

View File

@ -246,10 +246,10 @@ public:
#if 1 // Brooks-Corey
matrixMaterialParams_.setEntryPressure(2000);
matrixMaterialParams_.setLambda(2.0);
matrixMaterialParams_.setThresholdSw(1e-1);
matrixMaterialParams_.setPcLowSw(1e-1);
fractureMaterialParams_.setEntryPressure(1000);
fractureMaterialParams_.setLambda(2.0);
fractureMaterialParams_.setThresholdSw(5e-2);
fractureMaterialParams_.setPcLowSw(5e-2);
#endif
#if 0 // van Genuchten