Changeset 962 in lmdz_wrf

Timestamp:

Jun 27, 2016, 12:08:22 PM (8 years ago)

Author:

lfita

Message:

On the correct use of shadcont2Dzsec' and speciffic' when plotting

Location:

trunk/tools

Files:

• model_graphics.bash (modified) (7 diffs)
• model_graphics_template.dat (modified) (5 diffs)

trunk/tools/model_graphics.bash

@@ -575 +575 @@
 #        pinterp: pressure interpolation (to the given $plevels)
 #        tmean: temporal mean values
+#        turb: Taylor's turbulence decomposition value
 #        xmean: x-axis mean values
 #        ymean: y-axis mean values
@@ -731 +732 @@
 
         varkeep=':'${CFvarn}'mean:timestats'
+      ;;
+      # turbulence values
+      'turb')
+        vals='turbulence|'${CFvarn}
+        dims='time@time,'${dnz}'@'${vdnz}',lat@lat,lon@lon,pres@pres'
+
+        pyout=`python ${pyHOME}/diagnostics.py -d ${dims} -v ${vals} -f ${cfiles}`
+        pyn=$?
+        Spyout=`echo ${pyout} | tr '\n' '#' | tr ' ' '!'`
+        ferrmsg ${pyn} ${fname} "python!'diagnostics'!'turbulence'!failed#"${Spyout}
+        mv diagnostics.nc ${filen}
+
+        # Keeping the operations
+        pyins="python "${pyHOME}"/diagnostics.py -d "${dims}" -v '"${vals}
+        pyins=${pyins}"' -f ${cfiles}"
+        echo " " >> ${odir}/all_statsvars.inf
+        echo "# ${CFvarn}" "${vark}" >> ${odir}/all_statsvars.inf
+        echo ${pyins} >> ${odir}/all_statsvars.inf
+
+        varkeep=':'${CFvarn}'turb'
       ;;
       # x-axis mean values
@@ -807 +828 @@
   fname='draw_plot'
 
-  set -x
-
   plot=$1
   odir=$2
@@ -854 +873 @@
           vn=${varn}
         fi
+        if test ${op} = 'turb'; then
+          vn=${vn}'turb'
+        fi          
       else
         oprs=`echo ${kind} | tr '@' ' '`
+        vn=${varn}
         for op in ${oprs}; do
           if $(isInlist ${varmeanname} ${op}); then 
-            vn=${varn}'mean'
-            break
-          else
-            vn=${varn}
+            vn=${vn}'mean'
           fi
+          if test ${op} = 'turb'; then
+            vn=${vn}'turb'
+          fi          
         done
       fi
@@ -897 +920 @@
       figname=${figname}'_'${vn}'-'$(echo ${kind} | tr '@' '-')
 
-      # Getting plot variable configuration
+      # Getting plot variable configuration (using variable name inside the file?)
       specific=false
-      if $(isInlist ${specificvarplot} ${varn}); then
-        vals=`listfilter ${specificvarplot} ${varn}`
-        kvals=`listfilter ${specificvarplot} ${kind}`
+#      if $(isInlist ${specificvarplot} ${varn}); then
+      if test $(index_string ${specificvarplot} ${vn}) -ne -1; then
+        vals=`list_filter ${specificvarplot} ${vn}`
+        kvals=`list_filter ${specificvarplot} ${kind}`
         Lkvals=`expr length ${kvals}'0'`
         if test ${Lkvals} -gt 1; then
-          fkvals=`listfilter ${kvals} ${kplot}`
+          fkvals=`list_filter ${kvals} ${kplot}`
           Lfkvals=`expr length ${fkvals}'0'`
           if test ${Lfkvals} -gt 1; then
@@ -1438 +1462 @@
             echo "  "${main}": differences will be calculated when all the "         \
               "model/experiments will be done !"
-          elif test ${vark} = 'diff'; then
+          elif test ${vark} = 'combo'; then
             echo "  "${main}": combos will be calculated later when all the "        \
               "variables will be done !"
@@ -1466 +1490 @@
         diagv=`echo ${cvar} | tr '|' ' ' | awk '{print $5}'`
 
+#        if $(index_string ${vark} 'pinterp') -ne -1; then
+#          fhead=${fileh}'p'
+#        else
+#          fhead=${fileh}
+#        fi
         combs=`echo ${vco} | tr ';' ' ' | awk '{print $2}' | tr '@' ' '`
         ifile=${CFv}_${fhead}
         for comb in ${combs}; do
-          combcvar=${CFv}'|'${comb}'|'${fileh}'|'${modv}'|'${diagv}
+          combcvar=${CFv}'|'${comb}'|'${fhead}'|'${modv}'|'${diagv}
           compute_statistics ${iwdir} ${ifile}.nc ${owdir} ${combcvar} ${moddims}    \
             ${modvdims} ${filescratch} ${ifile}.nc
           ifile=${ifile}_${comb}
+
+          # Adding 'surnames' to the variable's name
+          if test ${comb} = 'turb'; then
+            CFv=${CFv}'turb'
+          fi
+          if $(isInlist ${varmeanname} ${comb}); then
+            CFv=${CFv}'mean'
+          fi
+
           isc=`expr ${isc} + 1`
         # End of combo 

trunk/tools/model_graphics_template.dat

@@ -28 +28 @@
 
 # Have new files been added and do they need to be processed?
-addfiles = false
+addfiles = true
 
 # Have new figures been added and do they need to be drawn?
@@ -72 +72 @@
 #   pinterp: pressure interpolation (to the given $plevels, see below)
 #   tmean: temporal mean values
+#   turb: Taylor's turbulence decomposition value
 #   xmean: x-axis mean values
 #   ymean: y-axis mean values
@@ -85 +86 @@
 varxmean = ta:ua:va:hur:hurs:tas:wss:ps
 vardiff = ualmean:valmean:talmean:huslmean:uas:vas:ps:pr
-varpinterp = ta:ua:va:hur
-varcombo = ta;pinterp@last@xmean:ua;pinterp@last@xmean:va;pinterp@last@xmean:hur;pinterp@last@xmean
+varpinterp = ta:ua:va:hur:ws:hus
+varcombo = ta;pinterp@last@xmean:ua;pinterp@last@xmean:va;pinterp@last@xmean:hur;pinterp@last@xmean:ws;pinterp@turb@xmean:hus;pinterp@turb@xmean
 
 # Operations which attach 'mean' at the end of the variable name
@@ -113 +114 @@
 pltshadcont2Dsfc = huss|tmean#tas|tmean:vas|tmean#uas|tmean:ps|tmean#wss|tmean:pr|tmean#rsds|tmean:prw|tmean#clt|tmean:hfls|tmean#hfss|tmean:evspsbl|tmean#bils|tmean:zmaxth|tmean#stherm|tmean:wakeh|tmean#wakes|tmean:zmaxth|tmean#stherm|tmean:prls|tmean#prc|tmean:clt|tmean#cll|tmean:clm|tmean#clh|tmean:hurs|tmean#zmla|tmean:huss|last#tas|last:vas|last#uas|last:ps|last#wss|tmean:pr|last#rsds|last:prw|last#clt|last:hfls|last#hfss|last:evspsbl|last#bils|last:zmaxth|last#stherm|last:wakeh|last#wakes|last:zmaxth|last#stherm|last:prls|last#prc|last:clt|last#cll|last:clm|last#clh|last:hurs|last#zmla|last
 pltshadconthovmsfc = hurs|xmean#tas|xmean:wss|xmean#ps|xmean
-pltshadcont2Dzsec=ua|pinterp@last@xmean#va|pinterp@last@xmean:hur|pinterp@last@xmean#ta|pinterp@last@xmean
+pltshadcont2Dzsec=ua|pinterp@last@xmean#va|pinterp@last@xmean:hur|pinterp@last@xmean#ta|pinterp@last@xmean:ws|pinterp@turb@xmean#hus|pinterp@turb@xmean
 
 pltdiffmap2Dz = uapxmean:vapxmean:tapxmean:huspxmean
@@ -128 +129 @@
 #        [cntformat]: format of the contour labels
 #        [colorcnt]: color for the countor lines
-specificvarplot = cll|last|shadcount2Dsfc|0.|1.|gist_gray|black:clh|last|shadcount2Dsfc|0.|1.|gist_gray|black
+specificvarplot = cll|last|shadcont2Dsfc|0.|1.|gist_gray|%g|black:clh|last|shadcont2Dsfc|0.|1.|gist_gray|%g|black:husturbmean|pinterp@turb@xmean|shadcont2Dzsec|0.|1.e-6|Blues|%g|black
 
 # Figures output kind