From a35a687898ace6643f508a2be3f95db6d01c2bf8 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Fri, 10 Jun 2022 00:14:53 -0600 Subject: [PATCH 1/7] updated devbuild.sh --- devbuild.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/devbuild.sh b/devbuild.sh index aaad8dd09d..ad1622a33d 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -10,7 +10,7 @@ OPTIONS show this help guide -p, --platform=PLATFORM name of machine you are building on - (e.g. cheyenne | hera | jet | orion | wcoss_dell_p3) + (e.g. cheyenne | hera | jet | orion | gaea | noaacloud | macos | linux ) -c, --compiler=COMPILER compiler to use; default depends on platform (e.g. intel | gnu | cray | gccgfortran) @@ -154,9 +154,8 @@ if [ -z "${COMPILER}" ] ; then case ${PLATFORM} in jet|hera|gaea) COMPILER=intel ;; orion|noaacloud) COMPILER=intel ;; - wcoss_dell_p3) COMPILER=intel ;; - cheyenne) COMPILER=intel ;; - macos,singularity) COMPILER=gnu ;; + cheyenne,linux) COMPILER=intel ;; + macos,linux,singularity) COMPILER=gnu ;; odin) COMPILER=intel ;; *) COMPILER=intel @@ -243,7 +242,7 @@ if [ "${VERBOSE}" = true ]; then fi # Before we go on load modules, we first need to activate Lmod for some systems -source ${SRC_DIR}/etc/lmod-setup.sh +source ${SRC_DIR}/etc/lmod-setup.sh ${PLATFORM} # source the module file for this platform/compiler combination, then build the code printf "... Load MODULE_FILE and create BUILD directory ...\n" From da094e1c12ff6c93958868c10a1668400a55c4a0 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Fri, 10 Jun 2022 00:17:42 -0600 Subject: [PATCH 2/7] Use ufs-weather-model/release/public-v3-SRW, NOAA-EPIC:regional_workflow/feature/hera-fix --- Externals.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Externals.cfg b/Externals.cfg index ce380cfd32..6578295ea8 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -1,9 +1,9 @@ [regional_workflow] protocol = git -repo_url = https://github.com/ufs-community/regional_workflow +repo_url = https://github.com/NOAA-EPIC/regional_workflow # Specify either a branch name or a hash but not both. -#branch = develop -hash = de82b63 +branch = feature/hera-fix +#hash = de82b63 local_path = regional_workflow required = True @@ -20,8 +20,8 @@ required = True 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 = 96dffa1 +branch = release/public-v3-SRW +#hash = 96dffa1 local_path = src/ufs-weather-model required = True From ee9e46d500119e9b2034b43f8980349903e41be9 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Fri, 10 Jun 2022 00:27:17 -0600 Subject: [PATCH 3/7] Correct a branch name --- Externals.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Externals.cfg b/Externals.cfg index 6578295ea8..aec2c44cd2 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -20,7 +20,7 @@ required = True protocol = git repo_url = https://github.com/ufs-community/ufs-weather-model # Specify either a branch name or a hash but not both. -branch = release/public-v3-SRW +branch = release-public-v3-SRW #hash = 96dffa1 local_path = src/ufs-weather-model required = True From 444a6a1514132ff27d3ff02027009a74efdce137 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Fri, 10 Jun 2022 09:49:39 -0600 Subject: [PATCH 4/7] updated build_cheyenne_intel, intel2022, esmf-8.3.0b09 --- modulefiles/build_cheyenne_intel | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/modulefiles/build_cheyenne_intel b/modulefiles/build_cheyenne_intel index b83c36a5df..c1d868d458 100644 --- a/modulefiles/build_cheyenne_intel +++ b/modulefiles/build_cheyenne_intel @@ -2,33 +2,32 @@ proc ModulesHelp { } { puts stderr "This module loads libraries for building SRW on" - puts stderr "the CISL Cheyenne machine using Intel-19.1.1" + puts stderr "the CISL Cheyenne machine using Intel-2022.1" } module-whatis "Loads libraries needed for building SRW on Cheyenne" +module purge module load cmake/3.22.0 -module load ncarenv/1.3 -module load intel/2021.2 -module load mpt/2.22 -module load ncarcompilers/0.5.0 +module load intel/2022.1 +module load mpt/2.25 module load python/3.7.9 -module unload netcdf -module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack +module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack module load hpc/1.2.0 -module load hpc-intel/2021.2 -module load hpc-mpt/2.22 +module load hpc-intel/2022.1 +module load hpc-mpt/2.25 module load srw_common -module load g2/3.4.3 -module load esmf/8_2_0 +module load g2/3.4.5 +module load esmf/8.3.0b09 +module load mapl/2.11.0-esmf-8.3.0b09 module load netcdf/4.7.4 -module load png/1.6.35 -module load pio/2.5.2 +module load libpng/1.6.37 +module load pio/2.5.3 setenv CMAKE_C_COMPILER mpicc -setenv CMAKE_CXX_COMPILER mpicxx +setenv CMAKE_CXX_COMPILER mpixx setenv CMAKE_Fortran_COMPILER mpif90 setenv CMAKE_Platform cheyenne.intel From 7dc24039d3f06b466cc0a9464bc7aa8a7d356c8c Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Fri, 10 Jun 2022 16:37:53 -0600 Subject: [PATCH 5/7] update modules built for SRW public-v2 --- modulefiles/build_cheyenne_intel | 8 ++++---- modulefiles/srw_common | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modulefiles/build_cheyenne_intel b/modulefiles/build_cheyenne_intel index c1d868d458..1419d4a54c 100644 --- a/modulefiles/build_cheyenne_intel +++ b/modulefiles/build_cheyenne_intel @@ -13,18 +13,18 @@ module load intel/2022.1 module load mpt/2.25 module load python/3.7.9 -module use /glade/work/epicufsrt/GMTB/tools/intel/2022.1/hpc-stack-v1.2.0_6eb6/modulefiles/stack +module use /glade/scratch/nperlin/HPC-stack/intel2022.1/install-1.2.0/modulefiles/stack module load hpc/1.2.0 module load hpc-intel/2022.1 module load hpc-mpt/2.25 module load srw_common -module load g2/3.4.5 +module load g2/3.4.3 module load esmf/8.3.0b09 module load mapl/2.11.0-esmf-8.3.0b09 module load netcdf/4.7.4 -module load libpng/1.6.37 -module load pio/2.5.3 +module load libpng/1.6.35 +module load pio/2.5.2 setenv CMAKE_C_COMPILER mpicc setenv CMAKE_CXX_COMPILER mpixx diff --git a/modulefiles/srw_common b/modulefiles/srw_common index c8c87f92a8..d3fe0fe9f2 100644 --- a/modulefiles/srw_common +++ b/modulefiles/srw_common @@ -8,8 +8,8 @@ module load hdf5/1.10.6 module load-any netcdf/4.7.4 netcdf-c/4.7.4 module load-any netcdf/4.7.4 netcdf-fortran/4.5.4 module load-any pio/2.5.2 parallelio/2.5.2 -module load-any esmf/8_2_0 esmf/8.2.0 -module load fms/2021.03 +module load esmf/8.3.0b09 +module load fms/2021.04 module load bacio/2.4.1 module load crtm/2.3.0 From fe6c8456fe827443699f9713d903faf882b85607 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Fri, 10 Jun 2022 22:18:24 -0600 Subject: [PATCH 6/7] correct build for Cheyenne/GNU11.2 --- modulefiles/build_cheyenne_gnu | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/modulefiles/build_cheyenne_gnu b/modulefiles/build_cheyenne_gnu index add5ee3b0f..3e847a15d0 100644 --- a/modulefiles/build_cheyenne_gnu +++ b/modulefiles/build_cheyenne_gnu @@ -2,29 +2,28 @@ proc ModulesHelp { } { puts stderr "This module loads libraries for building SRW on" - puts stderr "the CISL Cheyenne machine using GNU" + puts stderr "the CISL Cheyenne machine using GNU compilers" } module-whatis "Loads libraries needed for building SRW on Cheyenne" +module purge module load cmake/3.22.0 -module load ncarenv/1.3 -module load gnu/10.1.0 -module load mpt/2.22 -module load ncarcompilers/0.5.0 +module load gnu/11.2.0 +module load mpt/2.25 module load python/3.7.9 -module unload netcdf -module use /glade/p/ral/jntp/GMTB/tools/hpc-stack-v1.2.0/modulefiles/stack +module use /glade/scratch/nperlin/HPC-stack/gnu11.2/install-1.2.0/modulefiles/stack module load hpc/1.2.0 -module load hpc-gnu/10.1.0 -module load hpc-mpt/2.22 +module load hpc-gnu/11.2.0 +module load hpc-mpt/2.25 module load srw_common module load g2/3.4.3 -module load esmf/8_2_0 module load netcdf/4.7.4 -module load png/1.6.35 +module load esmf/8.3.0b09 +module load mapl/2.11.0-esmf-8.3.0b09 +module load libpng/1.6.35 module load pio/2.5.2 setenv CMAKE_C_COMPILER mpicc From 19f57ac6e85ca1b432764ca425cc7d1f8117d3c9 Mon Sep 17 00:00:00 2001 From: Natalie Perlin Date: Mon, 13 Jun 2022 08:39:53 -0600 Subject: [PATCH 7/7] Use locally built module miniconda3/4.12.0 on cheyenne --- modulefiles/build_cheyenne_intel | 1 - modulefiles/wflow_cheyenne | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modulefiles/build_cheyenne_intel b/modulefiles/build_cheyenne_intel index 1419d4a54c..36109723b2 100644 --- a/modulefiles/build_cheyenne_intel +++ b/modulefiles/build_cheyenne_intel @@ -11,7 +11,6 @@ module purge module load cmake/3.22.0 module load intel/2022.1 module load mpt/2.25 -module load python/3.7.9 module use /glade/scratch/nperlin/HPC-stack/intel2022.1/install-1.2.0/modulefiles/stack module load hpc/1.2.0 diff --git a/modulefiles/wflow_cheyenne b/modulefiles/wflow_cheyenne index ca940a5387..8edb174677 100644 --- a/modulefiles/wflow_cheyenne +++ b/modulefiles/wflow_cheyenne @@ -7,12 +7,12 @@ proc ModulesHelp { } { module-whatis "Loads libraries needed for running SRW on Cheyenne" -module load ncarenv module use -a /glade/p/ral/jntp/UFS_SRW_app/modules/ module load rocoto +module load miniconda3/4.12.0 if { [module-info mode load] } { - puts stderr "Please do the following to activate ncar_pylib: - > ncar_pylib /glade/p/ral/jntp/UFS_SRW_app/ncar_pylib/regional_workflow" + puts stderr "Please do the following to activate regional_workflow: + > conda activate regional_workflow" }