Changeset 8718

Timestamp:

Feb 26, 2013, 7:04:13 PM (12 years ago)

Author:

steve

Message:

Did a first look at converting from Scientific Python to NetCDF4

Location:

trunk/anuga_core/source/anuga

Files:

• abstract_2d_finite_volumes/file_function.py (modified) (4 diffs)
• abstract_2d_finite_volumes/gauge.py (modified) (2 diffs)
• abstract_2d_finite_volumes/test_gauge.py (modified) (1 diff)
• abstract_2d_finite_volumes/util.py (modified) (1 diff)
• coordinate_transforms/geo_reference.py (modified) (1 diff)

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/file_function.py

@@ -189 +189 @@
     fid.close()
 
+    # FIXME SR: This test doesn't seem to work with netcdf4
     if line[:3] == 'CDF':
         return get_netcdf_file_function(filename,
@@ -250 +251 @@
  
     if interpolation_points is not None:
+
+        #interpolation_points = num.array(interpolation_points, num.float)
         interpolation_points = ensure_absolute(interpolation_points)
         msg = 'Points must by N x 2. I got %d' % interpolation_points.shape[1]
@@ -294 +297 @@
     # Get first timestep
     try:
-        starttime = fid.starttime[0]
+        starttime = fid.starttime
     except ValueError:
         msg = 'Could not read starttime from file %s' % filename
@@ -335 +338 @@
     if spatial:
         # Get origin
-        xllcorner = fid.xllcorner[0]
-        yllcorner = fid.yllcorner[0]
-        zone = fid.zone[0]        
+        #xllcorner = fid.xllcorner[0]
+        #yllcorner = fid.yllcorner[0]
+        #zone = fid.zone[0]
+
+        xllcorner = fid.xllcorner
+        yllcorner = fid.yllcorner
+        zone = fid.zone
 
         x = fid.variables['x'][:]

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/gauge.py

@@ -223 +223 @@
 
         if quake_offset_time is None:
-            quake_offset_time = callable_sww.starttime
+            quake_offset_time = callable_sww.starttime[0]
 
         for point_i, point in enumerate(points_array):
@@ -230 +230 @@
                 quake_time = time + quake_offset_time
                 point_quantities = callable_sww(time, point_i) # __call__ is overridden
+
 
                 if point_quantities[0] != NAN:

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/test_gauge.py

@@ -132 +132 @@
         line=[]
         for i,row in enumerate(point1_reader):
-#            print 'i',i,'row',row
+            #print 'i',i,'row',row
             line.append([float(row[0]),float(row[1]),float(row[2]),float(row[3]),
                          float(row[4]),float(row[5]),float(row[6])])

trunk/anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -43 +43 @@
                       time_thinning, time_limit, verbose, use_cache,
                       boundary_polygon, output_centroids)
+
+
 
 def multiple_replace(text, dictionary):

trunk/anuga_core/source/anuga/coordinate_transforms/geo_reference.py

@@ -136 +136 @@
         """
 
-        self.xllcorner = float(infile.xllcorner[0])
-        self.yllcorner = float(infile.yllcorner[0])
-        self.zone = int(infile.zone[0])
+        #self.xllcorner = float(infile.xllcorner[0])
+        #self.yllcorner = float(infile.yllcorner[0])
+        #self.zone = int(infile.zone[0])
+
+
+        self.xllcorner = float(infile.xllcorner)
+        self.yllcorner = float(infile.yllcorner)
+        self.zone = int(infile.zone)
 
         try:
-            self.false_easting = int(infile.false_easting[0])
-            self.false_northing = int(infile.false_northing[0])
+            #self.false_easting = int(infile.false_easting[0])
+            #self.false_northing = int(infile.false_northing[0])
+
+            self.false_easting = int(infile.false_easting)
+            self.false_northing = int(infile.false_northing)
 
             self.datum = infile.datum