Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix HEMCO ERS tests #1221

Open
wants to merge 6 commits into
base: cam_development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3692,9 +3692,9 @@

<!-- HEMCO: Harmonized Emissions Component -->
<use_hemco>.false.</use_hemco>
<hemco_data_root>atm/cam/geoschem/emis/ExtData/HEMCO</hemco_data_root>
<hemco_config_file>atm/cam/geoschem/emis/HEMCO_Config.CC.CEDS_AEIC19.NEx.c230615.rc</hemco_config_file>
<hemco_diagn_file>atm/cam/geoschem/emis/HEMCO_Diagn.3_5_0.c230307.rc</hemco_diagn_file>
<hemco_data_root>atm/cam/geoschem/ExtData/HEMCO</hemco_data_root>
<hemco_config_file>atm/cam/hemco/HEMCO_Config.CC.CEDS_AEIC19.NEx.c241122.rc</hemco_config_file>
<hemco_diagn_file>atm/cam/hemco/HEMCO_Diagn.3_5_0.c230307.rc</hemco_diagn_file>
<hemco_emission_year>-1</hemco_emission_year>

<!-- Default emissions grid resolution at 2x2.5 degree: coarser may result in masking artifacts -->
Expand Down
4 changes: 2 additions & 2 deletions cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2135,7 +2135,7 @@
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment">FCSD CAM-chem f19 with HEMCO exact restart</option>
<option name="comment">FCSD CAM-chem f09 with HEMCO exact restart</option>
</options>
</test>
<test compset="FCSD_HCO" grid="f09_f09_mg17" name="ERP_Ln9" testmods="cam/outfrq9s" supported="false">
Expand All @@ -2145,7 +2145,7 @@
</machines>
<options>
<option name="wallclock">00:40:00</option>
<option name="comment">FCSD CAM-chem f19 with HEMCO exact restart/PE tests</option>
<option name="comment">FCSD CAM-chem f09 with HEMCO exact restart/PE tests</option>
</options>
</test>

Expand Down
54 changes: 54 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/hemco