Changeset 5967

Timestamp:

Nov 18, 2008, 12:31:51 PM (16 years ago)

Author:

ole

Message:

Fixed return values and error codes in urs_ext.c

Location:

anuga_core/source/anuga/shallow_water

Files:

• shallow_water_ext.c (modified) (1 diff)
• test_data_manager.py (modified) (3 diffs)
• urs_ext.c (modified) (13 diffs)

anuga_core/source/anuga/shallow_water/shallow_water_ext.c

@@ -848 +848 @@
                          zl, 
                          zr,                                             
-                         ((double*) normal -> data)[0],                                                                          
+                         ((double*) normal -> data)[0],
                          ((double*) normal -> data)[1],                  
                          epsilon, H0, g,

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -6243 +6243 @@
 
     def test_urs2sts_read_mux2_pyIII(self):
-        """Varying start and finsh times
+        """Varying start and finish times
         """
         tide = 1
@@ -11048 +11048 @@
 if __name__ == "__main__":
 
-    #suite = unittest.makeSuite(Test_Data_Manager,'test')
+    suite = unittest.makeSuite(Test_Data_Manager,'test')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsI_beyond_model_time')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsIV_sinewave_ordering')
@@ -11057 +11057 @@
 
     # FIXME (Ole): This is the test that fails under Windows
-    suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem2')
+    #suite = unittest.makeSuite(Test_Data_Manager,'test_read_mux_platform_problem2')
     #suite = unittest.makeSuite(Test_Data_Manager,'test_file_boundary_stsIV')
 

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -179 +179 @@
     char susMuxFileName;
     long numData;
+    size_t elements_read; // fread return value
+    int block_size;
 
     /* Allocate space for the names and the weights and pointers to the data*/
@@ -218 +220 @@
         {
             fprintf(stderr, "cannot open file %s\n", muxFileName);
-            return 0;  
+            return -1;  
         }
         
         if (!i)
         {
-            fread(total_number_of_stations, sizeof(int), 1, fp);
+            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);
+              return -2;
+            }
         
             fros = (int*) malloc(*total_number_of_stations*numSrc*sizeof(int)); 
@@ -231 +238 @@
             mytgs = (struct tgsrwg*) malloc(*total_number_of_stations*sizeof(struct tgsrwg));
 
-            fread(mytgs0, *total_number_of_stations*sizeof(struct tgsrwg), 1, fp);
+            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);
+              return -2;
+            }
         }
         else
         {
             // Check that the mux files are compatible
-            fread(&numsta, sizeof(int), 1, fp);
+            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);
+              return -2;
+            }
+            
             if(numsta != *total_number_of_stations)
             {
@@ -243 +262 @@
                 muxFileNameArray[0]);
                 fclose(fp);
-                return 0;   
+                return -1;   
             }
 
-            fread(mytgs, numsta*sizeof(struct tgsrwg), 1, fp); 
-            
+            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);
+              return -2;
+            }       
+            
+            
             for (j = 0; j < numsta; j++)
             {
@@ -256 +282 @@
                     muxFileNameArray[0]);
                     fclose(fp);
-                    return 0;            
+                    return -1;            
                 }   
                 if (mytgs[j].nt != mytgs0[j].nt)
@@ -264 +290 @@
                     muxFileNameArray[0]);
                     fclose(fp);
-                    return 0;            
+                    return -1;            
                 }
 
@@ -275 +301 @@
 
         /* Read the start and stop times for this source */
-        fread(fros + i*(*total_number_of_stations), 
-              *total_number_of_stations*sizeof(int), 1, fp);
-        fread(lros + i*(*total_number_of_stations), 
-              *total_number_of_stations*sizeof(int), 1, fp);
+        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);
+          return -3;
+        }           
+                           
+                           
+        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);
+          return -3;
+        }                     
 
         /* Compute the size of the data block for this source */
@@ -289 +327 @@
         {
             fprintf(stderr,"Size of data block appears to be negative!\n");
-            return 0;        
+            return -1;        
         }
 
@@ -309 +347 @@
     free(mytgs);
 
-    return 1;
+    return 0; // Succesful execution
 }
 
@@ -329 +367 @@
     long numData;
 
-    int len_sts_data;
+    int len_sts_data, error_code;
     float **sts_data;
     float *temp_sts_data;
@@ -337 +375 @@
     int number_of_time_steps, N;
     double delta_t;
+    
+    size_t elements_read;
     
     // Shorthands pointing to memory blocks for each source
@@ -343 +383 @@
 
     
-    _read_mux2_headers(numSrc, 
-                       muxFileNameArray, 
-                       &total_number_of_stations,
-                       &number_of_time_steps,
-                       &delta_t,
-                       verbose);
+    error_code = _read_mux2_headers(numSrc, 
+                                    muxFileNameArray, 
+                                    &total_number_of_stations,
+                                    &number_of_time_steps,
+                                    &delta_t,
+                                    verbose);
+    if (error_code != 0) {
+      printf("urs_ext.c: Internal function _read_mux2_headers failed: Error code = %d\n", 
+             error_code);
+      
+      return NULL;
+    }
+    
 
     // Apply rule that an empty permutation file means 'take all stations'
@@ -430 +477 @@
                              total_number_of_stations);
                              
-        fread(muxData, ((int) numData)*sizeof(float), 1, fp); 
+                             
+                                     
+        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);
+          return NULL;
+        }
+                
         fclose(fp);
+        
 
         // FIXME (Ole): This is where Nariman and Ole traced the platform dependent