OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove errorguard in generic vanguard

Browse Source 
not used
This commit is contained in:
Arne Morten Kvarving 2022-06-14 10:51:13 +02:00
parent 00c374be5c
commit 4087fbff5b
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ebos/eclgenericvanguard.cc
View File

@ -36,7 +36,6 @@
#include <opm/input/eclipse/Schedule/SummaryState.hpp> #include <opm/input/eclipse/Schedule/SummaryState.hpp>
#include <opm/input/eclipse/Schedule/UDQ/UDQState.hpp> #include <opm/input/eclipse/Schedule/UDQ/UDQState.hpp>
#include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp> #include <opm/input/eclipse/EclipseState/SummaryConfig/SummaryConfig.hpp>
#include <opm/input/eclipse/Parser/ErrorGuard.hpp>
#include <opm/input/eclipse/Parser/ParseContext.hpp> #include <opm/input/eclipse/Parser/ParseContext.hpp>
#include <opm/input/eclipse/Python/Python.hpp> #include <opm/input/eclipse/Python/Python.hpp>
@ -55,7 +54,6 @@ namespace Opm {
double EclGenericVanguard::setupTime_ = 0.0; double EclGenericVanguard::setupTime_ = 0.0;
std::shared_ptr<Deck> EclGenericVanguard::deck_; std::shared_ptr<Deck> EclGenericVanguard::deck_;
std::unique_ptr<ParseContext> EclGenericVanguard::externalParseContext_; std::unique_ptr<ParseContext> EclGenericVanguard::externalParseContext_;
std::unique_ptr<ErrorGuard> EclGenericVanguard::externalErrorGuard_;
std::shared_ptr<EclipseState> EclGenericVanguard::eclState_; std::shared_ptr<EclipseState> EclGenericVanguard::eclState_;
std::shared_ptr<Schedule> EclGenericVanguard::eclSchedule_; std::shared_ptr<Schedule> EclGenericVanguard::eclSchedule_;
std::shared_ptr<SummaryConfig> EclGenericVanguard::eclSummaryConfig_; std::shared_ptr<SummaryConfig> EclGenericVanguard::eclSummaryConfig_;
@ -76,11 +74,6 @@ void EclGenericVanguard::setExternalParseContext(std::unique_ptr<ParseContext> p
externalParseContext_ = std::move(parseContext); externalParseContext_ = std::move(parseContext);
} }
void EclGenericVanguard::setExternalErrorGuard(std::unique_ptr<ErrorGuard> errorGuard)
{
externalErrorGuard_ = std::move(errorGuard);
}
void EclGenericVanguard::setSchedule(std::shared_ptr<Schedule> schedule) void EclGenericVanguard::setSchedule(std::shared_ptr<Schedule> schedule)
{ {
eclSchedule_ = std::move(schedule); eclSchedule_ = std::move(schedule);
@ -258,16 +251,13 @@ void EclGenericVanguard::init()
std::transform(caseName_.begin(), caseName_.end(), caseName_.begin(), ::toupper); std::transform(caseName_.begin(), caseName_.end(), caseName_.begin(), ::toupper);
} }
std::unique_ptr<ErrorGuard> errorGuard = nullptr;
// Check that we are in one of the known configurations for external variables // Check that we are in one of the known configurations for external variables
// and move them to internal // and move them to internal
if (true) if (true)
{ {
if (externalParseContext_ && externalErrorGuard_ ) if (externalParseContext_ )
{ {
parseContext_ = std::move(externalParseContext_); parseContext_ = std::move(externalParseContext_);
errorGuard = std::move(externalErrorGuard_);
} }
else else
{ {

7
ebos/eclgenericvanguard.hh
View File

@ -112,11 +112,6 @@ public:
*/ */
static void setExternalParseContext(std::unique_ptr<ParseContext> parseContext); static void setExternalParseContext(std::unique_ptr<ParseContext> 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> errorGuard);
/*! /*!
* \brief Set the Opm::Deck object which ought to be used when the simulator vanguard * \brief Set the Opm::Deck object which ought to be used when the simulator vanguard
* is instantiated. * is instantiated.
@ -306,7 +301,6 @@ protected:
static double setupTime_; static double setupTime_;
static std::unique_ptr<ParseContext> externalParseContext_; static std::unique_ptr<ParseContext> externalParseContext_;
static std::unique_ptr<ErrorGuard> externalErrorGuard_;
// These variables may be owned by both Python and the simulator // These variables may be owned by both Python and the simulator
static std::unique_ptr<UDQState> externalUDQState_; static std::unique_ptr<UDQState> externalUDQState_;
@ -345,7 +339,6 @@ protected:
// these attributes point either to the internal or to the external version of the // these attributes point either to the internal or to the external version of the
// parser objects. // parser objects.
std::unique_ptr<ParseContext> parseContext_; std::unique_ptr<ParseContext> parseContext_;
std::unique_ptr<ErrorGuard> errorGuard_;
std::shared_ptr<Python> python; std::shared_ptr<Python> python;
// These variables may be owned by both Python and the simulator // These variables may be owned by both Python and the simulator
static std::shared_ptr<Deck> deck_; static std::shared_ptr<Deck> deck_;