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

Merge pull request #596 from andlaus/fix_some_keyword_names

Browse Source 
Fix some keyword names
This commit is contained in:
Bård Skaflestad 2014-06-10 23:14:34 +02:00
commit 6bac6159ee
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/core/io/eclipse/EclipseWriter.cpp
View File

@ -1069,12 +1069,6 @@ void EclipseWriter::writeInit(const SimulatorTimer &timer)
deck_,
uses_);
if (deck_->hasKeyword("PERM")) {
auto data = getAllSiDoubles_(deck_->getKeyword("PERM"));
convertUnit_(data, toMilliDarcy);
fortio.writeKeyword ("PERM", data);
}
if (deck_->hasKeyword("PERMX")) {
auto data = getAllSiDoubles_(deck_->getKeyword("PERMX"));
convertUnit_(data, toMilliDarcy);

26
opm/core/props/rock/RockFromDeck.cpp
View File

@ -159,15 +159,15 @@ namespace Opm
{
const bool xx = deck->hasKeyword("PERMX" );
const bool xy = deck->hasKeyword("PERMXY");
const bool xz = deck->hasKeyword("PERMXZ");
const bool yx = xy;
const bool yx = deck->hasKeyword("PERMYX");
const bool yy = deck->hasKeyword("PERMY" );
const bool yz = deck->hasKeyword("PERMYZ");
const bool zy = yz;
const bool zx = deck->hasKeyword("PERMZX");
const bool zy = deck->hasKeyword("PERMZY");
const bool zz = deck->hasKeyword("PERMZ" );
const bool zx = deck->hasKeyword("PERMZX");
const bool xz = zx;
int num_cross_comp = xy + xz + yx + yz + zx + zy;
int num_comp = xx + yy + zz + num_cross_comp;
@ -278,7 +278,7 @@ namespace Opm
zx, zy, zz }; // 6, 7, 8
// -----------------------------------------------------------
// 1st row: [kxx, kxy, kxz]
// 1st row: [ kxx, kxy ], kxz handled in kzx
if (deck->hasKeyword("PERMX" )) {
kmap[xx] = tensor.size();
tensor.push_back(&deck->getKeyword("PERMX")->getSIDoubleData());
@ -289,17 +289,9 @@ namespace Opm
kmap[xy] = kmap[yx] = tensor.size(); // Enforce symmetry.
tensor.push_back(&deck->getKeyword("PERMXY")->getSIDoubleData());
}
if (deck->hasKeyword("PERMXZ")) {
kmap[xz] = kmap[zx] = tensor.size(); // Enforce symmetry.
tensor.push_back(&deck->getKeyword("PERMXZ")->getSIDoubleData());
}
// -----------------------------------------------------------
// 2nd row: [kyx, kyy, kyz]
if (deck->hasKeyword("PERMYX")) {
kmap[yx] = kmap[xy] = tensor.size(); // Enforce symmetry.
tensor.push_back(&deck->getKeyword("PERMYX")->getSIDoubleData());
}
// 2nd row: [ kyy, kyz ], kyx handled in kxy
if (deck->hasKeyword("PERMY" )) {
kmap[yy] = tensor.size();
tensor.push_back(&deck->getKeyword("PERMY")->getSIDoubleData());
@ -312,15 +304,11 @@ namespace Opm
}
// -----------------------------------------------------------
// 3rd row: [kzx, kzy, kzz]
// 3rd row: [ kzx, kzz ], kzy handled in kyz
if (deck->hasKeyword("PERMZX")) {
kmap[zx] = kmap[xz] = tensor.size(); // Enforce symmetry.
tensor.push_back(&deck->getKeyword("PERMZX")->getSIDoubleData());
}
if (deck->hasKeyword("PERMZY")) {
kmap[zy] = kmap[yz] = tensor.size(); // Enforce symmetry.
tensor.push_back(&deck->getKeyword("PERMZY")->getSIDoubleData());
}
if (deck->hasKeyword("PERMZ" )) {
kmap[zz] = tensor.size();
tensor.push_back(&deck->getKeyword("PERMZ")->getSIDoubleData());