From 48344facd495406bbe3e72e0dd739fc39520a1e4 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 2 Jul 2024 20:21:42 +0200 Subject: [PATCH 1/2] add virtual destructor to class with virtual members --- opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp b/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp index 11303b292..1acc60ebb 100644 --- a/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp +++ b/opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp @@ -51,6 +51,9 @@ namespace Opm { class Check { public: + /// Virtual destructor since class has virtual functions + virtual ~Check() = default; + /// Run specific check against a set of saturation function end-points. /// /// \param[in] endPoints Set of saturation function end-points. From 74cd10b1f2439181aabe53fd155fd1bc1c8cb0f8 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Wed, 3 Jul 2024 07:58:07 +0200 Subject: [PATCH 2/2] avoid using deprecated type --- opm/simulators/linalg/ISTLSolver.cpp | 2 +- opm/simulators/linalg/ISTLSolver.hpp | 2 +- opm/simulators/linalg/WellOperators.hpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/simulators/linalg/ISTLSolver.cpp b/opm/simulators/linalg/ISTLSolver.cpp index 8cdfd94b3..312827360 100644 --- a/opm/simulators/linalg/ISTLSolver.cpp +++ b/opm/simulators/linalg/ISTLSolver.cpp @@ -166,7 +166,7 @@ using BV = Dune::BlockVector>; #if HAVE_MPI using CommunicationType = Dune::OwnerOverlapCopyCommunication; #else -using CommunicationType = Dune::CollectiveCommunication; +using CommunicationType = Dune::Communication; #endif #define INSTANCE_FLEX(Dim) \ diff --git a/opm/simulators/linalg/ISTLSolver.hpp b/opm/simulators/linalg/ISTLSolver.hpp index 1c003e159..2c92c3cb6 100644 --- a/opm/simulators/linalg/ISTLSolver.hpp +++ b/opm/simulators/linalg/ISTLSolver.hpp @@ -162,7 +162,7 @@ std::unique_ptr blockJacobiAdjacency(const Grid& grid, #if HAVE_MPI using CommunicationType = Dune::OwnerOverlapCopyCommunication; #else - using CommunicationType = Dune::CollectiveCommunication; + using CommunicationType = Dune::Communication; #endif public: diff --git a/opm/simulators/linalg/WellOperators.hpp b/opm/simulators/linalg/WellOperators.hpp index 9d0b30b41..072da68ed 100644 --- a/opm/simulators/linalg/WellOperators.hpp +++ b/opm/simulators/linalg/WellOperators.hpp @@ -150,7 +150,7 @@ public: #if HAVE_MPI using communication_type = Dune::OwnerOverlapCopyCommunication; #else - using communication_type = Dune::CollectiveCommunication; + using communication_type = Dune::Communication; #endif Dune::SolverCategory::Category category() const override @@ -244,7 +244,7 @@ public: #if HAVE_MPI using communication_type = Dune::OwnerOverlapCopyCommunication; #else - using communication_type = Dune::CollectiveCommunication; + using communication_type = Dune::Communication; #endif Dune::SolverCategory::Category category() const override