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

Generate Units of Measurements for WELTARG UDAs

Browse Source 
In preparation of loading such UDAs from the restart file.
This commit is contained in:
Bård Skaflestad 2022-04-26 14:32:08 +02:00
parent 25ede43bf7
commit 14a6a5a4c3
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GenerateKeywords.cmake
View File

@ -11,6 +11,7 @@ set(genkw_SOURCES src/opm/json/JsonObject.cpp
src/opm/input/eclipse/Deck/DeckOutput.cpp src/opm/input/eclipse/Deck/DeckOutput.cpp
src/opm/input/eclipse/Generator/KeywordGenerator.cpp src/opm/input/eclipse/Generator/KeywordGenerator.cpp
src/opm/input/eclipse/Generator/KeywordLoader.cpp src/opm/input/eclipse/Generator/KeywordLoader.cpp
src/opm/input/eclipse/Schedule/UDQ/UDQEnums.cpp
src/opm/input/eclipse/Parser/ErrorGuard.cpp src/opm/input/eclipse/Parser/ErrorGuard.cpp
src/opm/input/eclipse/Parser/ParseContext.cpp src/opm/input/eclipse/Parser/ParseContext.cpp
src/opm/input/eclipse/Parser/ParserEnums.cpp src/opm/input/eclipse/Parser/ParserEnums.cpp

21
src/opm/input/eclipse/Units/UnitSystem.cpp
View File

@ -1308,11 +1308,11 @@ namespace {
} }
Dimension UnitSystem::uda_dim(UDAControl control) const { Dimension UnitSystem::uda_dim(const UDAControl control) const {
switch (control) { switch (control) {
case UDAControl::WCONPROD_ORAT: case UDAControl::WCONPROD_ORAT: case UDAControl::WELTARG_ORAT:
case UDAControl::WCONPROD_WRAT: case UDAControl::WCONPROD_WRAT: case UDAControl::WELTARG_WRAT:
case UDAControl::WCONPROD_LRAT: case UDAControl::WCONPROD_LRAT: case UDAControl::WELTARG_LRAT:
case UDAControl::GCONPROD_OIL_TARGET: case UDAControl::GCONPROD_OIL_TARGET:
case UDAControl::GCONPROD_WATER_TARGET: case UDAControl::GCONPROD_WATER_TARGET:
case UDAControl::GCONPROD_LIQUID_TARGET: case UDAControl::GCONPROD_LIQUID_TARGET:
@ -1320,16 +1320,17 @@ namespace {
case UDAControl::WCONINJE_RESV: case UDAControl::WCONINJE_RESV:
case UDAControl::WCONPROD_RESV: case UDAControl::WCONPROD_RESV:
case UDAControl::WELTARG_RESV:
case UDAControl::GCONINJE_RESV_MAX_RATE: case UDAControl::GCONINJE_RESV_MAX_RATE:
return this->getDimension(UnitSystem::measure::geometric_volume_rate); return this->getDimension(UnitSystem::measure::geometric_volume_rate);
case UDAControl::WCONPROD_GRAT: case UDAControl::WCONPROD_GRAT:
case UDAControl::WELTARG_GRAT:
return this->getDimension(UnitSystem::measure::gas_surface_rate); return this->getDimension(UnitSystem::measure::gas_surface_rate);
case UDAControl::WCONPROD_BHP: case UDAControl::WCONPROD_BHP: case UDAControl::WCONPROD_THP:
case UDAControl::WCONPROD_THP: case UDAControl::WCONINJE_BHP: case UDAControl::WCONINJE_THP:
case UDAControl::WCONINJE_THP: case UDAControl::WELTARG_BHP: case UDAControl::WELTARG_THP:
case UDAControl::WCONINJE_BHP:
return this->getDimension(UnitSystem::measure::pressure); return this->getDimension(UnitSystem::measure::pressure);
case UDAControl::GCONINJE_TARGET_REINJ_FRACTION: case UDAControl::GCONINJE_TARGET_REINJ_FRACTION:
@ -1339,7 +1340,9 @@ namespace {
return this->getDimension(UnitSystem::measure::identity); return this->getDimension(UnitSystem::measure::identity);
default: default:
throw std::logic_error("No dimension"); throw std::logic_error {
"No dimension for UDA control '" + UDQ::controlName(control) + '\''
};
} }
} }