Skip to content

Sync develop into main #1533

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

Merged
sdrabenh merged 82 commits into from
Oct 5, 2026
Merged

Sync develop into main #1533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
91efdec
Fixes spurious source of water from UW by allowing FILL routines to c…
narnold1 Jul 17, 2026
887662d
Limits precip evaporation in GF to avoid negative surface precip
narnold1 Jul 25, 2026
388559a
Major returning of GF deep/congestus to raise ice detrainment and get…
wmputman Jul 27, 2026
37f4f45
Restructuring of gw_convect and ET forcing, tuning updates in GFDL-MP
wmputman Jul 28, 2026
92c73e4
Modified the sponge layer and rayleigh damping in dynamics to handoff…
wmputman Jul 29, 2026
353257b
Merge branch 'develop' into bugfix/narnold1/spurious_water_from_moistgc
narnold1 Jul 30, 2026
b57b0c8
removed min/max for tpfac, it was problematic. Made JASON_PBL_SC an …
wmputman Aug 13, 2026
beb643a
Several GFDL-MP changes, GF congestus changes, and GWD+FV3: Base for …
wmputman Aug 13, 2026
a47fdf5
tweaks to GFDL tunings and GF congestus
wmputman Aug 14, 2026
a04cc2e
CRITICAL: These tunings for GF2026 remove the dry bias in the lower-m…
wmputman Aug 15, 2026
ee19478
Aerosol activation updates (specifically for ice), CCN/CIN limits upd…
wmputman Aug 20, 2026
5375733
Adjustments to GFDL wbf code and Hu et al shifts to get more TQL, GWD…
wmputman Aug 21, 2026
3f784b6
Latest v12 L137 evaluation with updated GWD, SHOC-MF, GF and GFDL-MP:…
wmputman Aug 24, 2026
c2a8523
Merge branch 'develop' into bugfix/narnold1/spurious_water_from_moistgc
narnold1 Aug 24, 2026
8f413ef
015e tunings to correct aerosol activation single moment, resolve dry…
wmputman Aug 31, 2026
1f91a39
Merge branch 'develop' into bugfix/narnold1/spurious_water_from_moistgc
narnold1 Aug 31, 2026
802616f
015f EMIP settings
wmputman Sep 1, 2026
a81bbe6
015 EMIPs need this single column data atmos update
wmputman Sep 1, 2026
67860a6
cleaned up glac_shift use and other things in Moist options, runs lik…
wmputman Sep 4, 2026
2c4b948
latest merge with develop 015i
wmputman Sep 9, 2026
e36a529
qadum cleanup and wbf coarse res update
wmputman Sep 9, 2026
4507653
updated ICE_RADII_PARAM comments
wmputman Sep 9, 2026
3708ea9
updated ICE_RADII_PARAM comments
wmputman Sep 9, 2026
bb4595d
making some changes for 015i EMIP radiation balance
wmputman Sep 11, 2026
42240fe
Fix typo in rc parameter name in comment (GEOS_SurfaceGridComp.rd)
gmao-rreichle Sep 11, 2026
b058c83
corrected 015i EMIP
wmputman Sep 14, 2026
cb738d1
015j updates run for CERES comparisons on Sep 15
wmputman Sep 15, 2026
9a321a2
Merge branch 'develop' into bugfix/narnold1/spurious_water_from_moistgc
narnold1 Sep 16, 2026
073bc64
fix ISSM initialization (#1523)
biljanaorescanin Sep 17, 2026
a29c478
Make direct ESMF regridding deterministic
mathomp4 Sep 17, 2026
8132756
Use variables for ESMF source term processing
mathomp4 Sep 17, 2026
ad86172
Fix regridding source term indentation
mathomp4 Sep 17, 2026
d4b19d2
hand-merge develop into feature/wmputman/Dev_v12_WMP
sdrabenh Sep 18, 2026
425b30b
Hand-resolve some compile errors
sdrabenh Sep 18, 2026
876ca34
restoring type AerPropsNew to Process_Library
sdrabenh Sep 18, 2026
5cf685c
use AerPropsNew from Process Library
mathomp4 Sep 18, 2026
8d14d4f
Move AerProps stuff back to aer_cloud
mathomp4 Sep 18, 2026
0d796b9
Change default for USE_SMOOTH_TEND to 0 to conserve water
narnold1 Sep 19, 2026
42d81b8
Merge branch 'develop' into bugfix/narnold1/spurious_water_from_moistgc
narnold1 Sep 19, 2026
c3eb27b
Merge branch 'develop' into feature/rreichle/fix_typo_in_rc_param_nam…
sdrabenh Sep 20, 2026
125f562
minor changes after merge
sdrabenh Sep 21, 2026
3743f57
corrected ncar convective source spectrum and retuned
wmputman Sep 21, 2026
9a82ef3
Merge remote-tracking branch 'origin/feature/wmputman/Dev_v12_WMP' in…
sdrabenh Sep 22, 2026
8ce9e86
added energy and momentum flux diagnostics 3d separated by direction …
wmputman Sep 22, 2026
69c7c58
Merge remote-tracking branch 'origin/feature/wmputman/Dev_v12_WMP' in…
sdrabenh Sep 23, 2026
d89da7b
undef values if not issm tiles
weiyuan-jiang Sep 23, 2026
e93bc8c
Updated resource options for EW and WW critical thresholds and fixed …
wmputman Sep 23, 2026
1307ec0
fill dstField with MAPL_UNDEF
weiyuan-jiang Sep 24, 2026
6a2513d
fill novalue
weiyuan-jiang Sep 24, 2026
4f6a110
Save MAPL_UNDEF for unmapped ISSM regrid points
biljanaorescanin Sep 24, 2026
a47bca9
Merge pull request #1520 from GEOS-ESM/feature/rreichle/fix_typo_in_r…
sdrabenh Sep 25, 2026
498b0a8
Merge branch 'develop' into feature/esmf-regrid-termorder-srcterm
biljanaorescanin Sep 25, 2026
9bfadb2
Merge branch 'develop' into feature/wjiang/noval_tiles
biljanaorescanin Sep 25, 2026
6af1c37
tuning adjustment for BKG GWD
wmputman Sep 25, 2026
84ea0f8
fixed regression bugs
wmputman Sep 25, 2026
4f94ad8
Merge remote-tracking branch 'origin/feature/wmputman/Dev_v12_WMP' in…
sdrabenh Sep 25, 2026
237441b
Merge remote-tracking branch 'origin/bugfix/narnold1/spurious_water_f…
sdrabenh Sep 25, 2026
b51ead3
fine tuning for GWD polar jet strength and GFDL radiation balance
wmputman Sep 26, 2026
2a7bfd8
Merge remote-tracking branch 'origin/develop' into feature/sdrabenh/v…
sdrabenh Sep 28, 2026
4722a42
Merge remote-tracking branch 'origin/feature/wmputman/Dev_v12_WMP' in…
sdrabenh Sep 28, 2026
2284b12
Merge pull request #1526 from GEOS-ESM/feature/wjiang/noval_tiles
sdrabenh Sep 29, 2026
2211fbb
Merge branch 'develop' into feature/esmf-regrid-termorder-srcterm
mathomp4 Sep 29, 2026
e214b73
Fix formatting in ESMF_FieldRegrid call
mathomp4 Sep 29, 2026
c68a58d
spreading spectra wider again 20.0 to 25.0
wmputman Sep 29, 2026
ccb5340
Merge remote-tracking branch 'origin/feature/wmputman/Dev_v12_WMP' in…
sdrabenh Sep 29, 2026
c26a2a1
Merge branch 'develop' into feature/sdrabenh/v11.11.0-rc5
sdrabenh Sep 29, 2026
00c3260
Fix assignment of cin to not be indexed
sdrabenh Sep 30, 2026
c7c28f1
Removed cumulus_type because it is a PARAMETER and as such can't be d…
sdrabenh Sep 30, 2026
0257d82
Fix PRNUM dimension in calc_numbers subroutine
sdrabenh Sep 30, 2026
693b9fc
Guard zero divisions in gravity wave fixers and Obukhov length
mathomp4 Sep 30, 2026
7e7a417
Merge pull request #1530 from GEOS-ESM/fix/mathomp4/v11.11.0-rc5-zero…
sdrabenh Sep 30, 2026
29f6a71
Hand-merge GEOS-CAM_v12 into feature/sdrabenh/v11.11.0-rc5
sdrabenh Oct 1, 2026
9e3e974
Bring back WSPD_STABLE300M
mathomp4 Oct 1, 2026
6d0198c
Remove cumulus_type from OMP declaration
mathomp4 Oct 1, 2026
5f1ab2c
Merge pull request #1531 from GEOS-ESM/feature/sdrabenh/v11.11.0-rc7
sdrabenh Oct 1, 2026
fb9c827
Merge pull request #1529 from GEOS-ESM/feature/sdrabenh/v11.11.0-rc5
sdrabenh Oct 1, 2026
ac4f13b
Merge branch 'develop' into feature/esmf-regrid-termorder-srcterm
sdrabenh Oct 1, 2026
810ed27
Merge pull request #1525 from GEOS-ESM/feature/esmf-regrid-termorder-…
sdrabenh Oct 1, 2026
cb63dea
Fixes for Datmodyn
mathomp4 Oct 2, 2026
7f80bd2
Merge pull request #1534 from GEOS-ESM/bugfix/fix-datmodyn
sdrabenh Oct 2, 2026
35e0a82
Fix gw_intr_ncar call in GWD GC
mathomp4 Oct 5, 2026
23e58ba
Merge pull request #1537 from GEOS-ESM/bugfix/1535-fix-gwd
sdrabenh Oct 5, 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
25 changes: 16 additions & 9 deletions GEOS_GcmGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2870,7 +2870,7 @@ subroutine DO_A2W(SRC,DST,NAME,RC)
integer, optional,intent(out) :: RC

character(len=ESMF_MAXSTR), parameter :: Iam = 'A2W'
integer :: status
integer :: status, srcTermProcessing

type(ESMF_RouteHandle), pointer :: rh
type(ESMF_Field) :: srcField, dstField
Expand All @@ -2884,9 +2884,11 @@ subroutine DO_A2W(SRC,DST,NAME,RC)
!ALT: this should be done only once per regridder
allocate(rh, stat=status)
VERIFY_(STATUS)
srcTermProcessing = 0
call ESMF_FieldRegridStore(srcField, dstField, &
regridmethod=ESMF_REGRIDMETHOD_BILINEAR, &
lineType=ESMF_LINETYPE_GREAT_CIRCLE, &
srcTermProcessing=srcTermProcessing, &
routeHandle=rh, rc=status)
VERIFY_(STATUS)

Expand All @@ -2900,7 +2902,7 @@ subroutine DO_A2W(SRC,DST,NAME,RC)
end if

call ESMF_FieldRegrid(srcField=srcField, dstField=dstField, &
routeHandle=rh, rc=status)
routeHandle=rh, termorderflag=ESMF_TERMORDER_SRCSEQ, rc=status)
VERIFY_(STATUS)

RETURN_(ESMF_SUCCESS)
Expand All @@ -2913,7 +2915,7 @@ subroutine DO_W2A(SRC,DST,NAME,RC)
integer, optional,intent(out) :: RC

character(len=ESMF_MAXSTR), parameter :: Iam = 'W2A'
integer :: status
integer :: status, srcTermProcessing

type(ESMF_RouteHandle), pointer :: rh
type(ESMF_Field) :: srcField, dstField
Expand All @@ -2927,9 +2929,11 @@ subroutine DO_W2A(SRC,DST,NAME,RC)
!ALT: this should be done only once per regridder
allocate(rh, stat=status)
VERIFY_(STATUS)
srcTermProcessing = 0
call ESMF_FieldRegridStore(srcField, dstField, &
regridmethod=ESMF_REGRIDMETHOD_BILINEAR, &
lineType=ESMF_LINETYPE_GREAT_CIRCLE, &
srcTermProcessing=srcTermProcessing, &
routeHandle=rh, rc=status)
VERIFY_(STATUS)

Expand All @@ -2943,7 +2947,7 @@ subroutine DO_W2A(SRC,DST,NAME,RC)
end if

call ESMF_FieldRegrid(srcField=srcField, dstField=dstField, &
routeHandle=rh, rc=status)
routeHandle=rh, termorderflag=ESMF_TERMORDER_SRCSEQ, rc=status)
VERIFY_(STATUS)

RETURN_(ESMF_SUCCESS)
Expand All @@ -2956,7 +2960,7 @@ subroutine DO_O2W(SRC,DST,NAME,RC)
integer, optional,intent(out) :: RC

character(len=ESMF_MAXSTR), parameter :: Iam = 'O2W'
integer :: status
integer :: status, srcTermProcessing

type(ESMF_RouteHandle), pointer :: rh
type(ESMF_Field) :: srcField, dstField
Expand All @@ -2970,9 +2974,11 @@ subroutine DO_O2W(SRC,DST,NAME,RC)
!ALT: this should be done only once per regridder
allocate(rh, stat=status)
VERIFY_(STATUS)
srcTermProcessing = 0
call ESMF_FieldRegridStore(srcField, dstField, &
regridmethod=ESMF_REGRIDMETHOD_BILINEAR, &
lineType=ESMF_LINETYPE_GREAT_CIRCLE, &
srcTermProcessing=srcTermProcessing, &
routeHandle=rh, rc=status)
VERIFY_(STATUS)

Expand All @@ -2986,7 +2992,7 @@ subroutine DO_O2W(SRC,DST,NAME,RC)
end if

call ESMF_FieldRegrid(srcField=srcField, dstField=dstField, &
routeHandle=rh, rc=status)
routeHandle=rh, termorderflag=ESMF_TERMORDER_SRCSEQ, rc=status)
VERIFY_(STATUS)

RETURN_(ESMF_SUCCESS)
Expand All @@ -2999,7 +3005,7 @@ subroutine DO_W2O(SRC,DST,NAME,RC)
integer, optional,intent(out) :: RC

character(len=ESMF_MAXSTR), parameter :: Iam = 'W2O'
integer :: status
integer :: status, srcTermProcessing

type(ESMF_RouteHandle), pointer :: rh
type(ESMF_Field) :: srcField, dstField
Expand All @@ -3013,10 +3019,12 @@ subroutine DO_W2O(SRC,DST,NAME,RC)
!ALT: this should be done only once per regridder
allocate(rh, stat=status)
VERIFY_(STATUS)
srcTermProcessing = 0
call ESMF_FieldRegridStore(srcField, dstField, &
regridMethod=ESMF_REGRIDMETHOD_BILINEAR, &
lineType=ESMF_LINETYPE_GREAT_CIRCLE, &
routeHandle=rh, &
srcTermProcessing=srcTermProcessing, &
unmappedAction=ESMF_UNMAPPEDACTION_IGNORE, rc=status)
VERIFY_(STATUS)

Expand All @@ -3031,7 +3039,7 @@ subroutine DO_W2O(SRC,DST,NAME,RC)
end if

call ESMF_FieldRegrid(srcField=srcField, dstField=dstField, &
routeHandle=rh, rc=status)
routeHandle=rh, termorderflag=ESMF_TERMORDER_SRCSEQ, rc=status)
VERIFY_(STATUS)

RETURN_(ESMF_SUCCESS)
Expand All @@ -3043,4 +3051,3 @@ end subroutine Run
! for example call ESMF_FieldRegridRelease(routeHandle, rc=status)

end module GEOS_GcmGridCompMod

10 changes: 5 additions & 5 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,21 +1690,21 @@ subroutine SetServices ( GC, RC )
! Imports for GWD
!----------------
call MAPL_AddConnectivity ( GC, &
SHORT_NAME = [character(len=7) :: 'Q', 'DTDT_DC', 'CNV_FRC' ], &
SHORT_NAME = [character(len=7) :: 'Q', 'CNV_FRC' ], &
DST_ID = GWD, &
SRC_ID = MOIST, &
RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddConnectivity ( GC, &
SRC_NAME = 'DQIDT_micro', &
DST_NAME = 'DQIDT', &
SRC_NAME = 'DTDT_micro', &
DST_NAME = 'HT_mi', &
DST_ID = GWD, &
SRC_ID = MOIST, &
RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddConnectivity ( GC, &
SRC_NAME = 'DQLDT_micro', &
DST_NAME = 'DQLDT', &
SRC_NAME = 'DTDT_DC', &
DST_NAME = 'HT_dc', &
DST_ID = GWD, &
SRC_ID = MOIST, &
RC=STATUS )
Expand Down
Loading
Loading