Changeset 4776

Timestamp:

Nov 1, 2007, 11:12:32 AM (17 years ago)

Author:

ole

Message:

Cosmetics according to style guide.

Location:

anuga_core/source/anuga

Files:

• geospatial_data/geospatial_data.py (modified) (14 diffs)
• shallow_water/data_manager.py (modified) (13 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -655 +655 @@
         new_size = round(factor*self_size)
         
-        #find unique random numbers
+        # Find unique random numbers
         if verbose: print "make unique random number list and get indices"
 
@@ -662 +662 @@
         if verbose: print "total list len",len(total_list)
                 
-        #there will be repeated random numbers however will not be a 
-        #problem as they are being 'pop'ed out of array so if there
-        #are two numbers the same they will pop different indicies, 
-        #still basically random
+        # There will be repeated random numbers however will not be a 
+        # problem as they are being 'pop'ed out of array so if there
+        # are two numbers the same they will pop different indicies, 
+        # still basically random
         ## create list of non-unquie random numbers
         if verbose: print "create random numbers list %s long" %new_size
         
-        #set seed if provided, mainly important for unit test!
+        # Set seed if provided, mainly important for unit test!
         if seed_num != None:
             seed(seed_num,seed_num)
@@ -684 +684 @@
         k=1
         remainder_list = total_list[:]
-        #pops array index (random_num) from remainder_list
+        # pops array index (random_num) from remainder_list
         # (which starts as the 
-        #total_list and appends to random_list  
+        # total_list and appends to random_list  
         random_num_len = len(random_num)
         for i in random_num:
@@ -696 +696 @@
                 k+=1
         
-        #FIXME: move to tests, it might take a long time
-        #then create an array of random lenght between 500 and 1000, 
-        #and use a random factor between 0 and 1 
-        #setup for assertion
+        # FIXME: move to tests, it might take a long time
+        # then create an array of random lenght between 500 and 1000, 
+        # and use a random factor between 0 and 1 
+        # setup for assertion
         test_total = random_list[:]
         test_total.extend(remainder_list)
@@ -707 +707 @@
         assert (total_list==test_total),msg
 
-        #get new samples
+        # Get new samples
         if verbose: print "get values of indices for random list"
         G1 = self.get_sample(random_list)
@@ -733 +733 @@
         if self.file_name[-4:] == ".pts":
             
-            # see if the file is there.  Throw a QUIET IO error if it isn't
+            # See if the file is there.  Throw a QUIET IO error if it isn't
             fd = open(self.file_name,'r')
             fd.close()
     
-            #throws prints to screen if file not present
+            # Throws prints to screen if file not present
             self.fid = NetCDFFile(self.file_name, 'r')
             
@@ -761 +761 @@
             
         else:
-            # assume the file is a csv file
+            # Assume the file is a csv file
             file_pointer = open(self.file_name)
             self.header, self.file_pointer = \
@@ -775 +775 @@
         if self.file_name[-4:] == ".pts":
             if self.start_row == self.last_row:
-                # read the end of the file last iteration
-                # remove blocking attributes
+                # Read the end of the file last iteration
+                # Remove blocking attributes
                 self.fid.close()
                 del self.max_read_lines
@@ -822 +822 @@
             
         else:
-            # assume the file is a csv file
+            # Assume the file is a csv file
             try:
                 pointlist, att_dict, geo_ref, self.file_pointer = \
@@ -859 +859 @@
                 raise SyntaxError, msg
         return geo
+
+    
 ##################### Error messages ###########
 Error_message = {}
@@ -933 +935 @@
     
         
-    # see if the file is there.  Throw a QUIET IO error if it isn't
+    # See if the file is there.  Throw a QUIET IO error if it isn't
     fd = open(file_name,'r')
     fd.close()
     
-    #throws prints to screen if file not present
+    # Throws prints to screen if file not present
     fid = NetCDFFile(file_name, 'r') 
     
@@ -1016 +1018 @@
     att_dict = {}
 
-    #This is to remove the x and y headers.
+    # This is to remove the x and y headers.
     header = header[:]
     try:
@@ -1063 +1065 @@
         att_dict[key] = array(att_dict[key]).astype(Float)
 
-    #Do stuff here so the info is in lat's and longs
+    # Do stuff here so the info is in lat's and longs
     geo_ref = None
     x_header = lower(x_header[:3])
@@ -1146 +1148 @@
     outfile = NetCDFFile(file_name, 'w')
     
-    #Create new file
+    # Create new file
     outfile.institution = 'Geoscience Australia'
     outfile.description = 'NetCDF format for compact and portable storage ' +\
                           'of spatial point data'
     
-    # dimension definitions
+    # Dimension definitions
     shape = write_data_points.shape[0]
     outfile.createDimension('number_of_points', shape)  
     outfile.createDimension('number_of_dimensions', 2) #This is 2d data
     
-    # variable definition
+    # Variable definition
     outfile.createVariable('points', Float, ('number_of_points',
                                              'number_of_dimensions'))

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -1290 +1290 @@
     """
 
-    #FIXME: Can this be written feasibly using write_pts?
+    # FIXME: Can this be written feasibly using write_pts?
 
     import os
@@ -1298 +1298 @@
     root = basename_in
 
-    #Get NetCDF
-    infile = NetCDFFile(root + '.dem', 'r')  #Open existing netcdf file for read
+    # Get NetCDF
+    infile = NetCDFFile(root + '.dem', 'r')  # Open existing netcdf file for read
 
     if verbose: print 'Reading DEM from %s' %(root + '.dem')
@@ -1305 +1305 @@
     ncols = infile.ncols[0]
     nrows = infile.nrows[0]
-    xllcorner = infile.xllcorner[0]  #Easting of lower left corner
-    yllcorner = infile.yllcorner[0]  #Northing of lower left corner
+    xllcorner = infile.xllcorner[0]  # Easting of lower left corner
+    yllcorner = infile.yllcorner[0]  # Northing of lower left corner
     cellsize = infile.cellsize[0]
     NODATA_value = infile.NODATA_value[0]
@@ -1315 +1315 @@
     false_northing = infile.false_northing[0]
 
-    #Text strings
+    # Text strings
     projection = infile.projection
     datum = infile.datum
@@ -1321 +1321 @@
 
 
-    #Get output file
+    # Get output file
     if basename_out == None:
         ptsname = root + '.pts'
@@ -1331 +1331 @@
     outfile = NetCDFFile(ptsname, 'w')
 
-    #Create new file
+    # Create new file
     outfile.institution = 'Geoscience Australia'
     outfile.description = 'NetCDF pts format for compact and portable storage ' +\
                       'of spatial point data'
-    #assign default values
+    # Assign default values
     if easting_min is None: easting_min = xllcorner
     if easting_max is None: easting_max = xllcorner + ncols*cellsize
@@ -1341 +1341 @@
     if northing_max is None: northing_max = yllcorner + nrows*cellsize
 
-    #compute offsets to update georeferencing
+    # Compute offsets to update georeferencing
     easting_offset = xllcorner - easting_min
     northing_offset = yllcorner - northing_min
 
-    #Georeferencing
+    # Georeferencing
     outfile.zone = zone
-    outfile.xllcorner = easting_min #Easting of lower left corner
-    outfile.yllcorner = northing_min #Northing of lower left corner
+    outfile.xllcorner = easting_min # Easting of lower left corner
+    outfile.yllcorner = northing_min # Northing of lower left corner
     outfile.false_easting = false_easting
     outfile.false_northing = false_northing
@@ -1357 +1357 @@
 
 
-    #Grid info (FIXME: probably not going to be used, but heck)
+    # Grid info (FIXME: probably not going to be used, but heck)
     outfile.ncols = ncols
     outfile.nrows = nrows
@@ -1364 +1364 @@
     totalnopoints = nrows*ncols
 
-    # calculating number of NODATA_values for each row in clipped region
-    #FIXME: use array operations to do faster
+    # Calculating number of NODATA_values for each row in clipped region
+    # FIXME: use array operations to do faster
     nn = 0
     k = 0
@@ -1390 +1390 @@
     index2 = thisj
 
-    # dimension definitions
+    # Dimension definitions
     nrows_in_bounding_box = int(round((northing_max-northing_min)/cellsize))
     ncols_in_bounding_box = int(round((easting_max-easting_min)/cellsize))
@@ -1407 +1407 @@
     outfile.createDimension('number_of_dimensions', 2) #This is 2d data
 
-    # variable definitions
+    # Variable definitions
     outfile.createVariable('points', Float, ('number_of_points',
                                              'number_of_dimensions'))
@@ -1417 +1417 @@
 
     lenv = index2-index1+1
-    #Store data
+    # Store data
     global_index = 0
-    #for i in range(nrows):
+    # for i in range(nrows):
     for i in range(i1_0,thisi+1,1):
         if verbose and i%((nrows+10)/10)==0:
@@ -1429 +1429 @@
         no_NODATA = sum(v == NODATA_value)
         if no_NODATA > 0:
-            newcols = lenv - no_NODATA #ncols_in_bounding_box - no_NODATA
+            newcols = lenv - no_NODATA # ncols_in_bounding_box - no_NODATA
         else:
-            newcols = lenv #ncols_in_bounding_box
+            newcols = lenv # ncols_in_bounding_box
 
         telev = zeros(newcols, Float)