Added dimensions to GCONINJE / GCONPROD / WCONINJE / WCONINJH.

This commit is contained in:
Joakim Hove
2013-12-16 17:23:46 +01:00
parent 65c9882b53
commit 99542f6685
6 changed files with 49 additions and 47 deletions

View File

@@ -173,7 +173,7 @@ namespace Opm {
DeckRecordConstPtr record = keyword->getRecord(recordNr);
const std::string& wellName = record->getItem("WELL")->getString(0);
WellPtr well = getWell(wellName);
double injectionRate = record->getItem("SURFACE_FLOW_TARGET")->getRawDouble(0);
double injectionRate = record->getItem("SURFACE_FLOW_TARGET")->getSIDouble(0);
well->setInjectionRate( currentStep , injectionRate );
well->setInPredictionMode(currentStep, true);
@@ -185,7 +185,7 @@ namespace Opm {
DeckRecordConstPtr record = keyword->getRecord(recordNr);
const std::string& wellName = record->getItem("WELL")->getString(0);
WellPtr well = getWell(wellName);
double injectionRate = record->getItem("RATE")->getRawDouble(0);
double injectionRate = record->getItem("RATE")->getSIDouble(0);
well->setInjectionRate( currentStep , injectionRate );
well->setInPredictionMode(currentStep, false );
@@ -207,8 +207,8 @@ namespace Opm {
GroupInjection::ControlEnum controlMode = GroupInjection::ControlEnumFromString( record->getItem("CONTROL_MODE")->getString(0) );
group->setInjectionControlMode( currentStep , controlMode );
}
group->setSurfaceMaxRate( currentStep , record->getItem("SURFACE_TARGET")->getRawDouble(0));
group->setReservoirMaxRate( currentStep , record->getItem("RESV_TARGET")->getRawDouble(0));
group->setSurfaceMaxRate( currentStep , record->getItem("SURFACE_TARGET")->getSIDouble(0));
group->setReservoirMaxRate( currentStep , record->getItem("RESV_TARGET")->getSIDouble(0));
group->setTargetReinjectFraction( currentStep , record->getItem("REINJ_TARGET")->getRawDouble(0));
group->setTargetVoidReplacementFraction( currentStep , record->getItem("VOIDAGE_TARGET")->getRawDouble(0));
}
@@ -224,10 +224,10 @@ namespace Opm {
GroupProduction::ControlEnum controlMode = GroupProduction::ControlEnumFromString( record->getItem("CONTROL_MODE")->getString(0) );
group->setProductionControlMode( currentStep , controlMode );
}
group->setOilTargetRate( currentStep , record->getItem("OIL_TARGET")->getRawDouble(0));
group->setGasTargetRate( currentStep , record->getItem("GAS_TARGET")->getRawDouble(0));
group->setWaterTargetRate( currentStep , record->getItem("WATER_TARGET")->getRawDouble(0));
group->setLiquidTargetRate( currentStep , record->getItem("LIQUID_TARGET")->getRawDouble(0));
group->setOilTargetRate( currentStep , record->getItem("OIL_TARGET")->getSIDouble(0));
group->setGasTargetRate( currentStep , record->getItem("GAS_TARGET")->getSIDouble(0));
group->setWaterTargetRate( currentStep , record->getItem("WATER_TARGET")->getSIDouble(0));
group->setLiquidTargetRate( currentStep , record->getItem("LIQUID_TARGET")->getSIDouble(0));
{
GroupProductionExceedLimit::ActionEnum exceedAction = GroupProductionExceedLimit::ActionEnumFromString(record->getItem("EXCEED_PROC")->getString(0) );
group->setProductionExceedLimitAction( currentStep , exceedAction );