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

ECL problem: return the stem of the name of the deck file in the name() method

Browse Source 
this causes output files to have the expected names, e.g. "SPE9" or
"NORNE" instead of "ECL"...
This commit is contained in:
Andreas Lauser 2014-04-25 17:48:41 +02:00
parent 0bb56e770f
commit 45758d723c
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ewoms/io/eclipsewriter.hh
View File

@ -152,9 +152,6 @@ public:
, vertexMapper_(gridView_) , vertexMapper_(gridView_)
{ {
reportStepIdx_ = 0; reportStepIdx_ = 0;
if (enableEclipseOutput_())
EclipseWriterHelper<TypeTag, Grid>::writeHeaders_(*this);
} }
~EclipseWriter() ~EclipseWriter()
@ -182,11 +179,13 @@ public:
} }
/*! /*!
* \brief Called when ever a new time step or a new grid must be * \brief Called whenever a new time step must be written.
* written.
*/ */
void beginWrite(double t) void beginWrite(double t)
{} {
if (enableEclipseOutput_() && reportStepIdx_ == 0)
EclipseWriterHelper<TypeTag, Grid>::writeHeaders_(*this);
}
/* /*
* \brief Add a vertex-centered scalar field to the output. * \brief Add a vertex-centered scalar field to the output.

9
tests/problems/eclproblem.hh
View File

@ -63,9 +63,6 @@ NEW_TYPE_TAG(EclBaseProblem, INHERITS_FROM(EclGridManager));
// The temperature inside the reservoir // The temperature inside the reservoir
NEW_PROP_TAG(Temperature); NEW_PROP_TAG(Temperature);
// The name of the simulation
NEW_PROP_TAG(SimulationName);
// Set the problem property // Set the problem property
SET_TYPE_PROP(EclBaseProblem, Problem, Ewoms::EclProblem<TypeTag>); SET_TYPE_PROP(EclBaseProblem, Problem, Ewoms::EclProblem<TypeTag>);
@ -100,7 +97,6 @@ SET_BOOL_PROP(EclBaseProblem, EnablePartialRelinearization, true);
// set the defaults for some problem specific properties // set the defaults for some problem specific properties
SET_SCALAR_PROP(EclBaseProblem, Temperature, 293.15); SET_SCALAR_PROP(EclBaseProblem, Temperature, 293.15);
SET_STRING_PROP(EclBaseProblem, SimulationName, "ecl");
// The default for the end time of the simulation [s] // The default for the end time of the simulation [s]
// //
@ -180,9 +176,6 @@ public:
EWOMS_REGISTER_PARAM(TypeTag, Scalar, Temperature, EWOMS_REGISTER_PARAM(TypeTag, Scalar, Temperature,
"The temperature [K] in the reservoir"); "The temperature [K] in the reservoir");
EWOMS_REGISTER_PARAM(TypeTag, std::string, SimulationName,
"The name of the simulation used for the output "
"files");
} }
/*! /*!
@ -284,7 +277,7 @@ public:
* \copydoc FvBaseProblem::name * \copydoc FvBaseProblem::name
*/ */
std::string name() const std::string name() const
{ return EWOMS_GET_PARAM(TypeTag, std::string, SimulationName); } { return this->simulator().gridManager().caseName(); }
/*! /*!
* \copydoc FvBaseMultiPhaseProblem::temperature * \copydoc FvBaseMultiPhaseProblem::temperature