OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

opm-common: Simplify import of time step data

Browse Source 
Avoid using restart state object for import of year, month, ...
This commit is contained in:
Magne Sjaastad 2024-01-11 11:50:56 +01:00
parent 58815aebea
commit fa94aa0bf9
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationLibCode/FileInterface/RifReaderOpmCommon.cpp
View File

@ -40,7 +40,9 @@
#include "opm/io/eclipse/ERst.hpp" #include "opm/io/eclipse/ERst.hpp"
#include "opm/io/eclipse/RestartFileView.hpp" #include "opm/io/eclipse/RestartFileView.hpp"
#include "opm/io/eclipse/rst/state.hpp" #include "opm/io/eclipse/rst/state.hpp"
#include "opm/output/eclipse/VectorItems/doubhead.hpp"
#include "opm/output/eclipse/VectorItems/group.hpp" #include "opm/output/eclipse/VectorItems/group.hpp"
#include "opm/output/eclipse/VectorItems/intehead.hpp"
#include "opm/output/eclipse/VectorItems/well.hpp" #include "opm/output/eclipse/VectorItems/well.hpp"
using namespace Opm; using namespace Opm;
@ -434,28 +436,24 @@ void RifReaderOpmCommon::readWellCells( std::shared_ptr<EclIO::ERst> restartFil
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RifReaderOpmCommon::TimeDataFile> RifReaderOpmCommon::readTimeSteps( std::shared_ptr<EclIO::ERst> restartFile ) std::vector<RifReaderOpmCommon::TimeDataFile> RifReaderOpmCommon::readTimeSteps( std::shared_ptr<EclIO::ERst> restartFile )
{ {
// It is required to create a deck as the input parameter to runspec. The default() initialization of the runspec keyword does not
// initialize the object as expected.
Deck deck;
Runspec runspec( deck );
Parser parser( false );
std::vector<RifReaderOpmCommon::TimeDataFile> reportTimeData; std::vector<RifReaderOpmCommon::TimeDataFile> reportTimeData;
try try
{ {
namespace VI = Opm::RestartIO::Helpers::VectorItems;
for ( auto seqNumber : restartFile->listOfReportStepNumbers() ) for ( auto seqNumber : restartFile->listOfReportStepNumbers() )
{ {
auto fileView = std::make_shared<EclIO::RestartFileView>( restartFile, seqNumber ); auto fileView = std::make_shared<EclIO::RestartFileView>( restartFile, seqNumber );
auto state = RestartIO::RstState::load( fileView, runspec, parser ); auto intehead = fileView->intehead();
auto header = state.header;
int year = header.year; auto year = intehead[VI::intehead::YEAR];
int month = header.month; auto month = intehead[VI::intehead::MONTH];
int day = header.mday; auto day = intehead[VI::intehead::DAY];
double daySinceSimStart = header.next_timestep1; auto doubhead = fileView->doubhead();
auto daySinceSimStart = doubhead[VI::doubhead::TsInit];
reportTimeData.emplace_back( reportTimeData.emplace_back(
TimeDataFile{ .sequenceNumber = seqNumber, .year = year, .month = month, .day = day, .simulationTimeFromStart = daySinceSimStart } ); TimeDataFile{ .sequenceNumber = seqNumber, .year = year, .month = month, .day = day, .simulationTimeFromStart = daySinceSimStart } );