Changeset 7276 for anuga_validation/automated_validation_tests/okushiri_tank_validation

Timestamp:

Jun 30, 2009, 2:07:41 PM (16 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.

Location:

anuga_validation/automated_validation_tests/okushiri_tank_validation

Files:

• Benchmark_2_Bathymetry.lic (modified) (1 diff)
• Benchmark_2_input.lic (modified) (1 diff)
• compare_timeseries_with_measures.py (modified) (1 diff)
• create_okushiri.py (modified) (4 diffs)
• output_ch5-7-9.lic (modified) (2 diffs)
• test_caching_of_set_quantity.py (modified) (1 diff)

anuga_validation/automated_validation_tests/okushiri_tank_validation/Benchmark_2_Bathymetry.lic

@@ -1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
+<?xml version='1.0' encoding='iso-8859-1'?>
 <ga_license_file>
   <metadata>

anuga_validation/automated_validation_tests/okushiri_tank_validation/Benchmark_2_input.lic

@@ -1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
+<?xml version='1.0' encoding='iso-8859-1'?>
 <ga_license_file>
   <metadata>

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
 

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
 

anuga_validation/automated_validation_tests/okushiri_tank_validation/output_ch5-7-9.lic

@@ -1 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
+<?xml version='1.0' encoding='iso-8859-1'?>
 <ga_license_file>
   <metadata>
@@ -8 +7 @@
   <datafile>
     <filename>output_ch5-7-9.txt</filename>
-    <checksum>-1044604103</checksum>
+    <checksum>3250363193</checksum>
     <publishable>Yes</publishable>
     <accountable>Ole Nielsen</accountable>

anuga_validation/automated_validation_tests/okushiri_tank_validation/test_caching_of_set_quantity.py

@@ -13 +13 @@
 from anuga.fit_interpolate.fit import _fit_to_mesh
 import project
-import Numeric as num
+import numpy as num
 import time