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 #5356 from akva2/equil_use_comm_type

Browse Source 
InitStateEquil: remove template parameter from Comm

Supersedes and closes #5348
This commit is contained in:
Bård Skaflestad 2024-05-15 12:06:38 +02:00 committed by GitHub
commit c6c8c0f237
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/flow/equil/InitStateEquil.cpp
View File

@ -76,11 +76,9 @@ INSTANCE_COMP(GridViewFem, MapperFem)
namespace Details { namespace Details {
template class PressureTable<BlackOilFluidSystem<double>,EquilReg>; template class PressureTable<BlackOilFluidSystem<double>,EquilReg>;
template void verticalExtent<std::vector<int>, template void verticalExtent(const std::vector<int>&,
Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator>>(
const std::vector<int>&,
const std::vector<std::pair<double,double>>&, const std::vector<std::pair<double,double>>&,
const Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator>&, const Parallel::Communication&,
std::array<double,2>&); std::array<double,2>&);
using MatLaw = EclMaterialLawManager<ThreePhaseMaterialTraits<double,0,1,2>>; using MatLaw = EclMaterialLawManager<ThreePhaseMaterialTraits<double,0,1,2>>;

6
opm/simulators/flow/equil/InitStateEquil.hpp
View File

@ -34,6 +34,8 @@
#include <opm/material/common/Tabulated1DFunction.hpp> #include <opm/material/common/Tabulated1DFunction.hpp>
#include <opm/material/fluidstates/SimpleModularFluidState.hpp> #include <opm/material/fluidstates/SimpleModularFluidState.hpp>
#include <opm/simulators/utils/ParallelCommunication.hpp>
#include <array> #include <array>
#include <cstddef> #include <cstddef>
#include <memory> #include <memory>
@ -658,10 +660,10 @@ private:
// =========================================================================== // ===========================================================================
template <typename CellRange, typename Comm> template <typename CellRange>
void verticalExtent(const CellRange& cells, void verticalExtent(const CellRange& cells,
const std::vector<std::pair<double, double>>& cellZMinMax, const std::vector<std::pair<double, double>>& cellZMinMax,
const Comm& comm, const Parallel::Communication& comm,
std::array<double,2>& span); std::array<double,2>& span);
template <class Element> template <class Element>

4
opm/simulators/flow/equil/InitStateEquil_impl.hpp
View File

@ -60,10 +60,10 @@ namespace EQUIL {
namespace Details { namespace Details {
template <typename CellRange, typename Comm> template <typename CellRange>
void verticalExtent(const CellRange& cells, void verticalExtent(const CellRange& cells,
const std::vector<std::pair<double, double>>& cellZMinMax, const std::vector<std::pair<double, double>>& cellZMinMax,
const Comm& comm, const Parallel::Communication& comm,
std::array<double,2>& span) std::array<double,2>& span)
{ {
span[0] = std::numeric_limits<double>::max(); span[0] = std::numeric_limits<double>::max();

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

@ -91,7 +91,7 @@ struct GeneralPreconditionerMaker {
virtual std::unique_ptr< virtual std::unique_ptr<
Preconditioner<typename OriginalPreconditioner::domain_type, typename OriginalPreconditioner::range_type>> Preconditioner<typename OriginalPreconditioner::domain_type, typename OriginalPreconditioner::range_type>>
make() = 0; make() = 0;
virtual ~GeneralPreconditionerMaker(){}; virtual ~GeneralPreconditionerMaker() = default;
}; };
/// @brief Struct implementing a make function which creates a preconditioner /// @brief Struct implementing a make function which creates a preconditioner