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

add equality operator and a default constructor to EquilRecord

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-11-29 09:50:15 +01:00
parent 850c91f047
commit d532f861ac
2 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp
View File

@@ -19,9 +19,13 @@ namespace Opm {
bool wetGasInitConstantRv() const;
int initializationTargetAccuracy() const;
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);
private:
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);
bool operator==(const EquilRecord& data) const;
private:
double datum_depth;
double datum_depth_ps;
double water_oil_contact_depth;

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

@@ -3,6 +3,11 @@
namespace Opm {
EquilRecord::EquilRecord() :
EquilRecord(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, false, false, 0.0)
{
}
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) :
datum_depth(datum_depth_arg),
datum_depth_ps(datum_depth_pc_arg),
@@ -51,6 +56,20 @@ namespace Opm {
return this->init_target_accuracy;
}
bool EquilRecord::operator==(const EquilRecord& data) const {
return datum_depth == data.datum_depth &&
datum_depth_ps == data.datum_depth_ps &&
water_oil_contact_depth == data.water_oil_contact_depth &&
water_oil_contact_capillary_pressure ==
data.water_oil_contact_capillary_pressure &&
data.gas_oil_contact_depth == data.gas_oil_contact_depth &&
gas_oil_contact_capillary_pressure ==
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;
}
/* */
Equil::Equil( const DeckKeyword& keyword )