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

Changing the naming in PvtDead.

Browse Source 
To be consistent with the naming int PvtLive.
This commit is contained in:
Kai Bao 2014-09-22 14:21:33 +02:00
parent ad54f1aa62
commit 09404202da
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
opm/core/props/pvt/PvtDead.cpp
View File

@ -41,7 +41,7 @@ namespace Opm
// resize the attributes of the object // resize the attributes of the object
b_.resize(numRegions); b_.resize(numRegions);
viscosity_.resize(numRegions); viscosity_.resize(numRegions);
inverseBV_.resize(numRegions); inverseBmu_.resize(numRegions);
for (int regionIdx = 0; regionIdx < numRegions; ++regionIdx) { for (int regionIdx = 0; regionIdx < numRegions; ++regionIdx) {
const Opm::PvdoTable& pvdoTable = pvdoTables[regionIdx]; const Opm::PvdoTable& pvdoTable = pvdoTables[regionIdx];
@ -52,22 +52,22 @@ namespace Opm
const std::vector<double>& visc = pvdoTable.getViscosityColumn(); const std::vector<double>& visc = pvdoTable.getViscosityColumn();
const int sz = b.size(); const int sz = b.size();
std::vector<double> bInv(sz); std::vector<double> inverseB(sz);
for (int i = 0; i < sz; ++i) { for (int i = 0; i < sz; ++i) {
bInv[i] = 1.0 / b[i]; inverseB[i] = 1.0 / b[i];
} }
// TODO: should we change the name of b so that we know it is the // TODO: should we change the name of b so that we know it is the
// inverse more explicitly? // inverse more explicitly?
// or use the captial B in a exlicit way to show the difference. // or use the captial B in a exlicit way to show the difference.
std::vector<double> bvInv(sz); std::vector<double> inverseBmu(sz);
for (int i = 0; i < sz; ++i) { for (int i = 0; i < sz; ++i) {
bvInv[i] = 1.0 / (b[i] * visc[i]); inverseBmu[i] = 1.0 / (b[i] * visc[i]);
} }
b_[regionIdx] = NonuniformTableLinear<double>(press, bInv); b_[regionIdx] = NonuniformTableLinear<double>(press, inverseB);
viscosity_[regionIdx] = NonuniformTableLinear<double>(press, visc); viscosity_[regionIdx] = NonuniformTableLinear<double>(press, visc);
inverseBV_[regionIdx] = NonuniformTableLinear<double>(press, bvInv); inverseBmu_[regionIdx] = NonuniformTableLinear<double>(press, inverseBmu);
} }
} }
@ -79,7 +79,7 @@ namespace Opm
// resize the attributes of the object // resize the attributes of the object
b_.resize(numRegions); b_.resize(numRegions);
viscosity_.resize(numRegions); viscosity_.resize(numRegions);
inverseBV_.resize(numRegions); inverseBmu_.resize(numRegions);
for (int regionIdx = 0; regionIdx < numRegions; ++regionIdx) { for (int regionIdx = 0; regionIdx < numRegions; ++regionIdx) {
const Opm::PvdgTable& pvdgTable = pvdgTables[regionIdx]; const Opm::PvdgTable& pvdgTable = pvdgTables[regionIdx];
@ -90,19 +90,19 @@ namespace Opm
const std::vector<double>& visc = pvdgTable.getViscosityColumn(); const std::vector<double>& visc = pvdgTable.getViscosityColumn();
const int sz = b.size(); const int sz = b.size();
std::vector<double> bInv(sz); std::vector<double> inverseB(sz);
for (int i = 0; i < sz; ++i) { for (int i = 0; i < sz; ++i) {
bInv[i] = 1.0 / b[i]; inverseB[i] = 1.0 / b[i];
} }
std::vector<double> bvInv(sz); std::vector<double> inverseBmu(sz);
for (int i = 0; i < sz; ++i) { for (int i = 0; i < sz; ++i) {
bvInv[i] = 1.0 / (b[i] * visc[i]); inverseBmu[i] = 1.0 / (b[i] * visc[i]);
} }
b_[regionIdx] = NonuniformTableLinear<double>(press, bInv); b_[regionIdx] = NonuniformTableLinear<double>(press, inverseB);
viscosity_[regionIdx] = NonuniformTableLinear<double>(press, visc); viscosity_[regionIdx] = NonuniformTableLinear<double>(press, visc);
inverseBV_[regionIdx] = NonuniformTableLinear<double>(press, bvInv); inverseBmu_[regionIdx] = NonuniformTableLinear<double>(press, inverseBmu);
} }
} }
@ -124,8 +124,8 @@ namespace Opm
int regionIdx = getTableIndex_(pvtTableIdx, i); int regionIdx = getTableIndex_(pvtTableIdx, i);
// output_mu[i] = viscosity_[regionIdx](p[i]); // output_mu[i] = viscosity_[regionIdx](p[i]);
double tempInvB = b_[regionIdx](p[i]); double tempInvB = b_[regionIdx](p[i]);
double tempInvBV = inverseBV_[regionIdx](p[i]); double tempInvBmu = inverseBmu_[regionIdx](p[i]);
output_mu[i] = tempInvB / tempInvBV; output_mu[i] = tempInvB / tempInvBmu;
} }
} }
@ -143,10 +143,10 @@ namespace Opm
// output_mu[i] = viscosity_[regionIdx](p[i]); // output_mu[i] = viscosity_[regionIdx](p[i]);
// output_dmudp[i] = viscosity_[regionIdx].derivative(p[i]); // output_dmudp[i] = viscosity_[regionIdx].derivative(p[i]);
double tempInvB = b_[regionIdx](p[i]); double tempInvB = b_[regionIdx](p[i]);
double tempInvBV = inverseBV_[regionIdx](p[i]); double tempInvBmu = inverseBmu_[regionIdx](p[i]);
output_mu[i] = tempInvB / tempInvBV; output_mu[i] = tempInvB / tempInvBmu;
output_dmudp[i] = (tempInvBV * b_[regionIdx].derivative(p[i]) output_dmudp[i] = (tempInvBmu * b_[regionIdx].derivative(p[i])
- tempInvB * inverseBV_[regionIdx].derivative(p[i])) / (tempInvBV * tempInvBV); - tempInvB * inverseBmu_[regionIdx].derivative(p[i])) / (tempInvBmu * tempInvBmu);
} }
std::fill(output_dmudr, output_dmudr + n, 0.0); std::fill(output_dmudr, output_dmudr + n, 0.0);
@ -165,13 +165,13 @@ namespace Opm
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
int regionIdx = getTableIndex_(pvtTableIdx, i); int regionIdx = getTableIndex_(pvtTableIdx, i);
double tempInvB = b_[regionIdx](p[i]); double tempInvB = b_[regionIdx](p[i]);
double tempInvBV = inverseBV_[regionIdx](p[i]); double tempInvBmu = inverseBmu_[regionIdx](p[i]);
// output_mu[i] = viscosity_[regionIdx](p[i]); // output_mu[i] = viscosity_[regionIdx](p[i]);
output_mu[i] = tempInvB / tempInvBV; output_mu[i] = tempInvB / tempInvBmu;
// output_dmudp[i] = viscosity_[regionIdx].derivative(p[i]); // output_dmudp[i] = viscosity_[regionIdx].derivative(p[i]);
// output_dmudp[i] = tempInvB / (tempInvBV * tempInvBV) * inverseBV_[regionIdx].derivative(p[i]); // output_dmudp[i] = tempInvB / (tempInvBV * tempInvBV) * inverseBV_[regionIdx].derivative(p[i]);
output_dmudp[i] = (tempInvBV * b_[regionIdx].derivative(p[i]) output_dmudp[i] = (tempInvBmu * b_[regionIdx].derivative(p[i])
- tempInvB * inverseBV_[regionIdx].derivative(p[i])) / (tempInvBV * tempInvBV); - tempInvB * inverseBmu_[regionIdx].derivative(p[i])) / (tempInvBmu * tempInvBmu);
} }
std::fill(output_dmudr, output_dmudr + n, 0.0); std::fill(output_dmudr, output_dmudr + n, 0.0);

2
opm/core/props/pvt/PvtDead.hpp
View File

@ -155,7 +155,7 @@ namespace Opm
// table per PVT region. // table per PVT region.
std::vector<NonuniformTableLinear<double> > b_; std::vector<NonuniformTableLinear<double> > b_;
std::vector<NonuniformTableLinear<double> > viscosity_; std::vector<NonuniformTableLinear<double> > viscosity_;
std::vector<NonuniformTableLinear<double> > inverseBV_; std::vector<NonuniformTableLinear<double> > inverseBmu_;
}; };
} }