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

rename TTag::EclFlowProblemTPFA to TTag::FlowProblemTPFA

Browse Source
This commit is contained in:
Arne Morten Kvarving
2024-02-06 14:47:31 +01:00
parent 67c9bba4c9
commit 4aa6dc355f
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flow/flow_ebos_blackoil.cpp
View File

@@ -30,13 +30,13 @@ namespace Opm {
namespace Properties { namespace Properties {
template<class TypeTag> template<class TypeTag>
struct Linearizer<TypeTag, TTag::EclFlowProblemTPFA> { using type = TpfaLinearizer<TypeTag>; }; struct Linearizer<TypeTag, TTag::FlowProblemTPFA> { using type = TpfaLinearizer<TypeTag>; };
template<class TypeTag> template<class TypeTag>
struct LocalResidual<TypeTag, TTag::EclFlowProblemTPFA> { using type = BlackOilLocalResidualTPFA<TypeTag>; }; struct LocalResidual<TypeTag, TTag::FlowProblemTPFA> { using type = BlackOilLocalResidualTPFA<TypeTag>; };
template<class TypeTag> template<class TypeTag>
struct EnableDiffusion<TypeTag, TTag::EclFlowProblemTPFA> { static constexpr bool value = false; }; struct EnableDiffusion<TypeTag, TTag::FlowProblemTPFA> { static constexpr bool value = false; };
} }
} }
@@ -44,14 +44,14 @@ namespace Opm {
namespace Opm namespace Opm
{ {
std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblemTPFA>> std::unique_ptr<FlowMain<Properties::TTag::FlowProblemTPFA>>
flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles) flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles)
{ {
// we always want to use the default locale, and thus spare us the trouble // we always want to use the default locale, and thus spare us the trouble
// with incorrect locale settings. // with incorrect locale settings.
resetLocale(); resetLocale();
return std::make_unique<FlowMain<Properties::TTag::EclFlowProblemTPFA>>( return std::make_unique<FlowMain<Properties::TTag::FlowProblemTPFA>>(
argc, argv, outputCout, outputFiles); argc, argv, outputCout, outputFiles);
} }
@@ -62,14 +62,14 @@ int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool output
// with incorrect locale settings. // with incorrect locale settings.
resetLocale(); resetLocale();
FlowMain<Properties::TTag::EclFlowProblemTPFA> FlowMain<Properties::TTag::FlowProblemTPFA>
mainfunc {argc, argv, outputCout, outputFiles}; mainfunc {argc, argv, outputCout, outputFiles};
return mainfunc.execute(); return mainfunc.execute();
} }
int flowEbosBlackoilTpfaMainStandalone(int argc, char** argv) int flowEbosBlackoilTpfaMainStandalone(int argc, char** argv)
{ {
using TypeTag = Properties::TTag::EclFlowProblemTPFA; using TypeTag = Properties::TTag::FlowProblemTPFA;
auto mainObject = std::make_unique<Opm::Main>(argc, argv); auto mainObject = std::make_unique<Opm::Main>(argc, argv);
auto ret = mainObject->runStatic<TypeTag>(); auto ret = mainObject->runStatic<TypeTag>();
// Destruct mainObject as the destructor calls MPI_Finalize! // Destruct mainObject as the destructor calls MPI_Finalize!

4
flow/flow_ebos_blackoil.hpp
View File

@@ -21,7 +21,7 @@
namespace Opm::Properties::TTag { namespace Opm::Properties::TTag {
struct FlowProblem; struct FlowProblem;
struct EclFlowProblemTPFA { struct FlowProblemTPFA {
using InheritsFrom = std::tuple<FlowProblem>; using InheritsFrom = std::tuple<FlowProblem>;
}; };
} }
@@ -34,7 +34,7 @@ int flowEbosBlackoilTpfaMain(int argc, char** argv, bool outputCout, bool output
template<class TypeTag> class FlowMain; template<class TypeTag> class FlowMain;
//! \brief Initialization function used in flow binary and python simulator. //! \brief Initialization function used in flow binary and python simulator.
std::unique_ptr<FlowMain<Properties::TTag::EclFlowProblemTPFA>> std::unique_ptr<FlowMain<Properties::TTag::FlowProblemTPFA>>
flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles); flowEbosBlackoilTpfaMainInit(int argc, char** argv, bool outputCout, bool outputFiles);
//! \brief Main function used in flow_brine binary. //! \brief Main function used in flow_brine binary.

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

@@ -170,7 +170,7 @@ public:
return exitCode; return exitCode;
} }
using FlowMainType = FlowMain<Properties::TTag::EclFlowProblemTPFA>; using FlowMainType = FlowMain<Properties::TTag::FlowProblemTPFA>;
// To be called from the Python interface code. Only do the // To be called from the Python interface code. Only do the
// initialization and then return a pointer to the FlowEbosMain // initialization and then return a pointer to the FlowEbosMain
// object that can later be accessed directly from the Python interface // object that can later be accessed directly from the Python interface

2
opm/simulators/flow/python/PyBlackOilSimulator.hpp
View File

@@ -33,7 +33,7 @@ namespace Opm::Pybind {
class PyBlackOilSimulator class PyBlackOilSimulator
{ {
private: private:
using TypeTag = Opm::Properties::TTag::EclFlowProblemTPFA; using TypeTag = Opm::Properties::TTag::FlowProblemTPFA;
using Simulator = Opm::GetPropType<TypeTag, Opm::Properties::Simulator>; using Simulator = Opm::GetPropType<TypeTag, Opm::Properties::Simulator>;
public: public:

2
python/simulators/PyBlackOilSimulator.cpp
View File

@@ -101,7 +101,7 @@ py::array_t<double> PyBlackOilSimulator::getPorosity()
int PyBlackOilSimulator::run() int PyBlackOilSimulator::run()
{ {
auto main_object = Opm::Main( this->deck_filename_ ); auto main_object = Opm::Main( this->deck_filename_ );
return main_object.runStatic<Opm::Properties::TTag::EclFlowProblemTPFA>(); return main_object.runStatic<Opm::Properties::TTag::FlowProblemTPFA>();
} }
void PyBlackOilSimulator::setPorosity( py::array_t<double, void PyBlackOilSimulator::setPorosity( py::array_t<double,