Skip to content

Commit 59fcade

Browse files
committed
GCHP 14.5.2 release
This is the official release commit of GCHP 14.5.2. Updated version numbers in: - CHANGELOG.md - CMakeLists.txt - docs/source/conf.py Updated GEOS-Chem submodule to version 14.5.2 Updated geos-chem-shared-docs submodule to commit aeeb8e9 Also updated CHANGELOG.md with the latest information. Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
2 parents 5b7a4a7 + d2c9a54 commit 59fcade

File tree

10 files changed

+69
-26
lines changed

10 files changed

+69
-26
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ This file documents all notable changes to the GCHP wrapper repository starting
99

1010
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).
1111

12+
## [14.5.2] - 2025-02-12
13+
### Added
14+
- Added text to RTD stating that data download from `s3://geos-chem` is and `s3://gcgrid` is free
15+
16+
### Changed
17+
- Bumped `jinja2` to version 3.1.5 in `docs/requirements.txt` to fix a security issue
18+
- Changed the build sequence so that the KPP-Standalone is only built when configuring with `-DKPPSA=y`
19+
- Updated RTD documentation for fullchem rundir creation, which now asks users if they wish to build KPP-Standalone
20+
1221
## [14.5.1] - 2025-01-10
1322
### Added
1423
- Added code to `src/CMakeLists.txt` to build & install the KPP standalone executable when `fullchem` or `custom` mechanisms are selected

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required (VERSION 3.13)
22
project (gchp_ctm
3-
VERSION 14.5.1
3+
VERSION 14.5.2
44
LANGUAGES Fortran CXX C
55
)
66

docs/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ sphinxcontrib-bibtex==2.6.2
1212
sphinx-autobuild==2021.3.14
1313
recommonmark==0.7.1
1414
docutils==0.20.1
15-
jinja2==3.1.4
15+
jinja2==3.1.5

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
author = 'GEOS-Chem Support Team'
2424

2525
# The full version, including alpha/beta/rc tags
26-
release = '14.5.1'
26+
release = '14.5.2'
2727

2828

2929
# -- General configuration ---------------------------------------------------

docs/source/user-guide/rundir-init.rst

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,3 +193,29 @@ created and brief instructions for us. For example:
193193
-- Example run scripts are in the runScriptSamples subdirectory
194194
-- For more information visit the GCHP user guide at
195195
https://readthedocs.org/projects/gchp/
196+
197+
198+
Build KPP-Standalone Box Model (optional)
199+
-----------------------------------------
200+
201+
If you are creating a run directory for a fullchem simulation, the
202+
next (and final) menu will aks you:
203+
204+
.. code-block:: console
205+
206+
-----------------------------------------------------------
207+
Do you want to build the KPP-Standalone Box Model? (y/n)
208+
-----------------------------------------------------------
209+
>>>
210+
211+
Type :program:`y` and then :command:`ENTER` you wish to build the
212+
:program:`KPP-Standalone Box Model`, or :program:`n` then
213+
:program:`ENTER` to skip this step. If you choose to build
214+
KPP-Standalone, you will be given this reminder:
215+
216+
.. code-block:: console
217+
218+
>>>> REMINDER: You must compile with options: -DKPPSA=y <<<<
219+
220+
Please see the Supplemental Guide entitled :ref:`kppsa-guide`
221+
for further usage instructions.

src/CMakeLists.txt

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,8 @@ set_target_properties(${EXE_FILE_NAME}
6060
)
6161

6262
#-----------------------------------------------------------------------------
63+
# If GCHP has been configured with -DKPPSA=y, then:
64+
#
6365
# Define the KPP standalone executable:
6466
# 1. Specify a cache variable with the default target name
6567
# 2. Specify the location of the main program
@@ -72,26 +74,28 @@ set_target_properties(${EXE_FILE_NAME}
7274
# This should now fix the issue reported by @msulprizio in:
7375
# https://github.com/geoschem/GCClassic/issues/78
7476
#-----------------------------------------------------------------------------
75-
set(KPPSA_FILE_NAME kpp_standalone CACHE STRING
76-
"Default name for the KPP standalone executable file")
77-
mark_as_advanced(KPPSA_FILE_NAME)
78-
add_executable(${KPPSA_FILE_NAME}
79-
GCHP_GridComp/GEOSChem_GridComp/geos-chem/KPP/standalone/kpp_standalone.F90
80-
)
81-
if("${MECH}" STREQUAL fullchem OR "${MECH}" STREQUAL custom)
82-
target_link_libraries(${KPPSA_FILE_NAME}
83-
PUBLIC
84-
KPPStandalone
85-
)
86-
set_target_properties(${KPPSA_FILE_NAME}
87-
PROPERTIES
88-
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
89-
)
90-
else()
91-
set_target_properties(${KPPSA_FILE_NAME}
92-
PROPERTIES
93-
EXCLUDE_FROM_ALL TRUE
94-
)
77+
if (${KPPSA})
78+
set(KPPSA_FILE_NAME kpp_standalone CACHE STRING
79+
"Default name for the KPP standalone executable file")
80+
mark_as_advanced(KPPSA_FILE_NAME)
81+
add_executable(${KPPSA_FILE_NAME}
82+
GCHP_GridComp/GEOSChem_GridComp/geos-chem/KPP/standalone/kpp_standalone.F90
83+
)
84+
if("${MECH}" STREQUAL fullchem OR "${MECH}" STREQUAL custom)
85+
target_link_libraries(${KPPSA_FILE_NAME}
86+
PUBLIC
87+
KPPStandalone
88+
)
89+
set_target_properties(${KPPSA_FILE_NAME}
90+
PROPERTIES
91+
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
92+
)
93+
else()
94+
set_target_properties(${KPPSA_FILE_NAME}
95+
PROPERTIES
96+
EXCLUDE_FROM_ALL TRUE
97+
)
98+
endif()
9599
endif()
96100

97101
#-----------------------------------------------------------------------------

src/GCHP_GridComp/GEOSChem_GridComp/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ set(LUO_WETDEP OFF CACHE BOOL
1616
set(FASTJX OFF CACHE BOOL
1717
"Switch to use legacy FAST-JX photolysis in GEOS-Chem"
1818
)
19+
set(KPPSA OFF CACHE BOOL
20+
"Switch to build the KPP-Standalone Box Model"
21+
)
1922

2023
# Local variables
2124
set(GC_EXTERNAL_CONFIG TRUE)
@@ -147,3 +150,4 @@ gc_pretty_print(VARIABLE RRTMG IS_BOOLEAN)
147150
gc_pretty_print(VARIABLE GTMM IS_BOOLEAN)
148151
gc_pretty_print(VARIABLE LUO_WETDEP IS_BOOLEAN)
149152
gc_pretty_print(VARIABLE FASTJX IS_BOOLEAN)
153+
gc_pretty_print(VARIABLE KPPSA IS_BOOLEAN)
Submodule geos-chem updated 45 files

src/MAPL

0 commit comments

Comments
 (0)