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.

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

Fixes #176. Add extra esmf dependencies to CMake #177

Merged
merged 3 commits into from
Aug 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

# Anchors to prevent forgetting to update a version
baselibs_version: &baselibs_version v7.5.0
bcs_version: &bcs_version v10.22.3
bcs_version: &bcs_version v10.22.5

orbs:
ci: geos-esm/circleci-tools@1
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Initialized pointers by allocation instead of assignment. fixed issue #127
- Removed ExtData2G yaml files from all AMIP.20C directories as these are not needed anymore
- Removed declaration of Disable_Convection, no longer needed
- Added extra `esmf` to CMake files for UFS

### Changed
- Fixed typo in PM2.5 calculation (check if nitrate is active for not double counting ammonium)
Expand Down
2 changes: 1 addition & 1 deletion ESMF/GOCART2G_GridComp/GA_Environment/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ esma_set_this ()

esma_add_library (${this}
SRCS ${this}Mod.F90
DEPENDENCIES MAPL Chem_Shared2G Process_Library
DEPENDENCIES MAPL Chem_Shared2G Process_Library esmf
)
6 changes: 3 additions & 3 deletions ESMF/GOCART2G_GridComp/SU2G_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ esma_set_this ()

esma_add_library (${this}
SRCS ${this}Mod.F90
DEPENDENCIES GA_Environment MAPL Chem_Shared2G Process_Library)
DEPENDENCIES GA_Environment MAPL Chem_Shared2G Process_Library esmf)

mapl_acg (${this} SU2G_StateSpecs.rc
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
mapl_acg (${this} SU2G_StateSpecs.rc
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS
GET_POINTERS DECLARE_POINTERS)

file (GLOB_RECURSE rc_files CONFIGURE_DEPENDS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.rc *.yaml)
Expand Down
6 changes: 3 additions & 3 deletions ESMF/Shared/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ set (srcs
Chem_AeroGeneric.F90
)

esma_add_library(${this}
SRCS ${srcs}
DEPENDENCIES MAPL)
esma_add_library(${this}
SRCS ${srcs}
DEPENDENCIES MAPL esmf)

if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/@GSW )
set (gsw_ECBUILD_SYSTEM_INCLUDED TRUE)
Expand Down