Changeset 7276 for anuga_validation/circular_island/run_circular.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (15 years ago)

Author:

ole

Message:

Merged numpy branch back into the trunk.

In ~/sandpit/anuga/anuga_core/source
svn merge -r 6246:HEAD ../../branches/numpy .

In ~/sandpit/anuga/anuga_validation
svn merge -r 6417:HEAD ../branches/numpy_anuga_validation .

In ~/sandpit/anuga/misc
svn merge -r 6809:HEAD ../branches/numpy_misc .

For all merges, I used numpy version where conflicts existed

The suites test_all.py (in source/anuga) and validate_all.py passed using Python2.5 with numpy on my Ubuntu Linux box.

File:

• anuga_validation/circular_island/run_circular.py (modified) (6 diffs)

anuga_validation/circular_island/run_circular.py

@@ -15 +15 @@
 from anuga.abstract_2d_finite_volumes.util import file_function, sww2csv_gauges,csv2timeseries_graphs
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
-from anuga.utilities.polygon import read_polygon#, plot_polygons
-from math import cos,pi,sin,tan#,sqrt
-from Numeric import array, zeros, Float, allclose,resize,sqrt
+from anuga.utilities.polygon import read_polygon
+from math import cos,pi,sin,tan
+import numpy as num
 from anuga.shallow_water.data_manager import csv2dict
 from time import localtime, strftime, gmtime
 from anuga.utilities.system_tools import get_user_name, get_host_name
 from os import sep, environ, getenv
+from anuga.config import netcdf_float
+from Scientific.IO.NetCDF import NetCDFFile
+
 #-------------------------
 # Create Domain from mesh
@@ -57 +60 @@
 
     print 'Preparing time boundary from %s' %textversion
-    from Numeric import array
 
     fid = open(textversion)
@@ -70 +72 @@
 
     N = len(lines)
-    T = zeros(N, Float)  #Time
-    Q = zeros(N, Float)  #Values
+    T = num.zeros(N, num.float)  #Time
+    Q = num.zeros(N, num.float)  #Values
 
     for i, line in enumerate(lines):
@@ -82 +84 @@
 
     #Create tms file
-    from Scientific.IO.NetCDF import NetCDFFile
-
     print 'Writing to', filename
     fid = NetCDFFile(filename[:-4] + '.tms', 'w')
@@ -91 +91 @@
     fid.starttime = 0.0
     fid.createDimension('number_of_timesteps', len(T))
-    fid.createVariable('time', Float, ('number_of_timesteps',))
+    fid.createVariable('time', netcdf_float, ('number_of_timesteps',))
     fid.variables['time'][:] = T
 
-    fid.createVariable('stage', Float, ('number_of_timesteps',))
+    fid.createVariable('stage', netcdf_float, ('number_of_timesteps',))
     fid.variables['stage'][:] = Q[:]
 
-    fid.createVariable('xmomentum', Float, ('number_of_timesteps',))
+    fid.createVariable('xmomentum', netcdf_float, ('number_of_timesteps',))
     fid.variables['xmomentum'][:] = 0.0
 
-    fid.createVariable('ymomentum', Float, ('number_of_timesteps',))
+    fid.createVariable('ymomentum', netcdf_float, ('number_of_timesteps',))
     fid.variables['ymomentum'][:] = 0.0
 
@@ -181 +181 @@
 def circular_island_elevation(x,y):
     water_depth = 0.32
-    list_xy = sqrt((center_x-x)**2+(center_y-L-y)**2)
+    list_xy = num.sqrt((center_x-x)**2+(center_y-L-y)**2)
     print 'x',min(x),max(x)
     print 'y',min(y),max(y)