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

Change substep to time step in logging

Browse Source
This commit is contained in:
Alf B. Rustad 2017-10-13 13:29:31 +02:00
parent 2d2198a775
commit ad68c05982
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -1803,7 +1803,7 @@ typedef Eigen::Array<double,
} }
msg += " WELL-CONT"; msg += " WELL-CONT";
// std::cout << " WELL-CONT "; // std::cout << " WELL-CONT ";
OpmLog::note(msg); OpmLog::debug(msg);
} }
std::ostringstream ss; std::ostringstream ss;
const std::streamsize oprec = ss.precision(3); const std::streamsize oprec = ss.precision(3);
@ -1822,7 +1822,7 @@ typedef Eigen::Array<double,
// std::cout << std::setw(11) << residualWell; // std::cout << std::setw(11) << residualWell;
ss.precision(oprec); ss.precision(oprec);
ss.flags(oflags); ss.flags(oflags);
OpmLog::note(ss.str()); OpmLog::debug(ss.str());
} }
for (int idx = 0; idx < nm; ++idx) { for (int idx = 0; idx < nm; ++idx) {
@ -1933,7 +1933,7 @@ typedef Eigen::Array<double,
msg += " W-FLUX(" + materialName(idx).substr(0, 1) + ")"; msg += " W-FLUX(" + materialName(idx).substr(0, 1) + ")";
} }
msg += " WELL-CONT"; msg += " WELL-CONT";
OpmLog::note(msg); OpmLog::debug(msg);
} }
std::ostringstream ss; std::ostringstream ss;
const std::streamsize oprec = ss.precision(3); const std::streamsize oprec = ss.precision(3);
@ -1945,7 +1945,7 @@ typedef Eigen::Array<double,
ss << std::setw(11) << residualWell; ss << std::setw(11) << residualWell;
ss.precision(oprec); ss.precision(oprec);
ss.flags(oflags); ss.flags(oflags);
OpmLog::note(ss.str()); OpmLog::debug(ss.str());
} }
return converged; return converged;
} }

4
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -925,7 +925,7 @@ namespace Opm {
for (int compIdx = 0; compIdx < numComp; ++compIdx) { for (int compIdx = 0; compIdx < numComp; ++compIdx) {
msg += " CNV(" + key[ compIdx ] + ") "; msg += " CNV(" + key[ compIdx ] + ") ";
} }
OpmLog::note(msg); OpmLog::debug(msg);
} }
std::ostringstream ss; std::ostringstream ss;
const std::streamsize oprec = ss.precision(3); const std::streamsize oprec = ss.precision(3);
@ -939,7 +939,7 @@ namespace Opm {
} }
ss.precision(oprec); ss.precision(oprec);
ss.flags(oflags); ss.flags(oflags);
OpmLog::note(ss.str()); OpmLog::debug(ss.str());
} }
for (int phaseIdx = 0; phaseIdx < numPhases(); ++phaseIdx) { for (int phaseIdx = 0; phaseIdx < numPhases(); ++phaseIdx) {

2
opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -345,7 +345,7 @@ public:
std::string msg = std::string msg =
"Time step took " + std::to_string(solver_timer.secsSinceStart()) + " seconds; " "Time step took " + std::to_string(solver_timer.secsSinceStart()) + " seconds; "
"total solver time " + std::to_string(report.solver_time) + " seconds."; "total solver time " + std::to_string(report.solver_time) + " seconds.";
OpmLog::note(msg); OpmLog::debug(msg);
} }
// write simulation state at the report stage // write simulation state at the report stage

8
opm/simulators/timestepping/AdaptiveTimeStepping_impl.hpp
View File

@ -225,7 +225,7 @@ namespace Opm {
if( timestep_verbose_ ) if( timestep_verbose_ )
{ {
std::ostringstream ss; std::ostringstream ss;
ss <<" Substep " << substepTimer.currentStepNum() << ", stepsize " ss <<"Time step " << substepTimer.currentStepNum() << ", stepsize "
<< unit::convert::to(substepTimer.currentStepLength(), unit::day) << " days."; << unit::convert::to(substepTimer.currentStepLength(), unit::day) << " days.";
OpmLog::info(ss.str()); OpmLog::info(ss.str());
} }
@ -238,7 +238,7 @@ namespace Opm {
if( solver_verbose_ ) { if( solver_verbose_ ) {
// report number of linear iterations // report number of linear iterations
OpmLog::note("Overall linear iterations used: " + std::to_string(substepReport.total_linear_iterations)); OpmLog::debug("Overall linear iterations used: " + std::to_string(substepReport.total_linear_iterations));
} }
} }
catch (const Opm::TooManyIterations& e) { catch (const Opm::TooManyIterations& e) {
@ -309,7 +309,7 @@ namespace Opm {
if( timestep_verbose_ ) if( timestep_verbose_ )
{ {
std::ostringstream ss; std::ostringstream ss;
ss << " Substep summary: "; ss << "Time step summary: ";
if (substepReport.total_well_iterations != 0) { if (substepReport.total_well_iterations != 0) {
ss << "well its = " << std::setw(2) << substepReport.total_well_iterations << ", "; ss << "well its = " << std::setw(2) << substepReport.total_well_iterations << ", ";
} }
@ -389,7 +389,7 @@ namespace Opm {
std::ostringstream ss; std::ostringstream ss;
substepTimer.report(ss); substepTimer.report(ss);
ss << "Suggested next step size = " << unit::convert::to( suggested_next_timestep_, unit::day ) << " (days)" << std::endl; ss << "Suggested next step size = " << unit::convert::to( suggested_next_timestep_, unit::day ) << " (days)" << std::endl;
OpmLog::note(ss.str()); OpmLog::debug(ss.str());
} }
if( ! std::isfinite( suggested_next_timestep_ ) ) { // check for NaN if( ! std::isfinite( suggested_next_timestep_ ) ) { // check for NaN