Changes in opm-common for current Production/Injection Group Control parameters

CMakeLists_files.cmake

@@ -380,6 +380,7 @@ if(ENABLE_ECL_OUTPUT)
           tests/test_rst.cpp
           tests/test_Solution.cpp
           tests/test_Summary.cpp
+          tests/test_Summary_Group.cpp
           tests/test_Tables.cpp
           tests/test_Wells.cpp
           tests/test_WindowedArray.cpp
@@ -411,6 +412,7 @@ if(ENABLE_ECL_OUTPUT)
           tests/SOFR_TEST.DATA
           tests/UDQ_TEST_WCONPROD_IUAD-2.DATA
           tests/UDQ_ACTIONX_TEST1.DATA
+          tests/UDQ_ACTIONX_TEST1_U.DATA
           tests/include_example_pvt.txt
           tests/include_example_summary.txt
           tests/include_sgof.txt
@@ -727,6 +729,7 @@ if(ENABLE_ECL_OUTPUT)
         opm/output/data/Cells.hpp
         opm/output/data/Solution.hpp
         opm/output/data/Wells.hpp
+        opm/output/data/Groups.hpp
         opm/output/eclipse/VectorItems/aquifer.hpp
         opm/output/eclipse/VectorItems/connection.hpp
         opm/output/eclipse/VectorItems/group.hpp

msim/src/msim.cpp

@@ -24,6 +24,7 @@
 #include <opm/output/eclipse/Summary.hpp>
 #include <opm/output/data/Solution.hpp>
 #include <opm/output/data/Wells.hpp>
+#include <opm/output/data/Groups.hpp>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.hpp>
@@ -91,6 +92,8 @@ void msim::run_step(const Schedule& schedule, SummaryState& st, data::Solution&
 
         this->simulate(schedule, st, sol, well_data, report_step, seconds_elapsed, time_step);
 
+        Opm::data::Group group_data;
+
         seconds_elapsed += time_step;
 
         io.summary().eval(st,
@@ -99,6 +102,7 @@ void msim::run_step(const Schedule& schedule, SummaryState& st, data::Solution&
                           this->state,
                           schedule,
                           well_data,
+                          group_data,
                           {});
 
         this->output(st,

opm/output/data/Groups.hpp

@@ -0,0 +1,121 @@
+/*
+  Copyright 2016 Statoil ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef OPM_OUTPUT_GROUPS_HPP
+#define OPM_OUTPUT_GROUPS_HPP
+
+#include <algorithm>
+#include <cstddef>
+#include <initializer_list>
+#include <map>
+#include <stdexcept>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <vector>
+
+#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
+
+namespace Opm {
+
+    namespace data {
+
+    struct currentGroupConstraints {
+        Opm::Group::ProductionCMode currentProdConstraint;
+        Opm::Group::InjectionCMode  currentGasInjectionConstraint;
+        Opm::Group::InjectionCMode  currentWaterInjectionConstraint;
+
+        template <class MessageBufferType>
+        void write(MessageBufferType& buffer) const;
+        template <class MessageBufferType>
+        void read(MessageBufferType& buffer);
+
+        inline currentGroupConstraints& set(  Opm::Group::ProductionCMode cpc,
+        Opm::Group::InjectionCMode  cgic,
+        Opm::Group::InjectionCMode  cwic);
+
+        inline bool has();
+
+    };
+
+
+    class Group : public std::map<std::string, Opm::data::currentGroupConstraints>  {
+    public:
+
+        template <class MessageBufferType>
+        void write(MessageBufferType& buffer) const {
+            unsigned int size = this->size();
+            buffer.write(size);
+            for (const auto& witr : *this) {
+                const std::string& name = witr.first;
+                buffer.write(name);
+                const auto& pi_constr = witr.second;
+                pi_constr.write(buffer);
+            }
+        }
+
+        template <class MessageBufferType>
+        void read(MessageBufferType& buffer) {
+             unsigned int size;
+            buffer.read(size);
+            for (size_t i = 0; i < size; ++i) {
+                std::string name;
+                buffer.read(name);
+                currentGroupConstraints cgc;
+                cgc.read(buffer);
+                this->emplace(name, cgc);
+            }
+        }
+    };
+
+    /* IMPLEMENTATIONS */
+
+    template <class MessageBufferType>
+    void currentGroupConstraints::write(MessageBufferType& buffer) const {
+        buffer.write(this->currentProdConstraint);
+        buffer.write(this->currentGasInjectionConstraint);
+        buffer.write(this->currentWaterInjectionConstraint);
+    }
+
+    template <class MessageBufferType>
+    void currentGroupConstraints::read(MessageBufferType& buffer) {
+        buffer.read(this->currentProdConstraint);
+        buffer.read(this->currentGasInjectionConstraint);
+        buffer.read(this->currentWaterInjectionConstraint);
+    }
+
+
+    inline currentGroupConstraints& currentGroupConstraints::set(  Opm::Group::ProductionCMode cpc,
+        Opm::Group::InjectionCMode  cgic,
+        Opm::Group::InjectionCMode  cwic) {
+        this->currentGasInjectionConstraint = cgic;
+        this->currentWaterInjectionConstraint = cwic;
+        this->currentProdConstraint = cpc;
+        return *this;
+    }
+
+    inline bool currentGroupConstraints::has() {
+        return ((&this->currentGasInjectionConstraint != nullptr) && (&this->currentGasInjectionConstraint != nullptr)
+        && (&this->currentProdConstraint != nullptr));
+    }
+
+
+}} // Opm::data
+
+#endif //OPM_OUTPUT_GROUPS_HPP

opm/output/eclipse/Summary.hpp

@@ -20,6 +20,8 @@
 #ifndef OPM_OUTPUT_SUMMARY_HPP
 #define OPM_OUTPUT_SUMMARY_HPP
 
+#include <opm/parser/eclipse/EclipseState/Schedule/Group/Group.hpp>
+
 #include <map>
 #include <memory>
 #include <string>
@@ -36,6 +38,7 @@ namespace Opm {
 
 namespace Opm { namespace data {
     class WellRates;
+    class Group;
 }} // namespace Opm::data
 
 namespace Opm { namespace out {
@@ -62,12 +65,14 @@ class Summary {
               const EclipseState&            es,
               const Schedule&                schedule,
               const data::WellRates&         well_solution,
+              const data::Group&             group_solution,
               const GlobalProcessParameters& single_values,
               const RegionParameters&        region_values = {},
               const BlockValues&             block_values  = {}) const;
 
     void write() const;
 
+
 private:
     class SummaryImplementation;
     std::unique_ptr<SummaryImplementation> pImpl_;

opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp

@@ -46,7 +46,7 @@ namespace Opm {
         };
 
         enum class Type {
-            Rate, Total, Ratio, Pressure, Count,
+            Rate, Total, Ratio, Pressure, Count, Mode,
             Undefined,
         };