diff --git a/.gitmodules b/.gitmodules index 752c3bf4f7..7956857815 100644 --- a/.gitmodules +++ b/.gitmodules @@ -71,7 +71,7 @@ [submodule "hemco"] path = src/hemco url = https://github.com/ESCOMP/HEMCO_CESM.git - fxtag = hemco-cesm2_0_hemco3_9_0 + fxtag = hemco-cesm2_1_0_hemco3_9_0 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/HEMCO_CESM.git diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml index 3dfdca36f2..29d22b79f6 100644 --- a/bld/namelist_files/namelist_defaults_cam.xml +++ b/bld/namelist_files/namelist_defaults_cam.xml @@ -3692,9 +3692,9 @@ .false. -atm/cam/geoschem/emis/ExtData/HEMCO -atm/cam/geoschem/emis/HEMCO_Config.CC.CEDS_AEIC19.NEx.c230615.rc -atm/cam/geoschem/emis/HEMCO_Diagn.3_5_0.c230307.rc +atm/cam/geoschem/ExtData/HEMCO +atm/cam/hemco/HEMCO_Config.CC.CEDS_AEIC19.NEx.c241122.rc +atm/cam/hemco/HEMCO_Diagn.3_5_0.c230307.rc -1 diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index d0789ac1f3..c08f052359 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -2135,7 +2135,7 @@ - + @@ -2145,7 +2145,7 @@ - + diff --git a/doc/ChangeLog b/doc/ChangeLog index 606ff6bfbe..484a07bdb0 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,58 @@ +Tag name: TBD +Originator(s): lizziel +Date: 9 Jan 2025 +One-line Summary: Update to HEMCO_CESM 2.1.0 and introduce new FCSD_HCO tests that pass ERS +Github PR URL: https://github.com/ESCOMP/CAM/pull/1221 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): +HEMCO_CESM includes fixes to allow ERS tests of CAM-chem with HEMCO to pass. This requires +a clock time bug fix in HEMCO_CESM released in new version 2.1.0 as well as an update to +the HEMCO configuration file to read 3D emissions every timestep. + +Describe any changes made to build system: + +Describe any changes made to the namelist: + +List any changes to the defaults for the boundary datasets: + +Describe any substantial timing or memory changes: + +Code reviewed by: TBD + +List all files eliminated: N/A + +List all files added and what they do: N/A + +List all existing files that have been modified, and describe the changes: + +M .gitmodules + - Update HEMCO_CESM version + +M bld/namelist-files/namelist_defaults_cam.xml + - Update default hemco_config_file to read and regrid aviation emissions every timestep + - Change default paths of hemco_config_file, hemco_diagn_file, and hemco_data_root + +M src/hemco + - tag hemco-cesm2_1_0_hemco3_9_0 + +If there were any failures reported from running test_driver.sh on any test +platform, and checkin with these failures has been OK'd by the gatekeeper, +then copy the lines from the td.*.status files for the failed tests to the +appropriate machine below. All failed tests must be justified. + +derecho/intel/aux_cam: TBD + +derecho/nvhpc/aux_cam: TBD + +izumi/nag/aux_cam: TBD + +izumi/gnu/aux_cam: TBD + +Summarize any changes to answers: bit-for-bit unchanged + =============================================================== +=============================================================== Tag name: cam6_4_057 Originator(s): brianpm, eaton, nusbaume Date: Jan 29 2025 @@ -2422,6 +2475,7 @@ Summarize any changes to answers: - F compsets have answer changes due to updated CTSM. =============================================================== +======= Tag name: cam6_4_038 Originator(s): lizziel diff --git a/src/hemco b/src/hemco index 7bd8358229..d108012f84 160000 --- a/src/hemco +++ b/src/hemco @@ -1 +1 @@ -Subproject commit 7bd8358229eefd2cbb910ff30c46dfc97e34fb6f +Subproject commit d108012f8419ec13a56c0955684f5aaaf65fcacf