Skip to content

Contribute CI workflows #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 117 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
09c8fad
GEOS-Chem submod update: Merge PR #2359 (Per-species KPP error tol.)
yantosca Jul 3, 2024
600ce53
GEOS-Chem submod update: Merge hotfix from PR #2363 atop PR #2359
yantosca Jul 8, 2024
6c03981
GEOS-Chem submod update: Merge PR #2315 (complexSOA bug fixes)
yantosca Jul 16, 2024
a036cc7
Merge GCClassic 14.4.2 back into the 14.5.0 development stream
yantosca Jul 24, 2024
96e3b6b
Hotfix: Point to dev/14.5.0 + 14.4.2 in src/GEOS-Chem
yantosca Jul 24, 2024
6f22240
GEOS-Chem submod update: Merge PR #2398 (Uncomment cations for HETP)
yantosca Jul 26, 2024
a6ad1c5
GEOS-Chem submod update: Merge PR #2352 (ALK4/R4N2 fixes from J. Brewer)
yantosca Aug 1, 2024
0c22a3a
GEOS-Chem submod update: PR #2352 post-merge fix (rebuild KPP files)
yantosca Aug 5, 2024
c2a3236
Merge GEOS-Chem 14.4.3 back into the 14.5.0 development branch
yantosca Aug 13, 2024
8da455b
GEOS-Chem submod update: PR #2425 post-merge fix (CHANGELOG.md update_
yantosca Aug 15, 2024
edaa239
GEOS-Chem & HEMCO updates: Merge PR #2318, PR #284, PR #285
yantosca Aug 20, 2024
153a355
GEOS-Chem submod update: Merge PR #2428 (vdiff) and PR #2144 (drydep)
yantosca Aug 28, 2024
750151f
geos-chem-shared-docs update: Update packages.yaml to GCC 12.2.0
yantosca Aug 28, 2024
e7efd49
Update env files from GNU 10.2.0 to 12.2.0 + related updates
yantosca Aug 29, 2024
03ae9d8
geos-chem-shared-docs update: Use gcc@12.2.0 in load-libraries-guide.rst
yantosca Aug 29, 2024
930deb9
GEOS-Chem submod update: Merge PR #2436, #2439, #2371 (PPN Phot etc.)
yantosca Aug 29, 2024
49908a8
GEOS-Chem submod update: Merge PR #2424, PR #2426, Cloud-J PR #24
yantosca Sep 3, 2024
25bb833
Update jinja2 to 3.1.4 in docs/requirements.txt
yantosca Sep 4, 2024
615cf45
Cloud-J submod update: Merge PR #26 (Define max J-values rather than …
yantosca Sep 5, 2024
b577abe
GEOS-Chem submod update: Merge PR #2452 (Reorder photo rxns for PNs, …
yantosca Sep 6, 2024
5e00d7e
GEOS-Chem update: Merge PR #2457 (Update Is_Photolysis tags)
yantosca Sep 13, 2024
0e075b7
GEOS-Chem & HEMCO updates: Merge PR #2462, PR #2430, PR #287
yantosca Sep 16, 2024
af1ced6
GEOS-Chem submodupdate: Merge PR #2464 (remove zero J-value diagnostics)
msulprizio Sep 19, 2024
6160632
GEOS-Chem submod update: Merge PR #1467 (Fix dry mass fraction of sea…
msulprizio Sep 20, 2024
5e45d73
Bugfix: Restore stale workflow functionality
msulprizio Sep 24, 2024
bb056b3
GEOS-Chem submod update: Merge PR #2477 (Fix for double counting CH4 …
msulprizio Sep 27, 2024
dfd1f6f
GEOS-Chem submodule update: Merge PR #2473 (seasonality of CH4 reserv…
msulprizio Sep 27, 2024
347686f
GEOS-Chem and HEMCO submodule updates: Add fixes for stale issue Gith…
msulprizio Sep 27, 2024
67d1e8a
MergePR #67 containing a fix for the stale issue Github workflow
msulprizio Sep 27, 2024
3daf9fc
Moved config file doc to geos-chem-shared-docs
yantosca Sep 30, 2024
08cccff
GEOS-Chem submodule update: Merge PR #2489 (fix for coarse-mode seasa…
msulprizio Sep 30, 2024
f13ea9c
Updated "Speeding up a slow GEOS-Chem simulation" chapter
yantosca Sep 30, 2024
1c6c0ad
GEOS-Chem submodule update: Merge PR #2490 (clean up CHANGELOG.md)
msulprizio Oct 1, 2024
2734825
Cloud-J submodule update for 8.0.1 release
msulprizio Oct 1, 2024
440b4d6
geos-chem-shared-docs update: Add doc about diffs btw GCHP & GCC
yantosca Oct 1, 2024
f19794e
geos-chem-shared-doc update: Fixed typo; Added GCHP vs. GCC diffs
yantosca Oct 2, 2024
9545c59
GEOS-Chem submodule update: Merge PR #2493 (rename ALK7 to ALK6)
msulprizio Oct 3, 2024
347c3a2
GEOS-Chem submodule update: Merge PR #2492 (fixes for GCHP carbon sim)
msulprizio Oct 3, 2024
29b8615
geos-chem-shared-docs update: GC input data; GCHP History guide
yantosca Oct 15, 2024
a6973ae
RTD Updates: Additional updates for GC Input Data repository
yantosca Nov 2, 2024
a10e19b
RTD update: GC data portal doc updates + fixes broken links
yantosca Nov 4, 2024
09a5db3
Update dry-run download; Add warnings about GEOS-FP
yantosca Nov 5, 2024
765987a
Moved gcid-special-portals.rst to geos-chem-shared-docs/doc
yantosca Nov 5, 2024
b81423c
RTD update: Fixed more links/refs and text formatting issues
yantosca Nov 5, 2024
694e24f
Update warning boxes about GEOS-FP in dry-run & rundir doc
yantosca Nov 6, 2024
2d8b6e0
Submod update: Merge GC PR #2555 & HEMCO PR #295 (14.5.0 dry run)
yantosca Nov 7, 2024
09b6822
Update version numbers to 14.5.0
yantosca Nov 7, 2024
bef8b4b
Updated ReadTheDocs documentation for the 14.5.0 release
yantosca Nov 8, 2024
cc01a47
GCClassic 14.5.0 release
yantosca Nov 8, 2024
f56c705
Merge 14.5.0 release into dev/no-diff-to-benchmark
yantosca Nov 8, 2024
131a407
GEOS-Chem updates: Merge PR #2560 and PR #2508
yantosca Nov 19, 2024
e99538a
GEOS-Chem update: Merge PR #2532 (Add allocate guards)
yantosca Nov 20, 2024
63e9022
GEOS-Chem update: Merge PR #2544 (SatDiagn counter fixes)
yantosca Nov 20, 2024
8981668
GEOS-Chem update: Merge PR #2580 (Remove duplicate WD_RetFactor)
yantosca Nov 21, 2024
2b7306a
GEOS-Chem update: Merge PR #2486 (Prevent seg fault in qfyaml)
yantosca Nov 21, 2024
0560047
GEOS-Chem update: Merge PR #2542 (CESM fix: exclude HEMCO deps)
yantosca Nov 21, 2024
a8aeb02
GEOS-Chem update: Merge PR #2578 (Fixes for GCHP adjoint )
yantosca Nov 21, 2024
1eae7f9
Add CMake commands to build the KPP executable file
yantosca Nov 22, 2024
9d62975
Update src/CMakeLists.txt to install KPP standalone executable
yantosca Nov 22, 2024
8cc2c4b
GEOS-Chem update: Merge PR #2593 (Prevent duration < frequency)
yantosca Nov 26, 2024
384f5d3
GEOS-Chem update: Merge PR #2588 (Add KPP Standalone)
yantosca Dec 2, 2024
d807ca4
Merge PR #73 (Add KPP standalone into 14.5.1)
yantosca Dec 2, 2024
f69f415
Submodule updates for GEOS-Chem #2608 and HEMCO #296
lizziel Dec 3, 2024
3be5820
Submodule update: GEOS-Chem #2612
lizziel Dec 4, 2024
dc666fc
Bug fix" Now use "submodules: recursive" in Azure config files
yantosca Dec 5, 2024
b474570
Merge pull request #77 from geoschem/bugfix/azure-pipelines
lizziel Dec 5, 2024
9ec79fb
Submodule updates: GEOS-Chem #2553 and #2523
lizziel Dec 5, 2024
177d95b
Submodule update: GEOS-Chem #2615
lizziel Dec 6, 2024
123f6f7
GEOS-Chem update: Merge PR #2617 (KPP submodule update)
yantosca Dec 9, 2024
879b900
RTD Update: Added KPP-Standalone Supplemental Guide
yantosca Dec 9, 2024
b698203
GEOS-Chem submodule update: Merge PR #2626
msulprizio Dec 12, 2024
f866ce2
GEOS-Chem update: Merge PR #2634 (Update kpp_standalone_interface.yml)
yantosca Dec 12, 2024
7f7b6ff
Fixed CMake error to prevent KPP standalone being built in carbon sim
yantosca Dec 16, 2024
f9c3ea7
Merge PR #79 (Fix error in CMake logic for KPP standalone)
yantosca Dec 16, 2024
6d4a4ec
RTD Updates: KPP standalone guide and fixed broken link
yantosca Dec 17, 2024
258398c
Submodule updates: GEOS-Chem #2642 and #2643, HEMCO #298
lizziel Dec 19, 2024
be31b4c
Submodule updates: GEOS-Chem #2661, HEMCO #300
lizziel Dec 20, 2024
15d17fb
geos-chem-shared-docs update: Updated error-guide.rst
yantosca Jan 3, 2025
0ba41ca
GEOS-Chem update: Merge PR #2669 (Australian Hg emissions)
yantosca Jan 7, 2025
799dae7
GEOS-Chem update: Merge PR # (BC freq warnings in HISTORY.rc)
yantosca Jan 7, 2025
9428533
GEOS-Chem update: Merge PR #2554 (bug fixes for carbon simulations)
msulprizio Jan 8, 2025
b0c9eb1
GEOS-Chem update: Merge PR #2674 (Harvard int tests use GCC12)
yantosca Jan 9, 2025
d9885f1
GEOS-Chem update: Merge PR #2675 (Bugfix: GCHP read met from YAML)
yantosca Jan 9, 2025
448d443
Merge branch 'dev/no-diff-to-benchmark' into release/14.5.1
yantosca Jan 10, 2025
42a6060
Merge branch 'docs/dev' into release/14.5.1
yantosca Jan 10, 2025
9c964c8
GCClassic 14.5.1 release
yantosca Jan 10, 2025
ae50776
RTD updates: Add clarifying text to ObsPack, Planeflight diag pages
yantosca Jan 15, 2025
8147cd9
Bump jinja2 to 3.1.5 as suggested by Dependabot
yantosca Jan 16, 2025
bf0538f
Merge PR #81 (Bump jinja2 to 3.1.5)
yantosca Jan 17, 2025
5a3c427
GEOS-Chem and HEMCO updates: .zenodo.json and jinja2 updates
yantosca Jan 17, 2025
2004c3a
GEOS-Chem update: Merge PR #2684 (Fix CO2 weekly SF in GCHP)
yantosca Jan 17, 2025
cc6119e
geos-chem-shared-docs update: Explain data download is free
yantosca Jan 22, 2025
fbb95eb
GEOS-Chem update: Merge PR #2673 (Update to GRPI rice emissions)
msulprizio Jan 23, 2025
855843e
RTD Update: Warn about using older compiler versions
yantosca Jan 23, 2025
2b205bd
Submodule update: GEOS-Chem #2692 and #2616
lizziel Jan 30, 2025
a245e60
Now only build KPP-Standalone when -DKPPSA=y
yantosca Jan 30, 2025
11e7d2e
Fixed CMake gc_pretty_print statement for KPPSA variable
yantosca Jan 30, 2025
ef2e2ff
GEOS-Chem update: Merge PR #2712 (Build KPPSA upon request)
yantosca Feb 6, 2025
f2fd5b3
Merge PR #82 (Build KPP-Standalone only upon request)
yantosca Feb 6, 2025
bbe956d
geos-chem-shared-docs update: Update KPP-Standalone guide
yantosca Feb 6, 2025
541d420
Update fullchem rundir creation example for KPP-Standalone build
yantosca Feb 7, 2025
b5f2d46
geos-chem-shared-docs update: Point to KPP-Standalone GCPy doc
yantosca Feb 7, 2025
a972934
Merge branch 'dev/no-diff-to-benchmark' into release/14.5.2
yantosca Feb 12, 2025
ba5b7be
Change version numbers to 14.5.2 and update geos-chem hash
yantosca Feb 12, 2025
df405dc
Merge ReadTheDocs updates into the release/14.5.2 branch
yantosca Feb 12, 2025
b89f190
GCClassic 14.5.2 release
yantosca Feb 12, 2025
3271937
GEOS-Chem update: Merge PR #2713 (CESM reads AEIC2019 every timestep)
yantosca Feb 25, 2025
5025a5b
RTD updates: AWS-CLI + bug fix in planeflight doc
yantosca Mar 3, 2025
d8afa2c
Update HEMCO submodule with PRs #299, #304, and #306
lizziel Mar 4, 2025
e589efc
Merge branch 'dev/no-diff-to-benchmark' into release/14.5.3
yantosca Mar 4, 2025
2ebd178
Merge branch 'docs/dev' into release/14.5.3
yantosca Mar 4, 2025
14b847b
Update verwion numbers and submodule hashes for 14.5.3 release
yantosca Mar 4, 2025
265b1d2
GCClassic 14.5.3 release
yantosca Mar 5, 2025
6228f49
Add linting workflow
jwallwork23 Mar 31, 2025
66076f3
Persist credentials when checking out
jwallwork23 Mar 31, 2025
36353ed
Fix vulnerability in cloud benchmarking workflow
jwallwork23 Mar 31, 2025
56416f6
Fix formatting of stale workflow
jwallwork23 Mar 31, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci-pipelines/build-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ container: $[ variables['containerImage'] ]
# Try building GEOS-Chem (this is run for each "matrix" entry above)
steps:
- checkout: self
submodules: true
submodules: recursive
- script: |
. /opt/spack/share/spack/setup-env.sh
export CC=gcc
Expand Down
2 changes: 1 addition & 1 deletion .ci-pipelines/quick-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ container: geoschem/buildmatrix:netcdf-ubuntu
# Try building GEOS-Chem
steps:
- checkout: self
submodules: true
submodules: recursive
- script: |
. /opt/spack/share/spack/setup-env.sh
export CC=gcc
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/cloud-benchmarking-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
- uses: actions/checkout@v3
with:
fetch-depth: 0
persist-credentials: false
- name: Set Initial Variables
# By default we use 1Hr benchmarks
run: |
Expand All @@ -43,8 +44,8 @@ jobs:
# conditionally overwrite variables if a tag was the triggering event
- name: Reset Initial Variables for pull request
run: |
echo "GITHUB_SHA_SHORT=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV
echo "COMMIT_NAME=`echo ${{ github.event.pull_request.head.sha }} | cut -c1-7`" >> $GITHUB_ENV
echo "GITHUB_SHA_SHORT=${{ github.event.pull_request.head.sha | substr(0, 7) }}" >> $GITHUB_ENV
echo "COMMIT_NAME=${{ github.event.pull_request.head.sha | substr(0, 7) }}" >> $GITHUB_ENV
if: github.event_name == 'pull_request'
- name: Reset Variables For Tags
# We do a 1Month benchmark for tags
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/gcclassic-compile-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:

steps:
- name: Checkout code
with:
persist-credentials: false
uses: actions/checkout@v4

- name: Install dependencies
Expand Down
58 changes: 58 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# Workflow to run linting checks on source
name: Lint

# Controls when the workflow will run
on:
# Triggers the workflow on pushes to the "main" branch, i.e., PR merges
push:
branches: [ "main" ]

# Triggers the workflow on pushes to open pull requests with code changes
pull_request:
paths:
- '.github/workflows/*.yml'

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Cancel jobs running if new commits are pushed
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

# Workflow run - one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "lint"
lint:
# The type of runner that the job will run on
runs-on: ubuntu-latest
strategy:
fail-fast: false

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout code
with:
persist-credentials: false
uses: actions/checkout@v4

- name: Install Python
uses: actions/setup-python@v5
with:
python-version: '3.x'

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m venv ci_venv
. ci_venv/bin/activate
pip install zizmor==0.9.2

# Apply GitHub Actions linter, zizmor
- name: zizmor
if: always()
run: |
cd ${{ github.workspace }}
. ci_venv/bin/activate
zizmor .github/workflows/*.yml
4 changes: 2 additions & 2 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Mark stale issues

on:
schedule:
- cron: '0 0 * * *' # Run every night at midnight
- cron: '0 0 * * *' # Run every night at midnight

jobs:
stale:
Expand All @@ -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
52 changes: 51 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,57 @@ This file documents all notable changes to the GEOS-Chem Classic wrapper reposit
- src/HEMCO/CHANGELOG.md
- src/Cloud-J/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).
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.3] - 2025-03-05
### Added
- Updated RTD docs to state that users wishing not to open AWS account can use AWS CLI commands with `--no-sign-request1`

### Changed
- Updated GEOS-Chem submodule to 14.5.3
- Updated HEMCO submodule to 3.10.2

### Fixed
- Fixed error with the `rubric` section in the RTD planeflight documentation

## [14.5.2] - 2025-02-12
### Added
- Added clarifying text about which types of data can use altitude coordinates for the Planeflight diagnostic in RTD documentation
- Added warning for users to preprocess ObsPack GLOBALVIEWplus CH4 data files before reading into GEOS-Chem in RTD documentation
- Added text to RTD stating that data download from `s3://geos-chem` is and `s3://gcgrid` is free

### Changed
- Bumped `jinja2` to version 3.1.5 in `docs/requirements.txt` to fix a security issue
- Changed the build sequence so that the KPP-Standalone is only built when configuring with `-DKPPSA=y`
- Updated RTD documentation to state that older Intel compilers may cause unexpected results; Also updated to recommend GCC 10 and later.
- Updated RTD documentation for fullchem rundir creation, which now asks users if they wish to build KPP-Standalone

## [14.5.1] - 2025-01-10
### Added
- Added code to `src/CMakeLists.txt` to build & install the KPP standalone executable when `fullchem` or `custom` mechanisms are selected
- Added ReadTheDocs Supplemental Guide on using the KPP-Standalone Box Model and KPP-Standalone Interface in GEOS-Chem

### Changed
- Changed `submodules: true` to `submodules: recursive` in `.ci-pipelines/*.yml` files, which will fetch all levels of submodules in Azure CI tests.

### Fixed
- Fixed logic error in `src/CMakeLists.txt` that attempted to build the KPP standalone for the carbon simulation (see geoschem/GCClassic #78)
- Fixed broken links in ReadTheDocs documentation

## [14.5.0] - 2024-11-08
### Changed
- Updated GEOS-Chem to 14.5.0
- Updated HEMCO to 3.10.0
- Updated Cloud-J to 8.0.1
- Updated `docs/source/geos-chem-shared-docs/spack/packages.yaml` to use GCC 12.2.0 compilers
- Updated documentation for version 14.5.0
- Moved several doc files (not supplemental guides) that are used in both GCClassic and GCHP the to `geos-chem-shared-docs/doc` folder

### Fixed
- Fixed formatting error in `.github/workflows/stale.yml` that caused the Mark Stale Issues action not to run
- Updated to Python package `jinja2==3.1.4` in `docs/requirements.txt` (fixes a security issue)

## [14.4.3] - 2024-08-13
### Changed
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cmake_minimum_required (VERSION 3.13)
project (geos-chem-classic
VERSION 14.4.3
VERSION 14.5.3
LANGUAGES Fortran
)

Expand Down
10 changes: 9 additions & 1 deletion CMakeScripts/GC-ConfigureClassic.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,14 @@ function(configureGCClassic)
)
gc_pretty_print(VARIABLE HCOSA IS_BOOLEAN)

#-------------------------------------------------------------------------
# Build the KPP-Standalone?
#-------------------------------------------------------------------------
set(KPPSA OFF CACHE BOOL
"Switch to build the KPP-Standalone Box Model"
)
gc_pretty_print(VARIABLE KPPSA IS_BOOLEAN)

#-------------------------------------------------------------------------
# Build Luo et al wetdep scheme?
# (Currently a research option... turn OFF by default)
Expand Down Expand Up @@ -208,7 +216,7 @@ function(configureGCClassic)
INTERFACE FASTJX
)
endif()

#-------------------------------------------------------------------------
# Export the following variables to GEOS-Chem directory's scope
#-------------------------------------------------------------------------
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.5
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.3'


# -- General configuration ---------------------------------------------------
Expand Down
13 changes: 6 additions & 7 deletions docs/source/gcclassic-user-guide/compile-cmake.rst
Original file line number Diff line number Diff line change
Expand Up @@ -433,17 +433,16 @@ Classic contains code from the various repositories:

.. note::

If you are cloning GEOS-Chem Classic between official releases, you
may the see :code:`Current status` reported like this:
If you are cloning GEOS-Chem Classic between official releases, you
may the see :code:`Current status` reported like this:

.. code-block:: console
.. code-block:: console

X.Y.Z-alpha.n-C-gabcd1234.dirty or
X.Y.Z-alpha.n-C-gabcd1234.dirty or

X.Y.Z.rc.n-C.gabcd1234.dirty
X.Y.Z.rc.n-C.gabcd1234.dirty

We will explain these formats below. |br|
|br|
We will explain these formats below.

#. `HEMCO (Harmonized Emissions Component) submodule <https://github.com/geoschem/hemco.git>`_:

Expand Down
10 changes: 5 additions & 5 deletions docs/source/gcclassic-user-guide/config-overview.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ edit most (if not all) of these configuration files:
.. toctree::
:maxdepth: 1

geoschem-config.rst
hemco-config.rst
hemco-diagn.rst
../geos-chem-shared-docs/doc/geoschem-config.rst
../geos-chem-shared-docs/doc/hemco-config.rst
../geos-chem-shared-docs/doc/hemco-diagn.rst
history.rst

All of the above-mentioned files are included in your :ref:`GEOS-Chem
Expand All @@ -52,5 +52,5 @@ you'll need to edit these configuration files:
.. toctree::
:maxdepth: 1

spec-db.rst
phot-chem.rst
../geos-chem-shared-docs/doc/spec-db.rst
../geos-chem-shared-docs/doc/phot-chem.rst
5 changes: 3 additions & 2 deletions docs/source/gcclassic-user-guide/download-data.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Download input data
###################

In the following chapters, you will learn how to download input data
for your GEOS-Chem simulation:
for your GEOS-Chem simulation.

.. note::

Expand All @@ -18,6 +18,7 @@ for your GEOS-Chem simulation:
.. toctree::
:maxdepth: 2

input-overview.rst
../geos-chem-shared-docs/doc/gcid-portal-overview.rst
../geos-chem-shared-docs/doc/gcid-special-portals.rst
restart-files.rst
dry-run.rst
Loading
Loading