From acbd110d3d2ca2604b5032be6a114858a812a3a6 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 27 Nov 2023 10:36:51 -0500 Subject: [PATCH 1/9] HEMCO submodule update: Merge PRs #245, #248 This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/HEMCO repository: 6ab11ea Merge PR #245 (Rename HEMCO_Config.rc.sample to HEMCO_Config.rc) 697a28d Merge PR #248 (Increase string length for netCDF varname) 7a509dd Add section for unreleased version to changelog Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/HEMCO_GridComp/HEMCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO index 00aaf6569..6ab11ea18 160000 --- a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO +++ b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO @@ -1 +1 @@ -Subproject commit 00aaf656934963d64d283a8e6c302743f62942e1 +Subproject commit 6ab11ea187d5a92fd9c73e8fbd3cc9983bc6bf28 From 6012e51796879b8bcac4a771daf894ff309b2b6f Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 27 Nov 2023 10:37:17 -0500 Subject: [PATCH 2/9] GEOS-Chem update: Merge PRs 1796, 1987, 1990, 201{1,3}, 2039, 204{0,2,3} This commit informs the GCHP superproject about the following commits that were pushed to the geoschem/geos-chem repository: 78c1b7dc3 Merge PR #2042 (Fix HEMCO_Config.rc for CH4 and carbon simulations) 54e8cdafc Merge PR #2043 (Fix typos written to GCHP int test log files) 382f11dca Merge PR #2040 (Lower GCHP timestep threshold if > C180) ed1a20ec6 Merge PR #2039 (Improve missing CH4 emissions error message) 1b47584ba Merge PR #1990 (Add --no-bootstrap option to integration tests ) 48a244826 Merge PR #2013 (Fix incorrect comment on static H2O option) 533128246 Merge PR #1796 (Use integer flags to denote species units) 3388e7fed Merge PR #1987 (Prevent POAEMISS from being assigned if not allocated) 1b05bfdf8 Bug fix: Remove duplicate species flags in fullchem_mod.F90 b2e7f7056 Merge branch 'release/14.1.2' into dev/no-diff-to-benchmark f5f84fba9 Merge PR #2011 (Fix titles for 14.2.0 and 14.2.2 in CHANGELOG.md) Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 7e00810e5..78c1b7dc3 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 7e00810e5161a1f0f9855ed416753a8b7961a8b0 +Subproject commit 78c1b7dc35e403e674da2ef49f3e85e106feed18 From fe78a2b1688076218f06c378708379af96f06aa9 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 27 Nov 2023 10:57:29 -0500 Subject: [PATCH 3/9] HEMCO submod update: Include script to change HEMCO version numbers This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/HEMCO repository d56ede5 Merge PR #242 (Include script to change HEMCO version numbers) Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/HEMCO_GridComp/HEMCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO index 6ab11ea18..d56ede575 160000 --- a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO +++ b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO @@ -1 +1 @@ -Subproject commit 6ab11ea187d5a92fd9c73e8fbd3cc9983bc6bf28 +Subproject commit d56ede575906a1fae0f2d788ad2c8febee9cdb94 From 55578150b998bdce958cdcc0a1cb75b37cda703c Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Mon, 27 Nov 2023 11:30:13 -0500 Subject: [PATCH 4/9] Add a script to change the GEOS-Chem Classic version numbers before release .release/changeVersionNumbers.sh - Script that changes the GEOS-Chem Classic version numbers in: - CMakeLists.txt - docs/source/conf.py - CHANGELOG.md - src/GCHP_GridComp/GEOSChem_GridComp/geos-chem/CHANGELOG.md CHANGELOG.md - Updated accordingly Signed-off-by: Bob Yantosca --- .release/changeVersionNumbers.sh | 119 +++++++++++++++++++++++++++++++ CHANGELOG.md | 4 ++ 2 files changed, 123 insertions(+) create mode 100755 .release/changeVersionNumbers.sh diff --git a/.release/changeVersionNumbers.sh b/.release/changeVersionNumbers.sh new file mode 100755 index 000000000..ea469d334 --- /dev/null +++ b/.release/changeVersionNumbers.sh @@ -0,0 +1,119 @@ +#!/bin/bash + +#EOC +#------------------------------------------------------------------------------ +# GEOS-Chem Global Chemical Transport Model ! +#------------------------------------------------------------------------------ +#BOP +# +# !MODULE: changeVersionNumbers.sh +# +# !DESCRIPTION: Bash script to change the version numbers in the appropriate +# files in the GCHP directory structure. Run this before releasing +# a new GCHP Classic version. +#\\ +#\\ +# !CALLING SEQUENCE: +# $ ./changeVersionNumbers.sh X.Y.Z # X.Y.Z = GCHP version number +#EOP +#------------------------------------------------------------------------------ +#BOC + +function replace() { + + #======================================================================== + # Function to replace text in a file via sed. + # + # 1st argument: Search pattern + # 2nd argument: Replacement text + # 3rd argument: File in which to search and replace + #======================================================================== + + sed -i -e "s/${1}/${2}/" "${3}" +} + + +function exitWithError() { + + #======================================================================== + # Display and error message and exit + #======================================================================== + + echo "Could not update version numbers in ${1}... Exiting!" + exit 1 +} + + +function main() { + + #======================================================================== + # Replaces the version number in the files listed. + # + # 1st argument: New version number to use + #======================================================================== + + # New version number + version="${1}" + + # Save this directory path and change to root directory + thisDir=$(pwd -P) + cd .. + + #======================================================================== + # Update version numbers in various files + #======================================================================== + + # Pattern to match: X.Y.Z + pattern='[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*' + + # List of files to replace + files=( \ + "CMakeLists.txt" \ + "docs/source/conf.py" \ + ) + + # Replace version numbers in files + for file in ${files[@]}; do + replace "${pattern}" "${version}" "${file}" + [[ $? -ne 0 ]] && exitWithError "${file}" + echo "GCClassic version updated to ${version} in ${file}" + done + + #======================================================================== + # Update version number and date in CHANGELOG.md + #======================================================================== + + # Pattern to match: "[Unreleased] - TBD" + pattern='\[.*Unreleased.*\].*' + date=$(date -Idate) + + # List of files to replace + files=( \ + "CHANGELOG.md" \ + "src/GCHP_GridComp/GEOSChem_GridComp/geos-chem/CHANGELOG.md" \ + ) + + # Replace version numbers in files + for file in ${files[@]}; do + replace "${pattern}" "\[${version}\] - ${date}" "${file}" + [[ $? -ne 0 ]] && exitWithError "${file}" + echo "GCClassic version updated to ${version} in ${file}" + done + + # Return to the starting directory + cd "${thisDir}" +} + +# --------------------------------------------------------------------------- + +# Expect 1 argument, or exit with error +if [[ $# -ne 1 ]]; then + echo "Usage: ./changeVersionNumbers.sh VERSION" + exit 1 +fi + +# Replace version numbers +main "${1}" + +# Return status +exit $? diff --git a/CHANGELOG.md b/CHANGELOG.md index 9661669a1..c6b4dec89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ 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). +## [Unreleased] -- TBD +### Added +- Script `.release/changeVersionNumbers.sh` to change version numbers before a new GCHP release + ## [14.2.2] - 2023-10-23 ### Changed - Updated GEOS-Chem submodule to 14.2.2 From fcf978061b6eed5eb11b9e034fbc280fba194df6 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Tue, 28 Nov 2023 17:48:32 -0500 Subject: [PATCH 5/9] HEMCO submod update: Merge PR #250 (Turn off emission extensions) This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/HEMCO repository: 7e36ad3 Merge PR #250 (Turn off emission extensions when EMISSIONS is off ) This fixes an issue where the HEMCO emission extensions were not turned off even when the EMISSIONS switch was set to false. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/HEMCO_GridComp/HEMCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO index d56ede575..7e36ad323 160000 --- a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO +++ b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO @@ -1 +1 @@ -Subproject commit d56ede575906a1fae0f2d788ad2c8febee9cdb94 +Subproject commit 7e36ad323bf8c2958eedbbdeab1753226c6d620d From 2962d3c68dbba4b2475ee8ac643e939c880516c3 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 1 Dec 2023 10:45:42 -0500 Subject: [PATCH 6/9] GEOS-Chem submod update: Merge PR #2050 (Rst file paths from YAML) This commit informs the GCHP superproject about the following commits that were pushed to the Github geoschem/geos-chem repository: bc3779a41 Merge PR #2050 (Read GCClassic restart file paths from download_data.yml) This PR allows specification of the GEOS-Chem Classic restart file paths in a single place, used by both the rundir creation scripts and the dry-run data download. Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 78c1b7dc3..bc3779a41 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 78c1b7dc35e403e674da2ef49f3e85e106feed18 +Subproject commit bc3779a418865bd75b5fbb323191f4c6163a2b5b From afaba9c72fb39a9131088572662c6143b287e4d6 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 1 Dec 2023 10:46:14 -0500 Subject: [PATCH 7/9] HEMCO submod update: HEMCO 3.7.2 release This commit informs the GCHP superproject about the following commits that were pushed to the GitHub geoschem/HEMCO repository: a5d5169 HEMCO 3.7.2 release Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/HEMCO_GridComp/HEMCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO index 7e36ad323..a5d5169ae 160000 --- a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO +++ b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO @@ -1 +1 @@ -Subproject commit 7e36ad323bf8c2958eedbbdeab1753226c6d620d +Subproject commit a5d5169aee598fc62fb0907d5aef5d7a5353ea41 From d388351640aec488ceb4023a934db7d9276c10b9 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 1 Dec 2023 11:26:25 -0500 Subject: [PATCH 8/9] GEOS-Chem submod update: GEOS-Chem (science codebase) 14.2.3 release This commit informs the GCHP superproject about the following updates that were pushed to the GitHub geoschem/geos-chem repository: 3cd802eb4 GEOS-Chem (science codebase) 14.2.3 release Signed-off-by: Bob Yantosca --- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index bc3779a41..3cd802eb4 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit bc3779a418865bd75b5fbb323191f4c6163a2b5b +Subproject commit 3cd802eb4a9b7a226254fc3938778c8db8c07cf2 From 6fb296670a2723e0cfe75f45bacacba5640a0a14 Mon Sep 17 00:00:00 2001 From: Bob Yantosca Date: Fri, 1 Dec 2023 11:30:04 -0500 Subject: [PATCH 9/9] Update version numbers for GCHP 14.2.3 release Changed version numbers from 14.2.2 to 14.2.3 in: - CHANGELOG.md - CMakeLists.txt - docs/source/conf.py Signed-off-by: Bob Yantosca --- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- docs/source/conf.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6b4dec89..c5afade42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ 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). -## [Unreleased] -- TBD +## [14.2.3] - 2023-12-01 ### Added - Script `.release/changeVersionNumbers.sh` to change version numbers before a new GCHP release diff --git a/CMakeLists.txt b/CMakeLists.txt index bccdd8cd6..fe0077cbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.13) project (gchp_ctm - VERSION 14.2.2 + VERSION 14.2.3 LANGUAGES Fortran CXX C ) diff --git a/docs/source/conf.py b/docs/source/conf.py index db8e572cc..67fe39135 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.2.2' +release = '14.2.3' # -- General configuration ---------------------------------------------------