From 41319eab7dd34cafe92e839d5026dddfc999c63f Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Fri, 2 Feb 2024 10:46:44 +0100 Subject: [PATCH] move ebos/eclgenericoutputblackoilmodule.[hh|cc] to opm/simulators/flow --- CMakeLists_files.cmake | 4 +- ebos/ecloutputblackoilmodule.hh | 11 ++- .../flow/GenericOutputBlackoilModule.cpp | 91 +++++++++---------- .../flow/GenericOutputBlackoilModule.hpp | 46 +++++----- 4 files changed, 75 insertions(+), 77 deletions(-) rename ebos/eclgenericoutputblackoilmodule.cc => opm/simulators/flow/GenericOutputBlackoilModule.cpp (96%) rename ebos/eclgenericoutputblackoilmodule.hh => opm/simulators/flow/GenericOutputBlackoilModule.hpp (92%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 4a7bc041f..f4c2217b8 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -25,7 +25,6 @@ list (APPEND MAIN_SOURCE_FILES ebos/collecttoiorank.cc ebos/eclgenericcpgridvanguard.cc - ebos/eclgenericoutputblackoilmodule.cc ebos/eclgenericproblem.cc ebos/eclgenericthresholdpressure.cc ebos/eclgenerictracermodel.cc @@ -45,6 +44,7 @@ list (APPEND MAIN_SOURCE_FILES opm/simulators/flow/ConvergenceOutputConfiguration.cpp opm/simulators/flow/ExtraConvergenceOutputThread.cpp opm/simulators/flow/FlowMain.cpp + opm/simulators/flow/GenericOutputBlackoilModule.cpp opm/simulators/flow/InterRegFlows.cpp opm/simulators/flow/KeywordValidation.cpp opm/simulators/flow/LogOutputHelper.cpp @@ -420,7 +420,6 @@ list (APPEND PUBLIC_HEADER_FILES ebos/eclequilinitializer.hh ebos/eclfluxmodule.hh ebos/eclgenericcpgridvanguard.hh - ebos/eclgenericoutputblackoilmodule.hh ebos/eclgenericproblem.hh ebos/eclgenericproblem_impl.hh ebos/eclgenericthresholdpressure.hh @@ -455,6 +454,7 @@ list (APPEND PUBLIC_HEADER_FILES opm/simulators/flow/ExtraConvergenceOutputThread.hpp opm/simulators/flow/FlowMain.hpp opm/simulators/flow/FlowsData.hpp + opm/simulators/flow/GenericOutputBlackoilModule.hpp opm/simulators/flow/InterRegFlows.hpp opm/simulators/flow/KeywordValidation.hpp opm/simulators/flow/LogOutputHelper.hpp diff --git a/ebos/ecloutputblackoilmodule.hh b/ebos/ecloutputblackoilmodule.hh index 50b276fa2..307e31a9b 100644 --- a/ebos/ecloutputblackoilmodule.hh +++ b/ebos/ecloutputblackoilmodule.hh @@ -30,13 +30,14 @@ #include #include -#include #include #include #include #include +#include + #include #include #include @@ -51,7 +52,7 @@ #include #include -#include +#include #include #include @@ -111,8 +112,8 @@ class EcfvDiscretization; * ECL binary format. */ template -class EclOutputBlackOilModule : public EclGenericOutputBlackoilModule, - GetPropType> +class EclOutputBlackOilModule : public GenericOutputBlackoilModule, + GetPropType> { using Simulator = GetPropType; using Discretization = GetPropType; @@ -126,7 +127,7 @@ class EclOutputBlackOilModule : public EclGenericOutputBlackoilModule; using Element = typename GridView::template Codim<0>::Entity; using ElementIterator = typename GridView::template Codim<0>::Iterator; - using BaseType = EclGenericOutputBlackoilModule; + using BaseType = GenericOutputBlackoilModule; using Indices = GetPropType; using Dir = FaceDir::DirEnum; diff --git a/ebos/eclgenericoutputblackoilmodule.cc b/opm/simulators/flow/GenericOutputBlackoilModule.cpp similarity index 96% rename from ebos/eclgenericoutputblackoilmodule.cc rename to opm/simulators/flow/GenericOutputBlackoilModule.cpp index 79e8b2697..497df8d14 100644 --- a/ebos/eclgenericoutputblackoilmodule.cc +++ b/opm/simulators/flow/GenericOutputBlackoilModule.cpp @@ -18,8 +18,7 @@ */ #include - -#include +#include #include @@ -167,22 +166,22 @@ std::string EclString(const Opm::Inplace::Phase phase) namespace Opm { template -EclGenericOutputBlackoilModule:: -EclGenericOutputBlackoilModule(const EclipseState& eclState, - const Schedule& schedule, - const SummaryConfig& summaryConfig, - const SummaryState& summaryState, - const std::string& moduleVersion, - bool enableEnergy, - bool enableTemperature, - bool enableMech, - bool enableSolvent, - bool enablePolymer, - bool enableFoam, - bool enableBrine, - bool enableSaltPrecipitation, - bool enableExtbo, - bool enableMICP) +GenericOutputBlackoilModule:: +GenericOutputBlackoilModule(const EclipseState& eclState, + const Schedule& schedule, + const SummaryConfig& summaryConfig, + const SummaryState& summaryState, + const std::string& moduleVersion, + bool enableEnergy, + bool enableTemperature, + bool enableMech, + bool enableSolvent, + bool enablePolymer, + bool enableFoam, + bool enableBrine, + bool enableSaltPrecipitation, + bool enableExtbo, + bool enableMICP) : eclState_(eclState) , schedule_(schedule) , summaryConfig_(summaryConfig) @@ -250,11 +249,11 @@ EclGenericOutputBlackoilModule(const EclipseState& eclState, } template -EclGenericOutputBlackoilModule:: -~EclGenericOutputBlackoilModule() = default; +GenericOutputBlackoilModule:: +~GenericOutputBlackoilModule() = default; template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: outputTimeStamp(const std::string& lbl, const double elapsed, const int rstep, @@ -264,7 +263,7 @@ outputTimeStamp(const std::string& lbl, } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: prepareDensityAccumulation() { if (this->regionAvgDensity_.has_value()) { @@ -273,7 +272,7 @@ prepareDensityAccumulation() } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: accumulateDensityParallel() { if (this->regionAvgDensity_.has_value()) { @@ -282,28 +281,28 @@ accumulateDensityParallel() } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: outputCumLog(std::size_t reportStepNum) { this->logOutput_.cumulative(reportStepNum); } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: outputProdLog(std::size_t reportStepNum) { this->logOutput_.production(reportStepNum); } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: outputInjLog(std::size_t reportStepNum) { this->logOutput_.injection(reportStepNum); } template -Inplace EclGenericOutputBlackoilModule:: +Inplace GenericOutputBlackoilModule:: calc_inplace(std::map& miscSummaryData, std::map>& regionData, const Parallel::Communication& comm) @@ -321,9 +320,8 @@ calc_inplace(std::map& miscSummaryData, return inplace; } - template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: outputFipAndResvLog(const Inplace& inplace, const std::size_t reportStepNum, double elapsed, @@ -374,9 +372,8 @@ outputFipAndResvLog(const Inplace& inplace, } } - template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: addRftDataToWells(data::Wells& wellDatas, std::size_t reportStepNum) { const auto& rft_config = schedule_[reportStepNum].rft_config(); @@ -426,7 +423,7 @@ addRftDataToWells(data::Wells& wellDatas, std::size_t reportStepNum) } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: assignToSolution(data::Solution& sol) { using DataEntry = @@ -707,7 +704,7 @@ assignToSolution(data::Solution& sol) } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: setRestart(const data::Solution& sol, unsigned elemIdx, unsigned globalDofIndex) @@ -782,8 +779,8 @@ setRestart(const data::Solution& sol, } template -typename EclGenericOutputBlackoilModule::ScalarBuffer -EclGenericOutputBlackoilModule:: +typename GenericOutputBlackoilModule::ScalarBuffer +GenericOutputBlackoilModule:: regionSum(const ScalarBuffer& property, const std::vector& regionId, std::size_t maxNumberOfRegions, @@ -817,7 +814,7 @@ regionSum(const ScalarBuffer& property, } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: doAllocBuffers(const unsigned bufferSize, const unsigned reportStepNum, const bool substep, @@ -1345,7 +1342,7 @@ doAllocBuffers(const unsigned bufferSize, } template -bool EclGenericOutputBlackoilModule:: +bool GenericOutputBlackoilModule:: isOutputCreationDirective_(const std::string& keyword) { return (keyword == "BASIC") || (keyword == "FREQ") @@ -1354,7 +1351,7 @@ isOutputCreationDirective_(const std::string& keyword) } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: outputErrorLog(const Parallel::Communication& comm) const { const auto root = 0; @@ -1372,7 +1369,7 @@ outputErrorLog(const Parallel::Communication& comm) const } template -int EclGenericOutputBlackoilModule:: +int GenericOutputBlackoilModule:: regionMax(const std::vector& region, const Parallel::Communication& comm) { @@ -1381,7 +1378,7 @@ regionMax(const std::vector& region, } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: update(Inplace& inplace, const std::string& region_name, const Inplace::Phase phase, @@ -1398,7 +1395,7 @@ update(Inplace& inplace, } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: makeRegionSum(Inplace& inplace, const std::string& region_name, const Parallel::Communication& comm) const @@ -1436,7 +1433,7 @@ makeRegionSum(Inplace& inplace, } template -Inplace EclGenericOutputBlackoilModule:: +Inplace GenericOutputBlackoilModule:: accumulateRegionSums(const Parallel::Communication& comm) { Inplace inplace; @@ -1458,14 +1455,14 @@ accumulateRegionSums(const Parallel::Communication& comm) } template -Scalar EclGenericOutputBlackoilModule:: +Scalar GenericOutputBlackoilModule:: sum(const ScalarBuffer& v) { return std::accumulate(v.begin(), v.end(), Scalar{0}); } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: updateSummaryRegionValues(const Inplace& inplace, std::map& miscSummaryData, std::map>& regionData) const @@ -1548,7 +1545,7 @@ updateSummaryRegionValues(const Inplace& inplace, } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: setupBlockData(std::function isCartIdxOnThisRank) { for (const auto& node : summaryConfig_) { @@ -1564,7 +1561,7 @@ setupBlockData(std::function isCartIdxOnThisRank) } template -void EclGenericOutputBlackoilModule:: +void GenericOutputBlackoilModule:: assignGlobalFieldsToSolution(data::Solution& sol) { if (!this->cnvData_.empty()) { @@ -1578,6 +1575,6 @@ assignGlobalFieldsToSolution(data::Solution& sol) } } -template class EclGenericOutputBlackoilModule,double>; +template class GenericOutputBlackoilModule,double>; } // namespace Opm diff --git a/ebos/eclgenericoutputblackoilmodule.hh b/opm/simulators/flow/GenericOutputBlackoilModule.hpp similarity index 92% rename from ebos/eclgenericoutputblackoilmodule.hh rename to opm/simulators/flow/GenericOutputBlackoilModule.hpp index 7f95fa920..ba557f893 100644 --- a/ebos/eclgenericoutputblackoilmodule.hh +++ b/opm/simulators/flow/GenericOutputBlackoilModule.hpp @@ -18,10 +18,10 @@ */ /*! * \file - * \copydoc Opm::EclOutputBlackOilModule + * \copydoc Opm::OutputBlackOilModule */ -#ifndef EWOMS_ECL_GENERIC_OUTPUT_BLACK_OIL_MODULE_HH -#define EWOMS_ECL_GENERIC_OUTPUT_BLACK_OIL_MODULE_HH +#ifndef OPM_GENERIC_OUTPUT_BLACK_OIL_MODULE_HPP +#define OPM_GENERIC_OUTPUT_BLACK_OIL_MODULE_HPP #include @@ -54,8 +54,11 @@ class SummaryConfigNode; class SummaryState; template -class EclGenericOutputBlackoilModule { +class GenericOutputBlackoilModule { public: + // Virtual destructor for safer inheritance. + virtual ~GenericOutputBlackoilModule(); + Scalar* getPRESSURE_ptr(void) { return (this->fluidPressure_.data()) ; }; @@ -285,9 +288,6 @@ public: cnvData_ = data; } - // Virtual destructor for safer inheritance. - virtual ~EclGenericOutputBlackoilModule(); - template void serializeOp(Serializer& serializer) { @@ -313,21 +313,21 @@ protected: enum { waterCompIdx = FluidSystem::waterCompIdx }; using Dir = FaceDir::DirEnum; - EclGenericOutputBlackoilModule(const EclipseState& eclState, - const Schedule& schedule, - const SummaryConfig& summaryConfig, - const SummaryState& summaryState, - const std::string& moduleVersionName, - bool enableEnergy, - bool enableTemperature, - bool enableMech, - bool enableSolvent, - bool enablePolymer, - bool enableFoam, - bool enableBrine, - bool enableSaltPrecipitation, - bool enableExtbo, - bool enableMICP); + GenericOutputBlackoilModule(const EclipseState& eclState, + const Schedule& schedule, + const SummaryConfig& summaryConfig, + const SummaryState& summaryState, + const std::string& moduleVersionName, + bool enableEnergy, + bool enableTemperature, + bool enableMech, + bool enableSolvent, + bool enablePolymer, + bool enableFoam, + bool enableBrine, + bool enableSaltPrecipitation, + bool enableExtbo, + bool enableMICP); void doAllocBuffers(unsigned bufferSize, unsigned reportStepNum, @@ -525,4 +525,4 @@ protected: } // namespace Opm -#endif +#endif // OPM_GENERIC_OUTPUT_BLACK_OIL_MODULE_HPP