Changeset 5968 for anuga_core/source/anuga/shallow_water/urs_ext.c

Timestamp:

Nov 18, 2008, 12:45:04 PM (16 years ago)

Author:

ole

Message:

Better error messages in urs_ext.c

File:

• anuga_core/source/anuga/shallow_water/urs_ext.c (modified) (7 diffs)

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -226 +226 @@
         {
             elements_read = fread(total_number_of_stations, sizeof(int), 1, fp);
-            if ((int) elements_read != 1){
-              fprintf(stderr, "(1) Read %d number of elements, should have been 1\n",
-                      elements_read);
+            if ((int) elements_read == 0 && ferror(fp)){
+              fprintf(stderr, "Error reading total number of stations\n");
               return -2;
             }
@@ -240 +239 @@
             block_size = *total_number_of_stations*sizeof(struct tgsrwg);
             elements_read = fread(mytgs0, block_size , 1, fp);
-            if ((int) elements_read != 1){
-              fprintf(stderr, "(2) Read %d number of elements, should have been 1\n",
-                      elements_read);
+            if ((int) elements_read == 0 && ferror(fp)){
+              fprintf(stderr, "Error reading mytgs0\n");
               return -2;
             }
@@ -250 +248 @@
             // Check that the mux files are compatible
             elements_read = fread(&numsta, sizeof(int), 1, fp);
-            if ((int) elements_read != 1){
-              fprintf(stderr, "(3) Read %d number of elements, should have been 1\n",
-                      elements_read);
+            if ((int) elements_read == 0 && ferror(fp)){
+              fprintf(stderr, "Error reading numsta\n");
               return -2;
             }
@@ -267 +264 @@
             block_size = numsta*sizeof(struct tgsrwg);
             elements_read = fread(mytgs, block_size, 1, fp); 
-            if ((int) elements_read != 1){
-              fprintf(stderr, "(4) Read %d number of elements, should have been 1\n",
-                      elements_read);
+            if ((int) elements_read == 0 && ferror(fp)){
+              fprintf(stderr, "Error reading mgtgs\n");
               return -2;
             }       
@@ -302 +298 @@
         /* Read the start and stop times for this source */
         elements_read = fread(fros + i*(*total_number_of_stations), 
-                           *total_number_of_stations*sizeof(int), 1, fp);
-        if ((int) elements_read != 1){
-          fprintf(stderr, "(4) Read %d number of elements, should have been 1\n",
-                  elements_read);
+                              *total_number_of_stations*sizeof(int), 1, fp);
+        if ((int) elements_read == 0 && ferror(fp)){
+          fprintf(stderr, "Error reading start times\n");
           return -3;
         }           
@@ -311 +306 @@
                            
         elements_read = fread(lros + i*(*total_number_of_stations), 
-                           *total_number_of_stations*sizeof(int), 1, fp);
-        if ((int) elements_read != 1){
-          fprintf(stderr, "(5) Read %d number of elements, should have been 1\n",
-                  elements_read);
+                              *total_number_of_stations*sizeof(int), 1, fp);
+        if ((int) elements_read == 0 && ferror(fp)){
+          fprintf(stderr, "Error reading stop times\n");        
           return -3;
         }                     
@@ -480 +474 @@
                                      
         elements_read = fread(muxData, ((int) numData)*sizeof(float), 1, fp); 
-        
         if ((int) elements_read == 0 && ferror(fp)) {
-          //fprintf(stderr, "Numdata = %d\n", (int) numData);
-          fprintf(stderr, "(6) Read %d number of elements, should have been 1\n",
-                  elements_read);
+          fprintf(stderr, "Error reading mux data\n");
           return NULL;
         }