search

NorESMhub / CAM

Community Atmosphere Model including CAM6-Nor branches
1 stars 20 forks source link

noresm_v5_cam6_3_120: Update to cam6_3_120 #91

Closed gold2718 closed 1 year ago

gold2718 commented 1 year ago

Summary: Update noresm_develop with new features and tunings from NCAR

Contributors: gold2718

Reviewers: oyvindseland

Purpose of changes: Keep up to date with NCAR efforts to implement new aerosol objects and prepare for OsloAero implementation in CAM-Nor

Github PR URL: https://github.com/NorESMhub/CAM/pull/91

Changes made to build system: Addition of HEMCO emissions inventory system

Changes made to the namelist: Some tunings for the LT compsets have been improved

Changes to the defaults for the boundary datasets: None

Substantial timing or memory changes: None

The changes in this PR are mostly changes in ESCOMP/CAM between cam6_3_112 and cam6_3_120. Also, Externals.cfg was updated to reflect new externals that are being used by Noresm

aux_cam test suite run. Baselines changed as expected due to new tunings.

Issues addressed by this PR: closes #88

gold2718 commented 1 year ago

I will have to merge the conflicts by hand, for some reason, GitHub thinks the ancestor commit is cam6_3_109 not cam6_3_112.

gold2718 commented 1 year ago

The right seems to be what I intended but I have no idea where the left hand side came from. Most of the real changes came from ESCOMP/CAM.

These are the only files that differ from cam6_3_120

.gitignore
Externals.cfg
Externals_CAM.cfg
bld/config_files/definition.xml
bld/configure
bld/namelist_files/namelist_defaults_cam.xml
cime_config/config_component.xml
cime_config/config_compsets.xml
cime_config/testdefs/testlist_cam.xml
test/system/run_noresm_tests.sh
test/system/test_driver.sh
gold2718 commented 1 year ago

This is just too messy and will probably get messier in the future. I will close this and try a different approach to updating noresm_develop from ESCOMP/CAM.