From 4212296724e646de92ed1a3b82409fefb4a0088f Mon Sep 17 00:00:00 2001 From: Michael Lueken <63728921+MichaelLueken@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:00:10 -0400 Subject: [PATCH] [develop] Update ufs-weather-model hash and remove machine/modulefiles/WE2E test suites for decommissioned machines (#1117) * Update ufs-weather-model hash to a1143cc (August 12) * Remove machine files, modulefiles, and WE2E test suites for decommissioned machine, Cheyenne * Update build_jet_intel.lua modulefile to point to the /contrib spack-stack location, rather than /lfs4. At the end of September, /lfs4 is scheduled to be unmounted. * Update ush/machine/jet.yaml machine file to point to /lfs5 instead of /lfs4 for staged data on Jet. At the end of September, /lfs4 is schedules to be unmounted. * Updated ContainerQuickstart.rst and RunSRW.rst to note the new container location on Jet (/lfs5 instead of /lfs4) and the location of the staged data (/lfs5 instead of /lfs4). * Uncommented four WE2E tests that had previously failed in make_sfc_climo in the comprehensive WE2E suite for Derecho (comprehensive.derecho). --- .github/CODEOWNERS | 2 +- Externals.cfg | 2 +- .../ContainerQuickstart.rst | 2 +- .../BuildingRunningTesting/RunSRW.rst | 2 +- modulefiles/build_cheyenne_gnu.lua | 33 ------------ modulefiles/build_cheyenne_intel.lua | 27 ---------- modulefiles/build_jet_intel.lua | 2 +- modulefiles/tasks/cheyenne/aqm_ics.local.lua | 3 -- modulefiles/tasks/cheyenne/aqm_lbcs.local.lua | 3 -- .../tasks/cheyenne/fire_emission.local.lua | 2 - .../tasks/cheyenne/nexus_emission.local.lua | 5 -- .../tasks/cheyenne/nexus_gfs_sfc.local.lua | 2 - .../tasks/cheyenne/nexus_post_split.local.lua | 3 -- .../tasks/cheyenne/plot_allvars.local.lua | 3 -- .../tasks/cheyenne/point_source.local.lua | 2 - .../tasks/cheyenne/pre_post_stat.local.lua | 2 - modulefiles/tasks/cheyenne/python_srw.lua | 3 -- modulefiles/tasks/cheyenne/run_vx.local.lua | 25 --------- modulefiles/wflow_cheyenne.lua | 23 -------- .../machine_suites/comprehensive.cheyenne | 53 ------------------- .../WE2E/machine_suites/comprehensive.derecho | 8 +-- tests/WE2E/machine_suites/coverage.cheyenne | 8 --- ush/machine/cheyenne.yaml | 35 ------------ ush/machine/jet.yaml | 32 +++++------ 24 files changed, 25 insertions(+), 257 deletions(-) delete mode 100644 modulefiles/build_cheyenne_gnu.lua delete mode 100644 modulefiles/build_cheyenne_intel.lua delete mode 100644 modulefiles/tasks/cheyenne/aqm_ics.local.lua delete mode 100644 modulefiles/tasks/cheyenne/aqm_lbcs.local.lua delete mode 100644 modulefiles/tasks/cheyenne/fire_emission.local.lua delete mode 100644 modulefiles/tasks/cheyenne/nexus_emission.local.lua delete mode 100644 modulefiles/tasks/cheyenne/nexus_gfs_sfc.local.lua delete mode 100644 modulefiles/tasks/cheyenne/nexus_post_split.local.lua delete mode 100644 modulefiles/tasks/cheyenne/plot_allvars.local.lua delete mode 100644 modulefiles/tasks/cheyenne/point_source.local.lua delete mode 100644 modulefiles/tasks/cheyenne/pre_post_stat.local.lua delete mode 100644 modulefiles/tasks/cheyenne/python_srw.lua delete mode 100644 modulefiles/tasks/cheyenne/run_vx.local.lua delete mode 100644 modulefiles/wflow_cheyenne.lua delete mode 100644 tests/WE2E/machine_suites/comprehensive.cheyenne delete mode 100644 tests/WE2E/machine_suites/coverage.cheyenne delete mode 100644 ush/machine/cheyenne.yaml diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index bdc428c736..700cea255c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,7 +3,7 @@ # These owners will be the default owners for everything in the repo. #* @defunkt -* @mkavulich @gsketefian @JeffBeck-NOAA @RatkoVasic-NOAA @BenjaminBlake-NOAA @ywangwof @chan-hoo @panll @christinaholtNOAA @christopherwharrop-noaa @danielabdi-noaa @mark-a-potts @jkbk2004 @willmayfield @dmwright526 @gspetro-NOAA @natalie-perlin @EdwardSnyder-NOAA @MichaelLueken +* @mkavulich @gsketefian @JeffBeck-NOAA @RatkoVasic-NOAA @BenjaminBlake-NOAA @ywangwof @chan-hoo @panll @christinaholtNOAA @christopherwharrop-noaa @danielabdi-noaa @mark-a-potts @jkbk2004 @willmayfield @dmwright526 @gspetro-NOAA @natalie-perlin @EdwardSnyder-NOAA @MichaelLueken @rickgrubin-noaa # Order is important. The last matching pattern has the most precedence. # So if a pull request only touches javascript files, only these owners diff --git a/Externals.cfg b/Externals.cfg index 4545cd8ca5..b57d63957e 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -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 = b5a1976 +hash = a1143cc local_path = sorc/ufs-weather-model required = True diff --git a/doc/UsersGuide/BuildingRunningTesting/ContainerQuickstart.rst b/doc/UsersGuide/BuildingRunningTesting/ContainerQuickstart.rst index d9dd1a0afc..0607a232b5 100644 --- a/doc/UsersGuide/BuildingRunningTesting/ContainerQuickstart.rst +++ b/doc/UsersGuide/BuildingRunningTesting/ContainerQuickstart.rst @@ -81,7 +81,7 @@ On most Level 1 systems, a container named ``ubuntu20.04-intel-ue-1.4.1-srw-dev. * - Hera - /scratch1/NCEPDEV/nems/role.epic/containers * - Jet - - /mnt/lfs4/HFIP/hfv3gfs/role.epic/containers + - /mnt/lfs5/HFIP/hfv3gfs/role.epic/containers * - NOAA Cloud - /contrib/EPIC/containers * - Orion/Hercules [#fn]_ diff --git a/doc/UsersGuide/BuildingRunningTesting/RunSRW.rst b/doc/UsersGuide/BuildingRunningTesting/RunSRW.rst index b9471acd69..831b2a6345 100644 --- a/doc/UsersGuide/BuildingRunningTesting/RunSRW.rst +++ b/doc/UsersGuide/BuildingRunningTesting/RunSRW.rst @@ -62,7 +62,7 @@ The SRW App requires input files to run. These include static datasets, initial * - Hercules - /work/noaa/epic/role-epic/contrib/UFS_SRW_data/|data|/input_model_data/ * - Jet - - /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/|data|/input_model_data/ + - /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/|data|/input_model_data/ * - NOAA Cloud - /contrib/EPIC/UFS_SRW_data/|data|/input_model_data/ * - Orion diff --git a/modulefiles/build_cheyenne_gnu.lua b/modulefiles/build_cheyenne_gnu.lua deleted file mode 100644 index 58398891b2..0000000000 --- a/modulefiles/build_cheyenne_gnu.lua +++ /dev/null @@ -1,33 +0,0 @@ -help([[ -This module loads libraries for building the UFS SRW App on -the CISL machine Cheyenne using GNU -]]) - -whatis([===[Loads libraries needed for building the UFS SRW App on Cheyenne ]===]) - -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0")) -load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "1.3")) -load(pathJoin("gnu", os.getenv("gnu_ver") or "11.2.0")) -load(pathJoin("mpt", os.getenv("mpt_ver") or "2.25")) -setenv("MKLROOT", "/glade/u/apps/opt/intel/2022.1/mkl/latest") -load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "0.5.0")) -unload("netcdf") - -prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/hpc-stack/gnu11.2.0_ncdf492/modulefiles/stack") -load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) -load(pathJoin("hpc-gnu", os.getenv("hpc_gnu_ver") or "11.2.0")) -load(pathJoin("hpc-mpt", os.getenv("hpc_mpt_ver") or "2.25")) - -load("srw_common") - -load(pathJoin("openblas", os.getenv("openblas_ver") or "0.3.23")) - -unsetenv("MKLROOT") -setenv("CMAKE_C_COMPILER","mpicc") -setenv("CMAKE_CXX_COMPILER","mpicxx") -setenv("CMAKE_Fortran_COMPILER","mpif90") -setenv("CMAKE_Platform","cheyenne.gnu") -setenv("CC", "mpicc") -setenv("CXX", "mpicxx") -setenv("FC", "mpif90") - diff --git a/modulefiles/build_cheyenne_intel.lua b/modulefiles/build_cheyenne_intel.lua deleted file mode 100644 index 298c9879ac..0000000000 --- a/modulefiles/build_cheyenne_intel.lua +++ /dev/null @@ -1,27 +0,0 @@ -help([[ -This module loads libraries for building the UFS SRW App on -the CISL machine Cheyenne using Intel-2022.1 -]]) - -whatis([===[Loads libraries needed for building the UFS SRW App on Cheyenne ]===]) - -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0")) -load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "1.3")) -load(pathJoin("intel", os.getenv("intel_ver") or "2022.1")) -load(pathJoin("mpt", os.getenv("mpt_ver") or "2.25")) -load(pathJoin("mkl", os.getenv("mkl_ver") or "2022.1")) -load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "0.5.0")) -unload("netcdf") - -prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1_ncdf492/modulefiles/stack") -load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) -load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver") or "2022.1")) -load(pathJoin("hpc-mpt", os.getenv("hpc_mpt_ver") or "2.25")) - -load("srw_common") - -setenv("CMAKE_C_COMPILER","mpicc") -setenv("CMAKE_CXX_COMPILER","mpicpc") -setenv("CMAKE_Fortran_COMPILER","mpif90") -setenv("CMAKE_Platform","cheyenne.intel") - diff --git a/modulefiles/build_jet_intel.lua b/modulefiles/build_jet_intel.lua index 854b4404cb..a0169a684a 100644 --- a/modulefiles/build_jet_intel.lua +++ b/modulefiles/build_jet_intel.lua @@ -5,7 +5,7 @@ the NOAA RDHPC machine Jet using Intel-2021.5.0 whatis([===[Loads libraries needed for building the UFS SRW App on Jet ]===]) -prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core") +prepend_path("MODULEPATH","/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core") load("stack-intel/2021.5.0") load("stack-intel-oneapi-mpi/2021.5.1") diff --git a/modulefiles/tasks/cheyenne/aqm_ics.local.lua b/modulefiles/tasks/cheyenne/aqm_ics.local.lua deleted file mode 100644 index 9c9f0ca3d5..0000000000 --- a/modulefiles/tasks/cheyenne/aqm_ics.local.lua +++ /dev/null @@ -1,3 +0,0 @@ -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0")) -load("nco/4.9.5") -load("python_srw_aqm") diff --git a/modulefiles/tasks/cheyenne/aqm_lbcs.local.lua b/modulefiles/tasks/cheyenne/aqm_lbcs.local.lua deleted file mode 100644 index 9c9f0ca3d5..0000000000 --- a/modulefiles/tasks/cheyenne/aqm_lbcs.local.lua +++ /dev/null @@ -1,3 +0,0 @@ -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0")) -load("nco/4.9.5") -load("python_srw_aqm") diff --git a/modulefiles/tasks/cheyenne/fire_emission.local.lua b/modulefiles/tasks/cheyenne/fire_emission.local.lua deleted file mode 100644 index 86252a9a4f..0000000000 --- a/modulefiles/tasks/cheyenne/fire_emission.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("ncarenv") -load("python_srw_aqm") diff --git a/modulefiles/tasks/cheyenne/nexus_emission.local.lua b/modulefiles/tasks/cheyenne/nexus_emission.local.lua deleted file mode 100644 index 3c690fa12a..0000000000 --- a/modulefiles/tasks/cheyenne/nexus_emission.local.lua +++ /dev/null @@ -1,5 +0,0 @@ -load("nco/4.9.5") -load("mpt/2.25") - -load("ncarenv") -load("python_srw_aqm") diff --git a/modulefiles/tasks/cheyenne/nexus_gfs_sfc.local.lua b/modulefiles/tasks/cheyenne/nexus_gfs_sfc.local.lua deleted file mode 100644 index 86252a9a4f..0000000000 --- a/modulefiles/tasks/cheyenne/nexus_gfs_sfc.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("ncarenv") -load("python_srw_aqm") diff --git a/modulefiles/tasks/cheyenne/nexus_post_split.local.lua b/modulefiles/tasks/cheyenne/nexus_post_split.local.lua deleted file mode 100644 index e3f4bbe95d..0000000000 --- a/modulefiles/tasks/cheyenne/nexus_post_split.local.lua +++ /dev/null @@ -1,3 +0,0 @@ -load(pathJoin("nco", os.getenv("nco_ver") or "4.9.5")) -load("ncarenv") -load("python_srw_aqm") diff --git a/modulefiles/tasks/cheyenne/plot_allvars.local.lua b/modulefiles/tasks/cheyenne/plot_allvars.local.lua deleted file mode 100644 index 7cee04231e..0000000000 --- a/modulefiles/tasks/cheyenne/plot_allvars.local.lua +++ /dev/null @@ -1,3 +0,0 @@ -unload("python") -load("conda") -setenv("SRW_GRAPHICS_ENV", "srw_graphics") diff --git a/modulefiles/tasks/cheyenne/point_source.local.lua b/modulefiles/tasks/cheyenne/point_source.local.lua deleted file mode 100644 index 86252a9a4f..0000000000 --- a/modulefiles/tasks/cheyenne/point_source.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("ncarenv") -load("python_srw_aqm") diff --git a/modulefiles/tasks/cheyenne/pre_post_stat.local.lua b/modulefiles/tasks/cheyenne/pre_post_stat.local.lua deleted file mode 100644 index 042eb2f732..0000000000 --- a/modulefiles/tasks/cheyenne/pre_post_stat.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("nco/4.9.5") -load("python_srw_aqm") diff --git a/modulefiles/tasks/cheyenne/python_srw.lua b/modulefiles/tasks/cheyenne/python_srw.lua deleted file mode 100644 index fe6c73a7d5..0000000000 --- a/modulefiles/tasks/cheyenne/python_srw.lua +++ /dev/null @@ -1,3 +0,0 @@ -unload("python") -load("conda") -setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/cheyenne/run_vx.local.lua b/modulefiles/tasks/cheyenne/run_vx.local.lua deleted file mode 100644 index 54cc632c21..0000000000 --- a/modulefiles/tasks/cheyenne/run_vx.local.lua +++ /dev/null @@ -1,25 +0,0 @@ ---[[ -Compiler-specific modules are used for met and metplus libraries ---]] -local met_ver = (os.getenv("met_ver") or "10.1.2") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.3") -if (mode() == "load") then - load(pathJoin("met", met_ver)) - load(pathJoin("metplus",metplus_ver)) -end -local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT") -local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT") - -setenv("MET_INSTALL_DIR", base_met) -setenv("MET_BIN_EXEC", pathJoin(base_met,"bin")) -setenv("MET_BASE", pathJoin(base_met,"share/met")) -setenv("MET_VERSION", met_ver) -setenv("METPLUS_VERSION", metplus_ver) -setenv("METPLUS_ROOT", base_metplus) -setenv("METPLUS_PATH", base_metplus) - -if (mode() == "unload") then - unload(pathJoin("met", met_ver)) - unload(pathJoin("metplus",metplus_ver)) -end -load("python_srw") diff --git a/modulefiles/wflow_cheyenne.lua b/modulefiles/wflow_cheyenne.lua deleted file mode 100644 index fd4bc3eae5..0000000000 --- a/modulefiles/wflow_cheyenne.lua +++ /dev/null @@ -1,23 +0,0 @@ -help([[ -This module loads python environement for running the UFS SRW App on -on the CISL machine Cheyenne -]]) - -whatis([===[Loads libraries needed for running the UFS SRW App on Cheyenne ]===]) - -load("ncarenv") - -append_path("MODULEPATH","/glade/p/ral/jntp/UFS_SRW_app/modules") -load("rocoto") - -unload("python") - -load("conda") - - -if mode() == "load" then - LmodMsgRaw([===[Please do the following to activate conda: - > conda activate srw_app -]===]) -end - diff --git a/tests/WE2E/machine_suites/comprehensive.cheyenne b/tests/WE2E/machine_suites/comprehensive.cheyenne deleted file mode 100644 index 96792e37b0..0000000000 --- a/tests/WE2E/machine_suites/comprehensive.cheyenne +++ /dev/null @@ -1,53 +0,0 @@ -community -custom_ESGgrid -custom_ESGgrid_Central_Asia_3km -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 -grid_CONUS_25km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 -grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta -grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot -grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta -grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15p2 -grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot -grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v17_p8_plot -grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR -grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP -grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta -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_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 -grid_RRFS_CONUScompact_25km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_HRRR_suite_HRRR -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -grid_RRFS_CONUScompact_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 -grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_HRRR -grid_RRFS_CONUScompact_3km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -grid_RRFS_NA_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP -grid_SUBCONUS_Ind_3km_ics_FV3GFS_lbcs_FV3GFS_suite_WoFS_v0 -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 -MET_ensemble_verification_only_vx -MET_verification_only_vx -pregen_grid_orog_sfc_climo -specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS -specify_template_filenames diff --git a/tests/WE2E/machine_suites/comprehensive.derecho b/tests/WE2E/machine_suites/comprehensive.derecho index 5464a053d8..5930843582 100644 --- a/tests/WE2E/machine_suites/comprehensive.derecho +++ b/tests/WE2E/machine_suites/comprehensive.derecho @@ -9,9 +9,9 @@ 2020_jan_cold_blast community custom_ESGgrid -#custom_ESGgrid_Central_Asia_3km +custom_ESGgrid_Central_Asia_3km custom_ESGgrid_IndianOcean_6km -#custom_ESGgrid_NewZealand_3km +custom_ESGgrid_NewZealand_3km custom_ESGgrid_Peru_12km custom_ESGgrid_SF_1p1km custom_GFDLgrid__GFDLgrid_USE_NUM_CELLS_IN_FILENAMES_eq_FALSE @@ -20,8 +20,8 @@ deactivate_tasks 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 -#grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot +grid_CONUS_3km_GFDLgrid_ics_FV3GFS_lbcs_FV3GFS_suite_RRFS_v1beta +grid_RRFS_AK_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot grid_RRFS_AK_3km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot diff --git a/tests/WE2E/machine_suites/coverage.cheyenne b/tests/WE2E/machine_suites/coverage.cheyenne deleted file mode 100644 index 8f3c3ec78c..0000000000 --- a/tests/WE2E/machine_suites/coverage.cheyenne +++ /dev/null @@ -1,8 +0,0 @@ -custom_ESGgrid_IndianOcean_6km -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16_plot -grid_RRFS_CONUS_25km_ics_NAM_lbcs_NAM_suite_GFS_v16 -grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_HRRR -grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -grid_SUBCONUS_Ind_3km_ics_HRRR_lbcs_HRRR_suite_HRRR -pregen_grid_orog_sfc_climo -specify_template_filenames diff --git a/ush/machine/cheyenne.yaml b/ush/machine/cheyenne.yaml deleted file mode 100644 index a91c52e170..0000000000 --- a/ush/machine/cheyenne.yaml +++ /dev/null @@ -1,35 +0,0 @@ -platform: - WORKFLOW_MANAGER: rocoto - NCORES_PER_NODE: 36 - SCHED: pbspro - TEST_CCPA_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/ccpa/proc - TEST_MRMS_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/mrms/proc - TEST_NDAS_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/ndas/proc - TEST_NOHRSC_OBS_DIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/obs_data/nohrsc/proc - DOMAIN_PREGEN_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/FV3LAM_pregen - QUEUE_DEFAULT: regular - QUEUE_FCST: regular - QUEUE_HPSS: regular - RUN_CMD_FCST: mpirun -np ${PE_MEMBER01} - RUN_CMD_POST: mpirun -np $nprocs - RUN_CMD_PRDGEN: mpirun -np $nprocs - RUN_CMD_SERIAL: time - RUN_CMD_UTILS: mpirun -np $nprocs - RUN_CMD_NEXUS: mpirun -np $nprocs - RUN_CMD_AQMLBC: mpirun -np ${NUMTS} - PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' - TEST_EXTRN_MDL_SOURCE_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data - TEST_AQM_INPUT_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/aqm_data - TEST_PREGEN_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/FV3LAM_pregen - TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir - TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir - TEST_VX_FCST_INPUT_BASEDIR: '{{ "/glade/work/epicufsrt/contrib/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' - FIXaer: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_aer - FIXgsm: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_am - FIXlut: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_lut - FIXorg: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_orog - FIXsfc: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_sfc_climo - FIXshp: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/NaturalEarth -data: - ics_lbcs: - FV3GFS: /glade/p/ral/jntp/UFS_CAM/COMGFS/gfs.${yyyymmdd}/${hh} diff --git a/ush/machine/jet.yaml b/ush/machine/jet.yaml index 93d375ee02..375711c61a 100644 --- a/ush/machine/jet.yaml +++ b/ush/machine/jet.yaml @@ -2,11 +2,11 @@ platform: WORKFLOW_MANAGER: rocoto NCORES_PER_NODE: 24 SCHED: slurm - TEST_CCPA_OBS_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/ccpa/proc - TEST_MRMS_OBS_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/mrms/proc - TEST_NDAS_OBS_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/ndas/proc - TEST_NOHRSC_OBS_DIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/nohrsc/proc - DOMAIN_PREGEN_BASEDIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/FV3LAM_pregen + TEST_CCPA_OBS_DIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/ccpa/proc + TEST_MRMS_OBS_DIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/mrms/proc + TEST_NDAS_OBS_DIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/ndas/proc + TEST_NOHRSC_OBS_DIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/obs_data/nohrsc/proc + DOMAIN_PREGEN_BASEDIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/FV3LAM_pregen PARTITION_DEFAULT: sjet,vjet,kjet,xjet QUEUE_DEFAULT: batch PARTITION_FCST: xjet @@ -21,17 +21,17 @@ platform: SCHED_NATIVE_CMD: --export=NONE SCHED_NATIVE_CMD_HPSS: -n 1 --export=NONE PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' - TEST_EXTRN_MDL_SOURCE_BASEDIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/input_model_data - TEST_PREGEN_BASEDIR: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/FV3LAM_pregen - TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir - TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir - TEST_VX_FCST_INPUT_BASEDIR: '{{ "/mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' - FIXaer: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_aer - FIXgsm: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_am - FIXlut: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_lut - FIXorg: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_orog - FIXsfc: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_sfc_climo - FIXshp: /mnt/lfs4/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/NaturalEarth + TEST_EXTRN_MDL_SOURCE_BASEDIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/input_model_data + TEST_PREGEN_BASEDIR: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/FV3LAM_pregen + TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir + TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir + TEST_VX_FCST_INPUT_BASEDIR: '{{ "/mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' + FIXaer: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_aer + FIXgsm: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_am + FIXlut: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_lut + FIXorg: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_orog + FIXsfc: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/fix/fix_sfc_climo + FIXshp: /mnt/lfs5/HFIP/hfv3gfs/role.epic/UFS_SRW_data/develop/NaturalEarth EXTRN_MDL_DATA_STORES: hpss aws nomads data: ics_lbcs: