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

addition of entry in EQUIL keyword for water-gas ratio initialization

Browse Source
This commit is contained in:
Paul Egberts
2022-09-13 17:58:28 +02:00
parent feb695e1fd
commit f55bbefd18
4 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opm/input/eclipse/EclipseState/InitConfig/Equil.hpp
View File

@@ -18,10 +18,11 @@ namespace Opm {
bool liveOilInitConstantRs() const;
bool wetGasInitConstantRv() const;
int initializationTargetAccuracy() const;
bool humidGasInitConstantRvw() const;
EquilRecord();
EquilRecord( double datum_depth_arg, double datum_depth_pc_arg, double woc_depth, double woc_pc, double goc_depth, double goc_pc, bool live_oil_init, bool wet_gas_init, int target_accuracy);
EquilRecord( double datum_depth_arg, double datum_depth_pc_arg, double woc_depth, double woc_pc, double goc_depth, double goc_pc, bool live_oil_init, bool wet_gas_init, int target_accuracy, bool humid_gas_init);
bool operator==(const EquilRecord& data) const;
@@ -37,6 +38,7 @@ namespace Opm {
serializer(live_oil_init_proc);
serializer(wet_gas_init_proc);
serializer(init_target_accuracy);
serializer(humid_gas_init_proc);
}
private:
@@ -50,6 +52,7 @@ namespace Opm {
bool live_oil_init_proc;
bool wet_gas_init_proc;
int init_target_accuracy;
bool humid_gas_init_proc;
};
class Equil {

2
opm/input/eclipse/EclipseState/Tables/RvwvdTable.hpp
View File

@@ -1,5 +1,5 @@
/*
Copyright (C) 2014 by Andreas Lauser
Copyright (C) 2022 TNO
This file is part of the Open Porous Media project (OPM).

19
src/opm/input/eclipse/EclipseState/InitConfig/Equil.cpp
View File

@@ -15,7 +15,8 @@ namespace Opm {
0.0, 0.0,
false,
false,
0)
0,
false)
{}
EquilRecord::EquilRecord(const double datum_depth_arg, const double datum_depth_pc_arg,
@@ -23,7 +24,8 @@ namespace Opm {
const double goc_depth , const double goc_pc,
const bool live_oil_init ,
const bool wet_gas_init ,
const int target_accuracy)
const int target_accuracy,
const bool humid_gas_init )
: datum_depth(datum_depth_arg)
, datum_depth_ps(datum_depth_pc_arg)
, water_oil_contact_depth(woc_depth)
@@ -33,6 +35,7 @@ namespace Opm {
, live_oil_init_proc(live_oil_init)
, wet_gas_init_proc(wet_gas_init)
, init_target_accuracy(target_accuracy)
, humid_gas_init_proc(humid_gas_init)
{}
double EquilRecord::datumDepth() const {
@@ -71,6 +74,10 @@ namespace Opm {
return this->init_target_accuracy;
}
bool EquilRecord::humidGasInitConstantRvw() const {
return this->humid_gas_init_proc;
}
bool EquilRecord::operator==(const EquilRecord& data) const {
return datum_depth == data.datum_depth &&
datum_depth_ps == data.datum_depth_ps &&
@@ -82,7 +89,8 @@ namespace Opm {
data.gas_oil_contact_capillary_pressure &&
live_oil_init_proc == data.live_oil_init_proc &&
wet_gas_init_proc == data.wet_gas_init_proc &&
init_target_accuracy == data.init_target_accuracy;
init_target_accuracy == data.init_target_accuracy &&
humid_gas_init_proc == data.humid_gas_init_proc;
}
/* ----------------------------------------------------------------- */
@@ -101,18 +109,19 @@ namespace Opm {
const auto live_oil_init = record.getItem<EQUIL::BLACK_OIL_INIT>().get<int>(0) <= 0;
const auto wet_gas_init = record.getItem<EQUIL::BLACK_OIL_INIT_WG>().get<int>(0) <= 0;
const auto target_accuracy = record.getItem<EQUIL::OIP_INIT>().get<int>(0);
const auto humid_gas_init = record.getItem<EQUIL::BLACK_OIL_INIT_HG>().get<int>(0) <= 0;
this->m_records.emplace_back(datum_depth_arg, datum_depth_pc_arg,
woc_depth , woc_pc,
goc_depth , goc_pc,
live_oil_init, wet_gas_init, target_accuracy);
live_oil_init, wet_gas_init, target_accuracy, humid_gas_init);
}
}
Equil Equil::serializeObject()
{
Equil result;
result.m_records = {{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, true, false, 1}};
result.m_records = {{1.0, 2.0, 3.0, 4.0, 5.0, 6.0, true, false, 1, false}};
return result;
}

6
src/opm/input/eclipse/share/keywords/000_Eclipse100/E/EQUIL
View File

@@ -81,6 +81,12 @@
"name": "EQLOPT5",
"value_type": "INT",
"comment": "This item is ECLIPSE300 specific"
},
{
"item": 12,
"name": "BLACK_OIL_INIT_HG",
"value_type": "INT",
"default": 0
}
]
}