Changeset 5420 for anuga_core/source/anuga/shallow_water/data_manager.py

Timestamp:

Jun 24, 2008, 12:38:54 PM (15 years ago)

Author:

jakeman

Message:

added test ic create_sts boundary to make sure that there are at least two points in file being read

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -5081 +5081 @@
     outfile.close()
 
-def create_sts_boundary(order_file,stsname):
+def create_sts_boundary(order_file,stsname,lat_long=True):
     """
         Create boundary segments from .sts file. Points can be stored in
@@ -5107 +5107 @@
         raise Exception, msg
 
+    if len(lines)<2:
+        msg = 'File must contain at least two points'
+        raise Exception, msg
+
     try:
         fid = NetCDFFile(stsname+'.sts', 'r')
@@ -5132 +5136 @@
         fields = line.split(',')
         index=int(fields[0])
-        zone,easting,northing=redfearn(float(fields[1]),float(fields[2]))
-        if not zone == fid.zone[0]:
-            msg = 'Inconsitent zones'
-            raise Exception, msg
+        if lat_long:
+            zone,easting,northing=redfearn(float(fields[1]),float(fields[2]))
+            if not zone == fid.zone[0]:
+                msg = 'Inconsitent zones'
+                raise Exception, msg
+        else:
+            easting = float(fields[1])
+            northing = float(fields[2])
         if not allclose(array([easting,northing]),sts_points[index]):
             msg = "Points in sts file do not match those in the"+\