OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-02 05:49:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4352 from akva2/gasliftop_hpp_include

Browse Source 
GasLiftOpt.hpp: minimize include
This commit is contained in:
Bård Skaflestad 2023-01-10 11:08:14 +01:00 committed by GitHub
commit f5f3b41120
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
opm/simulators/utils/ParallelSerialization.cpp
View File

@ -25,6 +25,7 @@
#include <opm/input/eclipse/EclipseState/Grid/TransMult.hpp>
#include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
#include <opm/input/eclipse/Schedule/RPTConfig.hpp>
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Action/ASTNode.hpp>

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

@ -20,6 +20,8 @@
#include <config.h>
#include <opm/simulators/wells/GasLiftGroupInfo.hpp>
#include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
namespace Opm {
GasLiftGroupInfo::

4
opm/simulators/wells/GasLiftGroupInfo.hpp
View File

@ -29,7 +29,6 @@
#include <opm/input/eclipse/Schedule/Schedule.hpp>
#include <opm/input/eclipse/Schedule/Well/Well.hpp>
#include <opm/input/eclipse/Schedule/Group/Group.hpp>
#include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
#include <opm/input/eclipse/Schedule/SummaryState.hpp>
#include <opm/simulators/wells/GasLiftCommon.hpp>
#include <opm/simulators/wells/WellState.hpp>
@ -44,6 +43,9 @@
namespace Opm
{
class GasLiftOpt;
class GasLiftGroupInfo : public GasLiftCommon
{
protected:

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

@ -58,7 +58,7 @@ namespace Opm
std::optional<double> computeBhpAtThpLimit_(double alq) const override;
BasicRates computeWellRates_(
double bhp, bool bhp_is_limited, bool debug_output=true) const override;
void setAlqMaxRate_(const GasLiftOpt::Well& well);
void setAlqMaxRate_(const GasLiftWell& well);
void setupPhaseVariables_();
bool checkThpControl_() const override;

6
opm/simulators/wells/GasLiftSingleWellGeneric.cpp
View File

@ -1304,7 +1304,7 @@ GasLiftSingleWellGeneric::tryIncreaseLiftGas_()
}
void
GasLiftSingleWellGeneric::setAlqMinRate_(const GasLiftOpt::Well& well)
GasLiftSingleWellGeneric::setAlqMinRate_(const GasLiftWell& well)
{
// NOTE: According to WLIFTOPT item 5 :
// if min_rate() is negative, it means: allocate at least enough lift gas
@ -1394,7 +1394,7 @@ GasLiftSingleWellGeneric::updateRatesToGroupLimits_(const BasicRates& old_rates,
// Called when we should use a fixed ALQ value
void
GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftOpt::Well& well)
GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftWell& well)
{
auto& max_alq_optional = well.max_rate();
if (max_alq_optional) {
@ -1421,7 +1421,7 @@ GasLiftSingleWellGeneric::updateWellStateAlqFixedValue_(const GasLiftOpt::Well&
// value that can be set either in Item 3 of this keyword, or in
// Item 12 of keyword WCONPROD, or with keyword WELTARG.
bool
GasLiftSingleWellGeneric::useFixedAlq_(const GasLiftOpt::Well& well)
GasLiftSingleWellGeneric::useFixedAlq_(const GasLiftWell& well)
{
auto wliftopt_item2 = well.use_glo();
if (wliftopt_item2) {

10
opm/simulators/wells/GasLiftSingleWellGeneric.hpp
View File

@ -25,7 +25,6 @@
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
#include <opm/input/eclipse/Schedule/Well/Well.hpp>
#include <opm/simulators/wells/GasLiftGroupInfo.hpp>
#include <opm/simulators/wells/GasLiftCommon.hpp>
@ -42,6 +41,7 @@ namespace Opm
{
class DeferredLogger;
class GasLiftWell;
class GasLiftWellState;
class Schedule;
class SummaryState;
@ -317,7 +317,7 @@ protected:
std::unique_ptr<GasLiftWellState> runOptimize1_();
std::unique_ptr<GasLiftWellState> runOptimize2_();
std::unique_ptr<GasLiftWellState> runOptimizeLoop_(bool increase);
void setAlqMinRate_(const GasLiftOpt::Well& well);
void setAlqMinRate_(const GasLiftWell& well);
std::unique_ptr<GasLiftWellState> tryIncreaseLiftGas_();
std::unique_ptr<GasLiftWellState> tryDecreaseLiftGas_();
void updateGroupRates_(
@ -326,8 +326,8 @@ protected:
double delta_alq) const;
LimitedRates updateRatesToGroupLimits_(
const BasicRates& rates, const LimitedRates& new_rates, const std::string& gr_name = "") const;
void updateWellStateAlqFixedValue_(const GasLiftOpt::Well& well);
bool useFixedAlq_(const GasLiftOpt::Well& well);
void updateWellStateAlqFixedValue_(const GasLiftWell& well);
bool useFixedAlq_(const GasLiftWell& well);
void debugInfoGroupRatesExceedTarget(
Rate rate_type, const std::string& gr_name, double rate, double target) const;
void warnMaxIterationsExceeded_();
@ -356,7 +356,7 @@ protected:
std::string well_name_;
const GasLiftOpt::Well* gl_well_;
const GasLiftWell* gl_well_;
bool optimize_;
bool debug_limit_increase_decrease_;

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

@ -17,6 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
#include <fmt/format.h>
namespace Opm {
@ -191,7 +192,7 @@ setupPhaseVariables_()
template<typename TypeTag>
void
GasLiftSingleWell<TypeTag>::
setAlqMaxRate_(const GasLiftOpt::Well &well)
setAlqMaxRate_(const GasLiftWell &well)
{
auto& max_alq_optional = well.max_rate();
if (max_alq_optional) {

1
tests/test_ParallelSerialization.cpp
View File

@ -61,6 +61,7 @@
#include <opm/input/eclipse/Schedule/Action/ASTNode.hpp>
#include <opm/input/eclipse/Schedule/Action/Condition.hpp>
#include <opm/input/eclipse/Schedule/Events.hpp>
#include <opm/input/eclipse/Schedule/GasLiftOpt.hpp>
#include <opm/input/eclipse/Schedule/Group/GConSale.hpp>
#include <opm/input/eclipse/Schedule/Group/Group.hpp>
#include <opm/input/eclipse/Schedule/Group/GuideRateConfig.hpp>