OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-14 04:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1780 from andlaus/ebos_deck_diagnostics

Browse Source 
Ebos deck diagnostics
This commit is contained in:
Tor Harald Sandve 2019-05-03 13:49:02 +02:00 committed by GitHub
commit e19508e599
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ebos/eclbasevanguard.hh
View File

@ -31,6 +31,10 @@
#include <ewoms/common/propertysystem.hh>
#include <ewoms/common/parametersystem.hh>
#include <opm/grid/CpGrid.hpp>
#include <opm/grid/cpgrid/GridHelpers.hpp>
#include <opm/core/props/satfunc/RelpermDiagnostics.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
@ -68,6 +72,7 @@ NEW_PROP_TAG(EnableOpmRstFile);
NEW_PROP_TAG(EclStrictParsing);
NEW_PROP_TAG(EclOutputInterval);
NEW_PROP_TAG(IgnoreKeywords);
NEW_PROP_TAG(EnableExperiments);
SET_STRING_PROP(EclBaseVanguard, IgnoreKeywords, "");
SET_STRING_PROP(EclBaseVanguard, EclDeckFileName, "");
@ -92,6 +97,8 @@ class EclBaseVanguard : public BaseVanguard<TypeTag>
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
enum { enableExperiments = GET_PROP_VALUE(TypeTag, EnableExperiments) };
public:
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
@ -257,6 +264,9 @@ public:
internalDeck_.reset(new Opm::Deck(parser.parseFile(fileName , parseContext, errorGuard)));
internalEclState_.reset(new Opm::EclipseState(*internalDeck_, parseContext, errorGuard));
if (enableExperiments && myRank == 0)
Opm::checkDeck(*internalDeck_, parser, parseContext, errorGuard);
deck_ = &(*internalDeck_);
eclState_ = &(*internalEclState_);
}
@ -310,6 +320,11 @@ public:
asImp_().filterConnections_();
asImp_().updateOutputDir_();
asImp_().finalizeInit_();
if (enableExperiments) {
Opm::RelpermDiagnostics relpermDiagnostics;
relpermDiagnostics.diagnosis(*internalEclState_, *internalDeck_, asImp_().grid());
}
}
/*!