Merge pull request #1799 from joakim-hove/halvor_opm_restart

Halvor opm restart

opm/parser/eclipse/EclipseState/EclipseConfig.hpp

@@ -38,9 +38,10 @@ namespace Opm {
 
         static EclipseConfig serializeObject();
 
-        const InitConfig& init() const;
+        InitConfig& init();
         IOConfig& io();
         const IOConfig& io() const;
+        const InitConfig& init() const;
         const InitConfig& getInitConfig() const;
 
         bool operator==(const EclipseConfig& data) const;

opm/parser/eclipse/EclipseState/EclipseState.hpp

@@ -77,6 +77,8 @@ namespace Opm {
         IOConfig& getIOConfig();
 
         const InitConfig& getInitConfig() const;
+        InitConfig& getInitConfig();
+        
         const SimulationConfig& getSimulationConfig() const;
         virtual const EclipseGrid& getInputGrid() const;
 

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

@@ -165,7 +165,7 @@ namespace Opm {
         const std::string& getEclipseInputPath() const;
 
         void overrideNOSIM(bool nosim);
-
+        void consistentFileFlags();
 
         std::string getRestartFileName(const std::string& restart_base, int report_step, bool output) const;
 

python/cxx/eclipse_config.cpp

@@ -14,7 +14,7 @@
 void python::common::export_EclipseConfig(py::module& module)
 {
     py::class_< EclipseConfig >( module, "EclipseConfig" )
-        .def( "init",            &EclipseConfig::init, ref_internal);
+        .def( "init",            py::overload_cast<>(&EclipseConfig::init, py::const_));
 
     py::class_< SummaryConfig >( module, "SummaryConfig")
         .def(py::init([](const Deck& deck, const EclipseState& state, const Schedule& schedule) {

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

@@ -51,6 +51,9 @@ namespace Opm {
         return result;
     }
     
+    InitConfig& EclipseConfig::init() {
+        return const_cast<InitConfig &>(this->m_initConfig);
+    }
 
     const InitConfig& EclipseConfig::init() const{
         return m_initConfig;

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

@@ -129,6 +129,10 @@ namespace Opm {
         return m_eclipseConfig.getInitConfig();
     }
 
+    /// [[deprecated]] --- use cfg().init()
+    InitConfig& EclipseState::getInitConfig() {
+        return m_eclipseConfig.init();
+    }
     /// [[deprecated]] --- use cfg()
     const EclipseConfig& EclipseState::getEclipseConfig() const {
         return cfg();

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

@@ -193,6 +193,11 @@ namespace Opm {
         return m_UNIFOUT;
     }
 
+    void IOConfig::consistentFileFlags(){
+        m_UNIFIN = getUNIFOUT();
+        m_FMTIN = getFMTOUT();
+    }
+
     bool IOConfig::getFMTIN() const {
         return m_FMTIN;
     }