Changeset 6483

Timestamp:

Mar 10, 2009, 3:53:28 PM (16 years ago)

Author:

rwilson

Message:

Converted auto validation scripts to numpy.

Location:

branches/numpy_anuga_validation/automated_validation_tests

Files:

• okushiri_tank_validation/compare_timeseries_with_measures.py (modified) (1 diff)
• okushiri_tank_validation/create_okushiri.py (modified) (4 diffs)
• urs_mux_files_validation/run_Bf.py (modified) (1 diff)

branches/numpy_anuga_validation/automated_validation_tests/okushiri_tank_validation/compare_timeseries_with_measures.py

@@ -6 +6 @@
 """
 
-import Numeric as num
+import numpy as num
 from Scientific.IO.NetCDF import NetCDFFile
 

branches/numpy_anuga_validation/automated_validation_tests/okushiri_tank_validation/create_okushiri.py

@@ -3 +3 @@
 
 
-import Numeric as num
+import numpy as num
 
 from anuga.pmesh.mesh import *
@@ -9 +9 @@
 from anuga.coordinate_transforms.geo_reference import Geo_reference
 from anuga.geospatial_data import Geospatial_data
+from anuga.config import netcdf_float
 
 import project
@@ -111 +112 @@
 
     N = len(lines)
-    T = num.zeros(N, num.Float)  #Time
-    Q = num.zeros(N, num.Float)  #Values
+    T = num.zeros(N, num.float)  #Time
+    Q = num.zeros(N, num.float)  #Values
 
     for i, line in enumerate(lines):
@@ -128 +129 @@
     fid.starttime = 0.0
     fid.createDimension('number_of_timesteps', len(T))
-    fid.createVariable('time', num.Float, ('number_of_timesteps',))
+    fid.createVariable('time', netcdf_float, ('number_of_timesteps',))
     fid.variables['time'][:] = T
 
-    fid.createVariable('stage', num.Float, ('number_of_timesteps',))
+    fid.createVariable('stage', netcdf_float, ('number_of_timesteps',))
     fid.variables['stage'][:] = Q[:]
 
-    fid.createVariable('xmomentum', num.Float, ('number_of_timesteps',))
+    fid.createVariable('xmomentum', netcdf_float, ('number_of_timesteps',))
     fid.variables['xmomentum'][:] = 0.0
 
-    fid.createVariable('ymomentum', num.Float, ('number_of_timesteps',))
+    fid.createVariable('ymomentum', netcdf_float, ('number_of_timesteps',))
     fid.variables['ymomentum'][:] = 0.0
 

branches/numpy_anuga_validation/automated_validation_tests/urs_mux_files_validation/run_Bf.py

@@ -20 +20 @@
 # Related major packages
 from anuga.shallow_water import Domain,Dirichlet_boundary,File_boundary,Transmissive_boundary, Field_boundary
-import Numeric as num
+import numpy as num
 from anuga.pmesh.mesh_interface import create_mesh_from_regions
 from anuga.abstract_2d_finite_volumes.util import start_screen_catcher, copy_code_files, sww2timeseries, get_data_from_file