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

Merge pull request #3960 from akva2/janitoring

Browse Source 
Some janitoring
This commit is contained in:
Bård Skaflestad 2022-06-27 16:06:36 +02:00 committed by GitHub
commit c438a135f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/flow/BlackoilModelEbos.hpp
View File

@ -1114,7 +1114,7 @@ namespace Opm {
template<class G, class T> template<class G, class T>
typename std::enable_if<!std::is_same<G,Dune::CpGrid>::value, bool>::type typename std::enable_if<!std::is_same<G,Dune::CpGrid>::value, bool>::type
isNumericalAquiferCell(const G& grid, const T& elem) isNumericalAquiferCell(const G&, const T&)
{ {
return false; return false;
} }

2
opm/simulators/linalg/bda/opencl/Preconditioner.hpp
View File

@ -60,6 +60,8 @@ public:
static std::unique_ptr<Preconditioner> create(PreconditionerType type, int verbosity, ILUReorder opencl_ilu_reorder); static std::unique_ptr<Preconditioner> create(PreconditionerType type, int verbosity, ILUReorder opencl_ilu_reorder);
virtual ~Preconditioner() = default;
// nested Preconditioners might need to override this // nested Preconditioners might need to override this
virtual void setOpencl(std::shared_ptr<cl::Context>& context, std::shared_ptr<cl::CommandQueue>& queue); virtual void setOpencl(std::shared_ptr<cl::Context>& context, std::shared_ptr<cl::CommandQueue>& queue);

4
opm/simulators/wells/BlackoilWellModelGeneric.cpp
View File

@ -2390,14 +2390,14 @@ guideRateUpdateIsNeeded(const int reportStepIdx) const {
}); });
if (!need_update && this->report_step_starts_) { if (!need_update && this->report_step_starts_) {
const auto& events = this->schedule()[reportStepIdx].wellgroup_events(); const auto& events = this->schedule()[reportStepIdx].wellgroup_events();
const auto effective_events_mask = ScheduleEvents::WELL_STATUS_CHANGE constexpr auto effective_events_mask = ScheduleEvents::WELL_STATUS_CHANGE
+ ScheduleEvents::INJECTION_TYPE_CHANGED + ScheduleEvents::INJECTION_TYPE_CHANGED
+ ScheduleEvents::WELL_SWITCHED_INJECTOR_PRODUCER + ScheduleEvents::WELL_SWITCHED_INJECTOR_PRODUCER
+ ScheduleEvents::NEW_WELL; + ScheduleEvents::NEW_WELL;
need_update = std::any_of(this->well_container_generic_.begin(), need_update = std::any_of(this->well_container_generic_.begin(),
this->well_container_generic_.end(), this->well_container_generic_.end(),
[&events, effective_events_mask](const WellInterfaceGeneric* well) [&events](const WellInterfaceGeneric* well)
{ {
return events.hasEvent(well->name(), effective_events_mask); return events.hasEvent(well->name(), effective_events_mask);
}); });