Commit 738a0739 authored by William Gustafson's avatar William Gustafson
Browse files

Changed cloud masking to use qc+qi instead of just qc. At the same time,

added ice related (qi & qf) crm_stats and modified qt variables to
include ice.
parent 9bc23868
......@@ -127,8 +127,10 @@ state integer stat_count_nocc k dyn_em 1 - r "st
#!
state real cst_hour - misc 1 - rh9 "cst_hour" "Time in hour since simulation start" "hour"
#! set A
state real cst_cldlow - misc 1 - rh9 "cst_cldlow" "Fractional low-cloud cover (<5 km)" "(0-1)"
state real cst_cldtot - misc 1 - rh9 "cst_cldtot" "Fractional cloud cover" "(0-1)"
state real cst_lwp - misc 1 - rh9 "cst_lwp" "Vertical integrated liquid water" "kg/m^2"
state real cst_lwp - misc 1 - rh9 "cst_lwp" "Vertical integrated liquid water path" "kg/m^2"
state real cst_iwp - misc 1 - rh9 "cst_iwp" "Vertical integrated ice water path" "kg/m^2"
state real cst_precw - misc 1 - rh9 "cst_precw" "Vertical integrated water vapor" "kg/m^2"
state real cst_tke - misc 1 - rh9 "cst_tke" "Vertical integrated TKE" "kg/s^2"
state real cst_tsair - misc 1 - rh9 "cst_tsair" "Surface air temperature" "K"
......@@ -160,11 +162,14 @@ state real csp_thv k misc 1 - rh9 "c
state real csp_thl k misc 1 - rh9 "csp_thl" "Liquid water potential temperature" "K"
state real csp_qv k misc 1 - rh9 "csp_qv" "Water vapor mixing ratio" "kg/kg"
state real csp_qc k misc 1 - rh9 "csp_qc" "Cloud water mixing ratio" "kg/kg"
state real csp_ql k misc 1 - rh9 "csp_ql" "Liquid water mixing ratio" "kg/kg"
state real csp_qt k misc 1 - rh9 "csp_qt" "Total water mixing ratio" "kg/kg"
state real csp_lwc k misc 1 - rh9 "csp_lwc" "Liquid water content" "kg/m^3"
state real csp_speqv k misc 1 - rh9 "csp_speqv" "Specific humidity" "kg/kg"
state real csp_a_cl k misc 1 - rh9 "csp_a_cl" "Fraction of cloudy grid points" "(0-1)"
state real csp_qi k misc 1 - rh9 "csp_qi" "Ice crystal mixing ratio" "kg/kg"
state real csp_ql k misc 1 - rh9 "csp_ql" "Liquid water mixing ratio" "kg/kg"
state real csp_qf k misc 1 - rh9 "csp_qf" "Frozen water mixing ratio" "kg/kg"
state real csp_qt k misc 1 - rh9 "csp_qt" "Total (vapor+liquid+ice) water mixing ratio" "kg/kg"
state real csp_lwc k misc 1 - rh9 "csp_lwc" "Liquid water content" "kg/m^3"
state real csp_iwc k misc 1 - rh9 "csp_iwc" "Ice water content" "kg/m^3"
state real csp_speqv k misc 1 - rh9 "csp_speqv" "Specific humidity" "kg/kg"
state real csp_a_cl k misc 1 - rh9 "csp_a_cl" "Fraction of cloudy grid points" "(0-1)"
state real csp_rho k misc 1 - rh9 "csp_rho " "Density" "kg/m^3"
#! set B2
state real csp_u2 k misc 1 - rh9 "csp_u2" "u_p^2" "m^2/s^2"
......@@ -180,16 +185,20 @@ state real csp_wthv k misc 1 - rh9 "c
state real csp_wthl k misc 1 - rh9 "csp_wthl" "Liquid water potential temperature flux (rs+sgs)" "K m/s"
state real csp_wqv k misc 1 - rh9 "csp_wqv" "Water vapor flux (rs+sgs)" "kg/kg m/s"
state real csp_wqc k misc 1 - rh9 "csp_wqc" "Cloud water flux (rs+sgs)" "kg/kg m/s"
state real csp_wql k misc 1 - rh9 "csp_wql" "Liquid water flux (rs+sgs)" "kg/kg m/s"
state real csp_wqi k misc 1 - rh9 "csp_wqi" "Ice water flux (rs+sgs)" "kg/kg m/s"
state real csp_wql k misc 1 - rh9 "csp_wql" "Liquid water flux (rs+sgs)" "kg/kg m/s"
state real csp_wqf k misc 1 - rh9 "csp_wqf" "Frozen water flux (rs+sgs)" "kg/kg m/s"
state real csp_wqt k misc 1 - rh9 "csp_wqt" "Total water flux (rs+sgs)" "kg/kg m/s"
state real csp_uw_sgs k misc 1 - rh9 "csp_uw_sgs" "x-momentum flux uw (sgs)" "m^2/s^2"
state real csp_vw_sgs k misc 1 - rh9 "csp_vw_sgs" "y-momentum flux vw (sgs)" "m^2/s^2"
state real csp_wth_sgs k misc 1 - rh9 "csp_wth_sgs" "Potential temperature flux (sgs)" "K m/s"
state real csp_uw_sgs k misc 1 - rh9 "csp_uw_sgs" "x-momentum flux uw (sgs)" "m^2/s^2"
state real csp_vw_sgs k misc 1 - rh9 "csp_vw_sgs" "y-momentum flux vw (sgs)" "m^2/s^2"
state real csp_wth_sgs k misc 1 - rh9 "csp_wth_sgs" "Potential temperature flux (sgs)" "K m/s"
state real csp_wthv_sgs k misc 1 - rh9 "csp_wthv_sgs" "Virtual potential temperature flux (sgs)" "K m/s"
state real csp_wthl_sgs k misc 1 - rh9 "csp_wthl_sgs" "Liquid water potential temperature flux (sgs)" "K m/s"
state real csp_wqv_sgs k misc 1 - rh9 "csp_wqv_sgs" "Water vapor flux (sgs)" "kg/kg m/s"
state real csp_wqc_sgs k misc 1 - rh9 "csp_wqc_sgs" "Cloud water flux (sgs)" "kg/kg m/s"
state real csp_wqi_sgs k misc 1 - rh9 "csp_wqi_sgs" "Ice cyrstal flux (sgs)" "kg/kg m/s"
state real csp_wql_sgs k misc 1 - rh9 "csp_wql_sgs" "Liquid water flux (sgs)" "kg/kg m/s"
state real csp_wqf_sgs k misc 1 - rh9 "csp_wqf_sgs" "Frozen water flux (sgs)" "kg/kg m/s"
state real csp_wqt_sgs k misc 1 - rh9 "csp_wqt_sgs" "Total water flux (sgs)" "kg/kg m/s"
#! sed
state real csp_sedfqc k misc 1 - rh9 "csp_sedfqc" "Sedimentation flux of qc" "kg /m^2/s"
......@@ -236,7 +245,9 @@ state real csp_thl_c k misc 1 - rh9 "c
state real csp_qt_c k misc 1 - rh9 "csp_qt_c" "Average over all cloudy grid points of qt" "kg/kg"
state real csp_qv_c k misc 1 - rh9 "csp_qv_c" "Average over all cloudy grid points of qv" "kg/kg"
state real csp_ql_c k misc 1 - rh9 "csp_ql_c" "Average over all cloudy grid points of ql" "kg/kg"
state real csp_qf_c k misc 1 - rh9 "csp_qf_c" "Average over all cloudy grid points of qf" "kg/kg"
state real csp_qc_c k misc 1 - rh9 "csp_qc_c" "Average over all cloudy grid points of qc" "kg/kg"
state real csp_qi_c k misc 1 - rh9 "csp_qi_c" "Average over all cloudy grid points of qi" "kg/kg"
state real csp_qnc_c k misc 1 - rh9 "csp_qnc_c" "Average over all cloudy grid points of qnc" "cm-3"
state real csp_thv_c k misc 1 - rh9 "csp_thv_c" "Average over all cloudy grid points of thv" "K"
#! set B5
......@@ -245,7 +256,9 @@ state real csp_awthl_c k misc 1 - rh9 "c
state real csp_awqt_c k misc 1 - rh9 "csp_awqt_c" "Cloud fraction * average over all cloudy grid points of wqt" "kg/kg m/s"
state real csp_awqv_c k misc 1 - rh9 "csp_awqv_c" "Cloud fraction * average over all cloudy grid points of wqv" "kg/kg m/s"
state real csp_awql_c k misc 1 - rh9 "csp_awql_c" "Cloud fraction * average over all cloudy grid points of wql" "kg/kg m/s"
state real csp_awqf_c k misc 1 - rh9 "csp_awqf_c" "Cloud fraction * average over all cloudy grid points of wqf" "kg/kg m/s"
state real csp_awqc_c k misc 1 - rh9 "csp_awqc_c" "Cloud fraction * average over all cloudy grid points of wqc" "kg/kg m/s"
state real csp_awqi_c k misc 1 - rh9 "csp_awqi_c" "Cloud fraction * average over all cloudy grid points of wqi" "kg/kg m/s"
state real csp_awthv_c k misc 1 - rh9 "csp_awthv_c" "Cloud fraction * average over all cloudy grid points of wthv" "K m/s"
#! set B6
state real csp_a_cc k misc 1 - rh9 "csp_a_cc" "Fraction of cloudcore grid points" "(0-1)"
......@@ -254,7 +267,9 @@ state real csp_thl_cc k misc 1 - rh9 "c
state real csp_qt_cc k misc 1 - rh9 "csp_qt_cc" "Average over all cloudcore grid points of qt" "kg/kg"
state real csp_qv_cc k misc 1 - rh9 "csp_qv_cc" "Average over all cloudcore grid points of qv" "kg/kg"
state real csp_ql_cc k misc 1 - rh9 "csp_ql_cc" "Average over all cloudcore grid points of ql" "kg/kg"
state real csp_qf_cc k misc 1 - rh9 "csp_qf_cc" "Average over all cloudcore grid points of qf" "kg/kg"
state real csp_qc_cc k misc 1 - rh9 "csp_qc_cc" "Average over all cloudcore grid points of qc" "kg/kg"
state real csp_qi_cc k misc 1 - rh9 "csp_qi_cc" "Average over all cloudcore grid points of qi" "kg/kg"
state real csp_thv_cc k misc 1 - rh9 "csp_thv_cc" "Average over all cloudcore grid points of thv" "K"
#! set B7
state real csp_aw_cc k misc 1 - rh9 "csp_aw_cc" "Cloudcore fraction * average over all cloudcore grid points of w" "m/s"
......@@ -262,13 +277,17 @@ state real csp_awthl_cc k misc 1 - rh9 "c
state real csp_awqt_cc k misc 1 - rh9 "csp_awqt_cc" "Cloudcore fraction * average over all cloudcore grid points of wqt" "kg/kg m/s"
state real csp_awqv_cc k misc 1 - rh9 "csp_awqv_cc" "Cloudcore fraction * average over all cloudcore grid points of wqv" "kg/kg m/s"
state real csp_awql_cc k misc 1 - rh9 "csp_awql_cc" "Cloudcore fraction * average over all cloudcore grid points of wql" "kg/kg m/s"
state real csp_awqf_cc k misc 1 - rh9 "csp_awqf_cc" "Cloudcore fraction * average over all cloudcore grid points of wqf" "kg/kg m/s"
state real csp_awqc_cc k misc 1 - rh9 "csp_awqc_cc" "Cloudcore fraction * average over all cloudcore grid points of wqc" "kg/kg m/s"
state real csp_awqi_cc k misc 1 - rh9 "csp_awqi_cc" "Cloudcore fraction * average over all cloudcore grid points of wqi" "kg/kg m/s"
state real csp_awthv_cc k misc 1 - rh9 "csp_awthv_cc" "Cloudcore fraction * average over all cloudcore grid points of wthv" "K m/s"
#! set B8
state real csp_sigc_thl k misc 1 - rh9 "csp_sigc_thl" "Incloud variance of thl" "K^2"
state real csp_sigc_qt k misc 1 - rh9 "csp_sigc_qt" "Incloud variance of qt" "(kg/kg)^2"
state real csp_sigc_ql k misc 1 - rh9 "csp_sigc_ql" "Incloud variance of ql" "(kg/kg)^2"
state real csp_sigc_qf k misc 1 - rh9 "csp_sigc_qf" "Incloud variance of qf" "(kg/kg)^2"
state real csp_sigc_qc k misc 1 - rh9 "csp_sigc_qc" "Incloud variance of qc" "(kg/kg)^2"
state real csp_sigc_qi k misc 1 - rh9 "csp_sigc_qi" "Incloud variance of qi" "(kg/kg)^2"
state real csp_sigc_thv k misc 1 - rh9 "csp_sigc_thv" "Incloud variance of thv" "K^2"
#!
state real csp_th2 k misc 1 - rh9 "csp_th2" "Variance of th" "K^2"
......@@ -381,7 +400,7 @@ package cgilsrad_lwscheme ra_lw_physics==40 - state:lwupt
# ! Statistics option
#package nocrmstatopt crm_stat_opt==0 - -
package crmstatopt crm_stat_opt==1 - state:crm_stat_count,stat_count_nocl,stat_count_nocc,prev_stat_secs,cst_hour,cst_cldtot,cst_lwp,cst_precw,cst_tke,cst_tsair,cst_ps,cst_prect,cst_sh,cst_lh,cst_fsntc,cst_fsnt,cst_flntc,cst_flnt,cst_fsnsc,cst_fsns,cst_flnsc,cst_flns,cst_swinc,cst_tsk,cst_ust,csp_z,csp_z8w,csp_dz8w,csp_u,csp_v,csp_w,csp_p,csp_th,csp_thv,csp_thl,csp_qv,csp_qc,csp_ql,csp_qt,csp_lwc,csp_speqv,csp_a_cl,csp_rho,csp_u2,csp_v2,csp_u2v2,csp_w2,csp_w3,csp_wskew,csp_uw,csp_vw,csp_wth,csp_wthv,csp_wthl,csp_wqv,csp_wqc,csp_wql,csp_wqt,csp_uw_sgs,csp_vw_sgs,csp_wth_sgs,csp_wthv_sgs,csp_wthl_sgs,csp_wqv_sgs,csp_wqc_sgs,csp_wql_sgs,csp_wqt_sgs,csp_sedfqc,csp_sedfqr,csp_thdt_cond,csp_thdt_lw,csp_thdt_sw,csp_thdt_ls,csp_qvdt_pr,csp_qvdt_cond,csp_qvdt_ls,csp_qcdt_pr,csp_qcdt_sed,csp_qrdt_sed,csp_thdt_lshor,csp_qvdt_lshor,csp_thdt_lsver,csp_qvdt_lsver,csp_thdt_lsrlx,csp_qvdt_lsrlx,csp_udt_ls,csp_vdt_ls,csp_udt_lsver,csp_vdt_lsver,csp_udt_lsrlx,csp_vdt_lsrlx,csp_swupf,csp_swdnf,csp_lwupf,csp_lwdnf,csp_tke_rs,csp_tke_sh,csp_tke_bu,csp_tke_tr,csp_tke_di,csp_tke_sgs,csp_w_c,csp_thl_c,csp_qt_c,csp_qv_c,csp_ql_c,csp_qc_c,csp_qnc_c,csp_thv_c,csp_aw_c,csp_awthl_c,csp_awqt_c,csp_awqv_c,csp_awql_c,csp_awqc_c,csp_awthv_c,csp_a_cc,csp_w_cc,csp_thl_cc,csp_qt_cc,csp_qv_cc,csp_ql_cc,csp_qc_cc,csp_thv_cc,csp_aw_cc,csp_awthl_cc,csp_awqt_cc,csp_awqv_cc,csp_awql_cc,csp_awqc_cc,csp_awthv_cc,csp_sigc_thl,csp_sigc_qt,csp_sigc_ql,csp_sigc_qc,csp_sigc_thv,csp_th2,csp_thv2,csp_thl2,csp_qv2,w_dthdz,w_dqvdz,w_dudz,w_dvdz,thdt_lshor,qvdt_lshor,thdt_lsrlx,qvdt_lsrlx,udt_lsrlx,vdt_lsrlx,sedfqc,sedfqr,qvdt_pr,qvdt_cond,qcdt_pr,qcdt_sed,qrdt_sed,csp_smaxactmax,csp_rminactmin,csp_wmax,csp_wmin,csv_th,csv_u,csv_v,csv_w,csv_qv,csv_qc,csv_qr,csv_qi,csv_qs,csv_qg,csv_lwc,csv_iwc,csv_cldfrac,css_lwp,css_iwp,smaxact,rminact
package crmstatopt crm_stat_opt==1 - state:crm_stat_count,stat_count_nocl,stat_count_nocc,prev_stat_secs,cst_hour,cst_cldlow,cst_cldtot,cst_lwp,cst_iwp,cst_precw,cst_tke,cst_tsair,cst_ps,cst_prect,cst_sh,cst_lh,cst_fsntc,cst_fsnt,cst_flntc,cst_flnt,cst_fsnsc,cst_fsns,cst_flnsc,cst_flns,cst_swinc,cst_tsk,cst_ust,csp_z,csp_z8w,csp_dz8w,csp_u,csp_v,csp_w,csp_p,csp_th,csp_thv,csp_thl,csp_qv,csp_qc,csp_qi,csp_ql,csp_qf,csp_qt,csp_lwc,csp_iwc,csp_speqv,csp_a_cl,csp_rho,csp_u2,csp_v2,csp_u2v2,csp_w2,csp_w3,csp_wskew,csp_uw,csp_vw,csp_wth,csp_wthv,csp_wthl,csp_wqv,csp_wqc,csp_wqi,csp_wql,csp_wqf,csp_wqt,csp_uw_sgs,csp_vw_sgs,csp_wth_sgs,csp_wthv_sgs,csp_wthl_sgs,csp_wqv_sgs,csp_wqc_sgs,csp_wqi_sgs,csp_wql_sgs,csp_wqf_sgs,csp_wqt_sgs,csp_sedfqc,csp_sedfqr,csp_thdt_cond,csp_thdt_lw,csp_thdt_sw,csp_thdt_ls,csp_qvdt_pr,csp_qvdt_cond,csp_qvdt_ls,csp_qcdt_pr,csp_qcdt_sed,csp_qrdt_sed,csp_thdt_lshor,csp_qvdt_lshor,csp_thdt_lsver,csp_qvdt_lsver,csp_thdt_lsrlx,csp_qvdt_lsrlx,csp_udt_ls,csp_vdt_ls,csp_udt_lsver,csp_vdt_lsver,csp_udt_lsrlx,csp_vdt_lsrlx,csp_swupf,csp_swdnf,csp_lwupf,csp_lwdnf,csp_tke_rs,csp_tke_sh,csp_tke_bu,csp_tke_tr,csp_tke_di,csp_tke_sgs,csp_w_c,csp_thl_c,csp_qt_c,csp_qv_c,csp_ql_c,csp_qf_c,csp_qc_c,csp_qi_c,csp_qnc_c,csp_thv_c,csp_aw_c,csp_awthl_c,csp_awqt_c,csp_awqv_c,csp_awql_c,csp_awqf_c,csp_awqc_c,csp_awqi_c,csp_awthv_c,csp_a_cc,csp_w_cc,csp_thl_cc,csp_qt_cc,csp_qv_cc,csp_ql_cc,csp_qf_cc,csp_qc_cc,csp_qi_cc,csp_thv_cc,csp_aw_cc,csp_awthl_cc,csp_awqt_cc,csp_awqv_cc,csp_awql_cc,csp_awqf_cc,csp_awqc_cc,csp_awqi_cc,csp_awthv_cc,csp_sigc_thl,csp_sigc_qt,csp_sigc_ql,csp_sigc_qf,csp_sigc_qc,csp_sigc_qi,csp_sigc_thv,csp_th2,csp_thv2,csp_thl2,csp_qv2,w_dthdz,w_dqvdz,w_dudz,w_dvdz,thdt_lshor,qvdt_lshor,thdt_lsrlx,qvdt_lsrlx,udt_lsrlx,vdt_lsrlx,sedfqc,sedfqr,qvdt_pr,qvdt_cond,qcdt_pr,qcdt_sed,qrdt_sed,csp_smaxactmax,csp_rminactmin,csp_wmax,csp_wmin,csv_th,csv_u,csv_v,csv_w,csv_qv,csv_qc,csv_qr,csv_qi,csv_qs,csv_qg,csv_lwc,csv_iwc,csv_cldfrac,css_lwp,css_iwp,smaxact,rminact
##! aerosol input
package aerosolopt crm_morr_act_opt==2 - state:z_aer,z_aer_tend,rm_aer1,rm_aer1_tend,sig_aer1,sig_aer1_tend,na_aer1,na_aer1_tend,na_aer1_grd,rm_aer2,rm_aer2_tend,sig_aer2,sig_aer2_tend,na_aer2,na_aer2_tend,na_aer2_grd,rm_aer3,rm_aer3_tend,sig_aer3,sig_aer3_tend,na_aer3,na_aer3_tend,na_aer3_grd,rm_aer4,rm_aer4_tend,sig_aer4,sig_aer4_tend,na_aer4,na_aer4_tend,na_aer4_grd,hygro_aer1,hygro_aer1_tend,hygro_aer2,hygro_aer2_tend,hygro_aer3,hygro_aer3_tend,hygro_aer4,hygro_aer4_tend
......
......@@ -4638,7 +4638,8 @@ BENCH_END(bc_2d_tim)
,sedfqc=grid%sedfqc ,sedfqr=grid%sedfqr &
,smaxact=grid%smaxact, rminact=grid%rminact &
! Output array
,cst_cldtot=grid%cst_cldtot, cst_lwp=grid%cst_lwp, cst_precw=grid%cst_precw &
,cst_cldlow=grid%cst_cldlow, cst_cldtot=grid%cst_cldtot &
,cst_lwp=grid%cst_lwp, cst_iwp=grid%cst_iwp, cst_precw=grid%cst_precw &
,cst_tke=grid%cst_tke, cst_tsair=grid%cst_tsair, cst_ps=grid%cst_ps &
,cst_prect=grid%cst_prect, cst_sh=grid%cst_sh, cst_lh=grid%cst_lh &
,cst_fsntc=grid%cst_fsntc, cst_fsnt=grid%cst_fsnt, cst_flntc=grid%cst_flntc &
......@@ -4648,8 +4649,10 @@ BENCH_END(bc_2d_tim)
,csp_z=grid%csp_z, csp_z8w=grid%csp_z8w, csp_dz8w=grid%csp_dz8w &
,csp_u=grid%csp_u, csp_v=grid%csp_v, csp_w=grid%csp_w &
,csp_p=grid%csp_p, csp_th=grid%csp_th, csp_thv=grid%csp_thv &
,csp_thl=grid%csp_thl, csp_qv=grid%csp_qv, csp_qc=grid%csp_qc &
,csp_ql=grid%csp_ql, csp_qt=grid%csp_qt, csp_lwc=grid%csp_lwc &
,csp_thl=grid%csp_thl &
,csp_qv=grid%csp_qv, csp_qc=grid%csp_qc, csp_qi=grid%csp_qi &
,csp_ql=grid%csp_ql, csp_qf=grid%csp_qf, csp_qt=grid%csp_qt &
,csp_lwc=grid%csp_lwc, csp_iwc=grid%csp_iwc &
,csp_speqv=grid%csp_speqv, csp_a_cl=grid%csp_a_cl &
,csp_rho=grid%csp_rho, csp_u2=grid%csp_u2, csp_v2=grid%csp_v2 &
,csp_u2v2=grid%csp_u2v2, csp_w2=grid%csp_w2, csp_w3=grid%csp_w3 &
......@@ -4657,15 +4660,16 @@ BENCH_END(bc_2d_tim)
,csp_thl2=grid%csp_thl2, csp_qv2=grid%csp_qv2 &
,csp_uw=grid%csp_uw, csp_vw=grid%csp_vw &
,csp_wth=grid%csp_wth, csp_wthv=grid%csp_wthv, csp_wthl=grid%csp_wthl &
,csp_wqv=grid%csp_wqv, csp_wqc=grid%csp_wqc, csp_wql=grid%csp_wql &
,csp_wqt=grid%csp_wqt &
,csp_wqv=grid%csp_wqv, csp_wqc=grid%csp_wqc, csp_wqi=grid%csp_wqi &
,csp_wql=grid%csp_wql, csp_wqf=grid%csp_wqf, csp_wqt=grid%csp_wqt &
,csp_sedfqc=grid%csp_sedfqc, csp_sedfqr=grid%csp_sedfqr &
,csp_uw_sgs=grid%csp_uw_sgs, csp_vw_sgs=grid%csp_vw_sgs &
,csp_wth_sgs=grid%csp_wth_sgs, csp_wthv_sgs=grid%csp_wthv_sgs &
,csp_wthl_sgs=grid%csp_wthl_sgs, csp_wqv_sgs=grid%csp_wqv_sgs &
,csp_wqc_sgs=grid%csp_wqc_sgs, csp_wql_sgs=grid%csp_wql_sgs &
,csp_wqc_sgs=grid%csp_wqc_sgs, csp_wqi_sgs=grid%csp_wqi_sgs &
,csp_wql_sgs=grid%csp_wql_sgs, csp_wqf_sgs=grid%csp_wqf_sgs &
,csp_wqt_sgs=grid%csp_wqt_sgs, csp_thdt_cond=grid%csp_thdt_cond &
,csp_thdt_sw=grid%csp_thdt_sw, csp_thdt_lw=grid%csp_thdt_lw &
,csp_thdt_lw=grid%csp_thdt_lw, csp_thdt_sw=grid%csp_thdt_sw &
,csp_thdt_ls=grid%csp_thdt_ls, csp_qvdt_pr=grid%csp_qvdt_pr &
,csp_qvdt_cond=grid%csp_qvdt_cond, csp_qvdt_ls=grid%csp_qvdt_ls &
,csp_qcdt_pr=grid%csp_qcdt_pr, csp_qcdt_sed=grid%csp_qcdt_sed &
......@@ -4683,22 +4687,27 @@ BENCH_END(bc_2d_tim)
,csp_lwupf=grid%csp_lwupf, csp_lwdnf=grid%csp_lwdnf &
,csp_w_c=grid%csp_w_c, csp_thl_c=grid%csp_thl_c &
,csp_qt_c=grid%csp_qt_c, csp_qv_c=grid%csp_qv_c &
,csp_ql_c=grid%csp_ql_c, csp_qc_c=grid%csp_qc_c &
,csp_ql_c=grid%csp_ql_c, csp_qf_c=grid%csp_qf_c &
,csp_qc_c=grid%csp_qc_c, csp_qi_c=grid%csp_qi_c &
,csp_qnc_c=grid%csp_qnc_c &
,csp_thv_c=grid%csp_thv_c, csp_aw_c=grid%csp_aw_c &
,csp_awthl_c=grid%csp_awthl_c, csp_awqt_c=grid%csp_awqt_c &
,csp_awqv_c=grid%csp_awqv_c, csp_awql_c=grid%csp_awql_c &
,csp_awqc_c=grid%csp_awqc_c, csp_awthv_c=grid%csp_awthv_c &
,csp_awqf_c=grid%csp_awqf_c, csp_awqc_c=grid%csp_awqc_c &
,csp_awqi_c=grid%csp_awqi_c, csp_awthv_c=grid%csp_awthv_c &
,csp_a_cc=grid%csp_a_cc, csp_w_cc=grid%csp_w_cc &
,csp_thl_cc=grid%csp_thl_cc, csp_qt_cc=grid%csp_qt_cc &
,csp_qv_cc=grid%csp_qv_cc, csp_ql_cc=grid%csp_ql_cc &
,csp_qc_cc=grid%csp_qc_cc, csp_thv_cc=grid%csp_thv_cc &
,csp_qf_cc=grid%csp_qf_cc, csp_qc_cc=grid%csp_qc_cc &
,csp_qi_cc=grid%csp_qi_cc, csp_thv_cc=grid%csp_thv_cc &
,csp_aw_cc=grid%csp_aw_cc, csp_awthl_cc=grid%csp_awthl_cc &
,csp_awqt_cc=grid%csp_awqt_cc, csp_awqv_cc=grid%csp_awqv_cc &
,csp_awql_cc=grid%csp_awql_cc, csp_awqc_cc=grid%csp_awqc_cc &
,csp_awql_cc=grid%csp_awql_cc, csp_awqf_cc=grid%csp_awqf_cc &
,csp_awqc_cc=grid%csp_awqc_cc, csp_awqi_cc=grid%csp_awqi_cc &
,csp_awthv_cc=grid%csp_awthv_cc, csp_sigc_thl=grid%csp_sigc_thl &
,csp_sigc_qt=grid%csp_sigc_qt, csp_sigc_ql=grid%csp_sigc_ql &
,csp_sigc_qc=grid%csp_sigc_qc, csp_sigc_thv=grid%csp_sigc_thv &
,csp_sigc_qf=grid%csp_sigc_qf, csp_sigc_qc=grid%csp_sigc_qc &
,csp_sigc_qi=grid%csp_sigc_qi, csp_sigc_thv=grid%csp_sigc_thv &
,csp_smaxactmax=grid%csp_smaxactmax &
,csp_rminactmin=grid%csp_rminactmin &
,csp_wmax=grid%csp_wmax, csp_wmin=grid%csp_wmin &
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment