OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #766 from dr-robertk/PR/add-iterationcount-to-simreport

Browse Source 
SimulatorReport: add total number of newton and linear iterations to report struct.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-03-05 09:26:16 +01:00
commit 05b2adb28d
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
opm/core/simulator/SimulatorReport.cpp
View File

@ -19,14 +19,16 @@
#include "config.h"
#include <opm/core/simulator/SimulatorReport.hpp>
#include <iostream>
#include <ostream>
namespace Opm
{
SimulatorReport::SimulatorReport()
: pressure_time(0.0),
transport_time(0.0),
total_time(0.0)
total_time(0.0),
total_newton_iterations( 0 ),
total_linear_iterations( 0 )
{
}
@ -35,19 +37,27 @@ namespace Opm
pressure_time += sr.pressure_time;
transport_time += sr.transport_time;
total_time += sr.total_time;
total_newton_iterations += sr.total_newton_iterations;
total_linear_iterations += sr.total_linear_iterations;
}
void SimulatorReport::report(std::ostream& os)
{
os << "Total time taken: " << total_time
<< "\n Pressure time: " << pressure_time
<< "\n Transport time: " << transport_time << std::endl;
<< "\n Transport time: " << transport_time
<< "\n Overall Newton Iterations: " << total_newton_iterations
<< "\n Overall Linear Iterations: " << total_linear_iterations
<< std::endl;
}
void SimulatorReport::reportParam(std::ostream& os)
{
os << "/timing/total_time=" << total_time
<< "\n/timing/pressure/total_time=" << pressure_time
<< "\n/timing/transport/total_time=" << transport_time << std::endl;
<< "\n/timing/transport/total_time=" << transport_time
<< "\n/timing/newton/iterations=" << total_newton_iterations
<< "\n/timing/linear/iterations=" << total_linear_iterations
<< std::endl;
}

3
opm/core/simulator/SimulatorReport.hpp
View File

@ -32,6 +32,9 @@ namespace Opm
double transport_time;
double total_time;
unsigned int total_newton_iterations;
unsigned int total_linear_iterations;
/// Default constructor initializing all times to 0.0.
SimulatorReport();
/// Increment this report's times by those in sr.