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

move FlowMain parameters to TypeTag-free parameter system

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-07-06 10:22:47 +02:00
parent 3716ee664d
commit bfe6f47d58
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,20 +44,10 @@
namespace Opm::Parameters { namespace Opm::Parameters {
template<class TypeTag, class MyTypeTag>
struct OutputInterval { using type = Properties::UndefinedProperty; };
template<class TypeTag, class MyTypeTag>
struct EnableLoggingFalloutWarning { using type = Properties::UndefinedProperty; };
// Do not merge parallel output files or warn about them // Do not merge parallel output files or warn about them
template<class TypeTag> struct EnableLoggingFalloutWarning { static constexpr bool value = false; };
struct EnableLoggingFalloutWarning<TypeTag, Properties::TTag::FlowProblem>
{ static constexpr bool value = false; };
template<class TypeTag> struct OutputInterval { static constexpr int value = 1; };
struct OutputInterval<TypeTag, Properties::TTag::FlowProblem>
{ static constexpr int value = 1; };
} // namespace Opm::Parameters } // namespace Opm::Parameters
@ -101,9 +91,9 @@ namespace Opm {
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
// register the flow specific parameters // register the flow specific parameters
Parameters::registerParam<TypeTag, Parameters::OutputInterval> Parameters::Register<Parameters::OutputInterval>
("Specify the number of report steps between two consecutive writes of restart data"); ("Specify the number of report steps between two consecutive writes of restart data");
Parameters::registerParam<TypeTag, Parameters::EnableLoggingFalloutWarning> Parameters::Register<Parameters::EnableLoggingFalloutWarning>
("Developer option to see whether logging was on non-root processors. " ("Developer option to see whether logging was on non-root processors. "
"In that case it will be appended to the *.DBG or *.PRT files"); "In that case it will be appended to the *.DBG or *.PRT files");
@ -403,7 +393,7 @@ namespace Opm {
detail::mergeParallelLogFiles(eclState().getIOConfig().getOutputDir(), detail::mergeParallelLogFiles(eclState().getIOConfig().getOutputDir(),
Parameters::Get<Parameters::EclDeckFileName>(), Parameters::Get<Parameters::EclDeckFileName>(),
Parameters::get<TypeTag, Parameters::EnableLoggingFalloutWarning>()); Parameters::Get<Parameters::EnableLoggingFalloutWarning>());
} }
void setupModelSimulator() void setupModelSimulator()

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

@ -419,7 +419,7 @@ private:
outputDir, outputDir,
Parameters::get<PreTypeTag, Parameters::OutputMode>(), Parameters::get<PreTypeTag, Parameters::OutputMode>(),
!Parameters::get<PreTypeTag, Parameters::SchedRestart>(), !Parameters::get<PreTypeTag, Parameters::SchedRestart>(),
Parameters::get<PreTypeTag, Parameters::EnableLoggingFalloutWarning>(), Parameters::Get<Parameters::EnableLoggingFalloutWarning>(),
Parameters::get<PreTypeTag, Parameters::ParsingStrictness>(), Parameters::get<PreTypeTag, Parameters::ParsingStrictness>(),
Parameters::get<PreTypeTag, Parameters::InputSkipMode>(), Parameters::get<PreTypeTag, Parameters::InputSkipMode>(),
getNumThreads<PreTypeTag>(), getNumThreads<PreTypeTag>(),