Changeset 5612 for anuga_core/source/anuga/shallow_water/data_manager.py

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/data_manager.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -4888 +4888 @@
     numSrc=len(filenames)
 
-    file_params=-1*ones(3,Float)#[nsta,dt,nt]
+    file_params=-1*ones(3,Float) #[nsta,dt,nt]
     
     # Convert verbose to int C flag
@@ -4896 +4896 @@
         verbose=0
         
-        
-    #msg = 'I got the permutation vector:' + str(permutation)
-    #assert permutation is not None, msg
     if permutation is None:
         permutation = ensure_numeric([], Float)    
 
     # Call underlying C implementation urs2sts_ext.c    
-    data = read_mux2(numSrc,filenames,weights,file_params,permutation,verbose)
+    data = read_mux2(numSrc, filenames, weights, file_params, permutation, verbose)
 
     msg='File parameter values were not read in correctly from c file'
@@ -4925 +4922 @@
     msg='Must have at least one gauge value'
     assert nt>0,msg
-    
+   
     OFFSET=5 # Number of site parameters p passed back with data
              # p=[geolat,geolon,depth,start_tstep,finish_tstep]
-
+     
+    # FIXME (Ole): What is the relationship with params and data.shape ?
+    # It looks as if the following asserts should pass but they don't always
+    #
+             
+    #print
+    #print nsta, nt, data.shape
+        
+    #msg = 'nt = %d, data.shape[1] == %d' %(nt, data.shape[1])
+    #assert nt == data.shape[1] - OFFSET, msg 
+    
+    #msg = 'nsta = %d, data.shape[0] == %d' %(nsta, data.shape[0])    
+    #assert nsta == data.shape[0], msg
+
+    
+    # Number of stations in ordering file
+    number_of_selected_stations = data.shape[0]
+
+    # Index where data ends and parameters begin
     parameters_index = data.shape[1]-OFFSET          
              
     times=dt*arange(parameters_index)    
-    latitudes=zeros(data.shape[0], Float)
-    longitudes=zeros(data.shape[0], Float)
-    elevation=zeros(data.shape[0], Float)
-    quantity=zeros((data.shape[0], parameters_index), Float)
+    latitudes=zeros(number_of_selected_stations, Float)
+    longitudes=zeros(number_of_selected_stations, Float)
+    elevation=zeros(number_of_selected_stations, Float)
+    quantity=zeros((number_of_selected_stations, parameters_index), Float)
     
     
     starttime=1e16
-    for i in range(0, data.shape[0]):
+    for i in range(number_of_selected_stations):
+        quantity[i][:]=data[i][:parameters_index]
+    
         latitudes[i]=data[i][parameters_index]
         longitudes[i]=data[i][parameters_index+1]
         elevation[i]=-data[i][parameters_index+2]
-        quantity[i][:]=data[i][:parameters_index] # Was data[i][:-OFFSET] 
-        
         first_time_step = data[i][parameters_index+3]
-        #print 'datamanager:', i, first_time_step, dt*first_time_step
-        starttime=min(dt*data[i][parameters_index+3],starttime)
+        
+        starttime=min(dt*first_time_step, starttime)
         
     return times, latitudes, longitudes, elevation, quantity, starttime