Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
13ed69f
Add the Precipitating Convective Cloud (PCC) scheme to the BMJ cumulu…
Jun 4, 2019
afd433d
Files modified following reviewers comment. Thank you!
Jan 28, 2020
1df8725
Merge branch 'develop' into PCCscheme
rmfonsecaweb Jan 28, 2020
41a89e5
.. to trigger jenkin test...
weiwangncar Jan 30, 2020
1dce82b
Registry file modified as per the reviewers request.
Jan 30, 2020
47cfa88
Update Registry.EM_COMMON
rmfonsecaweb Jan 30, 2020
b73d104
Code changes to allow compilation with NMM dynamical core.
Jan 31, 2020
00591c9
Merge branch 'PCCscheme' of https://github.com/rmfonsecaweb/WRF into …
Jan 31, 2020
a7873d8
to trigger jenkin test... will change it back...
weiwangncar Jan 31, 2020
7c9306d
no need to initialize these new variables to zero and this also helps…
weiwangncar Jan 31, 2020
ab0ec02
Radiation_Driver modified following reviewers suggestion.
Feb 1, 2020
8a40904
Merge branch 'PCCscheme' of https://github.com/rmfonsecaweb/WRF into …
Feb 1, 2020
8810095
Files modified following reviewers suggestion.
Feb 2, 2020
9087ba0
change the default option back to false, and trigger another jenkins …
weiwangncar Feb 2, 2020
6481d84
revert the change to that committed for MYNN (PR#1063)
weiwangncar Feb 4, 2020
869518f
need to pass namelist bmj_rad_feedback to radiation driver
weiwangncar Feb 4, 2020
e7869be
restoring recent MYNN changes
weiwangncar Feb 4, 2020
d3ea29f
redo the restoration change so that the code goes to their original p…
weiwangncar Feb 4, 2020
7cd698d
Merge branch 'develop' into PCCscheme
rmfonsecaweb Feb 7, 2020
bd7c6cb
remove arrays from older version of the code
weiwangncar Feb 7, 2020
751a45f
try to restore correct code
weiwangncar Feb 9, 2020
7666d4f
.. changes one more time...
weiwangncar Feb 9, 2020
d653c54
.. line the code up again...
weiwangncar Feb 9, 2020
ae43860
remove CLDEFI change so that we can get same results before and after…
weiwangncar Feb 9, 2020
51d531b
Merge branch 'PCCscheme' of https://github.com/rmfonsecaweb/WRF into …
weiwangncar Feb 9, 2020
f42505d
line up code
weiwangncar Feb 9, 2020
92c96fa
making BMJ bug fix consistant with the latest one
weiwangncar Feb 10, 2020
ea92c83
no need to save qc, qi to qc_old and qi_old - they have been saved to…
weiwangncar Feb 10, 2020
cc5e698
remove the four new variables added in this PR from history file
weiwangncar Feb 10, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Registry/Registry.EM_COMMON
Original file line number Diff line number Diff line change
Expand Up @@ -1425,6 +1425,8 @@ state real RQCNCUTEN ikj misc 1 - r "R
state real RQINCUTEN ikj misc 1 - r "RQINCUTEN" "Q_IN TENDENCY DUE TO CUMULUS SCHEME" "# kg-1 s-1"
state real W0AVG ikj misc 1 - r "W0AVG" "AVERAGE VERTICAL VELOCITY FOR KF CUMULUS SCHEME" "m s-1"

state real qcconv ikj misc 1 - r "QCCONV" "CLOUD MIXING RATIO FOR BMJ CUMULUS SCHEME" "kg kg-1"
state real qiconv ikj misc 1 - r "QICONV" "ICE MIXING RATIO FOR BMJ CUMULUS SCHEME" "kg kg-1"
state real RAINC ij misc 1 - rh01du "RAINC" "ACCUMULATED TOTAL CUMULUS PRECIPITATION" "mm"
state real RAINSH ij misc 1 - rh01du "RAINSH" "ACCUMULATED SHALLOW CUMULUS PRECIPITATION" "mm"
state real RAINNC ij misc 1 - rh01du "RAINNC" "ACCUMULATED TOTAL GRID SCALE PRECIPITATION" "mm"
Expand Down Expand Up @@ -1543,7 +1545,9 @@ state integer STEPCU - misc 1 - r "S
state real RTHRATEN ikj misc 1 - rd "RTHRATEN" "THETA TENDENCY DUE TO RADIATION" "K s-1"
state real RTHRATENLW ikj misc 1 - r "RTHRATLW" "UNCOUPLED THETA TENDENCY DUE TO LONG WAVE RADIATION" "K s-1"
state real RTHRATENSW ikj misc 1 - r "RTHRATSW" "UNCOUPLED THETA TENDENCY DUE TO SHORT WAVE RADIATION" "K s-1"
state real CLDFRA ikj misc 1 - rh "CLDFRA" "CLOUD FRACTION" ""
state real CLDFRA ikj misc 1 - rh "CLDFRA" "CLOUD FRACTION" ""
state real CONVCLD ij misc 1 - r "CONVCLD" "BMJ CONVECTIVE CLOUD" "kg m-2"
state real CCLDFRA ikj misc 1 - r "CCLDFRA" "CONVECTIVE CLOUD FRACTION" ""
state real CLDFRA_OLD ikj misc 1 - r "CLDFRA_OLD" "previous time level cldfra" ""
state real CLDFRA_BL ikj misc 1 - r "CLDFRA_BL" "CLOUD FRACTION pbl" ""
state real CLDT ij misc 1 - - "CFRACT" "TOTAL CLOUD FRACTION" ""
Expand Down Expand Up @@ -2334,6 +2338,7 @@ rconfig integer num_soil_cat namelist,physics 1 16
rconfig integer mp_zero_out namelist,physics 1 0 - "mp_zero_out" "microphysics fields set to zero 0=no action taken, 1=all fields but Qv, 2=all fields including Qv" "flag"
rconfig real mp_zero_out_thresh namelist,physics 1 1.e-8 - "mp_zero_out_thresh" "minimum threshold for non-Qv moist fields, below are set to zero" "kg/kg"
rconfig real seaice_threshold namelist,physics 1 100 h "seaice_threshold" "tsk below which which water points are set to sea ice for slab scheme" "K"
rconfig logical bmj_rad_feedback namelist,physics max_domains .false. - "if true include radiative effects of bmj clouds" ""
rconfig integer sst_update namelist,physics 1 0 h "sst_update" "update sst from wrflowinp file 0=no, 1=yes" ""

rconfig integer sst_skin namelist,physics 1 0 h "sst_skin" "calculate sst skin temperature 0=no, 1=yes" ""
Expand Down Expand Up @@ -2913,7 +2918,7 @@ package mynnpblscheme3_dfi bl_pbl_physics_dfi==6 - dfi_scalar:df

package nocuscheme cu_physics==0 - -
package kfetascheme cu_physics==1 - state:w0avg
package bmjscheme cu_physics==2 - -
package bmjscheme cu_physics==2 - state:qcconv,qiconv,convcld,ccldfra
package gfscheme cu_physics==3 - state:cugd_qvten,cugd_tten,cugd_qvtens,cugd_ttens,cugd_qcten,xmb_shallow,k22_shallow,kbcon_shallow,ktop_shallow
package scalesasscheme cu_physics==4 - -
package g3scheme cu_physics==5 - state:cugd_qvten,cugd_tten,cugd_qvtens,cugd_ttens,cugd_qcten,xmb_shallow,k22_shallow,kbcon_shallow,ktop_shallow
Expand Down
11 changes: 8 additions & 3 deletions Registry/Registry.NMM
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,8 @@ state real t_adj ijk dyn_nmm 1 - rd=(DownNear) "T_ADJ" "T
state real t_old ijk dyn_nmm 1 - r "T_OLD" "T before last call to precip" "K"
state real zero_3d ijk dyn_nmm 1 - r
state real W0AVG ikj dyn_nmm 1 - r "W0AVG" "AVERAGE VERTICAL VELOCITY FOR KF CUMULUS SCHEME" "m s-1"
state real qcconv ikj dyn_nmm 1 - r "QCCONV" "CLOUD MIXING RATIO FOR BMJ CUMULUS SCHEME" "kg kg-1"
state real qiconv ikj dyn_nmm 1 - r "QICONV" "ICE MIXING RATIO FOR BMJ CUMULUS SCHEME" "kg kg-1"
state real AKHS_OUT ij dyn_nmm 1 - rh023 "AKHS_OUT" "Output sfc exch coeff for heat" "m2 s-1"
state real AKMS_OUT ij dyn_nmm 1 - rh023 "AKMS_OUT" "Output sfc exch coeff for momentum" "m2 s-1"
#
Expand Down Expand Up @@ -588,7 +590,9 @@ state real rrw ijkb dyn_nmm 1 - rh "RRW" "Tracer"
state real f_ice ikj dyn_nmm 1 - rh023d=(DownMassIKJ:@EExtrap,0.0)u=(UpMassIKJ:@EExtrap,0.0) "F_ICE" "Frozen fraction of CWM" ""
state real f_rain ikj dyn_nmm 1 - rh023d=(DownMassIKJ:@EExtrap,0.0)u=(UpMassIKJ:@EExtrap,0.0) "F_RAIN" "Rain fraction of liquid part of CWM" ""
state real f_rimef ikj dyn_nmm 1 - rh023d=(DownMassIKJ:@EExtrap,1.0)u=(UpMassIKJ:@EExtrap,1.0) "F_RIMEF" "Rime factor" ""
state real cldfra ijk dyn_nmm 1 - rh023 "CLDFRA" "Cloud fraction" ""
state real cldfra ijk dyn_nmm 1 - rh023 "CLDFRA" "Cloud fraction" ""
state real CONVCLD ij dyn_nmm 1 - r "CONVCLD" "BMJ CONVECTIVE CLOUD" "kg m-2"
state real CCLDFRA ikj dyn_nmm 1 - r "CCLDFRA" "CONVECTIVE CLOUD FRACTION" ""
state real sr ij dyn_nmm 1 - irh023 "SR" "Timestep mass ratio of snow:precip" ""
state real cfrach ij dyn_nmm 1 - rh023d=(DownCopy) "CFRACH" "High cloud fraction" ""
state real cfracl ij dyn_nmm 1 - rh023d=(DownCopy) "CFRACL" "Low cloud fraction" ""
Expand Down Expand Up @@ -1493,8 +1497,9 @@ rconfig real seaice_snowdepth_max namelist,physics 1 1.E10
rconfig real seaice_snowdepth_min namelist,physics 1 0.001 - "seaice_snowdepth_min" "Minimum snow depth (m) on sea ice"
rconfig integer seaice_thickness_opt namelist,physics 1 0 - "seaice_thickness_opt" "Method for setting sea-ice thickness"
rconfig real seaice_thickness_default namelist,physics 1 3.0 - "seaice_thickness_default" "Default value for sea-ice thickness"
rconfig logical tice2tsk_if2cold namelist,physics 1 .false. - "tice2tsk_if2cold" "Avoid low ice temps when ice frac and Tsk are inconsistent"
rconfig logical tice2tsk_if2cold namelist,physics 1 .false. - "tice2tsk_if2cold" "Avoid low ice temps when ice frac and Tsk are inconsistent"
rconfig integer sst_update namelist,physics 1 0 i01rh "sst_update" "update sst from wrflowinp file 0=no, 1=yes" ""
rconfig logical bmj_rad_feedback namelist,physics max_domains .false. - "if true include radiative effects of bmj clouds" ""
rconfig integer sf_urban_physics namelist,physics max_domains 0 h "sf_urban_physics" "activate urban model 0=no, 1=Noah_UCM 2=BEP_UCM" ""
rconfig logical usemonalb namelist,physics 1 .true. h "usemonalb" "use 2d field vs table values false=table, True=2d" ""
rconfig logical rdmaxalb namelist,physics 1 .true. h "rdmaxalb" "false set it to table values" ""
Expand Down Expand Up @@ -1858,7 +1863,7 @@ package shinhongscheme bl_pbl_physics==11 - -
package fitchscheme windfarm_opt==1 - -

package kfetascheme cu_physics==1 - -
package bmjscheme cu_physics==2 - -
package bmjscheme cu_physics==2 - state:qcconv,qiconv,convcld,ccldfra
package gdscheme cu_physics==93 - -
package sasscheme cu_physics==94 - state:hpbl2d,heat2d,evap2d
package scalesasscheme cu_physics==4 - state:hpbl2d,heat2d,evap2d
Expand Down
6 changes: 6 additions & 0 deletions dyn_em/module_first_rk_step_part1.F
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,9 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& , CLDT=grid%cldt, ZNU=grid%znu &
!ZCX-
& , CLDFRA=grid%cldfra, CLDFRA_MP_ALL=grid%cldfra_mp_all &
& , CCLDFRA=grid%ccldfra &
& , QCCONV=grid%qcconv, QICONV=grid%qiconv &
& , BMJ_RAD_FEEDBACK=config_flags%bmj_rad_feedback &
& , LRADIUS=grid%LRADIUS,IRADIUS=grid%IRADIUS & !BSINGH(01/22/2014)
& , CLDFRA_DP=grid%cldfra_dp & ! ckay for subgrid cloud
& , CLDFRA_SH=grid%cldfra_sh &
Expand Down Expand Up @@ -1135,6 +1138,8 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& ,ITIMESTEP=grid%itimestep ,DT=grid%dt ,DX=grid%dx &
& ,DX2D=grid%dx2d, AREA2D=grid%area2d &
& ,CUDT=grid%cudt,CURR_SECS=curr_secs,ADAPT_STEP_FLAG=adapt_step_flag &
& ,CCLDFRA=grid%ccldfra ,CONVCLD=grid%convcld &
& ,QCCONV=grid%qcconv ,QICONV=grid%qiconv &
& ,CUDTACTTIME=grid%cudtacttime &
& ,RAINC=grid%rainc ,RAINCV=grid%raincv ,PRATEC=grid%pratec &
& ,NCA=grid%nca &
Expand Down Expand Up @@ -1231,6 +1236,7 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
& ,lengath2d=grid%lengath2d &
! Selection flag
& ,pgcon=config_flags%sas_pgcon &
& ,BMJ_RAD_FEEDBACK=config_flags%bmj_rad_feedback &
& ,CU_PHYSICS=config_flags%cu_physics &
& ,BL_PBL_PHYSICS=config_flags%bl_pbl_physics &
& ,SF_SFCLAY_PHYSICS=config_flags%sf_sfclay_physics &
Expand Down
6 changes: 3 additions & 3 deletions dyn_em/start_em.F
Original file line number Diff line number Diff line change
Expand Up @@ -1035,15 +1035,15 @@ SUBROUTINE start_domain_em ( grid, allowed_to_read &
grid%re_cloud_gsfc, grid%re_ice_gsfc, & ! Goddard
grid%re_snow_gsfc, grid%re_graupel_gsfc, & ! Goddard
grid%re_hail_gsfc, grid%re_rain_gsfc, & ! Goddard
grid%nca,grid%swrad_scat, &
grid%nca,grid%swrad_scat, &
grid%cldefi,grid%lowlyr, &
grid%mass_flux, &
grid%mass_flux, &
grid%rthften, grid%rqvften, &
grid%cldfra, &
#if (WRF_CHEM == 1)
grid%cldfra_old, &
#else
cldfra_old, &
cldfra_old, &
#endif
grid%glw,grid%gsw,grid%emiss,grid%embck, &
grid%lu_index, &
Expand Down
6 changes: 6 additions & 0 deletions dyn_nmm/module_PHYSICS_CALLS.F
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,9 @@ SUBROUTINE RADIATION(NTSD,DT,JULDAY,JULYR,XTIME,JULIAN &
& ,cldovrlp=config_flags%cldovrlp & ! J. Henderson AER: cldovrlp namelist value
& ,WARM_RAIN=WARM_RAIN &
& ,SWDOWNC=TOTSWDNC,CLDFRA=CLFR &
& ,CCLDFRA=grid%ccldfra &
& ,QCCONV=grid%qcconv,QICONV=grid%qiconv &
& ,BMJ_RAD_FEEDBACK=config_flags%bmj_rad_feedback &
& ,SWUPT=SWUPT &
& ,SWUPTC=SWUPTC &
& ,SWDNT=SWDNT &
Expand Down Expand Up @@ -2863,6 +2866,8 @@ SUBROUTINE CUCNVC(NTSD,DT,NCNVC,NRADS,NRADL &
& ,ITIMESTEP=NTSD,DT=DT,DX=GPS &
& ,RAINC=RAINC,RAINCV=RAINCV,NCA=NCA &
& ,CLDFRA_DP=CLDFRA_DP,CLDFRA_SH=CLDFRA_SH &
& ,CCLDFRA=grid%ccldfra, CONVCLD=grid%convcld &
& ,QCCONV=grid%qcconv, QICONV=grid%qiconv &
& ,QC_CU=QC_CU, QI_CU=QI_CU &
& ,DZ8W=DZ,P8W=P8W,FORCET=TTEN,FORCEQ=QTEN &
& ,CLDEFI=CLDEFI,LOWLYR=LOWLYR,XLAND=XLAND &
Expand Down Expand Up @@ -2913,6 +2918,7 @@ SUBROUTINE CUCNVC(NTSD,DT,NCNVC,NRADS,NRADL &
& ,shalconv=config_flags%sas_shal_conv &
& ,shal_pgcon=config_flags%sas_shal_pgcon &
& ,IS_CAMMGMP_USED=IS_CAMMGMP_USED &
& ,BMJ_RAD_FEEDBACK=config_flags%bmj_rad_feedback &
! Selection argument
& ,CU_PHYSICS=CONFIG_FLAGS%CU_PHYSICS &
& ,MP_PHYSICS=CONFIG_FLAGS%MP_PHYSICS &
Expand Down
Loading