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

Minor code formatting changes

Browse Source
This commit is contained in:
Kjell W. Kongsvik 2016-06-29 10:11:06 +02:00
parent 7f3cbcf91a
commit 31ec1dcfb2
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
View File

@ -43,24 +43,22 @@
namespace Opm {
const std::vector <std::string> SummaryConfig::__ALL_expands_keywords ({
"FOPR", "GOPR", "WOPR", "FOPT", "GOPT", "WOPT",
"FOIR", "GOIR", "WOIR", "FOIT", "GOIT", "WOIT",
"FWPR", "GWPR", "WWPR", "FWPT", "GWPT", "WWPT",
"FWIR", "GWIR", "WWIR", "FWIT", "GWIT", "WWIT",
"FGPR", "GGPR", "WGPR", "FGPT", "GGPT", "WGPT",
"FGIR", "GGIR", "WGIR", "FGIT", "GGIT", "WGIT",
"FVPR", "GVPR", "WVPR", "FVPT", "GVPT", "WVPT",
"FVIR", "GVIR", "WVIR", "FVIT", "GVIT", "WVIT",
"FWCT", "GWCT", "WWCT", "FGOR", "GGOR", "WGOR",
"FWGR", "GWGR", "WWGR",
"WBHP", "WTHP", "WPI",
"FOIP", "FOIPL", "FOIPG",
"FWIP",
"FGIP", "FGIPL", "FGIPG", "FPR",
"FAQR", "FAQRG", "AAQR", "AAQRG",
"FAQT", "FAQTG", "AAQT", "AAQTG"
});
const std::vector <std::string> SummaryConfig::__ALL_expands_keywords ({
"FAQR", "FAQRG", "FAQT", "FAQTG", "FGIP", "FGIPG", "FGIPL",
"FGIR", "FGIT", "FGOR", "FGPR", "FGPT", "FOIP", "FOIPG",
"FOIPL", "FOIR", "FOIT", "FOPR", "FOPT", "FPR", "FVIR",
"FVIT", "FVPR", "FVPT", "FWCT", "FWGR", "FWIP", "FWIR",
"FWIT", "FWPR", "FWPT",
"GGIR", "GGIT", "GGOR", "GGPR", "GGPT", "GOIR", "GOIT",
"GOPR", "GOPT", "GVIR", "GVIT", "GVPR", "GVPT", "GWCT",
"GWGR", "GWIR", "GWIT", "GWPR", "GWPT",
"WBHP", "WGIR", "WGIT", "WGOR", "WGPR", "WGPT", "WOIR",
"WOIT", "WOPR", "WOPT", "WPI", "WTHP", "WVIR", "WVIT",
"WVPR", "WVPT", "WWCT", "WWGR", "WWIR", "WWIT", "WWPR",
"WWPT",
// ALL will not expand to these keywords yet
"AAQR", "AAQRG", "AAQT", "AAQTG"
});
std::vector <std::string> SummaryConfig::getAllExpandedKeywords() {
return __ALL_expands_keywords;

6
opm/parser/eclipse/EclipseState/SummaryConfig/tests/SummaryConfigTests.cpp
View File

@ -91,7 +91,7 @@ static std::vector< std::string > sorted_key_names( const SummaryConfig& summary
std::string key = x.keyword();
auto wgname = x.wgname();
if(wgname) {
key += ": "+ std::string(wgname);
key += ":"+ std::string(wgname);
}
ret.push_back( key );
}
@ -218,13 +218,13 @@ BOOST_AUTO_TEST_CASE(summary_ALL) {
all.push_back(keyword);
}
else if (keyword[0]=='G') {
auto kn = keyword + ": ";
auto kn = keyword + ":";
all.push_back(kn + "G");
all.push_back(kn + "OP");
all.push_back(kn + "FIELD");
}
else if (keyword[0]=='W') {
auto kn = keyword + ": ";
auto kn = keyword + ":";
all.push_back(kn + "W_1");
all.push_back(kn + "WX2");
all.push_back(kn + "W_3");