From 6119f11a7a23fab7bb129219223353303f752b12 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 25 May 2021 12:37:28 +0200 Subject: [PATCH] cosmetics: do not indent for namespace --- opm/simulators/wells/GasLiftStage2.hpp | 300 ++++++++++++------------- 1 file changed, 150 insertions(+), 150 deletions(-) diff --git a/opm/simulators/wells/GasLiftStage2.hpp b/opm/simulators/wells/GasLiftStage2.hpp index 886369f04..7a96058c7 100644 --- a/opm/simulators/wells/GasLiftStage2.hpp +++ b/opm/simulators/wells/GasLiftStage2.hpp @@ -45,168 +45,168 @@ class Schedule; class WellInterfaceGeneric; class WellState; - class GasLiftStage2 { - using GasLiftSingleWell = GasLiftSingleWellGeneric; - using GLiftOptWells = std::map>; - using GLiftProdWells = std::map; - using GLiftWellStateMap = std::map>; - using GradPair = std::pair; - using GradPairItr = std::vector::iterator; - using GradInfo = typename GasLiftSingleWellGeneric::GradInfo; - using GradMap = std::map; - using MPIComm = typename Dune::MPIHelper::MPICommunicator; + class GasLiftStage2 { + using GasLiftSingleWell = GasLiftSingleWellGeneric; + using GLiftOptWells = std::map>; + using GLiftProdWells = std::map; + using GLiftWellStateMap = std::map>; + using GradPair = std::pair; + using GradPairItr = std::vector::iterator; + using GradInfo = typename GasLiftSingleWellGeneric::GradInfo; + using GradMap = std::map; + using MPIComm = typename Dune::MPIHelper::MPICommunicator; #if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 7) - using Communication = Dune::Communication; + using Communication = Dune::Communication; #else - using Communication = Dune::CollectiveCommunication; + using Communication = Dune::CollectiveCommunication; #endif - static constexpr int Water = BlackoilPhases::Aqua; - static constexpr int Oil = BlackoilPhases::Liquid; - static constexpr int Gas = BlackoilPhases::Vapour; - public: - GasLiftStage2( - const int report_step_idx, - const Communication& comm, - const Schedule& schedule, - const SummaryState& summary_state, - DeferredLogger &deferred_logger, - WellState &well_state, - GLiftProdWells &prod_wells, - GLiftOptWells &glift_wells, - GLiftWellStateMap &state_map - ); - void runOptimize(); - private: - void addOrRemoveALQincrement_( - GradMap &grad_map, const std::string& well_name, bool add); - std::optional calcIncOrDecGrad_( - const std::string name, const GasLiftSingleWell &gs_well, bool increase); - bool checkRateAlreadyLimited_(GasLiftWellState &state, bool increase); - GradInfo deleteDecGradItem_(const std::string &name); - GradInfo deleteIncGradItem_(const std::string &name); - GradInfo deleteGrad_(const std::string &name, bool increase); - void displayDebugMessage_(const std::string &msg); - void displayDebugMessage2B_(const std::string &msg); - void displayDebugMessage_(const std::string &msg, const std::string &group_name); - void displayWarning_(const std::string &msg, const std::string &group_name); - void displayWarning_(const std::string &msg); - std::tuple getCurrentGroupRates_( - const Group &group); - std::array getCurrentGroupRatesRecursive_( - const Group &group); - std::tuple getCurrentWellRates_( - const std::string &well_name, const std::string &group_name); - std::vector getGroupGliftWells_( - const Group &group); - void getGroupGliftWellsRecursive_( - const Group &group, std::vector &wells); - std::pair getStdWellRates_(const WellInterfaceGeneric &well); - void optimizeGroup_(const Group &group); - void optimizeGroupsRecursive_(const Group &group); - void recalculateGradientAndUpdateData_( - GradPairItr &grad_itr, bool increase, - std::vector &grads, std::vector &other_grads); - void redistributeALQ_( - std::vector &wells, const Group &group, - std::vector &inc_grads, std::vector &dec_grads); - void removeSurplusALQ_( - const Group &group, - std::vector &inc_grads, std::vector &dec_grads); - void saveGrad_(GradMap &map, const std::string &name, GradInfo &grad); - void saveDecGrad_(const std::string &name, GradInfo &grad); - void saveIncGrad_(const std::string &name, GradInfo &grad); - void sortGradients_(std::vector &grads); - std::optional updateGrad_( - const std::string &name, GradInfo &grad, bool increase); - void updateGradVector_( - const std::string &name, std::vector &grads, double grad); - void mpiSyncGlobalGradVector_(std::vector &grads_global) const; - void mpiSyncLocalToGlobalGradVector_( - const std::vector &grads_local, - std::vector &grads_global) const; + static constexpr int Water = BlackoilPhases::Aqua; + static constexpr int Oil = BlackoilPhases::Liquid; + static constexpr int Gas = BlackoilPhases::Vapour; + public: + GasLiftStage2( + const int report_step_idx, + const Communication& comm, + const Schedule& schedule, + const SummaryState& summary_state, + DeferredLogger &deferred_logger, + WellState &well_state, + GLiftProdWells &prod_wells, + GLiftOptWells &glift_wells, + GLiftWellStateMap &state_map + ); + void runOptimize(); + private: + void addOrRemoveALQincrement_( + GradMap &grad_map, const std::string& well_name, bool add); + std::optional calcIncOrDecGrad_( + const std::string name, const GasLiftSingleWell &gs_well, bool increase); + bool checkRateAlreadyLimited_(GasLiftWellState &state, bool increase); + GradInfo deleteDecGradItem_(const std::string &name); + GradInfo deleteIncGradItem_(const std::string &name); + GradInfo deleteGrad_(const std::string &name, bool increase); + void displayDebugMessage_(const std::string &msg); + void displayDebugMessage2B_(const std::string &msg); + void displayDebugMessage_(const std::string &msg, const std::string &group_name); + void displayWarning_(const std::string &msg, const std::string &group_name); + void displayWarning_(const std::string &msg); + std::tuple getCurrentGroupRates_( + const Group &group); + std::array getCurrentGroupRatesRecursive_( + const Group &group); + std::tuple getCurrentWellRates_( + const std::string &well_name, const std::string &group_name); + std::vector getGroupGliftWells_( + const Group &group); + void getGroupGliftWellsRecursive_( + const Group &group, std::vector &wells); + std::pair getStdWellRates_(const WellInterfaceGeneric &well); + void optimizeGroup_(const Group &group); + void optimizeGroupsRecursive_(const Group &group); + void recalculateGradientAndUpdateData_( + GradPairItr &grad_itr, bool increase, + std::vector &grads, std::vector &other_grads); + void redistributeALQ_( + std::vector &wells, const Group &group, + std::vector &inc_grads, std::vector &dec_grads); + void removeSurplusALQ_( + const Group &group, + std::vector &inc_grads, std::vector &dec_grads); + void saveGrad_(GradMap &map, const std::string &name, GradInfo &grad); + void saveDecGrad_(const std::string &name, GradInfo &grad); + void saveIncGrad_(const std::string &name, GradInfo &grad); + void sortGradients_(std::vector &grads); + std::optional updateGrad_( + const std::string &name, GradInfo &grad, bool increase); + void updateGradVector_( + const std::string &name, std::vector &grads, double grad); + void mpiSyncGlobalGradVector_(std::vector &grads_global) const; + void mpiSyncLocalToGlobalGradVector_( + const std::vector &grads_local, + std::vector &grads_global) const; - DeferredLogger &deferred_logger_; - WellState &well_state_; - GLiftProdWells &prod_wells_; - GLiftOptWells &stage1_wells_; - GLiftWellStateMap &well_state_map_; + DeferredLogger &deferred_logger_; + WellState &well_state_; + GLiftProdWells &prod_wells_; + GLiftOptWells &stage1_wells_; + GLiftWellStateMap &well_state_map_; - int report_step_idx_; - const SummaryState &summary_state_; - const Schedule &schedule_; - const GasLiftOpt& glo_; - const Communication &comm_; - GradMap inc_grads_; - GradMap dec_grads_; - bool debug_; - static constexpr int max_iterations_ = 1000; - //int time_step_idx_; + int report_step_idx_; + const SummaryState &summary_state_; + const Schedule &schedule_; + const GasLiftOpt& glo_; + const Communication &comm_; + GradMap inc_grads_; + GradMap dec_grads_; + bool debug_; + static constexpr int max_iterations_ = 1000; + //int time_step_idx_; - struct OptimizeState { - OptimizeState( GasLiftStage2 &parent_, const Group &group_ ) : - parent{parent_}, - group{group_}, - it{0} - {} - GasLiftStage2 &parent; - const Group &group; - int it; + struct OptimizeState { + OptimizeState( GasLiftStage2 &parent_, const Group &group_ ) : + parent{parent_}, + group{group_}, + it{0} + {} + GasLiftStage2 &parent; + const Group &group; + int it; - void calculateEcoGradients(std::vector &wells, - std::vector &inc_grads, std::vector &dec_grads); - bool checkAtLeastTwoWells(std::vector &wells); - void debugShowIterationInfo(); - std::pair,std::optional> - getEcoGradients( - std::vector &inc_grads, std::vector &dec_grads); - void recalculateGradients( - std::vector &inc_grads, std::vector &dec_grads, - GradPairItr &min_dec_grad_itr, GradPairItr &max_inc_grad_itr); - void redistributeALQ( GradPairItr &min_dec_grad, GradPairItr &max_inc_grad); + void calculateEcoGradients(std::vector &wells, + std::vector &inc_grads, std::vector &dec_grads); + bool checkAtLeastTwoWells(std::vector &wells); + void debugShowIterationInfo(); + std::pair,std::optional> + getEcoGradients( + std::vector &inc_grads, std::vector &dec_grads); + void recalculateGradients( + std::vector &inc_grads, std::vector &dec_grads, + GradPairItr &min_dec_grad_itr, GradPairItr &max_inc_grad_itr); + void redistributeALQ( GradPairItr &min_dec_grad, GradPairItr &max_inc_grad); - private: - void displayDebugMessage_(const std::string &msg); - void displayWarning_(const std::string &msg); + private: + void displayDebugMessage_(const std::string &msg); + void displayWarning_(const std::string &msg); - }; + }; - struct SurplusState { - SurplusState( GasLiftStage2 &parent_, const Group &group_, - double oil_rate_, double gas_rate_, double alq_, double min_eco_grad_, - double oil_target_, double gas_target_, - std::optional max_glift_) : - parent{parent_}, - group{group_}, - oil_rate{oil_rate_}, - gas_rate{gas_rate_}, - alq{alq_}, - min_eco_grad{min_eco_grad_}, - oil_target{oil_target_}, - gas_target{gas_target_}, - max_glift{max_glift_}, - it{0} - {} - GasLiftStage2 &parent; - const Group &group; - double oil_rate; - double gas_rate; - double alq; - const double min_eco_grad; - const double oil_target; - const double gas_target; - std::optional max_glift; - int it; + struct SurplusState { + SurplusState( GasLiftStage2 &parent_, const Group &group_, + double oil_rate_, double gas_rate_, double alq_, double min_eco_grad_, + double oil_target_, double gas_target_, + std::optional max_glift_) : + parent{parent_}, + group{group_}, + oil_rate{oil_rate_}, + gas_rate{gas_rate_}, + alq{alq_}, + min_eco_grad{min_eco_grad_}, + oil_target{oil_target_}, + gas_target{gas_target_}, + max_glift{max_glift_}, + it{0} + {} + GasLiftStage2 &parent; + const Group &group; + double oil_rate; + double gas_rate; + double alq; + const double min_eco_grad; + const double oil_target; + const double gas_target; + std::optional max_glift; + int it; - void addOrRemoveALQincrement( - GradMap &grad_map, const std::string& well_name, bool add); - bool checkALQlimit(); - bool checkEcoGradient(const std::string &well_name, double eco_grad); - bool checkGasTarget(); - bool checkOilTarget(); - void updateRates(const std::string &name); - }; - }; + void addOrRemoveALQincrement( + GradMap &grad_map, const std::string& well_name, bool add); + bool checkALQlimit(); + bool checkEcoGradient(const std::string &well_name, double eco_grad); + bool checkGasTarget(); + bool checkOilTarget(); + void updateRates(const std::string &name); + }; + }; } // namespace Opm