Changeset 1825 in lmdz_wrf

Timestamp:

Mar 20, 2018, 3:40:35 PM (7 years ago)

Author:

lfita

Message:

Fixing:

• deaccum' and accum' in 'diagnostics.py'

Adding:

• rlus, surface_upwelling_longwave_flux_in_air
• rsus, surface_upwelling_shortwave_flux_in_air

Location:

trunk/tools

Files:

• diagnostics.py (modified) (8 diffs)
• variables_values.dat (modified) (2 diffs)

trunk/tools/diagnostics.py

@@ -87 +87 @@
 
 # Variables not to check
-NONcheckingvars = ['cllmh', 'deaccum', 'TSrhs', 'TStd', 'TSwds', 'TSwss', 'WRFbils', \
+NONcheckingvars = ['accum', 'cllmh', 'deaccum', 'TSrhs', 'TStd', 'TSwds', 'TSwss',   \
+  'WRFbils',                                                                         \
   'WRFclivi', 'WRFclwvi', 'WRFdens', 'WRFgeop',                                      \
   'WRFp', 'WRFtd',                                                                   \
@@ -95 +96 @@
 
 # diagnostics not to check their dependeny
-NONcheckdepvars = ['WRF_denszint', 'WRFzwind_log', 'WRFzwind', 'WRFzwindMO']
+NONcheckdepvars = ['accum', 'deaccum', 'WRF_denszint', 'WRFzwind_log', 'WRFzwind',   \
+  'WRFzwindMO']
 
 NONchkvardims = ['WRFtime']
@@ -419 +421 @@
 
         diagout, diagoutd, diagoutvd = diag.compute_accum(var0,dnamesvar,dvnamesvar)
+        # Removing the nonChecking variable-dimensions from the initial list
+        varsadd = []
+        diagoutvd = list(dvnames)
+        for nonvd in NONchkvardims:
+            if gen.searchInlist(dvnames,nonvd): diagoutvd.remove(nonvd)
+            varsadd.append(nonvd)
 
         CFvarn = ncvar.variables_values(depvars[0])[0]
@@ -430 +438 @@
             tunits = dtimeunits.split(' ')[0]
 
-        dtime = (var1[1] - var1[0])*timeunits_seconds(tunits)
+        dtime = (var1[1] - var1[0])*diag.timeunits_seconds(tunits)
 
         ncvar.insert_variable(ncobj, CFvarn + 'acc', diagout*dtime, diagoutd, diagoutvd, newnc)
@@ -477 +485 @@
     elif diagn == 'deaccum':
 
-        var0 = ncobj.variables[depvars[1]]
-        var1 = ncobj.variables[depvars[2]]
+        var0 = ncobj.variables[depvars[0]]
+        var1 = ncobj.variables[depvars[1]]
 
         dnamesvar = var0.dimensions
@@ -484 +492 @@
 
         diagout, diagoutd, diagoutvd = diag.compute_deaccum(var0,dnamesvar,dvnamesvar)
+        # Removing the nonChecking variable-dimensions from the initial list
+        varsadd = []
+        diagoutvd = list(dvnames)
+        for nonvd in NONchkvardims:
+            if gen.searchInlist(dvnames,nonvd): diagoutvd.remove(nonvd)
+            varsadd.append(nonvd)
 
 # Transforming to a flux
-        if depvars[2] == 'XTIME':
+        if depvars[1] == 'XTIME':
             dtimeunits = var1.getncattr('description')
             tunits = dtimeunits.split(' ')[0]
@@ -493 +507 @@
             tunits = dtimeunits.split(' ')[0]
 
-        dtime = (var1[1] - var1[0])*timeunits_seconds(tunits)
-        ncvar.insert_variable(ncobj, depvars[3], diagout/dtime, diagoutd, diagoutvd, newnc)
+        dtime = (var1[1] - var1[0])*diag.timeunits_seconds(tunits)
+        ncvar.insert_variable(ncobj, depvars[2], diagout/dtime, diagoutd, diagoutvd, newnc)
 
 # LMDZrh (pres, t, r)
@@ -612 +626 @@
                 tunits = dtimeunits.split(' ')[0]
    
-                dtime = (var2[1] - var2[0])*timeunits_seconds(tunits)
+                dtime = (var2[1] - var2[0])*diag.timeunits_seconds(tunits)
             else:
                 var2 = ncobj.variables['Times']

trunk/tools/variables_values.dat

@@ -386 +386 @@
 LWdown, rlds, surface_downwelling_longwave_flux_in_air,  0., 1200., downward|LW|surface|radiation, Wm-2, Reds, $rlds$, rlds
 lwdown, rlds, surface_downwelling_longwave_flux_in_air,  0., 1200., downward|LW|surface|radiation, Wm-2, Reds, $rlds$, rlds
+rlus, rlus, surface_upwelling_longwave_flux_in_air,  0., 200., Surface|Upwelling|Longwave|Radiation,  Wm-2 ,Reds, $rlus$, rlus
+ACLWUPB, rlus, surface_upwelling_longwave_flux_in_air,  0., 200., Surface|Upwelling|Longwave|Radiation,  Wm-2 ,Reds, $rlus$, rlus
 rsds, rsds, surface_downwelling_shortwave_flux_in_air,  0., 1200., downward|SW|surface|radiation, Wm-2, Reds, $rsds$, rsds
 SWdnSFC, rsds, surface_downwelling_shortwave_flux_in_air,  0., 1200., downward|SW|surface|radiation, Wm-2, Reds, $rsds$, rsds
@@ -394 +396 @@
 SWdown_aerosol, rsdsaero, surface_downwelling_shortwave_flux_in_air_with_aerosol_effects,  0., 1200., downward|SW|surface|radiation|with|aerosol|effects, Wm-2 ,Reds, $rsds^{aerosols}$, rsdsaerosols
 rsdsacc, rsdsacc, accumulated_surface_downwelling_shortwave_flux_in_air, 0., 1200., accumulated|downward|SW|surface|radiation, Wm-2 ,Reds, $rsds^{ac}$, rsdsac
+rsus, rsus, surface_upwelling_shortwave_flux_in_air,  0., 200., Surface|Upwelling|Shortwave|Radiation,  Wm-2 ,Reds, $rsus$, rsus
+ACSWUPB, rsus, surface_upwelling_shortwave_flux_in_air,  0., 200., Surface|Upwelling|Shortwave|Radiation,  Wm-2 ,Reds, $rsus$, rsus
 rvor, rvor, air_relative_vorticity, -2.5E-3, 2.5E-3, air|relative|vorticity, s-1, seismic, $vor^{rel}$, vorrel
 WRFrvor, rvor, air_relative_vorticity, -2.5E-3, 2.5E-3, air|relative|vorticity, s-1, seismic, $vor^{rel}$, vorrel