rename and cleanup

opm/simulators/flow/BlackoilModelParametersEbos.hpp

@@ -406,9 +406,9 @@ namespace Opm
         bool matrix_add_well_contributions_;
 
         // Whether to check well operability
-        bool check_well_operabilty_;
+        bool check_well_operability_;
         // Whether to check well operability during iterations
-        bool check_well_operabilty_iter_;
+        bool check_well_operability_iter_;
 
 
         /// Construct from user parameters or defaults.
@@ -442,8 +442,8 @@ namespace Opm
             update_equations_scaling_ = EWOMS_GET_PARAM(TypeTag, bool, UpdateEquationsScaling);
             use_update_stabilization_ = EWOMS_GET_PARAM(TypeTag, bool, UseUpdateStabilization);
             matrix_add_well_contributions_ = EWOMS_GET_PARAM(TypeTag, bool, MatrixAddWellContributions);
-            check_well_operabilty_ = EWOMS_GET_PARAM(TypeTag, bool, EnableWellOperabilityCheck);
+            check_well_operability_ = EWOMS_GET_PARAM(TypeTag, bool, EnableWellOperabilityCheck);
-            check_well_operabilty_iter_ = EWOMS_GET_PARAM(TypeTag, bool, EnableWellOperabilityCheckIter);
+            check_well_operability_iter_ = EWOMS_GET_PARAM(TypeTag, bool, EnableWellOperabilityCheckIter);
 
             deck_file_name_ = EWOMS_GET_PARAM(TypeTag, std::string, EclDeckFileName);
         }

opm/simulators/wells/BlackoilWellModel_impl.hpp

@@ -1136,7 +1136,7 @@ namespace Opm {
         ConvergenceReport local_report;
         const int iterationIdx = ebosSimulator_.model().newtonMethod().numIterations();
         for (const auto& well : well_container_) {
-            if (well->isOperable() ) {
+            if (well->isOperableAndSolvable() ) {
                 local_report += well->getWellConvergence(this->wellState(), B_avg, local_deferredLogger, iterationIdx > param_.strict_outer_iter_wells_ );
             }
         }
@@ -1178,7 +1178,7 @@ namespace Opm {
     BlackoilWellModel<TypeTag>::
     calculateExplicitQuantities(DeferredLogger& deferred_logger) const
     {
-        // TODO: checking isOperable() ?
+        // TODO: checking isOperableAndSolvable() ?
         for (auto& well : well_container_) {
             well->calculateExplicitQuantities(ebosSimulator_, this->wellState(), deferred_logger);
         }

opm/simulators/wells/MultisegmentWellEval.cpp

@@ -439,7 +439,7 @@ updatePrimaryVariables(const WellState& well_state) const
 
     // TODO: to test using rate conversion coefficients to see if it will be better than
     // this default one
-    if (!baseif_.isOperable() && !baseif_.wellIsStopped()) return;
+    if (!baseif_.isOperableAndSolvable() && !baseif_.wellIsStopped()) return;
 
     const Well& well = baseif_.wellEcl();
 
@@ -510,7 +510,7 @@ void
 MultisegmentWellEval<FluidSystem,Indices,Scalar>::
 recoverSolutionWell(const BVector& x, BVectorWell& xw) const
 {
-    if (!baseif_.isOperable() && !baseif_.wellIsStopped()) return;
+    if (!baseif_.isOperableAndSolvable() && !baseif_.wellIsStopped()) return;
 
     BVectorWell resWell = resWell_;
     // resWell = resWell - B * x

opm/simulators/wells/MultisegmentWell_impl.hpp

@@ -183,7 +183,7 @@ namespace Opm
     MultisegmentWell<TypeTag>::
     apply(const BVector& x, BVector& Ax) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         if ( this->param_.matrix_add_well_contributions_ )
         {
@@ -210,7 +210,7 @@ namespace Opm
     MultisegmentWell<TypeTag>::
     apply(BVector& r) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         // invDrw_ = duneD^-1 * resWell_
         const BVectorWell invDrw = mswellhelpers::applyUMFPack(this->duneD_, this->duneDSolver_, this->resWell_);
@@ -227,7 +227,7 @@ namespace Opm
                                           WellState& well_state,
                                           DeferredLogger& deferred_logger) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         BVectorWell xw(1);
         this->recoverSolutionWell(x, xw);
@@ -484,7 +484,7 @@ namespace Opm
     MultisegmentWell<TypeTag>::
     solveEqAndUpdateWellState(WellState& well_state, DeferredLogger& deferred_logger)
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         // We assemble the well equations, then we check the convergence,
         // which is why we do not put the assembleWellEq here.
@@ -578,7 +578,7 @@ namespace Opm
                     DeferredLogger& deferred_logger,
                     const double relaxation_factor) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         const double dFLimit = this->param_.dwell_fraction_max_;
         const double max_pressure_change = this->param_.max_pressure_change_ms_wells_;
@@ -1336,7 +1336,7 @@ namespace Opm
                              const GroupState& group_state,
                              DeferredLogger& deferred_logger)
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return true;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return true;
 
         const int max_iter_number = this->param_.max_inner_iter_ms_wells_;
         const WellState well_state0 = well_state;
@@ -1460,7 +1460,7 @@ namespace Opm
                                    DeferredLogger& deferred_logger)
     {
 
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         // update the upwinding segments
         this->updateUpwindingSegments();

opm/simulators/wells/StandardWellEval.cpp

@@ -250,7 +250,7 @@ updatePrimaryVariables(const WellState& well_state, DeferredLogger& deferred_log
     static constexpr int Oil = WellInterfaceIndices<FluidSystem,Indices,Scalar>::Oil;
     static constexpr int Water = WellInterfaceIndices<FluidSystem,Indices,Scalar>::Water;
 
-    if (!baseif_.isOperable() && !baseif_.wellIsStopped()) return;
+    if (!baseif_.isOperableAndSolvable() && !baseif_.wellIsStopped()) return;
 
     const int well_index = baseif_.indexOfWell();
     const int np = baseif_.numPhases();

opm/simulators/wells/StandardWell_impl.hpp

@@ -397,7 +397,7 @@ namespace Opm
     {
         // TODO: only_wells should be put back to save some computation
         // for example, the matrices B C does not need to update if only_wells
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         // clear all entries
         this->duneB_ = 0.0;
@@ -852,7 +852,7 @@ namespace Opm
                     WellState& well_state,
                     DeferredLogger& deferred_logger) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         updatePrimaryVariablesNewton(dwells, well_state);
 
@@ -1517,7 +1517,7 @@ namespace Opm
     StandardWell<TypeTag>::
     solveEqAndUpdateWellState(WellState& well_state, DeferredLogger& deferred_logger)
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         // We assemble the well equations, then we check the convergence,
         // which is why we do not put the assembleWellEq here.
@@ -1552,7 +1552,7 @@ namespace Opm
     StandardWell<TypeTag>::
     apply(const BVector& x, BVector& Ax) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         if (this->param_.matrix_add_well_contributions_)
         {
@@ -1583,7 +1583,7 @@ namespace Opm
     StandardWell<TypeTag>::
     apply(BVector& r) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         assert( this->invDrw_.size() == this->invDuneD_.N() );
 
@@ -1598,7 +1598,7 @@ namespace Opm
     StandardWell<TypeTag>::
     recoverSolutionWell(const BVector& x, BVectorWell& xw) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         BVectorWell resWell = this->resWell_;
         // resWell = resWell - B * x
@@ -1618,7 +1618,7 @@ namespace Opm
                                           WellState& well_state,
                                           DeferredLogger& deferred_logger) const
     {
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         BVectorWell xw(1);
         xw[0].resize(this->numWellEq_);
@@ -1903,7 +1903,7 @@ namespace Opm
     updatePrimaryVariables(const WellState& well_state, DeferredLogger& deferred_logger) const
     {
         this->StdWellEval::updatePrimaryVariables(well_state, deferred_logger);
-        if (!this->isOperable() && !this->wellIsStopped()) return;
+        if (!this->isOperableAndSolvable() && !this->wellIsStopped()) return;
 
         // other primary variables related to polymer injection
         if constexpr (Base::has_polymermw) {

opm/simulators/wells/WellInterfaceGeneric.cpp

@@ -352,7 +352,7 @@ void WellInterfaceGeneric::updateWellTestStatePhysical(const double simulation_t
                                                        WellTestState& well_test_state,
                                                        DeferredLogger& deferred_logger) const
 {
-    if (!isOperable()) {
+    if (!isOperableAndSolvable()) {
         if (well_test_state.hasWellClosed(name(), WellTestConfig::Reason::ECONOMIC) ||
             well_test_state.hasWellClosed(name(), WellTestConfig::Reason::PHYSICAL) ) {
             // Already closed, do nothing.
@@ -368,9 +368,9 @@ void WellInterfaceGeneric::updateWellTestStatePhysical(const double simulation_t
     }
 }
 
-bool WellInterfaceGeneric::isOperable() const
+bool WellInterfaceGeneric::isOperableAndSolvable() const
 {
-    return operability_status_.isOperable();
+    return operability_status_.isOperableAndSolvable();
 }
 
 double WellInterfaceGeneric::getALQ(const WellState& well_state) const

opm/simulators/wells/WellInterfaceGeneric.hpp

@@ -82,7 +82,7 @@ public:
     bool underPredictionMode() const;
 
     // whether the well is operable
-    bool isOperable() const;
+    bool isOperableAndSolvable() const;
 
     void initCompletions();
     void closeCompletions(WellTestState& wellTestState);
@@ -180,7 +180,7 @@ protected:
 
     // definition of the struct OperabilityStatus
     struct OperabilityStatus {
-        bool isOperable() const {
+        bool isOperableAndSolvable() const {
             if (!operable_under_only_bhp_limit || !solvable) {
                 return false;
             } else {
@@ -196,7 +196,7 @@ protected:
             return can_obtain_bhp_with_thp_limit && obey_bhp_limit_with_thp_limit;
         }
 
-        void reset() {
+        void resetOperability() {
             operable_under_only_bhp_limit = true;
             obey_thp_limit_under_bhp_limit = true;
             can_obtain_bhp_with_thp_limit = true;

opm/simulators/wells/WellInterface_impl.hpp

@@ -246,7 +246,7 @@ namespace Opm
             }
 
             updateWellOperability(simulator, well_state_copy, deferred_logger);
-            if ( !this->isOperable() ) {
+            if ( !this->isOperableAndSolvable() ) {
                 const auto msg = fmt::format("WTEST: Well {} is not operable (physical)", this->name());
                 deferred_logger.debug(msg);
                 return;
@@ -346,7 +346,7 @@ namespace Opm
                       const GroupState& group_state,
                       DeferredLogger& deferred_logger)
     {
-        if (!this->isOperable())
+        if (!this->isOperableAndSolvable())
             return;
 
         // keep a copy of the original well state
@@ -372,9 +372,9 @@ namespace Opm
                    const GroupState& group_state,
                    DeferredLogger& deferred_logger)
     {
-        const bool old_well_operable = this->operability_status_.isOperable();
+        const bool old_well_operable = this->operability_status_.isOperableAndSolvable();
 
-        if (param_.check_well_operabilty_iter_)
+        if (param_.check_well_operability_iter_)
             checkWellOperability(ebosSimulator, well_state, deferred_logger);
 
         // only use inner well iterations for the first newton iterations.
@@ -390,7 +390,7 @@ namespace Opm
             }
         }
 
-        const bool well_operable = this->operability_status_.isOperable();
+        const bool well_operable = this->operability_status_.isOperableAndSolvable();
         if (!well_operable && old_well_operable) {
             if (this->well_ecl_.getAutomaticShutIn()) {
                 deferred_logger.info(" well " + this->name() + " gets SHUT during iteration ");
@@ -454,7 +454,7 @@ namespace Opm
                          DeferredLogger& deferred_logger)
     {
 
-        if (!param_.check_well_operabilty_) {
+        if (!param_.check_well_operability_) {
             return;
         }
 
@@ -496,7 +496,7 @@ namespace Opm
                           const WellState& well_state,
                           DeferredLogger& deferred_logger)
     {
-        this->operability_status_.reset();
+        this->operability_status_.resetOperability();
 
         auto current_control = well_state.well(this->index_of_well_).production_cmode;
         // Operability checking is not free