OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Change 18611 on 2012/09/11 by magne@ResInsight_magne_RHE5

Browse Source 
Removed requirement for MAPAXES when reading an Eclipse Ascii file
This commit is contained in:
CeetronResInsight
2012-09-11 13:04:24 +02:00
parent ad95533d2f
commit 76cfde5ba6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -92,8 +92,10 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigReservoi
progress.setProgress(3);
allKwReadOk = allKwReadOk && NULL != (actNumKw = ecl_kw_fscanf_alloc_grdecl_dynamic__( gridFilePointer , "ACTNUM" , false , ECL_INT_TYPE));
progress.setProgress(4);
allKwReadOk = allKwReadOk && NULL != (mapAxesKw = ecl_kw_fscanf_alloc_grdecl_dynamic__( gridFilePointer , "MAPAXES" , false , ECL_FLOAT_TYPE));
// If MAPAXES is not defined, this pointer will be NULL, which is a valid condition
mapAxesKw = ecl_kw_fscanf_alloc_grdecl_dynamic__( gridFilePointer , "MAPAXES" , false , ECL_FLOAT_TYPE);
if (!allKwReadOk)
{
if(specGridKw) ecl_kw_free(specGridKw);
@@ -124,7 +126,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigReservoi
ecl_kw_free(zCornKw);
ecl_kw_free(coordKw);
ecl_kw_free(actNumKw);
ecl_kw_free(mapAxesKw);
if (mapAxesKw) ecl_kw_free(mapAxesKw);
ecl_grid_free(inputGrid);