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

rename some variables from "*Lad" to "*Eval"

Browse Source 
this was an involuntary omission in the "local AD" to "dense AD"
rename...
This commit is contained in:
Andreas Lauser 2016-06-06 14:36:33 +02:00
parent 87c7b2c720
commit a8df55e02f
1 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

190
opm/autodiff/BlackoilPropsAdFromDeck.cpp
View File

@ -301,22 +301,22 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V mu(n); V mu(n);
V dmudp(n); V dmudp(n);
typedef Opm::DenseAd::Evaluation<double, /*size=*/1> LadEval; typedef Opm::DenseAd::Evaluation<double, /*size=*/1> Eval;
LadEval pLad = 0.0; Eval pEval = 0.0;
LadEval TLad = 0.0; Eval TEval = 0.0;
pLad.derivatives[0] = 1.0; pEval.derivatives[0] = 1.0;
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]]; unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]];
pLad.value = pw.value()[i]; pEval.value = pw.value()[i];
TLad.value = T.value()[i]; TEval.value = T.value()[i];
const LadEval& muLad = waterPvt_->viscosity(pvtRegionIdx, TLad, pLad); const Eval& muEval = waterPvt_->viscosity(pvtRegionIdx, TEval, pEval);
mu[i] = muLad.value; mu[i] = muEval.value;
dmudp[i] = muLad.derivatives[0]; dmudp[i] = muEval.derivatives[0];
} }
if (pw.derivative().empty()) { if (pw.derivative().empty()) {
@ -354,34 +354,34 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dmudp(n); V dmudp(n);
V dmudr(n); V dmudr(n);
typedef Opm::DenseAd::Evaluation<double, /*size=*/2> LadEval; typedef Opm::DenseAd::Evaluation<double, /*size=*/2> Eval;
LadEval pLad = 0.0; Eval pEval = 0.0;
LadEval TLad = 0.0; Eval TEval = 0.0;
LadEval RsLad = 0.0; Eval RsEval = 0.0;
pLad.derivatives[0] = 1.0; pEval.derivatives[0] = 1.0;
RsLad.derivatives[1] = 1.0; RsEval.derivatives[1] = 1.0;
LadEval muLad; Eval muEval;
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]]; unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]];
pLad.value = po.value()[i]; pEval.value = po.value()[i];
TLad.value = T.value()[i]; TEval.value = T.value()[i];
if (cond[i].hasFreeGas()) { if (cond[i].hasFreeGas()) {
muLad = oilPvt_->saturatedViscosity(pvtRegionIdx, TLad, pLad); muEval = oilPvt_->saturatedViscosity(pvtRegionIdx, TEval, pEval);
} }
else { else {
if (phase_usage_.phase_used[Gas]) { if (phase_usage_.phase_used[Gas]) {
RsLad.value = rs.value()[i]; RsEval.value = rs.value()[i];
} }
muLad = oilPvt_->viscosity(pvtRegionIdx, TLad, pLad, RsLad); muEval = oilPvt_->viscosity(pvtRegionIdx, TEval, pEval, RsEval);
} }
mu[i] = muLad.value; mu[i] = muEval.value;
dmudp[i] = muLad.derivatives[0]; dmudp[i] = muEval.derivatives[0];
dmudr[i] = muLad.derivatives[1]; dmudr[i] = muEval.derivatives[1];
} }
ADB::M dmudp_diag(dmudp.matrix().asDiagonal()); ADB::M dmudp_diag(dmudp.matrix().asDiagonal());
@ -421,32 +421,32 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dmudp(n); V dmudp(n);
V dmudr(n); V dmudr(n);
typedef Opm::DenseAd::Evaluation<double, /*size=*/2> LadEval; typedef Opm::DenseAd::Evaluation<double, /*size=*/2> Eval;
LadEval pLad = 0.0; Eval pEval = 0.0;
LadEval TLad = 0.0; Eval TEval = 0.0;
LadEval RvLad = 0.0; Eval RvEval = 0.0;
LadEval muLad; Eval muEval;
pLad.derivatives[0] = 1.0; pEval.derivatives[0] = 1.0;
RvLad.derivatives[1] = 1.0; RvEval.derivatives[1] = 1.0;
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]]; unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]];
pLad.value = pg.value()[i]; pEval.value = pg.value()[i];
TLad.value = T.value()[i]; TEval.value = T.value()[i];
if (cond[i].hasFreeOil()) { if (cond[i].hasFreeOil()) {
muLad = gasPvt_->saturatedViscosity(pvtRegionIdx, TLad, pLad); muEval = gasPvt_->saturatedViscosity(pvtRegionIdx, TEval, pEval);
} }
else { else {
RvLad.value = rv.value()[i]; RvEval.value = rv.value()[i];
muLad = gasPvt_->viscosity(pvtRegionIdx, TLad, pLad, RvLad); muEval = gasPvt_->viscosity(pvtRegionIdx, TEval, pEval, RvEval);
} }
mu[i] = muLad.value; mu[i] = muEval.value;
dmudp[i] = muLad.derivatives[0]; dmudp[i] = muEval.derivatives[0];
dmudr[i] = muLad.derivatives[1]; dmudr[i] = muEval.derivatives[1];
} }
ADB::M dmudp_diag(dmudp.matrix().asDiagonal()); ADB::M dmudp_diag(dmudp.matrix().asDiagonal());
@ -485,21 +485,21 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dbdp(n); V dbdp(n);
V dbdr(n); V dbdr(n);
typedef Opm::DenseAd::Evaluation<double, /*size=*/1> LadEval; typedef Opm::DenseAd::Evaluation<double, /*size=*/1> Eval;
LadEval pLad = 0.0; Eval pEval = 0.0;
LadEval TLad = 0.0; Eval TEval = 0.0;
pLad.derivatives[0] = 1.0; pEval.derivatives[0] = 1.0;
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]]; unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]];
pLad.value = pw.value()[i]; pEval.value = pw.value()[i];
TLad.value = T.value()[i]; TEval.value = T.value()[i];
const LadEval& bLad = waterPvt_->inverseFormationVolumeFactor(pvtRegionIdx, TLad, pLad); const Eval& bEval = waterPvt_->inverseFormationVolumeFactor(pvtRegionIdx, TEval, pEval);
b[i] = bLad.value; b[i] = bEval.value;
dbdp[i] = bLad.derivatives[0]; dbdp[i] = bEval.derivatives[0];
} }
ADB::M dbdp_diag(dbdp.matrix().asDiagonal()); ADB::M dbdp_diag(dbdp.matrix().asDiagonal());
@ -534,38 +534,38 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dbdp(n); V dbdp(n);
V dbdr(n); V dbdr(n);
typedef Opm::DenseAd::Evaluation<double, /*size=*/2> LadEval; typedef Opm::DenseAd::Evaluation<double, /*size=*/2> Eval;
LadEval pLad = 0.0; Eval pEval = 0.0;
LadEval TLad = 0.0; Eval TEval = 0.0;
LadEval RsLad = 0.0; Eval RsEval = 0.0;
LadEval bLad; Eval bEval;
pLad.derivatives[0] = 1.0; pEval.derivatives[0] = 1.0;
RsLad.derivatives[1] = 1.0; RsEval.derivatives[1] = 1.0;
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]]; unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]];
pLad.value = po.value()[i]; pEval.value = po.value()[i];
TLad.value = T.value()[i]; TEval.value = T.value()[i];
//RS/RV only makes sense when gas phase is active //RS/RV only makes sense when gas phase is active
if (cond[i].hasFreeGas()) { if (cond[i].hasFreeGas()) {
bLad = oilPvt_->saturatedInverseFormationVolumeFactor(pvtRegionIdx, TLad, pLad); bEval = oilPvt_->saturatedInverseFormationVolumeFactor(pvtRegionIdx, TEval, pEval);
} }
else { else {
if (rs.size() == 0) { if (rs.size() == 0) {
RsLad.value = 0.0; RsEval.value = 0.0;
} }
else { else {
RsLad.value = rs.value()[i]; RsEval.value = rs.value()[i];
} }
bLad = oilPvt_->inverseFormationVolumeFactor(pvtRegionIdx, TLad, pLad, RsLad); bEval = oilPvt_->inverseFormationVolumeFactor(pvtRegionIdx, TEval, pEval, RsEval);
} }
b[i] = bLad.value; b[i] = bEval.value;
dbdp[i] = bLad.derivatives[0]; dbdp[i] = bEval.derivatives[0];
dbdr[i] = bLad.derivatives[1]; dbdr[i] = bEval.derivatives[1];
} }
ADB::M dbdp_diag(dbdp.matrix().asDiagonal()); ADB::M dbdp_diag(dbdp.matrix().asDiagonal());
@ -607,32 +607,32 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V dbdp(n); V dbdp(n);
V dbdr(n); V dbdr(n);
typedef Opm::DenseAd::Evaluation<double, /*size=*/2> LadEval; typedef Opm::DenseAd::Evaluation<double, /*size=*/2> Eval;
LadEval pLad = 0.0; Eval pEval = 0.0;
LadEval TLad = 0.0; Eval TEval = 0.0;
LadEval RvLad = 0.0; Eval RvEval = 0.0;
LadEval bLad; Eval bEval;
pLad.derivatives[0] = 1.0; pEval.derivatives[0] = 1.0;
RvLad.derivatives[1] = 1.0; RvEval.derivatives[1] = 1.0;
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]]; unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]];
pLad.value = pg.value()[i]; pEval.value = pg.value()[i];
TLad.value = T.value()[i]; TEval.value = T.value()[i];
if (cond[i].hasFreeOil()) { if (cond[i].hasFreeOil()) {
bLad = gasPvt_->saturatedInverseFormationVolumeFactor(pvtRegionIdx, TLad, pLad); bEval = gasPvt_->saturatedInverseFormationVolumeFactor(pvtRegionIdx, TEval, pEval);
} }
else { else {
RvLad.value = rv.value()[i]; RvEval.value = rv.value()[i];
bLad = gasPvt_->inverseFormationVolumeFactor(pvtRegionIdx, TLad, pLad, RvLad); bEval = gasPvt_->inverseFormationVolumeFactor(pvtRegionIdx, TEval, pEval, RvEval);
} }
b[i] = bLad.value; b[i] = bEval.value;
dbdp[i] = bLad.derivatives[0]; dbdp[i] = bEval.derivatives[0];
dbdr[i] = bLad.derivatives[1]; dbdr[i] = bEval.derivatives[1];
} }
ADB::M dbdp_diag(dbdp.matrix().asDiagonal()); ADB::M dbdp_diag(dbdp.matrix().asDiagonal());
@ -667,21 +667,21 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V rbub(n); V rbub(n);
V drbubdp(n); V drbubdp(n);
typedef Opm::DenseAd::Evaluation<double, /*size=*/1> LadEval; typedef Opm::DenseAd::Evaluation<double, /*size=*/1> Eval;
LadEval pLad = 0.0; Eval pEval = 0.0;
LadEval TLad = 293.15; // temperature is not supported by this API! Eval TEval = 293.15; // temperature is not supported by this API!
pLad.derivatives[0] = 1.0; pEval.derivatives[0] = 1.0;
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]]; unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]];
pLad.value = po.value()[i]; pEval.value = po.value()[i];
const LadEval& RsLad = oilPvt_->saturatedGasDissolutionFactor(pvtRegionIdx, TLad, pLad); const Eval& RsEval = oilPvt_->saturatedGasDissolutionFactor(pvtRegionIdx, TEval, pEval);
rbub[i] = RsLad.value; rbub[i] = RsEval.value;
drbubdp[i] = RsLad.derivatives[0]; drbubdp[i] = RsEval.derivatives[0];
} }
ADB::M drbubdp_diag(drbubdp.matrix().asDiagonal()); ADB::M drbubdp_diag(drbubdp.matrix().asDiagonal());
@ -724,21 +724,21 @@ BlackoilPropsAdFromDeck::BlackoilPropsAdFromDeck(const BlackoilPropsAdFromDeck&
V rv(n); V rv(n);
V drvdp(n); V drvdp(n);
typedef Opm::DenseAd::Evaluation<double, /*size=*/1> LadEval; typedef Opm::DenseAd::Evaluation<double, /*size=*/1> Eval;
LadEval pLad = 0.0; Eval pEval = 0.0;
LadEval TLad = 293.15; // temperature is not supported by this API! Eval TEval = 293.15; // temperature is not supported by this API!
pLad.derivatives[0] = 1.0; pEval.derivatives[0] = 1.0;
for (int i = 0; i < n; ++i) { for (int i = 0; i < n; ++i) {
unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]]; unsigned pvtRegionIdx = cellPvtRegionIdx_[cells[i]];
pLad.value = pg.value()[i]; pEval.value = pg.value()[i];
const LadEval& RvLad = gasPvt_->saturatedOilVaporizationFactor(pvtRegionIdx, TLad, pLad); const Eval& RvEval = gasPvt_->saturatedOilVaporizationFactor(pvtRegionIdx, TEval, pEval);
rv[i] = RvLad.value; rv[i] = RvEval.value;
drvdp[i] = RvLad.derivatives[0]; drvdp[i] = RvEval.derivatives[0];
} }
ADB::M drvdp_diag(drvdp.matrix().asDiagonal()); ADB::M drvdp_diag(drvdp.matrix().asDiagonal());