From 315a301ff1521cf37bbb65ae22b6d42796186fd3 Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Sat, 9 Mar 2024 00:04:38 +0000 Subject: [PATCH 1/8] "point to the mynn pbl, HAILCAST diagnostic updates" --- .gitmodules | 8 ++++---- atmos_cubed_sphere | 2 +- ccpp/driver/GFS_diagnostics.F90 | 12 ++++++++++++ ccpp/physics | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 75876f6fa..e0e22cc0c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere - branch = production/RRFS.v1 + url = https://github.com/haiqinli/GFDL_atmos_cubed_sphere + branch = production/RRFS.v1-mynn [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework branch = production/RRFS.v1 [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = production/RRFS.v1 + url = https://github.com/haiqinli/ccpp-physics + branch = production/RRFS.v1-mynn [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 53413edda..01c092757 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 53413edda574d4d2f349c051529f4d9bab570fe5 +Subproject commit 01c0927577a2ad709f8f9137a580466d057c8e20 diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 9c17c2306..bdc72ad45 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -545,6 +545,18 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,32) enddo + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'csdsf' + ExtDiag(idx)%desc = 'Clear Sky Instantateous Downward Short Wave Flux' + ExtDiag(idx)%unit = 'W/m**2' + ExtDiag(idx)%mod_name = 'gfs_phys' + ExtDiag(idx)%intpl_method = 'bilinear' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%fluxr(:,32) + enddo + idx = idx + 1 ExtDiag(idx)%axes = 2 ExtDiag(idx)%name = 'csulf_ave' diff --git a/ccpp/physics b/ccpp/physics index 09d7f2f99..89533c6fd 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 09d7f2f99fc9cdae91ef92875e2f09cb857bcdf4 +Subproject commit 89533c6fdf16fc103d5f7b3e269cdbd71d69210e From 28c85996c3762241f92a1c203e34e20c300dda46 Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Wed, 13 Mar 2024 03:58:16 +0000 Subject: [PATCH 2/8] "point to the smoke updates for RRFS.v1" --- atmos_cubed_sphere | 2 +- ccpp/data/GFS_typedefs.F90 | 16 ++++++++++++++-- ccpp/data/GFS_typedefs.meta | 24 +++++++++++++++++++++++- ccpp/driver/GFS_diagnostics.F90 | 25 +++++++++++++------------ ccpp/physics | 2 +- 5 files changed, 52 insertions(+), 17 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 01c092757..485d44822 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 01c0927577a2ad709f8f9137a580466d057c8e20 +Subproject commit 485d448224fdc03e7d5969fa39f42bf7e7fa58e9 diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 168d36953..422d1b080 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -649,6 +649,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: max_fplume (:) => null() !< maximum plume rise level real (kind=kind_phys), pointer :: uspdavg (:) => null() !< BL average wind speed real (kind=kind_phys), pointer :: hpbl_thetav (:) => null() !< BL depth parcel method + real (kind=kind_phys), pointer :: rho_dry (:,:) => null() !< dry air density 3D array !--- hourly fire potential index real (kind=kind_phys), pointer :: rrfs_hwp (:) => null() !< hourly fire potential index real (kind=kind_phys), pointer :: rrfs_hwp_ave (:) => null() !< *Average* hourly fire potential index @@ -1534,6 +1535,7 @@ module GFS_typedefs real(kind=kind_phys) :: dust_alpha !< alpha parameter for fengsha dust scheme real(kind=kind_phys) :: dust_gamma !< gamma parameter for fengsha dust scheme real(kind=kind_phys) :: wetdep_ls_alpha !< alpha parameter for wet deposition + real(kind=kind_phys) :: plume_alpha !< alpha parameter for plumerise scheme integer :: ebb_dcycle !< 1:retro; 2:forecast of fire emission integer :: seas_opt integer :: dust_opt @@ -1547,6 +1549,7 @@ module GFS_typedefs integer :: plumerisefire_frq integer :: n_dbg_lines integer :: smoke_forecast + logical :: add_fire_moist_flux ! Flag to add moisture fluxes based on PM2.5 emissions logical :: aero_ind_fdb ! WFA/IFA indirect logical :: aero_dir_fdb ! smoke/dust direct logical :: rrfs_smoke_debug @@ -2354,7 +2357,7 @@ subroutine sfcprop_create (Sfcprop, IM, Model) allocate (Sfcprop%hprime (IM,Model%nmtvr)) allocate (Sfcprop%dust12m_in (IM,12,5)) allocate (Sfcprop%smoke_RRFS(IM,24,2)) - allocate (Sfcprop%smoke2d_RRFS(IM,4)) + allocate (Sfcprop%smoke2d_RRFS(IM,5)) allocate (Sfcprop%emi_in (IM,1)) allocate(Sfcprop%albdirvis_lnd (IM)) allocate(Sfcprop%albdirnir_lnd (IM)) @@ -3503,6 +3506,7 @@ subroutine coupling_create (Coupling, IM, Model) allocate (Coupling%min_fplume(IM)) allocate (Coupling%max_fplume(IM)) allocate (Coupling%uspdavg(IM)) + allocate (Coupling%rho_dry (IM,Model%levs)) allocate (Coupling%hpbl_thetav(IM)) allocate (Coupling%rrfs_hwp (IM)) allocate (Coupling%rrfs_hwp_ave (IM)) @@ -3515,6 +3519,7 @@ subroutine coupling_create (Coupling, IM, Model) Coupling%min_fplume = clear_val Coupling%max_fplume = clear_val Coupling%uspdavg = clear_val + Coupling%rho_dry = clear_val Coupling%hpbl_thetav = clear_val Coupling%rrfs_hwp = clear_val Coupling%rrfs_hwp_ave = clear_val @@ -4220,6 +4225,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & real(kind=kind_phys) :: dust_alpha = 0. real(kind=kind_phys) :: dust_gamma = 0. real(kind=kind_phys) :: wetdep_ls_alpha = 0.5 + real(kind=kind_phys) :: plume_alpha = 0.05 integer :: dust_moist_opt = 1 ! fecan :1 else shao integer :: ebb_dcycle = 1 ! 1:retro; 2:forecast integer :: seas_opt = 2 @@ -4230,10 +4236,11 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: extended_sd_diags = .false. integer :: wetdep_ls_opt = 1 logical :: do_plumerise = .false. + logical :: add_fire_moist_flux = .false. integer :: addsmoke_flag = 1 integer :: plumerisefire_frq = 60 integer :: n_dbg_lines = 3 - integer :: smoke_forecast = 0 ! RRFS-sd read in ebb_smoke + integer :: smoke_forecast = 2 ! RRFS-sd read in ebb_smoke logical :: aero_ind_fdb = .false. ! RRFS-sd wfa/ifa emission logical :: aero_dir_fdb = .false. ! RRFS-sd smoke/dust radiation feedback logical :: rrfs_smoke_debug = .false. ! RRFS-sd plumerise debug @@ -4405,6 +4412,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & rrfs_smoke_debug, do_plumerise, plumerisefire_frq, & addsmoke_flag, enh_mix, mix_chem, smoke_dir_fdb_coef, & do_smoke_transport,smoke_conv_wet_coef,n_dbg_lines, & + add_fire_moist_flux, plume_alpha, & !--- C3/GF closures ichoice,ichoicem,ichoice_s, & !--- (DFI) time ranges with radar-prescribed microphysics tendencies @@ -4633,6 +4641,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%dust_alpha = dust_alpha Model%dust_gamma = dust_gamma Model%wetdep_ls_alpha = wetdep_ls_alpha + Model%plume_alpha = plume_alpha Model%ebb_dcycle = ebb_dcycle Model%seas_opt = seas_opt Model%dust_opt = dust_opt @@ -4645,6 +4654,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%n_dbg_lines = n_dbg_lines Model%plumerisefire_frq = plumerisefire_frq Model%addsmoke_flag = addsmoke_flag + Model%add_fire_moist_flux = add_fire_moist_flux Model%smoke_forecast = smoke_forecast Model%aero_ind_fdb = aero_ind_fdb Model%aero_dir_fdb = aero_dir_fdb @@ -6779,6 +6789,7 @@ subroutine control_print(Model) print *, 'dust_alpha : ',Model%dust_alpha print *, 'dust_gamma : ',Model%dust_gamma print *, 'wetdep_ls_alpha : ',Model%wetdep_ls_alpha + print *, 'plume_alpha : ',Model%plume_alpha print *, 'ebb_dcycle : ',Model%ebb_dcycle print *, 'seas_opt : ',Model%seas_opt print *, 'dust_opt : ',Model%dust_opt @@ -6789,6 +6800,7 @@ subroutine control_print(Model) print *, 'wetdep_ls_opt : ',Model%wetdep_ls_opt print *, 'do_plumerise : ',Model%do_plumerise print *, 'plumerisefire_frq: ',Model%plumerisefire_frq + print *, 'add_fire_moist_flux: ',Model%add_fire_moist_flux print *, 'addsmoke_flag : ',Model%addsmoke_flag print *, 'smoke_forecast : ',Model%smoke_forecast print *, 'aero_ind_fdb : ',Model%aero_ind_fdb diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 9e7bdd260..1a3eaa603 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -945,7 +945,7 @@ standard_name = emission_smoke_prvd_RRFS long_name = emission fire RRFS daily units = various - dimensions = (horizontal_loop_extent,4) + dimensions = (horizontal_loop_extent,5) type = real kind = kind_phys active = (do_smoke_coupling) @@ -3188,6 +3188,14 @@ type = real kind = kind_phys active = (do_smoke_coupling) +[rho_dry] + standard_name = dry_air_density + long_name = dry air density + units = kg m-3 + dimensions = (horizontal_loop_extent,vertical_layer_dimension) + type = real + kind = kind_phys + active = (do_smoke_coupling) [uspdavg] standard_name = mean_wind_speed_in_boundary_layer long_name = average wind speed within the boundary layer @@ -4860,6 +4868,12 @@ units = flag dimensions = () type = logical +[add_fire_moist_flux] + standard_name = flag_for_fire_moisture_flux + long_name = flag to add fire moisture flux + units = flag + dimensions = () + type = logical [isncond_opt] standard_name = control_for_soil_thermal_conductivity_option_in_ruc_lsm long_name = control for soil thermal conductivity option in RUC land surface model @@ -6766,6 +6780,14 @@ type = real kind = kind_phys active = (do_smoke_coupling) +[plume_alpha] + standard_name = alpha_for_plumerise_scheme + long_name = alpha paramter for plumerise scheme + units = none + dimensions = () + type = real + kind = kind_phys + active = (do_smoke_coupling) [ebb_dcycle] standard_name = control_for_diurnal_cycle_of_biomass_burning_emissions long_name = rrfs smoke diurnal cycle option diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index bdc72ad45..dd3f14181 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -4785,6 +4785,19 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var2 => Sfcprop(nb)%fhist enddo + idx = idx + 1 + ExtDiag(idx)%axes = 3 + ExtDiag(idx)%name = 'ebu_smoke' + ExtDiag(idx)%desc = 'smoke emission' + ExtDiag(idx)%unit = 'ug/m2/s' + ExtDiag(idx)%mod_name = 'gfs_phys' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%ebu_smoke(:,:) + enddo + + idx = idx + 1 + if (Model%ebb_dcycle == 2 ) then idx = idx + 1 @@ -4864,18 +4877,6 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop endif smoke_forecast_mode - idx = idx + 1 - ExtDiag(idx)%axes = 3 - ExtDiag(idx)%name = 'ebu_smoke' - ExtDiag(idx)%desc = 'smoke emission' - ExtDiag(idx)%unit = 'ug/m2/s' - ExtDiag(idx)%mod_name = 'gfs_phys' - allocate (ExtDiag(idx)%data(nblks)) - do nb = 1,nblks - ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%ebu_smoke(:,:) - enddo - - idx = idx + 1 ExtDiag(idx)%axes = 3 ExtDiag(idx)%name = 'ext550' ExtDiag(idx)%desc = '3d total extinction at 550nm' diff --git a/ccpp/physics b/ccpp/physics index 89533c6fd..7eab4efc4 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 89533c6fdf16fc103d5f7b3e269cdbd71d69210e +Subproject commit 7eab4efc48f27d662eb372294361431aefae7900 From 27275534443f8aff8a572381c6f1c2018ca317a9 Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Wed, 13 Mar 2024 04:00:59 +0000 Subject: [PATCH 3/8] "update input for smoke" --- io/fv3atm_rrfs_sd_io.F90 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/io/fv3atm_rrfs_sd_io.F90 b/io/fv3atm_rrfs_sd_io.F90 index 93e2981c7..1d00cd74f 100644 --- a/io/fv3atm_rrfs_sd_io.F90 +++ b/io/fv3atm_rrfs_sd_io.F90 @@ -63,7 +63,7 @@ module fv3atm_rrfs_sd_io integer, private :: nvar_dust12m = 5 integer, private :: nvar_emi = 1 integer, private :: nvar_fire = 2 - integer, private :: nvar_fire2d = 4 + integer, private :: nvar_fire2d = 5 character(len=32), pointer, dimension(:), private :: dust12m_name => null() character(len=32), pointer, dimension(:), private :: emi_name => null() @@ -572,6 +572,7 @@ subroutine rrfs_sd_emissions_register_fire(data, Model, restart, Atm_block) data%fire_name2d(2) = 'frp_davg' data%fire_name2d(3) = 'fire_end_hr' data%fire_name2d(4) = 'hwp_davg' + data%fire_name2d(5) = 'totprcp_24hrs' !--- register axis call register_axis(restart, 'lon', 'X') @@ -630,6 +631,7 @@ subroutine rrfs_sd_emissions_copy_fire(data, Model, Sfcprop, Atm_block) Sfcprop(nb)%smoke2d_RRFS(ix,2) = data%fire_var2d(i,j,2) Sfcprop(nb)%smoke2d_RRFS(ix,3) = data%fire_var2d(i,j,3) Sfcprop(nb)%smoke2d_RRFS(ix,4) = data%fire_var2d(i,j,4) + Sfcprop(nb)%smoke2d_RRFS(ix,5) = data%fire_var2d(i,j,5) else ! -- user define their own fire emission endif From 1e178d7c7e710aa4eaf78492e20c6a2c93015f2d Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Wed, 13 Mar 2024 23:37:56 +0000 Subject: [PATCH 4/8] "point to the updates to address UFS code manager's comments" --- ccpp/driver/GFS_diagnostics.F90 | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index dd3f14181..62b87838f 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -4796,8 +4796,6 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%ebu_smoke(:,:) enddo - idx = idx + 1 - if (Model%ebb_dcycle == 2 ) then idx = idx + 1 @@ -4877,6 +4875,8 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop endif smoke_forecast_mode + + idx = idx + 1 ExtDiag(idx)%axes = 3 ExtDiag(idx)%name = 'ext550' ExtDiag(idx)%desc = '3d total extinction at 550nm' diff --git a/ccpp/physics b/ccpp/physics index 7eab4efc4..766360bf7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 7eab4efc48f27d662eb372294361431aefae7900 +Subproject commit 766360bf7ec501d436bec92bf80f4a449f151114 From f1c254cd5ccb9d2c3d7a4179f02f552eedad7a1e Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Thu, 14 Mar 2024 14:46:55 +0000 Subject: [PATCH 5/8] "merge fv3atm PR #801 from Jili" --- ccpp/data/GFS_typedefs.F90 | 8 +++++++- ccpp/data/GFS_typedefs.meta | 6 ++++++ ccpp/physics | 2 +- ccpp/suites/suite_RRFSens_phy1.xml | 2 ++ ccpp/suites/suite_RRFSens_phy4.xml | 2 ++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 422d1b080..ed29a4104 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1198,6 +1198,9 @@ module GFS_typedefs integer :: ichoice = 0 !< flag for closure of C3/GF deep convection integer :: ichoicem = 13!< flag for closure of C3/GF mid convection integer :: ichoice_s = 3 !< flag for closure of C3/GF shallow convection + integer :: conv_cf_opt !< option for convection scheme cloud fraction computation + !< 0: Chaboureau-Bechtold + !< 1: Xu-Randall integer :: nmtvr !< number of topographic variables such as variance etc !< used in the GWD parameterization - 10 more added if @@ -3997,6 +4000,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: hwrf_samfdeep = .false. !< flag for HWRF SAMF deepcnv scheme logical :: hwrf_samfshal = .false. !< flag for HWRF SAMF shalcnv scheme logical :: progsigma = .false. !< flag for prognostic updraft area fraction closure in saSAS or Unified conv. + integer :: conv_cf_opt = 0 !< option for convection scheme cloud fraction computation logical :: do_mynnedmf = .false. !< flag for MYNN-EDMF logical :: do_mynnsfclay = .false. !< flag for MYNN Surface Layer Scheme ! DH* TODO - move to MYNN namelist section @@ -4356,7 +4360,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & betadcu,h2o_phys, pdfcld, shcnvcw, redrag, hybedmf, satmedmf,& shinhong, do_ysu, dspheat, lheatstrg, lseaspray, cnvcld, & random_clds, shal_cnv, imfshalcnv, imfdeepcnv, isatmedmf, & - do_deep, jcap, & + conv_cf_opt, do_deep, jcap, & cs_parm, flgmin, cgwf, ccwf, cdmbgwd, sup, ctei_rm, crtrh, & dlqf, rbcr, shoc_parm, psauras, prauras, wminras, & do_sppt, do_shum, do_skeb, & @@ -5200,6 +5204,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%imfdeepcnv = imfdeepcnv Model%isatmedmf = isatmedmf Model%do_deep = do_deep + Model%conv_cf_opt = conv_cf_opt Model%nmtvr = nmtvr Model%jcap = jcap Model%flgmin = flgmin @@ -7078,6 +7083,7 @@ subroutine control_print(Model) print *, ' imfshalcnv : ', Model%imfshalcnv print *, ' imfdeepcnv : ', Model%imfdeepcnv print *, ' do_deep : ', Model%do_deep + print *, ' conv_cf_opt : ', Model%conv_cf_opt print *, ' nmtvr : ', Model%nmtvr print *, ' jcap : ', Model%jcap print *, ' cs_parm : ', Model%cs_parm diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 1a3eaa603..efca08cc3 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -5564,6 +5564,12 @@ units = none dimensions = () type = integer +[conv_cf_opt] + standard_name = option_for_convection_scheme_cloud_fraction_computation + long_name = option for convection scheme cloud fraction computation + units = flag + dimensions = () + type = integer [nmtvr] standard_name = number_of_statistical_measures_of_subgrid_orography long_name = number of topographic variables in GWD diff --git a/ccpp/physics b/ccpp/physics index 766360bf7..0935794e9 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 766360bf7ec501d436bec92bf80f4a449f151114 +Subproject commit 0935794e948a5501b1d45d1b050b21e23399bfc2 diff --git a/ccpp/suites/suite_RRFSens_phy1.xml b/ccpp/suites/suite_RRFSens_phy1.xml index f0de1ebf4..2d84ccadc 100644 --- a/ccpp/suites/suite_RRFSens_phy1.xml +++ b/ccpp/suites/suite_RRFSens_phy1.xml @@ -13,12 +13,14 @@ GFS_suite_interstitial_rad_reset + sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre rrtmg_sw rrtmg_sw_post rrtmg_lw + sgscloud_radpost rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_RRFSens_phy4.xml b/ccpp/suites/suite_RRFSens_phy4.xml index 74a1e8972..80796836c 100644 --- a/ccpp/suites/suite_RRFSens_phy4.xml +++ b/ccpp/suites/suite_RRFSens_phy4.xml @@ -13,12 +13,14 @@ GFS_suite_interstitial_rad_reset + sgscloud_radpre GFS_rrtmg_pre GFS_radiation_surface rad_sw_pre rrtmg_sw rrtmg_sw_post rrtmg_lw + sgscloud_radpost rrtmg_lw_post GFS_rrtmg_post From 72618b9484b010707721b9b7f0c29c439dbb9886 Mon Sep 17 00:00:00 2001 From: "Haiqin.Li" Date: Fri, 15 Mar 2024 15:43:29 +0000 Subject: [PATCH 6/8] "allocate rho_dry to zero size when not in use" --- ccpp/data/GFS_typedefs.F90 | 1 + 1 file changed, 1 insertion(+) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index ed29a4104..a6ca113c8 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -3536,6 +3536,7 @@ subroutine coupling_create (Coupling, IM, Model) allocate (Coupling%min_fplume(0)) allocate (Coupling%max_fplume(0)) allocate (Coupling%uspdavg(0)) + allocate (Coupling%rho_dry (0,0)) allocate (Coupling%hpbl_thetav(0)) allocate (Coupling%rrfs_hwp (0)) allocate (Coupling%rrfs_hwp_ave (0)) From 74ccdb6db6939e8770d0a807bedadf9c6b0ddd0a Mon Sep 17 00:00:00 2001 From: haiqinli <38666296+haiqinli@users.noreply.github.com> Date: Tue, 19 Mar 2024 08:22:21 -0600 Subject: [PATCH 7/8] update hash and revert change --- .gitmodules | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index e0e22cc0c..75876f6fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/haiqinli/GFDL_atmos_cubed_sphere - branch = production/RRFS.v1-mynn + url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + branch = production/RRFS.v1 [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework branch = production/RRFS.v1 [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/haiqinli/ccpp-physics - branch = production/RRFS.v1-mynn + url = https://github.com/ufs-community/ccpp-physics + branch = production/RRFS.v1 [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 64f039643405965f04cfc7e109150009ef53b73b Mon Sep 17 00:00:00 2001 From: "haiqin.li" Date: Tue, 19 Mar 2024 16:02:08 +0000 Subject: [PATCH 8/8] "point to hashes ufs-community/ccpp-physics@85fabc0 and NOAA-EMC/GFDL_atmos_cubed_sphere@fab198c" --- atmos_cubed_sphere | 2 +- ccpp/physics | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index 485d44822..fab198c58 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit 485d448224fdc03e7d5969fa39f42bf7e7fa58e9 +Subproject commit fab198c5815d707a8e8421e553d199eff945ffa9 diff --git a/ccpp/physics b/ccpp/physics index 0935794e9..85fabc0ae 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 0935794e948a5501b1d45d1b050b21e23399bfc2 +Subproject commit 85fabc0ae0762b938a30b4f1926009869297a108