renaming saltwater-->brine and review comments

This commit is contained in:
Trine S. Mykkeltvedt
2019-12-03 09:05:44 +01:00
committed by Tor Harald Sandve
parent 106c4e3616
commit 587fa71e04
10 changed files with 109 additions and 111 deletions

View File

@@ -59,7 +59,7 @@ class BlackOilRateVector
typedef BlackOilSolventModule<TypeTag> SolventModule;
typedef BlackOilPolymerModule<TypeTag> PolymerModule;
typedef BlackOilFoamModule<TypeTag> FoamModule;
typedef BlackOilSaltWaterModule<TypeTag> SaltWaterModule;
typedef BlackOilBrineModule<TypeTag> BrineModule;
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
enum { numComponents = GET_PROP_VALUE(TypeTag, NumComponents) };
@@ -70,7 +70,7 @@ class BlackOilRateVector
enum { enablePolymer = GET_PROP_VALUE(TypeTag, EnablePolymer) };
enum { enablePolymerMolarWeight = GET_PROP_VALUE(TypeTag, EnablePolymerMW) };
enum { enableFoam = GET_PROP_VALUE(TypeTag, EnableFoam) };
enum { enableSaltWater = GET_PROP_VALUE(TypeTag, EnableSaltWater) };
enum { enableBrine = GET_PROP_VALUE(TypeTag, EnableBrine) };
typedef Opm::MathToolbox<Evaluation> Toolbox;
typedef Dune::FieldVector<Evaluation, numEq> ParentType;
@@ -141,7 +141,7 @@ public:
throw std::logic_error("setMolarRate() not implemented for foam");
}
if ( enableSaltWater ) {
if ( enableBrine ) {
throw std::logic_error("setMolarRate() not implemented for salt water");
}