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

Re-tiling clean-up and additional RESTART options #149

Merged
merged 50 commits into from
Mar 13, 2020
Merged

Re-tiling clean-up and additional RESTART options #149

merged 50 commits into from
Mar 13, 2020

Conversation

weiyuan-jiang
Copy link
Contributor

@weiyuan-jiang weiyuan-jiang commented Mar 12, 2020 •
edited by gmao-rreichle
Loading

Addresses issues #108 and #113

weiyuan-jiang and others added 30 commits October 18, 2019 15:51
@weiyuan-jiang
bring MAPL-2.0 and related components to GEOSldas
9baf381
@weiyuan-jiang
exact match with MAPL-2.0 ( hangs in mpi_win_fence())
4b11012
@weiyuan-jiang
1)add assimilation for cubed-sphere grid
557a57b 
2)change perturbations writing for
3)add reading forcing from cubed-sphere grid
4)not verify yet (for cubed-sphere grid)
@weiyuan-jiang
reshape forcing for cs grid. Remove conditioning on pertubation
484bbeb
@weiyuan-jiang
Merge pull request #76 from GEOS-ESM/develop
34f63b3 
bring develop to develop_smap
@weiyuan-jiang
Merge branch 'dev/MAPL-2.0' into develop_smap
74e14af
@weiyuan-jiang
Merge pull request #77 from GEOS-ESM/develop_smap
bef0abf 
Develop smap
@weiyuan-jiang
typo fix. zero diff with develop branch
2f19d14
@weiyuan-jiang
Update lenkf.j.template
159ec76
@weiyuan-jiang
rm Develop.cfg
fff1df9
@weiyuan-jiang
Merge branch 'develop' into dev/MAPL-2.0
d77a8cf
@weiyuan-jiang
change External.cfg to match removed Develop.cfg
f83acd9
@gmao-rreichle
Update LDAS_Forcing.F90
d028df8
@weiyuan-jiang
Merge pull request #96 from GEOS-ESM/develop
4df544f 
bring changes from develop
@weiyuan-jiang
change env and cmake version
8f30572
@weiyuan-jiang
add export for incr
1cf3be0
@weiyuan-jiang
rm redundant NX NY and _FILE
5286540
@weiyuan-jiang
conform gcc-9.1 and bug fix in select-update_type 9 (abs(deltaT)>0.)
7729a73
@weiyuan-jiang
fix HISTORY.rc example for MAPL-2.0
0d84367
@weiyuan-jiang
Merge pull request #104 from GEOS-ESM/develop
a2b680a 
Develop
@weiyuan-jiang
1)create local nc4 vegdyn restart
3bff1a1 
2)bug fix for local mwRTM and time dimension restart
@weiyuan-jiang
Merge branch 'dev/MAPL-2.0' of github.com:GEOS-ESM/GEOSldas into dev/…
eb15ce1 
…MAPL-2.0
@weiyuan-jiang
use intel mpi
b9d60d3
@weiyuan-jiang
rm file_type that is detected by MAPL
400e91e
@weiyuan-jiang
remove compression of landpert rst.
4a7033f
@smahanam
revised GEOSldas regridding
5acf0e0
@gmao-rreichle
fixed typo: "sponser" --> "sponsor"
f4b7806
@gmao-rreichle
removed obsolete lines with hard-coded values for SURFLAY
a8d74e2
@smahanam
mk_LDASsaRestarts.F90 was renamed to mk_GEOSldasRestarts.F90
c94b356
@smahanam
Merge branch 'WJ_ldassa_regrid' of github.com:GEOS-ESM/GEOSldas into …
e5a79a2 
…WJ_ldassa_regrid
@weiyuan-jiang weiyuan-jiang requested review from a team as code owners March 12, 2020 18:42
@gmao-rreichle gmao-rreichle mentioned this pull request Mar 12, 2020
Closed
gmao-rreichle
gmao-rreichle reviewed Mar 12, 2020
View reviewed changes
Copy link
Contributor

@gmao-rreichle gmao-rreichle left a comment

Choose a reason for hiding this comment

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

I edited the help text for the RESTART options in ldas_setup.
@smahanam : can you please double-check that everything is still correct?
@weiyuan-jiang : Please re-approve the changes, assuming they are ok, but do NOT merge!!! I want to edit the change log (squash and merge).

@gmao-rreichle gmao-rreichle changed the title retiling Re-tiling clean-up and additional RESTART options Mar 12, 2020
@weiyuan-jiang
Copy link
Contributor Author

I don't need to re-approve it. It requires cmake team to approve @mathomp4

@smahanam
Copy link

Looks good to me.

gmao-rreichle
gmao-rreichle approved these changes Mar 13, 2020
View reviewed changes
Copy link
Contributor

@gmao-rreichle gmao-rreichle left a comment

Choose a reason for hiding this comment

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

Given Sarith's approving review of my edits, the land group is happy with the pull request.
@mathomp4 , @bena-nasa , @tclune : When you get a chance, please take a look and approve for the CMake team.
Looking ahead, perhaps @weiyuan-jiang could be given authority to approve for the CMake team? The CMake changes here are so minimal, we probably shouldn't need to bother @mathomp4 or @bena-nasa or @tclune .

This was referenced Mar 13, 2020
Closed
Closed
This was linked to issues Mar 13, 2020
questions re. RESTART options in GEOSldas #108
Closed
GEOSldas re-tiling functionality (RESTART=2) #113
Closed
mathomp4
mathomp4 reviewed Mar 13, 2020
View reviewed changes
Copy link
Member

@mathomp4 mathomp4 left a comment

Choose a reason for hiding this comment

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

The CMake changes seems good to me.

mathomp4
mathomp4 approved these changes Mar 13, 2020
View reviewed changes
Copy link
Member

@mathomp4 mathomp4 left a comment

Choose a reason for hiding this comment

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

Sigh. actually approve and not just comment.

@gmao-rreichle gmao-rreichle merged commit b04dc5f into develop Mar 13, 2020
@gmao-rreichle gmao-rreichle deleted the WJ_ldassa_regrid branch March 13, 2020 16:01
This was referenced Mar 13, 2020
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mathomp4 mathomp4 mathomp4 approved these changes

@gmao-rreichle gmao-rreichle gmao-rreichle approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

GEOSldas re-tiling functionality (RESTART=2) questions re. RESTART options in GEOSldas
4 participants
@weiyuan-jiang @smahanam @mathomp4 @gmao-rreichle