Changeset 8864

Timestamp:

May 11, 2013, 10:38:49 AM (12 years ago)

Author:

steve

Message:

Changed anuga.file.netcdf,NetCDFFile so that we get a better error if file not available
to read.

Location:

trunk/anuga_core/source/anuga

Files:

• file/netcdf.py (modified) (1 diff)
• operators/set_elevation_operators.py (modified) (1 diff)

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

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

trunk/anuga_core/source/anuga/operators/set_elevation_operators.py

@@ -215 +215 @@
         node_index = num.zeros((self.domain.number_of_nodes)+1, dtype = num.int)
 
+        # FIXME: SR Don't we calculate this for the domain already!
         k = 0
         node_index[0] = 0