Changeset 1201 for inundation/ga/storm_surge/pyvolution/data_manager.py

Timestamp:

Apr 6, 2005, 4:32:58 PM (20 years ago)

Author:

prow

Message:

fixed smoothed sww2domain

File:

• inundation/ga/storm_surge/pyvolution/data_manager.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/data_manager.py

@@ -1892 +1892 @@
         geo_reference = None
         
-    if verbose: print '    interpolating quantities'
+    if verbose: print '    getting quantities'
     for quantity in fid.variables.keys():
         dimensions = fid.variables[quantity].dimensions
@@ -1919 +1919 @@
     volumes=volumes.tolist()
     #FIXME:should this be in mesh?(peter row)
-    unique,coordinates,volumes,boundary=weed(coordinates,volumes,boundary)
+    if fid.smoothing == 'Yes': unique = False
+    else: unique = True
+    if unique:
+        coordinates,volumes,boundary=weed(coordinates,volumes,boundary)
+
 
     domain = Domain(coordinates, volumes, boundary)
@@ -1937 +1941 @@
             pass #quantity has no missing_value number
         X = fid.variables[quantity][:]
-        if verbose:
+        if very_verbose:
             print '       ',quantity
             print '        NaN =',NaN
@@ -1962 +1966 @@
             pass #quantity has no missing_value number
         X = interpolated_quantities[quantity]
-        if verbose:
+        if very_verbose:
             print '       ',quantity
             print '        NaN =',NaN
@@ -2077 +2081 @@
         boundary = new_boundary               
 
-    return unique,coordinates,volumes,boundary
+    return coordinates,volumes,boundary