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 #25

Merged
merged 61 commits into from
Mar 1, 2021
Merged

Merge develop into main #25

merged 61 commits into from
Mar 1, 2021

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Mar 1, 2021

This gets the CI and other updates from the handmerge PR into main.

gmao-esherman and others added 30 commits September 4, 2020 09:48
@gmao-esherman
can now disable MSA by commenting out in statespec.rc
f55f43a
@gmao-esherman
can now disable MSA by commenting out in statespec.rc
5d3e9dd
@gmao-esherman
reverted to default settings
5257ded
@WilliamJamieson
Refactored maps
2412662
@WilliamJamieson
Change test name
652020c
@WilliamJamieson
Added descriptive mathematical name
3f271ad
@WilliamJamieson
Merge remote-tracking branch 'origin/Aerosol_Test_App' into feature/r…
cba8eea 
…emove_GOCART_legacy
@WilliamJamieson
Updated HEMCO to use develop branch
9e64d69
@WilliamJamieson
Enabled HEMCO building
3a2ef37
@WilliamJamieson
Removed Legacy GOCART GridComp
91e63f8
@WilliamJamieson
Removed GOCART Legacy shared files
a14c727
@WilliamJamieson
Sparsing out most of GMAO shared
f1c2a21
@WilliamJamieson
Fixed GMAO_Shared sparsing
ce17e8a
@WilliamJamieson
Factored out the NCEP_Shared dependency
c7c5033
@tclune
Merge pull request #5 from GEOS-ESM/feature/remove_GOCART_legacy
9df0df3 
Remove remaining parts of GOCART legacy
@mathomp4
Add CircleCI
954e1a9
@mathomp4
Update CHANGELOG
178fcc4
@WilliamJamieson
Removed mpeu dependency from GOCART
5ce5eee
@mathomp4
Try new Ubuntu image
526054f
@tclune
Merge pull request #6 from GEOS-ESM/feature/mathomp4/add-circleci-gocart
8c701b2 
Add CircleCI
@mathomp4
Add CODEOWNERS
3b3883f
@tclune
Merge pull request #8 from GEOS-ESM/feature/mathomp4/add-CODEOWNERS-g…
c03a13b 
…ocart

Add CODEOWNERS
@WilliamJamieson
Switched to using StrTemplate wrapper procedure as requested by @tclune
6a3ee29
@WilliamJamieson
Merge remote-tracking branch 'origin/develop' into feature/remove_mpeu
13e18fb
@WilliamJamieson
Update CHANGELOG.md
e6bd14e
@tclune
Merge pull request #7 from GEOS-ESM/feature/remove_mpeu
1d30a52 
Remove mpeu dependency from GOCART2G
@tclune
Merge pull request #13 from GEOS-ESM/main
cf4f6e6 
Merge rc bugfix into develop
@gmao-esherman
testing daignostic variables
44cf8ee
@gmao-esherman
'GOCART2G works well after 2-day test run. This is a good tag'
17539a0
@WilliamJamieson
Fixed gfortran build errors
9c85490
gmao-esherman and others added 16 commits December 8, 2020 11:14
@gmao-esherman
'CA internal state varaibles have the CA gridded component's name app…
3901055 
…ended to them.'
@gmao-esherman
'Updated description.'
6d5cded
@gmao-esherman
'fixed minor typo'
89fa09d
@gmao-esherman
Update SU2G_StateSpecs.rc
7681f07 
removed SU_regionmask
@gmao-esherman
"Merged in changes from feature/adarmenov/#19-aerochem. Also include …
27aaefe 
…some updates for GAAS2G refactoring.'
@gmao-esherman
Merge branch 'feature/esherman/gocart2g_develop_MAPLconst' of github.…
c28382c 
…com:GEOS-ESM/GOCART into feature/esherman/gocart2g_develop_MAPLconst
@gmao-esherman
Merge branch 'feature/esherman/gocart2g_develop_MAPLconst' of github.…
15a0365 
…com:GEOS-ESM/GOCART into feature/esherman/gocart2g_develop_MAPLconst

'Fixing commit message. This commit contains support for computing aerosol diagnostics at mulitple wavelengths. It does NOT include updates from feature/adarmenov/#19-aerochem.'
@gmao-esherman
Merge branch 'feature/esherman/gocart2g_develop_MAPLconst' of github.…
86eab93 
…com:GEOS-ESM/GOCART into feature/esherman/gocart2g_develop_MAPLconst
@tclune
Merge pull request #19 from GEOS-ESM/feature/esherman/gocart2g_develo…
38b6244 
…p_MAPLconst

merge latest GOCART2G into develop
@mathomp4
Merge branch 'develop'
c91b19a
@mathomp4
Merge branch 'main' into develop
ea11302
@WilliamJamieson
Putting GOCART legacy back into develop
d100c02
@mathomp4
Add GOCART_GridComp to esma_add_subdirectories
c485750
@mathomp4
Update components and CI
369b6ed
@mathomp4
Merge pull request #22 from GEOS-ESM/merge/mathomp4/handmerge-main-to…
2ea2972 
…-develop-2021Feb23

Handmerge main into develop
@mathomp4
Update cmakelists and changelog
689d2ed
@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Mar 1, 2021
@mathomp4 mathomp4 self-assigned this Mar 1, 2021
@mathomp4 mathomp4 marked this pull request as draft March 1, 2021 20:05
@mathomp4
Copy link
Member Author

mathomp4 commented Mar 1, 2021

Oh boy...that was a lot more differences than I was thinking. I might not do this just yet...

@mathomp4
Copy link
Member Author

mathomp4 commented Mar 1, 2021

@tclune @WilliamJamieson @gmao-esherman What are your thoughts on bringing develop into main now? I mainly wanted to do it to get the fixes I made during the handmerge (#22) back to main. But this would bring all of the 2G work into main.

We know that GEOS-ESM/GEOSgcm#257 by @WilliamJamieson sparses out GOCART2G, etc. so it's "equivalent" to current GOCART.

@mathomp4
Copy link
Member Author

mathomp4 commented Mar 1, 2021

I am going to do a build and test with this branch. Make sure it is still zero-diff to GEOSgcm stock.

@mathomp4
Copy link
Member Author

mathomp4 commented Mar 1, 2021

I just did some tests with this and GEOSgcm built and is zero-diff with both actual (MERRA2) and climatological (GOCART.data) aerosols.

@mathomp4 mathomp4 marked this pull request as ready for review March 1, 2021 21:19
WilliamJamieson
WilliamJamieson approved these changes Mar 1, 2021
View reviewed changes
Copy link
Contributor

@WilliamJamieson WilliamJamieson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In light of your zero-diff test, I think I am fine with this.

gmao-esherman
gmao-esherman approved these changes Mar 1, 2021
View reviewed changes
Copy link
Contributor

@gmao-esherman gmao-esherman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mathomp4 has verified zero-diff!

@mathomp4 mathomp4 merged commit 1518190 into main Mar 1, 2021
@tclune
Copy link
Contributor

tclune commented Mar 2, 2021

I would have said to wait until 2G is ready to become the default for GOCART. Merging now slightly complicates things if legacy GOCART needs a hotfix in the mean time. But such is life.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gmao-esherman gmao-esherman gmao-esherman approved these changes

@WilliamJamieson WilliamJamieson WilliamJamieson 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.
4 participants
@mathomp4 @tclune @WilliamJamieson @gmao-esherman