Skip to content
Closed
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/ufs-community/ccpp-physics
branch = ufs/dev
url = https://github.com/AnningCheng-NOAA/ccpp-physics
branch = mr2_hf
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
6 changes: 3 additions & 3 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -3482,7 +3482,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
integer :: iems = 0 !< 1.0 => Noah lsm
!< 2.0 => Noah MP and RUC lsms
integer :: iaer = 1 !< default aerosol effect in sw only
integer :: iaermdl = 0 !< default tropospheric aerosol model scheme flag
integer :: iaermdl = 1 !< default tropospheric aerosol model scheme flag
!< 0: seasonal global distributed OPAC aerosol climatology
!< 1: monthly global distributed GOCART aerosol climatology
!< 2: GOCART prognostic aerosol model
Expand Down Expand Up @@ -4631,8 +4631,9 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%ialb = ialb
Model%iems = iems
Model%iaer = iaer
Model%iaermdl = iaer/1000
Model%iaerclm = iaerclm
if (iaer/1000 == 1 .or. Model%iccn == 2) then
if (iaer/1000 == 1 .or. Model%iccn == 2 .or. Model%iaermdl ==6 ) then
Model%iaerclm = .true.
ntrcaer = ntrcaerm
else if (iaer/1000 == 2) then
Expand All @@ -4642,7 +4643,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
endif
Model%lalw1bd = lalw1bd
Model%iaerflg = iaerflg
Model%iaermdl = iaermdl
Model%aeros_file = aeros_file
Model%solar_file = solar_file
Model%semis_file = semis_file
Expand Down
Loading