Skip to content

Commit 078507d

Browse files
authored
MYNN-EDMF Update from CCPP to WRF (wrf-model#1788)
MYNN-EDMF Update from CCPP to WRF TYPE: bug fix/enhancement/new feature KEYWORDS: MYNN EDMF closure subgrid clouds CCPP universalization SOURCE: Joseph Olson (NOAA-GSL), Wayne Angevine (NOAA-CSL) DESCRIPTION OF CHANGES: - Vacate bl_pbl_physics = 6; will instead regulate the closure level with new namelist variable “bl_mynn_closure”; now has 3 options: level 2.5, 2.6, 3.0. This alone required changes in many files beyond the MYNN code. - TKE budget fix; change bl_mynn_tkebudget to tke_budget (logical), so it’s a generic flag for other schemes to use - Universalization of MYNN-EDMF for CCPP and WRF-ARW/MPAS - Added a new WRF-specific wrapper called in module_pbl_driver.F - Added a new WRF-specific module for defining constants - Reordering of subroutines; bring driver to the top - Improved conservation of heat/moisture - Greatly improved global/medium-range performance - Improved performance for hurricanes - but still not directly tuned for hurricanes - New higher-order moment cloud PDF; improved SGS clouds - New downdraft MF option for turbulence related to cloud-top cooling (still work in progress) - Many misc tuning - Many updated comments - Bug fix for mixing in WRF_CHEM applications - Merged in new qnbca additions since last update - will probably need to modify again soon - Lingering (but not required for this commit): - Kind_physics (still different between WRF and CCPP) LIST OF MODIFIED FILES: M Registry/Registry.EM_COMMON M Registry/registry.chem M dyn_em/module_big_step_utilities_em.F M dyn_em/module_first_rk_step_part1.F M dyn_em/solve_em.F M main/depend.common M phys/Makefile M phys/module_bl_fogdes.F M phys/module_bl_mynn.F M phys/module_pbl_driver.F M phys/module_physics_addtendc.F M phys/module_physics_init.F M phys/module_sf_fogdes.F M phys/module_shcu_camuwshcu.F M share/module_check_a_mundo.F M wrftladj/module_pbl_driver_ad.F M wrftladj/module_pbl_driver_tl.F M wrftladj/module_physics_addtendc_tl.F M wrftladj/solve_em_ad.F M wrftladj/solve_em_tl.F M chem/chemics_init.F M chem/dry_dep_driver.F A phys/module_bl_mynn_common.F A phys/module_bl_mynn_wrapper.F TESTS CONDUCTED: 1. Most of the rigorous scientific testing was done in the CCPP framework before merging into WRF 2. Several case studies in WRF were performed after merging with strict debugging 2. All regression tests have now passed. RELEASE NOTE: overview of changes: A substantial update to the MYNN-EDMF, including a reorganization of the subroutines, as part of the “universalization efforts” which are meant to keep the scheme similar in all dycores. The major physics changes include (1) improved conservation of scalars which improves performance in medium-range global forecasting, (2) revised subgrid clouds which leverages the prognostic q’2, (3) vacate bl_pbl_physics = 6 (now only run with bl_pbl_physics = 5); will instead regulate the closure level with new namelist variable “bl_mynn_closure” set to 2.5, 2.6, or 3.0, (4) important bug fixes for the TKE budget and the bl_mynn_tkebudget flag is not renamed to tke_budget for use in other schemes (although may not be hooked up for other schemes yet), (5) new downdraft option (hidden hard-coded flag in module_bl_mynn.F) but still under development to best fit within the MYNN-EDMF, (6) and many miscellaneous tuning/minor bug fixes. For its performance evaluation, please see the following: [Examples of MYNN improvements.pdf](https://github.com/wrf-model/WRF/files/10125487/Examples.of.MYNN.improvements.pdf)
1 parent 7639166 commit 078507d

26 files changed

+6991
-4969
lines changed

Registry/Registry.EM_COMMON

+6-6
Original file line numberDiff line numberDiff line change
@@ -1106,6 +1106,7 @@ state real tsq ikj misc 1 - r "ts
11061106
state real qsq ikj misc 1 - r "qsq" "total water variance" "(kg/kg)**2"
11071107
state real cov ikj misc 1 - r "cov" "total water-liquid water pottemp covariance" "K kg/kg"
11081108
state real Sh3d ikj misc 1 - r "Sh3d" "Stability function for heat" ""
1109+
state real Sm3d ikj misc 1 - r "Sm3d" "Stability function for momentum" ""
11091110
state real ch ij misc 1 - - "ch" "surface exchange coeff for heat" "m s-1"
11101111
#state real K_m ikj misc 1 - - "K_m" "EXCHANGE COEFFICIENT for momentum "
11111112
#state real K_h ikj misc 1 - - "K_h" "EXCHANGE COEFFICIENT for heat "
@@ -2426,7 +2427,7 @@ rconfig integer irr_ph namelist,physics max_domains 0
24262427

24272428
rconfig integer sf_surface_physics namelist,physics max_domains -1 rh "sf_surface_physics" "" ""
24282429
rconfig integer bl_pbl_physics namelist,physics max_domains -1 rh "bl_pbl_physics" "" ""
2429-
rconfig integer bl_mynn_tkebudget namelist,physics max_domains 0 rh "bl_mynn_tkebudget" "" ""
2430+
rconfig integer tke_budget namelist,physics max_domains 0 rh "tke_budget" "" ""
24302431
rconfig integer ysu_topdown_pblmix namelist,physics 1 1 rh "ysu_topdown_pblmix" "" ""
24312432
rconfig integer shinhong_tke_diag namelist,physics max_domains 0 rh "shinhong_tke_diag" "" ""
24322433
rconfig logical bl_mynn_tkeadvect namelist,physics max_domains .false. rh "bl_mynn_tkeadvect" "" ""
@@ -2440,6 +2441,7 @@ rconfig integer bl_mynn_output namelist,physics max_domains 0
24402441
rconfig integer bl_mynn_cloudmix namelist,physics max_domains 1 irh "bl_mynn_cloudmix" "0:off,1:activate mixing of all cloud species" ""
24412442
rconfig integer bl_mynn_mixqt namelist,physics max_domains 0 irh "bl_mynn_mixqt" "0:mix moisture species separate,1: mix total water" ""
24422443
rconfig integer icloud_bl namelist,physics 1 1 irh "icloud_bl" "0:no subgrid cloud-radiation coupling,1:activated" ""
2444+
rconfig real bl_mynn_closure namelist,physics 1 2.6 irh "bl_mynn_closure" "2.5: level2.5, 2.6: level 2.6, 3.0: level 3.0" ""
24432445
rconfig integer mfshconv namelist,physics max_domains 1 rh "mfshconv" "To activate mass flux scheme with qnse, 1=true or 0=false" ""
24442446
rconfig integer sf_urban_physics namelist,physics max_domains 0 rh "sf_urban_physics" "activate urban model 0=no, 1=Noah_UCM 2=BEP_UCM" ""
24452447
rconfig real BLDT namelist,physics max_domains 0 h "BLDT" "" ""
@@ -3110,8 +3112,7 @@ package ysuscheme bl_pbl_physics==1 - -
31103112
package myjpblscheme bl_pbl_physics==2 - state:tke_pbl,el_pbl
31113113
package gfsscheme bl_pbl_physics==3 - -
31123114
package qnsepblscheme bl_pbl_physics==4 - state:tke_pbl,el_pbl,massflux_EDKF,entr_EDKF,detr_EDKF,thl_up,thv_up,rv_up,rt_up,rc_up,u_up,v_up,frac_up,rc_mf
3113-
package mynnpblscheme2 bl_pbl_physics==5 - scalar:qke_adv;state:qke,tke_pbl,sh3d,tsq,qsq,cov,el_pbl
3114-
package mynnpblscheme3 bl_pbl_physics==6 - scalar:qke_adv;state:qke,tke_pbl,sh3d,tsq,qsq,cov,el_pbl
3115+
package mynnpblscheme bl_pbl_physics==5 - scalar:qke_adv;state:qke,tke_pbl,sh3d,sm3d,tsq,qsq,cov,el_pbl
31153116
package acmpblscheme bl_pbl_physics==7 - -
31163117
package boulacscheme bl_pbl_physics==8 - state:el_pbl,tke_pbl,wu_tur,wv_tur,wt_tur,wq_tur
31173118
package camuwpblscheme bl_pbl_physics==9 - state:tauresx2d,tauresy2d,tpert2d,qpert2d,wpert2d,tke_pbl,smaw3d,wsedl3d,turbtype3d
@@ -3121,16 +3122,15 @@ package gbmpblscheme bl_pbl_physics==12 - state:exch_tk
31213122
package eepsscheme bl_pbl_physics==16 - scalar:pek_adv,pep_adv;state:tke_pbl,pep_pbl
31223123
package mrfscheme bl_pbl_physics==99 - -
31233124

3124-
package mynn_tkebudget bl_mynn_tkebudget==1 - state:qSHEAR,qBUOY,qDISS,qWT,dqke
3125+
package tkebudget tke_budget==1 - state:qSHEAR,qBUOY,qDISS,qWT,dqke
31253126
package mynn_dmp_edmf bl_mynn_edmf==1 - state:ktop_plume,maxmf,nupdraft
31263127
package mynn_3Doutput bl_mynn_output==1 - state:edmf_a,edmf_w,edmf_thl,edmf_qt,edmf_ent,edmf_qc,sub_thl3D,sub_sqv3D,det_thl3D,det_sqv3D
31273128
package pbl_cloud icloud_bl==1 - state:cldfra_bl,qc_bl,qi_bl
31283129

31293130
package sms_3dtke km_opt==5 - state:gamu,gamv,nlflux,dlk,l_diss,elmin,xkmv_meso
31303131

31313132
# dfi
3132-
package mynnpblscheme2_dfi bl_pbl_physics_dfi==5 - dfi_scalar:dfi_qke_adv
3133-
package mynnpblscheme3_dfi bl_pbl_physics_dfi==6 - dfi_scalar:dfi_qke_adv
3133+
package mynnpblscheme_dfi bl_pbl_physics_dfi==5 - dfi_scalar:dfi_qke_adv
31343134

31353135
package nocuscheme cu_physics==0 - -
31363136
package kfetascheme cu_physics==1 - state:w0avg

Registry/registry.chem

+1
Original file line numberDiff line numberDiff line change
@@ -3779,6 +3779,7 @@ rconfig integer cam_mam_mode namelist,chem 1 3
37793779
rconfig integer cam_mam_nspec namelist,chem 1 85 irh "cam_mam_nspec" "" ""
37803780
rconfig logical CAM_MP_MAM_cpled namelist,chem 1 .true. irh "CAM_MP_MAM_cpled" "" ""
37813781
rconfig integer mozart_ph_diag namelist,chem 1 0 rh "mozart_ph_diag" "" ""
3782+
rconfig logical mynn_chem_vertmx namelist,chem 1 .false. rh "mynn_chem_vertmx" "" ""
37823783

37833784
# CLM inputs
37843785
rconfig character megan_specifier namelist,physics max_mgnspc " " - "map from Megan2.1 to WRF species" "" ""

chem/chemics_init.F

+6-2
Original file line numberDiff line numberDiff line change
@@ -612,14 +612,18 @@ subroutine chem_init (id,chem,emis_ant,scalar,dt,bioemdt,photdt,chemdt,stepbioe,
612612

613613
! Set the num_vert_mix variable if using ACM
614614
num_vert_mix = 0
615-
IF ( config_flags%bl_pbl_physics == ACMPBLSCHEME ) THEN
615+
IF ( config_flags%bl_pbl_physics == ACMPBLSCHEME .or. config_flags%bl_pbl_physics == MYNNPBLSCHEME) THEN
616616
mix_select: SELECT CASE(config_flags%chem_opt)
617617
CASE (RADM2SORG_AQ, RADM2SORG_AQCHEM, RACMSORG_AQ, RACMSORG_AQCHEM_KPP, CBMZ_MOSAIC_4BIN_AQ, CBMZ_MOSAIC_8BIN_AQ, CBMZSORG_AQ, &
618618
CBMZ_MOSAIC_DMS_4BIN, CBMZ_MOSAIC_DMS_8BIN, CBMZ_MOSAIC_DMS_4BIN_AQ, CBMZ_MOSAIC_DMS_8BIN_AQ, &
619619
CRI_MOSAIC_8BIN_AQ_KPP, CRI_MOSAIC_4BIN_AQ_KPP)
620620
num_vert_mix = numgas
621621
CASE DEFAULT
622-
num_vert_mix = num_chem
622+
IF (config_flags%mynn_chem_vertmx) THEN
623+
num_vert_mix = num_chem
624+
ELSE
625+
num_vert_mix = 0
626+
ENDIF
623627
END SELECT mix_select
624628
if(num_vert_mix .gt. config_flags%ndepvel) then
625629
write(message_txt,'(A30,2(I8,2x))') 'chem_init: num_vert_mix and ndepvel ',num_vert_mix,config_flags%ndepvel

chem/dry_dep_driver.F

+15-12
Original file line numberDiff line numberDiff line change
@@ -752,18 +752,20 @@ subroutine dry_dep_driver(id,curr_secs,ktau,dtstep,config_flags, &
752752
SAPRC99_MOSAIC_8BIN_VBS2_AQ_KPP, &
753753
CB05_SORG_AQ_KPP, CB05_SORG_VBS_AQ_KPP)
754754
if(.not.is_aerosol(nv))then ! mix gases not aerosol
755-
call vertmx(dtstep,pblst,ekmfull,dryrho_1d, &
755+
if (.not.config_flags%mynn_chem_vertmx) then
756+
call vertmx(dtstep,pblst,ekmfull,dryrho_1d, &
756757
zzfull,zz,ddvel(i,j,nv),kts,kte)
757-
758+
endif
758759
endif
759760
!The default case below does turbulent mixing for all gas and aerosol species
760761
!If aqueous phase is not activated
761762
!It requires ddvel array as a boundary condition near surface for flux of species
762763
!The top boundary condition for eddy diffusivity is zero
763764
CASE DEFAULT
764-
call vertmx(dtstep,pblst,ekmfull,dryrho_1d, &
765+
if (.not.config_flags%mynn_chem_vertmx) then
766+
call vertmx(dtstep,pblst,ekmfull,dryrho_1d, &
765767
zzfull,zz,ddvel(i,j,nv),kts,kte)
766-
768+
endif
767769
END SELECT mix_select
768770

769771
! chem is in ppmv
@@ -1038,17 +1040,18 @@ subroutine dry_dep_driver(id,curr_secs,ktau,dtstep,config_flags, &
10381040
!
10391041
CASE (TRACER_SMOKE,TRACER_TEST1,TRACER_TEST2)
10401042
CALL wrf_debug(15,'DOING TRACER MIXING, 1 SPECIE ONLY')
1041-
do nv=2,num_tracer
1042-
do k=kts,kte
1043-
pblst(k)=max(epsilc,tracer(i,k,j,nv))
1044-
enddo
1045-
1043+
do nv=2,num_tracer
1044+
do k=kts,kte
1045+
pblst(k)=max(epsilc,tracer(i,k,j,nv))
1046+
enddo
1047+
if (.not.config_flags%mynn_chem_vertmx) then
10461048
call vertmx(dtstep,pblst,ekmfull,dryrho_1d, &
10471049
zzfull,zz,0.,kts,kte)
1048-
do k=kts,kte-1
1049-
tracer(i,k,j,nv)=max(epsilc,pblst(k))
1050+
endif
1051+
do k=kts,kte-1
1052+
tracer(i,k,j,nv)=max(epsilc,pblst(k))
1053+
enddo
10501054
enddo
1051-
enddo
10521055
CASE DEFAULT
10531056
! CALL wrf_debug(15,'NOT YET DEFINED')
10541057
END SELECT tracer_select

dyn_em/module_big_step_utilities_em.F

+1-1
Original file line numberDiff line numberDiff line change
@@ -5707,7 +5707,7 @@ SUBROUTINE moist_physics_finish_em( t_new, t_old, t0, mut, &
57075707
mpten=max(-config_flags%mp_tend_lim*dt, mpten)
57085708

57095709
#if ( WRF_DFI_RADAR == 1 )
5710-
compiler error, not handled yet
5710+
!compiler error, not handled yet
57115711
if(k < k_end ) then
57125712
if(dfi_tten_max < dfi_tten_rad(i,k,j) ) dfi_tten_max = dfi_tten_rad(i,k,j)
57135713
if(old_max < (th_phy(i,k,j)-h_diabatic(i,k,j)) ) old_max=th_phy(i,k,j)-h_diabatic(i,k,j)

dyn_em/module_first_rk_step_part1.F

+13-11
Original file line numberDiff line numberDiff line change
@@ -1192,13 +1192,13 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
11921192
& ,QNBCA_CURR=scalar(ims,kms,jms,P_QNBCA),F_QNBCA=F_QNBCA &
11931193
& ,HOL=HOL, MOL=grid%mol, REGIME=grid%REGIME &
11941194
!mynn mp@
1195-
& ,QKE=grid%qke, Sh3d=grid%sh3d &
1195+
& ,QKE=grid%qke, Sh3d=grid%sh3d, Sm3d=grid%sm3d &
11961196
& ,QKE_ADV=scalar(ims,kms,jms,P_qke_adv) & !ACF-QKE advection
11971197
& ,bl_mynn_tkeadvect=config_flags%bl_mynn_tkeadvect & !ACF-QKE advection
11981198
& ,tsq=grid%tsq, qsq=grid%qsq, cov=grid%cov &
11991199
& ,DQKE=grid%dqke,QWT=grid%qWT &
12001200
& ,QSHEAR=grid%qSHEAR,QBUOY=grid%qBUOY,QDISS=grid%qDISS &
1201-
& ,bl_mynn_tkebudget=config_flags%bl_mynn_tkebudget &
1201+
& ,tke_budget=config_flags%tke_budget &
12021202
& ,bl_mynn_cloudpdf=config_flags%bl_mynn_cloudpdf &
12031203
& ,bl_mynn_mixlength=config_flags%bl_mynn_mixlength &
12041204
& ,icloud_bl=config_flags%icloud_bl &
@@ -1210,6 +1210,7 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
12101210
& ,bl_mynn_output=config_flags%bl_mynn_output &
12111211
& ,bl_mynn_cloudmix=config_flags%bl_mynn_cloudmix &
12121212
& ,bl_mynn_mixqt=config_flags%bl_mynn_mixqt &
1213+
& ,bl_mynn_closure=config_flags%bl_mynn_closure &
12131214
& ,edmf_a=grid%edmf_a,edmf_w=grid%edmf_w &
12141215
& ,edmf_thl=grid%edmf_thl,edmf_qt=grid%edmf_qt &
12151216
& ,edmf_ent=grid%edmf_ent,edmf_qc=grid%edmf_qc &
@@ -1275,7 +1276,7 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
12751276
& ,pert_mynn_qke=config_flags%pert_mynn_qke &
12761277
!Variables required for camuwpbl scheme
12771278
& ,Z_AT_W=grid%z_at_w,CLDFRA_OLD_MP=grid%cldfra_old_mp &
1278-
& ,CLDFRA=grid%cldfra &
1279+
& ,CLDFRA=grid%cldfra &
12791280
& ,RTHRATENLW=grid%rthratenlw,TAURESX2D=grid%tauresx2d &
12801281
& ,TAURESY2D=grid%tauresy2d &
12811282
& ,TPERT2D=grid%tpert2d,QPERT2D=grid%qpert2d &
@@ -1291,21 +1292,22 @@ SUBROUTINE first_rk_step_part1 ( grid , config_flags &
12911292
! for pbl mixing of scalars and tracers
12921293
& ,SCALAR=scalar,SCALAR_TEND=scalar_tend,NUM_SCALAR=num_scalar&
12931294
& ,TRACER=tracer,TRACER_TEND=tracer_tend,NUM_TRACER=num_tracer&
1294-
& ,SCALAR_PBLMIX=config_flags%scalar_pblmix &
1295-
& ,TRACER_PBLMIX=config_flags%tracer_pblmix &
1295+
& ,SCALAR_PBLMIX=config_flags%scalar_pblmix &
1296+
& ,TRACER_PBLMIX=config_flags%tracer_pblmix &
12961297
#if (WRF_CHEM == 1)
1297-
& ,CHEM=chem,VD=grid%dep_vel &
1298-
& ,NCHEM=num_chem,kdvel=config_flags%kdepvel &
1299-
& ,ndvel=config_flags%ndepvel &
1300-
& ,NUM_VERT_MIX=grid%num_vert_mix &
1298+
& ,mynn_chem_vertmx=config_flags%mynn_chem_vertmx &
1299+
& ,CHEM=chem,VD=grid%dep_vel &
1300+
& ,NCHEM=num_chem,kdvel=config_flags%kdepvel &
1301+
& ,ndvel=config_flags%ndepvel &
1302+
& ,NUM_VERT_MIX=grid%num_vert_mix &
13011303
#endif
1302-
& ,QNORM=grid%QNORM, fasdas=config_flags%fasdas & !fasdas
1304+
& ,QNORM=grid%QNORM, fasdas=config_flags%fasdas & !fasdas
13031305
& )
13041306
13051307
#if (WRF_CHEM == 1)
13061308
#ifdef DM_PARALLEL
13071309
IF ( num_chem >= PARAM_FIRST_SCALAR .AND. (config_flags%bl_pbl_physics == &
1308-
& mynnpblscheme2 .OR. config_flags%bl_pbl_physics == mynnpblscheme3) ) then
1310+
& mynnpblscheme) ) then
13091311
CALL wrf_debug ( 200 , ' call HALO CHEM AFTER PBL' )
13101312
IF ( config_flags%h_sca_adv_order <= 4 ) THEN
13111313
# include "HALO_EM_CHEM_E_3.inc"

dyn_em/solve_em.F

+1-2
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,7 @@ END SUBROUTINE CMAQ_DRIVER
832832
)
833833

834834
#ifdef DM_PARALLEL
835-
IF ( config_flags%bl_pbl_physics == MYNNPBLSCHEME2 .OR. &
836-
config_flags%bl_pbl_physics == MYNNPBLSCHEME3 ) THEN
835+
IF ( config_flags%bl_pbl_physics == MYNNPBLSCHEME ) THEN
837836
# include "HALO_EM_SCALAR_E_5.inc"
838837
ENDIF
839838
#endif

main/depend.common

+9-6
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,10 @@ module_bl_gfs.o: module_gfs_machine.o \
179179
module_bl_gfsedmf.o: module_gfs_machine.o \
180180
module_gfs_physcons.o
181181

182-
module_bl_mynn.o: ../share/module_model_constants.o
182+
module_bl_mynn.o: module_bl_mynn_common.o
183+
184+
module_bl_mynn_wrapper.o: module_bl_mynn.o \
185+
module_bl_mynn_common.o
183186

184187
module_cam_upper_bc.o: module_cam_shr_kind_mod.o \
185188
module_cam_support.o
@@ -225,11 +228,9 @@ module_sf_mynn.o: module_sf_sfclay.o module_bl_mynn.o \
225228
../share/module_model_constants.o \
226229
../frame/module_wrf_error.o
227230

228-
module_sf_fogdes.o: ../share/module_model_constants.o \
229-
module_bl_mynn.o
231+
module_sf_fogdes.o: ../share/module_model_constants.o
230232

231-
module_bl_fogdes.o: ../share/module_model_constants.o \
232-
module_bl_mynn.o
233+
module_bl_fogdes.o: ../share/module_model_constants.o
233234

234235
module_sf_gfdl.o : \
235236
module_gfs_machine.o \
@@ -551,10 +552,11 @@ module_physics_init.o : \
551552
module_bl_myjpbl.o \
552553
module_bl_qnsepbl.o \
553554
module_bl_mynn.o \
555+
module_bl_mynn_wrapper.o \
554556
module_bl_myjurb.o \
555557
module_bl_boulac.o \
556558
module_bl_camuwpbl_driver.o \
557-
module_bl_temf.o \
559+
module_bl_temf.o \
558560
module_bl_mfshconvpbl.o \
559561
module_cu_kf.o \
560562
module_cu_g3.o \
@@ -691,6 +693,7 @@ module_pbl_driver.o: \
691693
module_bl_gfs.o \
692694
module_bl_gfsedmf.o \
693695
module_bl_mynn.o \
696+
module_bl_mynn_wrapper.o \
694697
module_bl_fogdes.o \
695698
module_bl_gwdo.o \
696699
module_bl_gwdo_gsl.o \

phys/Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,9 @@ MODULES = \
4242
module_bl_myjpbl.o \
4343
module_bl_qnsepbl.o \
4444
module_bl_acm.o \
45-
module_bl_mynn.o \
45+
module_bl_mynn_common.o \
46+
module_bl_mynn.o \
47+
module_bl_mynn_wrapper.o \
4648
module_bl_fogdes.o \
4749
module_bl_gwdo.o \
4850
module_bl_gwdo_gsl.o \

phys/module_bl_fogdes.F

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
MODULE module_bl_fogdes
22

33
USE module_model_constants
4-
USE module_bl_mynn, only: qcgmin, gno, gpw
54

65
!-------------------------------------------------------------------
76
IMPLICIT NONE
87
!-------------------------------------------------------------------
8+
REAL, PARAMETER :: gno=1.0 !original value seems too aggressive: 4.64158883361278196
9+
REAL, PARAMETER :: gpw=5./3., qcgmin=1.e-8
910

1011
CONTAINS
1112

@@ -67,7 +68,6 @@ SUBROUTINE bl_fogdes(&
6768
!-- jte end index for j in tile
6869
!-- kts start index for k in tile
6970
!-- kte end index for k in tile
70-
!******************************************************************
7171
!------------------------------------------------------------------
7272

7373
INTEGER, INTENT(IN) :: ims,ime,jms,jme,kms,kme &

0 commit comments

Comments
 (0)