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

Remove SimulationTimer from RFTWriter

Browse Source
This commit is contained in:
Jørgen Kvalsvik
2016-05-06 13:11:07 +02:00
parent 94f0dd92ed
commit 3bbdbf888f
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
opm/output/eclipse/EclipseWriteRFTHandler.hpp
View File

@@ -20,8 +20,6 @@
#ifndef OPM_ECLIPSE_WRITE_RFT_HANDLER_HPP
#define OPM_ECLIPSE_WRITE_RFT_HANDLER_HPP
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <ert/ecl/ecl_rft_node.h>
@@ -45,7 +43,9 @@ namespace EclipseWriterDetails {
void writeTimeStep(const IOConfig& ioConfig,
const std::string& filename,
const ert_ecl_unit_enum ecl_unit,
const SimulatorTimerInterface& simulatorTimer,
int report_step,
time_t current_time,
double secs_elapsed,
std::vector<std::shared_ptr< const Well >>& wells,
std::shared_ptr< const EclipseGrid > eclipseGrid,
std::vector<double>& pressure,
@@ -57,7 +57,9 @@ namespace EclipseWriterDetails {
private:
ecl_rft_node_type * createEclRFTNode(std::shared_ptr< const Well > well,
const SimulatorTimerInterface& simulatorTimer,
int report_step,
time_t current_time,
double secs_elapsed,
std::shared_ptr< const EclipseGrid > eclipseGrid,
const std::vector<double>& pressure,
const std::vector<double>& swat,

26
src/opm/output/eclipse/EclipseWriteRFTHandler.cpp
View File

@@ -20,7 +20,6 @@
#include <vector>
#include <opm/output/eclipse/EclipseWriteRFTHandler.hpp>
#include <opm/core/simulator/SimulatorTimer.hpp>
#include <opm/core/props/BlackoilPhases.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/miscUtilities.hpp>
@@ -50,7 +49,9 @@ namespace EclipseWriterDetails {
void EclipseWriteRFTHandler::writeTimeStep(const IOConfig& ioConfig,
const std::string& filename,
const ert_ecl_unit_enum ecl_unit,
const SimulatorTimerInterface& simulatorTimer,
int report_step,
time_t current_time,
double secs_elapsed,
std::vector<WellConstPtr>& wells,
EclipseGridConstPtr eclipseGrid,
std::vector<double>& pressure,
@@ -58,15 +59,18 @@ namespace EclipseWriterDetails {
std::vector<double>& sgas) {
std::ios_base::openmode mode = std::ios_base::app;
if (simulatorTimer.reportStepNum() == ioConfig.getFirstRFTStep())
if( report_step == ioConfig.getFirstRFTStep() )
mode = std::ios_base::out;
{
ERT::FortIO fortio(filename , mode);
for (const auto& well : wells) {
if ((well->getRFTActive(simulatorTimer.reportStepNum())) || (well->getPLTActive(simulatorTimer.reportStepNum()))) {
if ((well->getRFTActive( report_step )) || (well->getPLTActive( report_step ))) {
ERT::ert_unique_ptr<ecl_rft_node_type, ecl_rft_node_free> ecl_node( createEclRFTNode(well,
simulatorTimer,
report_step,
current_time,
secs_elapsed,
eclipseGrid,
pressure,
swat,
@@ -87,8 +91,10 @@ namespace EclipseWriterDetails {
ecl_rft_node_type * EclipseWriteRFTHandler::createEclRFTNode(WellConstPtr well,
const SimulatorTimerInterface& simulatorTimer,
ecl_rft_node_type * EclipseWriteRFTHandler::createEclRFTNode( WellConstPtr well,
int report_step,
time_t current_time,
double secs_elapsed,
EclipseGridConstPtr eclipseGrid,
const std::vector<double>& pressure,
const std::vector<double>& swat,
@@ -96,9 +102,9 @@ namespace EclipseWriterDetails {
const std::string& well_name = well->name();
size_t timestep = (size_t)simulatorTimer.reportStepNum();
time_t recording_date = simulatorTimer.currentPosixTime();
double days = Opm::unit::convert::to(simulatorTimer.simulationTimeElapsed(), Opm::unit::day);
size_t timestep = size_t( report_step );
time_t recording_date = current_time;
double days = Opm::unit::convert::to( secs_elapsed, Opm::unit::day );
std::string type = "RFT";
ecl_rft_node_type * ecl_rft_node = ecl_rft_node_alloc_new(well_name.c_str(), type.c_str(), recording_date, days);

4
src/opm/output/eclipse/EclipseWriter.cpp
View File

@@ -1405,7 +1405,9 @@ void EclipseWriter::writeTimeStep(const SimulatorTimerInterface& timer,
eclipseWriteRFTHandler->writeTimeStep(*ioConfig,
rft_filename,
ecl_unit,
timer,
timer.reportStepNum(),
timer.currentPosixTime(),
timer.simulationTimeElapsed(),
wells,
eclipseState_->getInputGrid(),
pressure,