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.48 release #3051

Merged
merged 131 commits into from
Sep 24, 2024
Merged

GitFlow: Merge develop into main for 2.48 release #3051

merged 131 commits into from
Sep 24, 2024

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

GitFlow merge of develop into main for 2.48 release.

Related Issue

metdyn and others added 30 commits June 21, 2024 19:25
@metdyn
begin improve_mask_xygrid
bbefee3
@metdyn
Replace LS_root --> LS_ds with
8a6c11c 
        LS_root -->  LS_chunk --> LS_ds
Get coord. of LS_ds(bk=CS) does not work directly:
        call ESMF_LocStreamGetKey( LS_ds, "ESMF:Lon", farray=ptA) gives wrong results
@metdyn
removed the ESMF_LocStreamGetKey, not working for LS_ds(CS-grid)
62c8e3e
@metdyn
1. Use MPI to process ABI_grid data to Lon/Lat, which is more efficient
4e4562d 
2. add LS_chunk as middle step to get coordinates for LS_ds(CS-grid)
@metdyn
clean up code
74466ce
@metdyn
add change log
11eec59
@metdyn
Merge branch 'develop' into feature/ygyu/improve_mask_xygrid
b1f7714
@metdyn
correct a typo
9138cc4
@metdyn
update changelog
60dd3d2
@mathomp4
Merge pull request #2890 from GEOS-ESM/feature/ygyu/improve_mask_xygrid
cf02db6 
Improved mask sampler
@mathomp4
Update CI Baselibs to 7.25.0
589b414
@mathomp4
Update to ESMA_cmake v3.48.0
9bbcc85
@tclune
Merge pull request #2905 from GEOS-ESM/feature/mathomp4/update-esma-c…
3ec6b97 
…make-3.48.0

Update to ESMA_cmake v3.48.0
@mathomp4
Merge pull request #2915 from GEOS-ESM/main
89f6c45 
Auto GitFlow - main → develop
@JulesKouatchou
Add VERIFY statements in the base folder
6ccd0ee
@mathomp4
Merge branch 'develop' into feature/mathomp4/update-ci-baselibs-7.25
8b8da34
@mathomp4
Update to test CI orb
04f0bd3
@mathomp4
Update docker build
4ef1555
@mathomp4
make strings
4d08f9a
@mathomp4
Update orb
1b647fb
@JulesKouatchou
Add VERIFY statements in files in the folder Apps.
5c8b146
@mathomp4
Merge pull request #2897 from GEOS-ESM/feature/mathomp4/update-ci-bas…
c4777bc 
…elibs-7.25

Update CI Baselibs to 7.25.0
@mathomp4
Merge branch 'develop' into verify_after_mpi_call
1904b5a
@JulesKouatchou
Add error checking for MPI calls in the benchmarks folder
7cdb365
@JulesKouatchou
Add error checking for MPI calls in the generic folder
ab58f56
@JulesKouatchou
Add error checking for MPI calls in the gridcomps folder
e1621b1
@JulesKouatchou
Add error checking for MPI calls in the pfio folder
9d33fde
@JulesKouatchou
Add error checking after MPI calls in the profiler folder.
cdccb82
@JulesKouatchou
Add error checking after MPI calls in the Tests folder.
b9cb0f0
@JulesKouatchou
Remove _IERROR as argument but use instead _VERIFY(ierror) statements…
dfe0b03 
… in the pfio folder.
mathomp4 and others added 25 commits September 9, 2024 12:27
@mathomp4
Merge pull request #3015 from GEOS-ESM/feature/mathomp4/update-env-4301
3d6e3e5 
Update to ESMA_env v4.30.1
@mathomp4
Merge branch 'main' into develop
f335c5d
@bena-nasa
restart_simulator
8aa4cca
@weiyuan-jiang
read explicit "string" attribute
a6606b5
@weiyuan-jiang
Merge branch 'develop' into feature/wjiang/read_string_attribute
43cc8a6
@tclune
Merge pull request #3026 from GEOS-ESM/feature/wjiang/read_string_att…
0fe9a5e 
…ribute

read explicit "string" type of an attribute of a netcdf variable
@bena-nasa
fixs #3025
7052154
@bena-nasa
too zelous restore
cae216f
@mathomp4
Merge pull request #3028 from GEOS-ESM/feature/fixes-#3025
2296a66 
Feature/fixes #3025
@mathomp4
Fixes #3034. Convert Cap time print to colons
cd7bf91
@bena-nasa
Merge branch 'develop' into feature/bmauer/restart_simulator
9ba2512
@mathomp4
Merge pull request #3035 from GEOS-ESM/feature/mathomp4/3034-fix-time…
b0501c9 
…-print

Fixes #3034. Convert Cap time print to colons
@atrayano
querring VLOCATION on MAPL_VerticalMethods.F90 for rank 2 fields
fb9136d
@bena-nasa
Merge branch 'develop' into feature/bmauer/restart_simulator
c40d46d
@tclune
Merge pull request #3039 from GEOS-ESM/bugfix/atrayano/#3038_fix_veri…
ae6bc63 
…cal_attributes

querring VLOCATION on MAPL_VerticalMethods.F90 for rank 2 fields
@bena-nasa
Merge branch 'develop' into feature/bmauer/restart_simulator
5147281
@mathomp4
Merge pull request #3040 from GEOS-ESM/feature/bmauer/restart_simulator
e600653 
new restart_simulator.x code
@mathomp4
Add extdata tests to test compression, bit-shaving, and quantization
6f596a5
@mathomp4
Merge branch 'develop' into feature/mathomp4/add-compress-tests
a147e09
@mathomp4
Change all tests to have 2-digits
f1bf0c2
@mathomp4
Update changelog
d764fa4
@mathomp4
Merge pull request #3047 from GEOS-ESM/feature/mathomp4/add-compress-…
200c2fc 
…tests

Add extdata tests to test compression, bit-shaving, and quantization
@mathomp4
Prepare for 2.48.0 Release
f1b5a83
@mathomp4
Update changelog
60fb32e
@mathomp4
Merge pull request #3049 from GEOS-ESM/feature/mathomp4/prepare-for-2…
a3ac73e 
….48.0-release

Prepare for 2.48.0 Release
@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Sep 24, 2024
@mathomp4 mathomp4 requested review from a team as code owners September 24, 2024 13:49
@mathomp4 mathomp4 merged commit 38af635 into main Sep 24, 2024
41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tclune tclune tclune 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.
7 participants
@mathomp4 @tclune @metdyn @JulesKouatchou @bena-nasa @weiyuan-jiang @atrayano