Changeset 7276 for anuga_validation/automated_validation_tests/patong_beach_validation/run_model.py

Timestamp:

Jun 30, 2009, 2:07:41 PM (14 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/automated_validation_tests/patong_beach_validation/run_model.py (modified) (12 diffs)

anuga_validation/automated_validation_tests/patong_beach_validation/run_model.py

@@ -28 +28 @@
 # Related major packages
 from Scientific.IO.NetCDF import NetCDFFile
-import Numeric as num
+#import numpy as num
 
 from anuga.interface import create_domain_from_regions
@@ -44 +44 @@
 from anuga.utilities.polygon import read_polygon, Polygon_function
 from anuga.caching import cache
+
+import anuga.utilities.log as log
 
 # Application specific imports
@@ -70 +72 @@
 #-------------------------------------------------------------------------------
 
-print 'Create computational domain'
+log.critical('Create computational domain')
 
 # Create the STS file
@@ -76 +78 @@
 # We need to use caching instead!
 
-print 'project.mux_data_folder=%s' % project.mux_data_folder
+log.critical( 'project.mux_data_folder=%s' % project.mux_data_folder)
 if not os.path.exists(project.event_sts + '.sts'):
     bub.build_urs_boundary(project.mux_input_filename, project.event_sts)
@@ -111 +113 @@
                                     use_cache=True,
                                     verbose=True)
-print domain.statistics()
+log.critical(domain.statistics())
 
 # FIXME(Ole): How can we make this more automatic?
@@ -125 +127 @@
 #-------------------------------------------------------------------------------
 
-print 'Setup initial conditions'
+log.critical('Setup initial conditions')
 
 # Set the initial stage in the offcoast region only
@@ -144 +146 @@
 if project.use_buildings:
     # Add buildings from file
-    print 'Reading building polygons'    
+    log.critical('Reading building polygons')
     building_polygons, building_heights = csv2building_polygons(project.building_polygon)
     #clipping_polygons=project.building_area_polygons)
 
-    print 'Creating %d building polygons' % len(building_polygons)
+    log.critical('Creating %d building polygons' % len(building_polygons))
     def create_polygon_function(building_polygons, geo_reference=None):
         L = []
         for i, key in enumerate(building_polygons):
-            if i%100==0: print i
+            if i%100==0: log.critical(i)
             poly = building_polygons[key]
             elev = building_heights[key]
@@ -161 +163 @@
         return buildings
 
-    print 'Creating %d building polygons' % len(building_polygons)
+    log.critical('Creating %d building polygons' % len(building_polygons))
     buildings = cache(create_polygon_function,
                       building_polygons,
@@ -167 +169 @@
                       verbose=True)
 
-    print 'Adding buildings'
+    log.critical('Adding buildings')
     domain.add_quantity('elevation',
                         buildings,
@@ -178 +180 @@
 #-------------------------------------------------------------------------------
 
-print 'Set boundary - available tags:', domain.get_boundary_tags()
+log.critical('Set boundary - available tags:' % domain.get_boundary_tags())
 
 Br = Reflective_boundary(domain)
@@ -204 +206 @@
 for t in domain.evolve(yieldstep=2000,
                        finaltime=6000):
-    print domain.timestepping_statistics()
-    print domain.boundary_statistics(tags='ocean')
+    log.critical(domain.timestepping_statistics())
+    log.critical(domain.boundary_statistics(tags='ocean'))
 
 # Start detailed model
@@ -211 +213 @@
                        finaltime=project.finaltime,
                        skip_initial_step=True):
-    print domain.timestepping_statistics()
-    print domain.boundary_statistics(tags='ocean')
+    log.critical(domain.timestepping_statistics())
+    log.critical(domain.boundary_statistics(tags='ocean'))
     
-print 'Simulation took %.2f seconds' %(time.time()-t0)
+log.critical('Simulation took %.2f seconds' %(time.time()-t0))