Changeset 975

Timestamp:

Mar 1, 2005, 9:50:18 AM (20 years ago)

Author:

duncan

Message:

trying to make having scientificPython optional

Location:

inundation/ga/storm_surge/pmesh/load_mesh

Files:

• loadASCII.py (modified) (4 diffs)
• test_loadASCII.py (modified) (2 diffs)

inundation/ga/storm_surge/pmesh/load_mesh/loadASCII.py

@@ -57 +57 @@
 from os.path import splitext
 
-from Scientific.IO.NetCDF import NetCDFFile
-    
+    
+
 import exceptions
 class TitleAmountError(exceptions.Exception): pass
@@ -576 +576 @@
     WARNING: This function mangles the mesh_dict data structure
     """
-    
+  
+    from Scientific.IO.NetCDF import NetCDFFile  
     
     point_atts2array(point_atts)
@@ -717 +718 @@
     """
 
+    from Scientific.IO.NetCDF import NetCDFFile
+
     fid = NetCDFFile(filename, 'r') 
 
@@ -745 +748 @@
     """
     
+    from Scientific.IO.NetCDF import NetCDFFile
+
     point_atts2array(point_atts)
     # NetCDF file definition

inundation/ga/storm_surge/pmesh/load_mesh/test_loadASCII.py

@@ -19 +19 @@
 from os.path import splitext
 
-from Scientific.IO.NetCDF import NetCDFFile
 from Numeric import array #Float, arrayrange, concatenate
     
@@ -145 +144 @@
 
     def test_loadpts(self):
+        
+        from Scientific.IO.NetCDF import NetCDFFile
+
         fileName = tempfile.mktemp(".pts")
         # NetCDF file definition