OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/opm/master' into format-step-output

Browse Source
This commit is contained in:
Liu Ming
2016-06-21 09:28:30 +08:00
parent 0dfe945f25 82d0c81c13
commit 922490a9d8
10 changed files with 73 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opm/autodiff/SimulatorBase_impl.hpp
View File

@@ -264,14 +264,14 @@ namespace Opm
}
namespace SimFIBODetails {
typedef std::unordered_map<std::string, WellConstPtr> WellMap;
typedef std::unordered_map<std::string, const Well* > WellMap;
inline WellMap
mapWells(const std::vector<WellConstPtr>& wells)
mapWells(const std::vector< const Well* >& wells)
{
WellMap wmap;
for (std::vector<WellConstPtr>::const_iterator
for (std::vector< const Well* >::const_iterator
w = wells.begin(), e = wells.end();
w != e; ++w)
{
@@ -313,7 +313,7 @@ namespace Opm
WellMap::const_iterator i = wmap.find(name);
if (i != wmap.end()) {
WellConstPtr wp = i->second;
const Well* wp = i->second;
match = (wp->isProducer(step) &&
wp->getProductionProperties(step)
@@ -435,7 +435,7 @@ namespace Opm
{
typedef SimFIBODetails::WellMap WellMap;
const std::vector<WellConstPtr>& w_ecl = eclipse_state_->getSchedule()->getWells(step);
const auto w_ecl = eclipse_state_->getSchedule()->getWells(step);
const WellMap& wmap = SimFIBODetails::mapWells(w_ecl);
const std::vector<int>& resv_wells = SimFIBODetails::resvWells(wells, step, wmap);
@@ -513,7 +513,7 @@ namespace Opm
WellMap::const_iterator i = wmap.find(wells->name[*rp]);
if (i != wmap.end()) {
WellConstPtr wp = i->second;
const auto* wp = i->second;
const WellProductionProperties& p =
wp->getProductionProperties(step);
@@ -570,7 +570,7 @@ namespace Opm
if (!is_producer && wells->name[w] != 0) {
WellMap::const_iterator i = wmap.find(wells->name[w]);
if (i != wmap.end()) {
WellConstPtr wp = i->second;
const auto* wp = i->second;
const WellInjectionProperties& injector = wp->getInjectionProperties(step);
if (!injector.predictionMode) {
//History matching WCONINJEH