correction to SWEL for prediction mode wells
This commit is contained in:
@@ -40,7 +40,6 @@ namespace Opm {
|
|||||||
|
|
||||||
explicit Regdims(const Deck& deck);
|
explicit Regdims(const Deck& deck);
|
||||||
|
|
||||||
#if 0
|
|
||||||
Regdims(size_t ntfip , size_t nmfipr , size_t nrfregr , size_t ntfreg , size_t nplmix) :
|
Regdims(size_t ntfip , size_t nmfipr , size_t nrfregr , size_t ntfreg , size_t nplmix) :
|
||||||
m_NTFIP( ntfip ),
|
m_NTFIP( ntfip ),
|
||||||
m_NMFIPR( nmfipr ),
|
m_NMFIPR( nmfipr ),
|
||||||
@@ -48,7 +47,6 @@ namespace Opm {
|
|||||||
m_NTFREG( ntfreg ),
|
m_NTFREG( ntfreg ),
|
||||||
m_NPLMIX( nplmix )
|
m_NPLMIX( nplmix )
|
||||||
{}
|
{}
|
||||||
#endif
|
|
||||||
|
|
||||||
static Regdims serializeObject()
|
static Regdims serializeObject()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -613,11 +613,6 @@ namespace {
|
|||||||
sWell[Ix::ResVRateTarget] = getRateLimit(units, M::rate, pc.resv_rate);
|
sWell[Ix::ResVRateTarget] = getRateLimit(units, M::rate, pc.resv_rate);
|
||||||
//}
|
//}
|
||||||
}
|
}
|
||||||
if ((well.getStatus() == Opm::Well::Status::SHUT)) {
|
|
||||||
sWell[Ix::OilRateTarget] = 0.;
|
|
||||||
sWell[Ix::WatRateTarget] = 0.;
|
|
||||||
sWell[Ix::GasRateTarget] = 0.;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (well.isInjector()) {
|
else if (well.isInjector()) {
|
||||||
const auto& ic = well.injectionControls(smry);
|
const auto& ic = well.injectionControls(smry);
|
||||||
|
|||||||
@@ -760,9 +760,9 @@ BOOST_AUTO_TEST_CASE (Declared_Well_Data)
|
|||||||
const auto i1 = 4*ih_8.nswelz;
|
const auto i1 = 4*ih_8.nswelz;
|
||||||
|
|
||||||
const auto& swell = awd.getSWell();
|
const auto& swell = awd.getSWell();
|
||||||
BOOST_CHECK_CLOSE(swell[i1 + Ix::OilRateTarget], 0.0f, 1.0e-7f);
|
BOOST_CHECK_CLOSE(swell[i1 + Ix::OilRateTarget], 20000.0f, 1.0e-7f);
|
||||||
BOOST_CHECK_CLOSE(swell[i1 + Ix::WatRateTarget], 0.0f, 1.0e-7f);
|
BOOST_CHECK_CLOSE(swell[i1 + Ix::WatRateTarget], 1.0e+20f, 1.0e-7f);
|
||||||
BOOST_CHECK_CLOSE(swell[i1 + Ix::GasRateTarget], 0.0f, 1.0e-7f);
|
BOOST_CHECK_CLOSE(swell[i1 + Ix::GasRateTarget], 1.0e+20f, 1.0e-7f);
|
||||||
|
|
||||||
|
|
||||||
const auto i2 = 5*ih_8.nswelz;
|
const auto i2 = 5*ih_8.nswelz;
|
||||||
|
|||||||
Reference in New Issue
Block a user