OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #101 from atgeirr/new-interface-for-ecl-output

Browse Source 
Made saveEGRID() method available unconditionally.
This commit is contained in:
Atgeirr Flø Rasmussen 2012-11-26 05:03:31 -08:00
commit 2d8610d773
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
opm/core/eclipse/EclipseGridParser.cpp
View File

@ -958,7 +958,7 @@ ecl_grid_type * EclipseGridParser::newGrid( ) {
} }
*/ */
void EclipseGridParser::saveEGRID( const std::string & filename) { void EclipseGridParser::saveEGRID( const std::string & filename) const {
bool endian_flip = true;//ECL_ENDIAN_FLIP; bool endian_flip = true;//ECL_ENDIAN_FLIP;
bool fmt_file = ecl_util_fmt_file( filename.c_str() ); bool fmt_file = ecl_util_fmt_file( filename.c_str() );
struct grdecl grdecl = get_grdecl(); struct grdecl grdecl = get_grdecl();
@ -1068,6 +1068,14 @@ void EclipseGridParser::saveEGRID_INIT( const std::string& output_dir , const st
free( egrid_file ); free( egrid_file );
ecl_grid_free( ecl_grid ); ecl_grid_free( ecl_grid );
} }
#else
void EclipseGridParser::saveEGRID( const std::string & filename) const
{
static_cast<void>(filename); // Suppress "unused variable" warning.
THROW("Cannot write EGRID format without ert library support. Reconfigure opm-core with --with-ert and recompile.");
}
#endif #endif
// Read an imported fortio data file using Ert. // Read an imported fortio data file using Ert.

4
opm/core/eclipse/EclipseGridParser.hpp
View File

@ -221,9 +221,11 @@ public:
struct grdecl get_grdecl() const; struct grdecl get_grdecl() const;
/// Save grid parts of deck in EGRID format.
void saveEGRID(const std::string & filename) const;
#ifdef HAVE_ERT #ifdef HAVE_ERT
void saveEGRID_INIT( const std::string& output_dir , const std::string& basename, bool fmt_file = false); void saveEGRID_INIT( const std::string& output_dir , const std::string& basename, bool fmt_file = false);
void saveEGRID( const std::string & filename );
void saveINIT( const std::string & filename , const ecl_grid_type * ecl_grid); void saveINIT( const std::string & filename , const ecl_grid_type * ecl_grid);
ecl_grid_type * newGrid( ); ecl_grid_type * newGrid( );
#endif #endif