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

Add ParseContext behaviour to trimming of well/group names

Browse Source
This commit is contained in:
Joakim Hove
2019-08-09 12:12:30 +02:00
parent b55e073182
commit 49d32a02fb
8 changed files with 109 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp
View File

@@ -248,7 +248,7 @@ namespace Opm
void handleUDQ(const DeckKeyword& keyword, size_t currentStep);
void handleWLIST(const DeckKeyword& keyword, size_t currentStep);
void handleCOMPORD(const ParseContext& parseContext, ErrorGuard& errors, const DeckKeyword& compordKeyword, size_t currentStep);
void handleWELSPECS( const SCHEDULESection&, size_t, size_t , const UnitSystem& unit_system);
void handleWELSPECS( const SCHEDULESection&, size_t, size_t , const UnitSystem& unit_system, const ParseContext& parseContext, ErrorGuard& errors);
void handleWCONHIST( const DeckKeyword& keyword, size_t currentStep, const ParseContext& parseContext, ErrorGuard& errors);
void handleWCONPROD( const DeckKeyword& keyword, size_t currentStep, const ParseContext& parseContext, ErrorGuard& errors);
void handleWGRUPCON( const DeckKeyword& keyword, size_t currentStep);
@@ -273,7 +273,7 @@ namespace Opm
void handleGEFAC( const DeckKeyword& keyword, size_t currentStep, const ParseContext& parseContext, ErrorGuard& errors);
void handleWEFAC( const DeckKeyword& keyword, size_t currentStep, const ParseContext& parseContext, ErrorGuard& errors);
void handleTUNING( const DeckKeyword& keyword, size_t currentStep);
void handleGRUPTREE( const DeckKeyword& keyword, size_t currentStep, const UnitSystem& unit_system);
void handleGRUPTREE( const DeckKeyword& keyword, size_t currentStep, const UnitSystem& unit_system, const ParseContext& parseContext, ErrorGuard& errors);
void handleGRUPNET( const DeckKeyword& keyword, size_t currentStep, const UnitSystem& unit_system);
void handleWRFT( const DeckKeyword& keyword, size_t currentStep);
void handleWTEST( const DeckKeyword& keyword, size_t currentStep, const ParseContext& parseContext, ErrorGuard& errors);

8
opm/parser/eclipse/Parser/ParseContext.hpp
View File

@@ -271,6 +271,14 @@ namespace Opm {
*/
const static std::string PARSE_MISSING_SECTIONS;
/*
When defining wells and groups with the WELSPECS and GRUPTREE keywords
we do not allow leading or trailing spaces. The code in Schedule.cpp
will *unconditionally* remove the spaces, but with PARSE_WGNAME_SPACE
setting you can additionally configure the normal IGNORE|WARN|ERROR
behavior.
*/
const static std::string PARSE_WGNAME_SPACE;
/*
If you have configured a specific well in the summary section,