Skip to content
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

GitFlow: Merge Develop Into Main for 2.52 release #3346

Merged
merged 74 commits into from
Jan 17, 2025
Merged

GitFlow: Merge Develop Into Main for 2.52 release #3346

merged 74 commits into from
Jan 17, 2025

Conversation

mathomp4
Copy link
Member

Types of change(s)

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Trivial change (affects only documentation or cleanup)
  • Refactor (no functional changes, no api changes)

Checklist

  • Tested this change with a run of GEOSgcm
  • Ran the Unit Tests (make tests)

Description

Merge develop into main for release.

Related Issue

wmputman and others added 30 commits March 5, 2024 12:48
@wmputman
major updates for upper_air restart regrid/remap to fix vector regrid…
1184b1b 
… and remapping options
@wmputman
patches from WMP
e7db9cf
@sdrabenh
hand-merge develop into feature/wmputman/KM_v11_5_1_remap_upper
2338c52
@bena-nasa
updates so it builds
958b125
@bena-nasa
change allreduce bill put in to barriers
fa8c5b3
@bena-nasa
remove commented out code
52bfc94
@bena-nasa
restore version without spaces
e9343aa
@mathomp4
Merge branch 'develop' into feature/sdrabenh/gcm_v12-rc1
5e907d8
@mathomp4
Merge branch 'develop' into feature/sdrabenh/gcm_v12-rc1
b889e07
@mathomp4
Update CHANGELOG.md
610d1ae
@wmputman
latest updates for HWT SFE 2024
e65cfe8
@sdrabenh
hand-resolve merge conflicts from feature/wmputman/KM_v11_5_1_HWT_SFE…
8f7fc9e 
…2024
@wmputman
Removed loop-level timer barriers
f1fd67a
@sdrabenh
Hand-merge v2.47.1
493149f
@mathomp4
Turn off default write/read of weights
6786b54
@sdrabenh
hand merge v2.50.1 into feature/sdrabenh/gcm_v12
957c6d8
@mathomp4
Merge tag 'v2.51.0' into feature/sdrabenh/gcm_v12
abf70cd
@mathomp4
Remove stray changelog entry
d59bdbb
@mathomp4
Add loggers when reading and writing weights
4a16f59
@mathomp4
Fix typo
ff54749
@mathomp4
Merge branch 'develop' into feature/mathomp4/weight-logger
b134aa2
@mathomp4
Merge tag 'v2.51.1' into feature/sdrabenh/gcm_v12
1ff3ceb
@mathomp4
Merge pull request #3233 from GEOS-ESM/feature/mathomp4/weight-logger
4dbc5e3 
Add loggers when reading and writing weights
@bena-nasa
fixes #3242
28f389c
@bena-nasa
change i5 to i0
f97ca09
@bena-nasa
Merge pull request #3243 from GEOS-ESM/feature/bmauer/fixes-#3242
6ef3cfe 
fixes #3242
@darianboggs
Fix for bug with udunits2f return code and macros
ef32c48
@mathomp4
Merge branch 'main' into develop
0e0a5fa
@darianboggs
include files and MAPL_ExceptionHandling
249b45c
@tclune
Merge branch 'develop' into bugfix/wdboggs/udsystem_bug_3253
b1d7b02
bena-nasa and others added 25 commits January 6, 2025 14:24
@bena-nasa
Merge branch 'develop' into feature/bmauer/fixes-#3280
447b933
@bena-nasa
update changelog
573e6b7
@atrayano
Merge branch 'develop' into feature/atrayano/history_start_stop
35e774a
@atrayano
Merge pull request #3278 from GEOS-ESM/feature/atrayano/history_start…
8a14993 
…_stop

Feature/atrayano/history start stop
@bena-nasa
Merge branch 'develop' into feature/bmauer/fixes-#3280
86f90f2
@bena-nasa
Merge pull request #3281 from GEOS-ESM/feature/bmauer/fixes-#3280
c8ad63f 
fixes #3280
@atrayano
Fixes #3289. This commit fixes the behavior of MAPL_MaxMin in presence
02f81aa 
of NaN.
@atrayano
Merge branch 'develop' into bugfix/atrayano/maxmin_support_for_nan
02f3794
@mathomp4
Merge branch 'main' into develop
b3cc556
@atrayano
Adopted suggestions from PR review
4916c93
@tclune
Update base/MAPL_MaxMinMod.F90
65f9f56
@atrayano
Merge branch 'develop' into bugfix/atrayano/maxmin_support_for_nan
d452ea3
@atrayano
Merge pull request #3290 from GEOS-ESM/bugfix/atrayano/maxmin_support…
116fb6f 
…_for_nan

Bugfix/atrayano/maxmin support for nan
@atrayano
Properly freeing MPI communicators after reading or writing restarts
6334057
@mathomp4
Merge pull request #3303 from GEOS-ESM/bugfix/atrayano/#3302_free_mpi…
99b1564 
…_comm
@atrayano
Fixes #3307. Fixed more MPI communicator assignments
eede063
@mathomp4
Merge pull request #3310 from GEOS-ESM/bugfix/atrayano/fix_of_mpi_com…
5e3f8f9 
…m_free_fix
@atrayano
Added protection for null mpi communicator
0361120
@tclune
Merge pull request #3316 from GEOS-ESM/bugfix/atrayano/#3314_protect_…
3e18fc4 
…comm_dup

Added protection for null mpi communicator
@mathomp4
Update GitHub Actions to use blobless clones (#3318)
452b583
@metdyn
Trajectory sampler: use a single obs file at each Epoch time and rest…
45bdba5 
…ore obs location for output (#3326)
@weiyuan-jiang @mathomp4
Added subroutine to read NC4 tile file (#3321)
76f3be0 
Co-authored-by: Matt Thompson <[email protected]>
@mathomp4
Move to use Baselibs 7.29.0 (#3327)
b49832a
@weiyuan-jiang @tclune @mathomp4
fixed kind=8 (#3340)
ca04152 
Co-authored-by: Tom Clune <[email protected]>
Co-authored-by: Matt Thompson <[email protected]>
@mathomp4
Prepare for 2.52.0 Release (#3335)
16b7f41
@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Jan 17, 2025
@mathomp4 mathomp4 self-assigned this Jan 17, 2025
@mathomp4 mathomp4 requested a review from a team as a code owner January 17, 2025 16:11
@mathomp4 mathomp4 merged commit c41f37c into main Jan 17, 2025
53 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bena-nasa bena-nasa bena-nasa approved these changes

Assignees

@mathomp4 mathomp4

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.
9 participants
@mathomp4 @bena-nasa @wmputman @sdrabenh @darianboggs @tclune @atrayano @metdyn @weiyuan-jiang