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

Jump to bottom

Updates for Spack Support, Round 2 #126

Merged
merged 3 commits into from
Mar 24, 2022
Merged

Updates for Spack Support, Round 2 #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53fbeaa
Updates for Spack Support, Round 2
mathomp4 Mar 21, 2022
1f101dc
Update components.yaml to match GEOSgcm v10.22.1 to pass CI
mathomp4 Mar 21, 2022
3721821
update changelog
mathomp4 Mar 21, 2022
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- This matches the styles currently used in MAPL (2 space indents in CMake and yaml, 4 spaces for Python)

### Changed

- Updated the CircleCI to use circleci-tools 0.13.0 orb
- Moves CI to use Baselibs 6.2.13 needed by MAPL development
- Update `components.yaml` to be in line with GEOSgcm v10.22.0
- Update `components.yaml` to be in line with GEOSgcm v10.22.1
- Updates to support Spack
- Changed the handling of state variable names in multiple instances of component (see Issue #93)
- Major refactoring of Mie table class. (see Issue #96)
Expand Down
9 changes: 4 additions & 5 deletions ESMF/GOCART_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,15 @@ set (srcs

set (resource_files
GOCARTdata_AerRegistry.rc
)
)

install( FILES ${resource_files}
install( FILES ${resource_files}
DESTINATION etc
)

set (dependencies Chem_Base Chem_Shared MAPL GMAO_mpeu)
set (dependencies Chem_Base Chem_Shared MAPL GMAO_mpeu esmf)
esma_add_library (${this}
SRCS ${srcs}
SUBCOMPONENTS ${alldirs}
DEPENDENCIES ${dependencies}
INCLUDES ${INC_ESMF})
DEPENDENCIES ${dependencies})

10 changes: 5 additions & 5 deletions components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ GOCART:
env:
local: ./env@
remote: ../ESMA_env.git
tag: v3.11.0
tag: v3.13.0
develop: main

cmake:
local: ./cmake@
remote: ../ESMA_cmake.git
tag: v3.10.0
tag: v3.12.0
develop: develop

ecbuild:
Expand All @@ -22,17 +22,17 @@ ecbuild:
HEMCO:
local: ./ESMF/HEMCO_GridComp@
remote: ../HEMCO.git
branch: geos/v2.2.2
branch: geos/v2.2.3

GMAO_Shared:
local: ./ESMF/Shared/GMAO_Shared@
remote: ../GMAO_Shared.git
tag: v1.5.1
tag: v1.5.3
sparse: ./config/GMAO_Shared.sparse
develop: main

MAPL:
local: ./ESMF/Shared/MAPL@
remote: ../MAPL.git
tag: v2.18.0
tag: v2.19.0
develop: develop