From a609ad7974bca303877ec9481152d6eaa31be320 Mon Sep 17 00:00:00 2001
From: Dustin Swales <dustin.swales@noaa.gov>
Date: Thu, 23 May 2024 14:24:29 +0000
Subject: [PATCH] Move gfdlmp init call to fv_sat_adj init().

---
 ccpp/data/GFS_typedefs.F90  | 19 -------------------
 ccpp/data/GFS_typedefs.meta |  2 --
 ccpp/physics                |  2 +-
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
index 9a2eb6fa4..e1a8dc52a 100644
--- a/ccpp/data/GFS_typedefs.F90
+++ b/ccpp/data/GFS_typedefs.F90
@@ -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
 
@@ -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
@@ -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
diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
index dc65cfb80..4723bf732 100644
--- a/ccpp/data/GFS_typedefs.meta
+++ b/ccpp/data/GFS_typedefs.meta
@@ -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
diff --git a/ccpp/physics b/ccpp/physics
index 8aee3daaf..174f598fd 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 8aee3daaf70994e0dfa5116f176f5e705b729ae6
+Subproject commit 174f598fd9661c5edb0b1545eaa3db8ff4beebc5