Changeset 6432

Timestamp:

Mar 2, 2009, 11:59:23 AM (16 years ago)

Author:

rwilson

Message:

Added sanity checks for landward_boundary_filename and urs_order_filename parameters.

Location:

anuga_work/production/busselton/standardised_version

Files:

• project.py (modified) (3 diffs)
• setup_model.py (modified) (1 diff)

anuga_work/production/busselton/standardised_version/project.py

@@ -78 +78 @@
 ##    add_csv_header(join(topographies_folder, f), headerlist)
 
-    # BOUNDING POLYGON - for data clipping and estimate of triangles in mesh
+# BOUNDING POLYGON - for data clipping and estimate of triangles in mesh
 # Used in build_elevation.py
 # Format for points easting,northing (no header)
@@ -219 +219 @@
 
 # The pathname for the urs order points, used within build_urs_boundary.py
-urs_order = join(boundaries_folder, urs_order_filename)
+if urs_order_filename:
+    urs_order = join(boundaries_folder, urs_order_filename)
 
 # The absolute pathname for the landward points of the bounding polygon,
 # Used within run_model.py)
-landward_boundary = join(boundaries_folder, landward_boundary_filename)
+if landward_boundary_filename:
+    landward_boundary = join(boundaries_folder, landward_boundary_filename)
 
 # The absolute pathname for the .sts file, generated in build_boundary.py
@@ -238 +240 @@
 # The absolute pathname for the gauges file
 # Used for get_timeseries.py
-gauges = join(gauges_folder, gauges_filename)       
+if gauges_filename:
+    gauges = join(gauges_folder, gauges_filename)       
 
 # The absolute pathname for the building file
 # Used for run_building_inundation.py
-building_exposure = join(gauges_folder, building_exposure_filename)
+if building_exposure_filename:
+    building_exposure = join(gauges_folder, building_exposure_filename)
 
 # full path to where MUX files (or meta-files) live

anuga_work/production/busselton/standardised_version/setup_model.py

@@ -29 +29 @@
 if os.getenv(project.ENV_MUXHOME) is None:
     print "Environment variable '%s' is not set" % project.ENV_MUXHOME
+    sanity_error = True
+
+#-------------------------------------------------------------------------------
+# Check filename strings that MUST be set
+#-------------------------------------------------------------------------------
+
+if not urs_order_filename:
+    print ("Sorry, thinned ordering file parameter 'urs_order_filename' "
+           "isn't set")
+    sanity_error = True
+
+if not landward_boundary_filename:
+    print ("Sorry, landward bounding points parameter "
+           "'landward_boundary_filename' isn't set")
     sanity_error = True