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 (2.26 Release) #1677

Merged
merged 36 commits into from
Sep 16, 2022
Merged

Merge Develop into Main (2.26 Release) #1677

merged 36 commits into from
Sep 16, 2022

Conversation

mathomp4
Copy link
Member

Merging develop into main for 2.26 Release.

Tests last night showed MAPL develop was zero-diff.

atrayano and others added 30 commits September 6, 2022 16:47
@atrayano
Fixes #1654. We check first if we actually need to allocate the field…
9e12a28 
…, and only then require the grid to be set
@bena-nasa
fixes # 1656
5f2d7fb
@bena-nasa
fixes #1657
b924ac6
@atrayano
Added a line in CHANGELOG file
4b937f8
@atrayano
Fixes #1654. Fixed a typo
6c4a96f
@atrayano
Fixes #1654. Fixed another typo
c6b0ab5
@bena-nasa
Merge pull request #1659 from GEOS-ESM/feature/bmauer/fixes-#1657
fc9abef 
fixes #1657
@bena-nasa
Merge branch 'develop' into feature/bmauer/fixes-#1656
68ce7b6
@bena-nasa
Merge branch 'develop' into bugfix/atrayano/#1654_propagate_tile_vars
3874ad5
@bena-nasa
Merge pull request #1658 from GEOS-ESM/feature/bmauer/fixes-#1656
a4ee7a7 
fixes # 1656
@bena-nasa
Merge branch 'develop' into bugfix/atrayano/#1654_propagate_tile_vars
ed55578
@atrayano
Merge pull request #1660 from GEOS-ESM/bugfix/atrayano/#1654_propagat…
3518cea 
…e_tile_vars

Fixes #1654. We check first if we actually need to allocate the field…
@weiyuan-jiang
remove unnecessary DSO lib name assert
fafbd97
@bena-nasa
fix logic with checking for duplicates
6be9fd8
@bena-nasa
update changelog
bb6c948
@tclune
Merge pull request #1666 from GEOS-ESM/feature/bmauer/fixes-#1665
a2ba020 
Feature/bmauer/fixes #1665
@mathomp4
Fixes #1668. Only allow certain History modes
0173b97
@mathomp4
Convert to _RC
bcac8e2
@mathomp4
Helps to say what the case is selecting on
a9a3325
@mathomp4
Name the collection that failed
1c4b592
@mathomp4
Use square brackets
79accdf
@mathomp4
Merge pull request #1669 from GEOS-ESM/feature/mathomp4/1668-history-…
ebcffd9 
…mode-protect

Fixes #1668. Only allow certain History modes
@mathomp4
Merge branch 'develop' into feature/wjiang/remove_dso_extension_assert
3a1988b
@mathomp4
Merge pull request #1664 from GEOS-ESM/feature/wjiang/remove_dso_exte…
04fac26 
…nsion_assert

remove unnecessary DSO lib name assertion
@mathomp4
Fixes #1598. Have AddChildFromDSO call Meta
3d665b9
@mathomp4
Update changelog (to trigger CI)
2bf0e02
@mathomp4
Add Ninja build of MAPL
b8b9e99
@mathomp4
Trivial commit to trigger CI
bfea1bd
@mathomp4
Update ci bcs version
a101e94
@mathomp4
Update circleci orb dev version
a02311e
@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Sep 16, 2022
@mathomp4 mathomp4 requested a review from a team as a code owner September 16, 2022 13:43
@mathomp4 mathomp4 self-assigned this Sep 16, 2022
@mathomp4 mathomp4 requested a review from a team as a code owner September 16, 2022 13:43
@mathomp4 mathomp4 merged commit 0608e97 into main Sep 16, 2022
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.
5 participants
@mathomp4 @bena-nasa @atrayano @weiyuan-jiang @tclune