Changeset 6262

Timestamp:

Feb 3, 2009, 1:44:29 PM (16 years ago)

Author:

ole

Message:

Cleanup before coding style meeting

Location:

anuga_work/production/busselton/standardised_version

Files:

• build_busselton.py (modified) (5 diffs)
• project.py (modified) (1 diff)
• run_busselton.py (modified) (4 diffs)

anuga_work/production/busselton/standardised_version/build_busselton.py

@@ -14 +14 @@
 
 # Standard modules
-from os.path import dirname
-from os import mkdir, access, F_OK
+import os
 
 # Related major packages
-from anuga.shallow_water import Domain
 from anuga.shallow_water.data_manager import convert_dem_from_ascii2netcdf, dem2pts
-from anuga.geospatial_data.geospatial_data import *
+from anuga.geospatial_data.geospatial_data import Geospatial_data
 from anuga.shallow_water.data_manager import start_screen_catcher, copy_code_files
 
@@ -31 +29 @@
 #------------------------------------------------------------------------------
 
-#copy_code_files(project.output_build_time_dir,__file__, 
-#               dirname(project.__file__)+os.sep+ project.__name__+'.py' )
-#start_screen_catcher(project.output_build_time_dir)
+copy_code_files(project.output_build_time_dir,__file__, 
+                os.path.dirname(project.__file__)+os.sep+ project.__name__+'.py' )
+start_screen_catcher(project.output_build_time_dir)
 
 
@@ -46 +44 @@
 print 'project.poly_all', project.poly_all
 print 'project.combined_dir_name', project.combined_dir_name
-
-# input elevation directory filenames
-#onshore_in_dir_name = project.onshore_in_dir_name
-#coast_in_dir_name = project.coast_in_dir_name
-#coast_in_dir_name1 = project.coast_in_dir_name1
-#offshore_in_dir_name = project.offshore_in_dir_name
-#offshore_in_dir_name1 = project.offshore_in_dir_name1
-#offshore_in_dir_name2 = project.offshore_in_dir_name2
-#offshore_in_dir_name3 = project.offshore_in_dir_name3
-#offshore_in_dir_name4 = project.offshore_in_dir_name4
-#offshore_in_dir_name5 = project.offshore_in_dir_name5
-
-# output elevation directory filenames
-#onshore_dir_name = project.onshore_dir_name
-#coast_dir_name = project.coast_dir_name
-#coast_dir_name1 = project.coast_dir_name1
-#offshore_dir_name = project.offshore_dir_name
-#offshore_dir_name1 = project.offshore_dir_name1
-#offshore_dir_name2 = project.offshore_dir_name2
-#offshore_dir_name3 = project.offshore_dir_name3
-#offshore_dir_name4 = project.offshore_dir_name4
-#offshore_dir_name5 = project.offshore_dir_name5
-
 
 # Create Geospatial data from ASCII files
@@ -90 +65 @@
 
 
-#print "creates DEMs from asc data"
-#print onshore_in_dir_name, onshore_dir_name
-#print offshore_in_dir_name5, offshore_dir_name5
-#
-#convert_dem_from_ascii2netcdf(onshore_in_dir_name, basename_out=onshore_dir_name, use_cache=True, verbose=True)
-#
-#convert_dem_from_ascii2netcdf(offshore_in_dir_name5, basename_out=offshore_dir_name5, use_cache=True, verbose=True)#
-##
-#
-# creates pts file for onshore DEM
-#print "creates pts file for onshore DEM"
-#dem2pts(onshore_dir_name ,use_cache=True,verbose=True)
-#dem2pts(offshore_dir_name5 ,use_cache=True,verbose=True)
-
-# create onshore pts files
-#print'create Geospatial data1 objects from topographies'
-#G1 = Geospatial_data(file_name = onshore_dir_name + '.pts')
-
-# create coastal and offshore pts files
-#print'create Geospatial data2 objects from topographies'
-#G2 = Geospatial_data(file_name = coast_in_dir_name)
-#print'create Geospatial data3 objects from topographies'
-#G3 = Geospatial_data(file_name = coast_in_dir_name1)
-#print'create Geospatial data4 objects from topographies'
-#G_off = Geospatial_data(file_name = offshore_in_dir_name)
-#print'create Geospatial data5 objects from topographies'
-#G_off1 = Geospatial_data(file_name = offshore_in_dir_name1)
-#print'create Geospatial data6 objects from topographies'
-#G_off2 = Geospatial_data(file_name = offshore_in_dir_name2)
-#print'create Geospatial data7 objects from topographies'
-#G_off3 = Geospatial_data(file_name = offshore_in_dir_name3)
-#print'create Geospatial data8 objects from topographies'
-#G_off4 = Geospatial_data(file_name = offshore_in_dir_name4)
-#print'create Geospatial data9 objects from topographies'
-#G_off5 = Geospatial_data(file_name = offshore_dir_name5 + '.pts')
-
-
 #-------------------------------------------------------------------------------
 # Combine, clip and export dataset 
 #-------------------------------------------------------------------------------
 
-#print'add all geospatial objects'
-#G = G1 + G2 + G3 + G_off + G_off1 + G_off2 + G_off3 + G_off4
-
 print 'Add geospatial objects except', project.offshore_name5
-print geospatial_data.keys()
 G = None
 for key in geospatial_data:
@@ -141 +75 @@
         G += geospatial_data[key]
         
-print 'Clip (outside) combined geospatial object except %s by area of interest.'
+print 'Clip combined geospatial data'
 G_clip = G.clip_outside(project.poly_aoi1)
-
-print 'Clip combined geospatial object by bounding polygon'
 G_all = G_clip + geospatial_data[project.offshore_name5]   # G_off5
 G_clipped = G_all.clip(project.poly_all)
 
 print 'Export combined DEM file'
-#if access(project.topographies_dir,F_OK) == 0:
-#    mkdir (project.topographies_dir)
 G_clipped.export_points_file(project.combined_dir_name + '.pts')
 print 'Do txt version too'

anuga_work/production/busselton/standardised_version/project.py

@@ -7 +7 @@
 
 import os
-from os import sep, environ, getenv, getcwd
-from os.path import expanduser
-import sys
+from os import sep, getenv
 from time import localtime, strftime, gmtime
-from anuga.utilities.polygon import read_polygon, plot_polygons, is_inside_polygon, number_mesh_triangles
+from anuga.utilities.polygon import read_polygon, number_mesh_triangles
 from anuga.utilities.system_tools import get_user_name, get_host_name
-from anuga.shallow_water.data_manager import urs2sts,create_sts_boundary
-from anuga.utilities.polygon import read_polygon, plot_polygons, polygon_area, is_inside_polygon
 
 #------------------------------------------------------------------------------

anuga_work/production/busselton/standardised_version/run_busselton.py

@@ -16 +16 @@
 """
 
-# Note repeated use of domain id
-# Note naming of fundamental datasets and directories
-
-
 #------------------------------------------------------------------------------
 # Import necessary modules
@@ -26 +22 @@
 # Standard modules
 import os
-from os.path import dirname
 import time
 
@@ -50 +45 @@
 #-----------------------------------------------------------------------
 
-#copy script must be before screen_catcher
-#copy_code_files(project.output_run_time_dir, __file__, 
-#         dirname(project.__file__)+os.sep+ project.__name__+'.py' )
-#start_screen_catcher(project.output_run_time_dir, myid, numprocs)
+copy script must be before screen_catcher
+copy_code_files(project.output_run_time_dir, __file__, 
+                os.path.dirname(project.__file__)+os.sep+ project.__name__+'.py' )
+start_screen_catcher(project.output_run_time_dir, myid, numprocs)
 
 
@@ -133 +128 @@
                      'ocean': Bf}) 
 
+
 #-------------------------------------------------------------------------
 # Evolve system through time