mirror of
https://github.com/OPM/opm-simulators.git
synced 2024-07-07 04:53:03 -05:00
changed: OutputDir parameter moved to Opm::Parameters namespace
This commit is contained in:
parent
da4471acfa
commit
b3fae7f0f9
|
@ -80,10 +80,6 @@ struct FlowProblem {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
struct OutputDir<TypeTag, TTag::FlowProblem> {
|
|
||||||
static constexpr auto value = "";
|
|
||||||
};
|
|
||||||
template<class TypeTag>
|
|
||||||
struct EnableDebuggingChecks<TypeTag, TTag::FlowProblem> {
|
struct EnableDebuggingChecks<TypeTag, TTag::FlowProblem> {
|
||||||
static constexpr bool value = false;
|
static constexpr bool value = false;
|
||||||
};
|
};
|
||||||
|
@ -152,6 +148,14 @@ struct LinearSolverSplice<TypeTag, TTag::FlowProblem> {
|
||||||
|
|
||||||
} // namespace Opm::Properties
|
} // namespace Opm::Properties
|
||||||
|
|
||||||
|
namespace Opm::Parameters {
|
||||||
|
|
||||||
|
template<class TypeTag>
|
||||||
|
struct OutputDir<TypeTag, Properties::TTag::FlowProblem>
|
||||||
|
{ static constexpr auto value = ""; };
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
namespace Opm {
|
namespace Opm {
|
||||||
|
|
||||||
/// A model implementation for three-phase black oil.
|
/// A model implementation for three-phase black oil.
|
||||||
|
|
|
@ -530,7 +530,7 @@ protected:
|
||||||
{
|
{
|
||||||
asImp_().createGrids_();
|
asImp_().createGrids_();
|
||||||
asImp_().filterConnections_();
|
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>();
|
bool enableEclCompatFile = !Parameters::get<TypeTag, Properties::EnableOpmRstFile>();
|
||||||
asImp_().updateOutputDir_(outputDir, enableEclCompatFile);
|
asImp_().updateOutputDir_(outputDir, enableEclCompatFile);
|
||||||
asImp_().finalizeInit_();
|
asImp_().finalizeInit_();
|
||||||
|
|
|
@ -404,12 +404,6 @@ struct EclOutputDoublePrecision<TypeTag, TTag::FlowBaseProblem> {
|
||||||
static constexpr bool value = false;
|
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
|
// the cache for intensive quantities can be used for ECL problems and also yields a
|
||||||
// decent speedup...
|
// decent speedup...
|
||||||
template<class TypeTag>
|
template<class TypeTag>
|
||||||
|
@ -523,4 +517,13 @@ struct ExplicitRockCompaction<TypeTag, TTag::FlowBaseProblem> {
|
||||||
|
|
||||||
} // namespace Opm::Properties
|
} // 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
|
#endif // OPM_FLOW_PROBLEM_PROPERTIES_HPP
|
||||||
|
|
|
@ -336,7 +336,7 @@ private:
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
deckFilename = Parameters::get<PreTypeTag, Properties::EclDeckFileName>();
|
deckFilename = Parameters::get<PreTypeTag, Properties::EclDeckFileName>();
|
||||||
outputDir = Parameters::get<PreTypeTag, Properties::OutputDir>();
|
outputDir = Parameters::get<PreTypeTag, Parameters::OutputDir>();
|
||||||
}
|
}
|
||||||
|
|
||||||
#if HAVE_DAMARIS
|
#if HAVE_DAMARIS
|
||||||
|
|
Loading…
Reference in New Issue
Block a user