From 96e1a89abee43e273eb1f4be1e12bacecec7a9b5 Mon Sep 17 00:00:00 2001 From: babrodtk Date: Wed, 2 Sep 2015 13:55:46 +0200 Subject: [PATCH] Fixed even more warnings --- opm/core/props/pvt/PvtDead.cpp | 8 ++++---- opm/core/props/pvt/PvtDeadSpline.cpp | 4 ++-- opm/core/props/pvt/PvtLiveOil.cpp | 10 +++++----- tests/test_geom2d.cpp | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/opm/core/props/pvt/PvtDead.cpp b/opm/core/props/pvt/PvtDead.cpp index 67ed9335..a619309c 100644 --- a/opm/core/props/pvt/PvtDead.cpp +++ b/opm/core/props/pvt/PvtDead.cpp @@ -48,18 +48,18 @@ namespace Opm // Copy data const std::vector& press = pvdoTable.getPressureColumn(); - const std::vector& b = pvdoTable.getFormationFactorColumn(); + const std::vector& b_var = pvdoTable.getFormationFactorColumn(); const std::vector& visc = pvdoTable.getViscosityColumn(); - const int sz = b.size(); + const int sz = b_var.size(); std::vector inverseB(sz); for (int i = 0; i < sz; ++i) { - inverseB[i] = 1.0 / b[i]; + inverseB[i] = 1.0 / b_var[i]; } std::vector inverseBmu(sz); for (int i = 0; i < sz; ++i) { - inverseBmu[i] = 1.0 / (b[i] * visc[i]); + inverseBmu[i] = 1.0 / (b_var[i] * visc[i]); } b_[regionIdx] = NonuniformTableLinear(press, inverseB); diff --git a/opm/core/props/pvt/PvtDeadSpline.cpp b/opm/core/props/pvt/PvtDeadSpline.cpp index 293caf62..f49fb7b3 100644 --- a/opm/core/props/pvt/PvtDeadSpline.cpp +++ b/opm/core/props/pvt/PvtDeadSpline.cpp @@ -54,12 +54,12 @@ namespace Opm // Copy data const std::vector &press = pvdoTable.getPressureColumn(); - const std::vector &B = pvdoTable.getFormationFactorColumn(); + const std::vector &B_var = pvdoTable.getFormationFactorColumn(); const std::vector &visc = pvdoTable.getViscosityColumn(); std::vector B_inv(numRows); for (int i = 0; i < numRows; ++i) { - B_inv[i] = 1.0 / B[i]; + B_inv[i] = 1.0 / B_var[i]; } buildUniformMonotoneTable(press, B_inv, numSamples, b_[regionIdx]); diff --git a/opm/core/props/pvt/PvtLiveOil.cpp b/opm/core/props/pvt/PvtLiveOil.cpp index bf78e48f..1502e710 100644 --- a/opm/core/props/pvt/PvtLiveOil.cpp +++ b/opm/core/props/pvt/PvtLiveOil.cpp @@ -110,15 +110,15 @@ namespace Opm undersat_oil_tables_[pvtTableIdx][i][0].push_back(pressure); double compr = (1.0/undersat_oil_tables_[pvtTableIdx][iNext][1][j]-1.0/undersat_oil_tables_[pvtTableIdx][iNext][1][j-1]) / (0.5*(1.0/undersat_oil_tables_[pvtTableIdx][iNext][1][j]+1.0/undersat_oil_tables_[pvtTableIdx][iNext][1][j-1])); - double B = (1.0/undersat_oil_tables_[pvtTableIdx][i][1].back())*(1.0+0.5*compr)/(1.0-0.5*compr); - undersat_oil_tables_[pvtTableIdx][i][1].push_back(1.0/B); + double B_var = (1.0/undersat_oil_tables_[pvtTableIdx][i][1].back())*(1.0+0.5*compr)/(1.0-0.5*compr); + undersat_oil_tables_[pvtTableIdx][i][1].push_back(1.0/B_var); double visc = (undersat_oil_tables_[pvtTableIdx][iNext][2][j]-undersat_oil_tables_[pvtTableIdx][iNext][2][j-1]) / (0.5*(undersat_oil_tables_[pvtTableIdx][iNext][2][j]+undersat_oil_tables_[pvtTableIdx][iNext][2][j-1])); - double mu = (undersat_oil_tables_[pvtTableIdx][i][2].back())*(1.0+0.5*visc)/(1.0-0.5*visc); - undersat_oil_tables_[pvtTableIdx][i][2].push_back(mu); + double mu_var = (undersat_oil_tables_[pvtTableIdx][i][2].back())*(1.0+0.5*visc)/(1.0-0.5*visc); + undersat_oil_tables_[pvtTableIdx][i][2].push_back(mu_var); // A try to expolate the 1/BMu with the expolated mu and B - double inverseBMu = 1.0 / (B*mu); + double inverseBMu = 1.0 / (B_var*mu_var); undersat_oil_tables_[pvtTableIdx][i][3].push_back(inverseBMu); } diff --git a/tests/test_geom2d.cpp b/tests/test_geom2d.cpp index a8ffbe2d..13feb674 100644 --- a/tests/test_geom2d.cpp +++ b/tests/test_geom2d.cpp @@ -176,18 +176,18 @@ BOOST_AUTO_TEST_CASE(cellAreas) BOOST_AUTO_TEST_CASE(cellCenters) { - double cellCenters[] = { + double cellCenters_var[] = { -1./3., 0.0, /* cell 0 */ 1./2., 0.0, /* cell 1 */ }; - BOOST_REQUIRE (sizeof(cellCenters)/sizeof(cellCenters[0]) == + BOOST_REQUIRE (sizeof(cellCenters_var)/sizeof(cellCenters_var[0]) == g->number_of_cells * g->dimensions); for (int cell = 0; cell < g->number_of_cells; ++cell) { for (int dim = 0; dim < g->dimensions; ++dim) { BOOST_REQUIRE_CLOSE (g->cell_centroids[cell*g->dimensions+dim], - cellCenters[cell*g->dimensions+dim], 0.001); + cellCenters_var[cell*g->dimensions+dim], 0.001); } } }