diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp index edfff3c79..488e81d22 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group.cpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Group.cpp @@ -35,9 +35,7 @@ namespace Opm { waterTarget( timeMap , INVALID_GROUP_RATE ), gasTarget( timeMap , INVALID_GROUP_RATE ), liquidTarget( timeMap , INVALID_GROUP_RATE ), - reservoirVolumeTarget( timeMap , INVALID_GROUP_RATE ), - efficiencyFactor( timeMap, INVALID_EFFICIENCY_FACTOR ), - transferEfficiencyFactor( timeMap, false ) + reservoirVolumeTarget( timeMap , INVALID_GROUP_RATE ) {} GroupInjection::InjectionData::InjectionData(const TimeMap& timeMap) : @@ -57,7 +55,9 @@ namespace Opm { m_production( timeMap ), m_wells( timeMap, std::make_shared< const WellSet >() ), m_isProductionGroup( timeMap, false), - m_isInjectionGroup( timeMap, false) + m_isInjectionGroup( timeMap, false), + m_efficiencyFactor( timeMap, 1.0), + m_transferEfficiencyFactor( timeMap, 1) { m_name = name_; m_creationTimeStep = creationTimeStep; @@ -248,20 +248,20 @@ namespace Opm { void Group::setGroupEfficiencyFactor(size_t time_step, double factor) { - m_production.efficiencyFactor.update(time_step , factor); + m_efficiencyFactor.update(time_step , factor); } double Group::getGroupEfficiencyFactor(size_t time_step) const { - return m_production.efficiencyFactor.get(time_step); + return m_efficiencyFactor.get(time_step); } void Group::setTransferGroupEfficiencyFactor(size_t time_step, bool transfer) { - m_production.transferEfficiencyFactor.update(time_step , transfer); + m_transferEfficiencyFactor.update(time_step , transfer); } bool Group::getTransferGroupEfficiencyFactor(size_t time_step) const { - return m_production.transferEfficiencyFactor.get(time_step); + return m_transferEfficiencyFactor.get(time_step); } /*****************************************************************/ diff --git a/opm/parser/eclipse/EclipseState/Schedule/Group.hpp b/opm/parser/eclipse/EclipseState/Schedule/Group.hpp index ef347d640..903e477c7 100644 --- a/opm/parser/eclipse/EclipseState/Schedule/Group.hpp +++ b/opm/parser/eclipse/EclipseState/Schedule/Group.hpp @@ -60,8 +60,6 @@ namespace Opm { DynamicState< double > gasTarget; DynamicState< double > liquidTarget; DynamicState< double > reservoirVolumeTarget; - DynamicState< double > efficiencyFactor; - DynamicState< int > transferEfficiencyFactor; }; } @@ -138,6 +136,8 @@ namespace Opm { DynamicState > m_wells; DynamicState m_isProductionGroup; DynamicState m_isInjectionGroup; + DynamicState m_efficiencyFactor; + DynamicState m_transferEfficiencyFactor; }; }