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

Remove unused query/switch code for GLO - it is always on

Browse Source
This commit is contained in:
Joakim Hove 2021-09-27 14:04:50 +02:00
parent edb2c4abb2
commit ef12186d78
5 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -387,8 +387,6 @@ namespace Opm {
void maybeDoGasLiftOptimize(DeferredLogger& deferred_logger); void maybeDoGasLiftOptimize(DeferredLogger& deferred_logger);
bool checkDoGasLiftOptimization(DeferredLogger& deferred_logger);
void gasLiftOptimizationStage1(DeferredLogger& deferred_logger, void gasLiftOptimizationStage1(DeferredLogger& deferred_logger,
GLiftProdWells &prod_wells, GLiftOptWells &glift_wells, GLiftProdWells &prod_wells, GLiftOptWells &glift_wells,
GasLiftGroupInfo &group_info, GLiftWellStateMap &state_map); GasLiftGroupInfo &group_info, GLiftWellStateMap &state_map);

24
opm/simulators/wells/BlackoilWellModel_impl.hpp
View File

@ -845,7 +845,8 @@ namespace Opm {
BlackoilWellModel<TypeTag>:: BlackoilWellModel<TypeTag>::
maybeDoGasLiftOptimize(DeferredLogger& deferred_logger) maybeDoGasLiftOptimize(DeferredLogger& deferred_logger)
{ {
if (checkDoGasLiftOptimization(deferred_logger)) { const bool do_glift_optimization = true;
if (do_glift_optimization) {
GLiftOptWells glift_wells; GLiftOptWells glift_wells;
GLiftProdWells prod_wells; GLiftProdWells prod_wells;
GLiftWellStateMap state_map; GLiftWellStateMap state_map;
@ -985,27 +986,6 @@ namespace Opm {
} }
} }
template<typename TypeTag>
bool
BlackoilWellModel<TypeTag>::
checkDoGasLiftOptimization(Opm::DeferredLogger& deferred_logger)
{
gliftDebug("checking if GLIFT should be done..", deferred_logger);
/*
std::size_t num_procs = ebosSimulator_.gridView().comm().size();
if (num_procs > 1u) {
const std::string msg = fmt::format(" GLIFT: skipping optimization. "
"Parallel run not supported yet: num procs = {}", num_procs);
deferred_logger.warning(msg);
return false;
}
*/
if (!(this->wellState().gliftOptimizationEnabled())) {
gliftDebug("Optimization disabled in WellState", deferred_logger);
return false;
}
return true;
}
template<typename TypeTag> template<typename TypeTag>
void void

5
opm/simulators/wells/StandardWellGeneric.cpp
View File

@ -253,11 +253,6 @@ doGasLiftOptimize(const WellState &well_state,
const Schedule& schedule, const Schedule& schedule,
DeferredLogger& deferred_logger) const DeferredLogger& deferred_logger) const
{ {
gliftDebug("checking if GLIFT should be done..", deferred_logger);
if (!well_state.gliftOptimizationEnabled()) {
gliftDebug("Optimization disabled in WellState", deferred_logger);
return false;
}
if (well_state.gliftCheckAlqOscillation(baseif_.name())) { if (well_state.gliftCheckAlqOscillation(baseif_.name())) {
gliftDebug("further optimization skipped due to oscillation in ALQ", gliftDebug("further optimization skipped due to oscillation in ALQ",
deferred_logger); deferred_logger);

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

@ -216,8 +216,6 @@ void WellState::init(const std::vector<double>& cellPressures,
const int nw = wells_ecl.size(); const int nw = wells_ecl.size();
do_glift_optimization_ = true;
if( nw == 0 ) return ; if( nw == 0 ) return ;
// Initialize perfphaserates_, which must be done here. // Initialize perfphaserates_, which must be done here.

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

@ -182,10 +182,6 @@ public:
this->alq_state.update_count(name, increase); this->alq_state.update_count(name, increase);
} }
bool gliftOptimizationEnabled() const {
return do_glift_optimization_;
}
void gliftTimeStepInit() { void gliftTimeStepInit() {
this->alq_state.reset_count(); this->alq_state.reset_count();
} }
@ -269,7 +265,6 @@ private:
// whereas the GlobalWellInfo is not. // whereas the GlobalWellInfo is not.
std::optional<GlobalWellInfo> global_well_info; std::optional<GlobalWellInfo> global_well_info;
ALQState alq_state; ALQState alq_state;
bool do_glift_optimization_;
PhaseUsage phase_usage_; PhaseUsage phase_usage_;
WellContainer<SingleWellState> wells_; WellContainer<SingleWellState> wells_;