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 #5464 from akva2/quell_gcc12_warnings

Browse Source 
Quell some gcc12 warnings
This commit is contained in:
Arne Morten Kvarving 2024-07-03 11:00:39 +02:00 committed by GitHub
commit 84c1f0f5c8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/simulators/linalg/ISTLSolver.cpp
View File

@ -166,7 +166,7 @@ using BV = Dune::BlockVector<Dune::FieldVector<double,Dim>>;
#if HAVE_MPI #if HAVE_MPI
using CommunicationType = Dune::OwnerOverlapCopyCommunication<int,int>; using CommunicationType = Dune::OwnerOverlapCopyCommunication<int,int>;
#else #else
using CommunicationType = Dune::CollectiveCommunication<int>; using CommunicationType = Dune::Communication<int>;
#endif #endif
#define INSTANCE_FLEX(Dim) \ #define INSTANCE_FLEX(Dim) \

2
opm/simulators/linalg/ISTLSolver.hpp
View File

@ -162,7 +162,7 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
#if HAVE_MPI #if HAVE_MPI
using CommunicationType = Dune::OwnerOverlapCopyCommunication<int,int>; using CommunicationType = Dune::OwnerOverlapCopyCommunication<int,int>;
#else #else
using CommunicationType = Dune::CollectiveCommunication<int>; using CommunicationType = Dune::Communication<int>;
#endif #endif
public: public:

4
opm/simulators/linalg/WellOperators.hpp
View File

@ -150,7 +150,7 @@ public:
#if HAVE_MPI #if HAVE_MPI
using communication_type = Dune::OwnerOverlapCopyCommunication<int,int>; using communication_type = Dune::OwnerOverlapCopyCommunication<int,int>;
#else #else
using communication_type = Dune::CollectiveCommunication<int>; using communication_type = Dune::Communication<int>;
#endif #endif
Dune::SolverCategory::Category category() const override Dune::SolverCategory::Category category() const override
@ -244,7 +244,7 @@ public:
#if HAVE_MPI #if HAVE_MPI
using communication_type = Dune::OwnerOverlapCopyCommunication<int,int>; using communication_type = Dune::OwnerOverlapCopyCommunication<int,int>;
#else #else
using communication_type = Dune::CollectiveCommunication<int>; using communication_type = Dune::Communication<int>;
#endif #endif
Dune::SolverCategory::Category category() const override Dune::SolverCategory::Category category() const override

3
opm/simulators/utils/satfunc/SatfuncConsistencyChecks.hpp
View File

@ -51,6 +51,9 @@ namespace Opm {
class Check class Check
{ {
public: public:
/// Virtual destructor since class has virtual functions
virtual ~Check() = default;
/// Run specific check against a set of saturation function end-points. /// Run specific check against a set of saturation function end-points.
/// ///
/// \param[in] endPoints Set of saturation function end-points. /// \param[in] endPoints Set of saturation function end-points.