revision for including CORE_v2 flux

E3SM-Project · Oct 31, 2019 · 94c971b · 94c971b
1 parent ded4384
commit 94c971b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/acme_diags/derivations/acme.py b/acme_diags/derivations/acme.py
@@ -98,7 +98,7 @@ def qflxconvert_units(var):
     return var
 
 def pminuse_convert_units(var):
-    if var.units == 'kg/m2/s' or var.units == 'kg m-2 s-1':
+    if var.units == 'kg/m2/s' or var.units == 'kg m-2 s-1' or var.units == 'kg/s/m^2':
         # need to find a solution for units not included in udunits
         # var = convert_units( var, 'kg/m2/s' )
         var = var * 3600.0 * 24  # convert to mm/day
@@ -802,6 +802,7 @@ def cosp_histogram_standardize(cld):
     'PminusE': OrderedDict([
         (('PminusE',),lambda pminuse: pminuse_convert_units(pminuse)),
         (('PRECC', 'PRECL', 'QFLX',),lambda precc,precl,qflx: pminuse_convert_units(prect(precc,precl)-pminuse_convert_units(qflx))),
+        (('F_prec','F_evap'), lambda pr,evspsbl: pminuse_convert_units(pr + evspsbl)),
         (('pr','evspsbl'), lambda pr,evspsbl: pminuse_convert_units(pr - evspsbl))
 
     ]),

diff --git a/analysis_data_preprocess/create_COREv2_Flux_climo.sh b/analysis_data_preprocess/create_COREv2_Flux_climo.sh
@@ -23,7 +23,7 @@ for yr in $(eval echo "{$start_yr..$end_yr}"); do
     ncks --mk_rec_dmn time ${original_path}${yyyy}.nc ${tmp}time_rec_dim_${yyyy}.nc
     #ncrename -v F_evap,evspsbl -v F_prec,pr -v F_roff,mrro -v Q_lat,hfls -v Q_sen,hfss -v Q_lwdn,rlds -v Q_lwup,rlus -v Q_swnet,rss -v taux,tauu -v tauy,tauv ${original_path}${yyyy}.nc
     #somehow Q_lwup can not get renamed, neglect for now.
-    ncrename -v F_evap,evspsbl -v F_prec,pr -v F_roff,mrro -v Q_lat,hfls -v Q_sen,hfss -v Q_lwdn,rlds -v Q_swnet,rss -v taux,tauu -v tauy,tauv ${tmp}time_rec_dim_${yyyy}.nc
+    #ncrename -v F_evap,evspsbl -v F_prec,pr -v F_roff,mrro -v Q_lat,hfls -v Q_sen,hfss -v Q_lwdn,rlds -v Q_swnet,rss -v taux,tauu -v tauy,tauv ${tmp}time_rec_dim_${yyyy}.nc
 
 
     for mth in {1..12}; do
@@ -40,7 +40,8 @@ ncrcat ${tmp}COREv2_Flux_*nc ${time_series_output_path}COREv2_Flux_${start_yr}01
 
 #ncrename -v F_evap,evspsbl -v F_prec,pr -v F_roff,mrro -v Q_lat,hfls -v Q_sen,hfss -v Q_lwdn,rlds -v Q_lwup,rlus -v Q_swnet,rss -v taux,tauu -v tauy,tauv ${time_series_output_path}COREv2_Flux_${start_yr}01_${end_yr}12.nc
 
-for var in evspsbl pr mrro hfls hfss rlds rlus rss tauu tauv
+#for var in evspsbl pr mrro hfls hfss rlds rlus rss tauu tauv
+for var in F_evap F_prec F_roff Q_lat Q_sen Q_lwdn Q_lwup Q_swnet taux tauy
 do
    echo $var
    ncks -v $var ${time_series_output_path}COREv2_Flux_${start_yr}01_${end_yr}12.nc ${time_series_output_path}${var}_${start_yr}01_${end_yr}12.nc