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

[BlackoilPropsFromDeck] remove sign/unsigned warnings.

Browse Source
This commit is contained in:
Robert Kloefkorn 2015-09-07 09:50:40 +02:00
parent 2dc9d78286
commit 9ab8e6ec93
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
opm/core/props/BlackoilPropertiesFromDeck.cpp
View File

@ -29,7 +29,7 @@ namespace Opm
bool init_rock) bool init_rock)
{ {
std::vector<int> compressedToCartesianIdx(grid.number_of_cells); std::vector<int> compressedToCartesianIdx(grid.number_of_cells);
for (unsigned cellIdx = 0; cellIdx < grid.number_of_cells; ++cellIdx) { for (int cellIdx = 0; cellIdx < grid.number_of_cells; ++cellIdx) {
if (grid.global_cell) { if (grid.global_cell) {
compressedToCartesianIdx[cellIdx] = grid.global_cell[cellIdx]; compressedToCartesianIdx[cellIdx] = grid.global_cell[cellIdx];
} }
@ -52,7 +52,7 @@ namespace Opm
bool init_rock) bool init_rock)
{ {
std::vector<int> compressedToCartesianIdx(grid.number_of_cells); std::vector<int> compressedToCartesianIdx(grid.number_of_cells);
for (unsigned cellIdx = 0; cellIdx < grid.number_of_cells; ++cellIdx) { for (int cellIdx = 0; cellIdx < grid.number_of_cells; ++cellIdx) {
if (grid.global_cell) { if (grid.global_cell) {
compressedToCartesianIdx[cellIdx] = grid.global_cell[cellIdx]; compressedToCartesianIdx[cellIdx] = grid.global_cell[cellIdx];
} }
@ -64,7 +64,7 @@ namespace Opm
auto materialLawManager = std::make_shared<MaterialLawManager>(); auto materialLawManager = std::make_shared<MaterialLawManager>();
materialLawManager->initFromDeck(deck, eclState, compressedToCartesianIdx); materialLawManager->initFromDeck(deck, eclState, compressedToCartesianIdx);
init(deck, eclState, materialLawManager, grid.number_of_cells, grid.global_cell, grid.cartdims, grid.cell_centroids, init(deck, eclState, materialLawManager, grid.number_of_cells, grid.global_cell, grid.cartdims, grid.cell_centroids,
grid.dimensions, param, init_rock); grid.dimensions, param, init_rock);
} }
@ -333,14 +333,14 @@ namespace Opm
{ {
satprops_->satRange(n, cells, smin, smax); satprops_->satRange(n, cells, smin, smax);
} }
/// Update capillary pressure scaling according to pressure diff. and initial water saturation. /// Update capillary pressure scaling according to pressure diff. and initial water saturation.
/// \param[in] cell Cell index. /// \param[in] cell Cell index.
/// \param[in] pcow P_oil - P_water. /// \param[in] pcow P_oil - P_water.
/// \param[in/out] swat Water saturation. / Possibly modified Water saturation. /// \param[in/out] swat Water saturation. / Possibly modified Water saturation.
void BlackoilPropertiesFromDeck::swatInitScaling(const int cell, void BlackoilPropertiesFromDeck::swatInitScaling(const int cell,
const double pcow, const double pcow,
double & swat) double & swat)
{ {
satprops_->swatInitScaling(cell, pcow, swat); satprops_->swatInitScaling(cell, pcow, swat);