From 22a7008642b024e8b1c51741740a11313ca4bfaa Mon Sep 17 00:00:00 2001 From: Kate Friedman Date: Wed, 18 Dec 2024 13:48:26 -0500 Subject: [PATCH] Remake the package for WAFS removal from GFS (#3176) Remake the release branch for the WAFS removal from the GFS due to implementation order change. It includes changes previously made in the original release branch: - updated release notes - remove all WAFS scripts and settings - include resource update for enkfgdas_update job Refs #2591 --- Externals.cfg | 7 - docs/Release_Notes.md | 121 +++++-- ecf/defs/gfs_v16_3.def | 308 ------------------ .../analysis/create/jenkfgdas_update.ecf | 4 +- .../grib2_wafs/jgfs_atmos_wafs_blending.ecf | 53 --- .../jgfs_atmos_wafs_blending_0p25.ecf | 54 --- .../grib2_wafs/jgfs_atmos_wafs_grib2.ecf | 66 ---- .../grib2_wafs/jgfs_atmos_wafs_grib2_0p25.ecf | 66 ---- .../post_processing/grib_wafs/.gitignore | 2 - .../grib_wafs/jgfs_atmos_wafs_master.ecf | 65 ---- .../post_processing/jgfs_atmos_wafs_gcip.ecf | 70 ---- ecf/setup_ecf_links.sh | 5 - env/HERA.env | 4 - env/ORION.env | 4 - env/WCOSS2.env | 7 +- fix/product/wafs_admin_msg | 5 - jobs/rocoto/arch.sh | 2 +- jobs/rocoto/wafs.sh | 55 ---- jobs/rocoto/wafsblending.sh | 40 --- jobs/rocoto/wafsblending0p25.sh | 40 --- jobs/rocoto/wafsgcip.sh | 47 --- jobs/rocoto/wafsgrib2.sh | 47 --- jobs/rocoto/wafsgrib20p25.sh | 47 --- modulefiles/module_base.wcoss_dell_p3 | 4 - parm/config/config.base.emc.dyn | 1 - parm/config/config.base.nco.static | 1 - parm/config/config.resources.emc.dyn | 53 +-- parm/config/config.resources.nco.static | 53 +-- parm/config/config.wafs | 14 - parm/config/config.wafsblending | 14 - parm/config/config.wafsblending0p25 | 16 - parm/config/config.wafsgcip | 17 - parm/config/config.wafsgrib2 | 17 - parm/config/config.wafsgrib20p25 | 16 - parm/product/transfer_gfs_1.list | 2 - parm/product/transfer_gfs_7.list | 2 - sorc/build_all.sh | 16 - sorc/build_gfs_wafs.sh | 22 -- sorc/checkout.sh | 31 +- sorc/fv3gfs_build.cfg | 1 - sorc/link_fv3gfs.sh | 41 --- sorc/partial_build.sh | 1 - ush/ecflow/prod.yml | 34 -- ush/hpssarch_gen.sh | 12 +- ush/rocoto/setup_workflow.py | 178 ---------- ush/rocoto/setup_workflow_fcstonly.py | 175 +--------- versions/run.ver | 4 +- 47 files changed, 109 insertions(+), 1735 deletions(-) delete mode 100755 ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending.ecf delete mode 100755 ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending_0p25.ecf delete mode 100755 ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2.ecf delete mode 100755 ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2_0p25.ecf delete mode 100644 ecf/scripts/gfs/atmos/post_processing/grib_wafs/.gitignore delete mode 100755 ecf/scripts/gfs/atmos/post_processing/grib_wafs/jgfs_atmos_wafs_master.ecf delete mode 100755 ecf/scripts/gfs/atmos/post_processing/jgfs_atmos_wafs_gcip.ecf delete mode 100755 fix/product/wafs_admin_msg delete mode 100755 jobs/rocoto/wafs.sh delete mode 100755 jobs/rocoto/wafsblending.sh delete mode 100755 jobs/rocoto/wafsblending0p25.sh delete mode 100755 jobs/rocoto/wafsgcip.sh delete mode 100755 jobs/rocoto/wafsgrib2.sh delete mode 100755 jobs/rocoto/wafsgrib20p25.sh delete mode 100755 parm/config/config.wafs delete mode 100755 parm/config/config.wafsblending delete mode 100755 parm/config/config.wafsblending0p25 delete mode 100755 parm/config/config.wafsgcip delete mode 100755 parm/config/config.wafsgrib2 delete mode 100755 parm/config/config.wafsgrib20p25 delete mode 100755 sorc/build_gfs_wafs.sh diff --git a/Externals.cfg b/Externals.cfg index 560fa6fb77..44e02093a7 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -42,12 +42,5 @@ repo_url = https://github.com/NOAA-EMC/EMC_verif-global.git protocol = git required = True -[EMC_gfs_wafs] -tag = gfs_wafs.v6.3.3 -local_path = sorc/gfs_wafs.fd -repo_url = https://github.com/NOAA-EMC/EMC_gfs_wafs.git -protocol = git -required = False - [externals_description] schema_version = 1.0.0 diff --git a/docs/Release_Notes.md b/docs/Release_Notes.md index 01fd2c7210..5ca908e4f7 100644 --- a/docs/Release_Notes.md +++ b/docs/Release_Notes.md @@ -1,21 +1,21 @@ -GFS V16.3.20 RELEASE NOTES +GFS V16.3.21 RELEASE NOTES ------- PRELUDE ------- -Annual CO2 fix file update for 2025. Additionally, the GSI is updated to turn on assimilation of PlanetiQ GPS Radio Occultation (GPS-RO) data. +The WAFS is separated from the GFS and is now its own package in production as WAFS.v7.0.0. IMPLEMENTATION INSTRUCTIONS --------------------------- -The NOAA VLab and the NOAA-EMC and NCAR organization spaces on GitHub are used to manage the GFS code. The SPA(s) handling the GFS implementation need to have permissions to clone VLab Gerrit repositories and the private NCAR UPP_GTG repository. All NOAA-EMC organization repositories are publicly readable and do not require access permissions. Please proceed with the following steps to install the package on WCOSS2: +The NOAA VLab and the NOAA-EMC and NCAR organization spaces on GitHub are used to manage the GFS code. The SPA(s) handling the GFS implementation need to have permissions to clone VLab Gerrit repositories. All NOAA-EMC organization repositories on GitHub are publicly readable and do not require access permissions. Please proceed with the following steps to install the package on WCOSS2: ```bash cd $PACKAGEROOT -mkdir gfs.v16.3.20 -cd gfs.v16.3.20 -git clone -b EMC-v16.3.20 https://github.com/NOAA-EMC/global-workflow.git . +mkdir gfs.v16.3.21 +cd gfs.v16.3.21 +git clone -b EMC-v16.3.21 https://github.com/NOAA-EMC/global-workflow.git . cd sorc ./checkout.sh -o ``` @@ -29,7 +29,6 @@ The checkout script extracts the following GFS components: | GSI | gfsda.v16.3.20 | Andrew.Collard@noaa.gov | | UFS_UTILS | ops-gfsv16.3.0 | George.Gayno@noaa.gov | | POST | upp_v8.3.0 | Wen.Meng@noaa.gov | -| WAFS | gfs_wafs.v6.3.3 | Yali.Mao@noaa.gov | To build all the GFS components, execute: ```bash @@ -50,78 +49,146 @@ cd ../ecf VERSION FILE CHANGES -------------------- -* `versions/run.ver` - change `version=v16.3.20` and `gfs_ver=v16.3.20` +* `versions/run.ver` - change `version=v16.3.21` and `gfs_ver=v16.3.21` SORC CHANGES ------------ -* No changes from GFS v16.3.19 +The WAFS is no longer a submodule that is checked out within the GFS package. +The `sorc/checkout.sh` and `Externals.cfg` checkout script no longer clone WAFS. +The `sorc/build_all.sh` script no longer builds the WAFS code. +The `sorc/build_gfs_wafs.sh` build script is deleted. +The `sorc/link_fv3gfs.sh` script no longer links/copies WAFS files/execs. JOBS CHANGES ------------ -* No changes from GFS v16.3.19 +All WAFS jobs are removed from the GFS ecFlow definition file, rocoto mesh, and `ush/ecflow/prod.yml`. +Jobs removed: +* `jgfs_atmos_wafs_gcip` +* `jgfs_atmos_wafs_fFFF` +* `jgfs_atmos_wafs_grib2` +* `jgfs_atmos_wafs_grib2_0p25` +* `jgfs_atmos_wafs_blending_0p25` PARM/CONFIG CHANGES ------------------- -* No changes from GFS v16.3.19 +The following config files are deleted: +* `parm/config/config.wafs` +* `parm/config/config.wafsblending` +* `parm/config/config.wafsblending0p25` +* `parm/config/config.wafsgcip` +* `parm/config/config.wafsgrib2` +* `parm/config/config.wafsgrib20p25` + +* The `WAFSF` flag is removed from `parm/config/config.base.emc.dyn` and `parm/config/config.base.nco.static`. +* All WAFS jobs are removed from platform env files, `parm/config/config.resources.emc.dyn`, and `parm/config/config.resources.nco.static`. +* The WAFS jobs are removed from experiment setup. + +WAFS output is removed from the following transfer list files: +* `parm/product/transfer_gfs_1.list` +* `parm/product/transfer_gfs_7.list` SCRIPT CHANGES -------------- -* No changes from GFS v16.3.19 +The following WAFS rocoto scripts are removed: +* `jobs/rocoto/wafs.sh` +* `jobs/rocoto/wafsblending.sh` +* `jobs/rocoto/wafsblending0p25.sh` +* `jobs/rocoto/wafsgcip.sh` +* `jobs/rocoto/wafsgrib2.sh` +* `jobs/rocoto/wafsgrib20p25.sh` + +The following ecf scripts are removed from the GFS: +* `ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending.ecf` +* `ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending_0p25.ecf` +* `ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2.ecf` +* `ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2_0p25.ecf` +* `ecf/scripts/gfs/atmos/post_processing/grib_wafs/jgfs_atmos_wafs_master.ecf` +* `ecf/scripts/gfs/atmos/post_processing/jgfs_atmos_wafs_gcip.ecf` + +The WAFS is removed from `ecf/setup_ecf_links.sh`. + +The WAFS output is removed from archival (`ush/hpssarch_gen.sh`). FIX CHANGES ----------- -* New 2025 CO2 fix files are added. -* Updated `global_convinfo.txt` file in GSI package +* `fix/product/wafs_admin_msg` - removed MODULE CHANGES -------------- -* No changes from GFS v16.3.19 - -CHANGES TO FILE SIZES ---------------------- - -* No changes of existing file sizes from GFS v16.3.19 +Modules needed by WAFS are removed from `modulefiles/module_base.wcoss_dell_p3`. + +CHANGES TO FILE AND FILE SIZES +------------------------------ + +The following files will no longer be produced within the GFS COM: +* `gfs.tCCz.awf_0p25.fFFF.grib2` - renamed to `wafs.tCCz.awf.0p25.fFFF.grib2` in WAFSv7 +* `gfs.tCCz.awf_grb45fFF.grib2` - renamed to `wafs.tCCz.awf_grid45.fFFF.grib2` in WAFSv7 +* `wmo/grib2.tCCz.awf_grbfFF.45` - renamed to `wmo/grib2.wafs.tCCz.awf_grid45.fFFF` in WAFSv7 +* `gfs.tCCz.control.wafsblending_0p25` +* `gfs.tCCz.wafs.0p25.anl` - renamed to `wafs.tCCz.0p25.anl.grib2` in WAFSv7 +* `gfs.tCCz.wafs.0p25.anl.idx` +* `gfs.tCCz.wafs_0p25.fFFF.grib2` +* `gfs.tCCz.wafs_0p25.fFFF.grib2.idx` +* `gfs.tCCz.wafs_0p25_unblended.fFFF.grib2` - renamed to `WAFS_0p25_unblended_YYYYMMDDHHfFFF.grib2` in WAFSv7 +* `gfs.tCCz.wafs_0p25_unblended.fFFF.grib2.idx` +* `gfs.tCCz.wafs.grb2fFFF` - renamed to `wafs.tCCz.master.fFFF.grib2` in WAFSv7 +* `gfs.tCCz.wafs.grb2fFFF.idx` +* `gfs.tCCz.wafs_grb45fFF.grib2` - renamed to `gfs.tCCz.wafs_grb45fFFF.grib2` in WAFSv7 +* `gfs.tCCz.wafs_grb45fFF.grib2.idx` +* `wmo/grib2.tCCz.wafs_grbfFF.45` - renamed to `wmo/grib2.wafs.tCCz.awf_grid45.fFFF` in WAFSv7 +* `wmo/xtrn.wfsgfs0006.gfs_atmos_wafs_f30_00` +* `gfs.tCCz.gcip.fFF.grib2` - renamed to `wafs.tCCz.gcip.fFFF.grib2` in WAFSv7 +* `WAFS_0p25_blended_YYYYMMDDHHf[06-48].grib2` - renamed to `WAFS_0p25_blended_ YYYYMMDDHHfFFF.grib2` in WAFSv7 + +The following files will no longer be produced within the GFS COM +and are being retired from the WAFS package: +* `gfs.tCCz.wafs_icao.grb2fFFF` +* `gfs.tCCz.wafs_icao.grb2fFFF.idx` +* `wafs.tCCz.master.fFFF.grib2` where FFF is from 001 to 005 ENVIRONMENT AND RESOURCE CHANGES -------------------------------- -* Memory increases to some jobs to resolve Cgroup memory warnings +* Updates to improve the enkfgdas_update job runtime stability. + * Run with `--cpu-bind core` instead of `--cpu-bind depth` + * Change tasks to 280 and threads to 16 PRE-IMPLEMENTATION TESTING REQUIREMENTS --------------------------------------- * Which production jobs should be tested as part of this implementation? - * Analysis + * None * Does this change require a 30-day evaluation? * No DISSEMINATION INFORMATION ------------------------- -* No changes from GFS v16.3.19 +* No changes from GFS v16.3.20 HPSS ARCHIVE ------------ -* No changes from GFS v16.3.19 +* No changes from GFS v16.3.20 JOB DEPENDENCIES AND FLOW DIAGRAM --------------------------------- -* No changes from GFS v16.3.19 +* Removal of WAFS jobs. DOCUMENTATION ------------- -* No changes from GFS v16.3.19 +* No changes from GFS v16.3.20 PREPARED BY ----------- Kate.Friedman@noaa.gov -Andrew.Collard@noaa.gov +Yali.Mao@noaa.gov +Rahul.Mahajan@noaa.gov diff --git a/ecf/defs/gfs_v16_3.def b/ecf/defs/gfs_v16_3.def index 883259b9e9..41d60be88a 100644 --- a/ecf/defs/gfs_v16_3.def +++ b/ecf/defs/gfs_v16_3.def @@ -1511,83 +1511,6 @@ suite gfs_v16_3 edit HR '384' endfamily family post_processing - task jgfs_atmos_wafs_gcip - trigger ../post/jgfs_atmos_post_f003 == complete - time 04:40 - family grib_wafs - task jgfs_atmos_wafs_f000 - trigger ../../post/jgfs_atmos_post_f000 == complete and ../../post/jgfs_atmos_post_f120 == complete and ../grib2_wafs/jgfs_atmos_wafs_grib2 == complete - edit FCSTHR '00' - task jgfs_atmos_wafs_f006 - trigger ../../post/jgfs_atmos_post_f006 == complete and ./jgfs_atmos_wafs_f000 == complete - edit FCSTHR '06' - task jgfs_atmos_wafs_f012 - trigger ../../post/jgfs_atmos_post_f012 == complete and ./jgfs_atmos_wafs_f006 == complete - edit FCSTHR '12' - task jgfs_atmos_wafs_f018 - trigger ../../post/jgfs_atmos_post_f018 == complete and ./jgfs_atmos_wafs_f012 == complete - edit FCSTHR '18' - task jgfs_atmos_wafs_f024 - trigger ../../post/jgfs_atmos_post_f024 == complete and ./jgfs_atmos_wafs_f018 == complete - edit FCSTHR '24' - task jgfs_atmos_wafs_f030 - trigger ../../post/jgfs_atmos_post_f030 == complete and ./jgfs_atmos_wafs_f024 == complete - edit FCSTHR '30' - task jgfs_atmos_wafs_f036 - trigger ../../post/jgfs_atmos_post_f036 == complete and ./jgfs_atmos_wafs_f030 == complete - edit FCSTHR '36' - task jgfs_atmos_wafs_f042 - trigger ../../post/jgfs_atmos_post_f042 == complete and ./jgfs_atmos_wafs_f036 == complete - edit FCSTHR '42' - task jgfs_atmos_wafs_f048 - trigger ../../post/jgfs_atmos_post_f048 == complete and ./jgfs_atmos_wafs_f042 == complete - edit FCSTHR '48' - task jgfs_atmos_wafs_f054 - trigger ../../post/jgfs_atmos_post_f054 == complete and ./jgfs_atmos_wafs_f048 == complete - edit FCSTHR '54' - task jgfs_atmos_wafs_f060 - trigger ../../post/jgfs_atmos_post_f060 == complete and ./jgfs_atmos_wafs_f054 == complete - edit FCSTHR '60' - task jgfs_atmos_wafs_f066 - trigger ../../post/jgfs_atmos_post_f066 == complete and ./jgfs_atmos_wafs_f060 == complete - edit FCSTHR '66' - task jgfs_atmos_wafs_f072 - trigger ../../post/jgfs_atmos_post_f072 == complete and ./jgfs_atmos_wafs_f066 == complete - edit FCSTHR '72' - task jgfs_atmos_wafs_f078 - trigger ../../post/jgfs_atmos_post_f078 == complete and ./jgfs_atmos_wafs_f072 == complete - edit FCSTHR '78' - task jgfs_atmos_wafs_f084 - trigger ../../post/jgfs_atmos_post_f084 == complete and ./jgfs_atmos_wafs_f078 == complete - edit FCSTHR '84' - task jgfs_atmos_wafs_f090 - trigger ../../post/jgfs_atmos_post_f090 == complete and ./jgfs_atmos_wafs_f084 == complete - edit FCSTHR '90' - task jgfs_atmos_wafs_f096 - trigger ../../post/jgfs_atmos_post_f096 == complete and ./jgfs_atmos_wafs_f090 == complete - edit FCSTHR '96' - task jgfs_atmos_wafs_f102 - trigger ../../post/jgfs_atmos_post_f102 == complete and ./jgfs_atmos_wafs_f096 == complete - edit FCSTHR '102' - task jgfs_atmos_wafs_f108 - trigger ../../post/jgfs_atmos_post_f108 == complete and ./jgfs_atmos_wafs_f102 == complete - edit FCSTHR '108' - task jgfs_atmos_wafs_f114 - trigger ../../post/jgfs_atmos_post_f114 == complete and ./jgfs_atmos_wafs_f108 == complete - edit FCSTHR '114' - task jgfs_atmos_wafs_f120 - trigger ../../post/jgfs_atmos_post_f120 == complete and ./jgfs_atmos_wafs_f114 == complete - edit FCSTHR '120' - endfamily - family grib2_wafs - task jgfs_atmos_wafs_grib2 - trigger ../../post/jgfs_atmos_post_f000 == complete - task jgfs_atmos_wafs_grib2_0p25 - trigger ../../post/jgfs_atmos_post_f036 == complete - task jgfs_atmos_wafs_blending_0p25 - trigger ./jgfs_atmos_wafs_grib2_0p25 == complete - time 04:30 - endfamily family bufr_sounding task jgfs_atmos_postsnd trigger ../../post/jgfs_atmos_post_manager:release_post000 @@ -4138,83 +4061,6 @@ suite gfs_v16_3 edit HR '384' endfamily family post_processing - task jgfs_atmos_wafs_gcip - trigger ../post/jgfs_atmos_post_f003 == complete - time 10:40 - family grib_wafs - task jgfs_atmos_wafs_f000 - trigger ../../post/jgfs_atmos_post_f000 == complete and ../../post/jgfs_atmos_post_f120 == complete and ../grib2_wafs/jgfs_atmos_wafs_grib2 == complete - edit FCSTHR '00' - task jgfs_atmos_wafs_f006 - trigger ../../post/jgfs_atmos_post_f006 == complete and ./jgfs_atmos_wafs_f000 == complete - edit FCSTHR '06' - task jgfs_atmos_wafs_f012 - trigger ../../post/jgfs_atmos_post_f012 == complete and ./jgfs_atmos_wafs_f006 == complete - edit FCSTHR '12' - task jgfs_atmos_wafs_f018 - trigger ../../post/jgfs_atmos_post_f018 == complete and ./jgfs_atmos_wafs_f012 == complete - edit FCSTHR '18' - task jgfs_atmos_wafs_f024 - trigger ../../post/jgfs_atmos_post_f024 == complete and ./jgfs_atmos_wafs_f018 == complete - edit FCSTHR '24' - task jgfs_atmos_wafs_f030 - trigger ../../post/jgfs_atmos_post_f030 == complete and ./jgfs_atmos_wafs_f024 == complete - edit FCSTHR '30' - task jgfs_atmos_wafs_f036 - trigger ../../post/jgfs_atmos_post_f036 == complete and ./jgfs_atmos_wafs_f030 == complete - edit FCSTHR '36' - task jgfs_atmos_wafs_f042 - trigger ../../post/jgfs_atmos_post_f042 == complete and ./jgfs_atmos_wafs_f036 == complete - edit FCSTHR '42' - task jgfs_atmos_wafs_f048 - trigger ../../post/jgfs_atmos_post_f048 == complete and ./jgfs_atmos_wafs_f042 == complete - edit FCSTHR '48' - task jgfs_atmos_wafs_f054 - trigger ../../post/jgfs_atmos_post_f054 == complete and ./jgfs_atmos_wafs_f048 == complete - edit FCSTHR '54' - task jgfs_atmos_wafs_f060 - trigger ../../post/jgfs_atmos_post_f060 == complete and ./jgfs_atmos_wafs_f054 == complete - edit FCSTHR '60' - task jgfs_atmos_wafs_f066 - trigger ../../post/jgfs_atmos_post_f066 == complete and ./jgfs_atmos_wafs_f060 == complete - edit FCSTHR '66' - task jgfs_atmos_wafs_f072 - trigger ../../post/jgfs_atmos_post_f072 == complete and ./jgfs_atmos_wafs_f066 == complete - edit FCSTHR '72' - task jgfs_atmos_wafs_f078 - trigger ../../post/jgfs_atmos_post_f078 == complete and ./jgfs_atmos_wafs_f072 == complete - edit FCSTHR '78' - task jgfs_atmos_wafs_f084 - trigger ../../post/jgfs_atmos_post_f084 == complete and ./jgfs_atmos_wafs_f078 == complete - edit FCSTHR '84' - task jgfs_atmos_wafs_f090 - trigger ../../post/jgfs_atmos_post_f090 == complete and ./jgfs_atmos_wafs_f084 == complete - edit FCSTHR '90' - task jgfs_atmos_wafs_f096 - trigger ../../post/jgfs_atmos_post_f096 == complete and ./jgfs_atmos_wafs_f090 == complete - edit FCSTHR '96' - task jgfs_atmos_wafs_f102 - trigger ../../post/jgfs_atmos_post_f102 == complete and ./jgfs_atmos_wafs_f096 == complete - edit FCSTHR '102' - task jgfs_atmos_wafs_f108 - trigger ../../post/jgfs_atmos_post_f108 == complete and ./jgfs_atmos_wafs_f102 == complete - edit FCSTHR '108' - task jgfs_atmos_wafs_f114 - trigger ../../post/jgfs_atmos_post_f114 == complete and ./jgfs_atmos_wafs_f108 == complete - edit FCSTHR '114' - task jgfs_atmos_wafs_f120 - trigger ../../post/jgfs_atmos_post_f120 == complete and ./jgfs_atmos_wafs_f114 == complete - edit FCSTHR '120' - endfamily - family grib2_wafs - task jgfs_atmos_wafs_grib2 - trigger ../../post/jgfs_atmos_post_f000 == complete - task jgfs_atmos_wafs_grib2_0p25 - trigger ../../post/jgfs_atmos_post_f036 == complete - task jgfs_atmos_wafs_blending_0p25 - trigger ./jgfs_atmos_wafs_grib2_0p25 == complete - time 10:30 - endfamily family bufr_sounding task jgfs_atmos_postsnd trigger ../../post/jgfs_atmos_post_manager:release_post000 @@ -6764,83 +6610,6 @@ suite gfs_v16_3 edit HR '384' endfamily family post_processing - task jgfs_atmos_wafs_gcip - trigger ../post/jgfs_atmos_post_f003 == complete - time 16:40 - family grib_wafs - task jgfs_atmos_wafs_f000 - trigger ../../post/jgfs_atmos_post_f000 == complete and ../../post/jgfs_atmos_post_f120 == complete and ../grib2_wafs/jgfs_atmos_wafs_grib2 == complete - edit FCSTHR '00' - task jgfs_atmos_wafs_f006 - trigger ../../post/jgfs_atmos_post_f006 == complete and ./jgfs_atmos_wafs_f000 == complete - edit FCSTHR '06' - task jgfs_atmos_wafs_f012 - trigger ../../post/jgfs_atmos_post_f012 == complete and ./jgfs_atmos_wafs_f006 == complete - edit FCSTHR '12' - task jgfs_atmos_wafs_f018 - trigger ../../post/jgfs_atmos_post_f018 == complete and ./jgfs_atmos_wafs_f012 == complete - edit FCSTHR '18' - task jgfs_atmos_wafs_f024 - trigger ../../post/jgfs_atmos_post_f024 == complete and ./jgfs_atmos_wafs_f018 == complete - edit FCSTHR '24' - task jgfs_atmos_wafs_f030 - trigger ../../post/jgfs_atmos_post_f030 == complete and ./jgfs_atmos_wafs_f024 == complete - edit FCSTHR '30' - task jgfs_atmos_wafs_f036 - trigger ../../post/jgfs_atmos_post_f036 == complete and ./jgfs_atmos_wafs_f030 == complete - edit FCSTHR '36' - task jgfs_atmos_wafs_f042 - trigger ../../post/jgfs_atmos_post_f042 == complete and ./jgfs_atmos_wafs_f036 == complete - edit FCSTHR '42' - task jgfs_atmos_wafs_f048 - trigger ../../post/jgfs_atmos_post_f048 == complete and ./jgfs_atmos_wafs_f042 == complete - edit FCSTHR '48' - task jgfs_atmos_wafs_f054 - trigger ../../post/jgfs_atmos_post_f054 == complete and ./jgfs_atmos_wafs_f048 == complete - edit FCSTHR '54' - task jgfs_atmos_wafs_f060 - trigger ../../post/jgfs_atmos_post_f060 == complete and ./jgfs_atmos_wafs_f054 == complete - edit FCSTHR '60' - task jgfs_atmos_wafs_f066 - trigger ../../post/jgfs_atmos_post_f066 == complete and ./jgfs_atmos_wafs_f060 == complete - edit FCSTHR '66' - task jgfs_atmos_wafs_f072 - trigger ../../post/jgfs_atmos_post_f072 == complete and ./jgfs_atmos_wafs_f066 == complete - edit FCSTHR '72' - task jgfs_atmos_wafs_f078 - trigger ../../post/jgfs_atmos_post_f078 == complete and ./jgfs_atmos_wafs_f072 == complete - edit FCSTHR '78' - task jgfs_atmos_wafs_f084 - trigger ../../post/jgfs_atmos_post_f084 == complete and ./jgfs_atmos_wafs_f078 == complete - edit FCSTHR '84' - task jgfs_atmos_wafs_f090 - trigger ../../post/jgfs_atmos_post_f090 == complete and ./jgfs_atmos_wafs_f084 == complete - edit FCSTHR '90' - task jgfs_atmos_wafs_f096 - trigger ../../post/jgfs_atmos_post_f096 == complete and ./jgfs_atmos_wafs_f090 == complete - edit FCSTHR '96' - task jgfs_atmos_wafs_f102 - trigger ../../post/jgfs_atmos_post_f102 == complete and ./jgfs_atmos_wafs_f096 == complete - edit FCSTHR '102' - task jgfs_atmos_wafs_f108 - trigger ../../post/jgfs_atmos_post_f108 == complete and ./jgfs_atmos_wafs_f102 == complete - edit FCSTHR '108' - task jgfs_atmos_wafs_f114 - trigger ../../post/jgfs_atmos_post_f114 == complete and ./jgfs_atmos_wafs_f108 == complete - edit FCSTHR '114' - task jgfs_atmos_wafs_f120 - trigger ../../post/jgfs_atmos_post_f120 == complete and ./jgfs_atmos_wafs_f114 == complete - edit FCSTHR '120' - endfamily - family grib2_wafs - task jgfs_atmos_wafs_grib2 - trigger ../../post/jgfs_atmos_post_f000 == complete - task jgfs_atmos_wafs_grib2_0p25 - trigger ../../post/jgfs_atmos_post_f036 == complete - task jgfs_atmos_wafs_blending_0p25 - trigger ./jgfs_atmos_wafs_grib2_0p25 == complete - time 16:30 - endfamily family bufr_sounding task jgfs_atmos_postsnd trigger ../../post/jgfs_atmos_post_manager:release_post000 @@ -9392,83 +9161,6 @@ suite gfs_v16_3 edit HR '384' endfamily family post_processing - task jgfs_atmos_wafs_gcip - trigger ../post/jgfs_atmos_post_f003 == complete - time 22:40 - family grib_wafs - task jgfs_atmos_wafs_f000 - trigger ../../post/jgfs_atmos_post_f000 == complete and ../../post/jgfs_atmos_post_f120 == complete and ../grib2_wafs/jgfs_atmos_wafs_grib2 == complete - edit FCSTHR '00' - task jgfs_atmos_wafs_f006 - trigger ../../post/jgfs_atmos_post_f006 == complete and ./jgfs_atmos_wafs_f000 == complete - edit FCSTHR '06' - task jgfs_atmos_wafs_f012 - trigger ../../post/jgfs_atmos_post_f012 == complete and ./jgfs_atmos_wafs_f006 == complete - edit FCSTHR '12' - task jgfs_atmos_wafs_f018 - trigger ../../post/jgfs_atmos_post_f018 == complete and ./jgfs_atmos_wafs_f012 == complete - edit FCSTHR '18' - task jgfs_atmos_wafs_f024 - trigger ../../post/jgfs_atmos_post_f024 == complete and ./jgfs_atmos_wafs_f018 == complete - edit FCSTHR '24' - task jgfs_atmos_wafs_f030 - trigger ../../post/jgfs_atmos_post_f030 == complete and ./jgfs_atmos_wafs_f024 == complete - edit FCSTHR '30' - task jgfs_atmos_wafs_f036 - trigger ../../post/jgfs_atmos_post_f036 == complete and ./jgfs_atmos_wafs_f030 == complete - edit FCSTHR '36' - task jgfs_atmos_wafs_f042 - trigger ../../post/jgfs_atmos_post_f042 == complete and ./jgfs_atmos_wafs_f036 == complete - edit FCSTHR '42' - task jgfs_atmos_wafs_f048 - trigger ../../post/jgfs_atmos_post_f048 == complete and ./jgfs_atmos_wafs_f042 == complete - edit FCSTHR '48' - task jgfs_atmos_wafs_f054 - trigger ../../post/jgfs_atmos_post_f054 == complete and ./jgfs_atmos_wafs_f048 == complete - edit FCSTHR '54' - task jgfs_atmos_wafs_f060 - trigger ../../post/jgfs_atmos_post_f060 == complete and ./jgfs_atmos_wafs_f054 == complete - edit FCSTHR '60' - task jgfs_atmos_wafs_f066 - trigger ../../post/jgfs_atmos_post_f066 == complete and ./jgfs_atmos_wafs_f060 == complete - edit FCSTHR '66' - task jgfs_atmos_wafs_f072 - trigger ../../post/jgfs_atmos_post_f072 == complete and ./jgfs_atmos_wafs_f066 == complete - edit FCSTHR '72' - task jgfs_atmos_wafs_f078 - trigger ../../post/jgfs_atmos_post_f078 == complete and ./jgfs_atmos_wafs_f072 == complete - edit FCSTHR '78' - task jgfs_atmos_wafs_f084 - trigger ../../post/jgfs_atmos_post_f084 == complete and ./jgfs_atmos_wafs_f078 == complete - edit FCSTHR '84' - task jgfs_atmos_wafs_f090 - trigger ../../post/jgfs_atmos_post_f090 == complete and ./jgfs_atmos_wafs_f084 == complete - edit FCSTHR '90' - task jgfs_atmos_wafs_f096 - trigger ../../post/jgfs_atmos_post_f096 == complete and ./jgfs_atmos_wafs_f090 == complete - edit FCSTHR '96' - task jgfs_atmos_wafs_f102 - trigger ../../post/jgfs_atmos_post_f102 == complete and ./jgfs_atmos_wafs_f096 == complete - edit FCSTHR '102' - task jgfs_atmos_wafs_f108 - trigger ../../post/jgfs_atmos_post_f108 == complete and ./jgfs_atmos_wafs_f102 == complete - edit FCSTHR '108' - task jgfs_atmos_wafs_f114 - trigger ../../post/jgfs_atmos_post_f114 == complete and ./jgfs_atmos_wafs_f108 == complete - edit FCSTHR '114' - task jgfs_atmos_wafs_f120 - trigger ../../post/jgfs_atmos_post_f120 == complete and ./jgfs_atmos_wafs_f114 == complete - edit FCSTHR '120' - endfamily - family grib2_wafs - task jgfs_atmos_wafs_grib2 - trigger ../../post/jgfs_atmos_post_f000 == complete - task jgfs_atmos_wafs_grib2_0p25 - trigger ../../post/jgfs_atmos_post_f036 == complete - task jgfs_atmos_wafs_blending_0p25 - trigger ./jgfs_atmos_wafs_grib2_0p25 == complete - time 22:30 - endfamily family bufr_sounding task jgfs_atmos_postsnd trigger ../../post/jgfs_atmos_post_manager:release_post000 diff --git a/ecf/scripts/enkfgdas/analysis/create/jenkfgdas_update.ecf b/ecf/scripts/enkfgdas/analysis/create/jenkfgdas_update.ecf index 9ea639607a..37c443768e 100755 --- a/ecf/scripts/enkfgdas/analysis/create/jenkfgdas_update.ecf +++ b/ecf/scripts/enkfgdas/analysis/create/jenkfgdas_update.ecf @@ -3,8 +3,8 @@ #PBS -j oe #PBS -q %QUEUE% #PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=00:40:00 -#PBS -l select=35:mpiprocs=9:ompthreads=14:ncpus=126 +#PBS -l walltime=00:35:00 +#PBS -l select=35:mpiprocs=8:ompthreads=16:ncpus=128 #PBS -l place=vscatter:exclhost #PBS -l debug=true diff --git a/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending.ecf b/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending.ecf deleted file mode 100755 index 72e69281b1..0000000000 --- a/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending.ecf +++ /dev/null @@ -1,53 +0,0 @@ -#PBS -S /bin/bash -#PBS -N %RUN%_atmos_wafs_blending_%CYC% -#PBS -j oe -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=00:30:00 -#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=1GB -#PBS -l place=vscatter -#PBS -l debug=true - -model=gfs -%include -%include - -set -x - -export NET=%NET:gfs% -export RUN=%RUN% -export CDUMP=%RUN% - -############################################################ -# Load modules -############################################################ -module load PrgEnv-intel/${PrgEnv_intel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load libjpeg/${libjpeg_ver} -module load grib_util/${grib_util_ver} -module load util_shared/${util_shared_ver} - -module list - -############################################################# -# WCOSS environment settings -############################################################# -export cyc=%CYC% -export cycle=t%CYC%z - -############################################################ -# CALL executable job script here -############################################################ -${HOMEgfs}/jobs/JGFS_ATMOS_WAFS_BLENDING - -if [ $? -ne 0 ]; then - ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" - ecflow_client --abort - exit -fi - -%include -%manual - -%end diff --git a/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending_0p25.ecf b/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending_0p25.ecf deleted file mode 100755 index 3a59be2c3f..0000000000 --- a/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_blending_0p25.ecf +++ /dev/null @@ -1,54 +0,0 @@ -#PBS -S /bin/bash -#PBS -N %RUN%_atmos_wafs_blending_0p25_%CYC% -#PBS -j oe -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=00:40:00 -#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=15GB -#PBS -l place=vscatter -#PBS -l debug=true - -model=gfs -%include -%include - -set -x - -export NET=%NET:gfs% -export RUN=%RUN% -export CDUMP=%RUN% - -############################################################ -# Load modules -############################################################ -module load PrgEnv-intel/${PrgEnv_intel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load libjpeg/${libjpeg_ver} -module load grib_util/${grib_util_ver} -module load util_shared/${util_shared_ver} - -module list - -############################################################# -# WCOSS environment settings -############################################################# -export cyc=%CYC% -export cycle=t%CYC%z -export ICAO2023=yes - -############################################################ -# CALL executable job script here -############################################################ -${HOMEgfs}/jobs/JGFS_ATMOS_WAFS_BLENDING_0P25 - -if [ $? -ne 0 ]; then - ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" - ecflow_client --abort - exit -fi - -%include -%manual - -%end diff --git a/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2.ecf b/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2.ecf deleted file mode 100755 index 267e4313b3..0000000000 --- a/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2.ecf +++ /dev/null @@ -1,66 +0,0 @@ -#PBS -S /bin/bash -#PBS -N %RUN%_atmos_wafs_grib2_%CYC% -#PBS -j oe -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=00:30:00 -#PBS -l select=1:mpiprocs=18:ompthreads=1:ncpus=18:mem=80GB -#PBS -l place=vscatter -#PBS -l debug=true - -model=gfs -%include -%include - -set -x - -export NET=%NET:gfs% -export RUN=%RUN% -export CDUMP=%RUN% - -############################################################ -# Load modules -############################################################ -module load PrgEnv-intel/${PrgEnv_intel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-pals/${cray_pals_ver} -module load libjpeg/${libjpeg_ver} -module load grib_util/${grib_util_ver} -module load wgrib2/${wgrib2_ver} -module load cfp/${cfp_ver} - -module list - -############################################################# -# WCOSS environment settings -############################################################# -export cyc=%CYC% -export cycle=t%CYC%z -export USE_CFP=YES -export ICAO2023=yes -############################################################ -# CALL executable job script here -############################################################ -${HOMEgfs}/jobs/JGFS_ATMOS_WAFS_GRIB2 -if [ $? -ne 0 ]; then - ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" - ecflow_client --abort - exit -fi - -%include -%manual -###################################################################### -# Purpose: To execute the job that prepares initial condition for -# gdas. -###################################################################### - -###################################################################### -# Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### - -# include manual page below -%end diff --git a/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2_0p25.ecf b/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2_0p25.ecf deleted file mode 100755 index 442742bc61..0000000000 --- a/ecf/scripts/gfs/atmos/post_processing/grib2_wafs/jgfs_atmos_wafs_grib2_0p25.ecf +++ /dev/null @@ -1,66 +0,0 @@ -#PBS -S /bin/bash -#PBS -N %RUN%_atmos_wafs_grib2_0p25_%CYC% -#PBS -j oe -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=00:30:00 -#PBS -l select=1:mpiprocs=39:ompthreads=1:ncpus=39:mem=200GB -#PBS -l place=vscatter -#PBS -l debug=true - -model=gfs -%include -%include - -set -x - -export NET=%NET:gfs% -export RUN=%RUN% -export CDUMP=%RUN% - -############################################################ -# Load modules -############################################################ -module load PrgEnv-intel/${PrgEnv_intel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-pals/${cray_pals_ver} -module load libjpeg/${libjpeg_ver} -module load grib_util/${grib_util_ver} -module load wgrib2/${wgrib2_ver} -module load cfp/${cfp_ver} - -module list - -############################################################# -# WCOSS environment settings -############################################################# -export cyc=%CYC% -export cycle=t%CYC%z -export USE_CFP=YES -export ICAO2023=yes -############################################################ -# CALL executable job script here -############################################################ -${HOMEgfs}/jobs/JGFS_ATMOS_WAFS_GRIB2_0P25 -if [ $? -ne 0 ]; then - ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" - ecflow_client --abort - exit -fi - -%include -%manual -###################################################################### -# Purpose: To execute the job that prepares initial condition for -# gdas. -###################################################################### - -###################################################################### -# Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### - -# include manual page below -%end diff --git a/ecf/scripts/gfs/atmos/post_processing/grib_wafs/.gitignore b/ecf/scripts/gfs/atmos/post_processing/grib_wafs/.gitignore deleted file mode 100644 index f4afcf92ad..0000000000 --- a/ecf/scripts/gfs/atmos/post_processing/grib_wafs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -# Ignore these -jgfs_atmos_wafs_f*.ecf diff --git a/ecf/scripts/gfs/atmos/post_processing/grib_wafs/jgfs_atmos_wafs_master.ecf b/ecf/scripts/gfs/atmos/post_processing/grib_wafs/jgfs_atmos_wafs_master.ecf deleted file mode 100755 index 7e56ea1b9e..0000000000 --- a/ecf/scripts/gfs/atmos/post_processing/grib_wafs/jgfs_atmos_wafs_master.ecf +++ /dev/null @@ -1,65 +0,0 @@ -#PBS -S /bin/bash -#PBS -N %RUN%_atmos_wafs_%FCSTHR%_%CYC% -#PBS -j oe -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=00:05:00 -#PBS -l select=1:mpiprocs=1:ompthreads=1:ncpus=1:mem=1GB -#PBS -l place=vscatter -#PBS -l debug=true - -model=gfs -%include -%include - -set -x - -export NET=%NET:gfs% -export RUN=%RUN% -export CDUMP=%RUN% - -export fcsthrs=%FCSTHR% - -############################################################ -# Load modules -############################################################ -module load PrgEnv-intel/${PrgEnv_intel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load libjpeg/${libjpeg_ver} -module load grib_util/$grib_util_ver -module load wgrib2/${wgrib2_ver} - -module list - -############################################################# -# WCOSS environment settings -############################################################# -export cyc=%CYC% -export cycle=t%CYC%z - -############################################################ -# CALL executable job script here -############################################################ -${HOMEgfs}/jobs/JGFS_ATMOS_WAFS -if [ $? -ne 0 ]; then - ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" - ecflow_client --abort - exit -fi - -%include -%manual -###################################################################### -# Purpose: To execute the job that prepares initial condition for -# gdas. -###################################################################### - -###################################################################### -# Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### - -# include manual page below -%end diff --git a/ecf/scripts/gfs/atmos/post_processing/jgfs_atmos_wafs_gcip.ecf b/ecf/scripts/gfs/atmos/post_processing/jgfs_atmos_wafs_gcip.ecf deleted file mode 100755 index dceb8d72bd..0000000000 --- a/ecf/scripts/gfs/atmos/post_processing/jgfs_atmos_wafs_gcip.ecf +++ /dev/null @@ -1,70 +0,0 @@ -#PBS -S /bin/bash -#PBS -N %RUN%_atmos_wafs_gcip_%CYC% -#PBS -j oe -#PBS -q %QUEUE% -#PBS -A %PROJ%-%PROJENVIR% -#PBS -l walltime=00:30:00 -#PBS -l select=1:mpiprocs=2:ompthreads=1:ncpus=2:mem=50GB -#PBS -l place=vscatter -#PBS -l debug=true - -model=gfs -%include -%include - -set -x - -export NET=%NET:gfs% -export RUN=%RUN% -export CDUMP=%RUN% - -############################################################ -# Load modules -############################################################ -module load PrgEnv-intel/${PrgEnv_intel_ver} -module load craype/${craype_ver} -module load intel/${intel_ver} -module load cray-mpich/${cray_mpich_ver} -module load cray-pals/${cray_pals_ver} -module load cfp/${cfp_ver} -module load libjpeg/${libjpeg_ver} -module load grib_util/${grib_util_ver} -module load bufr_dump/${bufr_dump_ver} -module load wgrib2/${wgrib2_ver} - -module list - -############################################################# -# WCOSS environment settings -############################################################# -export cyc=%CYC% -export cycle=t%CYC%z -export USE_CFP=YES -export ICAO2023=yes - -############################################################ -# CALL executable job script here -############################################################ -${HOMEgfs}/jobs/JGFS_ATMOS_WAFS_GCIP - -if [ $? -ne 0 ]; then - ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***" - ecflow_client --abort - exit -fi - -%include -%manual -###################################################################### -# Purpose: To execute the job that prepares initial condition for -# gdas. -###################################################################### - -###################################################################### -# Job specific troubleshooting instructions: -# see generic troubleshoot manual page -# -###################################################################### - -# include manual page below -%end diff --git a/ecf/setup_ecf_links.sh b/ecf/setup_ecf_links.sh index b0dce50cc5..f672f5893d 100755 --- a/ecf/setup_ecf_links.sh +++ b/ecf/setup_ecf_links.sh @@ -52,8 +52,3 @@ echo "Linking gfs/atmos/post_processing/awips_g2 ..." fhrs=($(seq 0 3 84) $(seq 90 6 240)) link_master_to_fhr "jgfs_atmos_awips_g2" "$fhrs" -# GFS atmos wafs files -cd $ECF_DIR/scripts/gfs/atmos/post_processing/grib_wafs -echo "Linking gfs/atmos/post_processing/grib_wafs ..." -fhrs=($(seq 0 6 120)) -link_master_to_fhr "jgfs_atmos_wafs" "$fhrs" diff --git a/env/HERA.env b/env/HERA.env index 634392bb59..79144cf8ec 100755 --- a/env/HERA.env +++ b/env/HERA.env @@ -230,8 +230,4 @@ elif [ $step = "gempak" ]; then echo "WARNING: $step is not enabled on $machine!" -elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then - - export USE_CFP=${USE_CFP:-"YES"} - fi diff --git a/env/ORION.env b/env/ORION.env index ed274c8d3f..f98ec91aa4 100755 --- a/env/ORION.env +++ b/env/ORION.env @@ -231,8 +231,4 @@ elif [ $step = "gempak" ]; then echo "WARNING: $step is not enabled on $machine!" -elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then - - export USE_CFP=${USE_CFP:-"YES"} - fi diff --git a/env/WCOSS2.env b/env/WCOSS2.env index 86d211bcd3..0b0706b5e0 100755 --- a/env/WCOSS2.env +++ b/env/WCOSS2.env @@ -91,12 +91,13 @@ elif [ $step = "eobs" ]; then elif [ $step = "eupd" ]; then export OMP_PLACES=cores + export OMP_PROC_BIND=true export OMP_STACKSIZE=2G export MPICH_COLL_OPT_OFF=1 export FI_OFI_RXM_SAR_LIMIT=3145728 export NTHREADS_ENKF=$nth_eupd - export APRUN_ENKF="$launcher -n ${npe_enkf:-${npe_eupd:-$PBS_NP}} -ppn $npe_node_eupd --cpu-bind depth --depth $NTHREADS_ENKF" + export APRUN_ENKF="$launcher -n ${npe_enkf:-${npe_eupd:-$PBS_NP}} -ppn $npe_node_eupd --cpu-bind core --depth $NTHREADS_ENKF" export CFP_MP=${CFP_MP:-"NO"} export USE_CFP=${USE_CFP:-"YES"} @@ -203,8 +204,4 @@ elif [ $step = "waveawipsbulls" ]; then unset PERL5LIB -elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then - - export USE_CFP=${USE_CFP:-"YES"} - fi diff --git a/fix/product/wafs_admin_msg b/fix/product/wafs_admin_msg deleted file mode 100755 index 5df92dba3b..0000000000 --- a/fix/product/wafs_admin_msg +++ /dev/null @@ -1,5 +0,0 @@ -WAFC WASHINGTON ADVISES ALL USERS OF TRIAL CB CLOUD, ICING AND TURBULENCE WAFS FORECASTS IN GRIB2 FORMAT THAT PRODUCTION PROBLEMS HAVE TRIGGERED CONTINGENCY MEASURES AND THE ISSUANCE OF NON-HARMONIZED FORECASTS. - -STANDARD WAFS FORECAST PARAMETERS IN GRIB2 FORMAT (WIND, TEMPERATURE, HUMIDITY, TROP HEIGHT, MAX WIND, MAX WIND HEIGHT) ARE UNAFFECTED, AND ARE AVAILABLE AS NORMAL. - -WAFC WASHINGTON APOLOGIZES FOR ANY INCONVENIENCE CAUSED DUE TO THIS ISSUE. diff --git a/jobs/rocoto/arch.sh b/jobs/rocoto/arch.sh index a0fd6a6031..e97f01c46d 100755 --- a/jobs/rocoto/arch.sh +++ b/jobs/rocoto/arch.sh @@ -219,7 +219,7 @@ if [ $CDUMP = "gfs" ]; then fi #for downstream products - if [ $DO_BUFRSND = "YES" -o $WAFSF = "YES" ]; then + if [ $DO_BUFRSND = "YES" ]; then htar -P -cvf $ATARDIR/$CDATE/gfs_downstream.tar `cat $ARCH_LIST/gfs_downstream.txt` status=$? if [ $status -ne 0 -a $CDATE -ge $firstday ]; then diff --git a/jobs/rocoto/wafs.sh b/jobs/rocoto/wafs.sh deleted file mode 100755 index f3de9a141c..0000000000 --- a/jobs/rocoto/wafs.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/ksh -x - -############################################################### -echo -echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ===============" -. $HOMEgfs/ush/load_fv3gfs_modules.sh -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### -echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ===============" -configs="base wafs" -for config in $configs; do - . $EXPDIR/config.${config} - status=$? - [[ $status -ne 0 ]] && exit $status -done - -############################################################### - -export pid=${pid:-$$} -export jobid=${job}.${pid} -export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafs.$jobid" -[[ -d $DATAROOT ]] && rm -rf $DATAROOT -mkdir -p $DATAROOT - -export DATA="${DATAROOT}/$job" - -############################################################### -echo -echo "=============== START TO RUN WAFS ===============" - -# Loop through fcsthrs -hr=0 -while [ $hr -le 120 ]; do - - if [ $hr -le 100 ]; then - export fcsthrs="$(printf "%02d" $(( 10#$hr )) )" - else - export fcsthrs=$hr - fi - - # Execute the JJOB - $HOMEgfs/jobs/JGFS_ATMOS_WAFS - status=$? - [[ $status -ne 0 ]] && exit $status - - hr=`expr $hr + 6` - -done - -############################################################### -# Force Exit out cleanly -if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi -exit 0 diff --git a/jobs/rocoto/wafsblending.sh b/jobs/rocoto/wafsblending.sh deleted file mode 100755 index 3817c3b4e4..0000000000 --- a/jobs/rocoto/wafsblending.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/ksh -x - -############################################################### -echo -echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ===============" -. $HOMEgfs/ush/load_fv3gfs_modules.sh -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### -echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ===============" -configs="base wafsblending" -for config in $configs; do - . $EXPDIR/config.${config} - status=$? - [[ $status -ne 0 ]] && exit $status -done - -############################################################### - -export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsblending" -[[ -d $DATAROOT ]] && rm -rf $DATAROOT -mkdir -p $DATAROOT - -export pid=${pid:-$$} -export jobid=${job}.${pid} -export DATA="${DATAROOT}/$job" - -############################################################### -echo -echo "=============== START TO RUN WAFSBLENDING ===============" -# Execute the JJOB -$HOMEgfs/jobs/JGFS_ATMOS_WAFS_BLENDING -status=$? -exit $status - -############################################################### -# Force Exit out cleanly -if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi -exit 0 diff --git a/jobs/rocoto/wafsblending0p25.sh b/jobs/rocoto/wafsblending0p25.sh deleted file mode 100755 index a0125f851c..0000000000 --- a/jobs/rocoto/wafsblending0p25.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/ksh -x - -############################################################### -echo -echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ===============" -. $HOMEgfs/ush/load_fv3gfs_modules.sh -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### -echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ===============" -configs="base wafsblending0p25" -for config in $configs; do - . $EXPDIR/config.${config} - status=$? - [[ $status -ne 0 ]] && exit $status -done - -############################################################### - -export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsblending0p25" -[[ -d $DATAROOT ]] && rm -rf $DATAROOT -mkdir -p $DATAROOT - -export pid=${pid:-$$} -export jobid=${job}.${pid} -export DATA="${DATAROOT}/$job" - -############################################################### -echo -echo "=============== START TO RUN WAFSBLENDING0P25 ===============" -# Execute the JJOB -$HOMEgfs/jobs/JGFS_ATMOS_WAFS_BLENDING_0P25 -status=$? -exit $status - -############################################################### -# Force Exit out cleanly -if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi -exit 0 diff --git a/jobs/rocoto/wafsgcip.sh b/jobs/rocoto/wafsgcip.sh deleted file mode 100755 index d3a689e50b..0000000000 --- a/jobs/rocoto/wafsgcip.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/ksh -x - -############################################################### -echo -echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ===============" -. $HOMEgfs/ush/load_fv3gfs_modules.sh -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### -echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ===============" -configs="base wafsgcip" -for config in $configs; do - . $EXPDIR/config.${config} - status=$? - [[ $status -ne 0 ]] && exit $status -done - -########################################## -# Source machine runtime environment -########################################## -. $HOMEgfs/env/${machine}.env wafsgcip -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### - -export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsgcip" -[[ -d $DATAROOT ]] && rm -rf $DATAROOT -mkdir -p $DATAROOT - -export pid=${pid:-$$} -export jobid=${job}.${pid} -export DATA="${DATAROOT}/$job" - -############################################################### -echo -echo "=============== START TO RUN WAFSGCIP ===============" -# Execute the JJOB -$HOMEgfs/jobs/JGFS_ATMOS_WAFS_GCIP -status=$? -exit $status - -############################################################### -# Force Exit out cleanly -if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi -exit 0 diff --git a/jobs/rocoto/wafsgrib2.sh b/jobs/rocoto/wafsgrib2.sh deleted file mode 100755 index 4b143e8bd8..0000000000 --- a/jobs/rocoto/wafsgrib2.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/ksh -x - -############################################################### -echo -echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ===============" -. $HOMEgfs/ush/load_fv3gfs_modules.sh -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### -echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ===============" -configs="base wafsgrib2" -for config in $configs; do - . $EXPDIR/config.${config} - status=$? - [[ $status -ne 0 ]] && exit $status -done - -########################################## -# Source machine runtime environment -########################################## -. $HOMEgfs/env/${machine}.env wafsgrib2 -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### - -export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsgrib2" -[[ -d $DATAROOT ]] && rm -rf $DATAROOT -mkdir -p $DATAROOT - -export pid=${pid:-$$} -export jobid=${job}.${pid} -export DATA="${DATAROOT}/$job" - -############################################################### -echo -echo "=============== START TO RUN WAFSGRIB2 ===============" -# Execute the JJOB -$HOMEgfs/jobs/JGFS_ATMOS_WAFS_GRIB2 -status=$? -exit $status - -############################################################### -# Force Exit out cleanly -if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi -exit 0 diff --git a/jobs/rocoto/wafsgrib20p25.sh b/jobs/rocoto/wafsgrib20p25.sh deleted file mode 100755 index 70f04802cd..0000000000 --- a/jobs/rocoto/wafsgrib20p25.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/ksh -x - -############################################################### -echo -echo "=============== START TO SOURCE FV3GFS WORKFLOW MODULES ===============" -. $HOMEgfs/ush/load_fv3gfs_modules.sh -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### -echo "=============== BEGIN TO SOURCE RELEVANT CONFIGS ===============" -configs="base wafsgrib20p25" -for config in $configs; do - . $EXPDIR/config.${config} - status=$? - [[ $status -ne 0 ]] && exit $status -done - -########################################## -# Source machine runtime environment -########################################## -. $HOMEgfs/env/${machine}.env wafsgrib20p25 -status=$? -[[ $status -ne 0 ]] && exit $status - -############################################################### - -export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsgrib20p25" -[[ -d $DATAROOT ]] && rm -rf $DATAROOT -mkdir -p $DATAROOT - -export pid=${pid:-$$} -export jobid=${job}.${pid} -export DATA="${DATAROOT}/$job" - -############################################################### -echo -echo "=============== START TO RUN WAFSGRIB20p25 ===============" -# Execute the JJOB -$HOMEgfs/jobs/JGFS_ATMOS_WAFS_GRIB2_0P25 -status=$? -exit $status - -############################################################### -# Force Exit out cleanly -if [ ${KEEPDATA:-"NO"} = "NO" ] ; then rm -rf $DATAROOT ; fi -exit 0 diff --git a/modulefiles/module_base.wcoss_dell_p3 b/modulefiles/module_base.wcoss_dell_p3 index 0bd8bd436b..24f4bb91f9 100755 --- a/modulefiles/module_base.wcoss_dell_p3 +++ b/modulefiles/module_base.wcoss_dell_p3 @@ -29,10 +29,6 @@ module load gempak/7.3.3 module load g2tmpl/1.6.0 module load util_shared/1.3.0 -# Load for WAFS -module load bufr_dumplist/2.0.0 -module load dumpjb/5.1.0 - # python module load python/3.6.3 diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn index 00ac698807..70cb4110d9 100755 --- a/parm/config/config.base.emc.dyn +++ b/parm/config/config.base.emc.dyn @@ -51,7 +51,6 @@ export BASE_GIT="@BASE_GIT@" export DO_BUFRSND="YES" # BUFR sounding products export DO_GEMPAK="NO" # GEMPAK products export DO_AWIPS="NO" # AWIPS products -export WAFSF="NO" # WAFS products export DO_WDQMS="NO" # Generate WDQMS products # NO for retrospective parallel; YES for real-time parallel diff --git a/parm/config/config.base.nco.static b/parm/config/config.base.nco.static index b0b06e6cd9..70bab2c500 100755 --- a/parm/config/config.base.nco.static +++ b/parm/config/config.base.nco.static @@ -49,7 +49,6 @@ export BASE_GIT="/gpfs/dell2/emc/modeling/noscrub/emc.glopara/git" export DO_BUFRSND="YES" # BUFR sounding products export DO_GEMPAK="YES" # GEMPAK products export DO_AWIPS="YES" # AWIPS products -export WAFSF="YES" # WAFS products export DO_WDQMS="YES" # Generate WDQMS products # NO for retrospective parallel; YES for real-time parallel diff --git a/parm/config/config.resources.emc.dyn b/parm/config/config.resources.emc.dyn index 8746bb4dc8..0bdf50dab0 100755 --- a/parm/config/config.resources.emc.dyn +++ b/parm/config/config.resources.emc.dyn @@ -13,7 +13,6 @@ if [ $# -ne 1 ]; then echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt" echo "wavegempak waveawipsbulls waveawipsgridded" echo "postsnd awips gempak" - echo "wafs wafsgrib2 wafsblending wafsgrib20p25 wafsblending0p25 wafsgcip" exit 1 fi @@ -223,54 +222,6 @@ elif [ $step = "post" ]; then if [[ "$npe_node_post" -gt "$npe_node_max" ]]; then export npe_node_post=$npe_node_max ; fi if [[ "$npe_node_post_gfs" -gt "$npe_node_max" ]]; then export npe_node_post_gfs=$npe_node_max ; fi -elif [ $step = "wafs" ]; then - - export wtime_wafs="00:30:00" - export npe_wafs=1 - export npe_node_wafs=$npe_wafs - export nth_wafs=1 - export memory_wafs="1GB" - -elif [ $step = "wafsgcip" ]; then - - export wtime_wafsgcip="00:30:00" - export npe_wafsgcip=2 - export npe_node_wafsgcip=$npe_wafsgcip - export nth_wafsgcip=1 - export memory_wafsgcip="50GB" - -elif [ $step = "wafsgrib2" ]; then - - export wtime_wafsgrib2="00:30:00" - export npe_wafsgrib2=18 - export npe_node_wafsgrib2=$npe_wafsgrib2 - export nth_wafsgrib2=1 - export memory_wafsgrib2="80GB" - -elif [ $step = "wafsblending" ]; then - - export wtime_wafsblending="00:30:00" - export npe_wafsblending=1 - export npe_node_wafsblending=$npe_wafsblending - export nth_wafsblending=1 - export memory_wafsblending="1GB" - -elif [ $step = "wafsgrib20p25" ]; then - - export wtime_wafsgrib20p25="00:30:00" - export npe_wafsgrib20p25=11 - export npe_node_wafsgrib20p25=$npe_wafsgrib20p25 - export nth_wafsgrib20p25=1 - export memory_wafsgrib20p25="80GB" - -elif [ $step = "wafsblending0p25" ]; then - - export wtime_wafsblending0p25="00:40:00" - export npe_wafsblending0p25=1 - export npe_node_wafsblending0p25=$npe_wafsblending0p25 - export nth_wafsblending0p25=1 - export memory_wafsblending0p25="15GB" - elif [ $step = "vrfy" ]; then export wtime_vrfy="03:00:00" @@ -358,8 +309,8 @@ elif [ $step = "eupd" ]; then export npe_eupd=960 export nth_eupd=7 elif [[ "$machine" = "WCOSS2" ]]; then - export npe_eupd=315 - export nth_eupd=14 + export npe_eupd=280 + export nth_eupd=16 fi elif [ $CASE = "C384" ]; then export npe_eupd=270 diff --git a/parm/config/config.resources.nco.static b/parm/config/config.resources.nco.static index e1e65357cb..12bebbdd76 100755 --- a/parm/config/config.resources.nco.static +++ b/parm/config/config.resources.nco.static @@ -13,7 +13,6 @@ if [ $# -ne 1 ]; then echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt" echo "wavegempak waveawipsbulls waveawipsgridded" echo "postsnd awips gempak" - echo "wafs wafsgrib2 wafsblending wafsgrib20p25 wafsblending0p25 wafsgcip" exit 1 fi @@ -183,54 +182,6 @@ elif [ $step = "post" ]; then export npe_node_post_gfs=$npe_post export npe_node_dwn=$npe_node_max -elif [ $step = "wafs" ]; then - - export wtime_wafs="00:30:00" - export npe_wafs=1 - export npe_node_wafs=$npe_wafs - export nth_wafs=1 - export memory_wafs="1GB" - -elif [ $step = "wafsgcip" ]; then - - export wtime_wafsgcip="00:30:00" - export npe_wafsgcip=2 - export npe_node_wafsgcip=$npe_wafsgcip - export nth_wafsgcip=1 - export memory_wafsgcip="50GB" - -elif [ $step = "wafsgrib2" ]; then - - export wtime_wafsgrib2="00:30:00" - export npe_wafsgrib2=18 - export npe_node_wafsgrib2=$npe_wafsgrib2 - export nth_wafsgrib2=1 - export memory_wafsgrib2="80GB" - -elif [ $step = "wafsblending" ]; then - - export wtime_wafsblending="00:30:00" - export npe_wafsblending=1 - export npe_node_wafsblending=$npe_wafsblending - export nth_wafsblending=1 - export memory_wafsblending="1GB" - -elif [ $step = "wafsgrib20p25" ]; then - - export wtime_wafsgrib20p25="00:30:00" - export npe_wafsgrib20p25=11 - export npe_node_wafsgrib20p25=$npe_wafsgrib20p25 - export nth_wafsgrib20p25=1 - export memory_wafsgrib20p25="80GB" - -elif [ $step = "wafsblending0p25" ]; then - - export wtime_wafsblending0p25="00:40:00" - export npe_wafsblending0p25=1 - export npe_node_wafsblending0p25=$npe_wafsblending0p25 - export nth_wafsblending0p25=1 - export memory_wafsblending0p25="15GB" - elif [ $step = "vrfy" ]; then export wtime_vrfy="03:00:00" @@ -287,8 +238,8 @@ elif [ $step = "ediag" ]; then elif [ $step = "eupd" ]; then export wtime_eupd="00:40:00" - export npe_eupd=315 - export nth_eupd=14 + export npe_eupd=280 + export nth_eupd=16 export npe_node_eupd=$(echo "$npe_node_max / $nth_eupd" | bc) elif [ $step = "ecen" ]; then diff --git a/parm/config/config.wafs b/parm/config/config.wafs deleted file mode 100755 index 8bf5577030..0000000000 --- a/parm/config/config.wafs +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/ksh -x - -########## config.wafs ########## - -echo "BEGIN: config.wafs" - -# Get task specific resources -. $EXPDIR/config.resources wafs - -export COMIN=$COMINatmos -export COMOUT=$COMOUTatmos -export SENDCOM="YES" - -echo "END: config.wafs" diff --git a/parm/config/config.wafsblending b/parm/config/config.wafsblending deleted file mode 100755 index dfd7d1715e..0000000000 --- a/parm/config/config.wafsblending +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/ksh -x - -########## config.wafsblending ########## - -echo "BEGIN: config.wafsblending" - -# Get task specific resources -. $EXPDIR/config.resources wafsblending - -export COMIN=$COMINatmos -export COMOUT=$COMOUTatmos -export SENDCOM="YES" - -echo "END: config.wafsblending" diff --git a/parm/config/config.wafsblending0p25 b/parm/config/config.wafsblending0p25 deleted file mode 100755 index f1338d6793..0000000000 --- a/parm/config/config.wafsblending0p25 +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/ksh -x - -########## config.wafsblending0p25 ########## - -echo "BEGIN: config.wafsblending0p25" - -# Get task specific resources -. $EXPDIR/config.resources wafsblending0p25 - -export COMIN=$COMINatmos -export COMOUT=$COMOUTatmos -export SENDCOM="YES" - -export ICAO2023=no - -echo "END: config.wafsblending0p25" diff --git a/parm/config/config.wafsgcip b/parm/config/config.wafsgcip deleted file mode 100755 index bbf2357b44..0000000000 --- a/parm/config/config.wafsgcip +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/ksh -x - -########## config.wafsgcip ########## - -echo "BEGIN: config.wafsgcip" - -# Get task specific resources -. $EXPDIR/config.resources wafsgcip - -export COMIN=$COMINatmos -export COMINgfs=$COMIN -export COMOUT=$COMOUTatmos -export SENDCOM="YES" - -export ICAO2023=no - -echo "END: config.wafsgcip" diff --git a/parm/config/config.wafsgrib2 b/parm/config/config.wafsgrib2 deleted file mode 100755 index d70515dae0..0000000000 --- a/parm/config/config.wafsgrib2 +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/ksh -x - -########## config.wafsgrib2 ########## -# Post specific - -echo "BEGIN: config.wafsgrib2" - -# Get task specific resources -. $EXPDIR/config.resources wafsgrib2 - -export COMIN=$COMINatmos -export COMOUT=$COMOUTatmos -export SENDCOM="YES" - -export ICAO2023=no - -echo "END: config.wafsgrib2" diff --git a/parm/config/config.wafsgrib20p25 b/parm/config/config.wafsgrib20p25 deleted file mode 100755 index 399c31efe6..0000000000 --- a/parm/config/config.wafsgrib20p25 +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/ksh -x - -########## config.wafsgrib20p25 ########## - -echo "BEGIN: config.wafsgrib20p25" - -# Get task specific resources -. $EXPDIR/config.resources wafsgrib20p25 - -export COMIN=$COMINatmos -export COMOUT=$COMOUTatmos -export SENDCOM="YES" - -export ICAO2023=no - -echo "END: config.wafsgrib20p25" diff --git a/parm/product/transfer_gfs_1.list b/parm/product/transfer_gfs_1.list index 5067ae9d98..2fda891ca3 100644 --- a/parm/product/transfer_gfs_1.list +++ b/parm/product/transfer_gfs_1.list @@ -30,7 +30,6 @@ com/gfs/_ENVIR_/gfs._PDY_/ - /gfs.t??z.*flx* - /gfs.t??z.*atmfc* - /gfs_grb211.t??z.pgrsfnf* -- /wafsgfs??.t??z.grisfnf* - /gfs.t??z.master.* - /gfs*sfcf* @@ -43,7 +42,6 @@ com/gfs/_ENVIR_/gfs._PDYm1_/ - /gfs.t??z.*flx* - /gfs.t??z.*atmfc* - /gfs_grb211.t??z.pgrsfnf* -- /wafsgfs??.t??z.grisfnf* - /gfs.t??z.master.* - /gfs*sfcf* diff --git a/parm/product/transfer_gfs_7.list b/parm/product/transfer_gfs_7.list index 8ef7fbfa22..b21756140c 100644 --- a/parm/product/transfer_gfs_7.list +++ b/parm/product/transfer_gfs_7.list @@ -27,7 +27,6 @@ com/gfs/_ENVIR_/gfs._PDY_/ + /gfs.t??z.flxgrbf* + /gfs.t??z.flxgrbif* + /gfs.t??z.goessimpgrb2.1p00.f* -+ /wafsgfs??.t??z.grib* #+ /gfs.t??z.flxf*.nemsio - * B 444000 @@ -37,7 +36,6 @@ com/gfs/_ENVIR_/gfs._PDYm1_/ + /gfs.t??z.flxgrbf* + /gfs.t??z.flxgrbif* + /gfs.t??z.goessimpgrb2.1p00.f* -+ /wafsgfs??.t??z.grib* #+ /gfs.t??z.flxf*.nemsio - * B 444000 diff --git a/sorc/build_all.sh b/sorc/build_all.sh index 1c3ba8d00a..c43a3b340e 100755 --- a/sorc/build_all.sh +++ b/sorc/build_all.sh @@ -125,22 +125,6 @@ fi ((err+=$rc)) } -#------------------------------------ -# build gfs_wafs - optional checkout -#------------------------------------ -if [ -d gfs_wafs.fd ]; then - $Build_gfs_wafs && { - echo " .... Building gfs_wafs .... " - ./build_gfs_wafs.sh > $logs_dir/build_gfs_wafs.log 2>&1 - rc=$? - if [[ $rc -ne 0 ]] ; then - echo "Fatal error in building gfs_wafs." - echo "The log file is in $logs_dir/build_gfs_wafs.log" - fi - ((err+=$rc)) -} -fi - #------------------------------------ # build gaussian_sfcanl #------------------------------------ diff --git a/sorc/build_gfs_wafs.sh b/sorc/build_gfs_wafs.sh deleted file mode 100755 index ceff4eae67..0000000000 --- a/sorc/build_gfs_wafs.sh +++ /dev/null @@ -1,22 +0,0 @@ -#! /usr/bin/env bash -set -eux - -source ./machine-setup.sh > /dev/null 2>&1 -cwd=`pwd` - -USE_PREINST_LIBS=${USE_PREINST_LIBS:-"true"} -if [ $USE_PREINST_LIBS = true ]; then - export MOD_PATH=/scratch3/NCEPDEV/nwprod/lib/modulefiles -else - export MOD_PATH=${cwd}/lib/modulefiles -fi - -# Check final exec folder exists -if [ ! -d "../exec" ]; then - mkdir ../exec -fi - -cd gfs_wafs.fd/sorc -sh build_wafs.sh - -exit diff --git a/sorc/checkout.sh b/sorc/checkout.sh index aeda9691ba..5b27c59960 100755 --- a/sorc/checkout.sh +++ b/sorc/checkout.sh @@ -5,10 +5,7 @@ while getopts "o" option; do case $option in o) - echo "Received -o flag for optional checkout of GTG, will check out GTG with EMC_post" - checkout_gtg="YES" - checkout_wafs="YES" - gtg_git_args="--recursive" + echo "Received -o flag for operations" ;; :) echo "option -$OPTARG needs an argument" @@ -64,36 +61,12 @@ fi echo EMC_post checkout ... if [[ ! -d gfs_post.fd ]] ; then rm -f ${topdir}/checkout-gfs_post.log - git clone ${gtg_git_args:-} --branch upp_v8.3.0 https://github.com/NOAA-EMC/UPP.git gfs_post.fd >> ${topdir}/checkout-gfs_post.log 2>&1 - ################################################################################ - # checkout_gtg - ## yes: The gtg code at NCAR private repository is available for ops. GFS only. - # Only approved persons/groups have access permission. - ## no: No need to check out gtg code for general GFS users. - ################################################################################ - checkout_gtg=${checkout_gtg:-"NO"} - if [[ ${checkout_gtg} == "YES" ]] ; then - cd gfs_post.fd - cp sorc/post_gtg.fd/*f90 sorc/ncep_post.fd/. - cp sorc/post_gtg.fd/gtg.config.gfs parm/gtg.config.gfs - fi + git clone --branch upp_v8.3.0 https://github.com/NOAA-EMC/UPP.git gfs_post.fd >> ${topdir}/checkout-gfs_post.log 2>&1 cd ${topdir} else echo 'Skip. Directory gfs_post.fd already exists.' fi -checkout_wafs=${checkout_wafs:-"NO"} -if [[ ${checkout_wafs} == "YES" ]] ; then - echo EMC_gfs_wafs checkout ... - if [[ ! -d gfs_wafs.fd ]] ; then - rm -f ${topdir}/checkout-gfs_wafs.log - git clone --recursive --branch gfs_wafs.v6.3.3 https://github.com/NOAA-EMC/EMC_gfs_wafs.git gfs_wafs.fd >> ${topdir}/checkout-gfs_wafs.log 2>&1 - cd ${topdir} - else - echo 'Skip. Directory gfs_wafs.fd already exists.' - fi -fi - echo EMC_verif-global checkout ... if [[ ! -d verif-global.fd ]] ; then rm -f ${topdir}/checkout-verif-global.log diff --git a/sorc/fv3gfs_build.cfg b/sorc/fv3gfs_build.cfg index 20c6fe3497..4e7a144f64 100644 --- a/sorc/fv3gfs_build.cfg +++ b/sorc/fv3gfs_build.cfg @@ -7,7 +7,6 @@ Building gldas (gldas) ................................ yes Building ncep_post (ncep_post) ........................ yes Building ufs_utils (ufs_utils) ........................ yes - Building gfs_wafs (gfs_wafs) .......................... yes Building gaussian_sfcanl (gaussian_sfcanl)............. yes Building enkf_chgres_recenter (enkf_chgres_recenter) .. yes Building enkf_chgres_recenter_nc (enkf_chgres_recenter_nc) .. yes diff --git a/sorc/link_fv3gfs.sh b/sorc/link_fv3gfs.sh index b654c96a62..8d110fe4c2 100755 --- a/sorc/link_fv3gfs.sh +++ b/sorc/link_fv3gfs.sh @@ -92,25 +92,6 @@ cd ${pwd}/../util ||exit 8 done -#----------------------------------- -#--add gfs_wafs link if checked out -if [ -d ${pwd}/gfs_wafs.fd ]; then -#----------------------------------- - cd ${pwd}/../jobs ||exit 8 - $LINK ../sorc/gfs_wafs.fd/jobs/* . - cd ${pwd}/../parm ||exit 8 - [[ -d wafs ]] && rm -rf wafs - $LINK ../sorc/gfs_wafs.fd/parm/wafs wafs - cd ${pwd}/../scripts ||exit 8 - $LINK ../sorc/gfs_wafs.fd/scripts/* . - cd ${pwd}/../ush ||exit 8 - $LINK ../sorc/gfs_wafs.fd/ush/* . - cd ${pwd}/../fix ||exit 8 - [[ -d wafs ]] && rm -rf wafs - $LINK ../sorc/gfs_wafs.fd/fix/* . -fi - - #------------------------------ #--add GSI/EnKF file #------------------------------ @@ -206,16 +187,6 @@ fi [[ -s gfs_ncep_post ]] && rm -f gfs_ncep_post $LINK ../sorc/gfs_post.fd/exec/ncep_post gfs_ncep_post -if [ -d ${pwd}/gfs_wafs.fd ]; then - for wafsexe in \ - wafs_awc_wafavn wafs_blending wafs_blending_0p25 \ - wafs_cnvgrib2 wafs_gcip wafs_grib2_0p25 \ - wafs_makewafs wafs_setmissing; do - [[ -s $wafsexe ]] && rm -f $wafsexe - $LINK ../sorc/gfs_wafs.fd/exec/$wafsexe . - done -fi - for ufs_utilsexe in \ emcsfc_ice_blend emcsfc_snow2mdl global_cycle ; do [[ -s $ufs_utilsexe ]] && rm -f $ufs_utilsexe @@ -303,18 +274,6 @@ cd ${pwd}/../sorc || exit 8 $SLINK ufs_utils.fd/sorc/$prog $prog done - - if [ -d ${pwd}/gfs_wafs.fd ]; then - $SLINK gfs_wafs.fd/sorc/wafs_awc_wafavn.fd wafs_awc_wafavn.fd - $SLINK gfs_wafs.fd/sorc/wafs_blending.fd wafs_blending.fd - $SLINK gfs_wafs.fd/sorc/wafs_blending_0p25.fd wafs_blending_0p25.fd - $SLINK gfs_wafs.fd/sorc/wafs_cnvgrib2.fd wafs_cnvgrib2.fd - $SLINK gfs_wafs.fd/sorc/wafs_gcip.fd wafs_gcip.fd - $SLINK gfs_wafs.fd/sorc/wafs_grib2_0p25.fd wafs_grib2_0p25.fd - $SLINK gfs_wafs.fd/sorc/wafs_makewafs.fd wafs_makewafs.fd - $SLINK gfs_wafs.fd/sorc/wafs_setmissing.fd wafs_setmissing.fd - fi - for prog in gdas2gldas.fd gldas2gdas.fd gldas_forcing.fd gldas_model.fd gldas_post.fd gldas_rst.fd ;do $SLINK gldas.fd/sorc/$prog $prog done diff --git a/sorc/partial_build.sh b/sorc/partial_build.sh index f61e0639c4..481e27743f 100755 --- a/sorc/partial_build.sh +++ b/sorc/partial_build.sh @@ -7,7 +7,6 @@ "Build_ncep_post" \ "Build_ufs_utils" \ "Build_gldas" \ - "Build_gfs_wafs" \ "Build_gaussian_sfcanl" \ "Build_tropcy" \ "Build_enkf_chgres_recenter" \ diff --git a/ush/ecflow/prod.yml b/ush/ecflow/prod.yml index 04ddca61bb..8e6d6c6b3b 100644 --- a/ush/ecflow/prod.yml +++ b/ush/ecflow/prod.yml @@ -89,40 +89,6 @@ suites: HR: '( )' post_processing: tasks: - jgfs_atmos_wafs_gcip: - triggers: - - task: jgfs_atmos_post_f003 - grib_wafs: - tasks: - jgfs_atmos_wafs_f000: - template: jgfs_atmos_wafs_master - triggers: - - task: jgfs_atmos_post_f000 - - task: jgfs_atmos_post_f120 - - task: jgfs_atmos_wafs_grib2 - edits: - FCSTHR: '000' - jgfs_atmos_wafs_f( 6,20,6 ): - template: jgfs_atmos_wafs_master - triggers: - - task: jgfs_atmos_post_f( ) - - task: jgfs_atmos_wafs_f( 0,,6 ) - edits: - FCSTHR: ( ) - grib2_wafs: - tasks: - jgfs_atmos_wafs_grib2: - triggers: - - task: jgfs_atmos_post_f000 - jgfs_atmos_wafs_grib2_0p25: - triggers: - - task: jgfs_atmos_post_f036 - jgfs_atmos_wafs_blending: - triggers: - - task: jgfs_atmos_wafs_grib2 - jgfs_atmos_wafs_blending_0p25: - triggers: - - task: jgfs_atmos_wafs_grib2_0p25 bufr_sounding: tasks: jgfs_atmos_postsnd: diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh index 0184683a44..464acc5e93 100755 --- a/ush/hpssarch_gen.sh +++ b/ush/hpssarch_gen.sh @@ -23,7 +23,7 @@ fi # Set whether to archive downstream products DO_DOWN=${DO_DOWN:-"NO"} -if [ $DO_BUFRSND = "YES" -o $WAFSF = "YES" ]; then +if [ $DO_BUFRSND = "YES" ]; then export DO_DOWN="YES" fi @@ -99,16 +99,6 @@ if [ $type = "gfs" ]; then echo "${dirname}bufr.t${cyc}z " >>gfs_downstream.txt echo "${dirname}gfs.t${cyc}z.bufrsnd.tar.gz " >>gfs_downstream.txt fi - if [ $WAFSF = "YES" ]; then - echo "${dirname}wafsgfs*.t${cyc}z.gribf*.grib2 " >>gfs_downstream.txt - echo "${dirname}gfs.t${cyc}z.wafs_grb45f*.grib2 " >>gfs_downstream.txt - echo "${dirname}gfs.t${cyc}z.wafs_grb45f*.nouswafs.grib2 " >>gfs_downstream.txt - echo "${dirname}WAFS_blended_${PDY}${cyc}f*.grib2 " >>gfs_downstream.txt - echo "${dirname}gfs.t*z.gcip.f*.grib2 " >>gfs_downstream.txt - echo "${dirname}gfs.t${cyc}z.wafs_0p25.f*.grib2 " >>gfs_downstream.txt - echo "${dirname}gfs.t${cyc}z.wafs_0p25_unblended.f*.grib2" >>gfs_downstream.txt - echo "${dirname}WAFS_0p25_blended_${PDY}${cyc}f*.grib2 " >>gfs_downstream.txt - fi fi if [ $MODE = "cycled" ]; then diff --git a/ush/rocoto/setup_workflow.py b/ush/rocoto/setup_workflow.py index bb3568b082..8bcdd60a26 100755 --- a/ush/rocoto/setup_workflow.py +++ b/ush/rocoto/setup_workflow.py @@ -45,7 +45,6 @@ def main(): gfs_steps = ['prep', 'anal', 'analdiag', 'analcalc', 'gldas', 'fcst', 'postsnd', 'post', 'vrfy', 'arch'] gfs_steps_gempak = ['gempak'] gfs_steps_awips = ['awips'] - gfs_steps_wafs = ['wafs', 'wafsgrib2', 'wafsblending', 'wafsgcip', 'wafsgrib20p25', 'wafsblending0p25'] #hyb_steps = ['eobs', 'eomg', 'eupd', 'ecen', 'efcs', 'epos', 'earc'] metp_steps = ['metp'] wav_steps = ['waveinit', 'waveprep', 'wavepostsbs', 'wavepostbndpnt', 'wavepostbndpntbll', 'wavepostpnt'] @@ -60,7 +59,6 @@ def main(): steps = steps + metp_steps if _base.get('DO_METP', 'NO') == 'YES' else steps steps = steps + gfs_steps_gempak if _base.get('DO_GEMPAK', 'NO') == 'YES' else steps steps = steps + gfs_steps_awips if _base.get('DO_AWIPS', 'NO') == 'YES' else steps - steps = steps + gfs_steps_wafs if _base.get('WAFSF', 'NO') == 'YES' else steps steps = steps + wav_steps if _base.get('DO_WAVE', 'NO') == 'YES' else steps steps = steps + wav_steps_gempak if _base.get('DO_GEMPAK', 'NO') == 'YES' else steps steps = steps + wav_steps_awips if _base.get('DO_AWIPS', 'NO') == 'YES' else steps @@ -241,7 +239,6 @@ def get_gdasgfs_resources(dict_configs, cdump='gdas'): do_bufrsnd = base.get('DO_BUFRSND', 'NO').upper() do_gempak = base.get('DO_GEMPAK', 'NO').upper() do_awips = base.get('DO_AWIPS', 'NO').upper() - do_wafs = base.get('WAFSF', 'NO').upper() do_metp = base.get('DO_METP', 'NO').upper() do_gldas = base.get('DO_GLDAS', 'NO').upper() do_wdqms = base.get('DO_WDQMS', 'NO').upper() @@ -275,8 +272,6 @@ def get_gdasgfs_resources(dict_configs, cdump='gdas'): tasks += ['wavegempak'] if cdump in ['gfs'] and do_awips in ['Y', 'YES']: tasks += ['awips'] - if cdump in ['gfs'] and do_wafs in ['Y', 'YES']: - tasks += ['wafs', 'wafsgrib2', 'wafsblending', 'wafsgcip', 'wafsgrib20p25', 'wafsblending0p25'] if cdump in ['gfs'] and do_metp in ['Y', 'YES']: tasks += ['metp'] if cdump in ['gfs'] and do_wave in ['Y', 'YES'] and do_awips in ['Y', 'YES']: @@ -412,7 +407,6 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): do_bufrsnd = base.get('DO_BUFRSND', 'NO').upper() do_gempak = base.get('DO_GEMPAK', 'NO').upper() do_awips = base.get('DO_AWIPS', 'NO').upper() - do_wafs = base.get('WAFSF', 'NO').upper() do_metp = base.get('DO_METP', 'NO').upper() do_gldas = base.get('DO_GLDAS', 'NO').upper() do_wdqms = base.get('DO_WDQMS', 'NO').upper() @@ -763,178 +757,6 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'): dict_tasks[f'{cdump}gempak'] = task - # wafs - if cdump in ['gfs'] and do_wafs in ['Y', 'YES']: - deps = [] - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if006' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if012' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if015' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if018' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if021' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if024' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if027' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if030' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if033' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if036' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - task = wfu.create_wf_task('wafs', cdump=cdump, envar=envars, dependency=dependencies) - - dict_tasks[f'{cdump}wafs'] = task - - # wafsgcip - if cdump in ['gfs'] and do_wafs in ['Y', 'YES']: - deps = [] - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if006' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if012' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if015' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if018' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if021' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if024' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if027' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if030' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if033' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if036' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - task = wfu.create_wf_task('wafsgcip', cdump=cdump, envar=envars, dependency=dependencies) - - dict_tasks[f'{cdump}wafsgcip'] = task - - # wafsgrib2 - if cdump in ['gfs'] and do_wafs in ['Y', 'YES']: - deps = [] - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if006' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if012' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if015' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if018' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if021' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if024' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if027' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if030' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if033' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if036' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - task = wfu.create_wf_task('wafsgrib2', cdump=cdump, envar=envars, dependency=dependencies) - - dict_tasks[f'{cdump}wafsgrib2'] = task - - # wafsgrib20p25 - if cdump in ['gfs'] and do_wafs in ['Y', 'YES']: - deps = [] - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if006' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if012' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if015' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if018' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if021' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if024' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if027' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if030' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if033' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if036' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - task = wfu.create_wf_task('wafsgrib20p25', cdump=cdump, envar=envars, dependency=dependencies) - - dict_tasks[f'{cdump}wafsgrib20p25'] = task - - # wafsblending - if cdump in ['gfs'] and do_wafs in ['Y', 'YES']: - deps = [] - dep_dict = {'type': 'task', 'name': f'{cdump}wafsgrib2'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - task = wfu.create_wf_task('wafsblending', cdump=cdump, envar=envars, dependency=dependencies) - - dict_tasks[f'{cdump}wafsblending'] = task - - # wafsblending0p25 - if cdump in ['gfs'] and do_wafs in ['Y', 'YES']: - deps = [] - dep_dict = {'type': 'task', 'name': f'{cdump}wafsgrib20p25'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - task = wfu.create_wf_task('wafsblending0p25', cdump=cdump, envar=envars, dependency=dependencies) - - dict_tasks[f'{cdump}wafsblending0p25'] = task - # arch deps = [] dep_dict = {'type': 'task', 'name': f'{cdump}vrfy'} diff --git a/ush/rocoto/setup_workflow_fcstonly.py b/ush/rocoto/setup_workflow_fcstonly.py index 57e3780bec..c33f58880e 100755 --- a/ush/rocoto/setup_workflow_fcstonly.py +++ b/ush/rocoto/setup_workflow_fcstonly.py @@ -27,7 +27,7 @@ import rocoto import workflow_utils as wfu -taskplan = ['getic', 'waveinit', 'waveprep', 'fcst', 'post', 'wavepostsbs', 'wavepostbndpnt', 'wavepostbndpntbll', 'wavepostpnt', 'wavegempak', 'waveawipsbulls', 'waveawipsgridded', 'wafs', 'wafsgrib2', 'wafsblending', 'wafsgcip', 'wafsgrib20p25', 'wafsblending0p25', 'postsnd', 'gempak', 'awips', 'vrfy', 'metp', 'arch'] +taskplan = ['getic', 'waveinit', 'waveprep', 'fcst', 'post', 'wavepostsbs', 'wavepostbndpnt', 'wavepostbndpntbll', 'wavepostpnt', 'wavegempak', 'waveawipsbulls', 'waveawipsgridded', 'postsnd', 'gempak', 'awips', 'vrfy', 'metp', 'arch'] def main(): parser = ArgumentParser(description='Setup XML workflow and CRONTAB for a forecast only experiment.', formatter_class=ArgumentDefaultsHelpFormatter) @@ -250,7 +250,6 @@ def get_workflow(dict_configs, cdump='gdas'): do_bufrsnd = base.get('DO_BUFRSND', 'NO').upper() do_gempak = base.get('DO_GEMPAK', 'NO').upper() do_awips = base.get('DO_AWIPS', 'NO').upper() - do_wafs = base.get('WAFSF', 'NO').upper() do_vrfy = base.get('DO_VRFY', 'YES').upper() do_metp = base.get('DO_METP', 'NO').upper() @@ -413,178 +412,6 @@ def get_workflow(dict_configs, cdump='gdas'): tasks.append(task) tasks.append('\n') - # wafs - if do_wafs in ['Y', 'YES']: - deps = [] - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if006' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if012' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if015' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if018' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if021' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if024' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if027' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if030' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if033' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if036' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - task = wfu.create_wf_task('wafs', cdump=cdump, envar=envars, dependency=dependencies) - tasks.append(task) - tasks.append('\n') - - # wafsgcip - if do_wafs in ['Y', 'YES']: - deps = [] - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if006' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if012' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if015' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if018' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if021' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if024' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if027' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if030' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if033' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if036' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - task = wfu.create_wf_task('wafsgcip', cdump=cdump, envar=envars, dependency=dependencies) - tasks.append(task) - tasks.append('\n') - - # wafsgrib2 - if do_wafs in ['Y', 'YES']: - deps = [] - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if006' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if012' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if015' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if018' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if021' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if024' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if027' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if030' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if033' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if036' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - task = wfu.create_wf_task('wafsgrib2', cdump=cdump, envar=envars, dependency=dependencies) - tasks.append(task) - tasks.append('\n') - - # wafsgrib20p25 - if do_wafs in ['Y', 'YES']: - deps = [] - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if006' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if012' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if015' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if018' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if021' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if024' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if027' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if030' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if033' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - data = f'&ROTDIR;/{cdump}.@Y@m@d/@H/atmos/{cdump}.t@Hz.wafs.grb2if036' - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - task = wfu.create_wf_task('wafsgrib20p25', cdump=cdump, envar=envars, dependency=dependencies) - tasks.append(task) - tasks.append('\n') - - # wafsblending - if do_wafs in ['Y', 'YES']: - deps = [] - dep_dict = {'type': 'task', 'name': f'{cdump}wafsgrib2'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - task = wfu.create_wf_task('wafsblending', cdump=cdump, envar=envars, dependency=dependencies) - tasks.append(task) - tasks.append('\n') - - # wafsblending0p25 - if do_wafs in ['Y', 'YES']: - deps = [] - dep_dict = {'type': 'task', 'name': f'{cdump}wafsgrib20p25'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - task = wfu.create_wf_task('wafsblending0p25', cdump=cdump, envar=envars, dependency=dependencies) - tasks.append(task) - tasks.append('\n') - #postsnd if do_bufrsnd in ['Y', 'YES']: deps = [] diff --git a/versions/run.ver b/versions/run.ver index 807726f09a..6450837f8d 100755 --- a/versions/run.ver +++ b/versions/run.ver @@ -1,5 +1,5 @@ -export version=v16.3.20 -export gfs_ver=v16.3.20 +export version=v16.3.21 +export gfs_ver=v16.3.21 export ukmet_ver=v2.2 export ecmwf_ver=v2.1 export nam_ver=v4.2