Changeset 9331

Timestamp:

Sep 11, 2014, 9:35:24 AM (11 years ago)

Author:

davies

Message:

Template scripts fix for proj4string

Location:

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami1/scripts

Files:

• project.py (modified) (1 diff)
• run_model.py (modified) (2 diffs)

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami1/scripts/project.py

@@ -232 +232 @@
     # projection_information describes a UTM zone
     # e.g. '+units=m +ellps=WGS84 +zone=47 +south=False +proj=utm '
-    proj4string="+proj=utm +zone="+str(abs(projection_information))+" +south="+str(projection_information<0)+" + ellps=WGS84 +units=m +no_defs"
+    if(projection_information<0):
+        proj4string="+proj=utm +zone="+str(abs(projection_information))+" +south +datum=WGS84 +units=m +no_defs"
+    else:
+        proj4string="+proj=utm +zone="+str(projection_information)+" +datum=WGS84 +units=m +no_defs"
+
 else:
     msg = 'Invalid projection information --  must be a proj4string, or an integer'+\

trunk/anuga_work/development/gareth/template_scenarios/tsunami/tsunami1/scripts/run_model.py

@@ -108 +108 @@
 
     # Local function to print the velocity statistics
-    # user_functions.print_velocity_statistics(domain,maxQuantities)
+    # user_functions.print_velocity_statistics(domain,MaxQuantities)
 
 barrier()
@@ -120 +120 @@
 # Write max quantities to a file
 max_quantity_file_start=domain.get_datadir()+'/Max_quantities_'
-maxQuantities.export_max_quantities_to_csv(max_quantity_file_start)
+MaxQuantities.export_max_quantities_to_csv(max_quantity_file_start)
 
 # Merge the parallel SWW files together