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

merge.

Browse Source
This commit is contained in:
Xavier Raynaud 2012-03-23 15:53:02 +01:00
commit 26f27daacd
2 changed files with 145 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
opm/core/eclipse/EclipseGridParser.cpp
View File

@ -172,28 +172,94 @@ namespace {
inline std::string upcase(const std::string& s) inline std::string upcase(const std::string& s)
{ {
std::string us(s); std::string us(s);
// Getting the character type facet for toupper(). // Getting the character type facet for toupper().
// We use the classic (i.e. C) locale. // We use the classic (i.e. C) locale.
const std::ctype<char>& ct = std::use_facet< std::ctype<char> >(std::locale::classic()); const std::ctype<char>& ct = std::use_facet< std::ctype<char> >(std::locale::classic());
for (int i = 0; i < int(s.size()); ++i) { for (int i = 0; i < int(s.size()); ++i) {
us[i] = ct.toupper(s[i]); us[i] = ct.toupper(s[i]);
} }
return us; return us;
} }
inline std::string readKeyword(std::istream& is) inline std::string readKeyword(std::istream& is)
{ {
std::string keyword_candidate; std::string keyword_candidate;
while (!is.eof()) { while (!is.eof()) {
is >> keyword_candidate; is >> keyword_candidate;
if(keyword_candidate.find("--") == 0) { if(keyword_candidate.find("--") == 0) {
is >> ignoreLine; // This line is a comment is >> ignoreLine; // This line is a comment
} else { } else {
return upcase(keyword_candidate); return upcase(keyword_candidate);
} }
} }
return "CONTINUE"; // Last line in included file is a comment return "CONTINUE"; // Last line in included file is a comment
}
inline bool readKeywordNew(std::istream& is, std::string& keyword)
{
char buf[9];
int i, j;
char c;
/* Clear buf */
for (i=0; i<9; ++i) {
buf[i] = '\0';
}
/* Read first character and check if it is uppercase*/
//buf[0] = fgetc(fp);
is.get(buf[0]);
if ( !isupper( buf[0] ) ) {
is.unget();
return false; /* NOT VALID CHARACTER */
}
/* Scan as much as possible possible keyword, 8 characters long */
i = 1;
is.get(c);
while ( (is.good()) &&
(c != EOF ) &&
(!isblank(c) ) &&
(isupper(c) || isdigit(c)) &&
(c != '\n' ) &&
(c != '/' ) &&
(i < 8 )) {
buf[i++] = c;
is.get(c);
}
/* Skip rest of line */
if (c != '\n'){
is.get(c);
while ( (is.good()) &&
(c != EOF ) &&
(c != '\n' )) {
is.get(c);
}
}
if(c == '\n') {
is.unget();
}
/* Find first non-uppercase or non-digit character */
for (i=0; i<8; ++i) {
if ( !(isupper(buf[i]) || isdigit(buf[i])) ) {
break;
}
}
/* Check if remaining characters are blank */
for (j = i; j<8; ++j) {
if(!isspace(buf[j]) && buf[j] != '\0') {
return false; /* CHARACTER AFTER SPACE OR INVALID CHARACTER */
}
buf[j] = '\0';
}
keyword = std::string(buf);
std::string::size_type end = keyword.find_last_of('\0');
if(end != keyword.npos)
keyword = keyword.substr(0, end+1);
return true;
} }
} // anon namespace } // anon namespace
@ -254,7 +320,7 @@ void EclipseGridParser::readImpl(istream& is)
// Make temporary maps that will at the end be swapped with the // Make temporary maps that will at the end be swapped with the
// member maps // member maps
// NOTE: Above is no longer true, for easier implementation of // NOTE: Above is no longer true, for easier implementation of
// the INCLUDE keyword. We lose the strong exception guarantee, // the INCLUDE keyword. We lose the strong exception guarantee,
// though (of course retaining the basic guarantee). // though (of course retaining the basic guarantee).
map<string, vector<int> >& intmap = integer_field_map_; map<string, vector<int> >& intmap = integer_field_map_;
@ -262,71 +328,71 @@ void EclipseGridParser::readImpl(istream& is)
map<string, tr1::shared_ptr<SpecialBase> >& specialmap = special_field_map_; map<string, tr1::shared_ptr<SpecialBase> >& specialmap = special_field_map_;
// Actually read the data // Actually read the data
is >> ignoreWhitespace; std::string keyword;
while (!is.eof()) { while (is.good()) {
string keyword = readKeyword(is); is >> ignoreWhitespace;
#ifdef VERBOSE bool ok = readKeywordNew(is, keyword);
cout << "Keyword found: " << keyword << endl; if (ok) {
#endif //#ifdef VERBOSE
FieldType type = classifyKeyword(keyword); cout << "Keyword found: " << keyword << endl;
switch (type) { //#endif
case Integer: FieldType type = classifyKeyword(keyword);
readVectorData(is, intmap[keyword]); switch (type) {
break; case Integer:
case FloatingPoint: readVectorData(is, intmap[keyword]);
readVectorData(is, floatmap[keyword]); break;
break; case FloatingPoint:
case SpecialField: { readVectorData(is, floatmap[keyword]);
map<string, std::tr1::shared_ptr<SpecialBase> >::iterator pos = break;
specialmap.find(keyword); case SpecialField: {
if (pos == specialmap.end()) { std::tr1::shared_ptr<SpecialBase> sb_ptr = createSpecialField(is, keyword);
std::tr1::shared_ptr<SpecialBase> sb_ptr =
createSpecialField(is, keyword);
if (sb_ptr) { if (sb_ptr) {
specialmap[keyword] = sb_ptr; specialmap[keyword] = sb_ptr;
} else { } else {
THROW("Could not create field " << keyword); THROW("Could not create field " << keyword);
} }
} else { break;
pos->second->read(is);
} }
break; case IgnoreWithData: {
} ignored_fields_.insert(keyword);
case IgnoreWithData: { //is >> ignoreSlashLine;
ignored_fields_.insert(keyword); //#ifdef VERBOSE
is >> ignoreSlashLine; // cout << "(ignored)" << endl;
#ifdef VERBOSE //#endif
cout << "(ignored)" << endl; break;
#endif }
break; case IgnoreNoData: {
} ignored_fields_.insert(keyword);
case IgnoreNoData: { //is >> ignoreLine;
ignored_fields_.insert(keyword); //#ifdef VERBOSE
// cout << "(ignored)" << endl;
//#endif
break;
}
case Include: {
string include_filename = readString(is);
if (!directory_.empty()) {
include_filename = directory_ + '/' + include_filename;
}
ifstream include_is(include_filename.c_str());
if (!include_is) {
THROW("Unable to open INCLUDEd file " << include_filename);
}
readImpl(include_is);
// is >> ignoreSlashLine;
break;
}
case Unknown:
default:
ignored_fields_.insert(keyword);
cout << "*** Warning: keyword " << keyword << " is unknown." << endl;
//is >> ignoreSlashLine;
//throw exception();
}
} else {
// if (!ok)
is >> ignoreLine; is >> ignoreLine;
#ifdef VERBOSE
cout << "(ignored)" << endl;
#endif
break;
} }
case Include: {
string include_filename = readString(is);
if (!directory_.empty()) {
include_filename = directory_ + '/' + include_filename;
}
ifstream include_is(include_filename.c_str());
if (!include_is) {
THROW("Unable to open INCLUDEd file " << include_filename);
}
readImpl(include_is);
is >> ignoreSlashLine;
break;
}
case Unknown:
default:
cerr << "Keyword " << keyword << " not recognized." << endl;
throw exception();
}
is >> ignoreWhitespace;
} }
#define VERBOSE_LIST_FIELDS 0 #define VERBOSE_LIST_FIELDS 0
@ -382,7 +448,7 @@ void EclipseGridParser::convertToSI()
unit = 1.0; unit = 1.0;
do_convert = false; // Dimensionless keywords... do_convert = false; // Dimensionless keywords...
} else if (key == "PRESSURE") { } else if (key == "PRESSURE") {
unit = units_.pressure; unit = units_.pressure;
} else { } else {
THROW("Units for field " << key << " not specified. Cannon convert to SI."); THROW("Units for field " << key << " not specified. Cannon convert to SI.");
} }
@ -478,7 +544,7 @@ const std::vector<int>& EclipseGridParser::getIntegerValue(const std::string& ke
map<string, vector<int> >::const_iterator it map<string, vector<int> >::const_iterator it
= integer_field_map_.find(keyword); = integer_field_map_.find(keyword);
if (it == integer_field_map_.end()) { if (it == integer_field_map_.end()) {
return empty_integer_field_; THROW("No such field: " << keyword);
} else { } else {
return it->second; return it->second;
} }
@ -491,7 +557,7 @@ const std::vector<double>& EclipseGridParser::getFloatingPointValue(const std::s
map<string, vector<double> >::const_iterator it map<string, vector<double> >::const_iterator it
= floating_field_map_.find(keyword); = floating_field_map_.find(keyword);
if (it == floating_field_map_.end()) { if (it == floating_field_map_.end()) {
return empty_floating_field_; THROW("No such field: " << keyword);
} else { } else {
return it->second; return it->second;
} }

2
opm/core/eclipse/EclipseGridParser.hpp
View File

@ -186,8 +186,6 @@ private:
std::map<std::string, std::vector<double> > floating_field_map_; std::map<std::string, std::vector<double> > floating_field_map_;
std::map<std::string, std::tr1::shared_ptr<SpecialBase> > special_field_map_; std::map<std::string, std::tr1::shared_ptr<SpecialBase> > special_field_map_;
std::set<std::string> ignored_fields_; std::set<std::string> ignored_fields_;
std::vector<int> empty_integer_field_;
std::vector<double> empty_floating_field_;
std::tr1::shared_ptr<SpecialBase> empty_special_field_; std::tr1::shared_ptr<SpecialBase> empty_special_field_;
EclipseUnits units_; EclipseUnits units_;
}; };