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

Merge develop into main for 2.20.0 release #1486

Merged
merged 68 commits into from
Apr 19, 2022
Merged

Merge develop into main for 2.20.0 release #1486

merged 68 commits into from
Apr 19, 2022

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Apr 19, 2022 •
edited
Loading

Description

This PR is to merge develop into main for a MAPL 2.20.0 release.

Related Issue

Motivation and Context

New release.

How Has This Been Tested?

I will test with a build-and-run of GEOSgcm on discover.

Types of changes

  • 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)

Checklist:

  • I have tested this change with a run of GEOSgcm (if non-trivial)
  • I have added one of the required labels (0 diff, 0 diff trivial, 0 diff structural, non 0-diff)
  • I have updated the CHANGELOG.md accordingly following the style of Keep a Changelog

weiyuan-jiang and others added 30 commits February 6, 2022 14:42
@weiyuan-jiang
more infomation if get_var fails
3a6d0a7
@weiyuan-jiang
Merge branch 'develop' into feature/wjiang/get_var_info
3a482c5
@mathomp4
Fix issue with calling ACG multiple times
1bbfeb9
@mathomp4
Clean up some old CMake
b934404
@mathomp4
Update changelog
5352963
@bena-nasa
implementing multiple f-streams
7d575f0
@mathomp4
Merge pull request #1448 from GEOS-ESM/feature/mathomp4/fix-acg-multi…
414e90f 
…compile

Fix issue with calling ACG multiple times
@bena-nasa
fixed bugs in previous commit, move code around
3b627ea
@mathomp4
Update CI to use orb build job
e3a8819
@mathomp4
Add ctest options
2ce4952
@mathomp4
Add GEOSadas
20b1f91
@bena-nasa
change name to variable from vname
2de55c0
@mathomp4
mepodevelop now default true
aa0a9d2
@mathomp4
Try running FV3 with job
f8f8617
@mathomp4
Move to orb v1 and add comments. Turn off FV3
2d6f0a8
@mathomp4
Merge pull request #1450 from GEOS-ESM/feature/mathomp4/use-orb-job
b1513d8 
Update CI to use orb build job, Update components.yaml
@mathomp4
Merge branch 'develop'
d03e8ee
@mathomp4
Merge branch 'main' into develop
85cf154
@mathomp4
Merge pull request #1458 from GEOS-ESM/merge/mathomp4/handmerge-main-…
c800c16 
…into-develop-MAPL-2022Mar24

GitFlow: Handmerge main into develop
@mathomp4
Merge branch 'develop'
e2f399d
@mathomp4
Merge branch 'main' into develop
66dd42b
@mathomp4
Merge pull request #1463 from GEOS-ESM/merge/mathomp4/handmerge-main-…
dfef125 
…into-develop-MAPL-2022Mar29

GitFlow: Handmerge main into develop 2022-Mar-299
@bena-nasa
kind of got the multiple templates working
74244ed
@bena-nasa
cleanup and fix dervied
d24c209
@bena-nasa
allow T to be omitted in time change time ranges to be iso compliant
7b96702
@bena-nasa
fix bug with vectors
ed9249a
@bena-nasa
more bug fixes
9d1ac4f
@bena-nasa
fix bugs
6ee63e3
@bena-nasa
should have used info not error
6a4764b
@mathomp4
Add missing rc=status
6647a3f
bena-nasa and others added 18 commits April 13, 2022 17:51
@bena-nasa
cleanup, move masking to own file
14d6314
@bena-nasa
forgot to commit this
7472eb5
@bena-nasa
more bug fixes and cleanup
b40e3fb
@bena-nasa
forgot to commit this last file
8a7c092
@tclune
Merge pull request #1475 from GEOS-ESM/feature/bmauer/extdata2g_multi…
af4198c 
…ple_fstreams

ExtData2G updates, bugs fixes and multiple filestream feature.
@weiyuan-jiang
remove on redudant get_file_extension
76a670f
@weiyuan-jiang
change log
0decd3e
@weiyuan-jiang
Merge branch 'develop' into bugfix/wjiang/fix_is_supported_dso_name
5ac2188
@tclune
Merge pull request #1480 from GEOS-ESM/bugfix/wjiang/fix_is_supported…
f4eee0d 
…_dso_name

remove one redundant get_file_extension call
@mathomp4
Prepare for 2.20.0 Release
ac13f10
@mathomp4
Restore commented out debugger
ea30969
@mathomp4
Merge branch 'develop' into feature/mathomp4/prepare-for-mapl-2200
47c6e09
@atrayano
Fixes #1483. Fixed the rank of variable declaration
141daec
@mathomp4
Merge pull request #1484 from GEOS-ESM/bugfix/atrayano/#1483_correct_…
a3b2214 
…rank

Fixes #1483. Fixed the rank of variable declaration
@mathomp4
Merge branch 'develop' into feature/mathomp4/prepare-for-mapl-2200
72522e2
@mathomp4
Merge pull request #1481 from GEOS-ESM/feature/mathomp4/prepare-for-m…
f97ed87 
…apl-2200

Prepare for 2.20.0 Release
@tclune
Merge branch 'develop' into feature/wjiang/get_var_info
71e3916
@mathomp4
Merge pull request #1339 from GEOS-ESM/feature/wjiang/get_var_info
ad9f468 
more infomation if get_var fails
@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Apr 19, 2022
@mathomp4 mathomp4 requested a review from a team as a code owner April 19, 2022 13:47
@mathomp4 mathomp4 self-assigned this Apr 19, 2022
@mathomp4 mathomp4 requested review from a team as code owners April 19, 2022 13:47
@mathomp4 mathomp4 marked this pull request as draft April 19, 2022 13:47
@mathomp4
Copy link
Member Author

Making draft until I can test!

@mathomp4 mathomp4 marked this pull request as ready for review April 19, 2022 15:15
@mathomp4
Copy link
Member Author

Zero-diff. Merging!

@mathomp4 mathomp4 merged commit 91f3340 into main Apr 19, 2022
@github-actions github-actions bot mentioned this pull request May 25, 2022
Merged
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

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