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

Adapt to moved SimulatorTimer class, and use common SimulatorReport class.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-06-14 14:26:29 +02:00
parent eb845fd45a
commit cd9be1030a
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/polymer_reorder.cpp
View File

@ -31,7 +31,7 @@
#include <opm/core/wells/WellsManager.hpp> #include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp> #include <opm/core/utility/initState.hpp>
#include <opm/core/utility/SimulatorTimer.hpp> #include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/utility/StopWatch.hpp> #include <opm/core/utility/StopWatch.hpp>
#include <opm/core/utility/Units.hpp> #include <opm/core/utility/Units.hpp>
#include <opm/core/utility/writeVtkData.hpp> #include <opm/core/utility/writeVtkData.hpp>

17
opm/polymer/SimulatorPolymer.cpp
View File

@ -32,7 +32,8 @@
#include <opm/core/newwells.h> #include <opm/core/newwells.h>
#include <opm/core/pressure/flow_bc.h> #include <opm/core/pressure/flow_bc.h>
#include <opm/core/utility/SimulatorTimer.hpp> #include <opm/core/simulator/SimulatorReport.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/utility/StopWatch.hpp> #include <opm/core/utility/StopWatch.hpp>
#include <opm/core/utility/writeVtkData.hpp> #include <opm/core/utility/writeVtkData.hpp>
#include <opm/core/utility/miscUtilities.hpp> #include <opm/core/utility/miscUtilities.hpp>
@ -144,10 +145,9 @@ namespace Opm
SimulatorPolymer::SimulatorReport SimulatorReport SimulatorPolymer::run(SimulatorTimer& timer,
SimulatorPolymer::run(SimulatorTimer& timer, PolymerState& state,
PolymerState& state, WellState& well_state)
WellState& well_state)
{ {
return pimpl_->run(timer, state, well_state); return pimpl_->run(timer, state, well_state);
} }
@ -231,10 +231,9 @@ namespace Opm
SimulatorPolymer::SimulatorReport SimulatorReport SimulatorPolymer::Impl::run(SimulatorTimer& timer,
SimulatorPolymer::Impl::run(SimulatorTimer& timer, PolymerState& state,
PolymerState& state, WellState& well_state)
WellState& well_state)
{ {
std::vector<double> transport_src; std::vector<double> transport_src;

12
opm/polymer/SimulatorPolymer.hpp
View File

@ -37,6 +37,7 @@ namespace Opm
class SimulatorTimer; class SimulatorTimer;
class PolymerState; class PolymerState;
class WellState; class WellState;
class SimulatorReport;
/// Class collecting all necessary components for a two-phase simulation. /// Class collecting all necessary components for a two-phase simulation.
class SimulatorPolymer class SimulatorPolymer
@ -77,17 +78,6 @@ namespace Opm
LinearSolverInterface& linsolver, LinearSolverInterface& linsolver,
const double* gravity); const double* gravity);
/// A struct for returning timing data to the client.
struct SimulatorReport
{
double pressure_time;
double transport_time;
double total_time;
SimulatorReport();
void operator+=(const SimulatorReport& sr);
void report(std::ostream& os);
};
/// Run the simulation. /// Run the simulation.
/// This will run succesive timesteps until timer.done() is true. It will /// This will run succesive timesteps until timer.done() is true. It will
/// modify the reservoir and well states. /// modify the reservoir and well states.