-
Notifications
You must be signed in to change notification settings - Fork 36
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge GEOS-Chem 14.2.3 and HEMCO 3.7.2 into dev/14.3.0
This merge brings the following into the GEOS-Chem 14.3.0 development branch (dev/14.3.0): - GEOS-Chem (science codebase) 14.2.3 - HEMCO 3.7.2 - Updated CHANGELOG.md - ./release/changeVersionNumbers.sh script Signed-off-by: Bob Yantosca <[email protected]>
- Loading branch information
Showing
4 changed files
with
125 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 GCClassic directory structure. Run this before releasing | ||
# a new GEOS-Chem Classic version. | ||
#\\ | ||
#\\ | ||
# !CALLING SEQUENCE: | ||
# $ ./changeVersionNumbers.sh X.Y.Z # X.Y.Z = GCClassic 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/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 $? |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule GEOS-Chem
updated
21 files
+0 −8 | CHANGELOG.md | |
+6 −6 | GeosCore/drydep_mod.F90 | |
+1 −1 | GeosCore/fast_jx_mod.F90 | |
+21 −39 | GeosCore/fjx_interface_mod.F90 | |
+222 −225 | KPP/aciduptake/aciduptake.eqn | |
+212 −212 | KPP/custom/custom.eqn | |
+2 −11 | KPP/fullchem/CHANGELOG_fullchem.md | |
+213 −212 | KPP/fullchem/fullchem.eqn | |
+70 −27 | KPP/fullchem/fullchem_RateLawFuncs.F90 | |
+1 −8 | KPP/fullchem/fullchem_SulfurChemFuncs.F90 | |
+9,279 −9,181 | KPP/fullchem/gckpp_Function.F90 | |
+1 −1 | KPP/fullchem/gckpp_Global.F90 | |
+1 −1 | KPP/fullchem/gckpp_Initialize.F90 | |
+1 −1 | KPP/fullchem/gckpp_Integrator.F90 | |
+13,499 −13,509 | KPP/fullchem/gckpp_Jacobian.F90 | |
+771 −777 | KPP/fullchem/gckpp_JacobianSP.F90 | |
+1,988 −1,992 | KPP/fullchem/gckpp_LinearAlgebra.F90 | |
+952 −923 | KPP/fullchem/gckpp_Monitor.F90 | |
+120 −120 | KPP/fullchem/gckpp_Parameters.F90 | |
+1,046 −1,022 | KPP/fullchem/gckpp_Rates.F90 | |
+271 −271 | KPP/fullchem/gckpp_Util.F90 |
Submodule HEMCO
updated
10 files
+108 −0 | .release/changeVersionNumbers.sh | |
+12 −1 | CHANGELOG.md | |
+1 −1 | CMakeLists.txt | |
+1 −1 | SUPPORT.md | |
+1 −1 | docs/source/conf.py | |
+1 −1 | docs/source/hco-ref-guide/hemco-config.rst | |
+5 −0 | run/createRunDir.sh | |
+26 −4 | src/Core/hco_config_mod.F90 | |
+1 −1 | src/Core/hco_error_mod.F90 | |
+1 −1 | src/Core/hco_types_mod.F90 |