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

Initial version of schedule handling more or less complete.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2012-06-07 15:09:13 +02:00
parent 78e9a8f6fa
commit 174ab7cd6e
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,6 +446,15 @@ void EclipseGridParser::readImpl(istream& is)
special_field_by_epoch_.push_back(SpecialMap()); special_field_by_epoch_.push_back(SpecialMap());
++current_epoch_; ++current_epoch_;
ASSERT(int(special_field_by_epoch_.size()) == current_epoch_ + 1); ASSERT(int(special_field_by_epoch_.size()) == current_epoch_ + 1);
// Add clones of all existing special fields to new map.
SpecialMap& oldmap = special_field_by_epoch_[current_epoch_ - 1];
SpecialMap& newmap = special_field_by_epoch_[current_epoch_];
for (SpecialMap::iterator it = oldmap.begin(); it != oldmap.end(); ++it) {
// if (it->first != "TSTEP") {
newmap[it->first] = cloneSpecialField(it->first, it->second);
//}
}
//ASSERT(newmap.count("TSTEP") == 0);
} }
// Check if the keyword already exists. If so, append. Otherwise, create new. // Check if the keyword already exists. If so, append. Otherwise, create new.
SpecialMap::iterator it = special_field_by_epoch_[current_epoch_].find(keyword); SpecialMap::iterator it = special_field_by_epoch_[current_epoch_].find(keyword);
@ -703,6 +712,18 @@ EclipseGridParser::createSpecialField(std::istream& is,
return spec_ptr; return spec_ptr;
} }
//---------------------------------------------------------------------------
std::tr1::shared_ptr<SpecialBase>
EclipseGridParser::cloneSpecialField(const std::string& fieldname,
const std::tr1::shared_ptr<SpecialBase> original)
//---------------------------------------------------------------------------
{
string ukey = upcase(fieldname);
std::tr1::shared_ptr<SpecialBase> spec_ptr
= Factory<SpecialBase>::cloneObject(fieldname, original);
return spec_ptr;
}
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void EclipseGridParser::setIntegerField(const std::string& keyword, void EclipseGridParser::setIntegerField(const std::string& keyword,

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

@ -193,6 +193,8 @@ public:
private: private:
SpecialFieldPtr createSpecialField(std::istream& is, const std::string& fieldname); SpecialFieldPtr createSpecialField(std::istream& is, const std::string& fieldname);
SpecialFieldPtr cloneSpecialField(const std::string& fieldname,
const std::tr1::shared_ptr<SpecialBase> original);
void readImpl(std::istream& is); void readImpl(std::istream& is);