Skip to content

Handmerge 1217 into v12 #1370

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

Closed
mathomp4 wants to merge 5 commits into from
Closed

Handmerge 1217 into v12 #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37878b7
Updates to MG3
dbarahon Mar 6, 2026
4caf90e
Set fail-fast false
mathomp4 Mar 6, 2026
1427417
Merge branch 'feature/sdrabenh/gcm_v12' into feature/dbarahon/rc23_MG3
mathomp4 Apr 13, 2026
d3b4d59
Strip whitespace
mathomp4 Apr 13, 2026
3389ee3
Fix connectivity
mathomp4 Apr 13, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ concurrency:
jobs:
build_gcm:
strategy:
fail-fast: false
matrix:
compiler: [ifort, gfortran-14, gfortran-15]
build-type: [Debug]
Expand Down
2 changes: 1 addition & 1 deletion GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,7 +1886,7 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)

call MAPL_AddConnectivity ( GC, &
SHORT_NAME = (/'ALH'/), &
SHORT_NAME = (/'ALH', 'KM ', 'RI '/), &
DST_ID = MOIST, &
SRC_ID = TURBL, &
RC=STATUS )
Expand Down
4 changes: 2 additions & 2 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ set (srcs
GEOS_GF_InterfaceMod.F90 ConvPar_GF_GEOS5.F90 ConvPar_GF2020.F90 ConvPar_GF_Shared.F90 module_gate.F90
GEOS_UW_InterfaceMod.F90 uwshcu.F90
aer_actv_single_moment.F90
GEOS_MoistGridComp.F90
GEOS_MoistGridComp.F90 Wnet.F90
# files that are sometimes present?
# ras00.F90 cloud.F90
)
Expand Down Expand Up @@ -65,7 +65,7 @@ endif ()

esma_add_library (${this}
SRCS ${srcs}
DEPENDENCIES GEOS_Shared GMAO_mpeu MAPL Chem_Shared Chem_Base ESMF::ESMF)
DEPENDENCIES GEOS_Shared GMAO_mpeu MAPL Chem_Shared Chem_Base ESMF::ESMF BLAS::BLAS LAPACK::LAPACK)

get_target_property (extra_incs FMS::fms_r4 INTERFACE_INCLUDE_DIRECTORIES)
target_include_directories(${this} PRIVATE
Expand Down
692 changes: 479 additions & 213 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MGB2_2M_InterfaceMod.F90
View file
Open in desktop

Large diffs are not rendered by default.

329 changes: 199 additions & 130 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSmoist_GridComp/GEOS_MoistGridComp.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading