Merge pull request #5052 from akva2/janitoring

Some janitoring
This commit is contained in:
Bård Skaflestad
2023-12-08 21:20:16 +01:00
committed by GitHub
3 changed files with 5 additions and 3 deletions

View File

@@ -34,6 +34,8 @@ class SimulatorTimer;
//! \brief Abstract interface for simulator serialization ops.
struct SerializableSim {
virtual ~SerializableSim() = default;
//! \brief Load simulator state from file.
virtual void loadState(HDF5Serializer& serializer,
const std::string& groupName) = 0;

View File

@@ -132,7 +132,9 @@ namespace Opm
const WellState& well_state,
DeferredLogger& deferred_logger) override; // should be const?
void updateIPRImplicit(const Simulator& ebos_simulator, WellState& well_state, DeferredLogger& deferred_logger);
void updateIPRImplicit(const Simulator& ebos_simulator,
WellState& well_state,
DeferredLogger& deferred_logger) override;
virtual void updateProductivityIndex(const Simulator& ebosSimulator,
const WellProdIndexCalculator& wellPICalc,

View File

@@ -1621,7 +1621,6 @@ namespace Opm
const auto well_status_orig = this->wellStatus_;
const auto operability_orig = this->operability_status_;
auto well_status_cur = well_status_orig;
int status_switch_count = 0;
// only allow switcing if well is not under zero-rate target and is open from schedule
bool allow_switching = !this->wellUnderZeroRateTarget(summary_state, well_state) && (this->well_ecl_.getStatus() == WellStatus::OPEN);
allow_switching = allow_switching && (!fixed_control || !fixed_status);
@@ -1641,7 +1640,6 @@ namespace Opm
switch_count++;
if (well_status_cur != this->wellStatus_) {
well_status_cur = this->wellStatus_;
status_switch_count++;
}
}
if (!changed && final_check) {