From a89136f1f24c9886fb335b99b93dad23fc815628 Mon Sep 17 00:00:00 2001
From: Kai Bao <kai.bao@sintef.no>
Date: Fri, 10 Feb 2023 10:40:39 +0100
Subject: [PATCH] only using the AQUCT and AQUFETP in SOLUTION section

to generate the aquifers in AquiferConfig.
---
 .../input/eclipse/EclipseState/Aquifer/AquiferCT.cpp | 12 ++++++++----
 .../input/eclipse/EclipseState/Aquifer/Aquifetp.cpp  | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp
index 7ff0dfdc0..d539abefa 100644
--- a/src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp
+++ b/src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp
@@ -35,6 +35,7 @@
 #include <opm/input/eclipse/Deck/DeckItem.hpp>
 #include <opm/input/eclipse/Deck/DeckKeyword.hpp>
 #include <opm/input/eclipse/Deck/DeckRecord.hpp>
+#include <opm/input/eclipse/Deck/DeckSection.hpp>
 
 #include <opm/common/OpmLog/OpmLog.hpp>
 #include <opm/common/utility/OpmInputError.hpp>
@@ -224,10 +225,13 @@ AquiferCT::AquiferCT(const TableManager& tables, const Deck& deck)
     if (!deck.hasKeyword<AQUCT>())
         return;
 
-    const auto& aquctKeyword = deck.get<AQUCT>().back();
-    OpmLog::info(OpmInputError::format("Initializing Carter Tracey aquifers from {keyword} in {file} line {line}", aquctKeyword.location()));
-    for (auto& record : aquctKeyword)
-        this->m_aquct.emplace_back(record, tables);
+    const auto& aquct_keywords = SOLUTIONSection(deck).getKeywordList("AQUCT");
+    for (const auto* keyword : aquct_keywords) {
+        OpmLog::info(OpmInputError::format("Initializing Fetkovich aquifers from {keyword} in {file} line {line}", keyword->location()));
+        for (const auto& record : *keyword) {
+            this->m_aquct.emplace_back(record, tables);
+        }
+    }
 }
 
 AquiferCT::AquiferCT(const std::vector<AquiferCT::AQUCT_data>& data) :
diff --git a/src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp b/src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp
index 3858bfffb..c4567396c 100644
--- a/src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp
+++ b/src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp
@@ -28,6 +28,7 @@
 
 #include <opm/input/eclipse/Deck/Deck.hpp>
 #include <opm/input/eclipse/Deck/DeckRecord.hpp>
+#include <opm/input/eclipse/Deck/DeckSection.hpp>
 
 #include <opm/common/utility/OpmInputError.hpp>
 #include <opm/common/OpmLog/OpmLog.hpp>
@@ -148,10 +149,13 @@ Aquifetp::Aquifetp(const TableManager& tables, const Deck& deck)
     if (!deck.hasKeyword<AQUFETP>())
         return;
 
-    const auto& aqufetpKeyword = deck.get<AQUFETP>().back();
-    OpmLog::info(OpmInputError::format("Initializing Fetkovich aquifers from {keyword} in {file} line {line}", aqufetpKeyword.location()));
-    for (auto& record : aqufetpKeyword)
-        this->m_aqufetp.emplace_back(record, tables);
+    const auto& aqufetp_keywords = SOLUTIONSection(deck).getKeywordList("AQUFETP");
+    for (const auto* keyword : aqufetp_keywords) {
+        OpmLog::info(OpmInputError::format("Initializing Fetkovich aquifers from {keyword} in {file} line {line}", keyword->location()));
+        for (const auto& record : *keyword) {
+            this->m_aqufetp.emplace_back(record, tables);
+        }
+    }
 }