diff --git a/.cicd/Jenkinsfile b/.cicd/Jenkinsfile index 6629e60d4f..86af5dded4 100644 --- a/.cicd/Jenkinsfile +++ b/.cicd/Jenkinsfile @@ -10,15 +10,14 @@ 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', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaeac5', 'hera', 'jet', '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', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') - // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') - choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'cheyenne', 'gaeac5', 'hera', 'jet', 'orion', 'hercules', 'pclusternoaav2use1'], description: 'Specify the platform(s) to use') + // choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'gaeac5', 'hera', 'jet', 'orion', 'hercules'], description: 'Specify the platform(s) to use') + choice(name: 'SRW_PLATFORM_FILTER', choices: ['all', 'derecho', 'hera', 'jet', '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') - // Uncomment the following line to re-enable comprehensive tests - // booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' + booleanParam name: 'SRW_WE2E_COMPREHENSIVE_TESTS', defaultValue: false, description: 'Whether to execute the comprehensive end-to-end tests' } stages { @@ -88,8 +87,8 @@ pipeline { axes { axis { name 'SRW_PLATFORM' - // values 'cheyenne', 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' - values 'gaea', 'gaea-c5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + // values 'derecho', 'gaeac5', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'hera', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1', 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -103,7 +102,8 @@ pipeline { exclude { axis { name 'SRW_PLATFORM' - values 'gaea', 'gaea-c5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + // values 'derecho', 'gaeac5', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' + values 'derecho', 'jet', 'orion', 'hercules' //, 'pclusternoaav2use1' , 'azclusternoaav2eus1', 'gclusternoaav2usc1' } axis { @@ -184,11 +184,6 @@ pipeline { dir ("${env.SRW_PLATFORM}") { echo "Testing SRW (${env.SRW_COMPILER}) on ${env.SRW_PLATFORM} (using ${env.WORKSPACE}/${env.SRW_PLATFORM})" - // Remove the following line to re-enable comprehensive tests - sh 'SRW_WE2E_COMPREHENSIVE_TESTS=false bash --login "${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/srw_test.sh"' - - // Uncomment the following block to re-enable comprehensive tests - /* // If executing for a Pull Request, check for the run_we2e_comprehensive_tests. If set, // override the value of the SRW_WE2E_COMPREHENSIVE_TESTS parameter script { @@ -205,7 +200,6 @@ pipeline { sh "SRW_WE2E_COMPREHENSIVE_TESTS=${run_we2e_comprehensive_tests}" + ' bash --login "${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/srw_test.sh"' } - */ } } diff --git a/.cicd/scripts/srw_ftest.sh b/.cicd/scripts/srw_ftest.sh index 5479e8b46d..95d5e2f936 100755 --- a/.cicd/scripts/srw_ftest.sh +++ b/.cicd/scripts/srw_ftest.sh @@ -85,7 +85,12 @@ module load build_${platform,,}_${SRW_COMPILER} module load wflow_${platform,,} [[ ${FORGIVE_CONDA} == true ]] && set +e +u # Some platforms have incomplete python3 or conda support, but wouldn't necessarily block workflow tests -conda activate srw_app +# Gaea-C5 special case missing jinja2 +if [ "${platform}" == "gaea-c5" ]; then + conda activate workflow_tools +else + conda activate srw_app +fi set -e -u # Adjust for strict limitation of stack size diff --git a/.cicd/scripts/wrapper_srw_ftest.sh b/.cicd/scripts/wrapper_srw_ftest.sh index 2e35b43b89..e4afaf9e98 100755 --- a/.cicd/scripts/wrapper_srw_ftest.sh +++ b/.cicd/scripts/wrapper_srw_ftest.sh @@ -23,11 +23,6 @@ else fi # Customize wrapper scripts -if [[ "${SRW_PLATFORM}" == gaea ]]; then - sed -i '15i #SBATCH --clusters=c4' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh - sed -i 's|qos=batch|qos=windfall|g' ${WORKSPACE}/${SRW_PLATFORM}/.cicd/scripts/${workflow_cmd}_srw_ftest.sh -fi - if [[ "${SRW_PLATFORM}" == gaea-c5 ]]; 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 diff --git a/devbuild.sh b/devbuild.sh index 6ec2615e23..9136b86e7a 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -212,6 +212,11 @@ printf "PLATFORM(MACHINE)=${PLATFORM}\n" >&2 if [ "${PLATFORM}" = "wcoss2" ]; then BUILD_CONDA="off" fi +# Conda is not used on Gaea-c5 F2 filesystem +# it needs to be reevaluated when moved to F2 filesystem +if [ "${PLATFORM}" = "gaea-c5" ]; then + BUILD_CONDA="off" +fi # build conda and conda environments, if requested. if [ "${BUILD_CONDA}" = "on" ] ; then @@ -244,8 +249,10 @@ if [ "${BUILD_CONDA}" = "on" ] ; then fi else - source ${CONDA_BUILD_DIR}/etc/profile.d/conda.sh - conda activate + if [ -d "${CONDA_BUILD_DIR}" ] ; then + source ${CONDA_BUILD_DIR}/etc/profile.d/conda.sh + conda activate + fi fi # Conda environment should have linux utilities to perform these tasks on macos. @@ -281,7 +288,7 @@ set -eu # automatically determine compiler if [ -z "${COMPILER}" ] ; then case ${PLATFORM} in - jet|hera|gaea|gaea-c5) COMPILER=intel ;; + jet|hera|gaea-c5) COMPILER=intel ;; orion) COMPILER=intel ;; wcoss2) COMPILER=intel ;; cheyenne) COMPILER=intel ;; diff --git a/devclean.sh b/devclean.sh index 8d13b0f061..01ace7a7d9 100755 --- a/devclean.sh +++ b/devclean.sh @@ -135,12 +135,13 @@ elif [ "${CLEAN}" = true ]; then "${INSTALL_DIR}/include" \ "${INSTALL_DIR}/lib" \ "${INSTALL_DIR}/lib64" \ - "${SRW_DIR}/manage_externals/manic" \ ) - for directory in $directories; do - [[ -d $directory ]] && rm -rfv $directory - done + if [ ${#directories[@]} -ge 1 ]; then + for dir in ${directories[@]}; do + [[ -d "${dir}" ]] && rm -rfv ${dir} + done echo " " + fi fi # Clean all the submodules if requested. Note: Need to check out them again before attempting subsequent builds, by sourcing ${SRW_DIR}/manage_externals/checkout_externals if [ ${INCLUDE_SUB_MODULES} == true ]; then diff --git a/etc/lmod-setup.csh b/etc/lmod-setup.csh index dc8fb2b064..92a4394893 100644 --- a/etc/lmod-setup.csh +++ b/etc/lmod-setup.csh @@ -37,14 +37,11 @@ else if ( "$L_MACHINE" == singularity ) then module purge -else if ( "$L_MACHINE" == gaea ) then - source /lustre/f2/dev/role.epic/contrib/Lmod_init.csh - else if ( "$L_MACHINE" == gaea-c5 ) then - source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.csh + module reset else if ( "$L_MACHINE" == derecho ) then - module reset + module purge else if ( "$L_MACHINE" == odin ) then module unload modules diff --git a/etc/lmod-setup.sh b/etc/lmod-setup.sh index 8a6b651958..7328dea76f 100644 --- a/etc/lmod-setup.sh +++ b/etc/lmod-setup.sh @@ -44,14 +44,11 @@ elif [ "$L_MACHINE" = singularity ]; then module purge -elif [ "$L_MACHINE" = gaea ]; then - source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh - elif [ "$L_MACHINE" = gaea-c5 ]; then - source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh + module reset elif [ "$L_MACHINE" = derecho ]; then - module reset + module purge elif [ "$L_MACHINE" = odin ]; then module unload modules diff --git a/jobs/JREGIONAL_AQM_ICS b/jobs/JREGIONAL_AQM_ICS index ce3e539cc9..5c8ba9c8dd 100755 --- a/jobs/JREGIONAL_AQM_ICS +++ b/jobs/JREGIONAL_AQM_ICS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_AQM_LBCS b/jobs/JREGIONAL_AQM_LBCS index 7f13d12fa1..c711f90288 100755 --- a/jobs/JREGIONAL_AQM_LBCS +++ b/jobs/JREGIONAL_AQM_LBCS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_BIAS_CORRECTION_O3 b/jobs/JREGIONAL_BIAS_CORRECTION_O3 index 6586d4427c..ddcef59494 100755 --- a/jobs/JREGIONAL_BIAS_CORRECTION_O3 +++ b/jobs/JREGIONAL_BIAS_CORRECTION_O3 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_BIAS_CORRECTION_PM25 b/jobs/JREGIONAL_BIAS_CORRECTION_PM25 index a0c0ba1b4a..7e08b02a12 100755 --- a/jobs/JREGIONAL_BIAS_CORRECTION_PM25 +++ b/jobs/JREGIONAL_BIAS_CORRECTION_PM25 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_CHECK_POST_OUTPUT b/jobs/JREGIONAL_CHECK_POST_OUTPUT index b9c1868282..2b1fe69bbb 100755 --- a/jobs/JREGIONAL_CHECK_POST_OUTPUT +++ b/jobs/JREGIONAL_CHECK_POST_OUTPUT @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_FIRE_EMISSION b/jobs/JREGIONAL_FIRE_EMISSION index ee540cfa6e..fdb6e57b0a 100755 --- a/jobs/JREGIONAL_FIRE_EMISSION +++ b/jobs/JREGIONAL_FIRE_EMISSION @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_GET_EXTRN_MDL_FILES b/jobs/JREGIONAL_GET_EXTRN_MDL_FILES index 6d8dd23c7e..8efd332dd9 100755 --- a/jobs/JREGIONAL_GET_EXTRN_MDL_FILES +++ b/jobs/JREGIONAL_GET_EXTRN_MDL_FILES @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_GRID b/jobs/JREGIONAL_MAKE_GRID index 0a6adfe277..844d782bc7 100755 --- a/jobs/JREGIONAL_MAKE_GRID +++ b/jobs/JREGIONAL_MAKE_GRID @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_ICS b/jobs/JREGIONAL_MAKE_ICS index 5ff0b3e4d8..1e38f4058d 100755 --- a/jobs/JREGIONAL_MAKE_ICS +++ b/jobs/JREGIONAL_MAKE_ICS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_LBCS b/jobs/JREGIONAL_MAKE_LBCS index 0070654cbe..4c524e26a6 100755 --- a/jobs/JREGIONAL_MAKE_LBCS +++ b/jobs/JREGIONAL_MAKE_LBCS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_OROG b/jobs/JREGIONAL_MAKE_OROG index 8f50c134ff..b6f674e5ee 100755 --- a/jobs/JREGIONAL_MAKE_OROG +++ b/jobs/JREGIONAL_MAKE_OROG @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_MAKE_SFC_CLIMO b/jobs/JREGIONAL_MAKE_SFC_CLIMO index fe7773230c..eee25b193a 100755 --- a/jobs/JREGIONAL_MAKE_SFC_CLIMO +++ b/jobs/JREGIONAL_MAKE_SFC_CLIMO @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_NEXUS_EMISSION b/jobs/JREGIONAL_NEXUS_EMISSION index 0f1a00d1a6..915de0f054 100755 --- a/jobs/JREGIONAL_NEXUS_EMISSION +++ b/jobs/JREGIONAL_NEXUS_EMISSION @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_NEXUS_GFS_SFC b/jobs/JREGIONAL_NEXUS_GFS_SFC index 5930762106..5fc05f86db 100755 --- a/jobs/JREGIONAL_NEXUS_GFS_SFC +++ b/jobs/JREGIONAL_NEXUS_GFS_SFC @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_NEXUS_POST_SPLIT b/jobs/JREGIONAL_NEXUS_POST_SPLIT index fc21421f8d..7cb8a55bf0 100755 --- a/jobs/JREGIONAL_NEXUS_POST_SPLIT +++ b/jobs/JREGIONAL_NEXUS_POST_SPLIT @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_PLOT_ALLVARS b/jobs/JREGIONAL_PLOT_ALLVARS index 49eb422c3a..5e59abd93d 100755 --- a/jobs/JREGIONAL_PLOT_ALLVARS +++ b/jobs/JREGIONAL_PLOT_ALLVARS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_POINT_SOURCE b/jobs/JREGIONAL_POINT_SOURCE index d3a02b7534..57000dd599 100755 --- a/jobs/JREGIONAL_POINT_SOURCE +++ b/jobs/JREGIONAL_POINT_SOURCE @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_POST_STAT_O3 b/jobs/JREGIONAL_POST_STAT_O3 index af8652e05d..a522d00dbb 100755 --- a/jobs/JREGIONAL_POST_STAT_O3 +++ b/jobs/JREGIONAL_POST_STAT_O3 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_POST_STAT_PM25 b/jobs/JREGIONAL_POST_STAT_PM25 index 81ec818075..cd86879a73 100755 --- a/jobs/JREGIONAL_POST_STAT_PM25 +++ b/jobs/JREGIONAL_POST_STAT_PM25 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_PRE_POST_STAT b/jobs/JREGIONAL_PRE_POST_STAT index 41cb25d6a0..640c629bce 100755 --- a/jobs/JREGIONAL_PRE_POST_STAT +++ b/jobs/JREGIONAL_PRE_POST_STAT @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_FCST b/jobs/JREGIONAL_RUN_FCST index 383739e172..a7f7c96031 100755 --- a/jobs/JREGIONAL_RUN_FCST +++ b/jobs/JREGIONAL_RUN_FCST @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT b/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT index 0f70f0f285..707697b5ab 100755 --- a/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT +++ b/jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX index a9f7d3ae98..0301e9946a 100755 --- a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX +++ b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN index 249a0a81bd..ab08320f33 100755 --- a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN +++ b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB index 7239b7367c..7da98212ac 100755 --- a/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB +++ b/jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_PB2NC_OBS b/jobs/JREGIONAL_RUN_MET_PB2NC_OBS index 552d855214..e36e72418f 100755 --- a/jobs/JREGIONAL_RUN_MET_PB2NC_OBS +++ b/jobs/JREGIONAL_RUN_MET_PB2NC_OBS @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_MET_PCPCOMBINE b/jobs/JREGIONAL_RUN_MET_PCPCOMBINE index 2722a8e646..7364ed96c9 100755 --- a/jobs/JREGIONAL_RUN_MET_PCPCOMBINE +++ b/jobs/JREGIONAL_RUN_MET_PCPCOMBINE @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_POST b/jobs/JREGIONAL_RUN_POST index 459431522f..b4327667a0 100755 --- a/jobs/JREGIONAL_RUN_POST +++ b/jobs/JREGIONAL_RUN_POST @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/jobs/JREGIONAL_RUN_PRDGEN b/jobs/JREGIONAL_RUN_PRDGEN index 6621db1727..2d30ced9db 100755 --- a/jobs/JREGIONAL_RUN_PRDGEN +++ b/jobs/JREGIONAL_RUN_PRDGEN @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/modulefiles/build_derecho_intel.lua b/modulefiles/build_derecho_intel.lua index 7c7f3c771e..d434e8ecd3 100644 --- a/modulefiles/build_derecho_intel.lua +++ b/modulefiles/build_derecho_intel.lua @@ -1,35 +1,18 @@ help([[ This module loads libraries for building the UFS SRW App on -the CISL machine Derecho (Cray) using Intel-classic-2023.0.0 +the CISL machine Derecho (Cray) using Intel@2021.10.0 ]]) -whatis([===[Loads libraries needed for building the UFS SRW App on Cheyenne ]===]) +whatis([===[Loads libraries needed for building the UFS SRW App on Derecho ]===]) -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) -load(pathJoin("ncarenv", os.getenv("ncarenv_ver") or "23.06")) -load(pathJoin("craype", os.getenv("craype_ver") or "2.7.20")) - -unload("netcdf") -unload("hdf5") -load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2023.0.0")) -load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "8.1.25")) - -prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/derecho/hpc-stack/intel-classic-2023.0.0/modulefiles/stack") -load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) -load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2023.0.0")) -load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "8.1.25")) +prepend_path("MODULEPATH","/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra") +prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") -load(pathJoin("ncarcompilers", os.getenv("ncarcompilers_ver") or "1.0.0")) -load(pathJoin("mkl", os.getenv("mkl_ver") or "2023.0.0")) +load(pathJoin("stack-intel", os.getenv("stack_intel_ver") or "2021.10.0")) +load(pathJoin("stack-cray-mpich", os.getenv("stack_cray_mpich_ver") or "8.1.25")) +load(pathJoin("cmake", os.getenv("cmake_ver") or "3.26.3")) load("srw_common") -setenv("CC","cc") -setenv("FC","ftn") -setenv("CXX","CC") - -setenv("CMAKE_C_COMPILER","cc") -setenv("CMAKE_CXX_COMPILER","CC") -setenv("CMAKE_Fortran_COMPILER","ftn") setenv("CMAKE_Platform","derecho.intel") diff --git a/modulefiles/build_gaea-c5_intel.lua b/modulefiles/build_gaea-c5_intel.lua index 84d05290d7..ecf21dcc8d 100644 --- a/modulefiles/build_gaea-c5_intel.lua +++ b/modulefiles/build_gaea-c5_intel.lua @@ -5,18 +5,24 @@ the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0 whatis([===[Loads libraries needed for building the UFS SRW App on Gaea C5 ]===]) -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.23.1")) +prepend_path("MODULEPATH","/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core") +stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0" +load(pathJoin("stack-intel", stack_intel_ver)) -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/hpc-stack/intel-classic-2023.1.0/modulefiles/stack") -load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0")) -load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2023.1.0")) -load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "8.1.25")) -load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2023.1.0")) -load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "8.1.25")) +stack_mpich_ver=os.getenv("stack_mpich_ver") or "8.1.25" +load(pathJoin("stack-cray-mpich", stack_mpich_ver)) + +stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" +load(pathJoin("stack-python", stack_python_ver)) + +cmake_ver=os.getenv("cmake_ver") or "3.23.1" +load(pathJoin("cmake", cmake_ver)) load("srw_common") unload("darshan-runtime/3.4.0") +unload("cray-pmi/6.1.10") + setenv("CFLAGS","-diag-disable=10441") setenv("FFLAGS","-diag-disable=10441") @@ -27,4 +33,3 @@ setenv("CMAKE_C_COMPILER","cc") setenv("CMAKE_Fortran_COMPILER","ftn") setenv("CMAKE_CXX_COMPILER","CC") setenv("CMAKE_Platform","gaea-c5.intel") - diff --git a/modulefiles/build_gaea_intel.lua b/modulefiles/build_gaea_intel.lua deleted file mode 100644 index d9d1a007d5..0000000000 --- a/modulefiles/build_gaea_intel.lua +++ /dev/null @@ -1,33 +0,0 @@ -help([[ -This module loads libraries for building the UFS SRW App on -the NOAA RDHPC machine Gaea using Intel-2022.0.2 -]]) - -whatis([===[Loads libraries needed for building the UFS SRW App on Gaea ]===]) - -unload("intel") -unload("cray-mpich") -unload("cray-python") -unload("darshan") - -prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/spack-stack-1.4.1-c4/envs/unified-env/install/modulefiles/Core") -prepend_path("MODULEPATH", "/lustre/f2/pdata/esrl/gsd/spack-stack/modulefiles") - -load("stack-intel/2022.0.2") -load("stack-cray-mpich/7.7.20") -load("cmake/3.23.1") - -load("srw_common") --- Need at runtime -load("alps") - -setenv("CC","cc") -setenv("FC","ftn") -setenv("CXX","CC") -setenv("CMAKE_C_COMPILER","cc") -setenv("CMAKE_CXX_COMPILER","CC") -setenv("CMAKE_Fortran_COMPILER","ftn") -setenv("CMAKE_Platform","gaea.intel") - -setenv("CFLAGS","-diag-disable=10441") -setenv("FFLAGS","-diag-disable=10441 -fp-model source") diff --git a/modulefiles/build_hera_gnu.lua b/modulefiles/build_hera_gnu.lua index d4a67e44b2..c1f57e2115 100644 --- a/modulefiles/build_hera_gnu.lua +++ b/modulefiles/build_hera_gnu.lua @@ -5,11 +5,12 @@ the NOAA RDHPC machine Hera using GNU 9.2.0 whatis([===[Loads libraries needed for building the UFS SRW App on Hera using GNU 9.2.0 ]===]) -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core") prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") load("stack-gcc/9.2.0") load("stack-openmpi/4.1.5") +load("stack-python/3.10.8") load("cmake/3.23.1") load("srw_common") diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua index df19b0a583..500d410dc5 100644 --- a/modulefiles/build_hera_intel.lua +++ b/modulefiles/build_hera_intel.lua @@ -8,7 +8,7 @@ whatis([===[Loads libraries needed for building the UFS SRW App on Hera ]===]) prepend_path("MODULEPATH","/contrib/sutils/modulefiles") load("sutils") -prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core") prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles") stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" @@ -17,6 +17,9 @@ load(pathJoin("stack-intel", stack_intel_ver)) stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1" load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver)) +stack_python_ver=os.getenv("stack_python_ver") or "3.10.8" +load(pathJoin("stack-python", stack_python_ver)) + cmake_ver=os.getenv("cmake_ver") or "3.20.1" load(pathJoin("cmake", cmake_ver)) diff --git a/modulefiles/build_hercules_intel.lua b/modulefiles/build_hercules_intel.lua index 3ca93978eb..1cb402b8a6 100644 --- a/modulefiles/build_hercules_intel.lua +++ b/modulefiles/build_hercules_intel.lua @@ -5,11 +5,12 @@ the MSU machine Hercules using intel-oneapi-compilers/2022.2.1 whatis([===[Loads libraries needed for building the UFS SRW App on Hercules ]===]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles") -load("stack-intel/2021.7.1") -load("stack-intel-oneapi-mpi/2021.7.1") +load("stack-intel/2021.9.0") +load("stack-intel-oneapi-mpi/2021.9.0") +load("stack-python/3.10.8") load("cmake/3.26.3") load("srw_common") diff --git a/modulefiles/build_jet_intel.lua b/modulefiles/build_jet_intel.lua index 9e26cb0489..e687531ac8 100644 --- a/modulefiles/build_jet_intel.lua +++ b/modulefiles/build_jet_intel.lua @@ -5,11 +5,12 @@ 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.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH","/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/lfs4/HFIP/hfv3gfs/spack-stack/modulefiles") load("stack-intel/2021.5.0") load("stack-intel-oneapi-mpi/2021.5.1") +load("stack-python/3.10.8") load("cmake/3.23.1") load("srw_common") diff --git a/modulefiles/build_noaacloud_intel.lua b/modulefiles/build_noaacloud_intel.lua index 82a432f822..50f1aec9ab 100644 --- a/modulefiles/build_noaacloud_intel.lua +++ b/modulefiles/build_noaacloud_intel.lua @@ -5,7 +5,7 @@ the NOAA cloud using Intel-oneapi whatis([===[Loads libraries needed for building the UFS SRW App on NOAA cloud ]===]) -prepend_path("MODULEPATH", "/contrib/EPIC/spack-stack/spack-stack-1.4.1/envs/unified-dev/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/apps/modules/modulefiles") prepend_path("PATH", "/contrib/EPIC/bin") load("stack-intel") diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua index 9e6b0cabbc..241b658c88 100644 --- a/modulefiles/build_orion_intel.lua +++ b/modulefiles/build_orion_intel.lua @@ -5,18 +5,18 @@ the MSU machine Orion using Intel-2022.1.2 whatis([===[Loads libraries needed for building the UFS SRW App on Orion ]===]) -prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/spack-stack-1.4.1/envs/unified-env/install/modulefiles/Core") +prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core") prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles") load("stack-intel/2022.0.2") load("stack-intel-oneapi-mpi/2021.5.1") +load("stack-python/3.10.8") load("cmake/3.22.1") load("srw_common") load("nccmp/1.9.0.1") load("nco/5.0.6") -load("ufs-pyenv") load("wget") setenv("CMAKE_C_COMPILER","mpiicc") diff --git a/modulefiles/srw_common.lua b/modulefiles/srw_common.lua index 6cd326a1f8..2bcbc1f5f7 100644 --- a/modulefiles/srw_common.lua +++ b/modulefiles/srw_common.lua @@ -1,10 +1,10 @@ -load_any("jasper/2.0.25","jasper/2.0.32") -load_any("zlib/1.2.11","zlib/1.2.13") -load_any("png/1.6.37","libpng/1.6.37") +load("jasper/2.0.32") +load("zlib/1.2.13") +load("libpng/1.6.37") -load_any("netcdf/4.9.2","netcdf-c/4.9.2") -load_any("netcdf/4.9.2","netcdf-fortran/4.6.0") -load_any("pio/2.5.10","parallelio/2.5.9","parallelio/2.5.10") +load("netcdf-c/4.9.2") +load("netcdf-fortran/4.6.0") +load("parallelio/2.5.10") load("esmf/8.4.2") load("fms/2023.01") @@ -12,18 +12,17 @@ load("bacio/2.4.1") load("crtm/2.4.0") load("g2/3.4.5") load("g2tmpl/1.10.2") -load("ip/3.3.3") +load("ip/4.3.0") load("sp/2.3.3") -load("w3emc/2.9.2") +load("w3emc/2.10.0") -load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0") -load_any("yafyaml/v0.5.1","yafyaml/0.5.1") +load("gftl-shared/1.5.0") load("mapl/2.35.2-esmf-8.4.2") -load_any("nemsio/2.5.2","nemsio/2.5.4") +load("nemsio/2.5.4") load("sfcio/1.4.1") load("sigio/2.3.2") load("w3nco/2.4.1") -load_any("wrf_io/1.2.0","wrf-io/1.2.0") +load("wrf-io/1.2.0") load_any("wgrib2/2.0.8","wgrib2/3.1.1") diff --git a/modulefiles/tasks/derecho/aqm_ics.local.lua b/modulefiles/tasks/derecho/aqm_ics.local.lua index 1040aab9a6..26b28db2c5 100644 --- a/modulefiles/tasks/derecho/aqm_ics.local.lua +++ b/modulefiles/tasks/derecho/aqm_ics.local.lua @@ -1,3 +1,2 @@ -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0")) -load("nco/4.9.5") +load("nco/5.0.6") load("python_srw_cmaq") diff --git a/modulefiles/tasks/derecho/aqm_lbcs.local.lua b/modulefiles/tasks/derecho/aqm_lbcs.local.lua index 1040aab9a6..26b28db2c5 100644 --- a/modulefiles/tasks/derecho/aqm_lbcs.local.lua +++ b/modulefiles/tasks/derecho/aqm_lbcs.local.lua @@ -1,3 +1,2 @@ -load(pathJoin("cmake", os.getenv("cmake_ver") or "3.22.0")) -load("nco/4.9.5") +load("nco/5.0.6") load("python_srw_cmaq") diff --git a/modulefiles/tasks/derecho/pre_post_stat.local.lua b/modulefiles/tasks/derecho/pre_post_stat.local.lua index 7dcdc5969b..26b28db2c5 100644 --- a/modulefiles/tasks/derecho/pre_post_stat.local.lua +++ b/modulefiles/tasks/derecho/pre_post_stat.local.lua @@ -1,2 +1,2 @@ -load("nco/4.9.5") +load("nco/5.0.6") load("python_srw_cmaq") diff --git a/modulefiles/tasks/derecho/run_vx.local.lua b/modulefiles/tasks/derecho/run_vx.local.lua index 54cc632c21..2613f8ae0e 100644 --- a/modulefiles/tasks/derecho/run_vx.local.lua +++ b/modulefiles/tasks/derecho/run_vx.local.lua @@ -1,8 +1,9 @@ --[[ 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") + +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +23,6 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua index b7e9528710..624b869bdb 100644 --- a/modulefiles/tasks/gaea-c5/plot_allvars.local.lua +++ b/modulefiles/tasks/gaea-c5/plot_allvars.local.lua @@ -1,2 +1,6 @@ -load("conda") -setenv("SRW_ENV", "srw_graphics") +unload("miniconda3") +unload("python") +prepend_path("MODULEPATH","/ncrc/proj/epic/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/gaea-c5/python_srw.lua b/modulefiles/tasks/gaea-c5/python_srw.lua index a8b57c694e..b6107cc465 100644 --- a/modulefiles/tasks/gaea-c5/python_srw.lua +++ b/modulefiles/tasks/gaea-c5/python_srw.lua @@ -1,3 +1,8 @@ unload("miniconda3") -load("conda") -setenv("SRW_ENV", "srw_app") +unload("python") +prepend_path("MODULEPATH","/ncrc/proj/epic/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +setenv("SRW_ENV", "workflow_tools") + +load("darshan-runtime/3.4.0") diff --git a/modulefiles/tasks/gaea-c5/run_vx.local.lua b/modulefiles/tasks/gaea-c5/run_vx.local.lua index 5979a8db96..cb64e9a38a 100644 --- a/modulefiles/tasks/gaea-c5/run_vx.local.lua +++ b/modulefiles/tasks/gaea-c5/run_vx.local.lua @@ -1,6 +1,25 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -load(pathJoin("met", os.getenv("met_ver") or "10.1.2")) -load(pathJoin("metplus", os.getenv("metplus_ver") or "4.1.3")) +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") +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/tasks/gaea/plot_allvars.local.lua b/modulefiles/tasks/gaea/plot_allvars.local.lua deleted file mode 100644 index b7e9528710..0000000000 --- a/modulefiles/tasks/gaea/plot_allvars.local.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("conda") -setenv("SRW_ENV", "srw_graphics") diff --git a/modulefiles/tasks/gaea/python_srw.lua b/modulefiles/tasks/gaea/python_srw.lua deleted file mode 100644 index a2dd45084c..0000000000 --- a/modulefiles/tasks/gaea/python_srw.lua +++ /dev/null @@ -1,2 +0,0 @@ -load("conda") -setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/gaea/run_vx.local.lua b/modulefiles/tasks/gaea/run_vx.local.lua deleted file mode 100644 index 8dccf5e63c..0000000000 --- a/modulefiles/tasks/gaea/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.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") -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/tasks/hera/aqm_lbcs.local.lua b/modulefiles/tasks/hera/aqm_lbcs.local.lua index 23370a8d60..5a7b0cece6 100644 --- a/modulefiles/tasks/hera/aqm_lbcs.local.lua +++ b/modulefiles/tasks/hera/aqm_lbcs.local.lua @@ -1 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/hera/get_extrn_ics.local.lua b/modulefiles/tasks/hera/get_extrn_ics.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/hera/get_extrn_ics.local.lua +++ b/modulefiles/tasks/hera/get_extrn_ics.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/hera/get_extrn_lbcs.local.lua b/modulefiles/tasks/hera/get_extrn_lbcs.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/hera/get_extrn_lbcs.local.lua +++ b/modulefiles/tasks/hera/get_extrn_lbcs.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/hera/get_obs.local.lua b/modulefiles/tasks/hera/get_obs.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/hera/get_obs.local.lua +++ b/modulefiles/tasks/hera/get_obs.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/hera/nexus_gfs_sfc.local.lua b/modulefiles/tasks/hera/nexus_gfs_sfc.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/hera/nexus_gfs_sfc.local.lua +++ b/modulefiles/tasks/hera/nexus_gfs_sfc.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/hera/run_vx.local.lua b/modulefiles/tasks/hera/run_vx.local.lua index 8dccf5e63c..737fc4f7cc 100644 --- a/modulefiles/tasks/hera/run_vx.local.lua +++ b/modulefiles/tasks/hera/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,6 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/hercules/aqm_lbcs.local.lua b/modulefiles/tasks/hercules/aqm_lbcs.local.lua index 23370a8d60..5a7b0cece6 100644 --- a/modulefiles/tasks/hercules/aqm_lbcs.local.lua +++ b/modulefiles/tasks/hercules/aqm_lbcs.local.lua @@ -1 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/hercules/run_vx.local.lua b/modulefiles/tasks/hercules/run_vx.local.lua index 8dccf5e63c..737fc4f7cc 100644 --- a/modulefiles/tasks/hercules/run_vx.local.lua +++ b/modulefiles/tasks/hercules/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,6 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/jet/get_extrn_ics.local.lua b/modulefiles/tasks/jet/get_extrn_ics.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/jet/get_extrn_ics.local.lua +++ b/modulefiles/tasks/jet/get_extrn_ics.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/jet/get_extrn_lbcs.local.lua b/modulefiles/tasks/jet/get_extrn_lbcs.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/jet/get_extrn_lbcs.local.lua +++ b/modulefiles/tasks/jet/get_extrn_lbcs.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/jet/get_obs.local.lua b/modulefiles/tasks/jet/get_obs.local.lua index acf81facb1..dcca3116d8 100644 --- a/modulefiles/tasks/jet/get_obs.local.lua +++ b/modulefiles/tasks/jet/get_obs.local.lua @@ -1,2 +1,3 @@ load("hpss") +unload("python") load("python_srw") diff --git a/modulefiles/tasks/jet/run_vx.local.lua b/modulefiles/tasks/jet/run_vx.local.lua index 8dccf5e63c..737fc4f7cc 100644 --- a/modulefiles/tasks/jet/run_vx.local.lua +++ b/modulefiles/tasks/jet/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,6 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/noaacloud/plot_allvars.local.lua b/modulefiles/tasks/noaacloud/plot_allvars.local.lua index 602d60842f..cc122f69b2 100644 --- a/modulefiles/tasks/noaacloud/plot_allvars.local.lua +++ b/modulefiles/tasks/noaacloud/plot_allvars.local.lua @@ -1 +1,5 @@ -prepend_path("PATH", "/contrib/EPIC/miniconda3/4.12.0/envs/regional_workflow/bin") +unload("python") +append_path("MODULEPATH","/contrib/EPIC/miniconda3/modulefiles") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) + +setenv("SRW_ENV", "regional_workflow") diff --git a/modulefiles/tasks/noaacloud/run_vx.local.lua b/modulefiles/tasks/noaacloud/run_vx.local.lua index 8dccf5e63c..737fc4f7cc 100644 --- a/modulefiles/tasks/noaacloud/run_vx.local.lua +++ b/modulefiles/tasks/noaacloud/run_vx.local.lua @@ -1,8 +1,8 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) @@ -22,4 +22,6 @@ if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("python_srw") +load("ufs-pyenv") +load("conda") +setenv("SRW_ENV", "srw_app") diff --git a/modulefiles/tasks/orion/aqm_lbcs.local.lua b/modulefiles/tasks/orion/aqm_lbcs.local.lua index 23370a8d60..5a7b0cece6 100644 --- a/modulefiles/tasks/orion/aqm_lbcs.local.lua +++ b/modulefiles/tasks/orion/aqm_lbcs.local.lua @@ -1 +1,2 @@ load(pathJoin("nco", os.getenv("nco_ver") or "4.9.3")) +load("miniconda_regional_workflow_cmaq") diff --git a/modulefiles/tasks/orion/run_vx.local.lua b/modulefiles/tasks/orion/run_vx.local.lua index 850f296af2..1fa9617365 100644 --- a/modulefiles/tasks/orion/run_vx.local.lua +++ b/modulefiles/tasks/orion/run_vx.local.lua @@ -1,9 +1,11 @@ --[[ Compiler-specific modules are used for met and metplus libraries --]] -local met_ver = (os.getenv("met_ver") or "10.1.1") -local metplus_ver = (os.getenv("metplus_ver") or "4.1.1") -if (mode() == "load") then +load("build_orion_intel") + +local met_ver = (os.getenv("met_ver") or "11.1.0") +local metplus_ver = (os.getenv("metplus_ver") or "5.1.0") +if (mode() == "load") then load(pathJoin("met", met_ver)) load(pathJoin("metplus",metplus_ver)) end @@ -19,9 +21,10 @@ setenv("METPLUS_ROOT", base_metplus) setenv("METPLUS_PATH", base_metplus) -if (mode() == "unload") then +if (mode() == "unload") then unload(pathJoin("met", met_ver)) unload(pathJoin("metplus",metplus_ver)) end -load("stack-python/3.9.7") +--load("ufs-pyenv") +load("stack-python/3.10.8") load("python_srw") diff --git a/modulefiles/wflow_gaea-c5.lua b/modulefiles/wflow_gaea-c5.lua index 7cfd1b4529..3073aa0522 100644 --- a/modulefiles/wflow_gaea-c5.lua +++ b/modulefiles/wflow_gaea-c5.lua @@ -6,15 +6,16 @@ the NOAA RDHPC machine Gaea C5 whatis([===[Loads libraries needed for running the UFS SRW App on gaea ]===]) unload("python") - -load("conda") -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/C5/rocoto/modulefiles") +load("set_pythonpath") +prepend_path("MODULEPATH","/ncrc/proj/epic/miniconda3/modulefiles/") +load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "4.12.0")) +prepend_path("MODULEPATH","/ncrc/proj/epic/rocoto/modulefiles/") load("rocoto") pushenv("MKLROOT", "/opt/intel/oneapi/mkl/2023.1.0/") if mode() == "load" then LmodMsgRaw([===[Please do the following to activate conda: - > conda activate srw_app + > conda activate workflow_tools ]===]) end diff --git a/modulefiles/wflow_gaea.lua b/modulefiles/wflow_gaea.lua deleted file mode 100644 index 83c83d5e92..0000000000 --- a/modulefiles/wflow_gaea.lua +++ /dev/null @@ -1,19 +0,0 @@ -help([[ -This module loads python environement for running the UFS SRW App on -the NOAA RDHPC machine Gaea -]]) - -whatis([===[Loads libraries needed for running the UFS SRW App on gaea ]===]) - -unload("python") - -load("conda") -prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/rocoto/modulefiles") -load("rocoto") -load("alps") - -if mode() == "load" then - LmodMsgRaw([===[Please do the following to activate conda: - > conda activate srw_app -]===]) -end diff --git a/modulefiles/wflow_jet.lua b/modulefiles/wflow_jet.lua index fcb46c0c07..b3cb7895d7 100644 --- a/modulefiles/wflow_jet.lua +++ b/modulefiles/wflow_jet.lua @@ -7,7 +7,6 @@ whatis([===[Loads libraries needed for running the UFS SRW App on Jet ]===]) load("rocoto") - load("conda") if mode() == "load" then diff --git a/parm/metplus/EnsembleStat_ADPSFC.conf b/parm/metplus/EnsembleStat_ADPSFC.conf index 627f99010d..07238030c1 100644 --- a/parm/metplus/EnsembleStat_ADPSFC.conf +++ b/parm/metplus/EnsembleStat_ADPSFC.conf @@ -165,18 +165,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_ADPUPA.conf b/parm/metplus/EnsembleStat_ADPUPA.conf index d843a2e123..edfda41b89 100644 --- a/parm/metplus/EnsembleStat_ADPUPA.conf +++ b/parm/metplus/EnsembleStat_ADPUPA.conf @@ -165,18 +165,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_APCP.conf b/parm/metplus/EnsembleStat_APCP.conf index 88e86b4563..7604a90bd7 100644 --- a/parm/metplus/EnsembleStat_APCP.conf +++ b/parm/metplus/EnsembleStat_APCP.conf @@ -162,18 +162,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_ASNOW.conf b/parm/metplus/EnsembleStat_ASNOW.conf index 9d12890e7f..8897b03295 100644 --- a/parm/metplus/EnsembleStat_ASNOW.conf +++ b/parm/metplus/EnsembleStat_ASNOW.conf @@ -162,18 +162,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_REFC.conf b/parm/metplus/EnsembleStat_REFC.conf index 332d665bb9..6de6eddeb8 100644 --- a/parm/metplus/EnsembleStat_REFC.conf +++ b/parm/metplus/EnsembleStat_REFC.conf @@ -164,18 +164,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/parm/metplus/EnsembleStat_RETOP.conf b/parm/metplus/EnsembleStat_RETOP.conf index 2066d2aaba..abd2dd2a45 100644 --- a/parm/metplus/EnsembleStat_RETOP.conf +++ b/parm/metplus/EnsembleStat_RETOP.conf @@ -164,18 +164,6 @@ ENSEMBLE_STAT_OUTPUT_FLAG_ORANK = STAT ENSEMBLE_STAT_OUTPUT_FLAG_SSVAR = STAT ENSEMBLE_STAT_OUTPUT_FLAG_RELP = STAT -ENSEMBLE_STAT_ENSEMBLE_FLAG_LATLON = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MEAN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_STDEV = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MINUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_PLUS = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MIN = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_MAX = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_RANGE = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_VLD_COUNT = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_FREQUENCY = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NEP = FALSE -ENSEMBLE_STAT_ENSEMBLE_FLAG_NMEP = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_RANK = FALSE ENSEMBLE_STAT_ENSEMBLE_FLAG_WEIGHT = FALSE # diff --git a/scripts/exregional_aqm_ics.sh b/scripts/exregional_aqm_ics.sh index c59bf87f81..676cc4ed90 100755 --- a/scripts/exregional_aqm_ics.sh +++ b/scripts/exregional_aqm_ics.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_aqm_lbcs.sh b/scripts/exregional_aqm_lbcs.sh index 24bac24ad7..09a33d40a2 100755 --- a/scripts/exregional_aqm_lbcs.sh +++ b/scripts/exregional_aqm_lbcs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_bias_correction_o3.sh b/scripts/exregional_bias_correction_o3.sh index 79ed056f59..709cc1957d 100755 --- a/scripts/exregional_bias_correction_o3.sh +++ b/scripts/exregional_bias_correction_o3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_bias_correction_pm25.sh b/scripts/exregional_bias_correction_pm25.sh index 05348ecbc8..9503f744c9 100755 --- a/scripts/exregional_bias_correction_pm25.sh +++ b/scripts/exregional_bias_correction_pm25.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_check_post_output.sh b/scripts/exregional_check_post_output.sh index cf82ae2051..1352d38789 100755 --- a/scripts/exregional_check_post_output.sh +++ b/scripts/exregional_check_post_output.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_fire_emission.sh b/scripts/exregional_fire_emission.sh index a2e9f9b44d..e1d2101477 100755 --- a/scripts/exregional_fire_emission.sh +++ b/scripts/exregional_fire_emission.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_get_extrn_mdl_files.sh b/scripts/exregional_get_extrn_mdl_files.sh index ffdcceef00..018a30c285 100755 --- a/scripts/exregional_get_extrn_mdl_files.sh +++ b/scripts/exregional_get_extrn_mdl_files.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh index 88472a8343..755e1c95c4 100755 --- a/scripts/exregional_make_grid.sh +++ b/scripts/exregional_make_grid.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- @@ -70,6 +70,7 @@ else print_info_msg "$VERBOSE" " All executables will be submitted with command \'${RUN_CMD_SERIAL}\'." fi + # #----------------------------------------------------------------------- # diff --git a/scripts/exregional_make_ics.sh b/scripts/exregional_make_ics.sh index d52bf25ec4..b42c086624 100755 --- a/scripts/exregional_make_ics.sh +++ b/scripts/exregional_make_ics.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_make_lbcs.sh b/scripts/exregional_make_lbcs.sh index 08cd0dda18..72f9369ff6 100755 --- a/scripts/exregional_make_lbcs.sh +++ b/scripts/exregional_make_lbcs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_make_orog.sh b/scripts/exregional_make_orog.sh index f595d405a0..4fcf34a4ad 100755 --- a/scripts/exregional_make_orog.sh +++ b/scripts/exregional_make_orog.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_make_sfc_climo.sh b/scripts/exregional_make_sfc_climo.sh index d641fd6267..868029a488 100755 --- a/scripts/exregional_make_sfc_climo.sh +++ b/scripts/exregional_make_sfc_climo.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_nexus_emission.sh b/scripts/exregional_nexus_emission.sh index 8c0f904b94..d1153d95b7 100755 --- a/scripts/exregional_nexus_emission.sh +++ b/scripts/exregional_nexus_emission.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_nexus_gfs_sfc.sh b/scripts/exregional_nexus_gfs_sfc.sh index 01207e5666..c34d2c30ae 100755 --- a/scripts/exregional_nexus_gfs_sfc.sh +++ b/scripts/exregional_nexus_gfs_sfc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_nexus_post_split.sh b/scripts/exregional_nexus_post_split.sh index a2e2a63b2a..390e0dcce6 100755 --- a/scripts/exregional_nexus_post_split.sh +++ b/scripts/exregional_nexus_post_split.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_point_source.sh b/scripts/exregional_point_source.sh index 8eee83337c..aeec8f3925 100755 --- a/scripts/exregional_point_source.sh +++ b/scripts/exregional_point_source.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_post_stat_o3.sh b/scripts/exregional_post_stat_o3.sh index 266cfe67f9..94306d7336 100755 --- a/scripts/exregional_post_stat_o3.sh +++ b/scripts/exregional_post_stat_o3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_post_stat_pm25.sh b/scripts/exregional_post_stat_pm25.sh index 47ee326fb4..dc054b87a3 100755 --- a/scripts/exregional_post_stat_pm25.sh +++ b/scripts/exregional_post_stat_pm25.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_pre_post_stat.sh b/scripts/exregional_pre_post_stat.sh index 33bbd75a41..44f4637684 100755 --- a/scripts/exregional_pre_post_stat.sh +++ b/scripts/exregional_pre_post_stat.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_fcst.sh b/scripts/exregional_run_fcst.sh index 6dfad9673b..c5519d923c 100755 --- a/scripts/exregional_run_fcst.sh +++ b/scripts/exregional_run_fcst.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh index 8fef9cfa21..5bbe61f530 100755 --- a/scripts/exregional_run_met_genensprod_or_ensemblestat.sh +++ b/scripts/exregional_run_met_genensprod_or_ensemblestat.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh index c9d8baeefe..1fa249ecf8 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh index 0ebff19961..067c24ec07 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensmean.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh index 06e7e22241..e042b68bfe 100755 --- a/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh +++ b/scripts/exregional_run_met_gridstat_or_pointstat_vx_ensprob.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_pb2nc_obs.sh b/scripts/exregional_run_met_pb2nc_obs.sh index 1122df77ae..10d1beba4d 100755 --- a/scripts/exregional_run_met_pb2nc_obs.sh +++ b/scripts/exregional_run_met_pb2nc_obs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_met_pcpcombine.sh b/scripts/exregional_run_met_pcpcombine.sh index 6db1ff16ba..4a9222707a 100755 --- a/scripts/exregional_run_met_pcpcombine.sh +++ b/scripts/exregional_run_met_pcpcombine.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_post.sh b/scripts/exregional_run_post.sh index 76a1196329..edf35ef2a4 100755 --- a/scripts/exregional_run_post.sh +++ b/scripts/exregional_run_post.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- diff --git a/scripts/exregional_run_prdgen.sh b/scripts/exregional_run_prdgen.sh index bf7a9b8e83..8fc72dff1c 100755 --- a/scripts/exregional_run_prdgen.sh +++ b/scripts/exregional_run_prdgen.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # #----------------------------------------------------------------------- @@ -212,7 +212,7 @@ sed -n -e '1,500p' $DATAprdgen/prslevf${fhr}.txt >& $DATAprdgen/hi_pr_1.txt sed -n -e '501,$p' $DATAprdgen/prslevf${fhr}.txt >& $DATAprdgen/hi_pr_2.txt # Create script to execute production generation tasks in parallel using CFP -echo "#!/bin/bash" > $DATAprdgen/poescript_${fhr} +echo "#!/usr/bin/env bash" > $DATAprdgen/poescript_${fhr} echo "export DATA=${DATAprdgen}" >> $DATAprdgen/poescript_${fhr} echo "export COMOUT=${COMOUT}" >> $DATAprdgen/poescript_${fhr} diff --git a/scripts/exregional_run_prdgen_subpiece.sh b/scripts/exregional_run_prdgen_subpiece.sh index 0b0b08630a..37e52c46fe 100755 --- a/scripts/exregional_run_prdgen_subpiece.sh +++ b/scripts/exregional_run_prdgen_subpiece.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ################################################################################ #### UNIX Script Documentation Block # . . diff --git a/sorc/CMakeLists.txt b/sorc/CMakeLists.txt index 4c076a1ede..e84319ad6e 100644 --- a/sorc/CMakeLists.txt +++ b/sorc/CMakeLists.txt @@ -45,9 +45,6 @@ if (BUILD_UFS) list(APPEND UFS_WEATHER_MODEL_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}" "-DCCPP_SUITES=${CCPP_SUITES}" - "-DCMAKE_C_COMPILER=${MPI_C_COMPILER}" - "-DCMAKE_CXX_COMPILER=${MPI_CXX_COMPILER}" - "-DCMAKE_Fortran_COMPILER=${MPI_Fortran_COMPILER}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" "-DCMAKE_MODULE_PATH=${MAPL_ROOT}/share/MAPL/cmake" "-DNETCDF_DIR=$ENV{NETCDF}" diff --git a/tests/WE2E/machine_suites/comprehensive.derecho b/tests/WE2E/machine_suites/comprehensive.derecho deleted file mode 120000 index 18a56d9739..0000000000 --- a/tests/WE2E/machine_suites/comprehensive.derecho +++ /dev/null @@ -1 +0,0 @@ -comprehensive.orion \ No newline at end of file diff --git a/tests/WE2E/machine_suites/comprehensive.derecho b/tests/WE2E/machine_suites/comprehensive.derecho new file mode 100644 index 0000000000..5bf5b4db24 --- /dev/null +++ b/tests/WE2E/machine_suites/comprehensive.derecho @@ -0,0 +1,63 @@ +2020_CAD +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 +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_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_ensemble_verification_winter_wx +MET_verification_only_vx +nco +nco_ensemble +nco_grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v16 +nco_grid_RRFS_CONUS_25km_ics_FV3GFS_lbcs_FV3GFS_timeoffset_suite_GFS_v16 +nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km +nco_grid_RRFS_CONUScompact_25km_ics_HRRR_lbcs_RAP_suite_HRRR +pregen_grid_orog_sfc_climo +specify_EXTRN_MDL_SYSBASEDIR_ICS_LBCS +specify_template_filenames diff --git a/tests/WE2E/machine_suites/comprehensive.gaea b/tests/WE2E/machine_suites/comprehensive.gaea deleted file mode 120000 index 18a56d9739..0000000000 --- a/tests/WE2E/machine_suites/comprehensive.gaea +++ /dev/null @@ -1 +0,0 @@ -comprehensive.orion \ No newline at end of file diff --git a/tests/WE2E/machine_suites/coverage.gaea b/tests/WE2E/machine_suites/coverage.gaea deleted file mode 100644 index 4ff7f61f3c..0000000000 --- a/tests/WE2E/machine_suites/coverage.gaea +++ /dev/null @@ -1,11 +0,0 @@ -community -custom_ESGgrid_NewZealand_3km -grid_RRFS_CONUScompact_13km_ics_HRRR_lbcs_RAP_suite_RRFS_v1beta -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_RAP -grid_RRFS_CONUS_13km_ics_FV3GFS_lbcs_FV3GFS_suite_HRRR -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 -nco_ensemble -nco_grid_RRFS_CONUS_3km_ics_FV3GFS_lbcs_FV3GFS_suite_GFS_v15_thompson_mynn_lam3km diff --git a/tests/WE2E/setup_WE2E_tests.sh b/tests/WE2E/setup_WE2E_tests.sh index 0bfe5c2a56..0644102c06 100755 --- a/tests/WE2E/setup_WE2E_tests.sh +++ b/tests/WE2E/setup_WE2E_tests.sh @@ -45,7 +45,7 @@ function usage { } -machines=( hera jet cheyenne derecho orion wcoss2 gaea gaea-c5 odin singularity macos noaacloud ) +machines=( hera jet cheyenne derecho orion wcoss2 gaea-c5 odin singularity macos noaacloud ) if [ "$1" = "-h" ] ; then usage ; fi [[ $# -le 2 ]] && usage diff --git a/tests/build.sh b/tests/build.sh index b1d7a00091..caf0e2b0ae 100755 --- a/tests/build.sh +++ b/tests/build.sh @@ -21,7 +21,7 @@ function usage() { exit 1 } -machines=( hera jet cheyenne derecho orion hercules wcoss2 gaea gaea-c5 odin singularity macos noaacloud ) +machines=( hera jet cheyenne derecho orion hercules wcoss2 gaea-c5 odin singularity macos noaacloud ) [[ $# -gt 4 ]] && usage diff --git a/ush/load_modules_wflow.sh b/ush/load_modules_wflow.sh index 67499f4888..cf33a43f3f 100755 --- a/ush/load_modules_wflow.sh +++ b/ush/load_modules_wflow.sh @@ -62,7 +62,12 @@ task failed: $has_mu && set +u if [ ! -z $(command -v conda) ]; then +# Gaea-C5 special case missing jinja2 + if [ "${machine}" == "gaea-c5" ]; then + conda activate workflow_tools + else conda activate srw_app + fi fi $has_mu && set -u diff --git a/ush/machine/gaea.yaml b/ush/machine/gaea.yaml deleted file mode 100644 index f2abbc55c5..0000000000 --- a/ush/machine/gaea.yaml +++ /dev/null @@ -1,51 +0,0 @@ -platform: - WORKFLOW_MANAGER: rocoto - NCORES_PER_NODE: 32 - SCHED: slurm - TEST_CCPA_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/ccpa/proc - TEST_MRMS_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/mrms/proc - TEST_NDAS_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/ndas/proc - TEST_NOHRSC_OBS_DIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/obs_data/nohrsc/proc - DOMAIN_PREGEN_BASEDIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/FV3LAM_pregen - QUEUE_DEFAULT: windfall - QUEUE_FCST: windfall - QUEUE_HPSS: windfall - REMOVE_MEMORY: True - PARTITION_HPSS: eslogin - RUN_CMD_FCST: srun --export=ALL -n ${PE_MEMBER01} - RUN_CMD_POST: srun --export=ALL -n $nprocs - RUN_CMD_PRDGEN: srun --export=ALL -n $nprocs - RUN_CMD_SERIAL: time - RUN_CMD_UTILS: srun --export=ALL -n $nprocs - SCHED_NATIVE_CMD: --clusters=c4 --export=NONE - SCHED_NATIVE_CMD_HPSS: --clusters=es --export=NONE - PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }' - TEST_EXTRN_MDL_SOURCE_BASEDIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data - TEST_PREGEN_BASEDIR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/FV3LAM_pregen - TEST_ALT_EXTRN_MDL_SYSBASEDIR_ICS: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir - TEST_ALT_EXTRN_MDL_SYSBASEDIR_LBCS: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/dummy_FV3GFS_sys_dir - TEST_VX_FCST_INPUT_BASEDIR: '{{ "/lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/output_data/fcst_" }}{{ "ens" if (global.NUM_ENS_MEMBERS > 0) else "det" }}{{ "/{{workflow.PREDEF_GRID_NAME}}" }}{% raw %}{% endraw %}' - FIXaer: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_aer - FIXgsm: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_am - FIXlut: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_lut - FIXorg: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_orog - FIXsfc: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/fix/fix_sfc_climo - FIXshp: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/NaturalEarth - EXTRN_MDL_DATA_STORES: aws -data: - ics_lbcs: - FV3GFS: - nemsio: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/FV3GFS/nemsio/${yyyymmdd}${hh} - grib2: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/FV3GFS/grib2/${yyyymmdd}${hh} - RAP: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmdd}${hh} - HRRR: /lustre/f2/dev/role.epic/contrib/UFS_SRW_data/develop/input_model_data/HRRR/${yyyymmdd}${hh} -rocoto: - tasks: - metatask_run_ensemble: - task_run_fcst_mem#mem#: - cores: '{{ task_run_fcst.PE_MEMBER01 // 1 }}' - native: '--cpus-per-task {{ task_run_fcst.OMP_NUM_THREADS_RUN_FCST|int }} --exclusive {{ platform.SCHED_NATIVE_CMD }}' - nodes: - nnodes: - nodesize: - ppn: diff --git a/ush/machine/noaacloud.yaml b/ush/machine/noaacloud.yaml index a3c3c7f6f8..50de28e751 100644 --- a/ush/machine/noaacloud.yaml +++ b/ush/machine/noaacloud.yaml @@ -6,6 +6,7 @@ platform: TEST_MRMS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/mrms/proc TEST_NDAS_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/ndas/proc TEST_NOHRSC_OBS_DIR: /contrib/EPIC/UFS_SRW_data/develop/obs_data/nohrsc/proc + DOMAIN_PREGEN_BASEDIR: /contrib/EPIC/UFS_SRW_data/develop/FV3LAM_pregen REMOVE_MEMORY: True RUN_CMD_FCST: mpiexec -np ${PE_MEMBER01} RUN_CMD_POST: mpiexec -np $nprocs diff --git a/ush/valid_param_vals.yaml b/ush/valid_param_vals.yaml index 1c19cadf79..f432c0bd76 100644 --- a/ush/valid_param_vals.yaml +++ b/ush/valid_param_vals.yaml @@ -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", "ODIN", "CHEYENNE", "DERECHO", "STAMPEDE", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEA", "GAEA-C5"] +valid_vals_MACHINE: ["HERA", "WCOSS2", "ORION", "HERCULES", "JET", "ODIN", "CHEYENNE", "DERECHO", "STAMPEDE", "LINUX", "MACOS", "NOAACLOUD", "SINGULARITY", "GAEA-C5"] valid_vals_SCHED: ["slurm", "pbspro", "lsf", "lsfcray", "none"] valid_vals_FCST_MODEL: ["ufs-weather-model"] valid_vals_WORKFLOW_MANAGER: ["rocoto", "ecflow", "none"] diff --git a/ush/wrappers/job_cards/qsub/get_ics.qsub b/ush/wrappers/job_cards/qsub/get_ics.qsub index da3343808a..10af488c4c 100644 --- a/ush/wrappers/job_cards/qsub/get_ics.qsub +++ b/ush/wrappers/job_cards/qsub/get_ics.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=1:ncpus=1:mem=2G #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/get_lbcs.qsub b/ush/wrappers/job_cards/qsub/get_lbcs.qsub index 1095e1ed95..b99e0d3c12 100644 --- a/ush/wrappers/job_cards/qsub/get_lbcs.qsub +++ b/ush/wrappers/job_cards/qsub/get_lbcs.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=1:ncpus=1:mem=2G #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_grid.qsub b/ush/wrappers/job_cards/qsub/make_grid.qsub index a26aeb1878..fb207e2e06 100644 --- a/ush/wrappers/job_cards/qsub/make_grid.qsub +++ b/ush/wrappers/job_cards/qsub/make_grid.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=24:ncpus=24 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_ics.qsub b/ush/wrappers/job_cards/qsub/make_ics.qsub index 193114f26f..3fad9f0ec1 100644 --- a/ush/wrappers/job_cards/qsub/make_ics.qsub +++ b/ush/wrappers/job_cards/qsub/make_ics.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=4:mpiprocs=12:ncpus=12 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_lbcs.qsub b/ush/wrappers/job_cards/qsub/make_lbcs.qsub index 83ae53bd91..72c66a355e 100644 --- a/ush/wrappers/job_cards/qsub/make_lbcs.qsub +++ b/ush/wrappers/job_cards/qsub/make_lbcs.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=4:mpiprocs=12:ncpus=12 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_orog.qsub b/ush/wrappers/job_cards/qsub/make_orog.qsub index 8ab292f8b2..473a9e54c6 100644 --- a/ush/wrappers/job_cards/qsub/make_orog.qsub +++ b/ush/wrappers/job_cards/qsub/make_orog.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=24:ncpus=24 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/make_sfc_climo.qsub b/ush/wrappers/job_cards/qsub/make_sfc_climo.qsub index 8103ea6e6f..46ac2d0f6f 100644 --- a/ush/wrappers/job_cards/qsub/make_sfc_climo.qsub +++ b/ush/wrappers/job_cards/qsub/make_sfc_climo.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=2:mpiprocs=24:ncpus=24 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/run_fcst.qsub b/ush/wrappers/job_cards/qsub/run_fcst.qsub index 931a84ce4c..31500164fb 100644 --- a/ush/wrappers/job_cards/qsub/run_fcst.qsub +++ b/ush/wrappers/job_cards/qsub/run_fcst.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -l select=1:mpiprocs=36:ncpus=36 #PBS -q main diff --git a/ush/wrappers/job_cards/qsub/run_post.qsub b/ush/wrappers/job_cards/qsub/run_post.qsub index 296ce7b59e..78dd8e834d 100644 --- a/ush/wrappers/job_cards/qsub/run_post.qsub +++ b/ush/wrappers/job_cards/qsub/run_post.qsub @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash #PBS -A epic #PBS -j oe -o run_post.log #PBS -l select=2:mpiprocs=24:ncpus=24 diff --git a/ush/wrappers/job_cards/sbatch/get_ics.sbatch b/ush/wrappers/job_cards/sbatch/get_ics.sbatch index 44e67f3c44..5aca1c2e7f 100644 --- a/ush/wrappers/job_cards/sbatch/get_ics.sbatch +++ b/ush/wrappers/job_cards/sbatch/get_ics.sbatch @@ -28,7 +28,3 @@ $USHdir/load_modules_run_task.sh "get_extrn_ics" $JOBSdir/JREGIONAL_GET_EXTRN_MD # Gaea-c5 differences: ##SBATCH --qos=normal ##SBATCH --clusters=es --partition=eslogin_c5 --export=NONE - -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=es --export=NONE diff --git a/ush/wrappers/job_cards/sbatch/get_lbcs.sbatch b/ush/wrappers/job_cards/sbatch/get_lbcs.sbatch index d5f037153b..fc747ece40 100644 --- a/ush/wrappers/job_cards/sbatch/get_lbcs.sbatch +++ b/ush/wrappers/job_cards/sbatch/get_lbcs.sbatch @@ -28,7 +28,3 @@ $USHdir/load_modules_run_task.sh "get_extrn_lbcs" $JOBSdir/JREGIONAL_GET_EXTRN_M # Gaea-c5 differences: ##SBATCH --qos=normal ##SBATCH --clusters=es --partition=eslogin_c5 --export=NONE - -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=es --export=NONE diff --git a/ush/wrappers/job_cards/sbatch/make_grid.sbatch b/ush/wrappers/job_cards/sbatch/make_grid.sbatch index d452d64426..b8866af36f 100644 --- a/ush/wrappers/job_cards/sbatch/make_grid.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_grid.sbatch @@ -22,11 +22,6 @@ $USHdir/load_modules_run_task.sh "make_grid" $JOBSdir/JREGIONAL_MAKE_GRID ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='24' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='24' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='24' diff --git a/ush/wrappers/job_cards/sbatch/make_ics.sbatch b/ush/wrappers/job_cards/sbatch/make_ics.sbatch index 20b18605a0..512eefeae5 100644 --- a/ush/wrappers/job_cards/sbatch/make_ics.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_ics.sbatch @@ -28,11 +28,6 @@ $USHdir/load_modules_run_task.sh "make_ics" $JOBSdir/JREGIONAL_MAKE_ICS ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='48' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='48' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='48' diff --git a/ush/wrappers/job_cards/sbatch/make_lbcs.sbatch b/ush/wrappers/job_cards/sbatch/make_lbcs.sbatch index a0ab0071a4..ab1d1312c8 100644 --- a/ush/wrappers/job_cards/sbatch/make_lbcs.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_lbcs.sbatch @@ -30,11 +30,6 @@ $USHdir/load_modules_run_task.sh "make_lbcs" $JOBSdir/JREGIONAL_MAKE_LBCS ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='48' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='48' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='48' diff --git a/ush/wrappers/job_cards/sbatch/make_orog.sbatch b/ush/wrappers/job_cards/sbatch/make_orog.sbatch index eebed3b5ce..3b440cbd42 100644 --- a/ush/wrappers/job_cards/sbatch/make_orog.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_orog.sbatch @@ -22,11 +22,6 @@ $USHdir/load_modules_run_task.sh "make_orog" $JOBSdir/JREGIONAL_MAKE_OROG ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='24' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='24' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='24' diff --git a/ush/wrappers/job_cards/sbatch/make_sfc_climo.sbatch b/ush/wrappers/job_cards/sbatch/make_sfc_climo.sbatch index 47c7aed043..b791288922 100644 --- a/ush/wrappers/job_cards/sbatch/make_sfc_climo.sbatch +++ b/ush/wrappers/job_cards/sbatch/make_sfc_climo.sbatch @@ -22,11 +22,6 @@ $USHdir/load_modules_run_task.sh "make_sfc_climo" $JOBSdir/JREGIONAL_MAKE_SFC_CL ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='48' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='48' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet #export nprocs='48' diff --git a/ush/wrappers/job_cards/sbatch/run_fcst.sbatch b/ush/wrappers/job_cards/sbatch/run_fcst.sbatch index 6a146a5627..75abd6fc03 100644 --- a/ush/wrappers/job_cards/sbatch/run_fcst.sbatch +++ b/ush/wrappers/job_cards/sbatch/run_fcst.sbatch @@ -26,11 +26,6 @@ $USHdir/load_modules_run_task.sh "run_fcst" $JOBSdir/JREGIONAL_RUN_FCST ##SBATCH --clusters=c5 --partition=batch --export=NONE #export nprocs='48' -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE -#export nprocs='48' - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet diff --git a/ush/wrappers/job_cards/sbatch/run_post.sbatch b/ush/wrappers/job_cards/sbatch/run_post.sbatch index 5b180b82e1..c2a24a7f5e 100644 --- a/ush/wrappers/job_cards/sbatch/run_post.sbatch +++ b/ush/wrappers/job_cards/sbatch/run_post.sbatch @@ -30,10 +30,6 @@ done ##SBATCH --qos=normal ##SBATCH --clusters=c5 --partition=batch --export=NONE -# Gaea differences: -##SBATCH --qos=windfall -##SBATCH --clusters=c4 --export=NONE - # Jet differences: ##SBATCH --partition=sjet,vjet,kjet,xjet diff --git a/ush/wrappers/run_fcst.sh b/ush/wrappers/run_fcst.sh index 93cc009b58..7450de7cc5 100755 --- a/ush/wrappers/run_fcst.sh +++ b/ush/wrappers/run_fcst.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_get_ics.sh b/ush/wrappers/run_get_ics.sh index 4cba2a86e5..0ee521a67d 100755 --- a/ush/wrappers/run_get_ics.sh +++ b/ush/wrappers/run_get_ics.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_get_lbcs.sh b/ush/wrappers/run_get_lbcs.sh index 3447d9f224..543ab6e47d 100755 --- a/ush/wrappers/run_get_lbcs.sh +++ b/ush/wrappers/run_get_lbcs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_gridensvx.sh b/ush/wrappers/run_gridensvx.sh index 6134e6f33a..d3cb0c12ae 100755 --- a/ush/wrappers/run_gridensvx.sh +++ b/ush/wrappers/run_gridensvx.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Stand-alone script to run grid-to-grid ensemble verification export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" diff --git a/ush/wrappers/run_gridvx.sh b/ush/wrappers/run_gridvx.sh index 9b6f0e3979..9a5d55b046 100755 --- a/ush/wrappers/run_gridvx.sh +++ b/ush/wrappers/run_gridvx.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Stand-alone script to run grid-to-grid verification export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" diff --git a/ush/wrappers/run_make_grid.sh b/ush/wrappers/run_make_grid.sh index deff13c0ee..2d55beaf94 100755 --- a/ush/wrappers/run_make_grid.sh +++ b/ush/wrappers/run_make_grid.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_make_ics.sh b/ush/wrappers/run_make_ics.sh index b3e4333d9d..5c629722fc 100755 --- a/ush/wrappers/run_make_ics.sh +++ b/ush/wrappers/run_make_ics.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_make_lbcs.sh b/ush/wrappers/run_make_lbcs.sh index 2cd59c47a2..27c94c127f 100755 --- a/ush/wrappers/run_make_lbcs.sh +++ b/ush/wrappers/run_make_lbcs.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_make_orog.sh b/ush/wrappers/run_make_orog.sh index 81bdd5787b..5f02ff9599 100755 --- a/ush/wrappers/run_make_orog.sh +++ b/ush/wrappers/run_make_orog.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_make_sfc_climo.sh b/ush/wrappers/run_make_sfc_climo.sh index 455a8fdf45..fab33f75d6 100755 --- a/ush/wrappers/run_make_sfc_climo.sh +++ b/ush/wrappers/run_make_sfc_climo.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_pointensvx.sh b/ush/wrappers/run_pointensvx.sh index 87ad3e2e30..ca1c63952f 100755 --- a/ush/wrappers/run_pointensvx.sh +++ b/ush/wrappers/run_pointensvx.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Stand-alone script to run grid-to-point ensemble verification export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" diff --git a/ush/wrappers/run_pointvx.sh b/ush/wrappers/run_pointvx.sh index d59a57ed5f..e6754d8e78 100755 --- a/ush/wrappers/run_pointvx.sh +++ b/ush/wrappers/run_pointvx.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # Stand-alone script to run grid-to-point verification export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" diff --git a/ush/wrappers/run_post.sh b/ush/wrappers/run_post.sh index 4a4a57513e..46ef104365 100755 --- a/ush/wrappers/run_post.sh +++ b/ush/wrappers/run_post.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_process_lightning.sh b/ush/wrappers/run_process_lightning.sh index d183d3adcd..1b6668136e 100755 --- a/ush/wrappers/run_process_lightning.sh +++ b/ush/wrappers/run_process_lightning.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP} diff --git a/ush/wrappers/run_process_radarref.sh b/ush/wrappers/run_process_radarref.sh index 694b79b4f8..39475b81be 100755 --- a/ush/wrappers/run_process_radarref.sh +++ b/ush/wrappers/run_process_radarref.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash export GLOBAL_VAR_DEFNS_FP="${EXPTDIR}/var_defns.sh" set -xa source ${GLOBAL_VAR_DEFNS_FP}