Allow loading of RstState for restart files without wells

opm/io/eclipse/rst/state.hpp

@@ -35,6 +35,11 @@ namespace Opm {
 
 namespace RestartIO {
 struct RstState {
+    RstState(const ::Opm::UnitSystem& unit_system,
+             const std::vector<int>& intehead,
+             const std::vector<bool>& logihead,
+             const std::vector<double>& doubhead);
+
     RstState(const ::Opm::UnitSystem& unit_system,
              const std::vector<int>& intehead,
              const std::vector<bool>& logihead,

src/opm/io/eclipse/rst/state.cpp

@@ -34,6 +34,16 @@ namespace VI = ::Opm::RestartIO::Helpers::VectorItems;
 namespace Opm {
 namespace RestartIO {
 
+RstState::RstState(const ::Opm::UnitSystem& unit_system_,
+                   const std::vector<int>& intehead,
+                   const std::vector<bool>& logihead,
+                   const std::vector<double>& doubhead):
+    unit_system(unit_system_),
+    header(intehead, logihead, doubhead)
+{
+    this->load_tuning(intehead, doubhead);
+}
+
 RstState::RstState(const ::Opm::UnitSystem& unit_system_,
                    const std::vector<int>& intehead,
                    const std::vector<bool>& logihead,
@@ -49,11 +59,9 @@ RstState::RstState(const ::Opm::UnitSystem& unit_system_,
                    const std::vector<int>& icon,
                    const std::vector<float>& scon,
                    const std::vector<double>& xcon):
-    unit_system(unit_system_),
+    RstState(unit_system_, intehead, logihead, doubhead)
-    header(intehead, logihead, doubhead)
 {
     this->add_groups(zgrp, igrp, sgrp, xgrp);
-    this->load_tuning(intehead, doubhead);
 
     for (int iw = 0; iw < this->header.num_wells; iw++) {
         std::size_t zwel_offset = iw * this->header.nzwelz;
@@ -99,11 +107,9 @@ RstState::RstState(const ::Opm::UnitSystem& unit_system_,
                    const std::vector<double>& xcon,
                    const std::vector<int>& iseg,
                    const std::vector<double>& rseg) :
-    unit_system(unit_system_),
+    RstState(unit_system_, intehead, logihead, doubhead)
-    header(intehead, logihead, doubhead)
 {
     this->add_groups(zgrp, igrp, sgrp, xgrp);
-    this->load_tuning(intehead, doubhead);
 
     for (int iw = 0; iw < this->header.num_wells; iw++) {
         std::size_t zwel_offset = iw * this->header.nzwelz;
@@ -207,39 +213,43 @@ RstState RstState::load(EclIO::ERst& rst_file, int report_step) {
     const auto& logihead = rst_file.getRst<bool>("LOGIHEAD", report_step, 0);
     const auto& doubhead = rst_file.getRst<double>("DOUBHEAD", report_step, 0);
 
-    const auto& zgrp = rst_file.getRst<std::string>("ZGRP", report_step, 0);
-    const auto& igrp = rst_file.getRst<int>("IGRP", report_step, 0);
-    const auto& sgrp = rst_file.getRst<float>("SGRP", report_step, 0);
-    const auto& xgrp = rst_file.getRst<double>("XGRP", report_step, 0);
-
-    const auto& zwel = rst_file.getRst<std::string>("ZWEL", report_step, 0);
-    const auto& iwel = rst_file.getRst<int>("IWEL", report_step, 0);
-    const auto& swel = rst_file.getRst<float>("SWEL", report_step, 0);
-    const auto& xwel = rst_file.getRst<double>("XWEL", report_step, 0);
-
-    const auto& icon = rst_file.getRst<int>("ICON", report_step, 0);
-    const auto& scon = rst_file.getRst<float>("SCON", report_step, 0);
-    const auto& xcon = rst_file.getRst<double>("XCON", report_step, 0);
-
     auto unit_id = intehead[VI::intehead::UNIT];
     ::Opm::UnitSystem unit_system(unit_id);
 
-    if (rst_file.hasKey("ISEG")) {
+    if (intehead[VI::intehead::NWELLS] != 0) {
-        const auto& iseg = rst_file.getRst<int>("ISEG", report_step, 0);
+        const auto& zgrp = rst_file.getRst<std::string>("ZGRP", report_step, 0);
-        const auto& rseg = rst_file.getRst<double>("RSEG", report_step, 0);
+        const auto& igrp = rst_file.getRst<int>("IGRP", report_step, 0);
+        const auto& sgrp = rst_file.getRst<float>("SGRP", report_step, 0);
+        const auto& xgrp = rst_file.getRst<double>("XGRP", report_step, 0);
 
-        return RstState(unit_system,
+        const auto& zwel = rst_file.getRst<std::string>("ZWEL", report_step, 0);
-                        intehead, logihead, doubhead,
+        const auto& iwel = rst_file.getRst<int>("IWEL", report_step, 0);
-                        zgrp, igrp, sgrp, xgrp,
+        const auto& swel = rst_file.getRst<float>("SWEL", report_step, 0);
-                        zwel, iwel, swel, xwel,
+        const auto& xwel = rst_file.getRst<double>("XWEL", report_step, 0);
-                        icon, scon, xcon,
+
-                        iseg, rseg);
+        const auto& icon = rst_file.getRst<int>("ICON", report_step, 0);
+        const auto& scon = rst_file.getRst<float>("SCON", report_step, 0);
+        const auto& xcon = rst_file.getRst<double>("XCON", report_step, 0);
+
+
+        if (rst_file.hasKey("ISEG")) {
+            const auto& iseg = rst_file.getRst<int>("ISEG", report_step, 0);
+            const auto& rseg = rst_file.getRst<double>("RSEG", report_step, 0);
+
+            return RstState(unit_system,
+                            intehead, logihead, doubhead,
+                            zgrp, igrp, sgrp, xgrp,
+                            zwel, iwel, swel, xwel,
+                            icon, scon, xcon,
+                            iseg, rseg);
+        } else
+            return RstState(unit_system,
+                            intehead, logihead, doubhead,
+                            zgrp, igrp, sgrp, xgrp,
+                            zwel, iwel, swel, xwel,
+                            icon, scon, xcon);
     } else
-        return RstState(unit_system,
+        return RstState(unit_system, intehead, logihead, doubhead);
-                        intehead, logihead, doubhead,
-                        zgrp, igrp, sgrp, xgrp,
-                        zwel, iwel, swel, xwel,
-                        icon, scon, xcon);
 }
 
 }