OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed getDouble() -> getRawDouble throughout.

Browse Source
This commit is contained in:
Joakim Hove
2013-12-10 14:16:54 +01:00
parent 4fce7703db
commit 7ea0bb8e53
12 changed files with 52 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Schedule/Completion.cpp
View File

@@ -61,7 +61,7 @@ namespace Opm {
if (CFItem->defaultApplied())
throw std::invalid_argument("The connection factor item can not be defaulted");
}
double CF = compdatRecord->getItem("CF")->getDouble(0);
double CF = compdatRecord->getItem("CF")->getRawDouble(0);
for (int k = K1; k <= K2; k++) {
CompletionConstPtr completion(new Completion(I , J , k , state , CF ));

26
opm/parser/eclipse/EclipseState/Schedule/Schedule.cpp
View File

@@ -149,9 +149,9 @@ namespace Opm {
DeckRecordConstPtr record = keyword->getRecord(recordNr);
const std::string& wellName = record->getItem("WELL")->getString(0);
WellPtr well = getWell(wellName);
double orat = record->getItem("ORAT")->getDouble(0);
double wrat = record->getItem("WRAT")->getDouble(0);
double grat = record->getItem("GRAT")->getDouble(0);
double orat = record->getItem("ORAT")->getRawDouble(0);
double wrat = record->getItem("WRAT")->getRawDouble(0);
double grat = record->getItem("GRAT")->getRawDouble(0);
well->setOilRate(currentStep, orat);
well->setWaterRate(currentStep, wrat);
@@ -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")->getDouble(0);
double injectionRate = record->getItem("SURFACE_FLOW_TARGET")->getRawDouble(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")->getDouble(0);
double injectionRate = record->getItem("RATE")->getRawDouble(0);
well->setInjectionRate( currentStep , injectionRate );
well->setInPredictionMode(currentStep, false );
@@ -207,10 +207,10 @@ namespace Opm {
GroupInjection::ControlEnum controlMode = GroupInjection::ControlEnumFromString( record->getItem("CONTROL_MODE")->getString(0) );
group->setInjectionControlMode( currentStep , controlMode );
}
group->setSurfaceMaxRate( currentStep , record->getItem("SURFACE_TARGET")->getDouble(0));
group->setReservoirMaxRate( currentStep , record->getItem("RESV_TARGET")->getDouble(0));
group->setTargetReinjectFraction( currentStep , record->getItem("REINJ_TARGET")->getDouble(0));
group->setTargetVoidReplacementFraction( currentStep , record->getItem("VOIDAGE_TARGET")->getDouble(0));
group->setSurfaceMaxRate( currentStep , record->getItem("SURFACE_TARGET")->getRawDouble(0));
group->setReservoirMaxRate( currentStep , record->getItem("RESV_TARGET")->getRawDouble(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")->getDouble(0));
group->setGasTargetRate( currentStep , record->getItem("GAS_TARGET")->getDouble(0));
group->setWaterTargetRate( currentStep , record->getItem("WATER_TARGET")->getDouble(0));
group->setLiquidTargetRate( currentStep , record->getItem("LIQUID_TARGET")->getDouble(0));
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));
{
GroupProductionExceedLimit::ActionEnum exceedAction = GroupProductionExceedLimit::ActionEnumFromString(record->getItem("EXCEED_PROC")->getString(0) );
group->setProductionExceedLimitAction( currentStep , exceedAction );

2
opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp
View File

@@ -136,7 +136,7 @@ namespace Opm {
DeckItemConstPtr item = record->getItem( 0 );
for (size_t itemIndex = 0; itemIndex < item->size(); itemIndex++) {
double days = item->getDouble( itemIndex );
double days = item->getRawDouble( itemIndex );
boost::posix_time::time_duration step = boost::posix_time::seconds( static_cast<long int>(days * 24 * 3600) );
addTStep( step );
}