From 8c321460936980b7e17c6ce36f84c624fdae52a1 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 24 Jul 2013 14:42:40 +0200 Subject: [PATCH] Rewritten EclipseGridParser to use input actnum instead of ACTNUM from deck --- opm/core/io/eclipse/EclipseGridParser.cpp | 6 +++--- opm/core/io/eclipse/EclipseGridParser.hpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/core/io/eclipse/EclipseGridParser.cpp b/opm/core/io/eclipse/EclipseGridParser.cpp index c4bfda4d..4f34dbcb 100644 --- a/opm/core/io/eclipse/EclipseGridParser.cpp +++ b/opm/core/io/eclipse/EclipseGridParser.cpp @@ -966,7 +966,7 @@ ecl_grid_type * EclipseGridParser::newGrid( ) { } */ -void EclipseGridParser::saveEGRID( const std::string & filename) const { + void EclipseGridParser::saveEGRID( const std::string & filename , std::vector& actnum) const { bool endian_flip = true;//ECL_ENDIAN_FLIP; bool fmt_file; struct grdecl grdecl = get_grdecl(); @@ -994,7 +994,7 @@ void EclipseGridParser::saveEGRID( const std::string & filename) const { { ecl_kw_type * coord_kw = newEclKW( COORD_KW , ECL_FLOAT_TYPE ); ecl_kw_type * zcorn_kw = newEclKW( ZCORN_KW , ECL_FLOAT_TYPE ); - ecl_kw_type * actnum_kw = newEclKW( ACTNUM_KW , ECL_INT_TYPE ); + ecl_kw_type * actnum_kw = ecl_kw_alloc_new_shared( ACTNUM_KW , grdecl.dims[0] * grdecl.dims[1] * grdecl.dims[2] , ECL_INT_TYPE , &actnum ); ecl_kw_type * endgrid_kw = ecl_kw_alloc( ENDGRID_KW , 0 , ECL_INT_TYPE ); ecl_kw_fwrite( coord_kw , fortio ); @@ -1092,7 +1092,7 @@ void EclipseGridParser::saveEGRID_INIT( const std::string& output_dir , const st } #else -void EclipseGridParser::saveEGRID( const std::string & filename) const + void EclipseGridParser::saveEGRID( const std::string & filename, std::vector& actnum) const { static_cast(filename); // Suppress "unused variable" warning. THROW("Cannot write EGRID format without ERT library support. Reconfigure opm-core with ERT support and recompile."); diff --git a/opm/core/io/eclipse/EclipseGridParser.hpp b/opm/core/io/eclipse/EclipseGridParser.hpp index f9fddb23..f193b21e 100644 --- a/opm/core/io/eclipse/EclipseGridParser.hpp +++ b/opm/core/io/eclipse/EclipseGridParser.hpp @@ -226,7 +226,7 @@ public: struct grdecl get_grdecl() const; /// Save grid parts of deck in EGRID format. - void saveEGRID(const std::string & filename) const; + void saveEGRID(const std::string & filename, std::vector& actnum) const; #ifdef HAVE_ERT void saveEGRID_INIT( const std::string& output_dir , const std::string& basename, bool fmt_file = false);