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

GEOS-Chem 14.5.1 and dependencies #287

Open
wants to merge 4 commits into
base: geos/latest_gcc
Choose a base branch
from
+22 −6
Open

GEOS-Chem 14.5.1 and dependencies #287

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
5d8389d
Added HETP subdirectory and CMake updates for HETP repository
lizziel Nov 19, 2024
708bfd4
Updates Cloud-J filenames in CMakeLists.txt for Cloud-J v8.0.1
lizziel Nov 19, 2024
b00630e
Update HEMCO_GridCompMod.F90 for HEMCO log changes in 3.10.1
lizziel Jan 14, 2025
105b657
Updated changelog
lizziel Jan 14, 2025
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: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Added
- Added Cloud-J subdirectory and CMake updates for Cloud-J repository
- Added HETP subdirectory and CMake updates for new HETP submodule

### Removed

### Changed
- Removed variable WLI from HEMCO grid comp module for compatibility with HEMCO v3.8
- Updating CMakeLists in GEOSCHEMchem to copy all rc and yaml files to install/etc needed to run GEOS with GEOS-Chem
- Updated subroutine call in HEMCO_GridCompMod.F90 for compatibility with HEMCO 3.10.1
- Updated CMakeLists.txt for Cloud-J for compatibility with Cloud-J 8.0.1

### Fixed

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
@@ -1,6 +1,6 @@
esma_set_this ()

esma_add_subdirectories(Shared GOCART Cloud-J)
esma_add_subdirectories(Shared GOCART Cloud-J HETP)

set (alldirs
GEOSpchem_GridComp
Expand Down
6 changes: 3 additions & 3 deletions Cloud-J/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ set (MODEL_GEOSCHEM TRUE) # Will need to rework to use with GMI instead
set (MAPL_ESMF TRUE)

set (srcs
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_sub_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_cmn_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_error_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_init_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_fjx_osa_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_fjx_sub_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_osa_sub_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_init_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_sub_mod.F90
)

# placeholder for excluding files from build
Expand Down
2 changes: 1 addition & 1 deletion GEOSCHEMchem_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ endif ()

esma_add_library (${this}
SRCS ${srcs}
DEPENDENCIES MAPL MAPL_cfio_r4 Chem_Base Chem_Shared HEMCO Cloud-J
DEPENDENCIES MAPL MAPL_cfio_r4 Chem_Base Chem_Shared HEMCO Cloud-J HETP
OpenMP::OpenMP_Fortran esmf NetCDF::NetCDF_Fortran
)

Expand Down
3 changes: 2 additions & 1 deletion HEMCO_GridComp/HEMCO_GridCompMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,7 @@ SUBROUTINE HEMCOinit_( GC, Import, Export, Clock, Inst, RC )
REAL(ESMF_KIND_R8) :: s_r8

INTEGER :: HCRC
INTEGER :: LUN

! For MAPL/ESMF error handling (defined Iam and STATUS)
__Iam__('HEMCOinit_ (GEOS_EmisGridComp.F90)')
Expand All @@ -820,7 +821,7 @@ SUBROUTINE HEMCOinit_( GC, Import, Export, Clock, Inst, RC )
! ------------------------------------------------------------------

IF ( MAPL_Am_I_Root() ) THEN
CALL HCO_LogFile_Open( Inst%HcoConfig%Err, RC = HCRC )
CALL HCO_LogFile_Open( Inst%HcoConfig%Err, .true., HCRC, LUN )
_ASSERT(HCRC==HCO_SUCCESS,'needs informative message')
ENDIF

Expand Down
12 changes: 12 additions & 0 deletions HETP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
esma_set_this ()

esma_mepo_style(HETP hetp_dir)

set (srcs
${CMAKE_CURRENT_SOURCE_DIR}/${hetp_dir}/src/Core/hetp_mod.F90
${CMAKE_CURRENT_SOURCE_DIR}/${hetp_dir}/src/Core/mach_hetp_mod.F90
)

esma_add_library (${this}
SRCS ${srcs}
)
Loading