Merge pull request #3247 from akva2/cleanup_vanguard

Some small cleanups
This commit is contained in:
Bård Skaflestad 2021-05-12 17:20:51 +02:00 committed by GitHub
commit 993c973340
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -53,13 +53,13 @@
namespace Opm { namespace Opm {
double EclGenericVanguard::externalSetupTime_ = 0.0; double EclGenericVanguard::externalSetupTime_ = 0.0;
std::unique_ptr<ParseContext> EclGenericVanguard::externalParseContext_ = nullptr; std::unique_ptr<ParseContext> EclGenericVanguard::externalParseContext_;
std::unique_ptr<ErrorGuard> EclGenericVanguard::externalErrorGuard_ = nullptr; std::unique_ptr<ErrorGuard> EclGenericVanguard::externalErrorGuard_;
std::unique_ptr<Deck> EclGenericVanguard::externalDeck_; std::unique_ptr<Deck> EclGenericVanguard::externalDeck_;
bool EclGenericVanguard::externalDeckSet_ = false; bool EclGenericVanguard::externalDeckSet_ = false;
std::unique_ptr<EclipseState> EclGenericVanguard::externalEclState_; std::unique_ptr<EclipseState> EclGenericVanguard::externalEclState_;
std::unique_ptr<Schedule> EclGenericVanguard::externalEclSchedule_ = nullptr; std::unique_ptr<Schedule> EclGenericVanguard::externalEclSchedule_;
std::unique_ptr<SummaryConfig> EclGenericVanguard::externalEclSummaryConfig_ = nullptr; std::unique_ptr<SummaryConfig> EclGenericVanguard::externalEclSummaryConfig_;
EclGenericVanguard::EclGenericVanguard() EclGenericVanguard::EclGenericVanguard()
: python(std::make_shared<Python>()) : python(std::make_shared<Python>())

View File

@ -256,7 +256,7 @@ public:
* *
* Will only have usable values for CpGrid. * Will only have usable values for CpGrid.
*/ */
const std::vector<std::pair<std::string,bool>>& parallelWells() const const ParallelWellStruct& parallelWells() const
{ return parallelWells_; } { return parallelWells_; }
protected: protected: