Skip to content

Commit 58f8ca2

Browse files
[develop] Update ufs-weather-model hash to end of March (ufs-community#1369)
* Externals.cfg - Update ufs-weather-model hash to 855243a (March 25) * doc/UsersGuide/CustomizingTheWorkflow/InputOutputFiles.rst - Update path to UPP's output-files and control-file documentation anchors * doc/UsersGuide/Reference/Glossary.rst - Update path to the new FVCOM website * Following the decommissioning of Jet on March 31, 2026, remove references to Jet
1 parent e868a7b commit 58f8ca2

29 files changed

Lines changed: 37 additions & 216 deletions

Externals.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ protocol = git
1212
repo_url = https://github.com/ufs-community/ufs-weather-model
1313
# Specify either a branch name or a hash but not both.
1414
#branch = develop
15-
hash = 36d5e2a
15+
hash = 855243a
1616
local_path = sorc/ufs-weather-model
1717
required = True
1818

devbuild.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ OPTIONS
1010
show this help guide
1111
-p, --platform=PLATFORM
1212
name of machine you are building on
13-
(e.g. derecho | hera | jet | orion | ursa | wcoss2)
13+
(e.g. derecho | hera | orion | ursa | wcoss2)
1414
-c, --compiler=COMPILER
1515
compiler to use; default depends on platform
1616
(e.g. intel | gnu | cray | gccgfortran)
@@ -342,7 +342,7 @@ set -eu
342342
# automatically determine compiler
343343
if [ -z "${COMPILER}" ] ; then
344344
case ${PLATFORM} in
345-
jet|hera|gaea|gaea-c6|ursa) COMPILER=intel ;;
345+
hera|gaeac6|ursa) COMPILER=intel ;;
346346
orion|hercules) COMPILER=intel ;;
347347
wcoss2) COMPILER=intel ;;
348348
derecho) COMPILER=intel ;;

doc/ContribGuide/contributing.rst

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -228,14 +228,11 @@ Here is the template that is provided when developers click "Create pull request
228228
<!-- Add an X to check off a box. -->
229229
230230
- [ ] derecho.intel
231-
- [ ] gaea.intel
232-
- [ ] gaea-c6.intel
233-
- [ ] hera.gnu
234-
- [ ] hera.intel
231+
- [ ] gaeac6.intel
235232
- [ ] hercules.intel
236-
- [ ] jet.intel
237233
- [ ] orion.intel
238-
- [ ] wcoss2.intel
234+
- [ ] ursa.gnu
235+
- [ ] ursa.intel
239236
- [ ] NOAA Cloud (indicate which platform)
240237
- [ ] Jenkins
241238
- [ ] fundamental test suite
@@ -278,7 +275,6 @@ Here is the template that is provided when developers click "Create pull request
278275
- [ ] run_we2e_fundamental_tests
279276
- [ ] run_we2e_comprehensive_tests
280277
- [ ] Needs Cheyenne test
281-
- [ ] Needs Jet test
282278
- [ ] Needs Hera test
283279
- [ ] Needs Orion test
284280
- [ ] help wanted

doc/ContribGuide/testing.rst

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,17 @@ Additionally, users can potentially access the directories where the Jenkins tes
4747
* - Tier-1 Platform
4848
- Location of Jenkins experiment directories
4949
* - Derecho
50-
- /glade/derecho/scratch/epicufsrt/jenkins/workspace
51-
* - Gaea
52-
- /gpfs/f5/epic/scratch/role.epic/jenkins/workspace/fs-srweather-app_pipeline_PR-#/gaea
53-
* - Hera (Intel)
54-
- /scratch2/NAGAPE/epic/role.epic/jenkins/workspace/fs-srweather-app_pipeline_PR-#__2/hera
55-
* - Hera (GNU)
56-
- /scratch2/NAGAPE/epic/role.epic/jenkins/workspace/fs-srweather-app_pipeline_PR-#/hera
50+
- /glade/derecho/scratch/epicufsrt/jenkins/workspace/s-srweather-app_pipeline_PR-#/derecho
51+
* - Gaea C6
52+
- /gpfs/f6/epic/scratch/role.epic/jenkins/workspace/s-srweather-app_pipeline_PR-#/gaeac6
5753
* - Hercules
58-
- /work/noaa/epic/role-epic/jenkins/workspace/fs-srweather-app_pipeline_PR-#/hercules
59-
* - Jet
60-
- /lfs1/NAGAPE/epic/role.epic/jenkins/workspace/fs-srweather-app_pipeline_PR-#/jet
54+
- /work2/noaa/epic/role-epic/jenkins/workspace/s-srweather-app_pipeline_PR-#/hercules
6155
* - Orion
62-
- /work/noaa/epic/role-epic/jenkins/workspace/fs-srweather-app_pipeline_PR-#/orion
56+
- /work/noaa/epic/role-epic/jenkins/workspace/s-srweather-app_pipeline_PR-#/orion
57+
* - Ursa (GNU)
58+
- /scratch3/NAGAPE/epic/role-epic/jenkins/workspace/s-srweather-app_pipeline_PR-#/ursa
59+
* - Ursa (Intel)
60+
- /scratch3/NAGAPE/epic/role-epic/jenkins/workspace/s-srweather-app_pipeline_PR-#_2/ursa
6361

6462
where ``#`` is the PR number.
6563

doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Machine-Dependent Parameters
123123
These parameters vary depending on machine. On :srw-wiki:`Level 1 and 2 <Supported-Platforms-and-Compilers>` systems, the appropriate values for each machine can be viewed in the ``ush/machine/<platform>.sh`` scripts. To specify a value other than the default, add these variables and the desired value in the ``config.yaml`` file so that they override the ``config_defaults.yaml`` and machine default values.
124124

125125
``PARTITION_DEFAULT``: (Default: "")
126-
This variable is only used with the Slurm job scheduler (i.e., when ``SCHED: "slurm"``). This is the default partition to which Slurm submits workflow tasks. If the task's ``PARTITION_HPSS`` or ``PARTITION_FCST`` (see below) parameters are **not** specified, the task will be submitted to the default partition indicated in the ``PARTITION_DEFAULT`` variable. If this value is not set or is set to an empty string, it will be (re)set to a machine-dependent value. Options are machine-dependent and include: ``""`` | ``"hera"`` | ``"normal"`` | ``"orion"`` | ``"sjet"`` | ``"vjet"`` | ``"kjet"`` | ``"xjet"`` | ``"workq"``
126+
This variable is only used with the Slurm job scheduler (i.e., when ``SCHED: "slurm"``). This is the default partition to which Slurm submits workflow tasks. If the task's ``PARTITION_HPSS`` or ``PARTITION_FCST`` (see below) parameters are **not** specified, the task will be submitted to the default partition indicated in the ``PARTITION_DEFAULT`` variable. If this value is not set or is set to an empty string, it will be (re)set to a machine-dependent value. Options are machine-dependent and include: ``""`` | ``"hera"`` | ``"normal"`` | ``"orion"`` | ``"workq"``
127127

128128
``QUEUE_DEFAULT``: (Default: "")
129129
The default queue or QOS to which workflow tasks are submitted (QOS is Slurm's term for queue; it stands for "Quality of Service"). If the task's ``QUEUE_HPSS`` or ``QUEUE_FCST`` parameters (see below) are not specified, the task will be submitted to the queue indicated by this variable. If this value is not set or is set to an empty string, it will be (re)set to a machine-dependent value. Options are machine-dependent and include: ``""`` | ``"batch"`` | ``"dev"`` | ``"normal"`` | ``"regular"`` | ``"workq"``
@@ -135,7 +135,7 @@ These parameters vary depending on machine. On :srw-wiki:`Level 1 and 2 <Support
135135
Tasks that get or create links to external model files are submitted to this queue, or QOS (QOS is Slurm's term for queue; it stands for "Quality of Service"). These links are needed to generate initial conditions (:term:`ICs`) and lateral boundary conditions (:term:`LBCs`) for the experiment. If this value is not set or is set to an empty string, it will be (re)set to a machine-dependent value. Options are machine-dependent and include: ``""`` | ``"batch"`` | ``"dev_transfer"`` | ``"normal"`` | ``"regular"`` | ``"workq"``
136136

137137
``PARTITION_FCST``: (Default: "")
138-
This variable is only used with the Slurm job scheduler (i.e., when ``SCHED: "slurm"``). The task that runs forecasts is submitted to this partition. If this variable is not set or is set to an empty string, it will be (re)set to a machine-dependent value. Options are machine-dependent and include: ``""`` | ``"hera"`` | ``"normal"`` | ``"orion"`` | ``"sjet"`` | ``"vjet"`` | ``"kjet"`` | ``"xjet"`` | ``"workq"``
138+
This variable is only used with the Slurm job scheduler (i.e., when ``SCHED: "slurm"``). The task that runs forecasts is submitted to this partition. If this variable is not set or is set to an empty string, it will be (re)set to a machine-dependent value. Options are machine-dependent and include: ``""`` | ``"hera"`` | ``"normal"`` | ``"orion"`` | ``"workq"``
139139

140140
``QUEUE_FCST``: (Default: "")
141141
The task that runs a forecast is submitted to this queue, or QOS (QOS is Slurm's term for queue; it stands for "Quality of Service"). If this variable is not set or set to an empty string, it will be (re)set to a machine-dependent value. Options are machine-dependent and include: ``""`` | ``"batch"`` | ``"dev"`` | ``"normal"`` | ``"regular"`` | ``"workq"``
@@ -919,7 +919,7 @@ File and Directory Parameters
919919
--------------------------------
920920

921921
``EXTRN_MDL_SYSBASEDIR_LBCS``: (Default: '')
922-
Same as ``EXTRN_MDL_SYSBASEDIR_ICS`` but for :term:`LBCs`. A known location of a real data stream on a given platform. This is typically a real-time data stream as on Hera, Jet, or WCOSS. External model files for generating :term:`LBCs` on the native grid should be accessible via this data stream. The way the full path containing these files is constructed depends on the user-specified external model for LBCs (defined above in :numref:`Section %s <basic-get-extrn-lbcs>` ``EXTRN_MDL_NAME_LBCS`` above).
922+
Same as ``EXTRN_MDL_SYSBASEDIR_ICS`` but for :term:`LBCs`. A known location of a real data stream on a given platform. This is typically a real-time data stream as on Hera or WCOSS. External model files for generating :term:`LBCs` on the native grid should be accessible via this data stream. The way the full path containing these files is constructed depends on the user-specified external model for LBCs (defined above in :numref:`Section %s <basic-get-extrn-lbcs>` ``EXTRN_MDL_NAME_LBCS`` above).
923923

924924
.. note::
925925
This variable must be defined as a null string in ``config_defaults.yaml`` so that if it is specified by the user in the experiment configuration file (``config.yaml``), it remains set to those values, and if not, it gets set to machine-dependent values.

doc/UsersGuide/CustomizingTheWorkflow/InputOutputFiles.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ where ``HHH`` corresponds to the 3-digit forecast hour (e.g., ``dynf006.nc`` for
147147

148148
Unified Post Processor (UPP)
149149
----------------------------
150-
Documentation for the UPP output files can be found in the `UPP User's Guide <https://upp.readthedocs.io/en/latest/InputsOutputs.html#output-files>`__.
150+
Documentation for the UPP output files can be found in the `UPP User's Guide <https://upp.readthedocs.io/en/latest/BuildingRunningTesting/InputsOutputs.html#output-files>`__.
151151

152152
.. COMMENT: Add crosslink in UPP docs; add ref here.
153153
@@ -172,7 +172,7 @@ UPP Product Output Tables for the UFS SRW LAM Grid:
172172
* :doc:`3D Native Hybrid Level Fields <../../tables/SRW_NATLEV_table>`
173173
* :doc:`3D Pressure Level Fields <../../tables/SRW_PRSLEV_table>`
174174

175-
Use the instructions in the `UPP User's Guide <https://upp.readthedocs.io/en/latest/InputsOutputs.html#control-file>`__ to make modifications to the ``fv3lam.xml`` file and to remake the flat text file, called ``postxconfig-NT-fv3lam.txt`` (default), that the UPP reads.
175+
Use the instructions in the `UPP User's Guide <https://upp.readthedocs.io/en/latest/BuildingRunningTesting/InputsOutputs.html#control-file>`__ to make modifications to the ``fv3lam.xml`` file and to remake the flat text file, called ``postxconfig-NT-fv3lam.txt`` (default), that the UPP reads.
176176

177177
.. COMMENT: Add crosslink to UPP docs; then update here.
178178

doc/UsersGuide/Reference/Glossary.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Glossary
118118
Fire Radiative Power (FRP) is a measure of the rate of radiant heat output from a fire, typically derived from satellite observations. FRP observations from :term:`RAVE` data are used in the SRW App's smoke and dust module to estimate fire emissions and initialize smoke tracer fields in the atmospheric model.
119119

120120
FVCOM
121-
`Finite Volume Community Ocean Model <http://www.fvcom.org/>`_. FVCOM is used in modeling work for the `Great Lakes Coastal Forecasting System (next-gen FVCOM) <https://www.glerl.noaa.gov/res/glcfs/>`_ conducted by the `Great Lakes Environmental Research Laboratory <https://www.glerl.noaa.gov/>`_.
121+
`Finite Volume Community Ocean Model <https://fvcom.smast.umassd.edu/>`_. FVCOM is used in modeling work for the `Great Lakes Coastal Forecasting System (next-gen FVCOM) <https://www.glerl.noaa.gov/res/glcfs/>`_ conducted by the `Great Lakes Environmental Research Laboratory <https://www.glerl.noaa.gov/>`_.
122122

123123
GFS
124124
`Global Forecast System <https://www.ncei.noaa.gov/products/weather-climate-models/global-forecast>`_. The GFS is a National Centers for Environmental Prediction (:term:`NCEP`) weather forecast model that generates data for dozens of atmospheric and land-soil variables, including temperatures, winds, precipitation, soil moisture, and atmospheric ozone concentration. The system couples four separate models (atmosphere, ocean, land/soil, and sea ice) that work together to accurately depict weather conditions.

doc/tables/Tests.csv

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ yes,yes,grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16,RRFS_CONUS_25km,FV3_
5252
,yes,pregen_grid_orog_sfc_climo,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019070100,6,6,17,
5353
,yes,specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2021061500,6,6,19,
5454
,yes,specify_template_filenames,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019070100,6,6,28,
55-
,hera/jet/orion/gaea/gaea-c6,get_from_AWS_ics_GEFS_lbcs_GEFS_fmt_grib2_2022040400_ensemble_2mems,RRFS_CONUS_3km,FV3_HRRR,GEFS,GEFS,2022040400,6,805,45,
56-
,hera/jet/orion/gaea/gaea-c6,get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,*2 days ago*,6,12,40,Retrieves online data and runs a forecast valid 00z 2 days previous to the test date
57-
,hera/jet,custom_ESGgrid_Great_Lakes_snow_8km,*custom*,FV3_RAP,RAP,RAP,2023021700,6,,,
58-
,hera/jet,get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019061200,6,6,19,
59-
,hera/jet,get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019061200,6,10,23,
60-
,hera/jet,get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021032018,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2021032018,6,10,23,
61-
,hera/jet,get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h,RRFS_CONUS_25km,FV3_GFS_v16,FV3GFS,FV3GFS,2022060112,48,55,43,
62-
,hera/jet,get_from_HPSS_ics_GDAS_lbcs_GDAS_fmt_netcdf_2022040400_ensemble_2mems,RRFS_CONUS_3km,FV3_HRRR,GDAS,GDAS,2022040400,6,765,48,
63-
,hera/jet,get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS,RRFS_CONUS_25km,FV3_GFS_v15p2,GSMGFS,GSMGFS,2019052000,6,10,25,
64-
,hera/jet,get_from_HPSS_ics_HRRR_lbcs_RAP,RRFS_CONUScompact_25km,FV3_HRRR,HRRR,RAP,2020080100,6,14,30,
65-
,hera/jet,get_from_HPSS_ics_RAP_lbcs_RAP,RRFS_CONUS_25km,FV3_HRRR,RAP,RAP,2019052000,6,17,35,
66-
,hera/jet,long_fcst,RRFS_CONUScompact_25km,FV3_RAP,FV3GFS,FV3GFS,2023060112,108,50,,
67-
,hera/jet,MET_ensemble_verification_only_vx_time_lag,RRFS_CONUS_3km,*none*,*none*,*none*,2021050500,6,3,30,
55+
,ursa/orion/gaeac6,get_from_AWS_ics_GEFS_lbcs_GEFS_fmt_grib2_2022040400_ensemble_2mems,RRFS_CONUS_3km,FV3_HRRR,GEFS,GEFS,2022040400,6,805,45,
56+
,ursa/orion/gaeac6,get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,*2 days ago*,6,12,40,Retrieves online data and runs a forecast valid 00z 2 days previous to the test date
57+
,ursa,custom_ESGgrid_Great_Lakes_snow_8km,*custom*,FV3_RAP,RAP,RAP,2023021700,6,,,
58+
,ursa,get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019061200,6,6,19,
59+
,ursa,get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2019061200,6,10,23,
60+
,ursa,get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021032018,RRFS_CONUS_25km,FV3_GFS_v15p2,FV3GFS,FV3GFS,2021032018,6,10,23,
61+
,ursa,get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h,RRFS_CONUS_25km,FV3_GFS_v16,FV3GFS,FV3GFS,2022060112,48,55,43,
62+
,ursa,get_from_HPSS_ics_GDAS_lbcs_GDAS_fmt_netcdf_2022040400_ensemble_2mems,RRFS_CONUS_3km,FV3_HRRR,GDAS,GDAS,2022040400,6,765,48,
63+
,ursa,get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS,RRFS_CONUS_25km,FV3_GFS_v15p2,GSMGFS,GSMGFS,2019052000,6,10,25,
64+
,ursa,get_from_HPSS_ics_HRRR_lbcs_RAP,RRFS_CONUScompact_25km,FV3_HRRR,HRRR,RAP,2020080100,6,14,30,
65+
,ursa,get_from_HPSS_ics_RAP_lbcs_RAP,RRFS_CONUS_25km,FV3_HRRR,RAP,RAP,2019052000,6,17,35,
66+
,ursa,long_fcst,RRFS_CONUScompact_25km,FV3_RAP,FV3GFS,FV3GFS,2023060112,108,50,,
67+
,ursa,MET_ensemble_verification_only_vx_time_lag,RRFS_CONUS_3km,*none*,*none*,*none*,2021050500,6,3,30,
6868
,,aqm_grid_AQM_NA13km_suite_GFS_v16,AQM_NA_13km,FV3_GFS_v16,FV3GFS,FV3GFS,2023021700 2023021706,6,,,This is an air-quality model test that requires special compilation to run; not supported in this release
6969
,,grid_RRFS_NA_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta,RRFS_NA_3km,FV3_RRFS_v1beta,FV3GFS,FV3GFS,2019070100,3,,,The RRFS_NA_3km domain currently has segfault problems--this test is not run
7070
,,subhourly_post,RRFS_CONUScompact_25km,FV3_RRFS_v1beta,HRRR,RAP,2020081000,3,,,Subhourly post tasks are currently broken--these tests are not run

doc/tables/code-managers.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ EPIC;Mark Potts (@mark-a-potts);HPC systems
1818
EPIC;Edward Snyder (@EdwardSnyder-NOAA);WE2E testing, input data
1919
GLERL;David Wright (@dmwright526);FVCOM integration, output visualization, preprocessing tasks
2020
EPIC;Ratko Vasic (@RatkoVasic-NOAA);Workflow, testing, and spack-stack maintenance
21-
NSSL;Yunheng Wang (@ywangwof);HPC systems, code management, and regional workflow (especially on Stampede, Jet and NSSL computers)
21+
NSSL;Yunheng Wang (@ywangwof);HPC systems, code management, and regional workflow (especially on Stampede and NSSL computers)

modulefiles/build_jet_intel.lua

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)