OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-27 09:40:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

move ebos/vtkecltracermodule.hh to opm/simulators/flow

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-05 19:22:15 +01:00
parent 9d256bc233
commit e6eac2039b
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -426,7 +426,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclthresholdpressure.hh ebos/eclthresholdpressure.hh
ebos/ecltransmissibility.hh ebos/ecltransmissibility.hh
ebos/ecltransmissibility_impl.hh ebos/ecltransmissibility_impl.hh
ebos/vtkecltracermodule.hh
opm/simulators/flow/ActionHandler.hpp opm/simulators/flow/ActionHandler.hpp
opm/simulators/flow/AluGridCartesianIndexMapper.hpp opm/simulators/flow/AluGridCartesianIndexMapper.hpp
opm/simulators/flow/AluGridVanguard.hpp opm/simulators/flow/AluGridVanguard.hpp
@ -471,6 +470,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/SubDomain.hpp opm/simulators/flow/SubDomain.hpp
opm/simulators/flow/TracerModel.hpp opm/simulators/flow/TracerModel.hpp
opm/simulators/flow/ValidationFunctions.hpp opm/simulators/flow/ValidationFunctions.hpp
opm/simulators/flow/VtkTracerModule.hpp
opm/core/props/BlackoilPhases.hpp opm/core/props/BlackoilPhases.hpp
opm/core/props/phaseUsageFromDeck.hpp opm/core/props/phaseUsageFromDeck.hpp
opm/core/props/satfunc/RelpermDiagnostics.hpp opm/core/props/satfunc/RelpermDiagnostics.hpp

6
ebos/eclproblem.hh
View File

@ -45,7 +45,6 @@
#if HAVE_DAMARIS #if HAVE_DAMARIS
#include <ebos/damariswriter.hh> #include <ebos/damariswriter.hh>
#endif #endif
#include <ebos/vtkecltracermodule.hh>
#include <opm/common/utility/TimeService.hpp> #include <opm/common/utility/TimeService.hpp>
@ -83,6 +82,7 @@
#include <opm/simulators/flow/FIBlackoilModel.hpp> #include <opm/simulators/flow/FIBlackoilModel.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp> #include <opm/simulators/flow/OutputBlackoilModule.hpp>
#include <opm/simulators/flow/TracerModel.hpp> #include <opm/simulators/flow/TracerModel.hpp>
#include <opm/simulators/flow/VtkTracerModule.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp> #include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp> #include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp> #include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
@ -217,7 +217,7 @@ public:
DamarisWriterType::registerParameters(); DamarisWriterType::registerParameters();
#endif #endif
VtkEclTracerModule<TypeTag>::registerParameters(); VtkTracerModule<TypeTag>::registerParameters();
EWOMS_REGISTER_PARAM(TypeTag, bool, EnableWriteAllSolutions, EWOMS_REGISTER_PARAM(TypeTag, bool, EnableWriteAllSolutions,
"Write all solutions to disk instead of only the ones for the " "Write all solutions to disk instead of only the ones for the "
@ -294,7 +294,7 @@ public:
wellModel_, wellModel_,
simulator.vanguard().grid().comm()) simulator.vanguard().grid().comm())
{ {
this->model().addOutputModule(new VtkEclTracerModule<TypeTag>(simulator)); this->model().addOutputModule(new VtkTracerModule<TypeTag>(simulator));
// Tell the black-oil extensions to initialize their internal data structures // Tell the black-oil extensions to initialize their internal data structures
const auto& vanguard = simulator.vanguard(); const auto& vanguard = simulator.vanguard();
SolventModule::initFromState(vanguard.eclState(), vanguard.schedule()); SolventModule::initFromState(vanguard.eclState(), vanguard.schedule());

4
ebos/eclproblem_properties.hh
View File

@ -35,7 +35,6 @@
#if HAVE_DAMARIS #if HAVE_DAMARIS
#include <ebos/damariswriter.hh> #include <ebos/damariswriter.hh>
#endif #endif
#include <ebos/vtkecltracermodule.hh>
#include <opm/input/eclipse/Parser/ParserKeywords/E.hpp> #include <opm/input/eclipse/Parser/ParserKeywords/E.hpp>
@ -50,6 +49,7 @@
#include <opm/simulators/flow/EclWriter.hpp> #include <opm/simulators/flow/EclWriter.hpp>
#include <opm/simulators/flow/FIBlackoilModel.hpp> #include <opm/simulators/flow/FIBlackoilModel.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp> #include <opm/simulators/flow/OutputBlackoilModule.hpp>
#include <opm/simulators/flow/VtkTracerModule.hpp>
#include <tuple> #include <tuple>
@ -63,7 +63,7 @@ namespace Opm::Properties {
namespace TTag { namespace TTag {
struct EclBaseProblem { struct EclBaseProblem {
using InheritsFrom = std::tuple<VtkEclTracer, OutputBlackOil, EclCpGridVanguard>; using InheritsFrom = std::tuple<VtkTracer, OutputBlackOil, EclCpGridVanguard>;
}; };
} }

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

@ -187,7 +187,7 @@ namespace Opm {
EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasFormationVolumeFactor); EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasFormationVolumeFactor);
EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasSaturationPressure); EWOMS_HIDE_PARAM(TypeTag, VtkWriteGasSaturationPressure);
EWOMS_HIDE_PARAM(TypeTag, VtkWriteIntrinsicPermeabilities); EWOMS_HIDE_PARAM(TypeTag, VtkWriteIntrinsicPermeabilities);
EWOMS_HIDE_PARAM(TypeTag, VtkWriteEclTracerConcentration); EWOMS_HIDE_PARAM(TypeTag, VtkWriteTracerConcentration);
EWOMS_HIDE_PARAM(TypeTag, VtkWriteExtrusionFactor); EWOMS_HIDE_PARAM(TypeTag, VtkWriteExtrusionFactor);
EWOMS_HIDE_PARAM(TypeTag, VtkWriteFilterVelocities); EWOMS_HIDE_PARAM(TypeTag, VtkWriteFilterVelocities);
EWOMS_HIDE_PARAM(TypeTag, VtkWriteDensities); EWOMS_HIDE_PARAM(TypeTag, VtkWriteDensities);

22
ebos/vtkecltracermodule.hh → opm/simulators/flow/VtkTracerModule.hpp
View File

@ -22,10 +22,10 @@
*/ */
/*! /*!
* \file * \file
* \copydoc Opm::VtkEclTracerModule * \copydoc Opm::VtkTracerModule
*/ */
#ifndef EWOMS_VTK_ECL_TRACER_MODULE_HH #ifndef OPM_VTK_TRACER_MODULE_HPP
#define EWOMS_VTK_ECL_TRACER_MODULE_HH #define OPM_VTK_TRACER_MODULE_HPP
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
@ -42,18 +42,18 @@ namespace Opm::Properties {
// create new type tag for the VTK tracer output // create new type tag for the VTK tracer output
namespace TTag { namespace TTag {
struct VtkEclTracer {}; struct VtkTracer {};
} }
// create the property tags needed for the tracer model // create the property tags needed for the tracer model
template<class TypeTag, class MyTypeTag> template<class TypeTag, class MyTypeTag>
struct VtkWriteEclTracerConcentration { struct VtkWriteTracerConcentration {
using type = UndefinedProperty; using type = UndefinedProperty;
}; };
// set default values for what quantities to output // set default values for what quantities to output
template<class TypeTag> template<class TypeTag>
struct VtkWriteEclTracerConcentration<TypeTag, TTag::VtkEclTracer> { struct VtkWriteTracerConcentration<TypeTag, TTag::VtkTracer> {
static constexpr bool value = false; static constexpr bool value = false;
}; };
@ -66,7 +66,7 @@ namespace Opm {
* \brief VTK output module for the tracer model's parameters. * \brief VTK output module for the tracer model's parameters.
*/ */
template <class TypeTag> template <class TypeTag>
class VtkEclTracerModule : public BaseOutputModule<TypeTag> class VtkTracerModule : public BaseOutputModule<TypeTag>
{ {
using ParentType = BaseOutputModule<TypeTag>; using ParentType = BaseOutputModule<TypeTag>;
@ -85,7 +85,7 @@ namespace Opm {
using ScalarBuffer = typename ParentType::ScalarBuffer; using ScalarBuffer = typename ParentType::ScalarBuffer;
public: public:
VtkEclTracerModule(const Simulator& simulator) VtkTracerModule(const Simulator& simulator)
: ParentType(simulator) : ParentType(simulator)
{ } { }
@ -95,7 +95,7 @@ namespace Opm {
*/ */
static void registerParameters() static void registerParameters()
{ {
EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteEclTracerConcentration, EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteTracerConcentration,
"Include the tracer concentration " "Include the tracer concentration "
"in the VTK output files"); "in the VTK output files");
} }
@ -163,7 +163,7 @@ namespace Opm {
private: private:
static bool eclTracerConcentrationOutput_() static bool eclTracerConcentrationOutput_()
{ {
static bool val = EWOMS_GET_PARAM(TypeTag, bool, VtkWriteEclTracerConcentration); static bool val = EWOMS_GET_PARAM(TypeTag, bool, VtkWriteTracerConcentration);
return val; return val;
} }
@ -172,4 +172,4 @@ namespace Opm {
}; };
} // namespace Opm } // namespace Opm
#endif #endif // OPM_VTK_TRACER_MODULE_HPP