Prune ForceDisable Parameters From *Log Functions

They aren't really needed in the current sources.  We can readd
them, or something similar, if the need to turn off these reports
from a command line parameter arises.

Suggested by: [at]akva2.
This commit is contained in:
Bård Skaflestad 2023-12-08 10:18:41 +01:00
parent ec549df37b
commit d79bd2848f
3 changed files with 9 additions and 22 deletions

View File

@ -226,10 +226,8 @@ EclGenericOutputBlackoilModule<FluidSystem,Scalar>::
template<class FluidSystem, class Scalar> template<class FluidSystem, class Scalar>
void EclGenericOutputBlackoilModule<FluidSystem,Scalar>:: void EclGenericOutputBlackoilModule<FluidSystem,Scalar>::
outputCumLog(std::size_t reportStepNum, bool forceDisableCumOutput) outputCumLog(std::size_t reportStepNum)
{ {
if (forceDisableCumOutput) { return; }
logOutput_.cumulative(reportStepNum, logOutput_.cumulative(reportStepNum,
[this](const std::string& name) [this](const std::string& name)
{ return this->isDefunctParallelWell(name); }); { return this->isDefunctParallelWell(name); });
@ -237,10 +235,8 @@ outputCumLog(std::size_t reportStepNum, bool forceDisableCumOutput)
template<class FluidSystem,class Scalar> template<class FluidSystem,class Scalar>
void EclGenericOutputBlackoilModule<FluidSystem,Scalar>:: void EclGenericOutputBlackoilModule<FluidSystem,Scalar>::
outputProdLog(std::size_t reportStepNum, bool forceDisableProdOutput) outputProdLog(std::size_t reportStepNum)
{ {
if (forceDisableProdOutput) { return; }
logOutput_.production(reportStepNum, logOutput_.production(reportStepNum,
[this](const std::string& name) [this](const std::string& name)
{ return this->isDefunctParallelWell(name); }); { return this->isDefunctParallelWell(name); });
@ -248,10 +244,8 @@ outputProdLog(std::size_t reportStepNum, bool forceDisableProdOutput)
template<class FluidSystem,class Scalar> template<class FluidSystem,class Scalar>
void EclGenericOutputBlackoilModule<FluidSystem,Scalar>:: void EclGenericOutputBlackoilModule<FluidSystem,Scalar>::
outputInjLog(std::size_t reportStepNum, bool forceDisableInjOutput) outputInjLog(std::size_t reportStepNum)
{ {
if (forceDisableInjOutput) { return; }
logOutput_.injection(reportStepNum, logOutput_.injection(reportStepNum,
[this](const std::string& name) [this](const std::string& name)
{ return this->isDefunctParallelWell(name); }); { return this->isDefunctParallelWell(name); });

View File

@ -62,16 +62,13 @@ public:
}; };
// write cumulative production and injection reports to output // write cumulative production and injection reports to output
void outputCumLog(std::size_t reportStepNum, void outputCumLog(std::size_t reportStepNum);
bool forceDisableCumOutput);
// write production report to output // write production report to output
void outputProdLog(std::size_t reportStepNum, void outputProdLog(std::size_t reportStepNum);
bool forceDisableProdOutput);
// write injection report to output // write injection report to output
void outputInjLog(std::size_t reportStepNum, void outputInjLog(std::size_t reportStepNum);
bool forceDisableInjOutput);
// write Fluid In Place to output log // write Fluid In Place to output log
Inplace outputFipLog(std::map<std::string, double>& miscSummaryData, Inplace outputFipLog(std::map<std::string, double>& miscSummaryData,

View File

@ -311,13 +311,9 @@ public:
if (! isSubStep) { if (! isSubStep) {
OPM_TIMEBLOCK(outputProdInjLogs); OPM_TIMEBLOCK(outputProdInjLogs);
const bool forceDisableProdOutput = false; eclOutputModule_->outputProdLog(reportStepNum);
const bool forceDisableInjOutput = false; eclOutputModule_->outputInjLog(reportStepNum);
const bool forceDisableCumOutput = false; eclOutputModule_->outputCumLog(reportStepNum);
eclOutputModule_->outputProdLog(reportStepNum, forceDisableProdOutput);
eclOutputModule_->outputInjLog(reportStepNum, forceDisableInjOutput);
eclOutputModule_->outputCumLog(reportStepNum, forceDisableCumOutput);
OpmLog::note(""); // Blank line after all reports. OpmLog::note(""); // Blank line after all reports.
} }