From 6f6979e173b71ea275556a199165acc274d050bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Mon, 27 May 2013 22:00:34 +0200 Subject: [PATCH] Now initialize with new code (for gas-oil ratio). --- examples/sim_fibo_ad.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/examples/sim_fibo_ad.cpp b/examples/sim_fibo_ad.cpp index 1a8ca702b..fb5a22099 100644 --- a/examples/sim_fibo_ad.cpp +++ b/examples/sim_fibo_ad.cpp @@ -104,10 +104,20 @@ main(int argc, char** argv) // Init state variables (saturation and pressure). if (param.has("init_saturation")) { initStateBasic(*grid->c_grid(), *props, param, gravity[2], state); + initBlackoilSurfvol(*grid->c_grid(), *props, state); + enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour }; + const PhaseUsage pu = props->phaseUsage(); + if (pu.phase_used[Oil] && pu.phase_used[Gas]) { + const int np = props->numPhases(); + const int nc = grid->c_grid()->number_of_cells; + for (int c = 0; c < nc; ++c) { + state.gasoilratio()[c] = state.surfacevol()[c*np + pu.phase_pos[Gas]] + / state.surfacevol()[c*np + pu.phase_pos[Oil]]; + } + } } else { - initStateFromDeck(*grid->c_grid(), *props, *deck, gravity[2], state); + initBlackoilStateFromDeck(*grid->c_grid(), *props, *deck, gravity[2], state); } - initBlackoilSurfvol(*grid->c_grid(), *props, state); } else { // Grid init. const int nx = param.getDefault("nx", 100);