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

Deleting some commented lines.

Browse Source
This commit is contained in:
Kai Bao 2014-09-22 14:26:00 +02:00
parent 09404202da
commit 6a43935ea3
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,9 +57,6 @@ namespace Opm
inverseB[i] = 1.0 / b[i];
}
// TODO: should we change the name of b so that we know it is the
// inverse more explicitly?
// or use the captial B in a exlicit way to show the difference.
std::vector<double> inverseBmu(sz);
for (int i = 0; i < sz; ++i) {
inverseBmu[i] = 1.0 / (b[i] * visc[i]);
@ -122,7 +119,6 @@ namespace Opm
// #pragma omp parallel for
for (int i = 0; i < n; ++i) {
int regionIdx = getTableIndex_(pvtTableIdx, i);
// output_mu[i] = viscosity_[regionIdx](p[i]);
double tempInvB = b_[regionIdx](p[i]);
double tempInvBmu = inverseBmu_[regionIdx](p[i]);
output_mu[i] = tempInvB / tempInvBmu;
@ -140,8 +136,6 @@ namespace Opm
// #pragma omp parallel for
for (int i = 0; i < n; ++i) {
int regionIdx = getTableIndex_(pvtTableIdx, i);
// output_mu[i] = viscosity_[regionIdx](p[i]);
// output_dmudp[i] = viscosity_[regionIdx].derivative(p[i]);
double tempInvB = b_[regionIdx](p[i]);
double tempInvBmu = inverseBmu_[regionIdx](p[i]);
output_mu[i] = tempInvB / tempInvBmu;
@ -166,12 +160,10 @@ namespace Opm
int regionIdx = getTableIndex_(pvtTableIdx, i);
double tempInvB = b_[regionIdx](p[i]);
double tempInvBmu = inverseBmu_[regionIdx](p[i]);
// output_mu[i] = viscosity_[regionIdx](p[i]);
output_mu[i] = tempInvB / tempInvBmu;
// output_dmudp[i] = viscosity_[regionIdx].derivative(p[i]);
// output_dmudp[i] = tempInvB / (tempInvBV * tempInvBV) * inverseBV_[regionIdx].derivative(p[i]);
output_dmudp[i] = (tempInvBmu * b_[regionIdx].derivative(p[i])
- tempInvB * inverseBmu_[regionIdx].derivative(p[i])) / (tempInvBmu * tempInvBmu);
- tempInvB * inverseBmu_[regionIdx].derivative(p[i]))
/ (tempInvBmu * tempInvBmu);
}
std::fill(output_dmudr, output_dmudr + n, 0.0);

6
opm/core/props/pvt/PvtLiveGas.cpp
View File

@ -65,7 +65,6 @@ namespace Opm
// The number of the columns
int nColumns = saturated_gas_table_[pvtTableIdx][2].size();
saturated_gas_table_[pvtTableIdx][3].resize(nColumns); // allocate memory for 1/(Bg*mu_g)
// saturated_gas_table_[pvtTableIdx][3] = pvtgTable.getOuterTable()->getGasFormationFactorColumn(); // TODO
saturated_gas_table_[pvtTableIdx][4] = pvtgTable.getOuterTable()->getOilSolubilityColumn(); // Rv
int sz = pvtgTable.getOuterTable()->numRows();
@ -80,7 +79,6 @@ namespace Opm
undersat_gas_tables_[pvtTableIdx][i][2] = undersatTable.getGasViscosityColumn(); // mu_g
int nColumns = undersat_gas_tables_[pvtTableIdx][i][2].size();
undersat_gas_tables_[pvtTableIdx][i][3].resize(nColumns); // allocate memory for 1/(Bg*mu_g)
// undersat_gas_tables_[pvtTableIdx][i][3] = undersatTable.getGasViscosityColumn(); // TODO
}
// Bg -> 1/Bg
@ -115,7 +113,6 @@ namespace Opm
double inverseBMu = miscible_gas(p[i], z + num_phases_*i, getTableIndex_(pvtRegionIdx, i), 3, false);
output_mu[i] = inverseB / inverseBMu;
// output_mu[i] = miscible_gas(p[i], z + num_phases_*i, getTableIndex_(pvtRegionIdx, i), 2, false);
}
}
@ -162,9 +159,6 @@ namespace Opm
output_dmudr[i] = (inverseBMu * dinverseBdr - inverseB * dinverseBmudr)
/ (inverseBMu * inverseBMu);
// output_mu[i] = miscible_gas(p[i], r[i], cnd, tableIdx, 2, 0);
// output_dmudp[i] = miscible_gas(p[i], r[i], cnd, tableIdx, 2, 1);
// output_dmudr[i] = miscible_gas(p[i], r[i], cnd, tableIdx, 2, 2);
}
}

10
opm/core/props/pvt/PvtLiveOil.cpp
View File

@ -147,9 +147,6 @@ namespace Opm
double inverseBMu = miscible_oil(p[i], z + num_phases_*i, tableIdx, 3, false);
output_mu[i] = inverseB / inverseBMu;
// output_mu[i] = miscible_oil(p[i], z + num_phases_*i, tableIdx, 2, false);
// output_mu[i] = miscible_oil(p[i], z + num_phases_*i, tableIdx, 2, false);
}
}
@ -184,10 +181,6 @@ namespace Opm
output_dmudr[i] = (inverseBMu * dinverseBdr - inverseB * dinverseBmudr)
/ (inverseBMu * inverseBMu);
// output_mu[i] = miscible_oil(p[i], r[i], tableIdx, 2, 0);
// output_dmudp[i] = miscible_oil(p[i], r[i], tableIdx, 2, 1);
// output_dmudr[i] = miscible_oil(p[i], r[i], tableIdx, 2, 2);
}
}
@ -223,9 +216,6 @@ namespace Opm
output_dmudr[i] = (inverseBMu * dinverseBdr - inverseB * dinverseBmudr)
/ (inverseBMu * inverseBMu);
// output_mu[i] = miscible_oil(p[i], r[i], cnd, tableIdx, 2, 0);
// output_dmudp[i] = miscible_oil(p[i], r[i], cnd, tableIdx, 2, 1);
// output_dmudr[i] = miscible_oil(p[i], r[i], cnd, tableIdx, 2, 2);
}
}