Skip to content

GitFlow: Merge develop into v12 - 2026Jan07 #307

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

Jump to bottom
Merged
sdrabenh merged 57 commits into from
Jan 16, 2026
Merged

GitFlow: Merge develop into v12 - 2026Jan07 #307

sdrabenh merged 57 commits into from
Jan 16, 2026

Conversation

@mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Jan 7, 2026 •
edited
Loading

mmanyin and others added 30 commits June 12, 2023 10:49
@mmanyin
Added flag usePreconCape
2cb8c4c
@mmanyin
Added code to support usePreconCape in the Lightning LFR calculations
bcc8a28
@mmanyin
Added code to support ACHEM OCS coupled w/ GMI, but Benchmark G does …
46c4b9d 
…not take advantage of this
@mmanyin
minor edits that are zero-diff for Bench G
660bf6e
@mmanyin
Made Lopez lightning the default, with attention to Lopez FlashFactor…
a0f3425 
… for c360
@pcolarco
prc: check in modifications for GEOS Hunga Tonga runs
4d9ca20
@pcolarco
prc: enforce OCS mechanism is turned on in ACHEM
1068d0a
@pcolarco
prc: updates for Hunga
6896a7a
@pcase13
added CARMA pfast parameterization
989c84a
@pcase13
Merge pull request #275 from GEOS-ESM/carma_pfast_parameterization
7493a19 
Added CARMA pfast parameterization
@pcolarco
prc: add a working MIXED group example
c347978
@pcase13
Added reff coupling for GMI<->CARMA and fixed CARMA bootstrapping
c32e2be
@pcase13
Merge remote-tracking branch 'refs/remotes/origin/feature/pcolarco/CC…
5e0935d 
…M_benchmark_G_HT' into feature/pcolarco/CCM_benchmark_G_HT
@pcase13
replaced debug message in CARMA so it doesnt print every timestep
1c2290e
@pcase13
Made "null" vapor routine index -1, added option to various registries
5ebf8e0
@pcase13
Made SO4Reff to SO4REFF for consistency
c2516cd
Reverting to a simpler version of GEOS_ChemGridComp for the PR
56ad2ff 
MSL
Rebase to get rid of QTOT from ChemEnv, etc.
1713088 
MSL
Updated Changelog
895b17a
@mmanyin
Capture the changes put in place for the Hunga experiments
ae910d3
@mmanyin
CARMA dust_source is now simply a pointer provided by ExtData
c04315f
@sdrabenh
Merge branch 'develop' into mslong1/rrg+rad
d881155
@mmanyin
Capture the CI fix from develop
b5c7f12
@mmanyin
Edit CHANGELOG to reflect updates from the HUNGA work
6184a2b
@mmanyin
Merge pull request #290 from GEOS-ESM/feature/mmanyin/add_HUNGA_edits
131b718 
Development for HUNGA simulations
Initialize 'n' to zero for logic purposes
8c3da5d 
Remove O3 connectivity btw RRG & PCHEM

MSL
Redo the O3 connectivity btw PCHEM & RRG. It's neede for photochem
1b73777 
MSL
Swap location of ANALYSIS_OX_PROVIDER and individual RATs providers
b319c41 
MSL
@mathomp4
Move MAM, MATRIX, CARMA, GAAS, ACHEM to separate repos
eb98b1b
@mathomp4
Merge branch 'develop' into mslong1/rrg+rad
730cdc0
mmanyin and others added 17 commits February 19, 2025 09:45
@mmanyin
Merge pull request #294 from GEOS-ESM/develop
87aae9f 
Break out subdirs to be repositories; add RRG; add connectivities for HUNGA work
@mathomp4
Merge pull request #295 from GEOS-ESM/main
96d6257
@mmanyin
Added option to compute LFC; refactored some terms needed for BUOYANCY
6aede67
@mmanyin
In lightning module, took out notes on computing PK, PKE, THV, ZLE
3decbe4
@mmanyin
Renamed usePreconCape to useImportedCape in order to cover both GCM a…
a9cea53 
…nd CTM
@mmanyin
Update CHANGELOG
7c96989
@mmanyin
Merge pull request #299 from GEOS-ESM/feature/mmanyin/lightning_update
98a5fdb 
small update for LOPEZ lightning scheme
@mathomp4
Updates to remove Python2 support
10e97c6
@mmanyin
Merge pull request #301 from GEOS-ESM/feature/convert-to-f2py3
d8f7673 
Updates to remove Python2 support
@mmanyin
ChemEnv now updates the precip exports in Run1 (as well as Run2)
855bf03
@mmanyin
Merge pull request #303 from GEOS-ESM/feature/mmanyin/precip_run1
4ba4891 
Add precip exports in Run1;  this is a bug-fix, and only affects GMI
@mmanyin
Edit CHANGELOG prior to release
251f7ef
@mmanyin
Merge pull request #304 from GEOS-ESM/feature/mmanyin/edit_log_for_16.1
dc035d8 
Edit CHANGELOG prior to release
@mathomp4
Update CI in Chem GC
07eac88
@mathomp4
Fix up CI. Part 2
144e4fd
@mathomp4
Merge pull request #306 from GEOS-ESM/feature/chem-ci-update
ebf93ee
@mathomp4
Merge branch 'develop' into feature/sdrabenh/gcm_v12
accc795 
# Conflicts:
#	CHANGELOG.md
@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Jan 7, 2026
This was referenced Jan 7, 2026
Merged
Merged
Merged
@mathomp4 mathomp4 marked this pull request as ready for review January 16, 2026 15:56
@mathomp4 mathomp4 requested review from a team as code owners January 16, 2026 15:56
@sdrabenh sdrabenh merged commit ae9b1d9 into feature/sdrabenh/gcm_v12 Jan 16, 2026
19 checks passed
@sdrabenh sdrabenh deleted the feature/v12-merge-from-downstream-2026Jan07 branch January 16, 2026 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sdrabenh sdrabenh sdrabenh approved these changes

Assignees

No one assigned

Labels

0 diff The changes in this pull request have verified to be zero-diff with the target branch.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@mathomp4 @sdrabenh @mmanyin @pcolarco @pcase13