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

Feature/acollow/#277-useGCsuffixforCAlongnames #278

Merged
merged 4 commits into from
Jul 10, 2024
Merged

Feature/acollow/#277-useGCsuffixforCAlongnames #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ff4a43
Closes #277 by amending CMakeLists.txt to use the GCsuffix for the ca…
acollow Jun 21, 2024
1904a8d
Update CHANGELOG.md
acollow Jun 21, 2024
760db31
Update CHANGELOG.md
acollow Jun 21, 2024
488bb1a
Update gocart components
mathomp4 Jun 21, 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
5 changes: 4 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

### Changed
Long names in State Spec files

- Long names for carbon diagnostics to use BC, OC, and BR instead of CA.*
- Note this requires MAPL v2.35.3+R21C_v1.2.0 or later
- Update `components.yaml` to match the `R21C` branch of GEOSgcm

## v2.1.2+R21C_v1.0.1

Expand Down
8 changes: 5 additions & 3 deletions ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ esma_add_library (${this}
SRCS ${this}Mod.F90
DEPENDENCIES MAPL GA_Environment Chem_Shared2G Process_Library esmf NetCDF::NetCDF_Fortran)

mapl_acg (${this} CA2G_StateSpecs.rc
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
GET_POINTERS DECLARE_POINTERS)
mapl_acg (${this} CA2G_StateSpecs.rc
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
GET_POINTERS DECLARE_POINTERS
LONG_NAME_PREFIX "GCsuffix")


file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml)
foreach ( file ${rc_files} )
Expand Down
12 changes: 6 additions & 6 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ GOCART:
env:
local: ./env@
remote: ../ESMA_env.git
tag: v4.2.0
tag: v4.9.1
develop: main

cmake:
local: ./cmake@
remote: ../ESMA_cmake.git
tag: v3.17.0
tag: v3.26.0
develop: develop

ecbuild:
local: ./cmake@/ecbuild@
remote: ../ecbuild.git
tag: geos/v1.2.0
tag: geos/v1.3.0

HEMCO:
local: ./ESMF/HEMCO_GridComp@
Expand All @@ -27,12 +27,12 @@ HEMCO:
GMAO_Shared:
local: ./ESMF/Shared/GMAO_Shared@
remote: ../GMAO_Shared.git
tag: v1.5.6
tag: v1.7.2+R21C_v1.0.0
sparse: ./config/GMAO_Shared.sparse
develop: main

MAPL:
local: ./ESMF/Shared/MAPL@
remote: ../MAPL.git
tag: v2.23.1
develop: develop
tag: v2.35.3+R21C_v1.2.0
develop: R21C
Loading