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

call checkDeck() in FlowMain instead of checkKeywords().

Browse Source
This commit is contained in:
Liu Ming 2016-07-07 15:38:03 +08:00
parent 7b81724e27
commit 1b5b112031
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/FlowMain.hpp
View File

@ -80,6 +80,7 @@
#include <opm/parser/eclipse/EclipseState/EclipseState.hpp>
#include <opm/parser/eclipse/EclipseState/IOConfig/IOConfig.hpp>
#include <opm/parser/eclipse/EclipseState/InitConfig/InitConfig.hpp>
#include <opm/parser/eclipse/EclipseState/checkDeck.hpp>
#include <boost/filesystem.hpp>
#include <boost/algorithm/string.hpp>
@ -411,7 +412,8 @@ namespace Opm
try {
ParseContext parseContext({{ ParseContext::PARSE_RANDOM_SLASH , InputError::IGNORE }});
deck_ = parser->parseFile(deck_filename, parseContext);
checkKeywords(deck_, parser);
checkDeck(deck_, parser);
MissingFeatures::checkKeywords(deck_, parser);
eclipse_state_.reset(new EclipseState(deck_, parseContext));
auto ioConfig = eclipse_state_->getIOConfig();
ioConfig->setOutputDir(output_dir_);

39
opm/autodiff/MissingFeatures.cpp
View File

@ -19,7 +19,6 @@
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp>
#include <opm/parser/eclipse/EclipseState/checkDeck.hpp>
#include <opm/autodiff/MissingFeatures.hpp>
#include <unordered_set>
#include <string>
@ -27,7 +26,8 @@
namespace Opm {
namespace MissingFeatures {
void checkKeywords(DeckConstPtr deck, ParserConstPtr parser)
{
// These keywords are supported by opm-parser, but are not supported
@ -35,39 +35,38 @@ namespace Opm {
// The list is used to output messages only.
std::unordered_set<std::string> unsupported_keywords = {
"ACTDIMS", "ADSALNOD", "API", "AQUCON", "AQUDIMS", "AQUNUM"
"BLOCK_PROBE", "COMPLUMP", "COMPSEGS", "CONNECTION", "CPR",
"DATE", "ECHO", "EDITNNC", "ENDINC", "ENDNUM", "ENDPOINT_SPECIFIERS",
"COMPLUMP", "COMPSEGS", "CONNECTION", "CPR",
"DATE", "ECHO", "EDITNNC", "ENDNUM",
"ENDSKIP", "ENKSRVD", "ENPTVD", "EQLNUM", "EQUALREG",
"EXCEL", "EXTRAPMS", "FILED_PROBE", "FILLEPS", "FIPNUM", "FMTIN",
"EXCEL", "EXTRAPMS", "FILLEPS", "FIPNUM", "FMTIN",
"FMTOUT", "FULLIMP", "GDORIENT", "GECON", "GEFAC", "GRIDUNIT",
"GROUP_PROBE", "GRUPNET", "IMKRVD", "IMPES", "IMPTVD", "MAPUNITS",
"MAXVALUE", "MEMORY", "MESSAGES", "MINVALUE", "MONITOR", "MSGFILE",
"GRUPNET", "IMKRVD", "IMPES", "IMPTVD", "MAPUNITS",
"MAXVALUE", "MESSAGES", "MINVALUE", "MONITOR", "MSGFILE",
"MULT_XYZ", "NETBALAN", "NEXTSTEP", "NOCASC", "NOECHO",
"NOGGF", "NOINSPEC", "NOMONITO", "NONNC", "NORSSPEC", "NOSIM",
"NSTACK", "NUMRES", "NUPCOL", "OILVISCT", "OLDTRAN", "OPTIONS",
"PARALLEL", "PBVD", "PCG", "PERFORMACE_PROBE", "PERMXY", "PERMYZ",
"PARALLEL", "PBVD", "PCG", "PERMXY", "PERMYZ",
"PERMZX", "PIMTDIMS", "PIMULTAB", "PLMIXPAR", "PLYADSS", "PLYDHFLF",
"RADFIN4", "REGDIMS", "REGION_PROBE", "RKTRMDIR", "ROCKCOMP", "ROCKOPTS",
"RADFIN4", "REGDIMS", "RKTRMDIR", "ROCKCOMP", "ROCKOPTS",
"ROCKTAB", "RPTGRID", "RPTONLY", "RPTONLYO", "RPTPROS", "PRTRST", "RPTRUNSP",
"RPTSCHED", "RPTSOL", "RTEMPVD", "RUNSUM", "SATOPTS", "SAVE", "SEPARATE",
"SKIP", "SKIP100", "SKIP300", "SKIPREST", "SMRYDIMS", "SPECGRID", "SSOL",
"SUMTHIN", "TEMP", "THCONR", "TRACER", "TRACERS", "UDADIMS", "UDQDIMS",
"UNIFIN", "UNIFOUT", "VAPPARS", "VISCREF", "WATVISCT", "WELL_PROBE",
"WPAVE", "WPIMULT", "WPITAB", "WRFT", "WRFTPLT", "WSEGDIMS", "WTEMP",
"VAPPARS", "VISCREF", "WATVISCT",
"WPAVE", "WPIMULT", "WPITAB", "WSEGDIMS", "WTEMP",
"WTEST", "WTRACER", "ZIPPY2" };
// check deck and keyword for flow and parser.
if (checkDeck(deck, parser)) {
for (size_t idx = 0; idx < deck->size(); ++idx) {
const auto& keyword = deck->getKeyword(idx);
std::unordered_set<std::string>::const_iterator it;
it = unsupported_keywords.find(keyword.name());
if (it != unsupported_keywords.end()) {
std::string msg = "Keyword '" + keyword.name() + "' is not supported by flow.\n"
+ "In file " + keyword.getFileName() + ", line " + std::to_string(keyword.getLineNumber()) + "\n";
for (size_t idx = 0; idx < deck->size(); ++idx) {
const auto& keyword = deck->getKeyword(idx);
std::unordered_set<std::string>::const_iterator it;
it = unsupported_keywords.find(keyword.name());
if (it != unsupported_keywords.end()) {
std::string msg = "Keyword '" + keyword.name() + "' is not supported by flow.\n"
+ "In file " + keyword.getFileName() + ", line " + std::to_string(keyword.getLineNumber()) + "\n";
OpmLog::error(msg);
}
}
}
}
} // namespace MissingFeatures
} // namespace Opm

6
opm/autodiff/MissingFeatures.hpp
View File

@ -21,7 +21,13 @@
#define OPM_MISSINGFEATURES_HEADER_INCLUDED
namespace Opm {
namespace MissingFeatures {
void checkKeywords(std::shared_ptr<const Deck> deck, std::shared_ptr<const Parser> parser);
}
}