Changeset 6832 for branches/numpy_anuga_validation

Timestamp:

Apr 17, 2009, 3:47:54 PM (16 years ago)

Author:

rwilson

Message:

Most recent changes to SVN - moving to Linux box.

Location:

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• run_model.py (modified) (9 diffs)
• validate_patong.py (modified) (4 diffs)

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/run_model.py

@@ -45 +45 @@
 from anuga.caching import cache
 
+import anuga.utilities.log as log
+
 # Application specific imports
 from setup_model import project
@@ -65 +67 @@
 #-------------------------------------------------------------------------------
 
-print 'Create computational domain'
+log.critical('Create computational domain')
 
 # Create the STS file
-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)
@@ -103 +105 @@
                                     use_cache=True,
                                     verbose=True)
-print domain.statistics()
+log.critical(domain.statistics())
 
 # FIXME(Ole): How can we make this more automatic?
@@ -117 +119 @@
 #-------------------------------------------------------------------------------
 
-print 'Setup initial conditions'
+log.critical('Setup initial conditions')
 
 # Set the initial stage in the offcoast region only
@@ -136 +138 @@
 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]
@@ -158 +160 @@
                       verbose=True)
 
-    print 'Adding buildings'
+    log.critical('Adding buildings')
     domain.add_quantity('elevation',
                         buildings,
@@ -169 +171 @@
 #-------------------------------------------------------------------------------
 
-print 'Set boundary - available tags:', domain.get_boundary_tags()
+log.critical('Set boundary - available tags:', domain.get_boundary_tags())
 
 Br = Reflective_boundary(domain)
@@ -196 +198 @@
 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
@@ -203 +205 @@
                        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))
       

branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate_patong.py

@@ -143 +143 @@
             return False
 
-    # unpack *.tgz files
-    for data_object in Local_Data_Objects:
-        tar_path = os.path.join(Local_Data_Directory, data_object+'.tgz')
-        log.info('Untarring %s in directory %s ...'
-                 % (tar_path, Local_Data_Directory))
-        untar_file(tar_path, target_dir=Local_Data_Directory)
-        
     log.info('Local data has been refreshed.')
     return True
@@ -185 +178 @@
     log.critical('You have the required files.')
 
-    # now untar file/directory objects
-    for data_object in Local_Data_Objects:
-        tar_path = os.path.join(Local_Data_Directory, data_object+'.tgz')
-        log.info('Untarring %s in directory %s ...'
-                 % (tar_path, Local_Data_Directory))
-        untar_file(tar_path, target_dir=Local_Data_Directory)
-
     return True
 
@@ -198 +184 @@
     '''Run the Patong simulation.'''
     
+##    # now untar file/directory objects
+##    for data_object in Local_Data_Objects:
+##        tar_path = os.path.join(Local_Data_Directory, data_object+'.tgz')
+##        log.info('Untarring %s in directory %s ...'
+##                 % (tar_path, Local_Data_Directory))
+##        untar_file(tar_path, target_dir=Local_Data_Directory)
+
     # modify environment so we use the local data
     new_inundationhome = os.path.join(Local_Data_Directory, '')
@@ -325 +318 @@
 
 # clean up
-teardown()
+#teardown()