diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ca2dc5a2..68de2b11b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14 +1,19 @@ # Changelog This file documents all notable changes to the GCHP wrapper repository starting in version 14.0.0. See also CHANGELOG files for individual submodules, such as: -- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem/CHANGELOG.md -- src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/CHANGELOG.md -- src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J/CHANGELOG.md -- src/GCHP_GridComp/GEOSChem_GridComp/HETP/CHANGELOG.md -- src/MAPL/CHANGELOG.md +- `src/GCHP_GridComp/GEOSChem_GridComp/geos-chem/CHANGELOG.md` +- `src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/CHANGELOG.md` +- `src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J/CHANGELOG.md` +- `src/GCHP_GridComp/GEOSChem_GridComp/HETP/CHANGELOG.md` +- `src/MAPL/CHANGELOG.md` The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [14.4.2] - 2024-07-24 +### Changed +- Updated Cloud-J submodule to 7.7.2 +- Disable support for FAST-JX for all simulations except Hg + ## [14.4.1] - 2024-06-28 ### Fixed - Fixed formatting error in `.github/workflows/stale.yml` that caused the Mark Stale Issues action not to run diff --git a/CMakeLists.txt b/CMakeLists.txt index 69094cb9d..4e8240076 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.13) project (gchp_ctm - VERSION 14.4.1 + VERSION 14.4.2 LANGUAGES Fortran CXX C ) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 61b29a79f..ff32b7ec2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -5,20 +5,21 @@ Thank you for looking into contributing to GEOS-Chem! GEOS-Chem is a grass-roots Updates to the GEOS-Chem model benefit both you and the [entire GEOS-Chem community](https://geoschem.github.io/people.html). You benefit through [coauthorship and citations](https://geoschem.github.io/new-developments.html). Priority development needs are identified at GEOS-Chem users' meetings with updates between meetings based on [GEOS-Chem Steering Committee (GCSC)](https://geoschem.github.io/steering-committee.html) input through [Working Groups](https://geoschem.github.io/working-groups.html). ## We use GitHub and ReadTheDocs -We use GitHub to host the GCHP source code, to track issues, user questions, and feature requests, and to accept pull requests: [https://github.com/geoschem/GCHP](https://github.com/geoschem/GCHP). Please help out as you can in response to issues and user questions. +We use GitHub to host the GEOS-Chem Classic source code, to track issues, user questions, and feature requests, and to accept pull requests: [https://github.com/geoschem/geos-chem](https://github.com/geoschem/geos-chem). Please help out as you can in response to issues and user questions. -GCHP Classic documentation can be found at [gchp.readthedocs.io](https://geos-chem.readthedocs.io). +GCHP documentation can be found at [gchp.readthedocs.io](https://geos-chem.readthedocs.io). ## When should I submit updates? -Submit bug fixes right away, as these will be given the highest priority. Please see "Support Guidelines" for more information. +Submit bug fixes right away, as these will be given the highest +priority. Please see **[Support Guidelines](https://gchp.readthedocs.io/en/latest/reference/SUPPORT.html)** for more information. Submit updates (code and/or data) for mature model developments once you have submitted a paper on the topic. Your Working Group chair can offer guidance on the timing of submitting code for inclusion into GEOS-Chem. The practical aspects of submitting code updates are listed below. ## How can I submit updates? -We use [GitHub Flow](https://guides.github.com/introduction/flow/index.html), so all changes happen through pull requests. This workflow is [described here](https://guides.github.com/introduction/flow/index.html). +We use **GitHub Flow**, so all changes happen through [pull requests](https://help.github.com/articles/creating-a-pull-request/). This workflow is [described here](https://docs.github.com/en/get-started/using-github/github-flow). As the author you are responsible for: - Testing your changes @@ -33,11 +34,12 @@ As the author you are responsible for: 4. [Fork the relevant GEOS-Chem repositories](https://help.github.com/articles/fork-a-repo/) into your Github account. 5. Clone your forks of the GEOS-Chem repositories to your computer system. 6. Add your modifications into a [new branch](https://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell) off the **main** branch. - 7. Test your update thoroughly and make sure that it works. For structural updates we recommend performing a difference test (i.e. testing against the prior version) in order to ensure that identical results are obtained). - 8. Review the coding conventions and checklists for code and data updates listed below. - 9. Create a [pull request in GitHub](https://help.github.com/articles/creating-a-pull-request/). - 10. The [GEOS-Chem Support Team](https://geoschem.github.io/support-team.html) will add your updates into the development branch for an upcoming GEOS-Chem version. They will also validate your updates with [benchmark simulations](http://wiki.geos-chem.org/GEOS-Chem_benchmarking). - 11. If the benchmark simulations reveal a problem with your update, the GCST will request that you take further corrective action. + 7. Add a sentence to the `CHANGELOG.md` file describing your update. + 8. Test your update thoroughly and make sure that it works. For structural updates we recommend performing a difference test (i.e. testing against the prior version) in order to ensure that identical results are obtained). + 9. Review the coding conventions and checklists for code and data updates listed below. + 10. Create a [pull request in GitHub](https://help.github.com/articles/creating-a-pull-request/). + 11. The [GEOS-Chem Support Team](https://geoschem.github.io/support-team.html) will add your updates into the development branch for an upcoming GEOS-Chem version. They will also validate your updates with [benchmark simulations](http://wiki.geos-chem.org/GEOS-Chem_benchmarking). + 12. If the benchmark simulations reveal a problem with your update, the GCST will request that you take further corrective action. ### Coding conventions The GEOS-Chem codebase dates back several decades and includes contributions from many people and multiple organizations. Therefore, some inconsistent conventions are inevitable, but we ask that you do your best to be consistent with nearby @@ -48,8 +50,9 @@ code. 1. Use Fortran-90 free format instead of Fortran-77 fixed format. 2. Include thorough comments in all submitted code. 3. Include full citations for references at the top of relevant source code modules. - 4. Remove extraneous code updates (e.g. testing options, other science). - 5. Submit any related code or configuration files for [GCHP](https://gchp.readthedocs.io) along with code or configuration files for [GEOS-Chem Classic](https://geos-chem.readthedocs.io). + 4. Check that you have updated the `CHANGELOG.md` file. + 5. Remove extraneous code updates (e.g. testing options, other science). + 6. Submit any related code or configuration files for [GCHP](https://gchp.readthedocs.io) along with code or configuration files for [GEOS-Chem Classic](https://geos-chem.readthedocs.io). ### Checklist for submitting data files diff --git a/docs/source/conf.py b/docs/source/conf.py index 10288b259..3bf48d972 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -23,7 +23,7 @@ author = 'GEOS-Chem Support Team' # The full version, including alpha/beta/rc tags -release = '14.4.1' +release = '14.4.2' # -- General configuration --------------------------------------------------- diff --git a/docs/source/geos-chem-shared-docs b/docs/source/geos-chem-shared-docs index cbfb5cb7e..ce3c86acc 160000 --- a/docs/source/geos-chem-shared-docs +++ b/docs/source/geos-chem-shared-docs @@ -1 +1 @@ -Subproject commit cbfb5cb7ea3b20921fb1cb156ba8ab468d54364d +Subproject commit ce3c86accdcd73d3c3a46e41be1fcc09775200dd diff --git a/docs/source/index.rst b/docs/source/index.rst index 3369aac6a..5af027817 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -77,6 +77,7 @@ use Spack to install GCHP's dependencies if needed. geos-chem-shared-docs/supplemental-guides/load-libraries-guide.rst geos-chem-shared-docs/supplemental-guides/spack-guide.rst + geos-chem-shared-docs/supplemental-guides/geos-chem-input-data-on-aws.rst supplement/setting-up-aws-parallelcluster.rst supplement/caching-input-data.rst supplement/containers.rst diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J b/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J index 3162ea8ba..37a4ece35 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J +++ b/src/GCHP_GridComp/GEOSChem_GridComp/Cloud-J @@ -1 +1 @@ -Subproject commit 3162ea8baa9ab69c3b8473270abc0188ad54501b +Subproject commit 37a4ece3580a9a8ce64d9fbd03c699cd116c6d80 diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO b/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO index 2192e0e88..e68ebae6e 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO +++ b/src/GCHP_GridComp/GEOSChem_GridComp/HEMCO/HEMCO @@ -1 +1 @@ -Subproject commit 2192e0e88ee5f20fcd3bae71b613a902ec4c31ba +Subproject commit e68ebae6ed8286e09f3a18fd505873bce074edfa diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index ef2ea60e7..0a172283d 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit ef2ea60e7caab0784ba139f8e5083f2f77982a6c +Subproject commit 0a172283d089111e17fc45c0dd0a57da563b7bdc diff --git a/src/MAPL b/src/MAPL index 850f20a9b..231d53cc0 160000 --- a/src/MAPL +++ b/src/MAPL @@ -1 +1 @@ -Subproject commit 850f20a9b7b78f8cf58fe4516e49ea2b0d50e31f +Subproject commit 231d53cc0b14dc3275cac2867ddb9e15adbc8877