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

Timestamp:

Aug 5, 2008, 3:46:33 PM (15 years ago)

Author:

ole

Message:

A bit more cleanup in urs2sts - all tests pass, but I think we need a few more.

File:

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

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -203 +203 @@
     }
 
-    /* Loop over all sources, read headers and check compatibility */
+    // Loop over all sources, read headers and check compatibility
     for (i = 0; i < numSrc; i++)
     {
         muxFileName = muxFileNameArray[i];
 
-        /* open the mux file */
+        // Open the mux file
         if((fp = fopen(muxFileName, "r")) == NULL)
         {
@@ -219 +219 @@
             fread(total_number_of_stations, sizeof(int), 1, fp);
         
-            fros = (int*)malloc(*total_number_of_stations*numSrc*sizeof(int)); 
-            lros = (int*)malloc(*total_number_of_stations*numSrc*sizeof(int));
+            fros = (int*) malloc(*total_number_of_stations*numSrc*sizeof(int)); 
+            lros = (int*) malloc(*total_number_of_stations*numSrc*sizeof(int));
       
-            mytgs0 = (struct tgsrwg*)malloc(*total_number_of_stations*sizeof(struct tgsrwg));
-            mytgs = (struct tgsrwg*)malloc(*total_number_of_stations*sizeof(struct tgsrwg));
+            mytgs0 = (struct tgsrwg*) malloc(*total_number_of_stations*sizeof(struct tgsrwg));
+            mytgs = (struct tgsrwg*) malloc(*total_number_of_stations*sizeof(struct tgsrwg));
 
             fread(mytgs0, *total_number_of_stations*sizeof(struct tgsrwg), 1, fp);
@@ -229 +229 @@
         else
         {
-            /* check that the mux files are compatible */      
+            // Check that the mux files are compatible
             fread(&numsta, sizeof(int), 1, fp);
             if(numsta != *total_number_of_stations)
@@ -246 +246 @@
                 if (mytgs[j].dt != mytgs0[j].dt)
                 {
-                    fprintf(stderr,"%s has different sampling rate to %s\n", 
+                    fprintf(stderr, "%s has different sampling rate to %s\n", 
                     muxFileName, 
                     muxFileNameArray[0]);
@@ -254 +254 @@
                 if (mytgs[j].nt != mytgs0[j].nt)
                 {
-                    fprintf(stderr,"%s has different series length to %s\n", 
+                    fprintf(stderr, "%s has different series length to %s\n", 
                     muxFileName, 
                     muxFileNameArray[0]);
@@ -342 +342 @@
                        verbose);
 
-    //FIXME: The params can be removed after the python interface is modified.
-    params[0] = (double)total_number_of_stations;
-    params[1] = (double)delta_t;
-    params[2] = (double)number_of_time_steps;
-    
     // Apply rule that an empty permutation file means 'take all stations'
     // We could change this later by passing in None instead of the empty 
@@ -365 +360 @@
         }
     }
+   
+    // The params array is used only for passing data back to Python.
+    params[0] = (double) number_of_selected_stations;
+    params[1] = (double) delta_t;
+    params[2] = (double) number_of_time_steps;
+    
+   
     
     // Make array(s) to hold demuxed data for stations given in the 
     // permutation file 
-    sts_data = (float**)malloc(number_of_selected_stations*sizeof(float*));
+    sts_data = (float**) malloc(number_of_selected_stations*sizeof(float*));
     if (sts_data == NULL)
     {
@@ -380 +382 @@
     {
         // Initialise sts_data to zero
-        sts_data[i] = (float*)calloc(len_sts_data, sizeof(float));
+        sts_data[i] = (float*) calloc(len_sts_data, sizeof(float));
         if (sts_data[i] == NULL)
         {
@@ -388 +390 @@
     }
 
-    temp_sts_data = (float*)calloc(len_sts_data, sizeof(float));
-
-    muxData = (float*)malloc(numDataMax*sizeof(float));
+    temp_sts_data = (float*) calloc(len_sts_data, sizeof(float));
+
+    muxData = (float*) malloc(numDataMax*sizeof(float));
     
     /* Loop over all sources */
@@ -401 +403 @@
             
     
-    
-        /* Read in data block from mux2 file */
+        // Read in data block from mux2 file
         muxFileName = muxFileNameArray[isrc];
         if((fp = fopen(muxFileName, "r")) == NULL)
@@ -427 +428 @@
         //     use ista with mux data
         //     use i with the processed data to be returned         
-        
         for(i = 0; i < number_of_selected_stations; i++)
         {               
@@ -461 +461 @@
             N = number_of_time_steps;
             
-            
-            /*
-            printf("station =  %d, source = %d, fros = %f, lros = %f\n", 
-                   ista, 
-                   isrc, 
-                   (float) fros_per_source[ista],
-                   (float) lros_per_source[ista]);                 
-            */
-                   
-                   
-                    
             if (isrc == 0) {
                 // Assign values for first source
@@ -485 +474 @@
                         printf("Adjusting start time for station %d and source %d",
                                ista, isrc);
-                        printf(" from %f to %f\n", sts_data[i][N+3], (float)fros_per_source[ista]);  
+                        printf(" from %f to %f\n", 
+                               sts_data[i][N+3], 
+                               (float) fros_per_source[ista]);  
                     }
-                    sts_data[i][N+3] = (float)fros_per_source[ista];
+                    sts_data[i][N+3] = (float) fros_per_source[ista];
                 }
                 
-                
-                if (sts_data[i][N+4] < (float)lros_per_source[ista]) {          
+                if (sts_data[i][N+4] < (float) lros_per_source[ista]) {         
                     if (verbose) {
                         printf("Adjusting end time for station %d and source %d",
                                ista, isrc);
-                        printf(" from %f to %f\n", sts_data[i][N+4], (float)lros_per_source[ista]);  
+                        printf(" from %f to %f\n", 
+                               sts_data[i][N+4], 
+                               (float) lros_per_source[ista]);  
                     }
-                    sts_data[i][N+4] = (float)lros_per_source[ista];
+                    sts_data[i][N+4] = (float) lros_per_source[ista];
                 }               
             }
@@ -593 +585 @@
     {
         PyErr_SetString(PyExc_ValueError, 
-      "ERROR: Memory for muxFileNameArray could not be allocated.");
+                        "ERROR: Memory for muxFileNameArray could not be allocated.");
         return NULL;
     }
@@ -697 +689 @@
     dimensions[1] = num_ts + POFFSET;
     
-    pydata = (PyArrayObject*)PyArray_FromDims(2, dimensions, PyArray_DOUBLE);
+    pydata = (PyArrayObject*) PyArray_FromDims(2, dimensions, PyArray_DOUBLE);
     if(pydata == NULL)
     {
@@ -719 +711 @@
                 {
                     // This gauge has stopped recording but others are 
-            // still recording
+                    // still recording
                     *(double*)(pydata->data + i*pydata->strides[0] 
-                                    + time*pydata->strides[1]) = 
-                        0.0;
+                               + time*pydata->strides[1]) = 
+                      0.0;
                 }
                 else