Added support of SWCR and SOWCR in CornerpointChopper

This commit is contained in:
Kari B. Skjerve
2014-03-11 14:51:23 +01:00
parent e2d5aafb56
commit c34d7a40fc

View File

@@ -236,6 +236,8 @@ namespace Opm
filterIntegerField("ACTNUM", new_ACTNUM_);
filterDoubleField("PORO", new_PORO_);
filterDoubleField("NTG", new_NTG_);
filterDoubleField("SWCR", new_SWCR_);
filterDoubleField("SOWCR", new_SOWCR_);
filterDoubleField("PERMX", new_PERMX_);
filterDoubleField("PERMY", new_PERMY_);
filterDoubleField("PERMZ", new_PERMZ_);
@@ -264,6 +266,8 @@ namespace Opm
if (!new_ACTNUM_.empty()) sp.setIntegerField("ACTNUM", new_ACTNUM_);
if (!new_PORO_.empty()) sp.setFloatingPointField("PORO", new_PORO_);
if (!new_NTG_.empty()) sp.setFloatingPointField("NTG", new_NTG_);
if (!new_SWCR_.empty()) sp.setFloatingPointField("SWCR", new_SWCR_);
if (!new_SOWCR_.empty()) sp.setFloatingPointField("SOWCR", new_SOWCR_);
if (!new_PERMX_.empty()) sp.setFloatingPointField("PERMX", new_PERMX_);
if (!new_PERMY_.empty()) sp.setFloatingPointField("PERMY", new_PERMY_);
if (!new_PERMZ_.empty()) sp.setFloatingPointField("PERMZ", new_PERMZ_);
@@ -291,12 +295,16 @@ namespace Opm
outputField(out, new_ACTNUM_, "ACTNUM");
outputField(out, new_PORO_, "PORO");
if (hasNTG()) {outputField(out, new_NTG_, "NTG");}
if (hasSWCR()) {outputField(out, new_SWCR_, "SWCR");}
if (hasSOWCR()) {outputField(out, new_SOWCR_, "SOWCR");}
outputField(out, new_PERMX_, "PERMX");
outputField(out, new_PERMY_, "PERMY");
outputField(out, new_PERMZ_, "PERMZ");
outputField(out, new_SATNUM_, "SATNUM");
}
bool hasNTG() const {return !new_NTG_.empty(); }
bool hasSWCR() const {return !new_SWCR_.empty(); }
bool hasSOWCR() const {return !new_SOWCR_.empty(); }
private:
EclipseGridParser parser_;
@@ -309,6 +317,8 @@ namespace Opm
std::vector<int> new_ACTNUM_;
std::vector<double> new_PORO_;
std::vector<double> new_NTG_;
std::vector<double> new_SWCR_;
std::vector<double> new_SOWCR_;
std::vector<double> new_PERMX_;
std::vector<double> new_PERMY_;
std::vector<double> new_PERMZ_;