Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/run_model.py

    r6788 r6832  
    4545from anuga.caching import cache
    4646
     47import anuga.utilities.log as log
     48
    4749# Application specific imports
    4850from setup_model import project
     
    6567#-------------------------------------------------------------------------------
    6668
    67 print 'Create computational domain'
     69log.critical('Create computational domain')
    6870
    6971# Create the STS file
    70 print 'project.mux_data_folder=%s' % project.mux_data_folder
     72log.critical( 'project.mux_data_folder=%s' % project.mux_data_folder)
    7173if not os.path.exists(project.event_sts + '.sts'):
    7274    bub.build_urs_boundary(project.mux_input_filename, project.event_sts)
     
    103105                                    use_cache=True,
    104106                                    verbose=True)
    105 print domain.statistics()
     107log.critical(domain.statistics())
    106108
    107109# FIXME(Ole): How can we make this more automatic?
     
    117119#-------------------------------------------------------------------------------
    118120
    119 print 'Setup initial conditions'
     121log.critical('Setup initial conditions')
    120122
    121123# Set the initial stage in the offcoast region only
     
    136138if project.use_buildings:
    137139    # Add buildings from file
    138     print 'Reading building polygons'   
     140    log.critical('Reading building polygons'    )
    139141    building_polygons, building_heights = csv2building_polygons(project.building_polygon)
    140142    #clipping_polygons=project.building_area_polygons)
    141143
    142     print 'Creating %d building polygons' % len(building_polygons)
     144    log.critical('Creating %d building polygons' % len(building_polygons))
    143145    def create_polygon_function(building_polygons, geo_reference=None):
    144146        L = []
    145147        for i, key in enumerate(building_polygons):
    146             if i%100==0: print i
     148            if i%100==0: log.critical(i)
    147149            poly = building_polygons[key]
    148150            elev = building_heights[key]
     
    158160                      verbose=True)
    159161
    160     print 'Adding buildings'
     162    log.critical('Adding buildings')
    161163    domain.add_quantity('elevation',
    162164                        buildings,
     
    169171#-------------------------------------------------------------------------------
    170172
    171 print 'Set boundary - available tags:', domain.get_boundary_tags()
     173log.critical('Set boundary - available tags:', domain.get_boundary_tags())
    172174
    173175Br = Reflective_boundary(domain)
     
    196198for t in domain.evolve(yieldstep=2000,
    197199                       finaltime=6000):
    198     print domain.timestepping_statistics()
    199     print domain.boundary_statistics(tags='ocean')
     200    log.critical(domain.timestepping_statistics())
     201    log.critical(domain.boundary_statistics(tags='ocean'))
    200202
    201203# Start detailed model
     
    203205                       finaltime=project.finaltime,
    204206                       skip_initial_step=True):
    205     print domain.timestepping_statistics()
    206     print domain.boundary_statistics(tags='ocean')
     207    log.critical(domain.timestepping_statistics())
     208    log.critical(domain.boundary_statistics(tags='ocean'))
    207209   
    208 print 'Simulation took %.2f seconds' %(time.time()-t0)
     210log.critical('Simulation took %.2f seconds' %(time.time()-t0))
    209211     
  • branches/numpy_anuga_validation/automated_validation_tests/patong_beach_validation/validate_patong.py

    r6828 r6832  
    143143            return False
    144144
    145     # unpack *.tgz files
    146     for data_object in Local_Data_Objects:
    147         tar_path = os.path.join(Local_Data_Directory, data_object+'.tgz')
    148         log.info('Untarring %s in directory %s ...'
    149                  % (tar_path, Local_Data_Directory))
    150         untar_file(tar_path, target_dir=Local_Data_Directory)
    151        
    152145    log.info('Local data has been refreshed.')
    153146    return True
     
    185178    log.critical('You have the required files.')
    186179
    187     # now untar file/directory objects
    188     for data_object in Local_Data_Objects:
    189         tar_path = os.path.join(Local_Data_Directory, data_object+'.tgz')
    190         log.info('Untarring %s in directory %s ...'
    191                  % (tar_path, Local_Data_Directory))
    192         untar_file(tar_path, target_dir=Local_Data_Directory)
    193 
    194180    return True
    195181
     
    198184    '''Run the Patong simulation.'''
    199185   
     186##    # now untar file/directory objects
     187##    for data_object in Local_Data_Objects:
     188##        tar_path = os.path.join(Local_Data_Directory, data_object+'.tgz')
     189##        log.info('Untarring %s in directory %s ...'
     190##                 % (tar_path, Local_Data_Directory))
     191##        untar_file(tar_path, target_dir=Local_Data_Directory)
     192
    200193    # modify environment so we use the local data
    201194    new_inundationhome = os.path.join(Local_Data_Directory, '')
     
    325318
    326319# clean up
    327 teardown()
     320#teardown()
Note: See TracChangeset for help on using the changeset viewer.