Changeset 477 for trunk/UTIL

Timestamp:

Dec 16, 2011, 10:10:27 AM (13 years ago)

Author:

acolaitis

Message:

PYTHON. Now works with outputs from testphys1d.e.

Location:

trunk/UTIL/PYTHON

Files:

• myplot.py (modified) (1 diff)
• planetoplot.py (modified) (2 diffs)

trunk/UTIL/PYTHON/myplot.py

@@ -1011 +1011 @@
    what_I_plot = array(what_I_plot)
    shape = what_I_plot.shape
-   if indextime is None:
+   if indextime is None and len(time) > 1:
       print "AXIS is time"
       x = time
       count = count+1
-   if indexlon is None:
+   if indexlon is None and len(lon) > 1:
       print "AXIS is lon"
       if count == 0: x = lon
       else: y = lon
       count = count+1
-   if indexlat is None:
+   if indexlat is None and len(lon) > 1:
       print "AXIS is lat"
       if count == 0: x = lat
       else: y = lat
       count = count+1
-   if indexvert is None and dim0 is 4:
+   if indexvert is None and ((dim0 is 4) or (y is None)):
       print "AXIS is vert"
       if vertmode == 0: # vertical axis is as is (GCM grid)

trunk/UTIL/PYTHON/planetoplot.py

@@ -96 +96 @@
     if slon is not None: vlon = slon[0][0]
     if slat is not None: vlat = slat[0][0]
-    if mapmode == 0:       winds=False
-    elif mapmode == 1:     
-        if svert is None:  svert = readslices(str(level)) ; nvert=1
-        if stime is None and mrate is None:
-           stime = readslices(str(0)) ; ntime=1 ## this is a default choice
-           print "WELL... nothing about time axis. I took default: first time reference stored in file."
     if mrate is not None and len(var) > 1: errormess("multivar not allowed in movies. should be fixed soon!")
     zelen = len(namefiles)*len(var)
@@ -128 +122 @@
       typefile = whatkindfile(nc)                                  
       if typefile in ['mesoideal']:   mapmode=0;winds=False
+      elif typefile in ['gcm'] and len(nc.variables["longitude"][:]) is 1 and len(nc.variables["latitude"][:]) is 1:       mapmode=0;winds=False
+      if mapmode == 0:       winds=False
+      elif mapmode == 1:
+          if svert is None:  svert = readslices(str(level)) ; nvert=1
+          if stime is None and mrate is None:
+             stime = readslices(str(0)) ; ntime=1 ## this is a default choice
+             print "WELL... nothing about time axis. I took default: first time reference stored in file."
+
       if firstfile: print "********** MAPMODE: ", mapmode
       if firstfile:                 typefile0 = typefile