From 7d54d1f31b2e4cd1a061403c39117bcbad181206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Mon, 14 May 2012 21:47:46 +0200 Subject: [PATCH] Adapt to changed interface of computePorevolume(). --- examples/polymer_reorder.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/examples/polymer_reorder.cpp b/examples/polymer_reorder.cpp index 6557108b2..7094992b3 100644 --- a/examples/polymer_reorder.cpp +++ b/examples/polymer_reorder.cpp @@ -307,6 +307,8 @@ private: int main(int argc, char** argv) { + using namespace Opm; + std::cout << "\n================ Test program for incompressible two-phase flow with polymer ===============\n\n"; Opm::parameter::ParameterGroup param(argc, argv, false); std::cout << "--------------- Reading parameters ---------------" << std::endl; @@ -475,9 +477,9 @@ main(int argc, char** argv) // Extra rock init. std::vector porevol; if (rock_comp->isActive()) { - computePorevolume(*grid->c_grid(), *props, *rock_comp, state.pressure(), porevol); + computePorevolume(*grid->c_grid(), props->porosity(), *rock_comp, state.pressure(), porevol); } else { - computePorevolume(*grid->c_grid(), *props, porevol); + computePorevolume(*grid->c_grid(), props->porosity(), porevol); } double tot_porevol_init = std::accumulate(porevol.begin(), porevol.end(), 0.0); @@ -651,7 +653,7 @@ main(int argc, char** argv) rc.resize(num_cells); std::vector initial_pressure = state.pressure(); std::vector initial_porevolume(num_cells); - computePorevolume(*grid->c_grid(), *props, *rock_comp, initial_pressure, initial_porevolume); + computePorevolume(*grid->c_grid(), props->porosity(), *rock_comp, initial_pressure, initial_porevolume); std::vector pressure_increment(num_cells + num_wells); std::vector prev_pressure(num_cells + num_wells); for (int iter = 0; iter < nl_pressure_maxiter; ++iter) { @@ -659,7 +661,7 @@ main(int argc, char** argv) for (int cell = 0; cell < num_cells; ++cell) { rc[cell] = rock_comp->rockComp(state.pressure()[cell]); } - computePorevolume(*grid->c_grid(), *props, *rock_comp, state.pressure(), porevol); + computePorevolume(*grid->c_grid(), props->porosity(), *rock_comp, state.pressure(), porevol); std::copy(state.pressure().begin(), state.pressure().end(), prev_pressure.begin()); std::copy(well_bhp.begin(), well_bhp.end(), prev_pressure.begin() + num_cells); // prev_pressure = state.pressure();