OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3468 from GitPaean/reverting_aquct_commit

Browse Source 
Revert "only using the AQUCT and AQUFETP in SOLUTION section"
This commit is contained in:
Bård Skaflestad 2023-04-12 13:24:34 +02:00 committed by GitHub
commit b9c1b39a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/opm/input/eclipse/EclipseState/Aquifer/AquiferCT.cpp
View File

@ -35,7 +35,6 @@
#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>
@ -225,13 +224,10 @@ AquiferCT::AquiferCT(const TableManager& tables, const Deck& deck)
if (!deck.hasKeyword<AQUCT>())
return;
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);
}
}
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);
}
AquiferCT::AquiferCT(const std::vector<AquiferCT::AQUCT_data>& data) :

12
src/opm/input/eclipse/EclipseState/Aquifer/Aquifetp.cpp
View File

@ -28,7 +28,6 @@
#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>
@ -149,13 +148,10 @@ Aquifetp::Aquifetp(const TableManager& tables, const Deck& deck)
if (!deck.hasKeyword<AQUFETP>())
return;
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);
}
}
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);
}