Changeset 8845

Timestamp:

Apr 20, 2013, 12:48:13 PM (12 years ago)

Author:

steve

Message:

Small change to plot_util to use both netcdf from scientific python and netcdf4

Location:

trunk/anuga_core/source

Files:

• anuga/compile_all.py (modified) (1 diff)
• anuga/utilities/plot_utils.py (modified) (1 diff)
• anuga_validation_tests/Case_studies/Okushiri/Benchmark_2_input.tms (modified) (previous)

trunk/anuga_core/source/anuga/compile_all.py

@@ -63 +63 @@
 
 #====================================================================
-os.chdir('..')
-os.chdir('utilities')
-try:
-    from anuga.utilities.system_tools  import store_version_info
-    store_version_info()
-    print
-    print "---------------------------------"
-    print 'Storing of version info succeeded'
-    print "---------------------------------"
-    print
-except:
-    print
-    print "----------------------------------------------------------------"
-    print 'Storage of version info failed (just means svn is not available)'
-    print "----------------------------------------------------------------"
-    print
+#os.chdir('..')
+#os.chdir('utilities')
+#try:
+#    from anuga.utilities.system_tools  import store_version_info
+#    store_version_info(verbose=True)
+#    print
+#    print "---------------------------------"
+#    print 'Storing of version info succeeded'
+#    print "---------------------------------"
+#    print
+#except:
+#    print
+#    print "----------------------------------------------------------------"
+#    print 'Storage of version info failed (just means svn is not available)'
+#    print "----------------------------------------------------------------"
+#    print
 
 os.chdir(BUILDROOT)

trunk/anuga_core/source/anuga/utilities/plot_utils.py

@@ -152 +152 @@
 
     # Read variables
-    x=fid.variables['x']
-    x=x.getValue()
-    y=fid.variables['y']
-    y=y.getValue()
-
-    stage=fid.variables['stage']
-    stage=stage.getValue()
-
-    elev=fid.variables['elevation']
-    elev=elev.getValue()
-
-    xmom=fid.variables['xmomentum']
-    xmom=xmom.getValue()
-
-    ymom=fid.variables['ymomentum']
-    ymom=ymom.getValue()
-
-    time=fid.variables['time']
-    time=time.getValue()
-
-    vols=fid.variables['volumes']
-    vols=vols.getValue()
+    x=fid.variables['x'][:]
+    #x=x.getValue()
+    y=fid.variables['y'][:]
+    #y=y.getValue()
+
+    stage=fid.variables['stage'][:]
+    #stage=stage.getValue()
+
+    elev=fid.variables['elevation'][:]
+    #elev=elev.getValue()
+
+    xmom=fid.variables['xmomentum'][:]
+    #xmom=xmom.getValue()
+
+    ymom=fid.variables['ymomentum'][:]
+    #ymom=ymom.getValue()
+
+    time=fid.variables['time'][:]
+    #time=time.getValue()
+
+    vols=fid.variables['volumes'][:]
+    #vols=vols.getValue()