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

Use flat vector for TSTEP, implement convertToSI().

Browse Source
This commit is contained in:
Bjørn Spjelkavik 2012-01-03 09:57:41 +01:00
parent 79ba5608c5
commit 9a12c4566c
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/core/eclipse/SpecialEclipseFields.hpp
View File

@ -1410,7 +1410,7 @@ struct PVCDO : public SpecialBase
struct TSTEP : public SpecialBase struct TSTEP : public SpecialBase
{ {
std::vector<std::vector<double> > tstep_; std::vector<double> tstep_;
virtual std::string name() const {return std::string("TSTEP");} virtual std::string name() const {return std::string("TSTEP");}
@ -1419,22 +1419,24 @@ struct TSTEP : public SpecialBase
std::vector<double> tstep; std::vector<double> tstep;
readVectorData(is, tstep); readVectorData(is, tstep);
if (!tstep.empty()) { if (!tstep.empty()) {
tstep_.push_back(tstep); tstep_.insert(tstep_.end(), tstep.begin(), tstep.end());
} }
} }
virtual void write(std::ostream& os) const virtual void write(std::ostream& os) const
{ {
os << name() << '\n'; os << name() << '\n';
for (int i=0; i<(int)tstep_.size(); ++i) { copy(tstep_.begin(), tstep_.end(),
copy(tstep_[i].begin(), tstep_[i].end(), std::ostream_iterator<double>(os, " "));
std::ostream_iterator<double>(os, " ")); os << '\n';
os << '\n';
}
} }
virtual void convertToSI(const EclipseUnits& units) virtual void convertToSI(const EclipseUnits& units)
{ {
int num_steps = tstep_.size();
for (int i = 0; i < num_steps; ++i) {
tstep_[i] *= units.time;
}
} }
}; };