changed: rename AquiferInterface to AquiferAnalytical

CMakeLists_files.cmake

@@ -247,9 +247,10 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/simulators/timestepping/SimulatorReport.hpp
   opm/simulators/wells/SegmentState.hpp
   opm/simulators/wells/WellContainer.hpp
-  opm/simulators/aquifers/AquiferInterface.hpp
+  opm/simulators/aquifers/AquiferAnalytical.hpp
   opm/simulators/aquifers/AquiferCarterTracy.hpp
   opm/simulators/aquifers/AquiferFetkovich.hpp
+  opm/simulators/aquifers/AquiferInterface.hpp
   opm/simulators/aquifers/AquiferNumerical.hpp
   opm/simulators/aquifers/BlackoilAquiferModel.hpp
   opm/simulators/aquifers/BlackoilAquiferModel_impl.hpp

opm/simulators/aquifers/AquiferAnalytical.hpp

@@ -19,8 +19,8 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef OPM_AQUIFERINTERFACE_HEADER_INCLUDED
+#ifndef OPM_AQUIFERANALYTICAL_HEADER_INCLUDED
-#define OPM_AQUIFERINTERFACE_HEADER_INCLUDED
+#define OPM_AQUIFERANALYTICAL_HEADER_INCLUDED
 
 #include <opm/common/utility/numeric/linearInterpolation.hpp>
 #include <opm/input/eclipse/EclipseState/Aquifer/Aquancon.hpp>
@@ -45,7 +45,7 @@
 namespace Opm
 {
 template <typename TypeTag>
-class AquiferInterface
+class AquiferAnalytical
 {
 public:
     using Simulator = GetPropType<TypeTag, Properties::Simulator>;
@@ -78,7 +78,7 @@ public:
                                           BlackoilIndices::numPhases>;
 
     // Constructor
-    AquiferInterface(int aqID,
+    AquiferAnalytical(int aqID,
                      const std::vector<Aquancon::AquancCell>& connections,
                      const Simulator& ebosSimulator)
         : aquiferID_(aqID)
@@ -88,7 +88,7 @@ public:
     }
 
     // Destructor
-    virtual ~AquiferInterface()
+    virtual ~AquiferAnalytical()
     {
     }
 
@@ -132,7 +132,7 @@ public:
             pressure_previous_[idx] = getValue(iq.fluidState().pressure(phaseIdx_()));
         }
 
-        OPM_END_PARALLEL_TRY_CATCH("AquiferInterface::beginTimeStep() failed: ", ebos_simulator_.vanguard().grid().comm());
+        OPM_END_PARALLEL_TRY_CATCH("AquiferAnalytical::beginTimeStep() failed: ", ebos_simulator_.vanguard().grid().comm());
     }
 
     template <class Context>
@@ -157,7 +157,7 @@ public:
 
         const auto* intQuantsPtr = model.cachedIntensiveQuantities(cellIdx, timeIdx);
         if (intQuantsPtr == nullptr) {
-            throw std::logic_error("Invalid intensive quantities cache detected in AquiferInterface::addToSource()");
+            throw std::logic_error("Invalid intensive quantities cache detected in AquiferAnalytical::addToSource()");
         }
 
         // This is the pressure at td + dt
@@ -439,5 +439,7 @@ protected:
 
     // This function is used to initialize and calculate the alpha_i for each grid connection to the aquifer
 };
+
 } // namespace Opm
+
 #endif

opm/simulators/aquifers/AquiferCarterTracy.hpp

@@ -21,7 +21,7 @@
 #ifndef OPM_AQUIFERCT_HEADER_INCLUDED
 #define OPM_AQUIFERCT_HEADER_INCLUDED
 
-#include <opm/simulators/aquifers/AquiferInterface.hpp>
+#include <opm/simulators/aquifers/AquiferAnalytical.hpp>
 
 #include <opm/output/data/Aquifer.hpp>
 
@@ -34,10 +34,10 @@ namespace Opm
 {
 
 template <typename TypeTag>
-class AquiferCarterTracy : public AquiferInterface<TypeTag>
+class AquiferCarterTracy : public AquiferAnalytical<TypeTag>
 {
 public:
-    using Base = AquiferInterface<TypeTag>;
+    using Base = AquiferAnalytical<TypeTag>;
 
     using typename Base::BlackoilIndices;
     using typename Base::ElementContext;

opm/simulators/aquifers/AquiferFetkovich.hpp

@@ -21,7 +21,7 @@ along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef OPM_AQUIFETP_HEADER_INCLUDED
 #define OPM_AQUIFETP_HEADER_INCLUDED
 
-#include <opm/simulators/aquifers/AquiferInterface.hpp>
+#include <opm/simulators/aquifers/AquiferAnalytical.hpp>
 
 #include <opm/output/data/Aquifer.hpp>
 
@@ -33,11 +33,11 @@ namespace Opm
 {
 
 template <typename TypeTag>
-class AquiferFetkovich : public AquiferInterface<TypeTag>
+class AquiferFetkovich : public AquiferAnalytical<TypeTag>
 {
 
 public:
-    using Base = AquiferInterface<TypeTag>;
+    using Base = AquiferAnalytical<TypeTag>;
 
     using typename Base::BlackoilIndices;
     using typename Base::ElementContext;