Changeset 1761 in lmdz_wrf

Timestamp:

Jan 19, 2018, 11:30:34 AM (7 years ago)

Author:

lfita

Message:

Final working version of cape from AFWA

Location:

trunk/tools

Files:

• diagnostics.py (modified) (2 diffs)
• module_ForDiagnostics.f90 (modified) (5 diffs)

trunk/tools/diagnostics.py

@@ -66 +66 @@
 parser.add_option("-f", "--netCDF_file", dest="ncfile", help="file to use", metavar="FILE")
 parser.add_option("-d", "--dimensions", dest="dimns",  
-  help="[dimtn]@[dtvn],[dimzn]@[dzvn],[...,[dimxn]@[dxvn]], ',' list with the couples [dimDn]@[dDvn], [dimDn], name of the dimension D and name of the variable [dDvn] with the values of the dimension ('WRFtime', for WRF time copmutation)" + comboinf, 
+  help="[dimtn]@[dtvn],[dimzn]@[dzvn],[...,[dimxn]@[dxvn]], ',' list with the couples [dimDn]@[dDvn], [dimDn], name of the dimension D and name of the variable [dDvn] with the values of the dimension ('WRFtime', for WRF time copmutation). NOTE: same order as in file!!!!" + comboinf, 
   metavar="LABELS")
 parser.add_option("-v", "--variables", dest="varns", 
@@ -698 +698 @@
         dz = WRFgeop.shape[1]
         # de-staggering
-        var3 = 0.5*(WRFgeop[:,0:dz-1,:,:]+WRFgeop[:,1:dz,:,:])*9.81
+        var3 = 0.5*(WRFgeop[:,0:dz-1,:,:]+WRFgeop[:,1:dz,:,:])
         var4 = ncobj.variables[depvars[4]][0,:,:]
 

trunk/tools/module_ForDiagnostics.f90

@@ -862 +862 @@
   END FUNCTION TLCL
 
-  FUNCTION var_cape_afwa1D(nz, tk, rhv, p, hgtv, sfc, cape, cin, zlfc, plfc, lidx, parcel) RESULT (ostat)
+  FUNCTION var_cape_afwa1D(nz, tk, rhv, p, hgt, sfc, cape, cin, zlfc, plfc, lidx, parcel) RESULT (ostat)
 ! Function to compute cape on a 1D column following implementation in phys/module_diag_afwa.F
 
@@ -868 +868 @@
 
     INTEGER, INTENT(in)                                  :: nz, sfc
-    REAL(r_k), DIMENSION(nz), INTENT(in)                 :: tk, rhv, p, hgtv
+    REAL(r_k), DIMENSION(nz), INTENT(in)                 :: tk, rhv, p, hgt
     REAL(r_k), INTENT(out)                               :: cape, cin, zlfc, plfc, lidx
     INTEGER                                              :: ostat
@@ -876 +876 @@
     !~ Derived profile variables
     !  -------------------------
-    REAL(r_k), DIMENSION(nz)                             :: rh, hgt, ws, w, dTvK, buoy
+    REAL(r_k), DIMENSION(nz)                             :: rh, ws, w, dTvK, buoy
     REAL(r_k)                                            :: tlclK, plcl, nbuoy, pbuoy
   
@@ -915 +915 @@
 ! rh: Relative Humidity profile [%]
 ! p: Pressure profile [Pa]
-! hgtv: Height profile [m]
-! hgt: Height profile [gpm]
+! hgt: Geopotential height profile [gpm]
 ! cape: CAPE [Jkg-1]
 ! cin: CIN [Jkg-1]
@@ -982 +981 @@
     !  --------------------
     rh = rhv*100.
-    hgt = hgtv*g
     ostat = 0
     CAPE = zeroRK