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

efficiency factor should not be part of productiondata.

Browse Source 
It applies to both the injection wells and production wells in the group.
This commit is contained in:
Kai Bao
2016-10-18 12:08:18 +02:00
parent 17ff5847b4
commit 85b47dffad
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opm/parser/eclipse/EclipseState/Schedule/Group.cpp
View File

@@ -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);
}
/*****************************************************************/

4
opm/parser/eclipse/EclipseState/Schedule/Group.hpp
View File

@@ -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<std::shared_ptr< const WellSet > > m_wells;
DynamicState<int> m_isProductionGroup;
DynamicState<int> m_isInjectionGroup;
DynamicState<double> m_efficiencyFactor;
DynamicState<int> m_transferEfficiencyFactor;
};
}