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

Support Recognizing UDAs in WELTARG Keyword

Browse Source 
This commit extends the set of supported UDQ enumators to include
those of the WELTARG keyword.  This is in preparation of adding
restart file support for such cases.
This commit is contained in:
Bård Skaflestad 2022-04-22 14:46:43 +02:00
parent f467ed7251
commit f4fde15e67
3 changed files with 74 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/input/eclipse/Schedule/UDQ/UDQEnums.hpp
View File

@ -162,13 +162,23 @@ enum class UDAControl {
GCONINJE_RESV_MAX_RATE,
GCONINJE_TARGET_REINJ_FRACTION,
GCONINJE_TARGET_VOID_FRACTION,
//
WELTARG_ORAT,
WELTARG_WRAT,
WELTARG_GRAT,
WELTARG_LRAT,
WELTARG_RESV,
WELTARG_BHP,
WELTARG_THP,
WELTARG_LIFT,
};
enum class UDAKeyword {
WCONPROD,
WCONINJE,
WELTARG,
GCONINJE,
GCONPROD
GCONPROD,
};
namespace UDQ {

50
src/opm/input/eclipse/Schedule/UDQ/UDQEnums.cpp
View File

@ -419,14 +419,30 @@ UDAKeyword keyword(const UDAControl control)
{UDAControl::WCONPROD_RESV, UDAKeyword::WCONPROD},
{UDAControl::WCONPROD_BHP, UDAKeyword::WCONPROD},
{UDAControl::WCONPROD_THP, UDAKeyword::WCONPROD},
// --------------------------------------------------------------
{UDAControl::WCONINJE_RATE, UDAKeyword::WCONINJE},
{UDAControl::WCONINJE_RESV, UDAKeyword::WCONINJE},
{UDAControl::WCONINJE_BHP, UDAKeyword::WCONINJE},
{UDAControl::WCONINJE_THP, UDAKeyword::WCONINJE},
// --------------------------------------------------------------
{UDAControl::WELTARG_ORAT, UDAKeyword::WELTARG},
{UDAControl::WELTARG_WRAT, UDAKeyword::WELTARG},
{UDAControl::WELTARG_GRAT, UDAKeyword::WELTARG},
{UDAControl::WELTARG_LRAT, UDAKeyword::WELTARG},
{UDAControl::WELTARG_RESV, UDAKeyword::WELTARG},
{UDAControl::WELTARG_BHP, UDAKeyword::WELTARG},
{UDAControl::WELTARG_THP, UDAKeyword::WELTARG},
{UDAControl::WELTARG_LIFT, UDAKeyword::WELTARG},
// --------------------------------------------------------------
{UDAControl::GCONPROD_OIL_TARGET, UDAKeyword::GCONPROD},
{UDAControl::GCONPROD_WATER_TARGET, UDAKeyword::GCONPROD},
{UDAControl::GCONPROD_GAS_TARGET, UDAKeyword::GCONPROD},
{UDAControl::GCONPROD_LIQUID_TARGET, UDAKeyword::GCONPROD},
// --------------------------------------------------------------
{UDAControl::GCONINJE_SURFACE_MAX_RATE, UDAKeyword::GCONINJE},
{UDAControl::GCONINJE_RESV_MAX_RATE, UDAKeyword::GCONINJE},
{UDAControl::GCONINJE_TARGET_REINJ_FRACTION, UDAKeyword::GCONINJE},
@ -466,6 +482,14 @@ int udaCode(const UDAControl control)
{UDAControl::GCONINJE_TARGET_VOID_FRACTION, 600'017}, // Voidage replacement fraction
// --------------------------------------------------------------
{UDAControl::WELTARG_ORAT, 16},
{UDAControl::WELTARG_WRAT, 100'016},
{UDAControl::WELTARG_GRAT, 200'016},
{UDAControl::WELTARG_LRAT, 300'016},
{UDAControl::WELTARG_RESV, 400'016},
{UDAControl::WELTARG_BHP, 500'016},
{UDAControl::WELTARG_THP, 600'016},
{UDAControl::WELTARG_LIFT, 1'000'016},
};
return lookup_control_map_value(c2uda, control);
@ -549,8 +573,14 @@ UDAControl udaControl(const int uda_code)
case 500'017: return UDAControl::GCONINJE_TARGET_REINJ_FRACTION;
case 600'017: return UDAControl::GCONINJE_TARGET_VOID_FRACTION;
case 999'999:
throw std::logic_error("UDA code 999999 is ambiguous");
case 16: return UDAControl::WELTARG_ORAT;
case 100'016: return UDAControl::WELTARG_WRAT;
case 200'016: return UDAControl::WELTARG_GRAT;
case 300'016: return UDAControl::WELTARG_LRAT;
case 400'016: return UDAControl::WELTARG_RESV;
case 500'016: return UDAControl::WELTARG_BHP;
case 600'016: return UDAControl::WELTARG_THP;
case 1'000'016: return UDAControl::WELTARG_LIFT;
}
throw std::logic_error {
@ -618,11 +648,21 @@ std::string controlName(const UDAControl control)
case UDAControl::WCONINJE_THP:
return "WCONINJE_THP";
default:
throw std::logic_error("What the ??");
case UDAControl::WELTARG_ORAT: return "WELTARG_ORAT";
case UDAControl::WELTARG_WRAT: return "WELTARG_WRAT";
case UDAControl::WELTARG_GRAT: return "WELTARG_GRAT";
case UDAControl::WELTARG_LRAT: return "WELTARG_LRAT";
case UDAControl::WELTARG_RESV: return "WELTARG_RESV";
case UDAControl::WELTARG_BHP: return "WELTARG_BHP";
case UDAControl::WELTARG_THP: return "WELTARG_THP";
case UDAControl::WELTARG_LIFT: return "WELTARG_LIFT";
}
throw std::logic_error {
"Unknown UDA control keyword '" +
std::to_string(static_cast<int>(control)) + '\''
};
}
}} // Opm::UDQ

18
tests/parser/UDQTests.cpp
View File

@ -1570,6 +1570,15 @@ BOOST_AUTO_TEST_CASE(UDQControl_Keyword)
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::GCONINJE_TARGET_REINJ_FRACTION) == UDAKeyword::GCONINJE, "GCONINJE_TARGET_REINJ_FRACTION control keyword must be GCONINJE");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::GCONINJE_TARGET_VOID_FRACTION) == UDAKeyword::GCONINJE, "GCONINJE_TARGET_VOID_FRACTION control keyword must be GCONINJE");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::WELTARG_ORAT) == UDAKeyword::WELTARG, "WELTARG_ORAT control keyword must be WELTARG");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::WELTARG_WRAT) == UDAKeyword::WELTARG, "WELTARG_WRAT control keyword must be WELTARG");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::WELTARG_GRAT) == UDAKeyword::WELTARG, "WELTARG_GRAT control keyword must be WELTARG");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::WELTARG_LRAT) == UDAKeyword::WELTARG, "WELTARG_LRAT control keyword must be WELTARG");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::WELTARG_RESV) == UDAKeyword::WELTARG, "WELTARG_RESV control keyword must be WELTARG");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::WELTARG_BHP) == UDAKeyword::WELTARG, "WELTARG_BHP control keyword must be WELTARG");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::WELTARG_THP) == UDAKeyword::WELTARG, "WELTARG_THP control keyword must be WELTARG");
BOOST_CHECK_MESSAGE(UDQ::keyword(UDAControl::WELTARG_LIFT) == UDAKeyword::WELTARG, "WELTARG_LIFT control keyword must be WELTARG");
BOOST_CHECK_THROW(UDQ::keyword(static_cast<UDAControl>(1729)),
std::logic_error);
}
@ -1599,6 +1608,15 @@ BOOST_AUTO_TEST_CASE(UDAControl_IUAD_0)
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::GCONINJE_TARGET_REINJ_FRACTION), 500'017);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::GCONINJE_TARGET_VOID_FRACTION), 600'017);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::WELTARG_ORAT), 16);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::WELTARG_WRAT), 100'016);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::WELTARG_GRAT), 200'016);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::WELTARG_LRAT), 300'016);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::WELTARG_RESV), 400'016);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::WELTARG_BHP), 500'016);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::WELTARG_THP), 600'016);
BOOST_CHECK_EQUAL(UDQ::udaCode(UDAControl::WELTARG_LIFT), 1'000'016);
BOOST_CHECK_THROW(UDQ::udaCode(static_cast<UDAControl>(1729)),
std::logic_error);
}