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.

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

Clean up mk_GEOSldasRestarts and process_rst.csh #551

Merged
merged 25 commits into from
Sep 2, 2022
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e72cf69
This branch is using mk_catchANDcnRestarts.x
weiyuan-jiang May 6, 2022
d76fbab
change components for testing purpose
weiyuan-jiang May 11, 2022
cc4cda2
set in_tilefile as string by default
weiyuan-jiang May 12, 2022
f2909f2
reverting components.yaml back to develop branch in anticipation of P…
gmao-rreichle Jul 19, 2022
abe3d18
Merge branch 'develop' into feature/wjiang/clean_mk_restarts
gmao-rreichle Jul 19, 2022
347a88d
changed to python 3 and use remap_restarts
weiyuan-jiang Aug 8, 2022
120d38f
change the script for processing restart
weiyuan-jiang Aug 8, 2022
0a338cd
bug fix
weiyuan-jiang Aug 8, 2022
2a3af9c
fix glob
weiyuan-jiang Aug 8, 2022
e7d2fa0
correct python3 division
weiyuan-jiang Aug 8, 2022
795cf09
change chmod
weiyuan-jiang Aug 10, 2022
3df4bc2
rm support for LDASsa restart. rm process_rst.csh
weiyuan-jiang Aug 12, 2022
2640504
search vegrst
weiyuan-jiang Aug 12, 2022
b3aeb0e
change componet for test
weiyuan-jiang Aug 18, 2022
45ec4c0
Revert "change componet for test"
gmao-rreichle Aug 26, 2022
fa7f594
reverting GMAO_Shared back to "main" branch in components.yaml in pre…
gmao-rreichle Aug 26, 2022
1f51c48
fix typos in comments (ldas_setup)
gmao-rreichle Aug 30, 2022
f8828a7
extend FP restart dates
weiyuan-jiang Aug 30, 2022
e3c52a6
resolved merge conflict in CMakeLists.txt
gmao-rreichle Sep 1, 2022
e6994a3
Merge branch 'develop' into feature/wjiang/clean_mk_restarts. Resolve…
gmao-rreichle Sep 1, 2022
17901e5
update catchcn restart dummy files
biljanaorescanin Sep 1, 2022
4c85309
fix catchcn45 tile file
biljanaorescanin Sep 1, 2022
664049a
missing else
biljanaorescanin Sep 1, 2022
f93bb94
no need for else
biljanaorescanin Sep 1, 2022
3379fc0
else syntax error
biljanaorescanin Sep 2, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Applications/LDAS_App/ldas_setup
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,12 @@ class LDASsetup:
'/mkCatchParam_SMAP_L4SM_v002/SMAP_EASEv2_M09/SMAP_EASEv2_M09_3856x1624.til'
elif (self.catch == 'catchcnclm40'):
self.in_rstfile = '/discover/nobackup/projects/gmao/ssd/land/l_data/LandRestarts_for_Regridding' \
'/CatchCN/M09/20151231/catchcn_internal_rst'
self.in_tilefile = '/discover/nobackup/ltakacs/bcs/Heracles-NL/SMAP_EASEv2_M09/SMAP_EASEv2_M09_3856x1624.til'
'/CatchCN/M36/20150301_0000/catchcnclm40_internal_dummy'
self.in_tilefile = '/discover/nobackup/ltakacs/bcs/Heracles-NL/SMAP_EASEv2_M36/SMAP_EASEv2_M36_964x406.til'
elif (self.catch == 'catchcnclm45'):
Copy link
Contributor

Choose a reason for hiding this comment

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

@weiyuan-jiang, @gmao-jkolassa:
If I'm guessing right, the current ldas_setup does not have information about a dummy restart file for CatchCNCLM45. It looks like the dummy restart files for the other model versions are all in the M09 tile space. @gmao-jkolassa, do you have an M09 restart for CatchCNCLM45 that could be used as a dummy restart here? If not, we could use the M36 restart from the LDAS_GLOBALCNCLM45 nightly test.
@weiyuan-jiang, please work with @gmao-jkolassa to implement a dummy CatchCNCLM45 restart in ldas_setup.

Copy link
Contributor

Choose a reason for hiding this comment

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

I do not have an M09 restart file readily available, but I can generate one if that is preferred. Please let me know.

@weiyuan-jiang I will send you the path to an M36 restart that can be used if an M09 restart is not needed.

Copy link
Contributor

Choose a reason for hiding this comment

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

@gmao-jkolassa: I'll leave it up to you to decide if we need an M09 dummy restart or if the M36 restart from the nightly test case is sufficient. Note that this is just a dummy and meant to give users a start by providing a properly formatted restart. Users will need to do some spin-up (unless the dummy restart itself is spun up properly, in the same tile space, and for the desired restart date, which is not likely to ever happen).

Copy link
Contributor

Choose a reason for hiding this comment

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

Since this is only meant to serve as a dummy restart with the understanding that some additional spin-up is necessary, I think it is fine to use the M36 restart file from the nightly test. I will work with @weiyuan-jiang to make sure it is copied to an accessible space.

self.in_rstfile = '/discover/nobackup/projects/gmao/ssd/land/l_data/LandRestarts_for_Regridding' \
'/CatchCN/M36/19800101_0000/catchcnclm45_internal_dummy'
self.in_tilefile = '/discover/nobackup/ltakacs/bcs/Heracles-NL/SMAP_EASEv2_M36/SMAP_EASEv2_M36_964x406.til'
sys.exit('need to provide at least dummy files')
biljanaorescanin marked this conversation as resolved.
Show resolved Hide resolved
self.in_rstfile = None
self.in_tilefile = None
Expand Down