Skip to content
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.

Sign up for GitHub

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

Merge no-diff-to-benchmark updates into the 14.3.0 development stream #365

Merged
merged 10 commits into from
Jan 8, 2024
Merged

Merge no-diff-to-benchmark updates into the 14.3.0 development stream #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cca320e
Correctly set CMAKE_Fortran_FLAGS
branfosj Jul 26, 2023
b903dd3
GEOS-Chem submod update: Merge PR #2061 Add units in commonIncludeVar…
yantosca Dec 7, 2023
ed3fb2f
GEOS-Chem submod update: Read Hg restarts from v2023-12 folder
yantosca Dec 8, 2023
0e2d1b7
GEOS-Chem submod update: Reduce timers to essential list only
yantosca Dec 11, 2023
24c5eed
Merge PR #334 (Avoid a semicolon in CMAKE_Fortran_Flags)
yantosca Dec 13, 2023
7b7bfa3
PR #334 post-merge update: Edit CHANGELOG.md
yantosca Dec 13, 2023
4774e4b
GEOS-Chem submod update: Merge PR #2058 (TransportTracers in GEOS)
yantosca Dec 15, 2023
5692f34
GEOS-Chem submod update: Merge PR #2084 (Fix exe name in int tests)
yantosca Dec 21, 2023
20f1ea1
GEOS-Chem submod update: Merge PR #2095 (Increase time in GCHP int te…
yantosca Jan 5, 2024
40ee99d
GEOS-Chem submod update: Merge PR #2062 (Updates for GEOS)
yantosca Jan 5, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ This file documents all notable changes to the GCHP wrapper repository starting

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
### Fixed
- Avoid semicolon in `CMAKE_ Fortran_FLAGS` variable when additional flags are passed to `cmake`

## [14.2.3] - 2023-12-01
### Added
- Script `.release/changeVersionNumbers.sh` to change version numbers before a new GCHP release
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ ecbuild_declare_project()
find_package(MPI REQUIRED COMPONENTS C CXX Fortran)

if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
list(APPEND CMAKE_Fortran_FLAGS "-ffree-line-length-none")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-none")
endif()

set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
Expand Down
2 changes: 1 addition & 1 deletion src/GCHP_GridComp/GEOSChem_GridComp/geos-chem
Open in desktop
Submodule geos-chem updated 40 files
+12 −0 CHANGELOG.md
+1 −112 GeosCore/carbon_gases_mod.F90
+7 −11 GeosCore/chemistry_mod.F90
+41 −200 GeosCore/fullchem_mod.F90
+0 −1 GeosCore/mercury_mod.F90
+0 −2 GeosCore/mixing_mod.F90
+4 −1 Headers/input_opt_mod.F90
+83 −1 Headers/state_diag_mod.F90
+28 −97 Interfaces/GCClassic/main.F90
+93 −53 Interfaces/GCHP/Chem_GridCompMod.F90
+9 −18 Interfaces/GCHP/gchp_chunk_mod.F90
+2 −3 Interfaces/GCHP/gchp_historyexports_mod.F90
+7 −217 Interfaces/GEOS/Includes_After_Run.H
+5 −222 Interfaces/GEOS/Includes_Before_Run.H
+12 −11 Interfaces/GEOS/geos_CarbonInterface.F90
+4 −1 Interfaces/GEOS/geos_analysis.F90
+170 −24 Interfaces/GEOS/geos_interface.F90
+14 −7 KPP/fullchem/commonIncludeVars.H
+3 −0 KPP/fullchem/fullchem_HetStateFuncs.F90
+21 −0 KPP/fullchem/fullchem_RateLawFuncs.F90
+2 −0 run/CESM/HISTORY.rc
+2 −0 run/GCClassic/HISTORY.rc.templates/HISTORY.rc.fullchem
+2 −0 run/GCHP/HISTORY.rc.templates/HISTORY.rc.fullchem
+103 −102 run/GEOS/GEOSCHEMchem_ExtData.yaml
+11 −3 run/GEOS/GEOSCHEMchem_GridComp.rc
+9 −1 run/GEOS/HEMCO_Config.rc
+228 −0 run/GEOS/TransportTracers/GEOSCHEMchem_ExtData.rc
+603 −0 run/GEOS/TransportTracers/GEOSCHEMchem_ExtData.yaml
+237 −0 run/GEOS/TransportTracers/GEOSCHEMchem_GridComp.rc
+430 −0 run/GEOS/TransportTracers/HEMCO_Config.rc
+42 −0 run/GEOS/TransportTracers/HEMCO_DiagnFile.rc
+1,848 −0 run/GEOS/TransportTracers/HISTORY.rc
+63 −0 run/GEOS/TransportTracers/geoschem_config.yml
+2 −2 run/GEOS/geoschem_config.yml
+1 −1 run/shared/download_data.yml
+1 −1 test/integration/GCClassic/integrationTestExecute.sh
+4 −4 test/integration/GCHP/integrationTest.sh
+2 −2 test/integration/GCHP/integrationTestCompile.sh
+3 −3 test/integration/GCHP/integrationTestExecute.sh
+1 −1 test/parallel/GCClassic/parallelTestExecute.sh