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/ecltracermodel.hh to opm/simulators/flow

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-02-05 19:22:15 +01:00
parent 3a3881e8d9
commit 9d256bc233
4 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

@ -424,7 +424,6 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclproblem.hh
ebos/eclproblem_properties.hh
ebos/eclthresholdpressure.hh
ebos/ecltracermodel.hh
ebos/ecltransmissibility.hh
ebos/ecltransmissibility_impl.hh
ebos/vtkecltracermodule.hh
@ -470,6 +469,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/SimulatorSerializer.hpp
opm/simulators/flow/SolutionContainers.hpp
opm/simulators/flow/SubDomain.hpp
opm/simulators/flow/TracerModel.hpp
opm/simulators/flow/ValidationFunctions.hpp
opm/core/props/BlackoilPhases.hpp
opm/core/props/phaseUsageFromDeck.hpp

10
ebos/eclproblem.hh
View File

@ -45,7 +45,6 @@
#if HAVE_DAMARIS
#include <ebos/damariswriter.hh>
#endif
#include <ebos/ecltracermodel.hh>
#include <ebos/vtkecltracermodule.hh>
#include <opm/common/utility/TimeService.hpp>
@ -83,6 +82,7 @@
#include <opm/simulators/flow/EclWriter.hpp>
#include <opm/simulators/flow/FIBlackoilModel.hpp>
#include <opm/simulators/flow/OutputBlackoilModule.hpp>
#include <opm/simulators/flow/TracerModel.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
@ -194,8 +194,8 @@ class EclProblem : public GetPropType<TypeTag, Properties::BaseProblem>
using DamarisWriterType = DamarisWriter<TypeTag>;
#endif
using TracerModel = EclTracerModel<TypeTag>;
using DirectionalMobilityPtr = Opm::Utility::CopyablePtr<DirectionalMobility<TypeTag, Evaluation>>;
using TracerModel = ::Opm::TracerModel<TypeTag>;
using DirectionalMobilityPtr = Utility::CopyablePtr<DirectionalMobility<TypeTag, Evaluation>>;
public:
using EclGenericProblem<GridView,FluidSystem,Scalar>::briefDescription;
@ -923,10 +923,10 @@ public:
EclThresholdPressure<TypeTag>& thresholdPressure()
{ return thresholdPressures_; }
const EclTracerModel<TypeTag>& tracerModel() const
const TracerModel& tracerModel() const
{ return tracerModel_; }
EclTracerModel<TypeTag>& tracerModel()
TracerModel& tracerModel()
{ return tracerModel_; }
/*!

22
ebos/ecltracermodel.hh → opm/simulators/flow/TracerModel.hpp
View File

@ -23,10 +23,10 @@
/**
* \file
*
* \copydoc Opm::EclTracerModel
* \copydoc Opm::TracerModel
*/
#ifndef EWOMS_ECL_TRACER_MODEL_HH
#define EWOMS_ECL_TRACER_MODEL_HH
#ifndef OPM_TRACER_MODEL_HPP
#define OPM_TRACER_MODEL_HPP
#include <opm/common/OpmLog/OpmLog.hpp>
@ -54,16 +54,16 @@ struct EnableTracerModel {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
* \ingroup BlackOilSimulator
*
* \brief A class which handles tracers as specified in by ECL
*/
template <class TypeTag>
class EclTracerModel : public GenericTracerModel<GetPropType<TypeTag, Properties::Grid>,
GetPropType<TypeTag, Properties::GridView>,
GetPropType<TypeTag, Properties::DofMapper>,
GetPropType<TypeTag, Properties::Stencil>,
GetPropType<TypeTag, Properties::Scalar>>
class TracerModel : public GenericTracerModel<GetPropType<TypeTag, Properties::Grid>,
GetPropType<TypeTag, Properties::GridView>,
GetPropType<TypeTag, Properties::DofMapper>,
GetPropType<TypeTag, Properties::Stencil>,
GetPropType<TypeTag, Properties::Scalar>>
{
using BaseType = GenericTracerModel<GetPropType<TypeTag, Properties::Grid>,
GetPropType<TypeTag, Properties::GridView>,
@ -92,7 +92,7 @@ class EclTracerModel : public GenericTracerModel<GetPropType<TypeTag, Properties
enum { gasPhaseIdx = FluidSystem::gasPhaseIdx };
public:
EclTracerModel(Simulator& simulator)
TracerModel(Simulator& simulator)
: BaseType(simulator.vanguard().gridView(),
simulator.vanguard().eclState(),
simulator.vanguard().cartesianIndexMapper(),
@ -617,4 +617,4 @@ protected:
} // namespace Opm
#endif
#endif // OPM_TRACER_MODEL_HPP

2
tests/test_RestartSerialization.cpp
View File

@ -428,7 +428,7 @@ BOOST_AUTO_TEST_CASE(EclGenericTracerModel)
namespace Opm {
class TBatchExport : public EclTracerModel<Properties::TTag::EbosTypeTag> {
class TBatchExport : public TracerModel<Properties::TTag::EbosTypeTag> {
public:
using TBatch = TracerBatch<double>;
};