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

Use GridInit in flow.cpp.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen
2015-12-07 16:04:09 +01:00
parent af980ed93c
commit 7c5256031c
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
examples/flow.cpp
View File

@@ -35,23 +35,19 @@
#include <dune/common/mpihelper.hh> #include <dune/common/mpihelper.hh>
#endif #endif
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#if HAVE_DUNE_CORNERPOINT && WANT_DUNE_CORNERPOINTGRID #if HAVE_DUNE_CORNERPOINT && WANT_DUNE_CORNERPOINTGRID
#define USE_DUNE_CORNERPOINTGRID 1 #define USE_DUNE_CORNERPOINTGRID 1
#include <dune/grid/CpGrid.hpp> #include <dune/grid/CpGrid.hpp>
#include <dune/grid/common/GridAdapter.hpp>
#else #else
#undef USE_DUNE_CORNERPOINTGRID #undef USE_DUNE_CORNERPOINTGRID
#endif #endif
#include <opm/common/utility/platform_dependent/reenable_warnings.h>
#include <opm/core/pressure/FlowBCManager.hpp>
#include <opm/core/grid.h>
#include <opm/core/grid/cornerpoint_grid.h>
#include <opm/core/grid/GridManager.hpp> #include <opm/core/grid/GridManager.hpp>
#include <opm/autodiff/GridHelpers.hpp> #include <opm/autodiff/GridHelpers.hpp>
#include <opm/autodiff/createGlobalCellArray.hpp> #include <opm/autodiff/createGlobalCellArray.hpp>
#include <opm/autodiff/GridInit.hpp>
#include <opm/core/wells.h> #include <opm/core/wells.h>
#include <opm/core/wells/WellsManager.hpp> #include <opm/core/wells/WellsManager.hpp>
@@ -253,17 +249,12 @@ try
std::vector<double> porv = eclipseState->getDoubleGridProperty("PORV")->getData(); std::vector<double> porv = eclipseState->getDoubleGridProperty("PORV")->getData();
#if USE_DUNE_CORNERPOINTGRID #if USE_DUNE_CORNERPOINTGRID
// Dune::CpGrid as grid manager typedef Dune::CpGrid Grid;
typedef Dune::CpGrid Grid;
// Grid init
Grid grid;
grid.processEclipseFormat(deck, false, false, false, porv);
#else #else
// UnstructuredGrid as grid manager typedef UnstructuredGrid Grid;
typedef UnstructuredGrid Grid;
GridManager gridManager( eclipseState->getEclipseGrid(), porv );
const Grid& grid = *(gridManager.c_grid());
#endif #endif
GridInit<Grid> grid_init(deck, eclipseState, porv);
auto&& grid = grid_init.grid();
// Possibly override IOConfig setting (from deck) for how often RESTART files should get written to disk (every N report step) // Possibly override IOConfig setting (from deck) for how often RESTART files should get written to disk (every N report step)
if (param.has("output_interval")) { if (param.has("output_interval")) {