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

Removed unused function tracking first RFT.

Browse Source
This commit is contained in:
Joakim Hove
2017-09-28 08:38:55 +02:00
parent 0f211bd2c1
commit f82a6fd281
4 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp
View File

@@ -27,7 +27,6 @@ namespace Opm {
class Deck;
class GRIDSection;
class RUNSPECSection;
class Schedule;
/*The IOConfig class holds data about input / ouput configurations
@@ -119,7 +118,6 @@ namespace Opm {
explicit IOConfig( const std::string& input_path );
int getFirstRFTStep() const;
bool getWriteEGRIDFile() const;
bool getWriteINITFile() const;
bool getUNIFOUT() const;
@@ -147,7 +145,6 @@ namespace Opm {
std::string fullBasePath( ) const;
bool initOnly() const;
void initFirstRFTOutput(const Schedule& schedule);
// Proxy methods forwarding directly to corresponding RestartConfig
bool getWriteRestartFile(size_t timestep) const;
@@ -163,7 +160,6 @@ namespace Opm {
bool m_FMTIN = false;
bool m_FMTOUT = false;
int m_first_restart_step;
int m_first_rft_step;
std::string m_deck_filename;
bool m_output_enabled = true;
std::string m_output_dir;

1
src/opm/parser/eclipse/EclipseState/EclipseState.cpp
View File

@@ -64,7 +64,6 @@ namespace Opm {
m_summaryConfig( deck, m_schedule, m_tables, m_parseContext)
{
m_inputGrid.resetACTNUM(m_eclipseProperties.getIntGridProperty("ACTNUM").getData().data());
m_eclipseConfig.io().initFirstRFTOutput(m_schedule);
if( this->runspec().phases().size() < 3 )
m_messageContainer.info("Only " + std::to_string( this->runspec().phases().size() )

26
src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp
View File

@@ -30,7 +30,6 @@
#include <opm/parser/eclipse/Deck/Section.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/DynamicState.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
#include <opm/parser/eclipse/EclipseState/Schedule/Well.hpp>
#include <ert/ecl/EclFilename.hpp>
@@ -123,27 +122,6 @@ namespace Opm {
}
/*
Will initialize an internal variable holding the first report
step when rft output is queried. The reason we are interested in
this report step is that when we reach this step the output
files should be opened with mode 'w' - whereas for subsequent
steps it should be opened with mode 'a'.
*/
void IOConfig::initFirstRFTOutput(const Schedule& schedule) {
m_first_rft_step = -1;
for (const auto& well : schedule.getWells( )) {
int well_output = well->firstRFTOutput();
if (well_output >= 0) {
if ((m_first_rft_step < 0) || (well_output < m_first_rft_step))
m_first_rft_step = well_output;
}
}
}
void IOConfig::overrideNOSIM(bool nosim) {
@@ -178,10 +156,6 @@ namespace Opm {
}
int IOConfig::getFirstRFTStep() const {
return m_first_rft_step;
}
bool IOConfig::getOutputEnabled() const {
return m_output_enabled;
}

12
tests/parser/IOConfigTests.cpp
View File

@@ -154,20 +154,8 @@ const std::string deckStr_RFT = "RUNSPEC\n"
static Deck createDeck(const std::string& input) {
Opm::Parser parser;
return parser.parseString(input, Opm::ParseContext());
}
BOOST_AUTO_TEST_CASE( RFT_TIME) {
Deck deck = createDeck(deckStr_RFT);
EclipseState state( deck , Opm::ParseContext() );
const IOConfig& ioConfig = state.cfg().io();
BOOST_CHECK_EQUAL( ioConfig.getFirstRFTStep() , 2 );
}
BOOST_AUTO_TEST_CASE(DefaultProperties) {
const char* data = "RUNSPEC\n"