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

Update ecflow after tag v7.0.0 #78

Merged
merged 2 commits into from
Nov 15, 2024

Conversation

YaliMao-NOAA
Copy link
Collaborator

  1. Update ecflow from changes that NCO made
  2. Add ecflow cron of cycle_end to force requeue of wafs

2. Add ecflow cron of cycle_end to force requeue of wafs
Copy link
Contributor

@aerorahul aerorahul left a comment

Choose a reason for hiding this comment

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

  1. NCO is not following its own vertical structure standards w.r.t. suite def/ directory.
  2. the cycle_end.ecf should not need an EXPID suffix. Please see suggestions in the review

.gitignore Outdated

# Ignore wafs.def
ecf/def/wafs*.def
ecf/cycle_end?*.ecf
Copy link
Contributor

Choose a reason for hiding this comment

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

This should not be necessary following the suggestion below

Copy link
Contributor

Choose a reason for hiding this comment

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

Wait, NCO is moving def/ to the top of the directory tree? This is not the EE2 implementation standards.
Please see Table 3, page 19.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@aerorahul You are absolutely right. I am going to mv def/ under ecf/. I've notified Xiaoxue about it and she is going to correct it.

# Make sure the right ecflow suite to be requeued by cycle_end
if [[ -n "${EXPID}" ]]; then
sed -e "s|model=.*|model=wafs${EXPID}|g" \
"${DIR_ROOT}/ecf/cycle_end.ecf" > "${DIR_ROOT}/ecf/cycle_end${EXPID}.ecf"
Copy link
Contributor

Choose a reason for hiding this comment

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

There should be no need for EXPID in cycle_end${EXPID}.ecf

edit COMPATH '%COMROOT%/wafs'
family 00
edit CYC '00'
task cycle_end@EXPID@
Copy link
Contributor

Choose a reason for hiding this comment

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

cycle_end does not need @EXPID@.

Suggested change
task cycle_end@EXPID@
task cycle_end

endfamily # endfamily 00
family 06
edit CYC '06'
task cycle_end@EXPID@
Copy link
Contributor

Choose a reason for hiding this comment

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

Same comment as above

Suggested change
task cycle_end@EXPID@
task cycle_end

endfamily # endfamily 06
family 12
edit CYC '12'
task cycle_end@EXPID@
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
task cycle_end@EXPID@
task cycle_end

endfamily # endfamily 12
family 18
edit CYC '18'
task cycle_end@EXPID@
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
task cycle_end@EXPID@
task cycle_end

Comment on lines 105 to 108
if [[ -n "${EXPID}" ]]; then
sed -e "s|model=.*|model=wafs${EXPID}|g" \
"${DIR_ROOT}/ecf/cycle_end.ecf" > "${DIR_ROOT}/ecf/cycle_end${EXPID}.ecf"
fi
Copy link
Contributor

Choose a reason for hiding this comment

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

I would suggest not creating cycle_end${EXPID}.ecf
Instead let it be cycle_end.ecf and pass argument via the suite def. file.
This eliminates cluttering the repo w/ experiment specific files.
See the suggested change in ecf/cycle_end.ecf

Suggested change
if [[ -n "${EXPID}" ]]; then
sed -e "s|model=.*|model=wafs${EXPID}|g" \
"${DIR_ROOT}/ecf/cycle_end.ecf" > "${DIR_ROOT}/ecf/cycle_end${EXPID}.ecf"
fi

cyc=%CYC%
ecflow_client --requeue=force /${model}/primary/${cyc}/wafs
%include <tail.h>
exit 0
Copy link
Contributor

Choose a reason for hiding this comment

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

Please add %manual similar to the other ecf scripts.

@@ -0,0 +1,10 @@
#!/bin/bash -l

model=wafs
Copy link
Contributor

Choose a reason for hiding this comment

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

This should eliminate the need for sed

Suggested change
model=wafs
model=%SUITE%

2. Made ecflow script modifications upon suggestions.
@YaliMao-NOAA
Copy link
Collaborator Author

@aerorahul I updated ecflow scripts upon your great suggestions.

@YaliMao-NOAA YaliMao-NOAA merged commit a1a3a44 into NOAA-EMC:release/wafs.v7 Nov 15, 2024
%include <envir-p1.h>
set -x
cyc=%CYC%
ecflow_client --requeue=force /wafs/primary/${cyc}/wafs
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think this will work.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It works, however different from NCO's version. I am running ecflow parallel run and it has been worked on dogwood since 15th.

@YaliMao-NOAA YaliMao-NOAA deleted the ecflow_instable branch January 10, 2025 20:46
YaliMao-NOAA added a commit that referenced this pull request Jan 11, 2025
* Change walltime according to the NCO general rule: (#75)

0-2 minutes of total runtime = 10 minute wall clock
3-10 minutes = 15 minute wall clock
11-15 minutes = 25 minute wall lock
16-20 minutes = 30 minute wall clock
21+ minutes = runtime * 1.25 rounded up  to the nearest 5 min

Co-authored-by: yali mao <yali.mao@clogin01.cactus.wcoss2.ncep.noaa.gov>

* Update ecflow after tag v7.0.0 (#78)

* 1. Update ecflow from changes that NCO made
2. Add ecflow cron of cycle_end to force requeue of wafs

* 1. Put def/ back under ecf/ to comply with EE2 standards
2. Made ecflow script modifications upon suggestions.

---------

Co-authored-by: yali mao <yali.mao@clogin09.cactus.wcoss2.ncep.noaa.gov>
Co-authored-by: yali mao <yali.mao@clogin02.cactus.wcoss2.ncep.noaa.gov>

* Upgrade module versions according to what NCO parallel run made (#82)

Co-authored-by: yali mao <yali.mao@dlogin09.dogwood.wcoss2.ncep.noaa.gov>

* Pick up changes from what NCO made (#86)

* Pick up changes from what NCO made
1. Remove jobsuffix from wafs grib1 products, wmo/xtrn* filename
2. Add '%VER:%' to ecf job cards
3. Change maillist in gcip job to MAILTOgcip and move to ecf script

* Add 'VER' to the rest of ecf job cards.

---------

Co-authored-by: yali mao <yali.mao@dlogin04.dogwood.wcoss2.ncep.noaa.gov>

* For GMGSI satellite data update: (#87)

- GMGSI satellite parm and script changes: scripts/exwafs_gcip.sh parm/wafs/wafs_gcip_gfs.cfg
- Add DCOMROOTsat under 'family gcip' to ecf def files, ecf/gcip/jwafs_gcip_master.ecf, jobs/JWAFS_GCIP

For unblended UK data which are availble in the prod DCOMROOT:
- remove DCOMROOT from family blending in ecf def files

Co-authored-by: yali mao <yali.mao@dlogin04.dogwood.wcoss2.ncep.noaa.gov>

* Pick up changes that NCO made after tag wafsv7.0.1 (#88)

Co-authored-by: yali mao <yali.mao@clogin07.cactus.wcoss2.ncep.noaa.gov>

---------

Co-authored-by: yali mao <yali.mao@clogin01.cactus.wcoss2.ncep.noaa.gov>
Co-authored-by: yali mao <yali.mao@clogin03.cactus.wcoss2.ncep.noaa.gov>
Co-authored-by: yali mao <yali.mao@clogin09.cactus.wcoss2.ncep.noaa.gov>
Co-authored-by: yali mao <yali.mao@clogin02.cactus.wcoss2.ncep.noaa.gov>
Co-authored-by: yali mao <yali.mao@dlogin09.dogwood.wcoss2.ncep.noaa.gov>
Co-authored-by: yali mao <yali.mao@dlogin04.dogwood.wcoss2.ncep.noaa.gov>
Co-authored-by: yali mao <yali.mao@clogin07.cactus.wcoss2.ncep.noaa.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants