Aquifer Restart: Address Review Comments

Mostly 'throw'ing in the case of unsupported operations.  While
here, also remove an unused header.

ebos/eclbaseaquifermodel.hh

@@ -31,6 +31,8 @@
 
 #include <opm/models/utils/propertysystem.hh>
 
+#include <exception>
+#include <stdexcept>
 #include <vector>
 
 BEGIN_PROPERTIES
@@ -78,7 +80,12 @@ public:
      *        volume from the model's aquifers.
      */
     void initFromRestart(const std::vector<data::AquiferData>& aquiferSoln OPM_UNUSED)
-    { }
+    {
+        throw std::logic_error {
+            "Initialization from restart data not supported "
+            "for base aquifer model"
+        };
+    }
 
     /*!
      * \brief This method is called when a new episode (report step) starts.

opm/simulators/aquifers/AquiferCarterTracy.hpp

@@ -25,6 +25,9 @@
 
 #include <opm/output/data/Aquifer.hpp>
 
+#include <exception>
+#include <stdexcept>
+
 namespace Opm
 {
 
@@ -148,7 +151,12 @@ namespace Opm
             }
 
             void assignRestartData(const data::AquiferData& /* xaq */) override
-            {}
+            {
+                throw std::runtime_error {
+                    "Restart-based initialization not currently supported "
+                    "for Carter-Tracey analytic aquifers"
+                };
+            }
 
             inline void getInfluenceTableValues(Scalar& pitd, Scalar& pitd_prime, const Scalar& td)
             {

opm/simulators/aquifers/BlackoilAquiferModel.hpp

@@ -34,7 +34,6 @@
 
 #include <opm/simulators/aquifers/AquiferCarterTracy.hpp>
 #include <opm/simulators/aquifers/AquiferFetkovich.hpp>
-#include <opm/simulators/timestepping/SimulatorTimer.hpp>
 
 #include <opm/material/densead/Math.hpp>