Skip to content

Commit

Permalink
GCHP 14.5.0 release
Browse files Browse the repository at this point in the history
Updated version numbers in:
- CHANGELOG.md
- CMakeLists.txt
- docs/source/conf.py

Also updated CHANGELOG.md with the latest information.

Signed-off-by: Bob Yantosca <[email protected]>
  • Loading branch information
yantosca committed Nov 8, 2024
2 parents e499969 + 35acd2b commit a9e7c3f
Show file tree
Hide file tree
Showing 31 changed files with 2,503 additions and 1,206 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-label: 'stale'
exempt-issue-labels: ['category: Discussion','category: Feature Request','deferred','help needed: Open Research Problem','help needed: Request Input from Community','never stale','TODO: Documentation']
exempt-issue-labels: 'category: Discussion,category: Feature Request,deferred,help needed: Open Research Problem,help needed: Request Input from Community,never stale,TODO: Documentation'
days-before-issue-stale: 30
days-before-issue-close: 7
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. If there are no updates within 7 days it will be closed. You can add the "never stale" tag to prevent the issue from closing this issue.'
Expand Down
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@ This file documents all notable changes to the GCHP wrapper repository starting

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.5.0] - 2024-11-08
### Added
- Added documentation about GEOS convection change affecting meteorology starting June 1, 2020

### Changed
- Updated GEOS-Chem to 14.5.0
- Updated HEMCO to 3.10.0
- Updated Cloud-J to 8.0.1

### Fixed
- Fixed formatting error in `.github/workflows/stale.yml` that caused the Mark Stale Issues action not to run
- Updated compiler requirements to specify max GNU version is 12
- Updated documentation for version 14.5.0
- Updated `docs/requirements.txt` to use `jinja2==3.1.4` (fixes a security issue)

## [14.4.3] - 2024-08-13
### Changed
- Updated GEOS-Chem (science codebase) to 14.4.3
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required (VERSION 3.13)
project (gchp_ctm
VERSION 14.4.3
VERSION 14.5.0
LANGUAGES Fortran CXX C
)

Expand Down
2 changes: 1 addition & 1 deletion docs/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ sphinxcontrib-bibtex==2.6.2
sphinx-autobuild==2021.3.14
recommonmark==0.7.1
docutils==0.20.1
jinja2==3.1.3
jinja2==3.1.4
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
author = 'GEOS-Chem Support Team'

# The full version, including alpha/beta/rc tags
release = '14.4.3'
release = '14.5.0'


# -- General configuration ---------------------------------------------------
Expand Down
52 changes: 31 additions & 21 deletions docs/source/getting-started/quick-start.rst
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ will automatically initialize and update all the submodules:

.. code-block:: console
gcuser:~$ git clone --recurse-submodules https://github.com/geoschem/GCHP.git ~/GCHP
gcuser:~$ cd ~/GCHP
$ git clone --recurse-submodules https://github.com/geoschem/GCHP.git ~/GCHP
$ cd ~/GCHP
Upon download you will have the most recently released version. You can check what this is by printing the last commit in the git log and scanning the output for tag.

.. code-block:: console
gcuser:~/GCHP$ git log -n 1
$ git log -n 1
.. tip::

Expand All @@ -40,17 +40,17 @@ Upon download you will have the most recently released version. You can check wh

.. code-block:: console
gcuser:~/GCHP$ git checkout tags/14.0.0 # Points HEAD to the tag "14.0.0"
gcuser:~/GCHP$ git branch version_14.0.0 # Creates a new branch at tag "14.0.0"
gcuser:~/GCHP$ git checkout version_14.0.0 # Checks out the version_14.0.0 branch
gcuser:~/GCHP$ git submodule update --init --recursive # Reverts submodules to the "14.0.0" tag
$ git checkout tags/14.0.0 # Points HEAD to the tag "14.0.0"
$ git branch version_14.0.0 # Creates a new branch at tag "14.0.0"
$ git checkout version_14.0.0 # Checks out the version_14.0.0 branch
$ git submodule update --init --recursive # Reverts submodules to the "14.0.0" tag
You can do this for any tag in the version history. For a list of
all tags, type:

.. code-block:: console
gcuser:~/GCHP$ git tag
$ git tag
If you have any unsaved changes, make sure you commit those to a
branch prior to updating versions.
Expand All @@ -65,8 +65,17 @@ the prompts:

.. code-block:: console
gcuser:~/GCHP$ cd run/
gcuser:~/GCHP$ ./createRunDir.sh
$ cd run/
$ ./createRunDir.sh
.. important::

The convection scheme used for GEOS-FP met generation changed
from RAS to Grell-Freitas with impact on GEOS-FP meteorology
files starting June 1, 2020, specifically enhanced vertical
transport. If you plan to do simulations across this boundary
consider using MERRA2 instead. For more information see
`GEOS-Chem GitHub issue #1409 <https://github.com/geoschem/geos-chem/issues/1409/>`__.

=======================
3. Configure your build
Expand All @@ -83,15 +92,15 @@ guide we will do both, starting with building from the source code.

.. code-block:: console
gcuser:~/GCHP$ mkdir ~/GCHP/build
gcuser:~/GCHP$ cd ~/GCHP/build
$ mkdir ~/GCHP/build
$ cd ~/GCHP/build
Initialize your build directory by running :program:`cmake`, passing it the path to your source code.
Make sure you have loaded all libraries required for GCHP prior to this step.

.. code-block:: console
gcuser:~/GCHP/build$ cmake ~/GCHP
$ cmake ~/GCHP
Now you can configure :ref:`build options <gchp_build_options>`.
These are persistent settings that are saved to your build directory.
Expand All @@ -103,7 +112,7 @@ the run directory you created in Step 2.

.. code-block:: console
gcuser:~/GCHP/build$ cmake . -DRUNDIR="/path/to/your/run/directory"
$ cmake . -DRUNDIR="/path/to/your/run/directory"
.. note::
The :literal:`.` in the :program:`cmake` command above is
Expand All @@ -116,23 +125,23 @@ symbolic link in the run directory:

.. code-block:: console
gcuser:/path/to/your/run/directory/$ cd build
gcuser:/path/to/your/run/directory/build$ cmake ../CodeDir -DRUNDIR=..
$ cd /path/to/your/run/directory/build
$ cmake ../CodeDir -DRUNDIR=..
GEOS-Chem has a number of optional compiler flags you can add
here. For example, to compile with RRTMG:

.. code-block:: console
gcuser:/path/to/your/run/directory/build$ cmake ../CodeDir -DRUNDIR=.. -DRRTMG=y
$ cmake ../CodeDir -DRUNDIR=.. -DRRTMG=y
A useful compiler option is to build in debug mode. Doing this is a
good idea if you encountered a segmentation fault in a previous run
and need more information about where the error happened and why.

.. code-block:: console
gcuser:/path/to/your/run/directory/build$ cmake ../CodeDir -DRUNDIR=.. -DCMAKE_BUILD_TYPE=Debug
$ cmake ../CodeDir -DRUNDIR=.. -DCMAKE_BUILD_TYPE=Debug
See the GEOS-Chem documentation for more information on compiler flags.

Expand All @@ -147,14 +156,15 @@ available. Do this with the :literal:`-j` flag:

.. code-block:: console
gcuser:~/GCHP/build$ make -j
$ cd ~/GCHP/build # Skip if you are already here
$ make -j
Upon successful compilation, install the compiled executable to your
run directory (or directories):

.. code-block:: console
gcuser:~/GCHP/build$ make install
$ make install
This copies :file:`bin/gchp` and supplemental files to your run directory.

Expand All @@ -180,7 +190,7 @@ Now, navigate to your run directory:

.. code-block:: console
$ cd path/to/your/run/directory
$ cd /path/to/your/run/directory
Commonly changed simulation settings, such as grid resolution, run
duration, and number of cores, are set in
Expand Down
2 changes: 1 addition & 1 deletion docs/source/getting-started/requirements.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ following software:
* Compilers (C, C++, and Fortran):

* Intel compilers versions 2019-2021, or
* GNU compilers version ≥ 10
* GNU compilers versions ≥ 10 and < 13

* MPI (Message Passing Interface)

Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,12 @@ 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
supplement/stretched-grid.rst
supplement/satellite-overpass.rst
geos-chem-shared-docs/doc/gcid-portal-overview.rst
geos-chem-shared-docs/supplemental-guides/bashdatacatalog.rst
geos-chem-shared-docs/supplemental-guides/history-diag-guide.rst
geos-chem-shared-docs/supplemental-guides/netcdf-guide.rst
Expand Down
Loading

0 comments on commit a9e7c3f

Please sign in to comment.