Changeset 1104 in lmdz_wrf

Timestamp:

Sep 13, 2016, 9:30:39 AM (9 years ago)

Author:

lfita

Message:

Adding 'tturb' for temporal turbulence (Taylor's decomposition x -<x>)

File:

• trunk/tools/model_graphics.py (modified) (4 diffs)

trunk/tools/model_graphics.py

@@ -962 +962 @@
         tmean: temporal mean values
         tstd: temporal standard deviation values
-        turb: Taylor's turbulence decomposition value
-        tvar: temporal variance values (Taylor's turbulence)
+        tturb: Taylor's turbulence decomposition value (x - <x>) for time
+        tvar: temporal variance values
         xmean: x-axis mean values
         xvar: x-axis variance values
@@ -1235 +1235 @@
             varkeep.append('timestats')
 
-#        elif op == 'turb':
-#            # turbulence values
-#            vals='turbulence|'${CFvarn}
-#            dims='time@time,'${dnz}'@'${vdnz}',lat@lat,lon@lon,pres@pres'
-#            pyins = pyH + "/diagnostics.py -d " + dims + " -v '" +vals + \
-#                "' -f " prevfiles
-#            if dofile:
-#                try:
-#                    with gen.Capturing() as output:
-#                        sout = sub.call('python ' + pyins, shell=True)
-#                except:
-#                    print errmsg
-#                    print pyins
-#                    for s1out in output: print s1out
-#                    quit(-1)
-
-#                if db:
-#                    for s1out in output: print s1out
-
-#                sout = sub.call('mv diagnostics.nc '+fileon, shell=True)
-
-#            # 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'
+        elif op == 'tturb':
+            # temporal turbulent values
+            vals='time|-1,time,turb,' + ':'.join(varnCFs) + ':' + vdnz
+            dims = gen.dictvar_listS(varnCFs,CFdimvardict,',','@') + dnz+'@'+vdnz
+            if dofile:
+                try:
+                    with gen.Capturing() as output:
+                        ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
+                except:
+                    print errmsg
+                    print 'file_oper_alongdims('+vals+',', prevfile, ','+CFvarnp+')'
+                    for s1out in output: print s1out
+                    quit(-1)
+
+                if db:
+                    for s1out in output: print s1out
+
+                sout = sub.call('mv file_oper_alongdims_turb.nc '+fileon, shell=True)
+
+                # Keeping the operations
+                pyins=pyH + "/nc_var.py -o file_oper_alongdims -S '" + vals +        \
+                  "' -f " + prevfile + " -v " + CFvarnp
+                otrackf.write("\n")
+                otrackf.write("# " + CFvarn + " " + Fopers + "\n")
+                otrackf.write(pyins + "\n")
+
+            # removing dimension variable-dimension 'time'
+            varkeep.append('timestats')
 
         elif op == 'tvar':
@@ -2882 +2881 @@
         tmean: temporal mean values
         tstd: temporal standard deviation values
-        turb: Taylor's turbulence decomposition value
-        tvar: temporal variance values (Taylor's turbulence)
+        tturb: Taylor's turbulence decomposition value (x - <x>) for time
+        tvar: temporal variance values
         xmean: x-axis mean values
         xvar: x-axis variance values
@@ -3075 +3074 @@
             varkeep.append('timestats')
 
-#        elif op == 'turb':
-#            # turbulence values
-#            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}`
-
-#            # 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'
+        elif op == 'tturb':
+            # temporal turbulent values
+            vals='time|-1,time,turb,' + ':'.join(varnCFs)
+            dims = gen.dictvar_listS(varnCFs,CFdimvardict,',','@')
+            if dofile:
+                try:
+                    with gen.Capturing() as output:
+                        ncvar.file_oper_alongdims(vals,prevfile,CFvarnp)
+                except:
+                    print errmsg
+                    print 'file_oper_alongdims('+vals+',', prevfile, ','+CFvarnp+')'
+                    for s1out in output: print s1out
+                    quit(-1)
+
+                if db:
+                    for s1out in output: print s1out
+
+                sout = sub.call('mv file_oper_alongdims_turb.nc '+fileon, shell=True)
+
+                # Keeping the operations
+                pyins=pyH + "/nc_var.py -o file_oper_alongdims -S '" + vals +        \
+                  "' -f " + prevfile + " -v " + CFvarnp
+                otrackf.write("\n")
+                otrackf.write("# " + varn + " " + Fopers + "\n")
+                otrackf.write(pyins + "\n")
+
+            varkeep.append('timestats')
 
         elif op == 'tvar':