Changeset 361

Timestamp:

Nov 8, 2011, 5:01:15 PM (13 years ago)

Author:

acolaitis

Message:

PYTHON.

Added zrecast capabilites for gcm.py. Interp modes AGL and P are working. Adding more is not difficult.
One should make sure that his zrecast.e is up to date and in his $PATH.

Note: we could also use f2py to compile a python module... However, most people do have zrecast in their path.

Note2: When using inter-file comparisons, such as field differences, one should make sure to use zrecast (or -i with gcm.py) to
make sure that operations are done at the same altitudes ! (levels in different simulations a priori do not represent same altitudes)

Note3: zrecast has been modified in previous commit to work with teta instead of temp, if needed.

Location:

trunk/UTIL/PYTHON

Files:

• gcm.py (modified) (7 diffs)
• planetoplot.py (modified) (2 diffs)
• zrecast_wrapper.py (added)

trunk/UTIL/PYTHON/gcm.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
-### T. Navarro + A. Spiga
+### T. Navarro + A. Spiga + A. Colaitis
 
 ###########################################################################################
@@ -10 +10 @@
     from optparse import OptionParser    ### to be replaced by argparse
     from api_wrapper import api_onelevel
+    from zrecast_wrapper import call_zrecast
     from netCDF4 import Dataset
     from myplot import getlschar, separatenames, readslices, adjust_length
     from os import system
     from planetoplot import planetoplot
+    
     import numpy as np
 
@@ -71 +73 @@
     print "Options:", opt
 
-    #listvar = '' 
-    #if opt.var is None:
-    #    zerange = [-999999]
-    #else:
-    #    zelen = len(opt.var)
-    #    zerange = range(zelen)
-    #    #if zelen == 1: listvar = opt.var[0] + ','
-    #    #else         : 
-    #    for jjj in zerange: listvar += opt.var[jjj] + ','
-    #    listvar = listvar[0:len(listvar)-1]
-    #    vmintab = adjust_length (opt.vmin, zelen)  
-    #    vmaxtab = adjust_length (opt.vmax, zelen)
+#    listvar = ''
+#    if opt.var is None:
+#        zerange = [-999999]
+#    else:
+#        zelen = len(opt.var)
+#        zerange = range(zelen)
+#        #if zelen == 1: listvar = opt.var[0] + ','
+#        #else         :
+#        for jjj in zerange: listvar += opt.var[jjj] + ','
+#        listvar = listvar[0:len(listvar)-1]
+#        vmintab = adjust_length (opt.vmin, zelen)
+#        vmaxtab = adjust_length (opt.vmax, zelen)
 
 
@@ -97 +99 @@
           exit()
 
+    if opt.fref is not None:
+       if opt.operation is not None:
+          if opt.interp is not None:
+             interpref=True
+
     ################################
 
@@ -125 +132 @@
         
         zevar = separatenames(opt.var[j])
+        zevars = zevar[j]
         zevar = zevar[0]
         print "var, zevar", opt.var, zevar
@@ -149 +157 @@
         #####################################################
         ### Call Fortran routines for vertical interpolations  -->  zrecast for GCM ?       
+#        if opt.interp is not None:
+#            if zelevel == 0. and opt.interp == 4:  zelevel = 0.010
+#            ### winds or no winds
+#            if opt.winds            :  zefields = 'uvmet'
+#            else                    :  zefields = ''
+#            ### var or no var
+#            #if opt.var is None      :  pass
+#            if zefields == ''       :  zefields = listvar 
+#            else                    :  zefields = zefields + "," + listvar 
+#            if opt.var2 is not None : zefields = zefields + "," + opt.var2  
+#            print zefields
+#            zefile = api_onelevel (  path_to_input   = '', \
+#                                     input_name      = zefile, \
+#                                     fields          = zefields, \
+#                                     interp_method   = opt.interp, \
+#                                     interp_level    = ze_interp_levels, \
+#                                     onelevel        = zelevel, \
+#                                     nocall          = opt.nocall )
+#            print zefile
+#            zelevel = 0 ## so that zelevel could play again the role of nvert
+
+# A.C.  #####################################################
+        ### Call Fortran routines for vertical interpolations  -->  zrecast
+
         if opt.interp is not None:
-            if zelevel == 0. and opt.interp == 4:  zelevel = 0.010
-            ### winds or no winds
-            if opt.winds            :  zefields = 'uvmet'
-            else                    :  zefields = ''
-            ### var or no var
-            #if opt.var is None      :  pass
-            if zefields == ''       :  zefields = listvar 
-            else                    :  zefields = zefields + "," + listvar 
-            if opt.var2 is not None : zefields = zefields + "," + opt.var2  
-            print zefields
-            zefile = api_onelevel (  path_to_input   = '', \
-                                     input_name      = zefile, \
-                                     fields          = zefields, \
-                                     interp_method   = opt.interp, \
-                                     interp_level    = ze_interp_levels, \
-                                     onelevel        = zelevel, \
-                                     nocall          = opt.nocall )
-            print zefile
-            zelevel = 0 ## so that zelevel could play again the role of nvert
-
+           interpolated_files=""
+           interpolated_files=call_zrecast(interp_mode=opt.interp,\
+                    input_name=zenamefiles,\
+                    fields=zevars)
+
+           zenamefiles=interpolated_files
+        if interpref:
+           interpolated_ref=""
+           interpolated_ref=call_zrecast(interp_mode=opt.interp,\
+                    input_name=[opt.fref],\
+                    fields=zevars)
+
+           reffile=interpolated_ref[0]
+        else:
+           reffile=opt.fref
 
         #############
@@ -183 +210 @@
                 slon=zeslon,slat=zeslat,svert=zesvert,stime=zestime,\
                 outputname=opt.output,resolution=opt.res,\
-                ope=opt.operation,fileref=opt.fref,minop=opt.vminope,maxop=opt.vmaxope,titleref=opt.titref)
+                ope=opt.operation,fileref=reffile,minop=opt.vminope,maxop=opt.vmaxope,titleref=opt.titref)
         print 'Done: '+name
         system("rm -f to_be_erased")

trunk/UTIL/PYTHON/planetoplot.py

@@ -5 +5 @@
 ### A. Spiga     -- LMD -- 06~09/2011 -- General building and mapping capabilities
 ### T. Navarro   -- LMD -- 10~11/2011 -- Improved use for GCM and added sections + 1Dplot capabilities 
-### A. Colaitis  -- LMD --            -- Mostly minor improvements and inter-plot operation capabilities
+### A. Colaitis  -- LMD --            -- Mostly minor improvements and inter-plot operation capabilities + zrecast interpolation for gcm
 
 def planetoplot (namefiles,\
@@ -83 +83 @@
     firstfile = True
     for namefile in namefiles:
-    
+      print namefile 
       ######################
       ### Load NETCDF object