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

added changes to account for WSEGITER parameters to the Ecl-rst-file

Browse Source
This commit is contained in:
Jostein Alvestad 2020-09-02 10:06:19 +02:00
parent 772cc7b265
commit e8803220ca
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/output/eclipse/InteHEAD.hpp
View File

@ -86,6 +86,7 @@ namespace RestartIO {
int litmin;
int mxwsit;
int mxwpit;
int wseg_mx_rst;
};
struct Group {

2
opm/output/eclipse/VectorItems/doubhead.hpp
View File

@ -59,6 +59,8 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
TrgFIP = 101,
TrgSFT = 102,
GRpar_damp = 144, // Guiderate parameter damping factor
WsegRedFac = 145, // WSEGITER parameter (item 3) Reduction factor (F_R)
WsegIncFac = 146, // WSEGITER parameter (item 4) Increas factor (F_I)
UdqPar_2 = 212, // UDQPARAM item number 2 (Permitted range (+/-) of user-defined quantities)
UdqPar_3 = 213, // UDQPARAM item number 3 (Value given to undefined elements when outputting data)
UdqPar_4 = 214, // UDQPARAM item number 4 (fractional equality tolerance used in ==, <= etc. functions)

1
src/opm/output/eclipse/CreateInteHead.cpp
View File

@ -302,6 +302,7 @@ namespace {
tuning.LITMIN,
tuning.MXWSIT,
tuning.MXWPIT,
tuning.WSEG_MAX_RESTART
};
}

12
src/opm/output/eclipse/DoubHEAD.cpp
View File

@ -216,8 +216,8 @@ enum Index : std::vector<double>::size_type {
dh_142 = 142,
dh_143 = 143,
grpar_dmp = VI::doubhead::GRpar_damp,
dh_145 = 145,
dh_146 = 146,
wseg_red_fac = VI::doubhead::WsegRedFac,
wseg_inc_fac = VI::doubhead::WsegIncFac,
dh_147 = 147,
dh_148 = 148,
dh_149 = 149,
@ -426,8 +426,8 @@ Opm::RestartIO::DoubHEAD::DoubHEAD()
this->data_[Index::dh_141] = 1.013;
this->data_[Index::dh_142] = 0.0;
this->data_[Index::dh_143] = 1.0;
this->data_[Index::dh_145] = 0.3;
this->data_[Index::dh_146] = 2.0;
//this->data_[Index::wseg_red_fac] = 0.3;
//this->data_[Index::wseg_inc_fac] = 2.0;
this->data_[Index::dh_147] = 0.0;
this->data_[Index::dh_148] = 0.0;
this->data_[Index::dh_149] = 0.0;
@ -568,6 +568,10 @@ Opm::RestartIO::DoubHEAD::tuningParameters(const Tuning& tuning,
this->data_[Index::DdpLim] = tuning.DDPLIM;
this->data_[Index::DdsLim] = tuning.DDSLIM;
// WSEGITER - data
this->data_[Index::wseg_red_fac] = tuning.WSEG_REDUCTION_FACTOR;
this->data_[Index::wseg_inc_fac] = tuning.WSEG_INCREASE_FACTOR;
return *this;
}

3
src/opm/output/eclipse/InteHEAD.cpp
View File

@ -228,7 +228,7 @@ enum index : std::vector<int>::size_type {
ih_205 = 205 , // 0
IHOURZ = VI::intehead::IHOURZ,
IMINTS = VI::intehead::IMINTS,
WSEGITER_I2 = VI::intehead::IMINTS,
WSEGITER_I2 = VI::intehead::WSEGITR_IT2,
ih_209 = 209 , // 0
ih_210 = 210 , // 0
ih_211 = 211 , // 0
@ -608,6 +608,7 @@ Opm::RestartIO::InteHEAD::tuningParam(const TuningPar& tunpar)
this->data_[LITMIN] = tunpar.litmin;
this->data_[MXWSIT] = tunpar.mxwsit;
this->data_[MXWPIT] = tunpar.mxwpit;
this->data_[WSEGITER_I2] = tunpar.wseg_mx_rst;
return *this;
}