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

changes after pull to opm/opm-core

Browse Source
This commit is contained in:
Kari B. Skjerve
2013-10-09 13:23:24 +02:00
parent 99a599be94
commit 09e572a15e
1 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
opm/core/io/eclipse/CornerpointChopper.hpp
View File

@@ -53,16 +53,6 @@ namespace Opm
std::cout << "Parsed grdecl file with dimensions (" std::cout << "Parsed grdecl file with dimensions ("
<< dims_[0] << ", " << dims_[1] << ", " << dims_[2] << ")" << std::endl; << dims_[0] << ", " << dims_[1] << ", " << dims_[2] << ")" << std::endl;
// Set NTG=1 if this is missing in file
if (!parser_.hasField("NTG")) {
std::vector<double> NTG_dummy(dims_[0]*dims_[1]*dims_[2],1.0);
parser_.setFloatingPointField("NTG", NTG_dummy);
has_NTG_ = false;
}
else {
has_NTG_ = true;
}
} }
@@ -317,18 +307,13 @@ namespace Opm
outputField(out, new_ACTNUM_, "ACTNUM"); outputField(out, new_ACTNUM_, "ACTNUM");
outputField(out, new_PORO_, "PORO"); outputField(out, new_PORO_, "PORO");
if (has_NTG_) { if (hasNTG()) {outputField(out, new_NTG_, "NTG");}
outputField(out, new_NTG_, "NTG");
}
outputField(out, new_PERMX_, "PERMX"); outputField(out, new_PERMX_, "PERMX");
outputField(out, new_PERMY_, "PERMY"); outputField(out, new_PERMY_, "PERMY");
outputField(out, new_PERMZ_, "PERMZ"); outputField(out, new_PERMZ_, "PERMZ");
outputField(out, new_SATNUM_, "SATNUM"); outputField(out, new_SATNUM_, "SATNUM");
} }
bool hasNTG() const {return !new_NTG_.empty(); }
bool hasNTG() {
return has_NTG_;
}
private: private:
EclipseGridParser parser_; EclipseGridParser parser_;
@@ -341,7 +326,6 @@ namespace Opm
std::vector<int> new_ACTNUM_; std::vector<int> new_ACTNUM_;
std::vector<double> new_PORO_; std::vector<double> new_PORO_;
std::vector<double> new_NTG_; std::vector<double> new_NTG_;
bool has_NTG_;
std::vector<double> new_PERMX_; std::vector<double> new_PERMX_;
std::vector<double> new_PERMY_; std::vector<double> new_PERMY_;
std::vector<double> new_PERMZ_; std::vector<double> new_PERMZ_;