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

Make the code more readable

Browse Source
This commit is contained in:
Tor Harald Sandve 2015-10-20 16:08:11 +02:00
parent 2330cd615a
commit 8b94e7b0eb
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,7 +96,7 @@ namespace Opm
// Complete undersaturated tables by extrapolating from existing data // Complete undersaturated tables by extrapolating from existing data
int iNext = -1; int iNext = -1;
for (int i=0; i<sz; ++i) { for (int i = 0; i < sz; ++i) {
// Skip records already containing undersaturated data // Skip records already containing undersaturated data
if (undersat_gas_tables_[pvtTableIdx][i][0].size() > 1) { if (undersat_gas_tables_[pvtTableIdx][i][0].size() > 1) {
continue; continue;
@ -107,27 +107,34 @@ namespace Opm
while (iNext < sz && undersat_gas_tables_[pvtTableIdx][iNext][0].size() < 2) { while (iNext < sz && undersat_gas_tables_[pvtTableIdx][iNext][0].size() < 2) {
++iNext; ++iNext;
} }
if (iNext == sz) OPM_THROW(std::runtime_error,"Unable to complete undersaturated table."); if (iNext == sz) {
OPM_THROW(std::runtime_error,"Unable to complete undersaturated table.");
} }
// Add undersaturated data to current record while maintaining compressibility and viscosibility }
// TODO: How to add 1/(B*mu) in this way? // Undersaturated data is added to the current record in the same way as for liveoil.
// It is unclear whether this expantion maintains the compressibility and viscosibility,
// but it seems like it reproduces eclipse results for spe3.
typedef std::vector<std::vector<std::vector<double> > >::size_type sz_t; typedef std::vector<std::vector<std::vector<double> > >::size_type sz_t;
for (sz_t j=1; j<undersat_gas_tables_[pvtTableIdx][iNext][0].size(); ++j) { auto& from_table = undersat_gas_tables_[pvtTableIdx][iNext];
double diffSolubility = undersat_gas_tables_[pvtTableIdx][iNext][0][j] - undersat_gas_tables_[pvtTableIdx][iNext][0][j-1]; auto& to_table = undersat_gas_tables_[pvtTableIdx][i];
double solubility = undersat_gas_tables_[pvtTableIdx][i][0].back() + diffSolubility; enum {RV = 0, BG = 1, MUG = 2, BGMUG = 3};
undersat_gas_tables_[pvtTableIdx][i][0].push_back(solubility);
double compr = (1.0/undersat_gas_tables_[pvtTableIdx][iNext][1][j]-1.0/undersat_gas_tables_[pvtTableIdx][iNext][1][j-1]) for (sz_t j = 1; j < from_table[0].size(); ++j) {
/ (0.5*(1.0/undersat_gas_tables_[pvtTableIdx][iNext][1][j]+1.0/undersat_gas_tables_[pvtTableIdx][iNext][1][j-1])); double diffSolubility = from_table[RV][j] - from_table[RV][j-1];
double B_var = (1.0/undersat_gas_tables_[pvtTableIdx][i][1].back())*(1.0+0.5*compr)/(1.0-0.5*compr); double solubility = to_table[RV].back() + diffSolubility;
undersat_gas_tables_[pvtTableIdx][i][1].push_back(1.0/B_var); to_table[RV].push_back(solubility);
double visc = (undersat_gas_tables_[pvtTableIdx][iNext][2][j]-undersat_gas_tables_[pvtTableIdx][iNext][2][j-1]) double compr = (1.0/from_table[BG][j] - 1.0/from_table[BG][j-1])
/ (0.5*(undersat_gas_tables_[pvtTableIdx][iNext][2][j]+undersat_gas_tables_[pvtTableIdx][iNext][2][j-1])); / (0.5*(1.0/from_table[BG][j] + 1.0/from_table[BG][j-1]));
double mu_var = (undersat_gas_tables_[pvtTableIdx][i][2].back())*(1.0+0.5*visc)/(1.0-0.5*visc); double B_var = (1.0/to_table[BG].back()) * (1.0+0.5*compr) / (1.0-0.5*compr);
undersat_gas_tables_[pvtTableIdx][i][2].push_back(mu_var); to_table[BG].push_back(1.0/B_var);
double visc = (from_table[MUG][j] - from_table[MUG][j-1])
/ (0.5*(from_table[MUG][j] + from_table[MUG][j-1]));
double mu_var = (to_table[MUG].back()) * (1.0+0.5*visc) / (1.0-0.5*visc);
to_table[MUG].push_back(mu_var);
// A try to expolate the 1/BMu with the expolated mu and B // A try to expolate the 1/BMu with the expolated mu and B
double inverseBMu = 1.0 / (B_var*mu_var); double inverseBMu = 1.0 / (B_var*mu_var);
undersat_gas_tables_[pvtTableIdx][i][3].push_back(inverseBMu); to_table[BGMUG].push_back(inverseBMu);
} }
} }