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

Merge pull request #1387 from bska/dont-output-rft-unless-requested

Browse Source 
Don't Output RFT Files Unless Specifically Requested
This commit is contained in:
Bård Skaflestad 2020-01-15 12:45:40 +01:00 committed by GitHub
commit a8d05385e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/opm/output/eclipse/EclipseIO.cpp
View File

@ -31,6 +31,7 @@
#include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp> #include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp> #include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Runspec.hpp> #include <opm/parser/eclipse/EclipseState/Runspec.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/RFTConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp> #include <opm/parser/eclipse/EclipseState/Schedule/Well/WellConnections.hpp>
#include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp> #include <opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
@ -46,6 +47,7 @@
#include <opm/io/eclipse/OutputStream.hpp> #include <opm/io/eclipse/OutputStream.hpp>
#include <algorithm> #include <algorithm>
#include <cstddef>
#include <cstdlib> #include <cstdlib>
#include <cctype> #include <cctype>
#include <memory> // unique_ptr #include <memory> // unique_ptr
@ -99,6 +101,7 @@ class EclipseIO::Impl {
Impl( const EclipseState&, EclipseGrid, const Schedule&, const SummaryConfig& ); Impl( const EclipseState&, EclipseGrid, const Schedule&, const SummaryConfig& );
void writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > int_data, const NNC& nnc) const; void writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > int_data, const NNC& nnc) const;
void writeEGRIDFile( const NNC& nnc ); void writeEGRIDFile( const NNC& nnc );
bool wantRFTOutput( const int report_step, const bool isSubstep ) const;
const EclipseState& es; const EclipseState& es;
EclipseGrid grid; EclipseGrid grid;
@ -150,6 +153,14 @@ void EclipseIO::Impl::writeEGRIDFile( const NNC& nnc ) {
this->grid.save( egridFile, formatted, nnc, this->es.getDeckUnitSystem()); this->grid.save( egridFile, formatted, nnc, this->es.getDeckUnitSystem());
} }
bool EclipseIO::Impl::wantRFTOutput( const int report_step,
const bool isSubstep ) const
{
return !isSubstep
&& (static_cast<std::size_t>(report_step)
>= this->schedule.rftConfig().firstRFTOutput());
}
/* /*
int_data: Writes key(string) and integers vector to INIT file as eclipse keywords int_data: Writes key(string) and integers vector to INIT file as eclipse keywords
- Key: Max 8 chars. - Key: Max 8 chars.
@ -219,8 +230,8 @@ void EclipseIO::writeTimeStep(const SummaryState& st,
es, grid, schedule, st, write_double); es, grid, schedule, st, write_double);
} }
// RFT file is not written for substeps // RFT file written only if requested and never for substeps.
if (! isSubstep) { if (this->impl->wantRFTOutput(report_step, isSubstep)) {
// Open existing RFT file if report step is after first RFT event. // Open existing RFT file if report step is after first RFT event.
const auto openExisting = EclIO::OutputStream::RFT::OpenExisting { const auto openExisting = EclIO::OutputStream::RFT::OpenExisting {
static_cast<std::size_t>(report_step) static_cast<std::size_t>(report_step)