From a3950b4205733838b18b1a6a8b3322fe9009166b Mon Sep 17 00:00:00 2001 From: Christina Holt <56881914+christinaholtNOAA@users.noreply.github.com> Date: Wed, 16 Feb 2022 13:23:33 -0600 Subject: [PATCH 1/8] Update hash for regional_workflow. (#213) ## DESCRIPTION OF CHANGES: Updates the hash to the regional_workflow to include the script necessary for running automated WE2E tests. ## TESTS CONDUCTED: Tests were conducted with the top of this branch with the acceptance of the regional_workflow PR (https://github.com/ufs-community/regional_workflow/pull/676). --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index ff41b51141..b72c34da7e 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -3,7 +3,7 @@ protocol = git repo_url = https://github.com/ufs-community/regional_workflow # Specify either a branch name or a hash but not both. #branch = develop -hash = f5f8158 +hash = e5d5c38 local_path = regional_workflow required = True From 20e3fa8820a86389820ac4e44cf9a4c2404205c8 Mon Sep 17 00:00:00 2001 From: Tracy Hertneky <39317287+hertneky@users.noreply.github.com> Date: Sat, 19 Feb 2022 16:43:44 -0700 Subject: [PATCH 2/8] Update UPP hash to current develop (#214) Co-authored-by: Tracy --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index b72c34da7e..a504a4ab07 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -30,7 +30,7 @@ protocol = git repo_url = https://github.com/NOAA-EMC/UPP # Specify either a branch name or a hash but not both. #branch = develop -hash = a49af05 +hash = 4a16052 local_path = src/UPP required = True From f6a78fe90ec7ec921de06bad9fff2ac8dead93b9 Mon Sep 17 00:00:00 2001 From: JeffBeck-NOAA <55201531+JeffBeck-NOAA@users.noreply.github.com> Date: Tue, 22 Feb 2022 16:46:09 -0700 Subject: [PATCH 3/8] Update CODEOWNERS file for new code reviewers (#217) --- .github/CODEOWNERS | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c05ae70791..2992d3de9c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -3,8 +3,7 @@ # These owners will be the default owners for everything in the repo. #* @defunkt -* @mkavulich @gsketefian @JeffBeck-NOAA @RatkoVasic-NOAA @BenjaminBlake-NOAA - +* @mkavulich @gsketefian @JeffBeck-NOAA @RatkoVasic-NOAA @BenjaminBlake-NOAA @ywangwof @chan-hoo @BenjaminBlake-NOAA @RatkoVasic-NOAA @panll @christinaholtNOAA @christopherwharrop-noaa @danielabdi-noaa @mark-a-potts @jkbk2004 @willmayfield @jwolff-ncar @dmwright526 # Order is important. The last matching pattern has the most precedence. # So if a pull request only touches javascript files, only these owners # will be requested to review. From 13bd274af987515069a3a9da508a4646cc000719 Mon Sep 17 00:00:00 2001 From: EdwardSnyder-NOAA <96196752+EdwardSnyder-NOAA@users.noreply.github.com> Date: Tue, 8 Mar 2022 11:35:13 -0600 Subject: [PATCH 4/8] Feature/singularity addition (#220) * Create build_singularity_gnu.env * Create wflow_singularity.env * Updated regional_workflow pointer: ES fork branch * Update build_singularity_gnu.env * Update Externals.cfg Updated the Regional Workflow repo as the accompanied PR (https://github.com/ufs-community/regional_workflow/pull/686) has been merged into the develop branch. * Update Externals.cfg updated regional workflow hash * Update build_singularity_gnu.env Co-authored-by: JONG KIM --- Externals.cfg | 2 +- env/build_singularity_gnu.env | 40 +++++++++++++++++++++++++++++++++++ env/wflow_singularity.env | 3 +++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 env/build_singularity_gnu.env create mode 100644 env/wflow_singularity.env diff --git a/Externals.cfg b/Externals.cfg index a504a4ab07..f1c6d0a3b9 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -3,7 +3,7 @@ protocol = git repo_url = https://github.com/ufs-community/regional_workflow # Specify either a branch name or a hash but not both. #branch = develop -hash = e5d5c38 +hash = 2c3919e local_path = regional_workflow required = True diff --git a/env/build_singularity_gnu.env b/env/build_singularity_gnu.env new file mode 100644 index 0000000000..dc1c65265e --- /dev/null +++ b/env/build_singularity_gnu.env @@ -0,0 +1,40 @@ +#Setup instructions for singularity container using gnu 9.3.0 built from this docker image: docker://noaaepic/ubuntu20.04-epic-srwapp:1.0 +#https://hub.docker.com/r/noaaepic/ubuntu20.04-epic-srwapp + +source /usr/share/lmod/6.6/init/profile + +module purge + +module use /opt/hpc-modules/modulefiles/stack + +module load hpc +module load hpc-gnu +module load hpc-openmpi + +module load netcdf +module load hdf5 +module load bacio +module load sfcio +module load sigio +module load nemsio +module load w3emc +module load esmf +module load fms +module load crtm +module load g2 +module load png +module load zlib +module load g2tmpl +module load ip +module load sp +module load w3nco +module load cmake/3.21.1 +module load module load gfsio +module load wgrib2 +module load upp + + +export CMAKE_C_COMPILER=mpicc +export CMAKE_CXX_COMPILER=mpicxx +export CMAKE_Fortran_COMPILER=mpif90 +export CMAKE_Platform=singularity.gnu diff --git a/env/wflow_singularity.env b/env/wflow_singularity.env new file mode 100644 index 0000000000..566fdc9c68 --- /dev/null +++ b/env/wflow_singularity.env @@ -0,0 +1,3 @@ +# Setup conda env for singularity container + +conda activate regional_workflow From 99586bf317c7193cf11b7aad4dfe372e2c15db4a Mon Sep 17 00:00:00 2001 From: JeffBeck-NOAA <55201531+JeffBeck-NOAA@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:53:03 -0700 Subject: [PATCH 5/8] Add SPP to the SRW App (#218) * Remove two old SDFs * Update hash of ufs-weather-model in Externals.cfg * Fix to list of SDFs. * Update Externals.cfg for regional_workflow hash * Fix UPP hash. --- Externals.cfg | 4 ++-- src/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index f1c6d0a3b9..27f4d244b8 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -3,7 +3,7 @@ protocol = git repo_url = https://github.com/ufs-community/regional_workflow # Specify either a branch name or a hash but not both. #branch = develop -hash = 2c3919e +hash = 03a0eed local_path = regional_workflow required = True @@ -21,7 +21,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 = 805421d +hash = e593349 local_path = src/ufs-weather-model required = True diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 746e6c3580..6771409c23 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,7 @@ ExternalProject_Add(UFS_UTILS ) if(NOT CCPP_SUITES) - set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GSD_SAR,FV3_GSD_v0,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km") + set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km") endif() if(NOT APP) From 89a0793359674acc0c663f70f15835fd47df6227 Mon Sep 17 00:00:00 2001 From: gsketefian <31046882+gsketefian@users.noreply.github.com> Date: Tue, 15 Mar 2022 14:36:09 -0600 Subject: [PATCH 6/8] Remove FV3_CPT_v0 from the list of suites to build with; update hash of regional_workflow (#224) ## DESCRIPTION OF CHANGES: This removes the old/unused physics suite `FV3_CPT_v0` from the list of suites to build. It also updates the hash of `regional_workflow` to include PR #[697](https://github.com/ufs-community/regional_workflow/pull/697). ## TESTS CONDUCTED: Builds successfully on Hera. See PR #[697](https://github.com/ufs-community/regional_workflow/pull/697) in the `regional_workflow` repo for WE2E tests conducted. ## DEPENDENCIES: This must be merged after PR #[697](https://github.com/ufs-community/regional_workflow/pull/697) is merged in the `regional_workflow` repo. --- Externals.cfg | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 27f4d244b8..e72d4ab5a6 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -3,7 +3,7 @@ protocol = git repo_url = https://github.com/ufs-community/regional_workflow # Specify either a branch name or a hash but not both. #branch = develop -hash = 03a0eed +hash = 2718b62 local_path = regional_workflow required = True diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6771409c23..2f494f8a52 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,7 @@ ExternalProject_Add(UFS_UTILS ) if(NOT CCPP_SUITES) - set(CCPP_SUITES "FV3_CPT_v0,FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km") + set(CCPP_SUITES "FV3_GFS_2017_gfdlmp,FV3_GFS_2017_gfdlmp_regional,FV3_GFS_v15p2,FV3_GFS_v16,FV3_RRFS_v1beta,FV3_HRRR,FV3_RRFS_v1alpha,FV3_GFS_v15_thompson_mynn_lam3km") endif() if(NOT APP) From 7a179396e7da4310547e9ac2596a71503d5126e9 Mon Sep 17 00:00:00 2001 From: "Chan-Hoo.Jeon-NOAA" <60152248+chan-hoo@users.noreply.github.com> Date: Tue, 22 Mar 2022 10:11:40 -0400 Subject: [PATCH 7/8] Remove wcoss_cray from the app (#225) * Remove wcoss_cray * Remove wcoss_cray from docs * Update hash of regional_workflow --- Externals.cfg | 2 +- devbuild.sh | 3 +- docs/UsersGuide/source/ConfigWorkflow.rst | 2 +- docs/UsersGuide/source/Quickstart.rst | 11 +--- env/build_wcoss_cray_intel.env | 67 ----------------------- env/detect_machine.sh | 8 --- env/wflow_wcoss_cray.env | 10 ---- 7 files changed, 4 insertions(+), 99 deletions(-) delete mode 100644 env/build_wcoss_cray_intel.env delete mode 100644 env/wflow_wcoss_cray.env diff --git a/Externals.cfg b/Externals.cfg index e72d4ab5a6..c13eb54263 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -3,7 +3,7 @@ protocol = git repo_url = https://github.com/ufs-community/regional_workflow # Specify either a branch name or a hash but not both. #branch = develop -hash = 2718b62 +hash = 405553b local_path = regional_workflow required = True diff --git a/devbuild.sh b/devbuild.sh index 44ec5f957a..b46063d30f 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -10,7 +10,7 @@ OPTIONS show this help guide --platform=PLATFORM name of machine you are building on - (e.g. cheyenne | hera | jet | orion | wcoss_cray | wcoss_dell_p3) + (e.g. cheyenne | hera | jet | orion | wcoss_dell_p3) --compiler=COMPILER compiler to use; default depends on platform (e.g. intel | gnu | cray | gccgfortran) @@ -145,7 +145,6 @@ if [ -z "${COMPILER}" ] ; then case ${PLATFORM} in jet|hera) COMPILER=intel ;; orion) COMPILER=intel ;; - wcoss_cray) COMPILER=intel ;; wcoss_dell_p3) COMPILER=intel ;; cheyenne) COMPILER=intel ;; macos) COMPILER=gccgfortran ;; diff --git a/docs/UsersGuide/source/ConfigWorkflow.rst b/docs/UsersGuide/source/ConfigWorkflow.rst index 36f06dbe68..04d3775c4a 100644 --- a/docs/UsersGuide/source/ConfigWorkflow.rst +++ b/docs/UsersGuide/source/ConfigWorkflow.rst @@ -22,7 +22,7 @@ Platform Environment Setting ``RUN_ENVIR`` to “community” will use the standard directory structure and variable naming convention and is recommended in most cases for users who are not planning to implement their code into operations at NCO. ``MACHINE``: (Default: “BIG_COMPUTER”) - The machine (a.k.a. platform) on which the workflow will run. Currently supported platforms include "WCOSS_CRAY," "WCOSS_DELL_P3," "HERA," "ORION," "JET," "ODIN," "CHEYENNE," "STAMPEDE,” “GAEA,” “MACOS,” and “LINUX." + The machine (a.k.a. platform) on which the workflow will run. Currently supported platforms include "WCOSS_DELL_P3," "HERA," "ORION," "JET," "ODIN," "CHEYENNE," "STAMPEDE,” “GAEA,” “MACOS,” and “LINUX." ``ACCOUNT``: (Default: “project_name”) The account under which to submit jobs to the queue on the specified ``MACHINE``. diff --git a/docs/UsersGuide/source/Quickstart.rst b/docs/UsersGuide/source/Quickstart.rst index 662d4c92b8..24630b65ab 100644 --- a/docs/UsersGuide/source/Quickstart.rst +++ b/docs/UsersGuide/source/Quickstart.rst @@ -174,7 +174,7 @@ project code for the account parameter: .. code-block:: console - MACHINE=”wcoss_cray” or MACHINE=”wcoss_dell_p3” + MACHINE=”wcoss_dell_p3” ACCOUNT="my_account" EXPT_SUBDIR="my_expt_name" @@ -275,15 +275,6 @@ For WCOSS_DELL_P3: module use /gpfs/dell3/usrx/local/dev/emc_rocoto/modulefiles/ module load ruby/2.5.1 rocoto/1.2.4 -For WCOSS_CRAY: - -.. code-block:: console - - module purge - module load xt-lsfhpc/9.1.3 - module use -a /usrx/local/emc_rocoto/modulefiles - module load rocoto/1.2.4 - Then manually call ``rocotorun`` to launch the tasks that have all dependencies satisfied and ``rocotostat`` to monitor the progress: diff --git a/env/build_wcoss_cray_intel.env b/env/build_wcoss_cray_intel.env deleted file mode 100644 index e8aed822de..0000000000 --- a/env/build_wcoss_cray_intel.env +++ /dev/null @@ -1,67 +0,0 @@ -#Setup instructions for WCOSS-Cray using Intel-18.1.163 (bash shell) - -module purge - -module load PrgEnv-intel -module rm intel -module load intel/18.1.163 -module rm NetCDF-intel-sandybridge/4.2 -module load xt-lsfhpc/9.1.3 -module load craype-haswell -module load python/3.6.3 -module load gcc/5.3.0 -# -module use /usrx/local/dev/modulefiles -module load NetCDF-intel-sandybridge/4.7.4 -module load HDF5-parallel-intel-sandybridge/1.10.6 - -module load jasper-gnu-sandybridge/1.900.1 -module load zlib-intel-sandybridge/1.2.7 -module load png-intel-sandybridge/1.2.49 -export PNG_ROOT="/usrx/local/prod//png/1.2.49/intel/sandybridge" - -## NCEP libraries -module use /usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0/modules -module load pio/2.5.2 -module load bacio/2.4.1 -module load crtm/2.3.0 -module load g2/3.4.1 -module load g2tmpl/1.10.0 -module load ip/3.3.3 -module load nemsio/2.5.2 -module load sp/2.3.3 -module load w3emc/2.7.3 -module load w3nco/2.4.1 - -module load gfsio/1.4.1 -module load sfcio/1.4.1 -module load sigio/2.3.2 - -module load upp/10.0.10 - -## WCOSS Cray execution prereqs: -module load rca -module load alps -module load xpmem -module load gni-headers -module load udreg -module load ugni - -module load esmf/820 -module load fms/2021.03 - -module load landsfcutil/2.4.1 -module load nemsiogfs/2.5.3 - -module use /gpfs/hps/nco/ops/nwprod/lib/modulefiles -module load wgrib2-intel/2.0.8 - -module swap pmi pmi/5.0.11 - -module load cmake/3.20.2 - -export CMAKE_C_COMPILER=cc -export CMAKE_CXX_COMPILER=CC -export CMAKE_Fortran_COMPILER=ftn -export CMAKE_Platform=wcoss_cray - diff --git a/env/detect_machine.sh b/env/detect_machine.sh index ba06998338..2e06e0ca7d 100755 --- a/env/detect_machine.sh +++ b/env/detect_machine.sh @@ -2,14 +2,6 @@ case $(hostname -f) in - llogin1) MACHINE_ID=wcoss_cray ;; ### luna - llogin2) MACHINE_ID=wcoss_cray ;; ### luna - llogin3) MACHINE_ID=wcoss_cray ;; ### luna - - slogin1) MACHINE_ID=wcoss_cray ;; ### surge - slogin2) MACHINE_ID=wcoss_cray ;; ### surge - slogin3) MACHINE_ID=wcoss_cray ;; ### surge - v71a1.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus v71a2.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus v71a3.ncep.noaa.gov) MACHINE_ID=wcoss_dell_p3 ;; ### venus diff --git a/env/wflow_wcoss_cray.env b/env/wflow_wcoss_cray.env deleted file mode 100644 index 0d06d99817..0000000000 --- a/env/wflow_wcoss_cray.env +++ /dev/null @@ -1,10 +0,0 @@ -# Python environment for workflow on WCOSS_cray - -module load xt-lsfhpc/9.1.3 -module use -a /usrx/local/emc_rocoto/modulefiles -module load rocoto/1.3.0rc2 - -module unload python/2.7.14 -module load python/3.6.3 -module use /usrx/local/nceplibs/modulefiles -module load srw-app-python/1.0.0 From 486224cf79e7795e97f63f8032afae27e6345171 Mon Sep 17 00:00:00 2001 From: "Christina.Holt" Date: Thu, 24 Mar 2022 20:22:54 +0000 Subject: [PATCH 8/8] Fix hashes that were accidentally not updated in merge. --- Externals.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index 5cbd6a674a..36af2bf7b1 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -20,7 +20,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 = 805421d +hash = e593349 local_path = src/ufs-weather-model required = True @@ -29,7 +29,7 @@ protocol = git repo_url = https://github.com/NOAA-EMC/UPP # Specify either a branch name or a hash but not both. #branch = develop -hash = a49af05 +hash = 4a16052 local_path = src/UPP required = True