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

Update ESMF CMake target to ESMF::ESMF #280

Merged
merged 1 commit into from
Aug 14, 2024
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 CARMAchem_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ foreach (dir ${src_directories})
list (APPEND srcs ${tmpsrcs})
endforeach()

set (dependencies Chem_Shared Chem_Base GMAO_mpeu esmf)
set (dependencies Chem_Shared Chem_Base GMAO_mpeu ESMF::ESMF)
esma_add_library (${this} SRCS ${srcs} DEPENDENCIES ${dependencies})
target_include_directories (${this} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/CARMA/source/base>)

Expand Down
9 changes: 6 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
### Removed
### Changed

- Update ESMF CMake target to `ESMF::ESMF`

### Fixed
### Deprecated

Expand Down Expand Up @@ -87,7 +90,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- Instead of importing a set of QQK diagnostic fields for chemical loss of stOX, TR now imports a single field: stOX_loss
- For OPS configuration: removal of links, change of QFED paths from vNRT/ to v2.5r1-nrt/
- For OPS configuration: removal of links, change of QFED paths from vNRT/ to v2.5r1-nrt/
- For AMIP configuration: update of QFED from v2.5r1 to v2.6r1 (most recent collection)
- Moved to GitHub Actions for label enforcement
- Update CircleCI to use Baselibs 7.7.0
Expand Down Expand Up @@ -135,7 +138,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Updates to emissions from galactic cosmic rays in GMI
- Minor improvement to Runtime_Registry module.
- Broke away the GMI contents from Chem_Registry.rc, into a separate file
- Broke away the GMI contents from Chem_Registry.rc, into a separate file

## [1.10.1] - 2022-08-30

Expand Down Expand Up @@ -191,7 +194,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Fix YAML typo in `GEOSachem_GridComp/GEOSachem_ExtData.yaml`

## [1.9.4] - 2022-05-31
## [1.9.4] - 2022-05-31

### Fixed

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set (srcs
esma_add_library (${this}
SRCS ${srcs}
SUBCOMPONENTS ${alldirs}
DEPENDENCIES MAPL Chem_Shared Chem_Base GOCART_GridComp GOCART2G_GridComp TR GMI StratChem esmf)
DEPENDENCIES MAPL Chem_Shared Chem_Base GOCART_GridComp GOCART2G_GridComp TR GMI StratChem ESMF::ESMF)

install(
FILES GEOS_ChemGridComp.rc ChemEnv_ExtData.rc ChemEnv.rc ChemEnv_ExtData.yaml
Expand Down
2 changes: 1 addition & 1 deletion DNA_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set (srcs
DNA_GridCompMod.F90
)

esma_add_library (${this} SRCS ${srcs} DEPENDENCIES MAPL esmf NetCDF::NetCDF_Fortran)
esma_add_library (${this} SRCS ${srcs} DEPENDENCIES MAPL ESMF::ESMF NetCDF::NetCDF_Fortran)
target_compile_definitions (${this} PRIVATE MAPL_MODE GEOS5)

set (resource_files
Expand Down
4 changes: 2 additions & 2 deletions GEOSCHEMchem_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set (src_directories
${geos_chem_dir}/KPP/fullchem
${geos_chem_dir}/GeosCore
${geos_chem_dir}/Interfaces/GCHP
${geos_chem_dir}/Interfaces/GEOS
${geos_chem_dir}/Interfaces/GEOS
${geos_chem_dir}/ObsPack
)
include_directories (${geos_chem_dir}/Headers)
Expand Down Expand Up @@ -77,7 +77,7 @@ endif ()
esma_add_library (${this}
SRCS ${srcs}
DEPENDENCIES MAPL MAPL_cfio_r4 Chem_Base Chem_Shared HEMCO
OpenMP::OpenMP_Fortran esmf NetCDF::NetCDF_Fortran
OpenMP::OpenMP_Fortran ESMF::ESMF NetCDF::NetCDF_Fortran
)

target_compile_definitions(${this} PRIVATE
Expand Down
2 changes: 1 addition & 1 deletion GEOSachem_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set (srcs
esma_add_library (
${this}
SRCS ${srcs}
DEPENDENCIES Chem_Shared MAPL GMAO_mpeu esmf NetCDF::NetCDF_Fortran
DEPENDENCIES Chem_Shared MAPL GMAO_mpeu ESMF::ESMF NetCDF::NetCDF_Fortran
)
target_compile_definitions (${this} PRIVATE MAPL_MODE GEOS5)
set_target_properties (${this} PROPERTIES COMPILE_FLAGS ${PP})
Expand Down
2 changes: 1 addition & 1 deletion GEOSpchem_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ esma_set_this ()

esma_add_library (${this}
SRCS GEOS_PChemGridComp.F90
DEPENDENCIES MAPL MAPL_cfio_r4 Chem_Base esmf NetCDF::NetCDF_Fortran)
DEPENDENCIES MAPL MAPL_cfio_r4 Chem_Base ESMF::ESMF NetCDF::NetCDF_Fortran)
2 changes: 1 addition & 1 deletion HEMCO_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set (srcs
esma_add_library (
${this}
SRCS ${srcs}
DEPENDENCIES Chem_Shared MAPL HEMCO esmf NetCDF::NetCDF_Fortran
DEPENDENCIES Chem_Shared MAPL HEMCO ESMF::ESMF NetCDF::NetCDF_Fortran
)
target_compile_definitions (${this} PRIVATE ESMF_ DEVEL GEOS_FP)

Expand Down
2 changes: 1 addition & 1 deletion MAMchem_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ set (srcs
)


set (dependencies MAPL Chem_Shared GMAO_mpeu esmf NetCDF::NetCDF_Fortran)
set (dependencies MAPL Chem_Shared GMAO_mpeu ESMF::ESMF NetCDF::NetCDF_Fortran)
esma_add_library (${this} SRCS ${srcs} DEPENDENCIES ${dependencies} SUBDIRS optics)
target_compile_definitions (${this} PRIVATE GEOS5 MODAL_AERO MODAL_AERO_7MODE GEOS5_PORT)

Expand Down
2 changes: 1 addition & 1 deletion MATRIXchem_GridComp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ set (srcs
MATRIXchem_GridCompMod.F90
)

esma_add_library (${this} SRCS ${srcs} DEPENDENCIES Chem_Shared MAPL esmf)
esma_add_library (${this} SRCS ${srcs} DEPENDENCIES Chem_Shared MAPL ESMF::ESMF)
if (EXTENDED_SOURCE)
set_target_properties (${this} PROPERTIES COMPILE_FLAGS ${EXTENDED_SOURCE})
endif ()
Expand Down
2 changes: 1 addition & 1 deletion Shared/Chem_Base/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set (srcs
Chem_AodMod.F90
Chem_SimpleBundleMod.F90
)
esma_add_library(${this} SRCS ${srcs} DEPENDENCIES GMAO_mpeu MAPL GMAO_gfio_r4 esmf NetCDF::NetCDF_Fortran)
esma_add_library(${this} SRCS ${srcs} DEPENDENCIES GMAO_mpeu MAPL GMAO_gfio_r4 ESMF::ESMF NetCDF::NetCDF_Fortran)
target_compile_definitions (${this} PRIVATE GEOS5)

ecbuild_add_executable(TARGET gogo.x SOURCES gogo.F90 LIBS ${this})
Expand Down
2 changes: 1 addition & 1 deletion Shared/Chem_Shared/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ endif ()

esma_add_library(${this}
SRCS ${srcs}
DEPENDENCIES GMAO_mpeu MAPL Chem_Base GEOS_Shared GMAO_hermes esmf NetCDF::NetCDF_Fortran)
DEPENDENCIES GMAO_mpeu MAPL Chem_Base GEOS_Shared GMAO_hermes ESMF::ESMF NetCDF::NetCDF_Fortran)
#add_definitions(-DDEBUG)
add_definitions(-DSPMD -DFVCHEM)

Expand Down
2 changes: 1 addition & 1 deletion Shared/HEMCO/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ list (REMOVE_ITEM srcs

esma_add_library (${this}
SRCS ${srcs}
DEPENDENCIES MAPL esmf NetCDF::NetCDF_Fortran
DEPENDENCIES MAPL ESMF::ESMF NetCDF::NetCDF_Fortran
)

target_compile_definitions (${this} PRIVATE ESMF_ USE_REAL8 MODEL_GEOS)
Expand Down
Loading