Changeset 8812 for trunk/anuga_core/source/anuga/file

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

File:

• trunk/anuga_core/source/anuga/file/netcdf.py (modified) (1 diff)

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