diff --git a/.gitmodules b/.gitmodules index af342d6a5..bbd201b26 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,15 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - branch = dev/emc + url = https://github.com/zhanglikate/GFDL_atmos_cubed_sphere + branch = develop-ufs-ccpp-chem [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/haiqinli/ccpp-physics - branch = gsl/develop-chem2 + url = https://github.com/zhanglikate/ccpp-physics + branch = develop-ufs-ccpp-chem [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index fad4c9f1f..02535ee09 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit fad4c9f1fc29c0cbb47df9a07a573249155a1c42 +Subproject commit 02535ee0983af040a4eb6b73159c0aa70d995c48 diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index e4b43d685..c8f6727b5 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -4338,7 +4338,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%aer_ra_feedback = aer_ra_feedback Model%aerchem_onoff = aerchem_onoff Model%bio_emiss_opt = bio_emiss_opt -! Model%biomass_burn_opt = biomass_burn_opt + Model%biomass_burn_cplchp = biomass_burn_cplchp Model%chem_conv_tr = chem_conv_tr Model%chem_in_opt = chem_in_opt Model%chem_opt = chem_opt diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 616b445af..ee21e200b 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -748,7 +748,7 @@ active = (flag_for_chemistry_package_coupling) [emi_in_cplchp] standard_name = anthropogenic_background_input_cplchp - long_name = anthropogenic background input + long_name = anthropogenic background input cplchp units = various dimensions = (horizontal_loop_extent,10) type = real diff --git a/ccpp/physics b/ccpp/physics index 4ca92f157..36f0f27b6 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4ca92f157174e3a85669e05b5f029a4061a473c3 +Subproject commit 36f0f27b637965a527c68b841c53b30b7e3ee259 diff --git a/ccpp/suites/suite_FV3_GFS_v17_p8_gsd_chem.xml b/ccpp/suites/suite_FV3_GFS_v17_p8_gsd_chem.xml index 991a8164e..b1c8cf017 100644 --- a/ccpp/suites/suite_FV3_GFS_v17_p8_gsd_chem.xml +++ b/ccpp/suites/suite_FV3_GFS_v17_p8_gsd_chem.xml @@ -90,11 +90,11 @@ mp_thompson_post GFS_MP_generic_post maximum_hourly_diagnostics - gsd_chem_lsdep_wrapper gsd_chem_gocart_wrapper gsd_chem_rad_wrapper gsd_chem_diag_wrapper + diff --git a/io/FV3GFS_io.F90 b/io/FV3GFS_io.F90 index f1f50d6ab..953d9a637 100644 --- a/io/FV3GFS_io.F90 +++ b/io/FV3GFS_io.F90 @@ -554,16 +554,17 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain, warm_sta nvar_dust12m = 5 nvar_gbbepx = 3 nvar_emi = 1 + else if (Model%cplchp) then + !-- global fire + nvar_dust = 5 + nvar_emi = 10 + nvar_emi2 = 3 + nvar_gbbepx = 5 else nvar_dust12m = 0 nvar_gbbepx = 0 nvar_emi = 0 endif - !-- global fire - nvar_dust = 5 - nvar_emi = 10 - nvar_emi2 = 3 - nvar_gbbepx = 5 if (Model%lsm == Model%lsm_ruc .and. warm_start) then if(Model%rdlai) then @@ -833,6 +834,7 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain, warm_sta call register_axis(emi2_restart, 'lat', 'Y') call register_axis(emi2_restart, 'z', 64) !--- register the 3D fields + mand = .false. do num = 1,nvar_emi2 var3_p2 => emi2_var(:,:,:,num) call register_restart_field(emi2_restart, emi2_name(num), var3_p2, dimensions=(/'z', 'lat ', 'lon '/),& @@ -937,6 +939,7 @@ subroutine sfc_prop_restart_read (Sfcprop, Atm_block, Model, fv_domain, warm_sta call register_axis(dust12m_restart, 'lat', 'Y') call register_axis(dust12m_restart, 'time', 12) !--- register the 3D fields + mand = .false. do num = 1,nvar_dust12m var3_p2 => dust12m_var(:,:,:,num) call register_restart_field(dust12m_restart, dust12m_name(num), var3_p2, dimensions=(/'time', 'lat ', 'lon '/),&