Merge pull request #1429 from akva2/remove_ioconfig_member

Fix TimeMap constructor and remove IOConfig member

opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp

@@ -154,7 +154,6 @@ namespace Opm {
         IOConfig(bool write_init, bool write_egrid,
                  bool unifin, bool unifout,
                  bool fmtin, bool fmtout,
-                 int firstRestartStep,
                  const std::string& deck_name,
                  bool output_enabled,
                  const std::string& output_dir,
@@ -196,7 +195,6 @@ namespace Opm {
 
         // Proxy methods forwarding directly to corresponding RestartConfig
         bool getWriteRestartFile(size_t timestep) const;
-        int  getFirstRestartStep() const;
         void overrideRestartWriteInterval(size_t interval);
         void setWriteInitialRestartFile(bool writeInitialRestartFile);
 
@@ -209,7 +207,6 @@ namespace Opm {
         bool            m_UNIFOUT = false;
         bool            m_FMTIN = false;
         bool            m_FMTOUT = false;
-        int             m_first_restart_step;
         std::string     m_deck_filename;
         bool            m_output_enabled = true;
         std::string     m_output_dir;

src/opm/parser/eclipse/EclipseState/IOConfig/IOConfig.cpp

@@ -91,7 +91,6 @@ namespace Opm {
     IOConfig::IOConfig(bool write_init, bool write_egrid,
                        bool unifin, bool unifout,
                        bool fmtin, bool fmtout,
-                       int firstRestartStep,
                        const std::string& deck_name,
                        bool output_enabled,
                        const std::string& output_dir,
@@ -104,7 +103,6 @@ namespace Opm {
         m_UNIFOUT(unifout),
         m_FMTIN(fmtin),
         m_FMTOUT(fmtout),
-        m_first_restart_step(firstRestartStep),
         m_deck_filename(deck_name),
         m_output_enabled(output_enabled),
         m_output_dir(output_dir),
@@ -283,11 +281,6 @@ namespace Opm {
     }
 
 
-    int IOConfig::getFirstRestartStep() const {
-        return m_first_restart_step;
-    }
-
-
     const std::string& IOConfig::getDeckFileName() const {
         return m_deck_filename;
     }
@@ -305,7 +298,6 @@ namespace Opm {
                this->getUNIFOUT() == data.getUNIFOUT() &&
                this->getFMTIN() == data.getFMTIN() &&
                this->getFMTOUT() == data.getFMTOUT() &&
-               this->getFirstRestartStep() == data.getFirstRestartStep() &&
                this->getDeckFileName() == data.getDeckFileName() &&
                this->getOutputEnabled() == data.getOutputEnabled() &&
                this->getOutputDir() == data.getOutputDir() &&

src/opm/parser/eclipse/EclipseState/Schedule/TimeMap.cpp

@@ -54,6 +54,8 @@ namespace {
             throw std::invalid_argument("Can not initialize with empty list of time points");
 
         this->m_timeList.push_back(time_points[0]);
+        m_first_timestep_months.push_back({0, TimeStampUTC{time_points[0]}});
+        m_first_timestep_years.push_back({0, TimeStampUTC{time_points[0]}});
         for (std::size_t ti = 1; ti < time_points.size(); ti++)
             this->addTime( time_points[ti] );
     }