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 eigen bug when compute the capPress.

Browse Source
This commit is contained in:
Liu Ming 2014-01-27 16:53:45 +08:00
parent 075e16dc36
commit f01c4dac10
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
opm/polymer/fullyimplicit/IncompPropsAdFromDeck.cpp
View File

@ -137,42 +137,42 @@ namespace Opm
const ADB& so,
const Cells& cells) const
{
const int n = cells.size();
const int np = numPhases();
const int num_blocks = so.numBlocks();
Block s_all(n, np);
assert(sw.size() == n && so.size() == n);
const int numCells = cells.size();
const int numActivePhases = numPhases();
const int numBlocks = so.numBlocks();
assert(sw.value().size() == numCells);
assert(so.value().size() == numCells);
Block s_all(numCells, numActivePhases);
s_all.col(0) = sw.value();
s_all.col(1) = so.value();
Block pc(n, np);
Block dpc(n, np * np);
Block pc(numCells, numActivePhases);
Block dpc(numCells, numActivePhases*numActivePhases);
satprops_.capPress(numCells, s_all.data(), cells.data(), pc.data(), dpc.data());
satprops_.capPress(n, s_all.data(), cells.data(), pc.data(), dpc.data());
std::vector<ADB> capPressures;
capPressures.reserve(2);
std::vector<ADB> adbCapPressures;
adbCapPressures.reserve(2);
const ADB* s[2] = { &sw, &so};
for (int phase1 = 0; phase1 < 3; ++phase1) {
for (int phase1 = 0; phase1 < 2; ++phase1) {
const int phase1_pos = phase1;
std::vector<ADB::M> jacs(num_blocks);
for (int block = 0; block < num_blocks; ++block) {
jacs[block] = ADB::M(n, s[phase1]->derivative()[block].cols());
std::vector<ADB::M> jacs(numBlocks);
for (int block = 0; block < numBlocks; ++block) {
jacs[block] = ADB::M(numCells, s[phase1]->derivative()[block].cols());
}
for (int phase2 = 0; phase2 < 3; ++phase2) {
for (int phase2 = 0; phase2 < 2; ++phase2) {
const int phase2_pos = phase2;
// Assemble dpc1/ds2.
const int column = phase1_pos + phase2_pos; // Recall: Fortran ordering from props_.relperm()
const int column = phase1_pos + numActivePhases*phase2_pos; // Recall: Fortran ordering from props_.relperm()
ADB::M dpc1_ds2_diag = spdiag(dpc.col(column));
for (int block = 0; block < num_blocks; ++block) {
for (int block = 0; block < numBlocks; ++block) {
jacs[block] += dpc1_ds2_diag * s[phase2]->derivative()[block];
}
}
capPressures.emplace_back(ADB::function(pc.col(phase1_pos), jacs));
adbCapPressures.emplace_back(ADB::function(pc.col(phase1_pos), jacs));
}
return capPressures;
return adbCapPressures;
}
} //namespace Opm