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

Updated calls to ecl_util_fmt_file() - result is by reference

Browse Source
This commit is contained in:
Joakim Hove 2013-05-02 19:04:09 +02:00
parent 0ed065586a
commit a6e3bbd610
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
opm/core/io/eclipse/EclipseGridParser.cpp
View File

@ -966,9 +966,16 @@ ecl_grid_type * EclipseGridParser::newGrid( ) {
void EclipseGridParser::saveEGRID( const std::string & filename) const { 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;
struct grdecl grdecl = get_grdecl(); struct grdecl grdecl = get_grdecl();
fortio_type * fortio = fortio_open_writer( filename.c_str() , fmt_file , endian_flip ); fortio_type * fortio;
if (!ecl_util_fmt_file( filename.c_str() , &fmt_file)) {
cerr << "Could not determine formatted/unformatted status of file:" << filename << " non-standard name?" << endl;
throw exception();
}
fortio = fortio_open_writer( filename.c_str() , fmt_file , endian_flip );
{ {
float * mapaxes = NULL; float * mapaxes = NULL;
if (grdecl.mapaxes != NULL) { if (grdecl.mapaxes != NULL) {
@ -1023,9 +1030,16 @@ void EclipseGridParser::save_kw( fortio_type * fortio , const std::string & kw ,
void EclipseGridParser::saveINIT( const std::string & filename , const ecl_grid_type * ecl_grid) { void EclipseGridParser::saveINIT( const std::string & filename , const ecl_grid_type * ecl_grid) {
int phases = ECL_OIL_PHASE + ECL_WATER_PHASE; int phases = ECL_OIL_PHASE + ECL_WATER_PHASE;
bool fmt_file = ecl_util_fmt_file( filename.c_str() );
bool endian_flip = true;//ECL_ENDIAN_FLIP; bool endian_flip = true;//ECL_ENDIAN_FLIP;
fortio_type * fortio = fortio_open_writer( filename.c_str() , fmt_file , endian_flip ); bool fmt_file;
fortio_type * fortio;
if (!ecl_util_fmt_file( filename.c_str() , &fmt_file)) {
cerr << "Could not determine formatted/unformatted status of file:" << filename << " non-standard name?" << endl;
throw exception();
}
fortio = fortio_open_writer( filename.c_str() , fmt_file , endian_flip );
{ {
ecl_kw_type * poro_kw = newEclKW( PORO_KW , ECL_FLOAT_TYPE ); ecl_kw_type * poro_kw = newEclKW( PORO_KW , ECL_FLOAT_TYPE );
time_t start_date; time_t start_date;