Changeset 19221

Timestamp:

03/24/15 12:05:18 (10 years ago)

Author:

Eric.Larour

Message:

CHG: adding capability to test for presence of a file, instead of erroring out instantly on open.

Location:

issm/trunk-jpl/src/c/shared/io/Disk

Files:

• diskio.h (modified) (1 diff)
• pfopen.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/shared/io/Disk/diskio.h

@@ -8 +8 @@
 #include <stdio.h>
 
-FILE* pfopen(char* filename,const char* format);
+FILE* pfopen(char* filename,const char* format,bool errorout=true);
 FILE* pfopen0(char* filename,const char* format);
 void  pfclose(FILE* fid,char* filename);

issm/trunk-jpl/src/c/shared/io/Disk/pfopen.cpp

@@ -24 +24 @@
         /*Open handle to data on disk*/
         fid = fopen(filename,format);
-        if(fid==NULL) _error_("could not open file " << filename << " for binary reading or writing");
+        if(fid==NULL)_error_("could not open file " << filename << " for binary reading or writing");
 
         return fid;
 }
-FILE* pfopen(char* filename,const char* format){
+FILE* pfopen(char* filename,const char* format,bool errorout){
 
         FILE* fid=NULL;
@@ -41 +41 @@
                 ISSM_MPI_Barrier(IssmComm::GetComm());
         }
-        if(fid==NULL) _error_("could not open file " << filename << " for binary reading or writing");
+        if(errorout && fid==NULL)_error_("could not open file " << filename << " for binary reading or writing");
 
         return fid;