Changeset 2095 in lmdz_wrf

Timestamp:

Aug 24, 2018, 10:09:56 PM (7 years ago)

Author:

lfita

Message:

Adding 'RAINSH' into RAINTOT and ACRAINTOT

Location:

trunk/tools

Files:

• diagnostics.inf (modified) (1 diff)
• diagnostics.py (modified) (4 diffs)

trunk/tools/diagnostics.inf

@@ -24 +24 @@
 p, WRFp, P@PB
 evspsblpot, WRFpotevap_orPM, WRFdens@UST@U10@V10@T2@PSFC@QVAPOR
-pr, RAINTOT, RAINC@RAINNC@WRFtime
-pracc, ACRAINTOT, RAINC@RAINNC@WRFtime
+pr, RAINTOT, RAINC@RAINNC@RAINSH@WRFtime
+pracc, ACRAINTOT, RAINC@RAINNC@RAINSH@WRFtime
 prc, WRFprc, deaccum@RAINC@XTIME@prc
 prls, WRFprls, deaccum@RAINNC@XTIME@prls

trunk/tools/diagnostics.py

@@ -13 +13 @@
 #      ciclad: f2py --f90flags="-fPIC" --f90exec=/usr/bin/gfortran -L/opt/canopy-1.3.0/Canopy_64bit/System/lib/ -L/usr/lib64/ -L/opt/canopy-1.3.0/Canopy_64bit/System/lib/ -m module_ForDiagnostics -c module_generic.F90 module_ForDiagnosticsVars.F90 module_ForDiagnostics.F90 >& run_f2py.log
 
-## e.g. # diagnostics.py -d 'Time@WRFtime,bottom_top@ZNU,south_north@XLAT,west_east@XLONG' -v 'clt|CLDFRA,cllmh|CLDFRA@WRFp,RAINTOT|RAINC@RAINNC@XTIME' -f WRF_LMDZ/NPv31/wrfout_d01_1980-03-01_00:00:00
+## e.g. # diagnostics.py -d 'Time@WRFtime,bottom_top@ZNU,south_north@XLAT,west_east@XLONG' -v 'clt|CLDFRA,cllmh|CLDFRA@WRFp,RAINTOT|RAINC@RAINNC@RAINSH@XTIME' -f WRF_LMDZ/NPv31/wrfout_d01_1980-03-01_00:00:00
 ## e.g. # diagnostics.py -f /home/lluis/PY/diagnostics.inf -d variable_combo -v WRFprc
 
@@ -429 +429 @@
     print "\n    Computing '" + diagn + "' from: ", depvars, '...'
 
-# acraintot: accumulated total precipitation from WRF RAINC, RAINNC
+# acraintot: accumulated total precipitation from WRF RAINC, RAINNC, RAINSH
     if diagn == 'ACRAINTOT':
             
         var0 = ncobj.variables[depvars[0]]
         var1 = ncobj.variables[depvars[1]]
-        diagout = var0[:] + var1[:]
+        var2 = ncobj.variables[depvars[2]]
+
+        diagout = var0[:] + var1[:] + var2[:]
 
         dnamesvar = var0.dimensions
@@ -719 +721 @@
         ncvar.insert_variable(ncobj, 'wa', diagout, diagoutd, diagoutvd, newnc)
 
-# raintot: instantaneous total precipitation from WRF as (RAINC + RAINC) / dTime
+# raintot: instantaneous total precipitation from WRF as (RAINC + RAINC + RAINSH) / dTime
     elif diagn == 'RAINTOT':
 
         var0 = ncobj.variables[depvars[0]]
         var1 = ncobj.variables[depvars[1]]
-        if depvars[2] != 'WRFtime':
-            var2 = ncobj.variables[depvars[2]]
+        var2 = ncobj.variables[depvars[2]]
+
+        if depvars[3] != 'WRFtime':
+            var3 = ncobj.variables[depvars[3]]
         else:
-            var2 = np.arange(var0.shape[0], dtype=int)
-
-        var = var0[:] + var1[:]
+            var3 = np.arange(var0.shape[0], dtype=int)
+
+        var = var0[:] + var1[:] + var2[:]
 
         dnamesvar = var0.dimensions
@@ -737 +741 @@
 
 # Transforming to a flux
-        if var2.shape[0] > 1:
-            if depvars[2] != 'WRFtime':
-                dtimeunits = var2.getncattr('units')
+        if var3.shape[0] > 1:
+            if depvars[3] != 'WRFtime':
+                dtimeunits = var3.getncattr('units')
                 tunits = dtimeunits.split(' ')[0]
    
-                dtime = (var2[1] - var2[0])*diag.timeunits_seconds(tunits)
+                dtime = (var3[1] - var3[0])*diag.timeunits_seconds(tunits)
             else:
-                var2 = ncobj.variables['Times']
-                time1 = var2[0,:]
-                time2 = var2[1,:]
+                var3 = ncobj.variables['Times']
+                time1 = var3[0,:]
+                time2 = var3[1,:]
                 tmf1 = ''
                 tmf2 = ''