Changeset 5470

Timestamp:

Jul 7, 2008, 12:18:29 PM (17 years ago)

Author:

ole

Message:

Added verbose flag to c code

Location:

anuga_core/source/anuga/shallow_water

Files:

• data_manager.py (modified) (3 diffs)
• urs_ext.c (modified) (7 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4838 +4838 @@
 NORTH_VELOCITY_MUX2_LABEL =  '-n-mux2'    
 
-def read_mux2_py(filenames,weights):
+def read_mux2_py(filenames,weights,verbose=False):
 
     from Numeric import ones,Float,compress,zeros,arange
@@ -4846 +4846 @@
 
     file_params=-1*ones(3,Float)#[nsta,dt,nt]
-    write=0 #if true write txt files to current directory as well
-    data=read_mux2(numSrc,filenames,weights,file_params,write)
+    
+    # Convert verbose to int C flag
+    if verbose:
+        verbose=1
+    else:
+        verbose=0
+        
+    data=read_mux2(numSrc,filenames,weights,file_params,verbose)
 
     msg='File parameter values were not read in correctly from c file'
@@ -5034 +5040 @@
     for i,quantity in enumerate(quantities):
         # For each quantity read the associated list of source mux2 file with extenstion associated with that quantity
-        times, latitudes_urs, longitudes_urs, elevation, mux[quantity],starttime = read_mux2_py(files_in[i],weights)
+        times, latitudes_urs, longitudes_urs, elevation, mux[quantity],starttime = read_mux2_py(files_in[i],weights,verbose=verbose)
         if quantity!=quantities[0]:
             msg='%s, %s and %s have inconsitent gauge data'%(files_in[0],files_in[1],files_in[2])

anuga_core/source/anuga/shallow_water/urs_ext.c

@@ -29 +29 @@
    
     Python call:
-    read_mux2(numSrc,filenames,weights,file_params,write)
+    read_mux2(numSrc,filenames,weights,file_params,verbose)
 
     NOTE:
@@ -43 +43 @@
   float *weights;
   long numSrc;
-  long write;
+  long verbose;
 
   float **cdata;
@@ -58 +58 @@
   // Convert Python arguments to C
   if (!PyArg_ParseTuple(args, "iOOOi",
-                        &numSrc,&filenames,&pyweights,&file_params,&write)) {                   
+                        &numSrc,&filenames,&pyweights,&file_params,&verbose)) {                 
                         
     PyErr_SetString(PyExc_RuntimeError, 
@@ -117 +117 @@
 
   // Read in mux2 data from file
-  cdata=_read_mux2((int)numSrc,muxFileNameArray,weights,(double*)file_params->data,(int)write);
+  cdata=_read_mux2((int)numSrc,muxFileNameArray,weights,(double*)file_params->data,(int)verbose);
 
 
@@ -181 +181 @@
   free(weights);
   free(muxFileNameArray);
+  free(cdata);
   return  PyArray_Return(pydata);
 
 }
 
-float** _read_mux2(int numSrc, char **muxFileNameArray, float *weights, double *params, int write)
+float** _read_mux2(int numSrc, char **muxFileNameArray, float *weights, double *params, int verbose)
 {
    FILE *fp;
@@ -225 +226 @@
    }   
                      
-   
-   /* open the first muxfile */
-   if((fp=fopen(muxFileNameArray[0],"r"))==NULL)
-   {
+   if (verbose){
+     printf("Reading mux header information\n");
+   }
+   
+   /* Open the first muxfile */
+   if((fp=fopen(muxFileNameArray[0],"r"))==NULL){
       fprintf(stderr, "cannot open file %s\n", muxFileNameArray[0]);
       exit(-1);  
    }
  
-   /* read in the header */
-   /*first read the number of stations*/   
+   /* Read in the header */
+   /* First read the number of stations*/   
    fread(&nsta0,sizeof(int),1,fp);
    
@@ -364 +367 @@
          exit(-1);  
        }
+       
+     if (verbose){
+       printf("Reading mux file %s\n",muxFileName);
+     }
 
      offset=sizeof(int)+nsta0*(sizeof(struct tgsrwg)+2*sizeof(int));