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 pull request #5059 from akva2/janitoring

Browse Source 
GroupEconomicLimitsChecker: cleanup includes
This commit is contained in:
Bård Skaflestad
2023-12-12 16:45:39 +01:00
committed by GitHub
parent df0daa1a16 6e21bdb35b
commit a88214460c
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
opm/simulators/wells/GroupEconomicLimitsChecker.cpp
View File

@@ -18,15 +18,24 @@
*/ */
#include <config.h> #include <config.h>
#include <opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.hpp>
#include <opm/simulators/wells/GroupEconomicLimitsChecker.hpp> #include <opm/simulators/wells/GroupEconomicLimitsChecker.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Well/WellTestConfig.hpp> #include <opm/input/eclipse/Schedule/Well/WellTestConfig.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
#include <opm/simulators/wells/BlackoilWellModelGeneric.hpp>
#include <opm/simulators/wells/WellGroupHelpers.hpp>
#include <fmt/format.h> #include <fmt/format.h>
#include <ctime> #include <ctime>
#include <chrono> #include <chrono>
#include <iostream> #include <sstream>
#include <iomanip> #include <iomanip>
namespace Opm { namespace Opm {
@@ -325,7 +334,7 @@ addPrintMessage(const std::string &msg, const double value, const double limit,
bool bool
GroupEconomicLimitsChecker:: GroupEconomicLimitsChecker::
closeWellsRecursive(Group group, int level) closeWellsRecursive(const Group& group, int level)
{ {
bool wells_closed = false; bool wells_closed = false;

22
opm/simulators/wells/GroupEconomicLimitsChecker.hpp
View File

@@ -20,21 +20,23 @@
#ifndef OPM_GROUP_ECONOMIC_LIMITS_CHECKER_HEADER_INCLUDED #ifndef OPM_GROUP_ECONOMIC_LIMITS_CHECKER_HEADER_INCLUDED
#define OPM_GROUP_ECONOMIC_LIMITS_CHECKER_HEADER_INCLUDED #define OPM_GROUP_ECONOMIC_LIMITS_CHECKER_HEADER_INCLUDED
#include <opm/simulators/wells/BlackoilWellModelGeneric.hpp>
#include <opm/simulators/utils/DeferredLogger.hpp>
#include <opm/simulators/wells/WellGroupHelpers.hpp>
#include <opm/simulators/wells/WellState.hpp>
#include <opm/core/props/BlackoilPhases.hpp> #include <opm/core/props/BlackoilPhases.hpp>
#include <opm/input/eclipse/Schedule/Group/Group.hpp>
#include <opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.hpp> #include <opm/input/eclipse/Schedule/Group/GroupEconProductionLimits.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/Units/UnitSystem.hpp> #include <opm/input/eclipse/Units/UnitSystem.hpp>
#include <ctime> #include <array>
#include <map>
#include <string>
namespace Opm namespace Opm
{ {
class BlackoilWellModelGeneric;
class DeferredLogger;
class Group;
class WellState;
class WellTestState;
class GroupEconomicLimitsChecker class GroupEconomicLimitsChecker
{ {
public: public:
@@ -63,7 +65,7 @@ namespace Opm
private: private:
void displayDebugMessage(const std::string &msg) const; void displayDebugMessage(const std::string &msg) const;
void addPrintMessage(const std::string &msg, const double value, const double limit, const UnitSystem::measure measure); void addPrintMessage(const std::string &msg, const double value, const double limit, const UnitSystem::measure measure);
bool closeWellsRecursive(Group group, int level=0); bool closeWellsRecursive(const Group& group, int level = 0);
void throwNotImplementedError(const std::string &error) const; void throwNotImplementedError(const std::string &error) const;
const BlackoilWellModelGeneric &well_model_; const BlackoilWellModelGeneric &well_model_;
const Group &group_; const Group &group_;
@@ -77,7 +79,7 @@ namespace Opm
const Schedule &schedule_; const Schedule &schedule_;
GroupEconProductionLimits::GEconGroupProp gecon_props_; GroupEconProductionLimits::GEconGroupProp gecon_props_;
bool debug_ = true; bool debug_ = true;
double production_rates_[NUM_PHASES]; std::array<double,NUM_PHASES> production_rates_;
std::map<int, BlackoilPhases::PhaseIndex> phase_idx_map_ = { std::map<int, BlackoilPhases::PhaseIndex> phase_idx_map_ = {
{0, BlackoilPhases::Liquid}, {0, BlackoilPhases::Liquid},
{1, BlackoilPhases::Vapour}, {1, BlackoilPhases::Vapour},