Changeset 8784

Timestamp:

Mar 28, 2013, 1:23:19 PM (12 years ago)

Author:

steve

Message:

Changing to netcdf.py to run scientific python netcdf in preference to netcdf4

Location:

trunk

Files:

• anuga_core/source/anuga/file/netcdf.py (modified) (1 diff)
• anuga_core/source/anuga_parallel/pymetis/test_metis.py (modified) (3 diffs)
• anuga_work/development/carrier_greenspan/produce_results.py (modified) (1 diff)

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

@@ -42 +42 @@
     """
 
-    from Scientific.IO.NetCDF import NetCDFFile
-    return NetCDFFile(file_name, netcdf_mode)
-
-    #from netCDF4 import Dataset
-    #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
+        return Dataset(file_name, netcdf_mode, format='NETCDF3_64BIT')
+
 
     #return Dataset(file_name, netcdf_mode, format='NETCDF3_CLASSIC')

trunk/anuga_core/source/anuga_parallel/pymetis/test_metis.py

@@ -36 +36 @@
                                                     1,\
                                                     3,)
-        print edgecut
-        print epart
-        print npart
+        #print edgecut
+        #print epart
+        #print npart
         epart_expected = array([2, 2, 0, 0, 0, 0], 'i')
         npart_expected = array([0, 2, 2, 2, 0, 0, 0], 'i')
@@ -67 +67 @@
                                                     1,\
                                                     2,)
-        print edgecut
-        print epart
-        print npart
+        #print edgecut
+        #print epart
+        #print npart
         epart_expected = array([1, 0, 0, 0, 1, 1], 'i')
         npart_expected = array([0, 1, 1, 0, 0, 0, 1], 'i')
@@ -103 +103 @@
                                                     1,\
                                                     3,)
-        print edgecut
-        print epart
-        print npart
+        #print edgecut
+        #print epart
+        #print npart
         epart_expected = array([0, 0, 0, 1, 2, 2, 2, 2, 1, 1], 'i')
         npart_expected = array([0, 2, 0, 2, 1, 1, 2, 2, 0, 1], 'i')

trunk/anuga_work/development/carrier_greenspan/produce_results.py

@@ -2 +2 @@
 # import modules
 #--------------------------------
-from fabricate import *
+from anuga_validation_tests.fabricate import **
 from validation_tests.utilities import run_validation_script