Changeset 1833 in lmdz_wrf

Timestamp:

Mar 20, 2018, 6:37:44 PM (7 years ago)

Author:

lfita

Message:

Fixing calculation of afwa unstable indices

Location:

trunk/tools

Files:

• diag_tools.py (modified) (1 diff)
• diagnostics.py (modified) (3 diffs)
• module_ForDiagnostics.f90 (modified) (2 diffs)

trunk/tools/diag_tools.py

@@ -1097 +1097 @@
 def Forcompute_potevap_orPM(rho1, ust, uas, vas, tas, ps, qv1, dimns, dimvns):
     """ Function to compute potential evapotranspiration following Penman-Monteith 
-      formulation implemented in ORCHIDEE
+      formulation implemented in ORCHIDEE in src_sechiba/enerbil.f90
     Forcompute_potevap_orPM(rho1, uas, vas, tas, ps, qv2, qv1, dimns, dimvns)
       [rho1]= air-density at the first layer (assuming [[t],y,m]) [kgm-3]

trunk/tools/diagnostics.py

@@ -113 +113 @@
     combination = variable_combo(opts.varns,opts.ncfile)
     print '     COMBO: ' + combination
+    quit(-1)
+
+if opts.ncfile is None:
+    print errormsg
+    print '   ' + main + ": No file provided !!"
+    print '     is mandatory to provide a file -f [filename]'
+    quit(-1)
+
+if opts.dimns is None:
+    print errormsg
+    print '   ' + main + ": No description of dimensions are provided !!"
+    print '     is mandatory to provide description of dimensions as -d [dimn]@[vardimname],... '
+    quit(-1)
+
+if opts.varns is None:
+    print errormsg
+    print '   ' + main + ": No variable to diagnose is provided !!"
+    print '     is mandatory to provide a variable to diagnose as -v [diagn]|[varn1]@... '
     quit(-1)
 
@@ -792 +810 @@
         dz = WRFgeop.shape[1]
         # de-staggering
-        var3 = 0.5*(WRFgeop[:,0:dz-1,:,:]+WRFgeop[:,1:dz,:,:])
+        var3 = 0.5*(WRFgeop[:,0:dz-1,:,:]+WRFgeop[:,1:dz,:,:])/9.8
         var4 = ncobj.variables[depvars[4]][0,:,:]
 
@@ -916 +934 @@
 
 # WRFpotevap_orPM potential evapotranspiration following Penman-Monteith formulation
-#   implemented in ORCHIDEE as: WRFdens, UST, U10, V10, T2, PSFC, QVAPOR
+#   implemented in ORCHIDEE (in src_sechiba/enerbil.f90) as: WRFdens, UST, U10, V10, T2, PSFC, QVAPOR
     elif diagn == 'WRFpotevap_orPM':
         var0 = WRFdens[:,0,:,:]

trunk/tools/module_ForDiagnostics.f90

@@ -594 +594 @@
           ofunc = var_cape_afwa1D(d3, ta(i,j,:,it), hur(i,j,:,it), press(i,j,:,it), zg(i,j,:,it),     &
             1, cape(i,j,it), cin(i,j,it), zlfc(i,j,it), plfc(i,j,it), li(i,j,it), parcelmethod)
-          zlfc(i,j,it) = zlfc(i,j,it)/g - hgt(i,j)
+          IF (zlfc(i,j,it) /= -1.) zlfc(i,j,it) = zlfc(i,j,it) - hgt(i,j)
         END DO
       END DO
@@ -797 +797 @@
   SUBROUTINE compute_potevap_orPM3D(d1, d2, d3, rho1, ust, uas, vas, tas, ps, qv1, potevap)
 ! Subroutine to compute potential evapotranspiration Penman-Monteith formulation implemented in 
-!   ORCHIDEE
+!   ORCHIDEE in src_sechiba/enerbil.f90
 
     IMPLICIT NONE