Changeset 7158

Timestamp:

Jun 9, 2009, 11:19:13 AM (16 years ago)

Author:

kristy

Message:

adding initial conditions read csv2polygon or list

File:

• anuga_work/production/hobart_2009/setup_model.py (modified) (1 diff)

anuga_work/production/hobart_2009/setup_model.py

@@ -147 +147 @@
 # Create list of land polygons with initial conditions
 project.land_initial_conditions = []
-for filename, MSL in project.land_initial_conditions_filename:
-    polygon = read_polygon(join(project.polygons_folder, filename))
-    project.land_initial_conditions.append([polygon, MSL])
-
+# if it's a list, then it's a list of land condition filenames
+# else it's a string - a single file, multiple land conditions
+if isinstance(project.land_initial_conditions_filename, list):
+    for filename, MSL in project.land_initial_conditions_filename:
+        polygon = read_polygon(join(project.polygons_folder, filename))
+        project.land_initial_conditions.append([polygon, MSL])
+elif isinstance(project.land_initial_conditions_filename, basestring):
+    polygons, MSL = csv2polygons(join(project.polygons_folder,
+                                      project.land_initial_conditions_filename))
+    for i, key in enumerate(polygons):
+        if i%100==0: print i
+        poly = polygons[key]
+        land = float(MSL[key])
+        project.land_initial_conditions.append([poly, land])
+else:
+    msg = ('project.land_initial_conditions_filename must be a list or '
+           'string, got %s'
+           % type(project.land_initial_conditions_filename))
+    raise Exception, msg
 # Create list of interior polygons with scaling factor
 project.interior_regions = []