search

geoschem / CAM

Community Atmosphere Model
Other
0 stars 0 forks source link

CESM-GC updates for cam_development #8

Closed lizziel closed 2 years ago

lizziel commented 2 years ago

This is a dummy PR to show documentation of CESM-GC changes to merge into the main CAM development branch. The source branch is a version of CESM-GC_main rebased onto CAM 6.0.034, with all CAM code in stale CESM 2.1.1 branch dropped, and many CESM-GC commits squashed.

The latest cam_development (target) has not been merged into the source branch and there are thus conflicts. This dummy PR also serves to help sort out those conflicts.

lizziel commented 2 years ago

@fritzt and @jimmielin, this dummy PR is a precursor to making a PR on the upstream CAM and discussing changes with NCAR. Could you look over the file changes and tell me if anything should be excluded from the PR, or if anything looks wrong?

A bit of information on what you are looking at: The source branch is a modified version of CESM-GC_main. I squashed 223 commits from the three of us into 12 commits total, and then dropped CESM commits between CAM 6.0.034 and the CESM 2.1.1 version Thibaud started with. I then merged the latest cam_development as of yesterday into it and did conflict resolution. The only features I have removed/disabled so far from the original changes are (1) change HEMCO from on to off by default (thanks for the very clear message about that in the code!), and (2) remove AEIC species from the external forcing list.

I expect that I should change more before opening the ESCOMP PR and I'm going to look at the files now. Let's discuss on this thread.

jimmielin commented 2 years ago

Hi Lizzie,

Thanks so much for working on this. I'm mostly familiar with the HEMCO changes. This all looks good to me. Disabling HEMCO by default is good, for it to work with CAM-chem we still have to work with the CAM-chem folks to add the changes to their emissions code (the changes in https://github.com/jimmielin/HEMCO_CESM/tree/development/SourceMods). We can sort that out in the future.

Best, Haipeng

fritzt commented 2 years ago

Hi Lizzie! Thank you for putting all of this together! This looks good to me. Some of the files were copied over from the mozart folder and are mostly commented out (e.g. charge_neutrality.F90, chem_prod_loss_diags.F90, clybry_fam.F90, mo_gas_phase_chemdr.F90, ...). I'm wondering if it would be worth it to remove all of this commented code. However, we can't just delete them, as some of these files have dependencies with other CAM modules.

lizziel commented 2 years ago

See new PR at https://github.com/ESCOMP/CAM/pull/484