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 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_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/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_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 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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 746e6c3580..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_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_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)