OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-07-04 11:33:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

changed: OutputDir parameter moved to Opm::Parameters namespace

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-06-28 12:17:13 +02:00
parent da4471acfa
commit b3fae7f0f9
4 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
opm/simulators/flow/BlackoilModel.hpp
View File

@ -80,10 +80,6 @@ struct FlowProblem {
};
}
template<class TypeTag>
struct OutputDir<TypeTag, TTag::FlowProblem> {
static constexpr auto value = "";
};
template<class TypeTag>
struct EnableDebuggingChecks<TypeTag, TTag::FlowProblem> {
static constexpr bool value = false;
};
@ -152,6 +148,14 @@ struct LinearSolverSplice<TypeTag, TTag::FlowProblem> {
} // namespace Opm::Properties
namespace Opm::Parameters {
template<class TypeTag>
struct OutputDir<TypeTag, Properties::TTag::FlowProblem>
{ static constexpr auto value = ""; };
}
namespace Opm {
/// A model implementation for three-phase black oil.

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

@ -530,7 +530,7 @@ protected:
{
asImp_().createGrids_();
asImp_().filterConnections_();
std::string outputDir = Parameters::get<TypeTag, Properties::OutputDir>();
std::string outputDir = Parameters::get<TypeTag, Parameters::OutputDir>();
bool enableEclCompatFile = !Parameters::get<TypeTag, Properties::EnableOpmRstFile>();
asImp_().updateOutputDir_(outputDir, enableEclCompatFile);
asImp_().finalizeInit_();

15
opm/simulators/flow/FlowProblemProperties.hpp
View File

@ -404,12 +404,6 @@ struct EclOutputDoublePrecision<TypeTag, TTag::FlowBaseProblem> {
static constexpr bool value = false;
};
// The default location for the ECL output files
template<class TypeTag>
struct OutputDir<TypeTag, TTag::FlowBaseProblem> {
static constexpr auto value = ".";
};
// the cache for intensive quantities can be used for ECL problems and also yields a
// decent speedup...
template<class TypeTag>
@ -523,4 +517,13 @@ struct ExplicitRockCompaction<TypeTag, TTag::FlowBaseProblem> {
} // namespace Opm::Properties
namespace Opm::Parameters {
// The default location for the ECL output files
template<class TypeTag>
struct OutputDir<TypeTag, Properties::TTag::FlowBaseProblem>
{ static constexpr auto value = "."; };
} // namespace Opm::Parameters
#endif // OPM_FLOW_PROBLEM_PROPERTIES_HPP

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

@ -336,7 +336,7 @@ private:
}
else {
deckFilename = Parameters::get<PreTypeTag, Properties::EclDeckFileName>();
outputDir = Parameters::get<PreTypeTag, Properties::OutputDir>();
outputDir = Parameters::get<PreTypeTag, Parameters::OutputDir>();
}
#if HAVE_DAMARIS