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

Add efcs and epos to ufs_hybatm xml (#3192) #3193

Merged
merged 4 commits into from
Jan 3, 2025

Conversation

RussTreadon-NOAA
Copy link
Contributor

@RussTreadon-NOAA RussTreadon-NOAA commented Dec 27, 2024

Description

g-w PR #3185 inadvertently removed metatasks enkfgdas_fcst and enkfgdas_epmn from the ufs_hybatmDA xml. This PR modifies workflow/applications/gfs_cycled.py so that these metatasks are once again in the ufs_hybatmDA xml.

Resolves: #3192

Type of change

  • Bug fix (fixes something broken)

Change characteristics

  • Does this change require a documentation update? NO
  • Does this change require an update to any of the following submodules? NO

How has this been tested?

  1. clone and install bugfix/ufs_hybatmDA on Dogwood
  2. set up g-w CI C96C48_ufs_hybatmDA by executing $HOMEgfs/workflow/create_experiment.py
  3. open C96C48_ufs_hybatmDA xml
  4. confirm that metatasks enkfgdas_fcst and enkfgdas_epmn are defined

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • My changes generate no new warnings
  • New and existing tests pass with my changes
  • This change is covered by an existing CI test or a new one has been added

aerorahul
aerorahul previously approved these changes Dec 27, 2024
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.

looks good to me.

@WalterKolczynski-NOAA
Copy link
Contributor

I think the earc dependencies will need to be added back as well.

@RussTreadon-NOAA
Copy link
Contributor Author

@WalterKolczynski-NOAA , feel free add the earc changes to my branch. Not sure if this will work, but give it a try. If it fails, point me at your earc changes and I'll add them. Alternatively, you can open a new issue and PR and pull my changes into your PR.

@WalterKolczynski-NOAA
Copy link
Contributor

I'm on leave until Jan 2, but you can see what #3185 took out of gfs_tasks.py and put it back in.

@RussTreadon-NOAA
Copy link
Contributor Author

No rush. We can wait until after everyone returns from leave.

@RussTreadon-NOAA
Copy link
Contributor Author

Limited g-w CI on Hera

Ran g-w CI for C48mx500_3DVarAOWCDA, C96C48_hybatmaerosnowDA, and C96C48_ufs_hybatmDA on Hera from an installation of g-w bugfix/ufs_hybatmDA at 5acc46c.

All jobs in C48mx500_3DVarAOWCDA and C96C48_ufs_hybatmDA ran to completion.

The 20211220 18Z C96C48_hybatmaerosnowDA enkfgdas_earc01 failed with the error message

  File "/scratch1/NCEPDEV/da/Russ.Treadon/git/global-workflow/test/parm/archive/enkf_restartb_grp.yaml.j2", line 41, in template
    {% endfor %}
^^^^^^^^^^^^^^^^^
jinja2.exceptions.TemplateSyntaxError: Encountered unknown tag 'endfor'. You probably made a nesting mistake. Jinja is expecting this tag, but currently looking for 'elif' or 'else' or 'endif'. The innermost block that needs to be closed is 'if'.
+ JGDAS_ENKF_ARCHIVE[1]: postamble JGDAS_ENKF_ARCHIVE 1735397434 1

The line 41 {% endfor %} is one line before the end of enkf_restartb_grp.yaml.j2

        {% endfor %}
        {% endfor %}
        {% endif %}

This is not correct. The template needs to end with {% endfor %} to close the top-level loop over members

nkf_restartb_grp:
    name: "ENKF_RESTARTB_GRP"
    target: "{{ ATARDIR }}/{{ cycle_YMDH }}/{{ RUN }}_restartb_grp{{ ENSGRP }}.tar"
    required:
        {% for mem in range(first_group_mem, last_group_mem + 1) %}

Make the following change to parm/archive/enkf_restartb_grp.yaml.j2

@@ -38,5 +38,5 @@ enkf_restartb_grp:
         - "{{ COMIN_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.coupler.res"
         - "{{ COMIN_ATMOS_RESTART_MEM | relpath(ROTDIR) }}/{{ r_prefix }}.fv_core.res.nc"
         {% endfor %}
-        {% endfor %}
         {% endif %}
+        {% endfor %}

With this change in place, the 20211220 18Z enkfgdas_earc01 successfully ran to completion.

@TravisElless-NOAA
Copy link
Contributor

@RussTreadon-NOAA Apologies for the inconvenience my PR errors caused and thank you for your efforts to correct them.

One suggestion: instead of adding the lines to the top half of the do_jediatmens if statement, we can just pull the lines #3185 added in the bottom half of the if statement outside of the if statement all together.

The earc dependencies are still fine and won't have to be updated. Changes to the dependencies in #3185 focused on the requirements between the early- and late-cycle. This PR focuses on restoring only late-cycle jobs for the UFS DA configuration and maintains that the UFS DA will still have the fcst and pos jobs turned off for the early-cycle.

@RussTreadon-NOAA
Copy link
Contributor Author

Requested changes have been made. Once everyone is OK with the changes in this PR, we should run run g-w CI on Hera to ensure no unintended consequences.

@RussTreadon-NOAA
Copy link
Contributor Author

Thank you @TravisElless-NOAA . I'll start g-w CI on Hera once I receive confirmation (approval) from the g-w team that the changes in this PR are OK with them. We don't want to run CI multiple times. Hence my waiting.

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.

lgtm

@aerorahul aerorahul added CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera CI-Hercules-Ready **CM use only** PR is ready for CI testing on Hercules labels Jan 2, 2025
@emcbot emcbot added CI-Hercules-Building **Bot use only** CI testing is cloning/building on Hercules CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera and removed CI-Hercules-Ready **CM use only** PR is ready for CI testing on Hercules CI-Hera-Ready **CM use only** PR is ready for CI testing on Hera labels Jan 2, 2025
@RussTreadon-NOAA
Copy link
Contributor Author

Thank you @aerorahul for the approval and triggering Hera and Hercules CI.

@emcbot emcbot added CI-Hercules-Running **Bot use only** CI testing on Hercules for this PR is in-progress CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress and removed CI-Hercules-Building **Bot use only** CI testing is cloning/building on Hercules labels Jan 2, 2025
@emcbot emcbot added CI-Hercules-Passed **Bot use only** CI testing on Hercules for this PR has completed successfully and removed CI-Hera-Building **Bot use only** CI testing is cloning/building on Hera CI-Hercules-Running **Bot use only** CI testing on Hercules for this PR is in-progress labels Jan 2, 2025
@emcbot
Copy link

emcbot commented Jan 2, 2025

CI Passed on Hercules in Build# 1
Built and ran in directory /work2/noaa/global/CI/HERCULES/3193


Experiment C48_ATM_e93036d4 Completed 2 Cycles: *SUCCESS* at Thu Jan  2 12:46:27 CST 2025
Experiment C48mx500_3DVarAOWCDA_e93036d4 Completed 2 Cycles: *SUCCESS* at Thu Jan  2 12:52:30 CST 2025
Experiment C48mx500_hybAOWCDA_e93036d4 Completed 2 Cycles: *SUCCESS* at Thu Jan  2 12:58:39 CST 2025
Experiment C96C48_hybatmDA_e93036d4 Completed 3 Cycles: *SUCCESS* at Thu Jan  2 13:53:20 CST 2025
Experiment C96_S2SWA_gefs_replay_ics_e93036d4 Completed 1 Cycles: *SUCCESS* at Thu Jan  2 13:53:42 CST 2025
Experiment C96_atm3DVar_e93036d4 Completed 3 Cycles: *SUCCESS* at Thu Jan  2 13:59:12 CST 2025
Experiment C48_S2SW_e93036d4 Completed 2 Cycles: *SUCCESS* at Thu Jan  2 14:18:09 CST 2025
Experiment C48_S2SWA_gefs_e93036d4 Completed 1 Cycles: *SUCCESS* at Thu Jan  2 16:19:42 CST 2025

@emcbot emcbot added CI-Hera-Passed **Bot use only** CI testing on Hera for this PR has completed successfully and removed CI-Hera-Running **Bot use only** CI testing on Hera for this PR is in-progress labels Jan 2, 2025
@emcbot
Copy link

emcbot commented Jan 2, 2025

CI Passed on Hera in Build# 2
Built and ran in directory /scratch1/NCEPDEV/global/CI/3193


Experiment C48mx500_3DVarAOWCDA_e93036d4 Completed 2 Cycles: *SUCCESS* at Thu Jan  2 19:19:31 UTC 2025
Experiment C48mx500_hybAOWCDA_e93036d4 Completed 2 Cycles: *SUCCESS* at Thu Jan  2 19:19:31 UTC 2025
Experiment C48_ATM_e93036d4 Completed 2 Cycles: *SUCCESS* at Thu Jan  2 19:25:46 UTC 2025
Experiment C96_S2SWA_gefs_replay_ics_e93036d4 Completed 1 Cycles: *SUCCESS* at Thu Jan  2 19:33:19 UTC 2025
Experiment C96C48_hybatmaerosnowDA_e93036d4 Completed 3 Cycles: *SUCCESS* at Thu Jan  2 20:42:56 UTC 2025
Experiment C96C48_hybatmDA_e93036d4 Completed 3 Cycles: *SUCCESS* at Thu Jan  2 20:42:57 UTC 2025
Experiment C96_atm3DVar_e93036d4 Completed 3 Cycles: *SUCCESS* at Thu Jan  2 20:52:16 UTC 2025
Experiment C96C48_ufs_hybatmDA_e93036d4 Completed 3 Cycles: *SUCCESS* at Thu Jan  2 21:29:12 UTC 2025
Experiment C48_S2SW_e93036d4 Completed 2 Cycles: *SUCCESS* at Thu Jan  2 21:36:54 UTC 2025
Experiment C48_S2SWA_gefs_e93036d4 Completed 1 Cycles: *SUCCESS* at Thu Jan  2 22:14:57 UTC 2025

@RussTreadon-NOAA
Copy link
Contributor Author

@WalterKolczynski-NOAA : Hera and Hercules g-w CI pass. Is this sufficient or do we also need to run g-w CI on WCOSS2 (Dogwood)?

@aerorahul aerorahul merged commit da9d717 into NOAA-EMC:develop Jan 3, 2025
5 checks passed
@RussTreadon-NOAA
Copy link
Contributor Author

Thank you @aerorahul

tsga added a commit to tsga/global-workflow that referenced this pull request Jan 4, 2025
* develop:
  Ensure OCNRES and ICERES have 3 digits in the archive script (NOAA-EMC#3199)
  Set runtime shell requirements within Jenkins Pipeline (NOAA-EMC#3171)
  Add efcs and epos to ufs_hybatm xml (NOAA-EMC#3192) (NOAA-EMC#3193)
  Fix GEFS and SFS compile flags in build_all.sh (NOAA-EMC#3197)
  Remove early-cycle EnKF forecast (NOAA-EMC#3185)
  Fix mod_icec bug in atmos_prod (NOAA-EMC#3167)
  Create compute build option (NOAA-EMC#3186)
  Support global-workflow using Rocky 8 on CSPs (NOAA-EMC#2998)
@RussTreadon-NOAA RussTreadon-NOAA deleted the bugfix/ufs_hybatmDA branch January 6, 2025 20:19
danholdaway added a commit to danholdaway/global-workflow that referenced this pull request Jan 27, 2025
* develop:
  Remove WAFS files and references from `develop` (NOAA-EMC#3263)
  fix intel stack version number on c5 (NOAA-EMC#3258)
  Update gsi_monitor and ufs_utils hashes to recent hashes for C5/C6 build and run (NOAA-EMC#3252)
  Enable DA cycling on gaea C5/C6 (NOAA-EMC#3255)
  Copy post-processed sea ice increment for diagnostics (NOAA-EMC#3235)
  Only run METplus in the 3Dvar tests (NOAA-EMC#3245)
  Clone, build, and run C48_ATM and C48_S2SW on Gaea C5 and C6 (NOAA-EMC#3106)
  Add echgres as a dependency only for RUN=enkfgdas, not enkfgfs (NOAA-EMC#3246)
  Add domain level to wave gridded COM path (NOAA-EMC#3137)
  CI JJOB Tests using CMake (NOAA-EMC#3214)
  Make assorted updates to waves (NOAA-EMC#3190)
  Move WCOSS2 LD_LIBRARY_PATH patches to load_ufsda_modules.sh (NOAA-EMC#3236)
  Adding a gefs_arch task to GEFS workflow (NOAA-EMC#3211)
  Add additional GEFS variables needed for AI/ML applications  (NOAA-EMC#3221)
  Add bmat task dependency to marine LETKF task (NOAA-EMC#3224)
  Resolve bug with LMOD_TMOD_FIND_FIRST setting affecting build on WCOSS2 (NOAA-EMC#3229)
  Reinstate product groups (NOAA-EMC#3208)
  Additional fixes for downstream jobs (NOAA-EMC#3187)
  Turn IAU off during staging job for cold start experiments (NOAA-EMC#3215)
  Update the gdas.cd hash and enable GDASApp to run on WCOSS2 (NOAA-EMC#3220)
  Update upload-artifact to v4 (NOAA-EMC#3216)
  Prevent duplicate case generation in generate_workflows.sh (NOAA-EMC#3217)
  Update g-w to cycle with C1152 ATM (NOAA-EMC#3206)
  Separate use of initial increment/perturbation file from REPLAY/+03 ICs  (NOAA-EMC#3119)
  Update gsi_enkf hash and gsi_ver (NOAA-EMC#3207)
  Remove cpus-per-task from APRUN_OCNANALECEN on WCOSS2 (NOAA-EMC#3212)
  Remove 5WAVH from AWIPS GRIB2 parm files (NOAA-EMC#3146)
  Remove multi-grid wave support (NOAA-EMC#3188)
  Add echgres as a dependency for earc (NOAA-EMC#3202)
  Ensure OCNRES and ICERES have 3 digits in the archive script (NOAA-EMC#3199)
  Set runtime shell requirements within Jenkins Pipeline (NOAA-EMC#3171)
  Add efcs and epos to ufs_hybatm xml (NOAA-EMC#3192) (NOAA-EMC#3193)
  Fix GEFS and SFS compile flags in build_all.sh (NOAA-EMC#3197)
  Remove early-cycle EnKF forecast (NOAA-EMC#3185)
  Fix mod_icec bug in atmos_prod (NOAA-EMC#3167)
  Create compute build option (NOAA-EMC#3186)
  Support global-workflow using Rocky 8 on CSPs (NOAA-EMC#2998)
  Change orog gravity wave drag scheme for grid sizes less than 10km (NOAA-EMC#3175)
  Switch snow DA to use 2DVar for deterministic and ensemble mean (NOAA-EMC#3163)
  Update compression options for GEFS history files (NOAA-EMC#3184)
  Update compression options for high res history files (NOAA-EMC#3178)
  Turn DO_TEST_MODE off (NOAA-EMC#3177)
  Hotfix for gdas_arch div/0 (NOAA-EMC#3169)
  Allow building of the ufs-weather-model, WW3 pre/post execs for GFS, GEFS, SFS in the same clone of global-workflow (NOAA-EMC#3098)
  Switch Aerosol DA to use JCB and Jedi class (NOAA-EMC#3125)
  Update ufs-weather-model to 2024-12-06 commit  (NOAA-EMC#3145)
  Enable traditional threading as an option (NOAA-EMC#3149)
  Update HPC_ACCOUNT on Hercules to fv3-cpu (NOAA-EMC#3164)
  Turn C96C48_ufs_hybatmDA and C48mx500_3DVarAOWCDA into a regression test (NOAA-EMC#3120)
  Update GSI analysis jobs to use COMIN/COMOUT (NOAA-EMC#3092)
  Update HPC Tier Definitions (NOAA-EMC#3138)
  Add marine hybrid envar (NOAA-EMC#3041)
  Archive the experiment directory along with git status/diff output (NOAA-EMC#3105)
  Use stochastic restart patterns on rerun (NOAA-EMC#3077)
  Point Jenkinsfile back to CI/ (NOAA-EMC#3139)
  Fix wave restart for cold start and add ic version file (NOAA-EMC#3112)
  Allow users to override the default account at setup time (NOAA-EMC#3127)
  Refactor gridded wave post (NOAA-EMC#3014)
  Update docs related to NOAA CSPs (NOAA-EMC#3043)
  Allow APP to differ between RUNs (NOAA-EMC#2943)
  Run one executable for soca2cice (instead of two) (NOAA-EMC#3118)
  Speed up GSI analysis jobs in CI testing (NOAA-EMC#3115)
  Make aerosol output frequency variable (NOAA-EMC#2982)
  Add new stations to GFS BUFR sounding products (NOAA-EMC#3107)
  JCB-based obs+bias staging, Jedi class updates, and marine B-matrix refactoring (NOAA-EMC#2992)
  Enable tapering of atm ens perts at the model top (NOAA-EMC#3097)
  Update JGDAS ENKF POST  job  (NOAA-EMC#3090)
  SFS Runs at C96mx100  (NOAA-EMC#2960)
  Move machine-based options from config.base to host files (NOAA-EMC#3053)
  Remove RUNDIRS before running CI cases to cover re-run events (NOAA-EMC#3076)
  CI GitHub pipeline (hotfix) update for fetching repo name (NOAA-EMC#3084)
  Update JGDAS ENKF ECEN job  (NOAA-EMC#3050)
  Update snow obs processing job (NOAA-EMC#3055)
  Update to action workflow pipeline in default repo for development  (NOAA-EMC#3062)
  Update to action workflow pipeline in default repo for development (NOAA-EMC#3061)
  Update workflow pipeline (NOAA-EMC#3060)
  PW CI pipeline update5 ready for review so it can be merged and tested (NOAA-EMC#3059)
  Revert "GitHub CI Pipeline update for debugging forked PR support" (NOAA-EMC#3057)
  GitHub CI Pipeline update for debugging forked PR support (NOAA-EMC#3056)
  Add more ocean variables for post-processing in GEFS (NOAA-EMC#2995)
  Auto provisioning of PW clusters from GitHub CI added (NOAA-EMC#3051)
  Fix the name of the TC tracker filenames in archive.py (NOAA-EMC#3030)
  Make wxflow links static instead of from link_workflow (NOAA-EMC#3008)
  Update global jdas enkf diag job with COMIN/COMOUT for COM prefix (NOAA-EMC#2959)
  Add run and finalize methods to marine LETKF task (NOAA-EMC#2944)
  Fix wave restarts and GEFS FHOUT/FHMAX (NOAA-EMC#3009)
  Disabling hyper-threading (NOAA-EMC#2965)
  GitHub Actions Pipeline Updates for Self-Hosted Runners on PW (NOAA-EMC#3018)
  CI jekninsfile update hotfix (NOAA-EMC#3038)
  Update gdas.cd (NOAA-EMC#2978)
  Add ability to add tag to pslots with generate_workflows (NOAA-EMC#3036)
  CI update to shell environment with HOMEgfs to HOME_GFS for systems that need the path (NOAA-EMC#3013)
  Quick updated to Jenkins (health check) launch script (NOAA-EMC#3033)
  Document the generate_workflows.sh script (NOAA-EMC#3028)
  Replace gfs_cyc with an interval (NOAA-EMC#2928)
  Hotfix: Fix generate_workflows.sh optional build flags (NOAA-EMC#3024)
  Add a tool to run multiple YAML cases locally (NOAA-EMC#3004)
  Hotfix: Correctly set overwrite option when specified (NOAA-EMC#3021)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI-Hera-Passed **Bot use only** CI testing on Hera for this PR has completed successfully CI-Hercules-Passed **Bot use only** CI testing on Hercules for this PR has completed successfully
Projects
None yet
Development

Successfully merging this pull request may close these issues.

metatasks enkfgdas_fcst and enkfgdas_epmn no longer created for C96C48_ufs_hybatmDA
5 participants