Merge pull request #2642 from joakim-hove/icd-variant

Use std::variant access to Segment::icd

ebos/eclmpiserializer.hh

@@ -22,6 +22,7 @@
 #define ECL_MPI_SERIALIZER_HH
 
 #include <opm/simulators/utils/ParallelRestart.hpp>
+#include <variant>
 
 namespace Opm {
 
@@ -48,6 +49,8 @@ public:
             ptr(data);
         } else if constexpr (is_pair<T>::value) {
             pair(data);
+        } else if constexpr (is_variant<T>::value) {
+            variant(data);
         } else {
           if (m_op == Operation::PACKSIZE)
               m_packSize += Mpi::packSize(data, m_comm);
@@ -93,6 +96,54 @@ public:
         }
     }
 
+
+    //! \brief Handler for std::variant<> with three types
+
+    /*
+      The std::variant<> serialization is a first attempt and *not* particularly
+      general. In particular that implies:
+
+        1. It is hardcoded to hold exactly three alternative types T1, T2 and
+           T3.
+
+        2. All the three types T1, T2 and T3 must implement the ::serializeOp( )
+           method. This implies that a variant with a fundamental type like e.g.
+           std::variant<int, Opm::Well, Opm::Group> will *not* work in the
+           current implementation.
+    */
+    template<class T1, class T2, class T3>
+    void variant(const std::variant<T1,T2,T3>& _data)
+    {
+        auto handle = [&](auto& d) {
+            d.serializeOp(*this);
+        };
+
+        std::variant<T1,T2,T3>& data = const_cast<std::variant<T1,T2,T3>&>(_data);
+        if (m_op == Operation::PACKSIZE) {
+            m_packSize += Mpi::packSize(data.index(), m_comm);
+            std::visit( [&] (auto& arg) { handle(arg); }, data);
+        } else if (m_op == Operation::PACK) {
+            Mpi::pack(data.index(), m_buffer, m_position, m_comm);
+            std::visit([&](auto& arg) { handle(arg); }, data);
+        } else if (m_op == Operation::UNPACK) {
+            size_t index;
+            Mpi::unpack(index, m_buffer, m_position, m_comm);
+
+            if (index == 0) {
+                data = T1();
+                handle(std::get<0>(data));
+            } else if (index == 1) {
+                data = T2();
+                handle(std::get<1>(data));
+            } else if (index == 2) {
+                data = T3();
+                handle(std::get<2>(data));
+            } else
+                std::logic_error("Internal meltdown in std::variant<T1,T2,T3> unpack");
+        }
+    }
+
+
     //! \brief Handler for maps.
     //! \tparam Map map type
     //! \tparam complexType Whether or not Data in map is a complex type
@@ -232,6 +283,17 @@ protected:
         constexpr static bool value = true;
     };
 
+    //! \brief Predicate for detecting variants.
+    template<class T>
+    struct is_variant {
+        constexpr static bool value = false;
+    };
+
+    template<class... Ts>
+    struct is_variant<std::variant<Ts...>> {
+        constexpr static bool value = true;
+    };
+
     //! \brief Predicate for smart pointers.
     template<class T>
     struct is_ptr {

opm/simulators/wells/MultisegmentWell_impl.hpp

@@ -3630,8 +3630,6 @@ namespace Opm
 
 
 
-
-
     template<typename TypeTag>
     double
     MultisegmentWell<TypeTag>::
@@ -3661,7 +3659,7 @@ namespace Opm
     pressureDropSpiralICD(const int seg) const
     {
         // TODO: We have to consider the upwinding here
-        const SICD& sicd = *segmentSet()[seg].spiralICD();
+        const SICD& sicd = segmentSet()[seg].spiralICD();
 
         const std::vector<EvalWell>& phase_fractions = segment_phase_fractions_[seg];
         const std::vector<EvalWell>& phase_viscosities = segment_phase_viscosities_[seg];
@@ -3725,7 +3723,7 @@ namespace Opm
     MultisegmentWell<TypeTag>::
     pressureDropValve(const int seg) const
     {
-        const Valve& valve = *segmentSet()[seg].valve();
+        const Valve& valve = segmentSet()[seg].valve();
 
         const EvalWell& mass_rate = segment_mass_rates_[seg];
         const EvalWell& visc = segment_viscosities_[seg];