From 3a7573370aa389ee8387fc811a84b3c2199754ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A5rd=20Skaflestad?= Date: Thu, 17 Mar 2016 10:34:59 +0100 Subject: [PATCH] Chase ParseMode -> ParseContext Renaming in Examples --- examples/cpregularize.cpp | 4 ++-- examples/grdecldips.cpp | 2 +- examples/upscale_avg.cpp | 2 +- examples/upscale_cap.cpp | 2 +- examples/upscale_cond.cpp | 2 +- examples/upscale_perm.cpp | 2 +- examples/upscale_relperm.cpp | 2 +- examples/upscale_relpermvisc.cpp | 2 +- examples/upscale_steadystate_implicit.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/cpregularize.cpp b/examples/cpregularize.cpp index e6e0c16..f02a875 100644 --- a/examples/cpregularize.cpp +++ b/examples/cpregularize.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include @@ -122,7 +122,7 @@ try std::vector permz; - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; // Original x/y resolution in terms of coordinate values (not indices) Opm::ParserPtr parser(new Opm::Parser); Opm::DeckConstPtr deck(parser->parseFile(gridfilename , parseMode)); // TODO: REFACTOR!!!! it is stupid to parse this again diff --git a/examples/grdecldips.cpp b/examples/grdecldips.cpp index 5348640..913c292 100644 --- a/examples/grdecldips.cpp +++ b/examples/grdecldips.cpp @@ -69,7 +69,7 @@ int main(int argc, char** argv) try { param.displayUsage(); } - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; Opm::ParserPtr parser(new Opm::Parser()); Opm::DeckConstPtr deck(parser->parseFile(gridfilename , parseMode)); Opm::EclipseGridInspector gridinspector(deck); diff --git a/examples/upscale_avg.cpp b/examples/upscale_avg.cpp index 646d813..b144c5c 100644 --- a/examples/upscale_avg.cpp +++ b/examples/upscale_avg.cpp @@ -161,7 +161,7 @@ int main(int varnum, char** vararg) try { // eclParser_p is here a pointer to an object of type Opm::EclipseGridParser // (this pointer trick is necessary for the try-catch-clause to work) - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; Opm::ParserPtr parser(new Opm::Parser()); Opm::addNonStandardUpscalingKeywords(parser); Opm::DeckConstPtr deck(parser->parseFile(ECLIPSEFILENAME , parseMode)); diff --git a/examples/upscale_cap.cpp b/examples/upscale_cap.cpp index a4b5dcc..8a4cfd5 100644 --- a/examples/upscale_cap.cpp +++ b/examples/upscale_cap.cpp @@ -231,7 +231,7 @@ try eclipsefile.close(); cout << "Parsing Eclipse file <" << ECLIPSEFILENAME << "> ... " << endl; - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; Opm::ParserPtr parser(new Opm::Parser()); Opm::addNonStandardUpscalingKeywords(parser); Opm::DeckConstPtr deck(parser->parseFile(ECLIPSEFILENAME , parseMode)); diff --git a/examples/upscale_cond.cpp b/examples/upscale_cond.cpp index cf2f6a3..0eb0233 100644 --- a/examples/upscale_cond.cpp +++ b/examples/upscale_cond.cpp @@ -340,7 +340,7 @@ try if (isMaster) cout << "Parsing Eclipse file <" << ECLIPSEFILENAME << "> ... "; flush(cout); start = clock(); - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; Opm::ParserPtr parser(new Opm::Parser()); Opm::addNonStandardUpscalingKeywords(parser); Opm::DeckConstPtr deck(parser->parseFile(ECLIPSEFILENAME , parseMode)); diff --git a/examples/upscale_perm.cpp b/examples/upscale_perm.cpp index de7de28..e92b520 100644 --- a/examples/upscale_perm.cpp +++ b/examples/upscale_perm.cpp @@ -192,7 +192,7 @@ int upscale(int varnum, char** vararg) { cout << "Parsing Eclipse file <" << ECLIPSEFILENAME << "> ... "; flush(cout); start = clock(); - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; Opm::ParserPtr parser(new Opm::Parser()); Opm::addNonStandardUpscalingKeywords(parser); Opm::DeckConstPtr deck(parser->parseFile(ECLIPSEFILENAME , parseMode)); diff --git a/examples/upscale_relperm.cpp b/examples/upscale_relperm.cpp index bbfdc62..3e8fcb4 100644 --- a/examples/upscale_relperm.cpp +++ b/examples/upscale_relperm.cpp @@ -385,7 +385,7 @@ try if (helper.isMaster) cout << "Parsing Eclipse file <" << ECLIPSEFILENAME << "> ... "; flush(cout); start = clock(); - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; Opm::ParserPtr parser(new Opm::Parser()); Opm::addNonStandardUpscalingKeywords(parser); Opm::DeckConstPtr deck(parser->parseFile(ECLIPSEFILENAME , parseMode)); diff --git a/examples/upscale_relpermvisc.cpp b/examples/upscale_relpermvisc.cpp index 39b62fd..46396bb 100644 --- a/examples/upscale_relpermvisc.cpp +++ b/examples/upscale_relpermvisc.cpp @@ -336,7 +336,7 @@ try if (isMaster) cout << "Parsing Eclipse file <" << ECLIPSEFILENAME << "> ... "; flush(cout); start = clock(); - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; Opm::ParserPtr parser(new Opm::Parser()); Opm::addNonStandardUpscalingKeywords(parser); Opm::DeckConstPtr deck(parser->parseFile(ECLIPSEFILENAME , parseMode)); diff --git a/examples/upscale_steadystate_implicit.cpp b/examples/upscale_steadystate_implicit.cpp index df96af3..c7a45dc 100644 --- a/examples/upscale_steadystate_implicit.cpp +++ b/examples/upscale_steadystate_implicit.cpp @@ -188,7 +188,7 @@ try usageandexit(); } // Initialize. - Opm::ParseMode parseMode; + Opm::ParseContext parseMode; Opm::parameter::ParameterGroup param(argc, argv); std::string gridfilename = param.get("gridfilename"); Opm::ParserPtr parser(new Opm::Parser());