Changeset 8812

Timestamp:

Apr 5, 2013, 5:26:18 PM (12 years ago)

Author:

steve

Message:

Fixed unit test in test_urs2sww.py to work with netcdf4 on windows

Location:

trunk/anuga_core/source/anuga

Files:

• file/netcdf.py (modified) (1 diff)
• file_conversion/test_urs2sww.py (modified) (3 diffs)

trunk/anuga_core/source/anuga/file/netcdf.py

@@ -42 +42 @@
     """
 
-
-
-    try:
-        from Scientific.IO.NetCDF import NetCDFFile
-        return NetCDFFile(file_name, netcdf_mode)
-    except:
-        from netCDF4 import Dataset
-        if netcdf_mode == 'wl' :
-            return Dataset(file_name, 'w', format='NETCDF3_64BIT')
-        else:
-            return Dataset(file_name, netcdf_mode, format='NETCDF3_64BIT')
+    from netCDF4 import Dataset
+    if netcdf_mode == 'wl' :
+        return Dataset(file_name, 'w', format='NETCDF3_64BIT')
+    else:
+        return Dataset(file_name, netcdf_mode, format='NETCDF3_64BIT')
+
+
+#    try:
+#        from Scientific.IO.NetCDF import NetCDFFile
+#        return NetCDFFile(file_name, netcdf_mode)
+#    except:
+#        from netCDF4 import Dataset
+#        if netcdf_mode == 'wl' :
+#            return Dataset(file_name, 'w', format='NETCDF3_64BIT')
+#        else:
+#            return Dataset(file_name, netcdf_mode, format='NETCDF3_64BIT')
 
 #    from netCDF4 import Dataset

trunk/anuga_core/source/anuga/file_conversion/test_urs2sww.py

@@ -191 +191 @@
                     [-20.5, 115.5],
                     [-20.6, 115.4],
-                    
-                    
                     [-21.5, 114.5],
                     [-21.4, 114.6],
@@ -213 +211 @@
         fid = NetCDFFile(sww_file)
         
-        volumes = fid.variables['volumes']
+        volumes = fid.variables['volumes'][:]
         #print "number_of_volumes",len(volumes)
 
@@ -225 +223 @@
         fid = NetCDFFile(sww_file)
         
-        volumes_again = fid.variables['volumes']
+        volumes_again = fid.variables['volumes'][:]
         #print "number_of_volumes",len(volumes_again) 
         assert num.allclose(len(volumes_again),