Skip to content

Merge develop into main for 2.5.0 release#377

Merged
mathomp4 merged 155 commits intomainfrom
develop
Feb 5, 2026
Merged

Merge develop into main for 2.5.0 release#377
mathomp4 merged 155 commits intomainfrom
develop

Conversation

@mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Feb 5, 2026

No description provided.

pcolarco and others added 30 commits March 14, 2025 11:22
@pcolarco
prc: data_driven instances of DU and NI incorrectly had internal stat…
c57ef6b 
…e made friendly to physics; commented that out
@pcolarco
prc: correct units error sulfate surface area density calculation in …
e56aac6 
…Process Library and add some further clarifying comment in SU2G_GridCompMod
@pcolarco
prc: update CHANGELOG
59a31f2
@acollow
update filepaths for optics files
ee5ce53
@acollow
update changelog
8d5d999
@weiyuan-jiang
fix nSubsteps =0 (again...)
be29ed5
@mathomp4
Merge branch 'develop' into feature/wjiang/fix_nsubsteps_again
e9a4285
@sdrabenh @mathomp4
@acollow @atrayano @wmputman
Merge changes from GCMv12-rc15 into develop (#321)
bbed61e 
Co-authored-by: Matthew Thompson <matthew.thompson@nasa.gov>
Co-authored-by: acollow <allison.collow@nasa.gov>
Co-authored-by: Atanas Trayanov <atanas.l.trayanov@nasa.gov>
Co-authored-by: William Putman <William.M.Putman@nasa.gov>
@mathomp4
Merge branch 'develop' into feature/acollow/opticsfilepaths
4c454c2
@mathomp4
Update changelog
65b73f8
@mathomp4
Merge pull request #322 from GEOS-ESM/feature/acollow/opticsfilepaths
95ce8a3
@mathomp4
Merge branch 'develop' into feature/wjiang/fix_nsubsteps_again
3f839f0
@mathomp4
Update changelog
7a5bef2
@mathomp4
Merge branch 'develop' into features/pcolarco/su_sad_and_data_driven
8e08181
@mathomp4
Update changelog
4646324
@mathomp4
Merge pull request #307 from GEOS-ESM/features/pcolarco/su_sad_and_da…
5152eca 
…ta_driven
@pcolarco
prc: functionality for coupling of GMI chemistry to GOCART SU; comput…
186f2fb 
…ation of sulfate surface area and effective radius based on optical tables
@pcolarco
prc: export cross sectional area and effective radius from optics tables
cad9004
@pcolarco
prc: changes to compute surface area densities of aerosol particles
314472d
@pcolarco
prc: changes to compute surface area density of carbonaceous particles
40ecd96
@pcolarco
prc: add effective radius output option to Aero_Compute_Diags
e956b1a
@pcolarco
prc: add effective radius to carbon
08742fb
@bena-nasa
check user RC
e6d1686
@bena-nasa
update changelog
c75e5f9
@acollow
fix typo in BRC optics filepath
36dd90c
@acollow
Update CHANGELOG.md
f00db84
@vbuchard
Merge pull request #331 from GEOS-ESM/hotfix/acollow/opticsfilepathtypo
c231677 
hotfix/acollow/opticsfilepathtypo
@pcolarco
prc: general bug fixes
3952d11
@pcolarco
prc: remove unnecessary if associated check on du_src
6955cac
@pcolarco
prc: update CHANGELOG
dbf09f8
mathomp4 and others added 23 commits January 8, 2026 19:09
@mathomp4
Merge branch 'feature/update-ci-reusable-gocart' into feature/acollow…
fdf1fe5 
…/v11instanceRC
@zhanglikate
Update SU2G_instance_SU.rc for AMIP.20 and AMIP
f3e3e2f
@catemgn
added GMI_HNO3 to ExtData.yaml.
b8edbd1
@mathomp4
Update components
b6c025a
@vbuchard
Merge pull request #363 from GEOS-ESM/feature/update-ci-reusable-gocart
4f030fb 
Update CI to use reusable workflows
@mathomp4
Merge branch 'develop' into feature/acollow/v11instanceRC
e800012
@mathomp4
Merge pull request #370 from GEOS-ESM/feature/acollow/v11instanceRC
fcedfca
@mathomp4
Merge branch 'develop' into bugfix-ufs-wetremoval
3c5e85f 
# Conflicts:
#	ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_instance_SU.rc
#	ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_instance_SU.rc
#	ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_instance_SU.rc
@mathomp4
Fix up weird font issue
f316502
@mathomp4
Update changelog
e723d19
@mathomp4
Merge pull request #365 from zhanglikate/bugfix-ufs-wetremoval
16e92dd
@catemgn
corrected HNO3_colmass diagnostic units.
f5808e7
@catemgn
updated changelog.
ebdaded
@pcolarco
prc: clean up AMIP RC files for consistency with OPS
dcf47bc
@pcolarco
prc: update CHANGELOG
2cffcf7
@acollow
Merge branch 'develop' into feature/catemgn/nitrate_GMI_coupling
68f738f
@vbuchard
Merge pull request #375 from GEOS-ESM/feature/pcolarco/tidy_v2.5.0-rc.5
930788a 
Feature/pcolarco/tidy v2.5.0 rc.5
@vbuchard
Merge branch 'develop' into feature/catemgn/nitrate_GMI_coupling
2cd4f3e
@catemgn
fixed preprocess directive to comment.
adccedc
@catemgn
Merge branch 'feature/catemgn/nitrate_GMI_coupling' of github.com:GEO…
59a3c8a 
…S-ESM/GOCART into feature/catemgn/nitrate_GMI_coupling
@mathomp4
GNU requires # macros to be in first column
8735cd2
@vbuchard
Merge pull request #373 from GEOS-ESM/feature/catemgn/nitrate_GMI_cou…
69dc9ef 
…pling

Feature/catemgn/nitrate gmi coupling
@mathomp4
Updates for 2.5.0 release
c4f39b8
@mathomp4 mathomp4 self-assigned this Feb 5, 2026
@mathomp4 mathomp4 added the Non 0-diff The changes in this pull request are non-zero-diff label Feb 5, 2026
@mathomp4 mathomp4 marked this pull request as ready for review February 5, 2026 16:40
@mathomp4 mathomp4 requested review from a team as code owners February 5, 2026 16:40
@mathomp4 mathomp4 merged commit 2d17c51 into main Feb 5, 2026
22 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vbuchard vbuchard vbuchard approved these changes

Assignees

@mathomp4 mathomp4

Labels

Non 0-diff The changes in this pull request are non-zero-diff

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.