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

Allow reading of Eclipse Ascii without ACTNUM

Browse Source 
p4#: 19298
This commit is contained in:
Magne Sjaastad
2012-10-24 13:46:42 +02:00
parent 73c370a299
commit e5c3418c02
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/FileInterface/RifEclipseInputFileTools.cpp
View File

@@ -74,7 +74,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigReservoi
findGridKeywordPositions(fileName, &coordPos, &zcornPos, &specgridPos, &actnumPos, &mapaxesPos); findGridKeywordPositions(fileName, &coordPos, &zcornPos, &specgridPos, &actnumPos, &mapaxesPos);
if (coordPos < 0 || zcornPos < 0 || specgridPos < 0 || actnumPos < 0) if (coordPos < 0 || zcornPos < 0 || specgridPos < 0)
{ {
return false; return false;
} }
@@ -119,9 +119,13 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigReservoi
allKwReadOk = allKwReadOk && NULL != (coordKw = ecl_kw_fscanf_alloc_current_grdecl__(gridFilePointer, false , ECL_FLOAT_TYPE)); allKwReadOk = allKwReadOk && NULL != (coordKw = ecl_kw_fscanf_alloc_current_grdecl__(gridFilePointer, false , ECL_FLOAT_TYPE));
progress.setProgress(3); progress.setProgress(3);
// If ACTNUM is not defined, this pointer will be NULL, which is a valid condition
if (actnumPos >= 0)
{
fseek(gridFilePointer, actnumPos, SEEK_SET); fseek(gridFilePointer, actnumPos, SEEK_SET);
allKwReadOk = allKwReadOk && NULL != (actNumKw = ecl_kw_fscanf_alloc_current_grdecl__(gridFilePointer, false , ECL_INT_TYPE)); allKwReadOk = allKwReadOk && NULL != (actNumKw = ecl_kw_fscanf_alloc_current_grdecl__(gridFilePointer, false , ECL_INT_TYPE));
progress.setProgress(4); progress.setProgress(4);
}
// If MAPAXES is not defined, this pointer will be NULL, which is a valid condition // If MAPAXES is not defined, this pointer will be NULL, which is a valid condition
if (mapaxesPos >= 0) if (mapaxesPos >= 0)
@@ -159,7 +163,7 @@ bool RifEclipseInputFileTools::openGridFile(const QString& fileName, RigReservoi
ecl_kw_free(specGridKw); ecl_kw_free(specGridKw);
ecl_kw_free(zCornKw); ecl_kw_free(zCornKw);
ecl_kw_free(coordKw); ecl_kw_free(coordKw);
ecl_kw_free(actNumKw); if (actNumKw) ecl_kw_free(actNumKw);
if (mapAxesKw) ecl_kw_free(mapAxesKw); if (mapAxesKw) ecl_kw_free(mapAxesKw);
ecl_grid_free(inputGrid); ecl_grid_free(inputGrid);