Skip to content

[develop] Update weather model hash to 8933749 (February 19) and add smoke/dust WE2E test to testing suites #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MichaelLueken merged 24 commits into from
Feb 21, 2025
Merged

[develop] Update weather model hash to 8933749 (February 19) and add smoke/dust WE2E test to testing suites #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
fd8bc48
[feature/hash_update_02_2025] Update ufs-weather-model hash to 0682f9…
MichaelLueken Jan 31, 2025
403a3d9
[feature/hash_update_02_2025] Add smoke_dust_grid_RRFS_CONUS_3km_suit…
MichaelLueken Feb 4, 2025
8331610
[feature/hash_update_02_2025] Update modulefiles/build_hera_gnu.lua t…
MichaelLueken Feb 4, 2025
93951d5
[feature/hash_update_02_2025] Add smoke_dust_grid_RRFS_CONUS_3km_suit…
MichaelLueken Feb 6, 2025
c3e5364
Merge branch 'ufs-community:develop' into feature/hash_update_02_2025
MichaelLueken Feb 6, 2025
156c53b
[feature/hash_update_02_2025] Correct warnings produced in documentat…
MichaelLueken Feb 7, 2025
7bbcf0d
[feature/hash_update_02_2025] Correct spelling issue and add pandas t…
MichaelLueken Feb 7, 2025
0359ffc
[feature/hash_update_02_2025] Continuing to address documentation issues
MichaelLueken Feb 7, 2025
b9e735f
[feature/hash_update_02_2025] Continuing to work through documentatio…
MichaelLueken Feb 7, 2025
c8725cc
[feature/hash_update_02_2025] Continuing to work through documentatio…
MichaelLueken Feb 7, 2025
8cd2fec
[feature/hash_update_02_2025] Update ufs-weather-model hash to 893374…
MichaelLueken Feb 19, 2025
7542da5
[feature/hash_update_02_2025] Update Gaea-C5 and Gaea-C6 files to ali…
MichaelLueken Feb 19, 2025
bd15947
[feature/hash_update_02_2025] Update TechDocs with updated sphinx, sp…
MichaelLueken Feb 19, 2025
0960cd2
[feature/hash_update_02_2025] Add --keep-going to SPHINXOPTS to allow…
MichaelLueken Feb 19, 2025
a88e594
[feature/hash_update_02_2025] Change napoleon_custom_sections from a …
MichaelLueken Feb 20, 2025
7825b68
[feature/hash_update_02_2025] Change napoleon_custom_sections back to…
MichaelLueken Feb 20, 2025
95a07b9
[feature/hash_update_02_2025] Change sphinx.ext.napoleon to sphinxcon…
MichaelLueken Feb 20, 2025
8b4e17d
[feature/hash_update_02_2025] Add sphinx.ext.napoleon back
MichaelLueken Feb 20, 2025
00afb5f
[feature/hash_update_02_2025] Remove sphinxcontrib.napoleon
MichaelLueken Feb 20, 2025
a396860
Merge branch 'ufs-community:develop' into feature/hash_update_02_2025
MichaelLueken Feb 20, 2025
21fa25a
add sd support for noaacloud
EdwardSnyder-NOAA Feb 21, 2025
aa785cd
Merge branch 'develop' into feature/hash_update_02_2025
MichaelLueken Feb 21, 2025
455f8b6
Merge pull request #1 from EdwardSnyder-NOAA/feature/hash_update_02_2025
MichaelLueken Feb 21, 2025
55ab00c
[feature/hash_update_02_2025] Update TechDocs to use sphinx==7.4.7
MichaelLueken Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .cicd/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ pipeline {
parameters {
// Allow job runner to filter based on platform
// Use the line below to enable all PW clusters
// choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c6','hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use')
// choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'gaeac6','hera', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use')
// Use the line below to enable the PW AWS cluster
// choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c6', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use')
choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaea', 'gaea-c6', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use')
// choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'gaeac6', 'hera', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use')
choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'gaeac6', 'hera', 'orion', 'hercules'], description: 'Specify the platform(s) to use')
// Allow job runner to filter based on compiler
choice(name: 'SRW_COMPILER_FILTER', choices: ['all', 'gnu', 'intel'], description: 'Specify the compiler(s) to use to build')
// Workflow Wrapper test depth {0..9}, 0=none, 1=simple, 9=all [default]
Expand Down Expand Up @@ -103,7 +103,7 @@ pipeline {
axes {
axis {
name 'SRW_PLATFORM'
values 'derecho', 'gaea', 'gaea-c6', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
values 'derecho', 'gaeac5', 'gaeac6', 'hera', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'
}

axis {
Expand All @@ -117,7 +117,7 @@ pipeline {
exclude {
axis {
name 'SRW_PLATFORM'
values 'derecho', 'gaea', 'gaea-c6', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
values 'derecho', 'gaeac5', 'gaeac6', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1'
}

axis {
Expand Down
2 changes: 1 addition & 1 deletion .cicd/scripts/srw_unittest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi

cd $workspace
# Only run this on machines with hpss access
hpss_machines=( jet hera )
hpss_machines=( hera )
if [[ ${hpss_machines[@]} =~ ${SRW_PLATFORM} ]] ; then

source ${workspace}/ush/load_modules_wflow.sh ${SRW_PLATFORM}
Expand Down
12 changes: 4 additions & 8 deletions .cicd/scripts/wrapper_srw_ftest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ else
fi

# Customize wrapper scripts
if [[ "${SRW_PLATFORM}" == gaea ]]; then
if [[ "${SRW_PLATFORM}" == gaeac5 ]]; then
sed -i '15i #SBATCH --clusters=c5' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
sed -i 's|qos=batch|qos=normal|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
sed -i 's|00:30:00|00:45:00|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
sed -i 's|${JOBSdir}/JREGIONAL_RUN_POST|$USHdir/load_modules_run_task.sh "gaea" "run_post" ${JOBSdir}/JREGIONAL_RUN_POST|g' ${WORKSPACE}/${SRW_PLATFORM}/ush/wrappers/run_post.sh
sed -i 's|${JOBSdir}/JREGIONAL_RUN_POST|$USHdir/load_modules_run_task.sh "gaeac5" "run_post" ${JOBSdir}/JREGIONAL_RUN_POST|g' ${WORKSPACE}/${SRW_PLATFORM}/ush/wrappers/run_post.sh
fi

if [[ "${SRW_PLATFORM}" == gaea-c6 ]]; then
if [[ "${SRW_PLATFORM}" == gaeac6 ]]; then
sed -i '15i #SBATCH --clusters=c6' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
sed -i 's|qos=batch|qos=normal|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
sed -i 's|00:30:00|00:45:00|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
sed -i 's|${JOBSdir}/JREGIONAL_RUN_POST|$USHdir/load_modules_run_task.sh "gaea-c6" "run_post" ${JOBSdir}/JREGIONAL_RUN_POST|g' ${WORKSPACE}/${SRW_PLATFORM}/ush/wrappers/run_post.sh
sed -i 's|${JOBSdir}/JREGIONAL_RUN_POST|$USHdir/load_modules_run_task.sh "gaeac6" "run_post" ${JOBSdir}/JREGIONAL_RUN_POST|g' ${WORKSPACE}/${SRW_PLATFORM}/ush/wrappers/run_post.sh
fi

if [[ "${SRW_PLATFORM}" == hera ]]; then
Expand All @@ -41,10 +41,6 @@ if [[ "${SRW_PLATFORM}" == hera ]]; then
fi
fi

if [[ "${SRW_PLATFORM}" == jet ]]; then
sed -i '15i #SBATCH --partition=xjet' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh
fi

if [[ "${TASK_DEPTH}" == 0 ]] ; then
exit 0
fi
Expand Down
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protocol = git
repo_url = https://github.com/ufs-community/ufs-weather-model
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 3a5e52e
hash = 8933749
local_path = sorc/ufs-weather-model
required = True

Expand Down
6 changes: 3 additions & 3 deletions etc/lmod-setup.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Usage: source etc/lmod-setup.csh PLATFORM

OPTIONS:
PLATFORM - name of machine you are building on
(e.g. cheyenne | hera | jet | orion | hercules | wcoss2 )
(e.g. cheyenne | hera | orion | hercules | wcoss2 )
EOF_USAGE
exit 1
else
Expand Down Expand Up @@ -37,10 +37,10 @@ else if ( "$L_MACHINE" == singularity ) then

module purge

else if ( "$L_MACHINE" == gaea ) then
else if ( "$L_MACHINE" == gaeac5 ) then
module reset

else if ( "$L_MACHINE" == gaea-c6 ) then
else if ( "$L_MACHINE" == gaeac6 ) then
module reset

else if ( "$L_MACHINE" == derecho ) then
Expand Down
6 changes: 3 additions & 3 deletions etc/lmod-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Usage: source etc/lmod-setup.sh PLATFORM

OPTIONS:
PLATFORM - name of machine you are building on
(e.g. cheyenne | hera | jet | orion | hercules | wcoss2 )
(e.g. cheyenne | hera | orion | hercules | wcoss2 )
EOF_USAGE
exit 1
else
Expand Down Expand Up @@ -44,10 +44,10 @@ elif [ "$L_MACHINE" = singularity ]; then

module purge

elif [ "$L_MACHINE" = gaea ]; then
elif [ "$L_MACHINE" = gaeac5 ]; then
module reset

elif [ "$L_MACHINE" = gaea-c6 ]; then
elif [ "$L_MACHINE" = gaeac6 ]; then
module reset

elif [ "$L_MACHINE" = derecho ]; then
Expand Down
0 modulefiles/build_gaea_intel.lua → modulefiles/build_gaeac5_intel.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/build_gaea-c6_intel.lua → modulefiles/build_gaeac6_intel.lua
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion modulefiles/build_hera_gnu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ load("cmake/3.23.1")
load("srw_common")

load(pathJoin("nccmp", os.getenv("nccmp_ver") or "1.9.0.1"))
load(pathJoin("nco", os.getenv("nco_ver") or "5.1.6"))
load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.24"))

prepend_path("CPPFLAGS", " -I/apps/slurm_hera/23.11.3/include/slurm"," ")
Expand Down
3 changes: 3 additions & 0 deletions modulefiles/build_noaacloud_intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,6 @@ unload("gnu")
load("cmake/3.23.1")

load("srw_common")

load(pathJoin("nco", os.getenv("nco_ver") or "5.0.6"))
load(pathJoin("prod_util", os.getenv("prod_util_ver") or "2.1.1"))
0 modulefiles/tasks/gaea-c6/get_obs.local.lua → modulefiles/tasks/gaeac5/get_obs.local.lua
View file
Open in desktop
File renamed without changes.
0 ...iles/tasks/gaea-c6/plot_allvars.local.lua → ...files/tasks/gaeac5/plot_allvars.local.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/tasks/gaea/python_srw.lua → modulefiles/tasks/gaeac5/python_srw.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/tasks/gaea-c6/run_vx.local.lua → modulefiles/tasks/gaeac5/run_vx.local.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/tasks/gaea/get_obs.local.lua → modulefiles/tasks/gaeac6/get_obs.local.lua
View file
Open in desktop
File renamed without changes.
0 ...lefiles/tasks/gaea/plot_allvars.local.lua → ...files/tasks/gaeac6/plot_allvars.local.lua
View file
Open in desktop
File renamed without changes.
0 ...lefiles/tasks/gaea-c6/prepstart.local.lua → modulefiles/tasks/gaeac6/prepstart.local.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/tasks/gaea-c6/python_srw.lua → modulefiles/tasks/gaeac6/python_srw.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/tasks/gaea-c6/python_srw_sd.lua → modulefiles/tasks/gaeac6/python_srw_sd.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/tasks/gaea/run_vx.local.lua → modulefiles/tasks/gaeac6/run_vx.local.lua
View file
Open in desktop
File renamed without changes.
0 ...efiles/tasks/gaea-c6/smoke_dust.local.lua → ...lefiles/tasks/gaeac6/smoke_dust.local.lua
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions modulefiles/tasks/noaacloud/prepstart.local.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
load("python_srw_sd")
1 change: 1 addition & 0 deletions modulefiles/tasks/noaacloud/smoke_dust.local.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
load("python_srw_sd")
0 modulefiles/wflow_gaea.lua → modulefiles/wflow_gaeac5.lua
View file
Open in desktop
File renamed without changes.
0 modulefiles/wflow_gaea-c6.lua → modulefiles/wflow_gaeac6.lua
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions tests/WE2E/machine_suites/comprehensive
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ MET_ensemble_verification_only_vx_time_lag
MET_ensemble_verification_winter_wx
MET_verification_only_vx
pregen_grid_orog_sfc_climo
smoke_dust_grid_RRFS_CONUS_3km_suite_HRRR_gf
specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS
specify_template_filenames
vx-det_long-fcst_custom-vx-config_aiml-fourcastnet
Expand Down
1 change: 0 additions & 1 deletion tests/WE2E/machine_suites/comprehensive.gaea-c6
View file
Open in desktop

This file was deleted.

23 changes: 6 additions & 17 deletions tests/WE2E/machine_suites/comprehensive.jet → .../WE2E/machine_suites/comprehensive.gaeac5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,14 @@
community
custom_ESGgrid
custom_ESGgrid_Central_Asia_3km
custom_ESGgrid_Great_Lakes_snow_8km
custom_ESGgrid_IndianOcean_6km
custom_ESGgrid_NewZealand_3km
custom_ESGgrid_Peru_12km
custom_ESGgrid_SF_1p1km
custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE
custom_GFDLgrid
deactivate_tasks
#get_from_AWS_ics_GEFS_lbcs_GEFS_fmt_grib2_2022040400_ensemble_2mems
get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_grib2_2019061200
get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2019061200
get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_nemsio_2021032018
get_from_HPSS_ics_FV3GFS_lbcs_FV3GFS_fmt_netcdf_2022060112_48h
#get_from_HPSS_ics_GDAS_lbcs_GDAS_fmt_netcdf_2022040400_ensemble_2mems
get_from_HPSS_ics_GSMGFS_lbcs_GSMGFS
get_from_HPSS_ics_HRRR_lbcs_RAP
get_from_HPSS_ics_RAP_lbcs_RAP
get_from_AWS_ics_GEFS_lbcs_GEFS_fmt_grib2_2022040400_ensemble_2mems
get_from_NOMADS_ics_FV3GFS_lbcs_FV3GFS
grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
Expand All @@ -46,11 +37,11 @@ grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_RAP_suite_RAP
grid_RRFS_CONUS_25km_ics_GSMGFS_lbcs_GSMGFS_suite_GFS_v15p2
grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16
grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_RRFS_v1beta
#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
#grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR
grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta
grid_RRFS_CONUScompact_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR
grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
Expand All @@ -67,9 +58,7 @@ grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR
grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_RAP_suite_WoFS_v0
grid_SUBCONUS_Ind_3km_ics_NAM_lbcs_NAM_suite_GFS_v16
grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot
long_fcst
MET_ensemble_verification_only_vx
MET_ensemble_verification_only_vx_time_lag
MET_ensemble_verification_winter_wx
MET_verification_only_vx
pregen_grid_orog_sfc_climo
Expand Down
0 tests/WE2E/machine_suites/comprehensive.gaea → .../WE2E/machine_suites/comprehensive.gaeac6
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions tests/WE2E/machine_suites/comprehensive.orion
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,6 @@ MET_ensemble_verification_only_vx
MET_ensemble_verification_winter_wx
MET_verification_only_vx
pregen_grid_orog_sfc_climo
smoke_dust_grid_RRFS_CONUS_3km_suite_HRRR_gf
specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS
specify_template_filenames
0 tests/WE2E/machine_suites/coverage.gaea → tests/WE2E/machine_suites/coverage.gaeac5
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions tests/WE2E/machine_suites/coverage.gaea-c6 → tests/WE2E/machine_suites/coverage.gaeac6
View file
Open in desktop
Comment thread
EdwardSnyder-NOAA marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km
grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR
grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta
grid_SUBCONUS_Ind_3km_ics_RAP_lbcs_RAP_suite_RRFS_v1beta_plot
smoke_dust_grid_RRFS_CONUS_3km_suite_HRRR_gf
2020_CAPE
2020_easter_storm
11 changes: 0 additions & 11 deletions tests/WE2E/machine_suites/coverage.jet
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/WE2E/setup_WE2E_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function usage {

}

machines=( hera jet cheyenne derecho orion wcoss2 gaea gaea-c6 odin singularity macos noaacloud )
machines=( hera cheyenne derecho orion wcoss2 gaeac5 gaeac6 odin singularity macos noaacloud )

if [ "$1" = "-h" ] ; then usage ; fi
[[ $# -le 2 ]] && usage
Expand Down
2 changes: 1 addition & 1 deletion tests/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function usage() {
exit 1
}

machines=( hera jet cheyenne derecho orion hercules wcoss2 gaea gaea-c6 odin singularity macos noaacloud )
machines=( hera derecho orion hercules wcoss2 gaeac5 gaeac6 odin singularity macos noaacloud )

[[ $# -gt 4 ]] && usage

Expand Down
0 ush/machine/gaea.yaml → ush/machine/gaeac5.yaml
View file
Open in desktop
File renamed without changes.
0 ush/machine/gaea-c6.yaml → ush/machine/gaeac6.yaml
View file
Open in desktop
File renamed without changes.
11 changes: 10 additions & 1 deletion ush/machine/noaacloud.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,18 @@ platform:
FIXorg: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_orog
FIXsfc: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_sfc_climo
FIXshp: /contrib/EPIC/UFS_SRW_data/develop/NaturalEarth
FIXaqm: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_aqm
FIXemis: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_emis
FIXsmoke: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_smoke
FIXupp: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_upp
FIXcrtm: /contrib/EPIC/UFS_SRW_data/develop/fix/fix_crtm
EXTRN_MDL_DATA_STORES: aws nomads
data:
ics_lbcs:
FV3GFS:
nemsio: /contrib/EPIC/UFS_SRW_data/develop/input_model_data/FV3GFS/nemsio/${yyyymmdd}${hh}
grib2: /contrib/EPIC/UFS_SRW_data/develop/input_model_data/FV3GFS/grib2/${yyyymmdd}${hh}
grib2: /contrib/EPIC/UFS_SRW_data/develop/input_model_data/FV3GFS/grib2/${yyyymmdd}${hh}

smoke_dust_parm:
COMINsmoke_default: /contrib/EPIC/UFS_SRW_data/develop/data_smoke_dust/RAVE_smoke_dust
COMINrave_default: /contrib/EPIC/UFS_SRW_data/develop/data_smoke_dust/RAVE_fire
2 changes: 1 addition & 1 deletion ush/valid_param_vals.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
valid_vals_RUN_ENVIR: ["nco", "community"]
valid_vals_VERBOSE: [True, False]
valid_vals_DEBUG: [True, False]
valid_vals_MACHINE: ["HERA", "WCOSS2", "ORION", "HERCULES", "JET", "DERECHO", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEA", "GAEA-C6"]
valid_vals_MACHINE: ["HERA", "WCOSS2", "ORION", "HERCULES", "DERECHO", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEAC5", "GAEAC6"]
valid_vals_SCHED: ["slurm", "pbspro", "lsf", "lsfcray", "none"]
valid_vals_FCST_MODEL: ["ufs-weather-model"]
valid_vals_WORKFLOW_MANAGER: ["rocoto", "ecflow", "none"]
Expand Down