Changeset 464

Timestamp:

Dec 9, 2011, 4:22:21 PM (13 years ago)

Author:

acolaitis

Message:

Changed name of the gcm utilities wrapper to gcm_transformations.py. Added hrecast to it, though there are no options yet in pp.py. hrecast will be used in mcs.py and in a future tes.py. It can be implemented in pp.py easily. Added --latreverse option to mcs.py to output files with a south_north latitude axis, as in the data.

Location:

trunk/UTIL/PYTHON

Files:

• gcm_transformations.py (added)
• mcs.py (modified) (5 diffs)
• myplot.py (modified) (1 diff)
• planetoplot.py (modified) (3 diffs)
• pp.py (modified) (3 diffs)
• zrecast_wrapper.py (deleted)

trunk/UTIL/PYTHON/mcs.py

@@ -22 +22 @@
    from myplot import getfield,separatenames
    from make_netcdf import make_gcm_netcdf
-   from zrecast_wrapper import call_zrecast
+   from gcm_transformations import call_zrecast,call_hrecast
    parser = OptionParser() 
 
@@ -34 +34 @@
    parser.add_option('--override', action='store_true', dest='override', default=False, help='Force zrecast.e to act even if recasted file is already present(will erase previous recasted file) [False]')
    parser.add_option('--ditch', action='store_true', dest='ditch', default=False, help='Ditch recasted file when interpolation is performed. [False]')
+   parser.add_option('--latreverse', action='store_true', dest='latreverse', default=False, help='Reverse the latitude axis in output diagfi. [False]')
+
    #############################
    ### Get options and variables
@@ -86 +88 @@
             print "Error: could not find controle variable in diagfi."
             day_ini=input("Please type initial sol number:")%669
+      else:
+         print "Error: could not find controle variable in diagfi."
+         day_ini=input("Please type initial sol number:")%669
    time[:]=time[:]+day_ini
    nx=len(lon)
@@ -281 +286 @@
    varnightout.set_fill_value([np.NaN])
 
+   if opt.latreverse:
+       vardayout[:,:,:,:,:]=vardayout[:,:,:,::-1,:]
+       varnightout[:,:,:,:,:]=varnightout[:,:,:,::-1,:]
+
    all=[aps,bps]
    for vv in np.arange(nzvar):
@@ -293 +302 @@
       all=all[2:]
       fullnames=fullnames[2:] 
+
+   if opt.latreverse:
+      lat=lat[::-1]
 
    make_gcm_netcdf (zfilename="diagfi_MCS.nc", \

trunk/UTIL/PYTHON/myplot.py

@@ -65 +65 @@
        out.set_fill_value([np.NaN])
     else:
-       out=field
+    # missing values from zrecast or hrecast are -1e-33
+       masked=np.ma.masked_where(field < -1e-30,field)
+       masked.set_fill_value([np.NaN])
+       mask = np.ma.getmask(masked)
+       if (True in mask):out=masked
+       else:out=field
     return out
 

trunk/UTIL/PYTHON/planetoplot.py

@@ -163 +163 @@
                vertdim='BOTTOM-TOP_PATCH_END_UNSTAG'
                dumped_vert_stag=True
+          else: dumped_vert_stag=False
           if varname in ['V']:  latdim='SOUTH-NORTH_PATCH_END_STAG'
           else:                 latdim='SOUTH-NORTH_PATCH_END_UNSTAG'
@@ -246 +247 @@
              numplot = numplot + 1 ; all_time[k] = all_time[k-1] ; all_namefile[k] = all_namefile[k-1]
              all_varname[k] = all_varname[k-2] + insert + all_varname[k-1] 
-
     ##################################
     ### Open a figure and set subplots
@@ -354 +354 @@
                             x, y = m(lon2d, lat2d)                                         ## this is dirty, defined above but out of imov loop
                     if typefile in ['mesoapi','meso'] and mapmode == 1:   what_I_plot_frame = dumpbdy(what_I_plot_frame,6,condition=True)
-                    if typefile in ['mesoideal']:    what_I_plot_frame = dumpbdy(what_I_plot_frame,0,stag='W',condition=dumped_vert_stag)
+#                   if typefile in ['mesoideal']:    what_I_plot_frame = dumpbdy(what_I_plot_frame,0,stag='W',condition=dumped_vert_stag)
 
                     if imov >= 0:

trunk/UTIL/PYTHON/pp.py

@@ -10 +10 @@
     from optparse import OptionParser    ### to be replaced by argparse
     from api_wrapper import api_onelevel
-    from zrecast_wrapper import call_zrecast
+    from gcm_transformations import call_zrecast
     from netCDF4 import Dataset
     from myplot import getlschar, separatenames, readslices, adjust_length, whatkindfile, errormess
@@ -111 +111 @@
                     input_name=zefiles,\
                     fields=zevars,\
-                    predifined=opt.intas)
+                    predefined=opt.intas)
 
             zefiles=interpolated_files
@@ -119 +119 @@
                     input_name=[opt.fref],\
                     fields=zevars,\
-                    predifined=opt.intas)
+                    predefined=opt.intas)
 
                reffile=interpolated_ref[0]