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

Merge pull request #167 from andlaus/do_not_pass_shared_ptr_to_EclipseWriter

Browse Source 
pass a reference to the UnstructuredGrid to EclipseWriter instead of a shared_ptr
This commit is contained in:
Joakim Hove 2014-07-18 11:51:31 +02:00
commit 99f1620963
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/sim_fibo_ad.cpp
View File

@ -46,7 +46,6 @@
#include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp> #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>
#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp> #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
#include <opm/core/utility/share_obj.hpp>
#include <opm/parser/eclipse/Deck/Deck.hpp> #include <opm/parser/eclipse/Deck/Deck.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
@ -108,7 +107,13 @@ try
// Grid init // Grid init
grid.reset(new GridManager(eclipseState->getEclipseGrid())); grid.reset(new GridManager(eclipseState->getEclipseGrid()));
Opm::EclipseWriter outputWriter(param, deck, share_obj(*grid->c_grid())); auto &cGrid = *grid->c_grid();
const PhaseUsage pu = Opm::phaseUsageFromDeck(deck);
Opm::EclipseWriter outputWriter(param,
eclipseState,
pu,
cGrid.number_of_cells,
cGrid.global_cell);
// Rock and fluid init // Rock and fluid init
props.reset(new BlackoilPropertiesFromDeck(deck, eclipseState, *grid->c_grid(), param)); props.reset(new BlackoilPropertiesFromDeck(deck, eclipseState, *grid->c_grid(), param));
@ -127,7 +132,6 @@ try
initStateBasic(*grid->c_grid(), *props, param, gravity[2], state); initStateBasic(*grid->c_grid(), *props, param, gravity[2], state);
initBlackoilSurfvol(*grid->c_grid(), *props, state); initBlackoilSurfvol(*grid->c_grid(), *props, state);
enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour }; enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour };
const PhaseUsage pu = props->phaseUsage();
if (pu.phase_used[Oil] && pu.phase_used[Gas]) { if (pu.phase_used[Oil] && pu.phase_used[Gas]) {
const int np = props->numPhases(); const int np = props->numPhases();
const int nc = grid->c_grid()->number_of_cells; const int nc = grid->c_grid()->number_of_cells;

8
examples/sim_fibo_ad_cp.cpp
View File

@ -145,11 +145,10 @@ try
} }
Opm::EclipseWriter outputWriter(param, deck, const PhaseUsage pu = Opm::phaseUsageFromDeck(deck);
Opm::EclipseWriter outputWriter(param, eclipseState, pu,
Opm::UgGridHelpers::numCells(*grid), Opm::UgGridHelpers::numCells(*grid),
Opm::UgGridHelpers::globalCell(*grid), Opm::UgGridHelpers::globalCell(*grid));
Opm::UgGridHelpers::cartDims(*grid),
Opm::UgGridHelpers::dimensions(*grid));
// Rock and fluid init // Rock and fluid init
props.reset(new BlackoilPropertiesFromDeck(deck, eclipseState, props.reset(new BlackoilPropertiesFromDeck(deck, eclipseState,
@ -177,7 +176,6 @@ try
*props, param, gravity[2], state); *props, param, gravity[2], state);
initBlackoilSurfvol(grid->numCells(), *props, state); initBlackoilSurfvol(grid->numCells(), *props, state);
enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour }; enum { Oil = BlackoilPhases::Liquid, Gas = BlackoilPhases::Vapour };
const PhaseUsage pu = props->phaseUsage();
if (pu.phase_used[Oil] && pu.phase_used[Gas]) { if (pu.phase_used[Oil] && pu.phase_used[Gas]) {
const int np = props->numPhases(); const int np = props->numPhases();
const int nc = grid->numCells(); const int nc = grid->numCells();