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

rebasing thermaloutput

Browse Source
This commit is contained in:
Paul Egberts
2021-02-22 18:47:13 +01:00
parent 3ff3d549ed
commit 42f426c7fd
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/wells/WellState.hpp
View File

@@ -44,7 +44,7 @@ namespace Opm
public: public:
typedef std::array< int, 3 > mapentry_t; typedef std::array< int, 3 > mapentry_t;
typedef std::map< std::string, mapentry_t > WellMapType; typedef std::map< std::string, mapentry_t > WellMapType;
/// Allocate and initialize if wells is non-null. /// Allocate and initialize if wells is non-null.
/// Also tries to give useful initial values to the bhp() and /// Also tries to give useful initial values to the bhp() and
/// wellRates() fields, depending on controls. The /// wellRates() fields, depending on controls. The

3
opm/simulators/wells/WellStateFullyImplicitBlackoil.hpp
View File

@@ -23,7 +23,6 @@
#include <opm/simulators/wells/WellState.hpp> #include <opm/simulators/wells/WellState.hpp>
#include <opm/core/props/BlackoilPhases.hpp> #include <opm/core/props/BlackoilPhases.hpp>
#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/Well.hpp>
@@ -85,7 +84,6 @@ namespace Opm
const SummaryState& summary_state, const SummaryState& summary_state,
const int globalNumberOfWells) const int globalNumberOfWells)
{ {
//Todo: make it reservoir perforation rates
std::vector<double> perforationRates; std::vector<double> perforationRates;
perforationRates = prevState->perfphaserates_; perforationRates = prevState->perfphaserates_;
// call init on base class // call init on base class
@@ -187,6 +185,7 @@ namespace Opm
perfRateBrine_.clear(); perfRateBrine_.clear();
perfRateBrine_.resize(nperf, 0.0); perfRateBrine_.resize(nperf, 0.0);
// intialize wells that have been there before // intialize wells that have been there before
// order may change so the mapping is based on the well name // order may change so the mapping is based on the well name
if (prevState && !prevState->wellMap().empty()) { if (prevState && !prevState->wellMap().empty()) {