From a4cffec8ee55a7ef4e07043790bf3e43494de2ec Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 20 Mar 2022 11:28:17 -0600 Subject: [PATCH 1/2] Import GFS_interstitial_type from CCPP_typedefs instead of GFS_typedefs --- physics/GFS_suite_interstitial.F90 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/physics/GFS_suite_interstitial.F90 b/physics/GFS_suite_interstitial.F90 index 044912e07..5a8849f08 100644 --- a/physics/GFS_suite_interstitial.F90 +++ b/physics/GFS_suite_interstitial.F90 @@ -16,8 +16,9 @@ end subroutine GFS_suite_interstitial_rad_reset_finalize !! subroutine GFS_suite_interstitial_rad_reset_run (Interstitial, Model, errmsg, errflg) - use machine, only: kind_phys - use GFS_typedefs, only: GFS_control_type, GFS_interstitial_type + use machine, only: kind_phys + use GFS_typedefs, only: GFS_control_type + use CCPP_typedefs, only: GFS_interstitial_type implicit none @@ -52,8 +53,10 @@ end subroutine GFS_suite_interstitial_phys_reset_finalize !! subroutine GFS_suite_interstitial_phys_reset_run (Interstitial, Model, errmsg, errflg) - use machine, only: kind_phys - use GFS_typedefs, only: GFS_control_type, GFS_interstitial_type + use machine, only: kind_phys + use GFS_typedefs, only: GFS_control_type + use CCPP_typedefs, only: GFS_interstitial_type + implicit none @@ -89,7 +92,7 @@ end subroutine GFS_suite_interstitial_1_finalize subroutine GFS_suite_interstitial_1_run (im, levs, ntrac, dtf, dtp, slmsk, area, dxmin, dxinv, pgr, & islmsk, work1, work2, psurf, dudt, dvdt, dtdt, dqdt, errmsg, errflg) - use machine, only: kind_phys + use machine, only: kind_phys implicit none From c2754623fea3b851a5d5c77c9ebe93c117852828 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Sun, 10 Apr 2022 21:04:14 -0600 Subject: [PATCH 2/2] Also change GFS_interstitial_type import in GFS_debug.F90 --- physics/GFS_debug.F90 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/physics/GFS_debug.F90 b/physics/GFS_debug.F90 index f01f25cbc..5b3d8f9c1 100644 --- a/physics/GFS_debug.F90 +++ b/physics/GFS_debug.F90 @@ -316,8 +316,8 @@ module GFS_diagtoscreen !! subroutine GFS_diagtoscreen_init (Model, Data, Interstitial, errmsg, errflg) - use GFS_typedefs, only: GFS_control_type, GFS_data_type, & - GFS_interstitial_type + use GFS_typedefs, only: GFS_control_type, GFS_data_type + use CCPP_typedefs, only: GFS_interstitial_type implicit none @@ -349,8 +349,8 @@ end subroutine GFS_diagtoscreen_init !! subroutine GFS_diagtoscreen_timestep_init (Model, Data, Interstitial, errmsg, errflg) - use GFS_typedefs, only: GFS_control_type, GFS_data_type, & - GFS_interstitial_type + use GFS_typedefs, only: GFS_control_type, GFS_data_type + use CCPP_typedefs, only: GFS_interstitial_type implicit none @@ -397,8 +397,8 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling, GFS_stateout_type, GFS_sfcprop_type, & GFS_coupling_type, GFS_grid_type, & GFS_tbd_type, GFS_cldprop_type, & - GFS_radtend_type, GFS_diag_type, & - GFS_interstitial_type + GFS_radtend_type, GFS_diag_type + use CCPP_typedefs, only: GFS_interstitial_type implicit none @@ -967,8 +967,8 @@ module GFS_interstitialtoscreen !! subroutine GFS_interstitialtoscreen_init (Model, Data, Interstitial, errmsg, errflg) - use GFS_typedefs, only: GFS_control_type, GFS_data_type, & - GFS_interstitial_type + use GFS_typedefs, only: GFS_control_type, GFS_data_type + use CCPP_typedefs, only: GFS_interstitial_type implicit none @@ -1001,8 +1001,8 @@ end subroutine GFS_interstitialtoscreen_init !! subroutine GFS_interstitialtoscreen_timestep_init (Model, Data, Interstitial, errmsg, errflg) - use GFS_typedefs, only: GFS_control_type, GFS_data_type, & - GFS_interstitial_type + use GFS_typedefs, only: GFS_control_type, GFS_data_type + use CCPP_typedefs, only: GFS_interstitial_type implicit none @@ -1051,8 +1051,8 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup GFS_stateout_type, GFS_sfcprop_type, & GFS_coupling_type, GFS_grid_type, & GFS_tbd_type, GFS_cldprop_type, & - GFS_radtend_type, GFS_diag_type, & - GFS_interstitial_type + GFS_radtend_type, GFS_diag_type + use CCPP_typedefs, only: GFS_interstitial_type implicit none