From 4087fbff5bf58604efa300b165ad4d8d23435279 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Tue, 14 Jun 2022 10:51:13 +0200 Subject: [PATCH] remove errorguard in generic vanguard not used --- ebos/eclgenericvanguard.cc | 12 +----------- ebos/eclgenericvanguard.hh | 7 ------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/ebos/eclgenericvanguard.cc b/ebos/eclgenericvanguard.cc index c24b7cb37..0fb479c3d 100644 --- a/ebos/eclgenericvanguard.cc +++ b/ebos/eclgenericvanguard.cc @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -55,7 +54,6 @@ namespace Opm { double EclGenericVanguard::setupTime_ = 0.0; std::shared_ptr EclGenericVanguard::deck_; std::unique_ptr EclGenericVanguard::externalParseContext_; -std::unique_ptr EclGenericVanguard::externalErrorGuard_; std::shared_ptr EclGenericVanguard::eclState_; std::shared_ptr EclGenericVanguard::eclSchedule_; std::shared_ptr EclGenericVanguard::eclSummaryConfig_; @@ -76,11 +74,6 @@ void EclGenericVanguard::setExternalParseContext(std::unique_ptr p externalParseContext_ = std::move(parseContext); } -void EclGenericVanguard::setExternalErrorGuard(std::unique_ptr errorGuard) -{ - externalErrorGuard_ = std::move(errorGuard); -} - void EclGenericVanguard::setSchedule(std::shared_ptr schedule) { eclSchedule_ = std::move(schedule); @@ -258,16 +251,13 @@ void EclGenericVanguard::init() std::transform(caseName_.begin(), caseName_.end(), caseName_.begin(), ::toupper); } - std::unique_ptr errorGuard = nullptr; - // Check that we are in one of the known configurations for external variables // and move them to internal if (true) { - if (externalParseContext_ && externalErrorGuard_ ) + if (externalParseContext_ ) { parseContext_ = std::move(externalParseContext_); - errorGuard = std::move(externalErrorGuard_); } else { diff --git a/ebos/eclgenericvanguard.hh b/ebos/eclgenericvanguard.hh index 92089d35a..21799539f 100644 --- a/ebos/eclgenericvanguard.hh +++ b/ebos/eclgenericvanguard.hh @@ -112,11 +112,6 @@ public: */ static void setExternalParseContext(std::unique_ptr parseContext); - /*! - * \brief Set the Opm::ErrorGuard object which ought to be used for parsing the deck and creating the Opm::EclipseState object. - */ - static void setExternalErrorGuard(std::unique_ptr errorGuard); - /*! * \brief Set the Opm::Deck object which ought to be used when the simulator vanguard * is instantiated. @@ -306,7 +301,6 @@ protected: static double setupTime_; static std::unique_ptr externalParseContext_; - static std::unique_ptr externalErrorGuard_; // These variables may be owned by both Python and the simulator static std::unique_ptr externalUDQState_; @@ -345,7 +339,6 @@ protected: // these attributes point either to the internal or to the external version of the // parser objects. std::unique_ptr parseContext_; - std::unique_ptr errorGuard_; std::shared_ptr python; // These variables may be owned by both Python and the simulator static std::shared_ptr deck_;