Skip to content

Commit

Permalink
Move gfdlmp init call to fv_sat_adj init().
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinswales committed May 23, 2024
1 parent d766a64 commit a609ad7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 22 deletions.
19 changes: 0 additions & 19 deletions ccpp/data/GFS_typedefs.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ module GFS_typedefs
use module_radlw_parameters, only: topflw_type, sfcflw_type
use h2o_def, only: levh2o, h2o_coeff
use module_ozphys, only: ty_ozphys
use module_gfdl_cloud_microphys, only: module_gfdl_cloud_microphys_init
use module_gfdl_cloud_microphys_v3, only: module_gfdl_cloud_microphys_v3_init

implicit none

Expand Down Expand Up @@ -4151,10 +4149,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!--- NRL ozone physics
character(len=128) :: err_message

!--- GFDL Microphysics
character(len=128) :: ccpp_errmsg
integer :: ccpp_errflg

! dtend selection: default is to match all variables:
dtend_select(1)='*'
do ipat=2,pat_count
Expand Down Expand Up @@ -4676,19 +4670,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &

!--- GFDL MP parameters
Model%lgfdlmprad = lgfdlmprad
if (Model%imp_physics == Model%imp_physics_gfdl) then
call module_gfdl_cloud_microphys_init(Model%me, Model%master, Model%nlunit, Model%input_nml_file, &
Model%logunit, Model%fn_nml, ccpp_errmsg, ccpp_errflg)
end if
if (Model%imp_physics == Model%imp_physics_gfdl_v3) then
call module_gfdl_cloud_microphys_v3_init(Model%me, Model%master, Model%nlunit, Model%input_nml_file, &
Model%logunit, Model%fn_nml, hydrostatic, ccpp_errmsg, ccpp_errflg)
Model%imp_physics = Model%imp_physics_gfdl !DJS2024 We only need to distinguish v1/v3 for this step.
end if
if (ccpp_errflg .ne. 0) then
write(0,*) 'ERROR initializing GFDL Microphysics: ',ccpp_errmsg
stop
endif

!--- Thompson,GFDL,NSSL MP parameter
Model%lrefres = lrefres
Expand Down
2 changes: 0 additions & 2 deletions ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -10064,8 +10064,6 @@
dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
dependencies = photochem/h2o_def.f,photochem/module_ozphys.F90
dependencies = MP/GFDL_parse_tracers.F90
dependencies = MP/GFDL/v1_2019/module_gfdl_cloud_microphys.F90
dependencies = MP/GFDL/v3_2022/module_gfdl_cloud_microphys_v3.F90

[ccpp-arg-table]
name = GFS_typedefs
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 198 files

0 comments on commit a609ad7

Please sign in to comment.