OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-27 11:40:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

refactoring: rename GridCreator to GridManager

Browse Source 
because "manager" sounds less religious than "creator" and the
GridCreators did all kinds of other stuff besides creating the grid.

this patch also gets rid of the static function inside these classes,
which should make them easier to understand...
This commit is contained in:
Andreas Lauser 2014-04-24 12:24:51 +02:00
parent 515f9b00cf
commit 049f7fa4e8
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ewoms/io/eclipsewriter.hh
View File

@ -80,15 +80,6 @@ class EclipseWriterHelper<TypeTag, Dune::CpGrid>
{ {
friend class EclipseWriter<TypeTag>; friend class EclipseWriter<TypeTag>;
typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
enum { dim = GridView::dimension };
static void writeHeaders_(EclipseWriter<TypeTag> &writer) static void writeHeaders_(EclipseWriter<TypeTag> &writer)
{ {
typedef typename GET_PROP_TYPE(TypeTag, Discretization) Discretization; typedef typename GET_PROP_TYPE(TypeTag, Discretization) Discretization;
@ -101,9 +92,6 @@ class EclipseWriterHelper<TypeTag, Dune::CpGrid>
OPM_THROW(std::logic_error, OPM_THROW(std::logic_error,
"Eclipse binary output requires the ERT libraries"); "Eclipse binary output requires the ERT libraries");
#else #else
if (dim != 3)
OPM_THROW(std::logic_error,
"Eclipse binary output can only be written for 3D grids");
// set the index of the first time step written to 0... // set the index of the first time step written to 0...
writer.reportStepIdx_ = 0; writer.reportStepIdx_ = 0;
@ -116,7 +104,7 @@ class EclipseWriterHelper<TypeTag, Dune::CpGrid>
std::string egridFileName(egridRawFileName); std::string egridFileName(egridRawFileName);
std::free(egridRawFileName); std::free(egridRawFileName);
ErtGrid ertGrid(GridCreator::eclipseGrid()); ErtGrid ertGrid(writer.simulator_.gridManager().eclipseGrid());
ertGrid.write(egridFileName, writer.reportStepIdx_); ertGrid.write(egridFileName, writer.reportStepIdx_);
#endif #endif
} }
@ -143,7 +131,7 @@ class EclipseWriter : public BaseOutputWriter
typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper; typedef typename GET_PROP_TYPE(TypeTag, VertexMapper) VertexMapper;
typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper; typedef typename GET_PROP_TYPE(TypeTag, ElementMapper) ElementMapper;
typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator; typedef typename GET_PROP_TYPE(TypeTag, Simulator) Simulator;
typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator; typedef typename GET_PROP_TYPE(TypeTag, GridManager) GridManager;
typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid; typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView; typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;