From 8e1d8ff5eabf7b8161399456a6b7918ee303dd6f Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Thu, 21 May 2015 16:18:20 +0200 Subject: [PATCH] minimal changes which are required to make it compile with the local-AD opm-material module --- examples/problems/co2injectionflash.hh | 3 +-- examples/problems/fractureproblem.hh | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/problems/co2injectionflash.hh b/examples/problems/co2injectionflash.hh index b19eb0df6..2dd946895 100644 --- a/examples/problems/co2injectionflash.hh +++ b/examples/problems/co2injectionflash.hh @@ -40,7 +40,6 @@ class Co2InjectionFlash : public Opm::NcpFlash typedef Opm::NcpFlash 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 + template static void guessInitial(FluidState &fluidState, ParameterCache ¶mCache, const ComponentVector &globalMolarities) { diff --git a/examples/problems/fractureproblem.hh b/examples/problems/fractureproblem.hh index 3e8619e46..15dae357e 100644 --- a/examples/problems/fractureproblem.hh +++ b/examples/problems/fractureproblem.hh @@ -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