Address Review Comments

Use SummaryState::get() with default, std::size instead of distance,
and a named constant for the aquifer model type.

opm/output/eclipse/VectorItems/aquifer.hpp

@@ -35,6 +35,13 @@ namespace Opm { namespace RestartIO { namespace Helpers { namespace VectorItems
 
             Unknown_1 = 11,     // Unknown item.  =1 in all cases seen thus far.
         };
+
+        namespace Value {
+            enum ModelType : int {
+                Fetkovich = 0,
+                CarterTracy = 1,
+            };
+        } // Value
     } // IAnalyticAquifer
 
     namespace IAnalyticAquiferConn {

src/opm/output/eclipse/AggregateAquiferData.cpp

@@ -115,7 +115,7 @@ namespace {
                 iaaq[Ix::WatPropTable] = aquifer.pvttableID; // One-based (=AQUCT(10))
 
                 iaaq[Ix::CTInfluenceFunction] = aquifer.inftableID;
-                iaaq[Ix::TypeRelated1] = 1; // =1 for Carter-Tracy
+                iaaq[Ix::TypeRelated1] = VI::IAnalyticAquifer::Value::ModelType::CarterTracy;
 
                 iaaq[Ix::Unknown_1] = 1; // Not characterised; =1 in all cases seen thus far.
             }
@@ -133,6 +133,7 @@ namespace {
                 iaaq[Ix::NumAquiferConn] = numActiveConn;
                 iaaq[Ix::WatPropTable] = aquifer.pvttableID; // One-based (=AQUFETP(7))
 
+                iaaq[Ix::TypeRelated1] = VI::IAnalyticAquifer::Value::ModelType::Fetkovich;
                 iaaq[Ix::Unknown_1] = 1; // Not characterised; =1 in all cases seen thus far.
             }
         } // Fetckovich
@@ -316,11 +317,7 @@ namespace {
         {
             const auto key = fmt::format("{}:{}", variable, aquiferID);
 
-            if (summaryState.has(key)) {
-                return summaryState.get(key);
-            }
-
-            return 0.0;
+            return summaryState.get(key, 0.0);
         }
 
         Opm::RestartIO::Helpers::WindowedArray<double>

tests/test_AggregateAquiferData.cpp

@@ -473,8 +473,7 @@ AQUANCON
     template <class Coll1, class Coll2>
     void check_is_close(const Coll1& coll1, const Coll2& coll2, const double tol)
     {
-        BOOST_REQUIRE_EQUAL(std::distance(std::begin(coll1), std::end(coll1)),
-                            std::distance(std::begin(coll2), std::end(coll2)));
+        BOOST_REQUIRE_EQUAL(std::size(coll1), std::size(coll2));
 
         if (coll1.empty()) { return; }