Skip to content

Commit efe3263

Browse files
committed
Merge remote-tracking branch 'remotes/origin/develop' into feature/gfspbl_lpt
2 parents 5a318a7 + 5750b9e commit efe3263

23 files changed

+2290
-2387
lines changed

FV3

doc/UsersGuide/source/BuildingAndRunning.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,6 @@ the data required to run the WM RTs are already available at the following ``DIS
9595
- /scratch2/NAGAPE/epic/UFS-WM_RT
9696
* - Hercules
9797
- /work/noaa/epic/hercules/UFS-WM_RT
98-
* - Jet (Level 2)
99-
- /mnt/lfs5/HFIP/hfv3gfs/role.epic/RT
10098
* - NOAA Cloud (Level 2)
10199
- /contrib/ufs-weather-model/RT
102100
* - Orion

doc/UsersGuide/source/CAPE2020.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Users who have access to :term:`HPSS` can generate initial conditions (:term:`IC
3434

3535
In order to generate all necessary configuration, data, input, and fix files to run a configuration similar to the July 2020 CAPE case for another date (still C48 resolution), the user first needs to run the base ``ufs_test.sh`` script for the default July 2020 CAPE case as described in :numref:`Section %s <run-2020-cape>`.
3636

37-
To generate coldstart ICs via the UFS_UTILS ``gdas_init``/``chgres_cube`` utilities on an :term:`RDHPCS` with :term:`HPSS` access (e.g., Hera or Jet), the user can run the following commands:
37+
To generate coldstart ICs via the UFS_UTILS ``gdas_init``/``chgres_cube`` utilities on an :term:`RDHPCS` with :term:`HPSS` access (e.g., Hera), the user can run the following commands:
3838

3939
.. code-block:: console
4040
@@ -45,7 +45,7 @@ To generate coldstart ICs via the UFS_UTILS ``gdas_init``/``chgres_cube`` utilit
4545
./build_all.sh
4646
cd util/gdas_init
4747
48-
where ``<platform>`` is Hera or Jet.
48+
where ``<platform>`` is Hera.
4949

5050
Then, users will need to edit the ``config`` file to:
5151

doc/UsersGuide/source/HSDcontainer.rst

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This chapter provides instructions for building and running the Unified Forecast
1313

1414
* The :ref:`July 2020 CAPE Case <cape-2020>`
1515
* The :ref:`Baroclinic Instability Case <baroclinic-wave>`
16+
* The :ref:`Idealized, Regional Tropical Cyclone Case <idealized-tc>`
1617

1718
.. attention::
1819

@@ -108,47 +109,45 @@ On many NOAA :term:`RDHPCS`, a container named ``ubuntu22.04-intel-wm-dev-hsd-te
108109
+--------------------+--------------------------------------------------------+
109110
| Machine | File location |
110111
+====================+========================================================+
111-
| Gaea | /gpfs/f5/epic/world-shared/containers |
112+
| Gaea | /gpfs/f6/bil-fire8/world-shared/containers |
112113
+--------------------+--------------------------------------------------------+
113114
| Hera | /scratch1/NCEPDEV/nems/role.epic/containers |
114115
+--------------------+--------------------------------------------------------+
115-
| Jet | /mnt/lfs5/HFIP/hfv3gfs/role.epic/containers |
116-
+--------------------+--------------------------------------------------------+
117116
| NOAA Cloud [#fn]_ | /contrib/EPIC/containers |
118117
+--------------------+--------------------------------------------------------+
119118
| Orion/Hercules | /work/noaa/epic/role-epic/contrib/containers |
120119
+--------------------+--------------------------------------------------------+
121120

122-
.. [#fn] The CAPE case can run on the NOAA Cloud ParallelWorks (PW) platforms, but the baroclinic wave case cannot.
121+
.. [#fn] The CAPE case can run on the NOAA Cloud ParallelWorks (PW) platforms, but the baroclinic wave and tropical cyclone cases cannot.
123122
124123
Users can simply set an environment variable to point to the container:
125124

126125
.. code-block:: console
127126
128127
export img=path/to/ubuntu22.04-intel-wm-dev-hsd-test.img
129128
130-
If users prefer, they may copy the container to their local working directory. For example, on Jet:
129+
If users prefer, they may copy the container to their local working directory. For example, on Gaea
131130

132131
.. code-block:: console
133132
134-
cp /mnt/lfs5/HFIP/hfv3gfs/role.epic/containers/ubuntu22.04-intel-wm-dev-hsd-test.img .
133+
cp /gpfs/f6/bil-fire8/world-shared/containers/ubuntu22.04-intel-wm-dev-hsd-test.img .
135134
136135
Other Systems
137136
----------------
138137

139-
On other systems, users can build the Singularity container from a public Docker :term:`container` image or download the ``ubuntu22.04-intel-wm-dev-hsd-test.img`` container from the `UFS Hierarchical Testing Framework (HTF) Data Bucket <https://registry.opendata.aws/noaa-ufs-htf-pds/>`_. Downloading may be faster depending on the download speed on the user's system. Note that the container in the data bucket is from the November 20, 2024 ``develop`` branch.
138+
On other systems, users can build the Singularity container from a public Docker :term:`container` image or download the ``ubuntu22.04-intel-wm-dev-hsd-test.img`` container from the `UFS Hierarchical Testing Framework (HTF) Data Bucket <https://registry.opendata.aws/noaa-ufs-htf-pds/>`_. Downloading may be faster depending on the download speed on the user's system. Note that the container in the data bucket is from the May 30, 2025 ``develop`` branch.
140139

141140
To download from the data bucket, users can run:
142141

143142
.. code-block:: console
144143
145-
wget https://noaa-ufs-htf-pds.s3.amazonaws.com/develop-20241115/ubuntu22.04-intel-wm-dev-hsd-test.img
144+
wget https://noaa-ufs-htf-pds.s3.amazonaws.com/develop-20250530/ubuntu22.04-intel-wm-dev-hsd-test.img
146145
147146
To build the container from a Docker image, users can run:
148147

149148
.. code-block:: console
150149
151-
singularity build --force ubuntu22.04-intel-wm-dev-hsd-test.img docker://noaaepic/ubuntu22.04-intel21.10-wm:ue160-fms202401-dev
150+
singularity build --force ubuntu22.04-intel-wm-dev-hsd-test.img docker://noaaepic/ubuntu22.04-intel21.10-wm:ue160-fms202401-dev-tc
152151
153152
This process may take several hours depending on the system.
154153

@@ -168,7 +167,7 @@ Users on any system may download and untar the data from the `UFS Hierarchical T
168167
.. code-block:: console
169168
170169
cd $HSD
171-
wget https://noaa-ufs-htf-pds.s3.amazonaws.com/develop-20241115/HSD_fix_files_and_case_data.tar.gz
170+
wget https://noaa-ufs-htf-pds.s3.amazonaws.com/develop-20250530/HSD_fix_files_and_case_data.tar.gz
172171
tar xvfz HSD_fix_files_and_case_data.tar.gz
173172
174173
.. _RunContainer:
@@ -234,9 +233,9 @@ Run the ``stage-rt.sh`` script with the proper arguments.
234233
235234
where:
236235

237-
* ``-c`` is the compiler on the user's local machine (e.g., ``intel/2022.1.2``)
238-
* ``-m`` is the :term:`MPI` on the user's local machine (e.g., ``impi/2022.1.2``)
239-
* ``-p`` refers to the local machine/platform (e.g., ``hera``, ``jet``, ``gaea``, ``noaacloud``). Required for Gaea and Jet only.
236+
* ``-c`` is the compiler on the user's local machine (e.g., ``intel/2022.1.2``, ``intel-oneapi-compilers/2022.2.1``, ``intel/2023.2.0``)
237+
* ``-m`` is the :term:`MPI` on the user's local machine (e.g., ``impi/2022.1.2``, ``intel-oneapi-mpi/2021.7.1``, ``cray-mpich/8.1.28``)
238+
* ``-p`` refers to the local machine/platform (e.g., ``hera``, ``gaea``, ``noaacloud``). Required for Gaea, Hercules, and Orion only.
240239
* ``-i`` is the full path to the container image (e.g., ``$img`` or ``$HSD/ubuntu22.04-intel-wm-dev-hsd-test.img``).
241240

242241
.. note::
@@ -259,9 +258,8 @@ Additionally, the user should see the ``ufs-weather-model`` directory in the ``$
259258

260259
.. note::
261260

262-
Gaea and Jet:
261+
Gaea:
263262
* Gaea uses a different compiler and MPI to run with the container: ``-c=intel-classic/2023.2.0 -m=cray-mpich/8.1.28``
264-
* On Jet, ``cd`` to ``/mnt`` first before navigating to individual user workspaces to use the container.
265263

266264
.. _ConfigureExptC:
267265

@@ -287,6 +285,7 @@ Additional configuration may be needed for the specific test the user plans to r
287285

288286
* The :ref:`July 2020 CAPE Test Configuration <cape-config>`
289287
* The :ref:`Baroclinic Instability Test Configuration <bw-config>`
288+
* The :ref:`Idealized, Regional Tropical Cyclone Test Configuration <idealized-config>`
290289

291290
.. _RunExptC:
292291

@@ -303,7 +302,7 @@ To start the experiment, run:
303302
where:
304303

305304
* ``<ACCOUNT>``: Account/project number for batch jobs.
306-
* ``<CASE_NAME>``: Name of the test case (e.g., ``2020_CAPE`` or ``baroclinic_wave``).
305+
* ``<CASE_NAME>``: Name of the test case (e.g., ``2020_CAPE``, ``baroclinic_wave``, or ``tropical_cyclone``).
307306
* ``<COMPILER>``: Compiler used for the tests (``intel`` or ``gnu``).
308307

309308
The script will loop until it runs both tasks or crashes. ``rococtostat`` can be used to track its progress; see the :ref:`Track Progress <TrackProgress>` section for details.

doc/UsersGuide/source/IdealizedTC.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Idealized, Regional Tropical Cyclone Case
88
**************************************
99

10-
The idealized, regional tropical cyclone case is derived from the I-HAFS configuration (:cite:t:`Wang2024`) and is designed to support controlled studies of tropical cyclone dynamics and forecast development. This configuration removes real-world data assimilation and ocean coupling, focusing solely on atmospheric forecasts using idealized inputs.
10+
The idealized, regional tropical cyclone case is derived from the I-HAFS configuration (:cite:t:`Wang2024`) and is designed to support controlled studies of tropical cyclone dynamics and forecast development. It uses the ``FV3_HAFS_v1_thompson_nonsst`` physics suite, which is documented in the `DTC UFS HAFS v1 Scientific Documentation <https://dtcenter.ucar.edu/GMTB/UFS_SRW_HSD_TC/scidoc/_h_a_f_sv1_page.html>`_. The configuration used in this case removes real-world data assimilation and ocean coupling, focusing solely on atmospheric forecasts using idealized inputs.
1111

1212
The case is configured to run at 4-km resolution, with 81 vertical levels. The forecast is initialized on 24 August 2019, and initial/lateral boundary conditions are provided for up to a five-day forecast duration. Initial and lateral boundary conditions (ICs/LBCs) are derived from a large-scale, idealized global FV3-based atmospheric forecast. The initial vortex is constructed using the Reed and Jablonowski (2011) method, introducing a weak, balanced storm into an environment favorable for rapid intensification.
1313

doc/UsersGuide/source/baroclinic_wave.rst

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,6 @@ It is recommended that users adjust certain values in the baroclinic wave case.
5555
5656
In general, it is preferable to make ``FHMAX`` a multiple of 24.
5757

58-
.. note::
59-
60-
On Jet, users will also need to adjust ``${UFS_WM}/tests/fv3_conf/compile_slurm.IN_jet`` in order to manage memory requirements for longer runs of the ``baroclinic_wave`` test. Users will need to change the number of tasks per node from 8 to 6 and add ``#SBATCH --mem=0``.
61-
62-
The file should include:
63-
64-
.. code-block:: console
65-
66-
#SBATCH --ntasks-per-node=6
67-
#SBATCH --mem=0
68-
6958
Baseline Configuration
7059
----------------------
7160

doc/UsersGuide/source/doc-snippets/hsd_data.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Data for the HSD cases is already staged on Tier-1 platforms at the ``INPUTDATA_
22

33
.. code-block:: console
44
5-
wget https://noaa-ufs-htf-pds.s3.amazonaws.com/develop-20241115/HSD_fix_files_and_case_data.tar.gz
5+
wget https://noaa-ufs-htf-pds.s3.amazonaws.com/develop-20250530/HSD_fix_files_and_case_data.tar.gz
66
tar xvfz HSD_fix_files_and_case_data.tar.gz

doc/UsersGuide/source/doc-snippets/hsd_run_multiple.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
To run multiple cases at once, modify ``ufs_test.yaml`` to contain only a subset of tests (e.g., ``2020_CAPE`` and ``baroclinic_wave``) and use the ``-l`` argument:
1+
To run multiple cases at once, modify ``ufs_test.yaml`` to contain only a subset of tests (e.g., ``2020_CAPE``, ``baroclinic_wave``, ``tropical_cyclone``) and use the ``-l`` argument:
22

33
.. code-block:: console
44
55
./ufs_test.sh -a epic -s -c -k -r -l ufs_test.yaml
66
7-
Alternatively, users may copy the sections for ``2020_CAPE``/``baroclinic_wave`` tests into a new YAML file (e.g., ``my_test_cases.yaml``) to call via ``ufs_test.sh``:
7+
Alternatively, users may copy the sections for ``2020_CAPE``/ ``baroclinic_wave``/ ``tropical_cyclone`` tests into a new YAML file (e.g., ``my_test_cases.yaml``) to call via ``ufs_test.sh``:
88

99
.. code-block:: console
1010

tests/bl_date.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export BL_DATE=20250528
1+
export BL_DATE=20250612

tests/default_vars.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,7 +1157,7 @@ export_ugwpv1() {
11571157
export K_SPLIT=2
11581158
export N_SPLIT=4
11591159
export TAU=3.0
1160-
export RF_CUTOFF=100.0
1160+
export RF_CUTOFF=300.0
11611161
export FV_SG_ADJ=450
11621162
;;
11631163
"C1152")
@@ -1169,7 +1169,7 @@ export_ugwpv1() {
11691169
export K_SPLIT=2
11701170
export N_SPLIT=6
11711171
export TAU=2.5
1172-
export RF_CUTOFF=100.0
1172+
export RF_CUTOFF=300.0
11731173
export FV_SG_ADJ=450
11741174
;;
11751175
"C3072")
@@ -1181,7 +1181,7 @@ export_ugwpv1() {
11811181
export K_SPLIT=4
11821182
export N_SPLIT=5
11831183
export TAU=0.5
1184-
export RF_CUTOFF=100.0
1184+
export RF_CUTOFF=300.0
11851185
export FV_SG_ADJ=300
11861186
;;
11871187
*)

0 commit comments

Comments
 (0)