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

Add name property to WellInjectionProperties

Browse Source
This commit is contained in:
Joakim Hove 2019-06-22 07:19:09 +02:00
parent 96b7797c4e
commit bf6a0335b0
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opm/parser/eclipse/EclipseState/Schedule/Well/Well2.cpp
View File

@ -108,7 +108,7 @@ Well2::Well2(const std::string& wname,
tracer_properties(std::make_shared<WellTracerProperties>()),
connections(std::make_shared<WellConnections>(headI, headJ)),
production(std::make_shared<WellProductionProperties>(wname)),
injection(std::make_shared<WellInjectionProperties>())
injection(std::make_shared<WellInjectionProperties>(wname))
{
auto p = std::make_shared<WellProductionProperties>(wname);
p->whistctl_cmode = whistctl_cmode;

5
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.cpp
View File

@ -30,8 +30,9 @@
namespace Opm {
WellInjectionProperties::WellInjectionProperties()
: injectorType(WellInjector::WATER),
WellInjectionProperties::WellInjectionProperties(const std::string& wname)
: name(wname),
injectorType(WellInjector::WATER),
controlMode(WellInjector::CMODE_UNDEFINED) {
surfaceInjectionRate=0.0;
reservoirInjectionRate=0.0;

3
src/opm/parser/eclipse/EclipseState/Schedule/Well/WellInjectionProperties.hpp
View File

@ -32,6 +32,7 @@ namespace Opm {
class SummaryState;
struct WellInjectionProperties {
std::string name;
double surfaceInjectionRate;
double reservoirInjectionRate;
double temperature;
@ -48,7 +49,7 @@ namespace Opm {
bool operator==(const WellInjectionProperties& other) const;
bool operator!=(const WellInjectionProperties& other) const;
WellInjectionProperties();
WellInjectionProperties(const std::string& wname);
void handleWELTARG(WellTarget::ControlModeEnum cmode, double newValue, double siFactorG, double siFactorL, double siFactorP);
void handleWCONINJE(const DeckRecord& record, bool availableForGroupControl, const std::string& well_name, const UnitSystem& unit_system);
void handleWCONINJH(const DeckRecord& record, bool is_producer, const std::string& well_name, const UnitSystem& unit_system);

2
tests/parser/WellTests.cpp
View File

@ -744,8 +744,8 @@ BOOST_AUTO_TEST_CASE(BHP_CMODE)
BOOST_AUTO_TEST_CASE(CMODE_DEFAULT) {
const Opm::WellInjectionProperties Iproperties;
const Opm::WellProductionProperties Pproperties("W");
const Opm::WellInjectionProperties Iproperties("W");
BOOST_CHECK_EQUAL( Pproperties.controlMode , Opm::WellProducer::CMODE_UNDEFINED );
BOOST_CHECK_EQUAL( Iproperties.controlMode , Opm::WellInjector::CMODE_UNDEFINED );