Skip to content

Commit

Permalink
Merge 14.3.1 release into dev/14.4.0
Browse files Browse the repository at this point in the history
Signed-off-by: Melissa Sulprizio <[email protected]>
  • Loading branch information
msulprizio committed Apr 3, 2024
2 parents 429fe7a + 98d145b commit 87cdac4
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 52 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/gcclassic-compile-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: gcclassic-compile-tests

on: [pull_request, push]

concurrency:
group: ${{ github.workflow }}-${{ github.ref || github.run_id }}
cancel-in-progress: true

jobs:
gnu:
runs-on: ubuntu-latest
strategy:
matrix:
build_type: [Debug]
env:
CXX: g++
CC: gcc
FC: gfortran

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Install dependencies
run: |
sudo apt update -y
sudo apt install -y libnetcdf-dev netcdf-bin libnetcdff-dev
- name: Compile-only tests
run: |
git submodule update --init --recursive
cd test/integration/GCClassic
./integrationTest.sh -d $HOME/compile-tests -t compile
cat $HOME/compile-tests/logs/results.compile.log
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "src/GEOS-Chem"]
[submodule "GEOS-Chem"]
path = src/GEOS-Chem
url = https://github.com/geoschem/geos-chem.git
[submodule "src/HEMCO"]
[submodule "HEMCO"]
path = src/HEMCO
url = https://github.com/geoschem/hemco.git
[submodule "docs/source/geos-chem-shared-docs"]
[submodule "geos-chem-shared-docs"]
path = docs/source/geos-chem-shared-docs
url = https://github.com/geoschem/geos-chem-shared-docs.git
[submodule "src/Cloud-J"]
[submodule "Cloud-J"]
path = src/Cloud-J
url = https://github.com/geoschem/Cloud-J.git
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,25 @@ This file documents all notable changes to the GEOS-Chem Classic wrapper reposit

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
### Changed
- Updated GEOS-Chem submodule to 14.4.0
- Updated HEMCO submodule to 3.9.0

### Removed
- `BPCH_DIAG` configuration option and related ReadTheDocs documentation

## [14.3.1] - 2024-04-02
### Added
- GitHub action to perform compile-only integration tests

### Changed
- Updated GEOS-Chem submodule to 14.3.1
- Updated HEMCO submodule to 3.8.1
- Now use short submodule names (i.e. without the full path) in `.gitmodules`
- Remove obsolete CH4 menu options from config file documentation

## [14.3.0] - 2024-02-07
### Changed
- Updated GEOS-Chem submodule to 14.3.0
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.3.0
VERSION 14.3.1
LANGUAGES Fortran
)

Expand Down
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.3.0'
release = '14.3.1'


# -- General configuration ---------------------------------------------------
Expand Down
43 changes: 0 additions & 43 deletions docs/source/gcclassic-user-guide/geoschem-config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1609,52 +1609,9 @@ the inversion parameters that you specify.
# ... preceding sub-sections omitted ...
analytical_inversion:
activate: false
emission_perturbation: 1.0
state_vector_element_number: 0
use_emission_scale_factor: false
use_OH_scale_factors: false
perturb_OH_boundary_conditions: false
CH4_boundary_condition_ppb_increase_NSEW: [0.0, 0.0, 0.0, 0.0]
.. option:: activate

Activates (:literal:`true`) or deactivates (:literal:`false`) the
analytical inversion.

Default value: :literal:`false`

.. option:: emission perturbation

Specifies a unitless factor by which emissions for this state
vector element will be perturbed.

Default value: :literal:`1.0` (no perturbation)

.. option:: state_vector_element_number

Specifies the element of the state vector corresponding to this
simulation.

Default value: :literal:`0`

.. option:: use_emission_scale_factor

Activates (:literal:`true`) or deactivates (:literal:`false`)
scaling methane emissions by a fixed factor. This scale factor is
specified in the :ref:`HEMCO_Config.rc <cfg-hco-cfg>` file.

Default value: :literal:`false`

.. option:: use_oh_scale_factors

Activates (:literal:`true`) or deactivates (:literal:`false`)
perturbation of OH in analytical inversions of methane. The OH
scale factors are specified in the :literal:`OH_SF` entry of
:ref:`HEMCO_Config.rc <cfg-hco-cfg>` file.

Default value: :literal:`false`

.. option:: perturb_CH4_boundary_conditions

Activates (:literal:`true`) or deactivatees (:literal:`false`)
Expand Down
2 changes: 1 addition & 1 deletion src/GEOS-Chem
Submodule GEOS-Chem updated 134 files

0 comments on commit 87cdac4

Please sign in to comment.