Skip to content

Commit c5d2846

Browse files
authored
Merge pull request #366 from GEOS-ESM/apifix/pchakrab/mapl-field-get-allocatable-geom
Fix for MAPL_FieldGet's API change
2 parents b608b04 + 5a2d150 commit c5d2846

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

.github/workflows/workflow.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ jobs:
5151
fixture-ref: release/MAPL-v3
5252
run-mepo-develop: false
5353
patch-esmf: true
54+
# For some reason, Spack builds have weird install issues. For now, skip install.
55+
run-install: false
5456

5557
spack_build_gocart:
5658
uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm
@@ -61,4 +63,6 @@ jobs:
6163
run-mepo-develop: false
6264
build-target: '--target GOCART2G_GridComp'
6365
patch-esmf: true
66+
# Note: you cannot build the install target with plain GOCART
67+
run-install: false
6468

ESMF/Shared/Chem_AeroGeneric.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ subroutine append_to_bundle(varname, provider_state, prefix, bundle, rc)
128128
!Local
129129
type(ESMF_Field) :: field, field2d
130130
type(ESMF_Info) :: info
131-
type(ESMF_Geom) :: geom
131+
type(ESMF_Geom), allocatable :: geom
132132
real, pointer :: orig_ptr(:,:,:)
133133
real, pointer :: ptr2d(:,:)
134134
character(len=ESMF_MAXSTR) :: bin_index

components.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ GOCART:
55
env:
66
local: ./env@
77
remote: ../ESMA_env.git
8-
tag: v4.38.0
8+
tag: v5.16.0
99
develop: main
1010

1111
cmake:
1212
local: ./cmake@
1313
remote: ../ESMA_cmake.git
14-
tag: v3.62.1
14+
tag: v3.68.0
1515
develop: develop
1616

1717
ecbuild:
@@ -28,7 +28,7 @@ HEMCO:
2828
GMAO_Shared:
2929
local: ./ESMF/Shared/GMAO_Shared@
3030
remote: ../GMAO_Shared.git
31-
tag: v2.1.2
31+
tag: v2.1.4
3232
sparse: ./config/GMAO_Shared.sparse
3333
develop: main
3434

0 commit comments

Comments
 (0)