From c476d07b009326514e28a553307f1a054ed3a6b6 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 25 May 2021 12:36:19 +0200 Subject: [PATCH] GLiftStage2: use constexpr --- opm/simulators/wells/GasLiftStage2.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/simulators/wells/GasLiftStage2.hpp b/opm/simulators/wells/GasLiftStage2.hpp index a93482976..cadbe5158 100644 --- a/opm/simulators/wells/GasLiftStage2.hpp +++ b/opm/simulators/wells/GasLiftStage2.hpp @@ -60,9 +60,9 @@ class WellState; #else using Communication = Dune::CollectiveCommunication; #endif - static const int Water = BlackoilPhases::Aqua; - static const int Oil = BlackoilPhases::Liquid; - static const int Gas = BlackoilPhases::Vapour; + 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, @@ -140,7 +140,7 @@ class WellState; GradMap inc_grads_; GradMap dec_grads_; bool debug_; - int max_iterations_ = 1000; + static constexpr int max_iterations_ = 1000; //int time_step_idx_; struct OptimizeState {