From 9941edecf67d2af772c264e4fba816040fee3c89 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Tue, 26 Dec 2017 11:40:05 -0700 Subject: [PATCH] Fixed bug in GFS_time_vary_step calling GFS_rad_time_vary_run with local/uninitialized variables ictmflg, isolar instead of the correct parameters defined in physparam --- GFS_layer/GFS_driver.F90 | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/GFS_layer/GFS_driver.F90 b/GFS_layer/GFS_driver.F90 index e9b818372..dd6bb4e88 100644 --- a/GFS_layer/GFS_driver.F90 +++ b/GFS_layer/GFS_driver.F90 @@ -12,8 +12,6 @@ module GFS_driver use module_radsw_parameters, only: topfsw_type, sfcfsw_type use module_radlw_parameters, only: topflw_type, sfcflw_type use funcphys, only: gfuncphys - use GFS_suite_setup_1, only: GFS_suite_setup_1_run - use GFS_suite_setup_2, only: GFS_suite_setup_2_run implicit none @@ -238,6 +236,9 @@ end subroutine GFS_initialize subroutine GFS_time_vary_step (Model, Statein, Stateout, Sfcprop, Coupling, & Grid, Tbd, Cldprop, Radtend, Diag) + use physparam, only: ictmflg, isolar + use GFS_suite_setup_1, only: GFS_suite_setup_1_run + use GFS_suite_setup_2, only: GFS_suite_setup_2_run use GFS_rad_time_vary, only: GFS_rad_time_vary_run implicit none @@ -253,21 +254,11 @@ subroutine GFS_time_vary_step (Model, Statein, Stateout, Sfcprop, Coupling, & type(GFS_radtend_type), intent(inout) :: Radtend(:) type(GFS_diag_type), intent(inout) :: Diag(:) !--- local variables - ! DH* - where are those coming from? - !integer :: nblks, ictmflg, isolar - integer :: ictmflg, isolar - !real(kind=kind_phys) :: rinc(5) real(kind=kind_phys) :: sec call GFS_suite_setup_1_run (Model, sec) - !--- radiation time varying routine -! CCPP - call GFS_rad_time_vary_run(Model,Statein, Tbd, blksz, sec, & - ictmflg, isolar) - - !--- repopulate specific time-varying sfc properties for AMIP/forecast runs - call Gcycle_driver (nblks, Model, Grid, Sfcprop, Cldprop) + call GFS_rad_time_vary_run(Model, Statein, Tbd, blksz, sec, ictmflg, isolar) call GFS_suite_setup_2_run (blksz, Grid, Model, Tbd, Sfcprop, Cldprop, Diag)