OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix some keyword names

Browse Source 
The queried keywords are unknown to the parser and after manual
inspection also to the Eclipse RM. There might be wrong keywords some
left, but these were to ones needed to get SPE9 started using
sim_fibo_ad...
This commit is contained in:
Andreas Lauser
2014-06-05 10:17:23 +02:00
parent 6a50afb219
commit 7603eafaf9
1 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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