-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge GCHP 14.4.2 back into the 14.5.0 development stream
This merge brings the GCHP 14.4.2 release into the GCHP 14.5.0 development stream. 14.4.2 is a zero-diff update. The CHANGELOG.md has been updated accordingly. Signed-off-by: Bob Yantosca <[email protected]>
- Loading branch information
Showing
10 changed files
with
32 additions
and
23 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
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 |
---|---|---|
@@ -1,6 +1,6 @@ | ||
cmake_minimum_required (VERSION 3.13) | ||
project (gchp_ctm | ||
VERSION 14.4.1 | ||
VERSION 14.4.2 | ||
LANGUAGES Fortran CXX C | ||
) | ||
|
||
|
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
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-shared-docs
updated
6 files
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 Cloud-J
updated
16 files
+34 −0 | .github/workflows/mac.yml | |
+31 −0 | .zenodo.json | |
+19 −2 | CHANGELOG.md | |
+19 −8 | CMakeLists.txt | |
+69 −14 | README.md | |
+16 −15 | src/Core/cldj_cmn_mod.F90 | |
+131 −79 | src/Core/cldj_error_mod.F90 | |
+463 −164 | src/Core/cldj_fjx_sub_mod.F90 | |
+171 −53 | src/Core/cldj_init_mod.F90 | |
+0 −2 | src/Core/cldj_osa_sub_mod.F90 | |
+177 −59 | src/Core/cldj_sub_mod.F90 | |
+25 −6 | src/Interfaces/Standalone/CJ77.F90 | |
+1 −16 | src/Interfaces/Standalone/CMakeLists.txt | |
+1 −1 | tools/AddXs/FJ_Add_XNO3-v76.f | |
+2 −2 | tools/AddXs/FJ_Add_XO3-v76.f | |
+1,544 −1,548 | tools/AddXs/FJ_watts.f |
Submodule HEMCO
updated
17 files
+10 −0 | CHANGELOG.md | |
+1 −1 | CMakeLists.txt | |
+38 −5 | CONTRIBUTING.md | |
+1 −1 | docs/source/conf.py | |
+1 −1 | docs/source/geos-chem-shared-docs | |
+9 −8 | docs/source/hco-ref-guide/basic-examples.rst | |
+62 −83 | docs/source/hco-ref-guide/diagnostics.rst | |
+173 −126 | docs/source/hco-ref-guide/extensions.rst | |
+1,037 −891 | docs/source/hco-ref-guide/hemco-config.rst | |
+48 −39 | docs/source/hco-ref-guide/input-file-format.rst | |
+3 −3 | docs/source/hco-ref-guide/known-bugs.rst | |
+73 −57 | docs/source/hco-ref-guide/more-examples.rst | |
+10 −10 | docs/source/hco-ref-guide/under-the-hood.rst | |
+30 −26 | docs/source/hco-ref-guide/units.rst | |
+2 −2 | docs/source/hco-sa-guide/config-sim.rst | |
+1 −1 | src/Core/hco_error_mod.F90 | |
+0 −243 | src/Extensions/hcox_megan_mod.F90 |
Submodule geos-chem
updated
44 files
Submodule MAPL
updated
3 files
+69 −9 | base/HorizontalFluxRegridder.F90 | |
+31 −0 | base/MAPL_SphericalGeometry.F90 | |
+1 −0 | gridcomps/ExtData/ExtDataGridCompMod.F90 |