From 90a69be8b1948da16c468d3c25cf0fd7fa8e9d5e Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Tue, 8 Feb 2022 14:39:15 -0600 Subject: [PATCH 01/23] Rename Orion modulefiles for LUA format - add the ".lua" extension to the Orion modulefiles Refs: #639 --- ...{enkf_chgres_recenter.orion => enkf_chgres_recenter.orion.lua} | 0 ...chgres_recenter_nc.orion => enkf_chgres_recenter_nc.orion.lua} | 0 .../fv3gfs/{gaussian_sfcanl.orion => gaussian_sfcanl.orion.lua} | 0 modulefiles/{gfs_bufr.orion => gfs_bufr.orion.lua} | 0 modulefiles/{gfs_fbwndgfs.orion => gfs_fbwndgfs.orion.lua} | 0 modulefiles/{module_base.orion => module_base.orion.lua} | 0 ...efile.fv3nc2nemsio.orion => modulefile.fv3nc2nemsio.orion.lua} | 0 ...ile.regrid_nemsio.orion => modulefile.regrid_nemsio.orion.lua} | 0 ...reloc_v6.0.0.orion => modulefile.storm_reloc_v6.0.0.orion.lua} | 0 modulefiles/{workflow_utils.orion => workflow_utils.orion.lua} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename modulefiles/fv3gfs/{enkf_chgres_recenter.orion => enkf_chgres_recenter.orion.lua} (100%) rename modulefiles/fv3gfs/{enkf_chgres_recenter_nc.orion => enkf_chgres_recenter_nc.orion.lua} (100%) rename modulefiles/fv3gfs/{gaussian_sfcanl.orion => gaussian_sfcanl.orion.lua} (100%) rename modulefiles/{gfs_bufr.orion => gfs_bufr.orion.lua} (100%) rename modulefiles/{gfs_fbwndgfs.orion => gfs_fbwndgfs.orion.lua} (100%) rename modulefiles/{module_base.orion => module_base.orion.lua} (100%) rename modulefiles/{modulefile.fv3nc2nemsio.orion => modulefile.fv3nc2nemsio.orion.lua} (100%) rename modulefiles/{modulefile.regrid_nemsio.orion => modulefile.regrid_nemsio.orion.lua} (100%) rename modulefiles/{modulefile.storm_reloc_v6.0.0.orion => modulefile.storm_reloc_v6.0.0.orion.lua} (100%) rename modulefiles/{workflow_utils.orion => workflow_utils.orion.lua} (100%) diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter.orion b/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua similarity index 100% rename from modulefiles/fv3gfs/enkf_chgres_recenter.orion rename to modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.orion b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.orion.lua similarity index 100% rename from modulefiles/fv3gfs/enkf_chgres_recenter_nc.orion rename to modulefiles/fv3gfs/enkf_chgres_recenter_nc.orion.lua diff --git a/modulefiles/fv3gfs/gaussian_sfcanl.orion b/modulefiles/fv3gfs/gaussian_sfcanl.orion.lua similarity index 100% rename from modulefiles/fv3gfs/gaussian_sfcanl.orion rename to modulefiles/fv3gfs/gaussian_sfcanl.orion.lua diff --git a/modulefiles/gfs_bufr.orion b/modulefiles/gfs_bufr.orion.lua similarity index 100% rename from modulefiles/gfs_bufr.orion rename to modulefiles/gfs_bufr.orion.lua diff --git a/modulefiles/gfs_fbwndgfs.orion b/modulefiles/gfs_fbwndgfs.orion.lua similarity index 100% rename from modulefiles/gfs_fbwndgfs.orion rename to modulefiles/gfs_fbwndgfs.orion.lua diff --git a/modulefiles/module_base.orion b/modulefiles/module_base.orion.lua similarity index 100% rename from modulefiles/module_base.orion rename to modulefiles/module_base.orion.lua diff --git a/modulefiles/modulefile.fv3nc2nemsio.orion b/modulefiles/modulefile.fv3nc2nemsio.orion.lua similarity index 100% rename from modulefiles/modulefile.fv3nc2nemsio.orion rename to modulefiles/modulefile.fv3nc2nemsio.orion.lua diff --git a/modulefiles/modulefile.regrid_nemsio.orion b/modulefiles/modulefile.regrid_nemsio.orion.lua similarity index 100% rename from modulefiles/modulefile.regrid_nemsio.orion rename to modulefiles/modulefile.regrid_nemsio.orion.lua diff --git a/modulefiles/modulefile.storm_reloc_v6.0.0.orion b/modulefiles/modulefile.storm_reloc_v6.0.0.orion.lua similarity index 100% rename from modulefiles/modulefile.storm_reloc_v6.0.0.orion rename to modulefiles/modulefile.storm_reloc_v6.0.0.orion.lua diff --git a/modulefiles/workflow_utils.orion b/modulefiles/workflow_utils.orion.lua similarity index 100% rename from modulefiles/workflow_utils.orion rename to modulefiles/workflow_utils.orion.lua From d83597fff40384c85d94f02707a691260c343fc3 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 08:07:17 -0600 Subject: [PATCH 02/23] Remove uneeded modulefiles for Orion/WCOSS-Dell - cleaned out modulefiles that are no longer needed for OznMon/Radmon - remove errant workflow_utils.orion.lua (wrong branch) Refs: #639 --- modulefiles/OznMonBuild.orion | 17 ---------------- modulefiles/OznMonBuild.wcoss_dell_p3 | 15 -------------- modulefiles/RadMonBuild.orion | 17 ---------------- modulefiles/RadMonBuild.wcoss_dell_p3 | 15 -------------- modulefiles/workflow_utils.orion.lua | 29 --------------------------- 5 files changed, 93 deletions(-) delete mode 100644 modulefiles/OznMonBuild.orion delete mode 100644 modulefiles/OznMonBuild.wcoss_dell_p3 delete mode 100644 modulefiles/RadMonBuild.orion delete mode 100644 modulefiles/RadMonBuild.wcoss_dell_p3 delete mode 100644 modulefiles/workflow_utils.orion.lua diff --git a/modulefiles/OznMonBuild.orion b/modulefiles/OznMonBuild.orion deleted file mode 100644 index efac4df057..0000000000 --- a/modulefiles/OznMonBuild.orion +++ /dev/null @@ -1,17 +0,0 @@ -#%Module################################################ -# Modfule file for oznmon -######################################################## -export ver=2.0.2 -export FCOMP=ifort - -export CF=$FCOMP -export FC=$FCOMP -export FFLAGS="-O3 -fp-model strict -convert big_endian -assume byterecl" - -export D_FFLAGS="-O3 -fp-model strict -convert big_endian -assume byterecl -debug" - -module load intel/2018.4 -#module load w3nco/2.0.6 -module use -a /work/noaa/noaatest/NCEPLIBS/lib/modulefiles -module load w3nco-intel-sandybridge/2.0.6 - diff --git a/modulefiles/OznMonBuild.wcoss_dell_p3 b/modulefiles/OznMonBuild.wcoss_dell_p3 deleted file mode 100644 index efb31a7da3..0000000000 --- a/modulefiles/OznMonBuild.wcoss_dell_p3 +++ /dev/null @@ -1,15 +0,0 @@ -#%Module################################################ -# Modfule file for oznmon -######################################################## -export ver=2.0.2 -export FCOMP=ifort - -export CF=$FCOMP -export FC=$FCOMP -export FFLAGS="-O3 -fp-model strict -convert big_endian -assume byterecl" - -export D_FFLAGS="-O3 -fp-model strict -convert big_endian -assume byterecl -debug" - -module load ips/18.0.1.163 -module load w3nco/2.0.6 - diff --git a/modulefiles/RadMonBuild.orion b/modulefiles/RadMonBuild.orion deleted file mode 100644 index 932bb6f95b..0000000000 --- a/modulefiles/RadMonBuild.orion +++ /dev/null @@ -1,17 +0,0 @@ -#%Module################################################ -# Modfule file for radmon -######################################################## -export ver=2.0.2 -export FCOMP=ifort - -export CF=$FCOMP -export FC=$FCOMP -export FFLAGS="-O3 -fp-model strict -D_REAL8_ -traceback -convert big_endian -assume byterecl" - -export CHECK_LIBS="/gpfs/hps/nco/ops/nwprod/spa_util/check_libs.bash" -export D_FFLAGS="-O3 -fp-model strict -D_REAL8_ -traceback -convert big_endian -assume byterecl -debug" - -module load intel/2018.4 -#module load w3nco/2.0.6 -module use -a /work/noaa/noaatest/NCEPLIBS/lib/modulefiles -module load w3nco-intel-sandybridge/2.0.6 diff --git a/modulefiles/RadMonBuild.wcoss_dell_p3 b/modulefiles/RadMonBuild.wcoss_dell_p3 deleted file mode 100644 index 9cece6e116..0000000000 --- a/modulefiles/RadMonBuild.wcoss_dell_p3 +++ /dev/null @@ -1,15 +0,0 @@ -#%Module################################################ -# Modfule file for radmon -######################################################## -export ver=2.0.2 -export FCOMP=ifort - -export CF=$FCOMP -export FC=$FCOMP -export FFLAGS="-O3 -fp-model strict -D_REAL8_ -traceback -convert big_endian -assume byterecl" - -export CHECK_LIBS="/gpfs/hps/nco/ops/nwprod/spa_util/check_libs.bash" -export D_FFLAGS="-O3 -fp-model strict -D_REAL8_ -traceback -convert big_endian -assume byterecl -debug" - -module load ips/18.0.1.163 -module load w3nco/2.0.6 diff --git a/modulefiles/workflow_utils.orion.lua b/modulefiles/workflow_utils.orion.lua deleted file mode 100644 index f379e1dbd0..0000000000 --- a/modulefiles/workflow_utils.orion.lua +++ /dev/null @@ -1,29 +0,0 @@ -#%Module##################################################### -## Workflow Utilities - orion -############################################################# - -module load cmake/3.17.3 - -module use /apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack -module load hpc/1.1.0 -module load hpc-intel/2018.4 -module load hpc-impi/2018.4 - -module load jasper/2.0.25 -module load zlib/1.2.11 -module load png/1.6.35 - -module load bacio/2.4.1 -module load w3nco/2.4.1 -module load w3emc/2.7.3 -module load sp/2.3.3 -module load ip/3.3.3 -module load nemsio/2.5.2 -module load nemsiogfs/2.5.3 -#module load ncio/1.0.0 -module load sigio/2.3.2 -module load g2/3.4.1 -module load bufr/11.4.0 - -module load hdf5/1.10.6 -module load netcdf/4.7.4 From 6e88009e9fd86eeaaead32bf14d263d26da28b32 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 15:17:35 -0600 Subject: [PATCH 03/23] Update Orion modulefiles to LUA format and hpc-stack Refs: #639 --- .../fv3gfs/enkf_chgres_recenter.orion.lua | 31 ++++---- .../fv3gfs/enkf_chgres_recenter_nc.orion.lua | 29 ++++---- modulefiles/fv3gfs/gaussian_sfcanl.orion.lua | 31 ++++---- modulefiles/gfs_bufr.orion.lua | 41 ++++++----- modulefiles/gfs_fbwndgfs.orion.lua | 29 +++++--- modulefiles/module_base.orion.lua | 72 +++++++++---------- modulefiles/modulefile.fv3nc2nemsio.orion.lua | 29 ++++---- .../modulefile.regrid_nemsio.orion.lua | 33 +++++---- .../modulefile.storm_reloc_v6.0.0.orion.lua | 38 +++++----- 9 files changed, 178 insertions(+), 155 deletions(-) diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua b/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua index 667318a770..894649fe03 100644 --- a/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua +++ b/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua @@ -1,17 +1,20 @@ -#%Module##################################################### -## enkf_chgres_recenter component -############################################################# +help([[ +Load environment for building enkf_chgres_recenter on Orion +]]) -module load intel/2018.4 -module load impi/2018.4 +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") -module use -a /apps/contrib/NCEPLIBS/orion/modulefiles -module load nemsio/2.2.4 -module load bacio/2.0.3 -module load w3nco/2.0.7 -module load ip/3.0.2 -module load sp/2.0.3 -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -export FC=ifort +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("ip", os.getenv("ip_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("FC","mpiifort") diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.orion.lua b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.orion.lua index 28aded5531..5460f4b3ee 100755 --- a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.orion.lua +++ b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.orion.lua @@ -1,16 +1,19 @@ -#%Module##################################################### -## enkf_chgres_recenter component -############################################################# +help([[ +Load environment for building enkf_chgres_recenter_nc +]]) -module load intel/2018.4 -module load impi/2018.4 +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") -module use -a /apps/contrib/NCEPLIBS/orion/modulefiles -module load bacio/2.0.3 -module load w3nco/2.0.7 -module load ip/3.0.2 -module load sp/2.0.3 -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -export FC=ifort +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("ip", os.getenv("ip_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("FC","mpiifort") diff --git a/modulefiles/fv3gfs/gaussian_sfcanl.orion.lua b/modulefiles/fv3gfs/gaussian_sfcanl.orion.lua index 82ffef2694..eb4bdfc299 100644 --- a/modulefiles/fv3gfs/gaussian_sfcanl.orion.lua +++ b/modulefiles/fv3gfs/gaussian_sfcanl.orion.lua @@ -1,19 +1,20 @@ -#%Module##################################################### -## gaussian_sfcanl build module for Orion -############################################################# +help([[ +Load environment for building gaussian_sfcanl on Orion +]]) -module load intel/2018.4 -module load impi/2018.4 +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") -module use -a /apps/contrib/NCEPLIBS/orion/modulefiles -module load w3nco/2.0.7 -module load bacio/2.0.3 -module load nemsio/2.2.4 -module load sp/2.0.3 -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -export NETCDF_INCLUDE="-I${NETCDF}/include" -export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -L${HDF5_LIBRARY_DIRS}/lib -lhdf5 -lhdf5_fortran" +load(pathJoin("zlib", os.getenv("zlib_ver"))) +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) -#export FCOMP=$FCOMP +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("FCOMP","mpiifort") diff --git a/modulefiles/gfs_bufr.orion.lua b/modulefiles/gfs_bufr.orion.lua index 668bc57759..ad20149842 100644 --- a/modulefiles/gfs_bufr.orion.lua +++ b/modulefiles/gfs_bufr.orion.lua @@ -1,23 +1,26 @@ -#%Module##################################################### -## bufrsnd -############################################################# +help([[ +Load environment to build gfs_bufr on Orion +]]) -module load intel/2018.4 -module load impi/2018.4 +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") -module load gempak/7.5.1 +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -module use -a /apps/contrib/NCEPLIBS/orion/modulefiles -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 -module load bacio/2.0.3 -module load w3nco/2.0.7 -module load sigio/2.1.1 -module load bufr/11.3.0 -module load nemsio/2.2.4 -module load w3emc_para/2.4.0 +load(pathJoin("gempak", os.getenv("gempak_ver"))) -export myFC=$FCOMP -export myFCFLAGS="-O3 -convert big_endian -traceback -g -fp-model source -qopenmp" -export myCPP=/lib/cpp -export myCPPFLAGS="-P" +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("sigio", os.getenv("sigio_ver"))) +load(pathJoin("w3emc", os.getenv("w3emc_ver"))) +load(pathJoin("bufr", os.getenv("bufr_ver"))) + +setenv("myFC","mpiifort") +setenv("myFCFLAGS","-O3 -convert big_endian -traceback -g -fp-model source -qopenmp") +setenv("myCPP","/lib/cpp") +setenv("myCPPFLAGS","-P") diff --git a/modulefiles/gfs_fbwndgfs.orion.lua b/modulefiles/gfs_fbwndgfs.orion.lua index c4601bf913..5c48c8bacb 100644 --- a/modulefiles/gfs_fbwndgfs.orion.lua +++ b/modulefiles/gfs_fbwndgfs.orion.lua @@ -1,10 +1,19 @@ -#%Module##################################################### -## Module file for fbwndgfs -############################################################# - -module use -a /apps/contrib/NCEPLIBS/orion/modulefiles -module load bacio/2.0.3 -module load w3emc/2.4.0 -module load w3nco/2.0.7 -module load ip/3.0.2 -module load sp/2.0.3 +help([[ +Load environment to build fbwndgfs on Orion +]]) + +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") + +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("sigio", os.getenv("sigio_ver"))) +load(pathJoin("w3emc", os.getenv("w3emc_ver"))) +load(pathJoin("ip", os.getenv("ip_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("myFC","mpiifort") diff --git a/modulefiles/module_base.orion.lua b/modulefiles/module_base.orion.lua index facf50d400..9b1a4a3a2d 100755 --- a/modulefiles/module_base.orion.lua +++ b/modulefiles/module_base.orion.lua @@ -1,39 +1,35 @@ -#%Module###################################################################### -## -## FV3GFS prerequisites -## - -module load intel/2018.4 -module load impi/2018.4 -module load wgrib/2.0.8 -#module load hpss/hpss -module load nco/4.8.1 -module load cdo/1.9.5 - -module load gempak/7.5.1 - -#Load from official NCEPLIBS -module use /apps/contrib/NCEPLIBS/orion/modulefiles -module load grib_util/1.2.0 -module load prod_util/1.2.0 -module load g2tmpl/1.6.0 -module load crtm/2.3.0 -#module load netcdf_parallel/4.7.4 -module load hdf5_parallel/1.10.6 - -## load ESMF library for above compiler / MPI combination -### use pre-compiled EMSF library for above compiler / MPI combination -### -module use /apps/contrib/NCEPLIBS/lib/modulefiles -module load netcdfp/4.7.4 -#module load hdf5_parallel/1.10.6 -module load esmflocal/8.0.1.08bs -module load post-intel-sandybridge/8.0.5 - -module load contrib -module load rocoto/1.3.2 -module load slurm/19.05.3-2 - -# Python -module load python/3.7.5 +help([[ +Load environment to run GFS on Orion +]]) +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") + +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) + +load(pathJoin("esmf", os.getenv("esmf_ver"))) + +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("gempak", os.getenv("gempak_ver"))) +load(pathJoin("perl", os.getenv("perl_ver"))) +load(pathJoin("libjpeg", os.getenv("libjpeg_ver"))) + +load(pathJoin("cdo", os.getenv("cdo_ver"))) + +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("udunits", os.getenv("udunits_ver"))) +load(pathJoin("nco", os.getenv("nco_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) +load(pathJoin("grib_util", os.getenv("grib_util_ver"))) +load(pathJoin("bufr_dump", os.getenv("bufr_dump_ver"))) +load(pathJoin("util_shared", os.getenv("util_shared_ver"))) +load(pathJoin("crtm", os.getenv("crtm_ver"))) +load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver"))) +load(pathJoin("wgrib2", os.getenv("wgrib2_ver"))) + +setenv("USE_CFP","YES") + +whatis("Description: GFS run environment") diff --git a/modulefiles/modulefile.fv3nc2nemsio.orion.lua b/modulefiles/modulefile.fv3nc2nemsio.orion.lua index 4ff5c23b03..1d9ea8ae7a 100644 --- a/modulefiles/modulefile.fv3nc2nemsio.orion.lua +++ b/modulefiles/modulefile.fv3nc2nemsio.orion.lua @@ -1,16 +1,19 @@ -#%Module##################################################### -## Module file for fv3nc2nemsio -############################################################# +help([[ +Load environment to build fv3nc2nemsio on Orion +]]) -module load intel/2018.4 -module load impi/2018.4 +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") -module use -a /apps/contrib/NCEPLIBS/orion/modulefiles -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 -module load bacio/2.0.3 -module load nemsio/2.2.4 -module load w3nco/2.0.7 +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -export FCMP="ifort" -export FFLAGS="-g -O2 -traceback" +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) + +setenv("FCMP","mpiifort") +setenv("FFLAGS","-g -O2 -traceback") diff --git a/modulefiles/modulefile.regrid_nemsio.orion.lua b/modulefiles/modulefile.regrid_nemsio.orion.lua index 19f0885c66..cde01668db 100644 --- a/modulefiles/modulefile.regrid_nemsio.orion.lua +++ b/modulefiles/modulefile.regrid_nemsio.orion.lua @@ -1,20 +1,19 @@ -#%Module##################################################### -## Module file for regrid_nemsio -############################################################# +help([[ +Load environment to build regrid_nemsio on Orion +]]) -module load intel/2018.4 -module load impi/2018.4 +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") -module use -a /apps/contrib/NCEPLIBS/orion/modulefiles -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 -module load bacio/2.0.3 -module load w3nco/2.0.7 -module load nemsio/2.2.4 -module load sp/2.0.3 +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -export FCMP="$FCOMP" -export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -lnetcdf -L${HDF5_ROOT}/lib -lhdf5 -lhdf5_hl -lhdf5 -lz" -export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdf -lnetcdff -lnetcdf -L${HDF5_ROOT}/lib -lhdf5 -lhdf5_hl -lhdf5 -lz" -export NETCDF_INCLUDE=-I$NETCDF/include -#export FCMP="mpif90 -f90=ifort" +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("FCMP","mpiifort") diff --git a/modulefiles/modulefile.storm_reloc_v6.0.0.orion.lua b/modulefiles/modulefile.storm_reloc_v6.0.0.orion.lua index 2fbf2bee62..02be852b7d 100644 --- a/modulefiles/modulefile.storm_reloc_v6.0.0.orion.lua +++ b/modulefiles/modulefile.storm_reloc_v6.0.0.orion.lua @@ -1,19 +1,25 @@ -#%Module##################################################### -## Module file for storm_reloc_v6.0.0 - Hera -############################################################# +help([[ +Load environment to build storm_reloc on Orion +]]) -module use -a /apps/contrib/NCEPLIBS/orion/modulefiles -module load w3emc_para/2.4.0 -module load w3nco/2.0.7 -module load bacio/2.0.3 -module load sp/2.0.3 -module load nemsio/2.2.4 -module load nemsiogfs/2.3.0 -module load sigio/2.1.1 -module load png/1.2.44 -module load z/1.2.6 -module load g2/3.1.1 +prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack") -module load jasper/1.900.1 +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -set FC mpiifort +load(pathJoin("jasper", os.getenv("jasper_ver"))) +load(pathJoin("libpng", os.getenv("libpng_ver"))) +load(pathJoin("png", os.getenv("1.6.35"))) +load(pathJoin("zlib", os.getenv("zlib_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("nemsiogfs", os.getenv("nemsiogfs_ver"))) +load(pathJoin("sigio", os.getenv("sigio_ver"))) +load(pathJoin("w3emc", os.getenv("w3emc_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) +load(pathJoin("g2", os.getenv("g2_ver"))) + +setenv("myFC","mpiifort") From 73b5664448c41d902e43b78141804528a857af0b Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 15:21:40 -0600 Subject: [PATCH 04/23] Add myFC variable to WCOSS2 modulefiles - add "setenv("myFC","ftn")" to the modulefiles for fbwndgfs and storm_reloc on WCOSS2 - needed to set FC on WCOSS2 now that other platforms have to set FC differently (e.g. mpiifort on Orion) Refs: #639 --- modulefiles/gfs_fbwndgfs.wcoss2.lua | 2 ++ modulefiles/modulefile.storm_reloc_v6.0.0.wcoss2.lua | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modulefiles/gfs_fbwndgfs.wcoss2.lua b/modulefiles/gfs_fbwndgfs.wcoss2.lua index 64ac70d950..1cc43633f5 100755 --- a/modulefiles/gfs_fbwndgfs.wcoss2.lua +++ b/modulefiles/gfs_fbwndgfs.wcoss2.lua @@ -14,3 +14,5 @@ load(pathJoin("sigio", os.getenv("sigio_ver"))) load(pathJoin("w3emc", os.getenv("w3emc_ver"))) load(pathJoin("ip", os.getenv("ip_ver"))) load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("myFC","ftn") diff --git a/modulefiles/modulefile.storm_reloc_v6.0.0.wcoss2.lua b/modulefiles/modulefile.storm_reloc_v6.0.0.wcoss2.lua index 392b2a1c3f..33cd59f099 100755 --- a/modulefiles/modulefile.storm_reloc_v6.0.0.wcoss2.lua +++ b/modulefiles/modulefile.storm_reloc_v6.0.0.wcoss2.lua @@ -20,4 +20,4 @@ load(pathJoin("w3emc", os.getenv("w3emc_ver"))) load(pathJoin("sp", os.getenv("sp_ver"))) load(pathJoin("g2", os.getenv("g2_ver"))) -setenv("FC","ftn") +setenv("myFC","ftn") From b246fd39eb86577ccfa89af6564926defea01b8b Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 15:24:21 -0600 Subject: [PATCH 05/23] Update fbwndgfs and storm_reloc builds to use myFC - update fbwndgfs makefile.GENERIC to use myFC variable - update build_tropcy_NEMS.sh to use myFC variable - also update build_tropcy_NEMS.sh to adjust JASPER_LIB variable and remove wcoss2 check for setting SIGIO_LIB4 and SIGIO_INC4 Refs: #639 --- sorc/build_tropcy_NEMS.sh | 10 ++++------ sorc/fbwndgfs.fd/makefile.GENERIC | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sorc/build_tropcy_NEMS.sh b/sorc/build_tropcy_NEMS.sh index 92be70e143..d04fa19378 100755 --- a/sorc/build_tropcy_NEMS.sh +++ b/sorc/build_tropcy_NEMS.sh @@ -24,13 +24,11 @@ fi module use ${cwd}/../modulefiles module load modulefile.storm_reloc_v6.0.0.$target -if [ $target = "wcoss2" ]; then - SIGIO_LIB4=$SIGIO_LIB - SIGIO_INC4=$SIGIO_INC -fi +SIGIO_LIB4=$SIGIO_LIB +SIGIO_INC4=$SIGIO_INC -export FC=ftn -export JASPER_LIB=${JASPER_LIB:-$JASPER_LIBRARY_DIRS/libjasper.a} +export FC=$myFC +export JASPER_LIB=${JASPER_LIB:-$JASPER_LIBRARIES/libjasper.a} export INC="${G2_INCd} -I${NEMSIO_INC}" export LIBS="${W3EMC_LIBd} ${W3NCO_LIBd} ${BACIO_LIB4} ${G2_LIBd} ${PNG_LIB} ${JASPER_LIB} ${Z_LIB}" diff --git a/sorc/fbwndgfs.fd/makefile.GENERIC b/sorc/fbwndgfs.fd/makefile.GENERIC index 30b2f8d823..ea8d393e5c 100755 --- a/sorc/fbwndgfs.fd/makefile.GENERIC +++ b/sorc/fbwndgfs.fd/makefile.GENERIC @@ -40,7 +40,7 @@ OBJS= fbwndgfs.o # CMD Name of the executable # PROFLIB Library needed for profiling # -FC = ftn +FC = $(myFC) LDFLAGS = LIBS = ${W3NCO_LIB8} ${W3EMC_LIB8} ${BACIO_LIB8} ${IP_LIB8} ${SP_LIB8} CMD = fbwndgfs From 50cf445fe678d1bdcd674c2fb8a59a22d54253e5 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 15:31:34 -0600 Subject: [PATCH 06/23] Cleanup machine-setup.sh - cleanup Orion, Hera, and Jet blocks to just set target and do a module purge - add $target.ver sourcing after build.ver sourcing Refs: #639 --- sorc/machine-setup.sh | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh index ab8a158995..cafcac7670 100644 --- a/sorc/machine-setup.sh +++ b/sorc/machine-setup.sh @@ -29,13 +29,6 @@ if [[ -d /work ]] ; then fi target=orion module purge - module load intel/2018.4 - module load impi/2018.4 - export NCEPLIBS=/apps/contrib/NCEPLIBS/orion - export WRFPATH=$NCEPLIBS/wrf.shared.new/v1.1.1/src - module use $NCEPLIBS/modulefiles - export myFC=mpiifort - export FCOMP=mpiifort ##--------------------------------------------------------------------------- elif [[ -d /scratch1 ]] ; then @@ -46,13 +39,6 @@ elif [[ -d /scratch1 ]] ; then fi target=hera module purge - module load intel - module load impi - export NCEPLIBS=/scratch2/NCEPDEV/nwprod/NCEPLIBS - module use $NCEPLIBS/modulefiles - #export WRFPATH=$NCEPLIBS/wrf.shared.new/v1.1.1/src - export myFC=mpiifort - export FCOMP=mpiifort ##--------------------------------------------------------------------------- elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then @@ -194,14 +180,6 @@ elif [[ -d /lfs3 ]] ; then fi target=jet module purge -module load intel/15.0.3.187 -module load impi -#export NCEPLIBS=/mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib - export NCEPLIBS=/mnt/lfs3/projects/hfv3gfs/gwv/ljtjet/lib -export NCEPLIBS=/mnt/lfs3/projects/hfv3gfs/gwv/NCEPLIBS.15X - module use $NCEPLIBS/modulefiles -export WRFPATH=$NCEPLIBS/wrf.shared.new/v1.1.1/src -export myFC=mpiifort else echo WARNING: UNKNOWN PLATFORM 1>&2 @@ -210,6 +188,7 @@ fi # Source versions file for build . ${HOMEgfs}/versions/build.ver +. ${HOMEgfs}/versions/${target}.ver unset __ms_shell unset __ms_ksh_test From 4f063a98f3baf11514ef974d276584b34a777431 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 15:34:27 -0600 Subject: [PATCH 07/23] Update gfs_bufrsnd build for hpc-stack - update the gfs_bufr build and makefile to use hpc-stack library variables Refs: #639 --- sorc/build_gfs_bufrsnd.sh | 8 -------- sorc/gfs_bufr.fd/makefile_module | 10 +++++----- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/sorc/build_gfs_bufrsnd.sh b/sorc/build_gfs_bufrsnd.sh index 8f03e160b5..7fc54b19e7 100755 --- a/sorc/build_gfs_bufrsnd.sh +++ b/sorc/build_gfs_bufrsnd.sh @@ -12,14 +12,6 @@ if [ ! -d "../exec" ]; then mkdir ../exec fi -if [ $target = "wcoss2" ]; then - export SIGIO_LIB4=$SIGIO_LIB - export SIGIO_INC4=$SIGIO_INC - export NETCDF_INC=$NETCDF_INCLUDES - export NETCDF_LIB=$NETCDF_LIBRARIES - export HDF5_LIB=$HDF5_LIBRARIES -fi - if [ -f gfs_bufr.fd/getncdimlen ]; then cp gfs_bufr.fd/getncdimlen ../exec fi diff --git a/sorc/gfs_bufr.fd/makefile_module b/sorc/gfs_bufr.fd/makefile_module index c640d0a927..d9d5374a7a 100755 --- a/sorc/gfs_bufr.fd/makefile_module +++ b/sorc/gfs_bufr.fd/makefile_module @@ -8,20 +8,20 @@ FC = $(myFC) $(myFCFLAGS) CPP = $(myCPP) $(myCPPFLAGS) -FFLAGS = -I$(NETCDF_INC) \ +FFLAGS = -I$(NETCDF_INCLUDES) \ -I$(NEMSIO_INC) \ - -I$(SIGIO_INC4) \ + -I$(SIGIO_INC) \ -I$(W3EMC_INC4) -LIBS = -L$(NETCDF_LIB) -lnetcdf -lnetcdff \ - -L$(HDF5_LIB) -lhdf5_hl -lhdf5 \ +LIBS = -L$(NETCDF_LIBRARIES) -lnetcdff -lnetcdf \ + -L$(HDF5_LIBRARIES) -lhdf5_hl -lhdf5 -lz \ $(NEMSIO_LIB) \ $(W3EMC_LIB4) \ $(W3NCO_LIB4) \ $(BUFR_LIB4) \ $(BACIO_LIB4) \ $(SP_LIB4) \ - $(SIGIO_LIB4) + $(SIGIO_LIB) SRCM = gfsbufr.f OBJS = physcons.o funcphys.o meteorg.o bfrhdr.o newsig1.o terp3.o\ From 5c115137dc83552300f25def034113e19a408efa Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 21:38:50 +0000 Subject: [PATCH 08/23] Update machine-setup.sh target version sourcing - wrap $target.ver sourcing in block that checks if user is not on WCOSS2 and source if so - do not need or have wcoss2.ver file at this time Refs: #639 --- sorc/machine-setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh index cafcac7670..dae5c12d11 100644 --- a/sorc/machine-setup.sh +++ b/sorc/machine-setup.sh @@ -188,7 +188,9 @@ fi # Source versions file for build . ${HOMEgfs}/versions/build.ver -. ${HOMEgfs}/versions/${target}.ver +if [[ $target != wcoss2 ]] ; then + . ${HOMEgfs}/versions/${target}.ver +fi unset __ms_shell unset __ms_ksh_test From de03082baea517dcb7759b4d24d94e5bb865a55d Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 15:41:54 -0600 Subject: [PATCH 09/23] Update NETCDF_LDFLAGS_F in gaussian_sfcanl build - adjust NETCDF_LDFLAGS_F flags in gaussian_sfcanl.fd/makefile.sh to flip -lnetcdf/-lnetcdff order, add -lhdf5_hl flag, and add -lz flag Refs: #639 --- sorc/gaussian_sfcanl.fd/makefile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gaussian_sfcanl.fd/makefile.sh b/sorc/gaussian_sfcanl.fd/makefile.sh index 7638ad654f..63730beea6 100755 --- a/sorc/gaussian_sfcanl.fd/makefile.sh +++ b/sorc/gaussian_sfcanl.fd/makefile.sh @@ -5,7 +5,7 @@ export FFLAGS="-O3 -fp-model precise -g -r8 -i4" #export FFLAGS="-g -r8 -i4 -warn unused -check bounds" export NETCDF_INCLUDE="-I${NETCDF}/include" -export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -L${HDF5_LIBRARIES} -lhdf5 " +export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdff -lnetcdf -L${HDF5_LIBRARIES} -lhdf5_hl -lhdf5 -lz" make clean make build From 529dfd6d255561e2f93a698daebe04fa6bfa5bf0 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Wed, 9 Feb 2022 15:51:59 -0600 Subject: [PATCH 10/23] Add $target.ver sourcing for Orion/Hera to load_fv3gfs_modules.sh - need to now source the target-specific version files before loading modulebase.$target.lua on Hera and Orion Refs: #639 --- ush/load_fv3gfs_modules.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ush/load_fv3gfs_modules.sh b/ush/load_fv3gfs_modules.sh index d1058695a1..e2e6a71e65 100755 --- a/ush/load_fv3gfs_modules.sh +++ b/ush/load_fv3gfs_modules.sh @@ -22,9 +22,11 @@ if [[ -d /lfs3 ]] ; then module load module_base.jet elif [[ -d /scratch1 ]] ; then # We are on NOAA Hera + source "$HOMEgfs/versions/hera.ver" module load module_base.hera elif [[ -d /work ]] ; then # We are on MSU Orion + source "$HOMEgfs/versions/orion.ver" module load module_base.orion elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then # We are on NOAA Luna or Surge From 1af6dfa6a610a35efc29ecc49ef4322d38d39f27 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Thu, 10 Feb 2022 11:51:05 -0600 Subject: [PATCH 11/23] Update build_regrid_nemsio.sh with NETCDF_LDFLAGS - add NETCDF_LDFLAGS flags to successfully build regrid_nemsio Refs: #639 --- sorc/build_regrid_nemsio.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sorc/build_regrid_nemsio.sh b/sorc/build_regrid_nemsio.sh index 36b42ff790..f5ab90ca36 100755 --- a/sorc/build_regrid_nemsio.sh +++ b/sorc/build_regrid_nemsio.sh @@ -18,12 +18,13 @@ export F90=${FCMP} export LD=${FCMP} export F77=${FCMP} +export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdff -lnetcdf -L${HDF5_LIBRARIES} -lhdf5_hl -lhdf5 -lz" export FCFFLAGS="" # "-convert native -assume byterecl -heap-arrays -mcmodel=large -shared-intel" export LDFLAGS="${FCFFLAGS}" export OPTIMIZATION="-O3" #-axCORE-AVX2,AVX -xSSE4.2 -O3 export DEBUG="-traceback -g" #-O0 #-C #-fp-stack-check #-check all -fp-stack-check -if [ $target != hera ]; then +if [ $target = wcoss2 ]; then LIBnetcdf=`$NETCDF/bin/nf-config --flibs` INCnetcdf=`$NETCDF/bin/nf-config --fflags` export NETCDF_LDFLAGS=$LIBnetcdf From 55b9eb86834ecc80022c5740d5704ec1d2a67b66 Mon Sep 17 00:00:00 2001 From: "Kate.Friedman" Date: Thu, 10 Feb 2022 17:54:36 +0000 Subject: [PATCH 12/23] Rename Hera modulefiles to add .lua extension Refs: #639 --- .../{enkf_chgres_recenter.hera => enkf_chgres_recenter.hera.lua} | 0 ...f_chgres_recenter_nc.hera => enkf_chgres_recenter_nc.hera.lua} | 0 .../fv3gfs/{gaussian_sfcanl.hera => gaussian_sfcanl.hera.lua} | 0 modulefiles/{gfs_bufr.hera => gfs_bufr.hera.lua} | 0 modulefiles/{gfs_fbwndgfs.hera => gfs_fbwndgfs.hera.lua} | 0 modulefiles/{module_base.hera => module_base.hera.lua} | 0 ...ulefile.fv3nc2nemsio.hera => modulefile.fv3nc2nemsio.hera.lua} | 0 .../{modulefile.grib_util.hera => modulefile.grib_util.hera.lua} | 0 ...efile.regrid_nemsio.hera => modulefile.regrid_nemsio.hera.lua} | 0 ...m_reloc_v6.0.0.hera => modulefile.storm_reloc_v6.0.0.hera.lua} | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename modulefiles/fv3gfs/{enkf_chgres_recenter.hera => enkf_chgres_recenter.hera.lua} (100%) rename modulefiles/fv3gfs/{enkf_chgres_recenter_nc.hera => enkf_chgres_recenter_nc.hera.lua} (100%) rename modulefiles/fv3gfs/{gaussian_sfcanl.hera => gaussian_sfcanl.hera.lua} (100%) rename modulefiles/{gfs_bufr.hera => gfs_bufr.hera.lua} (100%) rename modulefiles/{gfs_fbwndgfs.hera => gfs_fbwndgfs.hera.lua} (100%) rename modulefiles/{module_base.hera => module_base.hera.lua} (100%) rename modulefiles/{modulefile.fv3nc2nemsio.hera => modulefile.fv3nc2nemsio.hera.lua} (100%) rename modulefiles/{modulefile.grib_util.hera => modulefile.grib_util.hera.lua} (100%) rename modulefiles/{modulefile.regrid_nemsio.hera => modulefile.regrid_nemsio.hera.lua} (100%) rename modulefiles/{modulefile.storm_reloc_v6.0.0.hera => modulefile.storm_reloc_v6.0.0.hera.lua} (100%) diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter.hera b/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua similarity index 100% rename from modulefiles/fv3gfs/enkf_chgres_recenter.hera rename to modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.hera b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.hera.lua similarity index 100% rename from modulefiles/fv3gfs/enkf_chgres_recenter_nc.hera rename to modulefiles/fv3gfs/enkf_chgres_recenter_nc.hera.lua diff --git a/modulefiles/fv3gfs/gaussian_sfcanl.hera b/modulefiles/fv3gfs/gaussian_sfcanl.hera.lua similarity index 100% rename from modulefiles/fv3gfs/gaussian_sfcanl.hera rename to modulefiles/fv3gfs/gaussian_sfcanl.hera.lua diff --git a/modulefiles/gfs_bufr.hera b/modulefiles/gfs_bufr.hera.lua similarity index 100% rename from modulefiles/gfs_bufr.hera rename to modulefiles/gfs_bufr.hera.lua diff --git a/modulefiles/gfs_fbwndgfs.hera b/modulefiles/gfs_fbwndgfs.hera.lua similarity index 100% rename from modulefiles/gfs_fbwndgfs.hera rename to modulefiles/gfs_fbwndgfs.hera.lua diff --git a/modulefiles/module_base.hera b/modulefiles/module_base.hera.lua similarity index 100% rename from modulefiles/module_base.hera rename to modulefiles/module_base.hera.lua diff --git a/modulefiles/modulefile.fv3nc2nemsio.hera b/modulefiles/modulefile.fv3nc2nemsio.hera.lua similarity index 100% rename from modulefiles/modulefile.fv3nc2nemsio.hera rename to modulefiles/modulefile.fv3nc2nemsio.hera.lua diff --git a/modulefiles/modulefile.grib_util.hera b/modulefiles/modulefile.grib_util.hera.lua similarity index 100% rename from modulefiles/modulefile.grib_util.hera rename to modulefiles/modulefile.grib_util.hera.lua diff --git a/modulefiles/modulefile.regrid_nemsio.hera b/modulefiles/modulefile.regrid_nemsio.hera.lua similarity index 100% rename from modulefiles/modulefile.regrid_nemsio.hera rename to modulefiles/modulefile.regrid_nemsio.hera.lua diff --git a/modulefiles/modulefile.storm_reloc_v6.0.0.hera b/modulefiles/modulefile.storm_reloc_v6.0.0.hera.lua similarity index 100% rename from modulefiles/modulefile.storm_reloc_v6.0.0.hera rename to modulefiles/modulefile.storm_reloc_v6.0.0.hera.lua From d005cb6b0cf7cdeb28a06523c06f63553cbc89a9 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Thu, 10 Feb 2022 11:58:30 -0600 Subject: [PATCH 13/23] Create new $target.ver files for Hera and Orion - under the versions folder create new hera.ver and orion.ver - new target-specific version files will be used to set hpc-stack modules and versions, as well potentially override other versions as needed on the specific platforms Refs: #639 --- versions/hera.ver | 3 +++ versions/orion.ver | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 versions/hera.ver create mode 100644 versions/orion.ver diff --git a/versions/hera.ver b/versions/hera.ver new file mode 100644 index 0000000000..0816c623bd --- /dev/null +++ b/versions/hera.ver @@ -0,0 +1,3 @@ +export hpc_ver=1.1.0 +export hpc_intel_ver=18.0.5.274 +export hpc_impi_ver=2018.0.4 diff --git a/versions/orion.ver b/versions/orion.ver new file mode 100644 index 0000000000..282a115be4 --- /dev/null +++ b/versions/orion.ver @@ -0,0 +1,3 @@ +export hpc_ver=1.1.0 +export hpc_intel_ver=2018.4 +export hpc_impi_ver=2018.4 From ed6024d483053aa2520f283d27ab722706a2f925 Mon Sep 17 00:00:00 2001 From: "Kate.Friedman" Date: Thu, 10 Feb 2022 18:12:12 +0000 Subject: [PATCH 14/23] Remove unneeded modulefile.grib_util.hera.lua Refs: #639 --- modulefiles/modulefile.grib_util.hera.lua | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 modulefiles/modulefile.grib_util.hera.lua diff --git a/modulefiles/modulefile.grib_util.hera.lua b/modulefiles/modulefile.grib_util.hera.lua deleted file mode 100644 index b912ecc12d..0000000000 --- a/modulefiles/modulefile.grib_util.hera.lua +++ /dev/null @@ -1,18 +0,0 @@ -#%Module###################################################################### -# Module file for grib_util -############################################################################## -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load intel/18.0.5.274 -module load bacio/2.0.3 -module load w3emc/2.3.1 -module load w3nco/2.0.6 -module load ip/3.0.1 -module load sp/2.0.2 - -module load jasper/1.900.1 -module load png/1.2.44 -module load z/1.2.11 - -export FCMP=ifort -export CCMP=icc - From e50fea9220eb9b9a9fc36160d7e0fd3198d874e5 Mon Sep 17 00:00:00 2001 From: "Kate.Friedman" Date: Thu, 10 Feb 2022 19:16:24 +0000 Subject: [PATCH 15/23] Convert Hera modulefiles to LUA format and hpc-stack - convert the contents of the newly renamed Hera modules to use LUA format - convert Hera modulefiles to load hpc-stack modules Refs: #639 --- .../fv3gfs/enkf_chgres_recenter.hera.lua | 32 +++++---- .../fv3gfs/enkf_chgres_recenter_nc.hera.lua | 27 +++++--- modulefiles/fv3gfs/gaussian_sfcanl.hera.lua | 29 ++++---- modulefiles/gfs_bufr.hera.lua | 45 ++++++------ modulefiles/gfs_fbwndgfs.hera.lua | 29 +++++--- modulefiles/module_base.hera.lua | 69 ++++++++++--------- modulefiles/modulefile.fv3nc2nemsio.hera.lua | 32 +++++---- modulefiles/modulefile.regrid_nemsio.hera.lua | 32 +++++---- .../modulefile.storm_reloc_v6.0.0.hera.lua | 39 ++++++----- 9 files changed, 187 insertions(+), 147 deletions(-) diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua b/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua index ed37493828..1eeb7b816a 100644 --- a/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua +++ b/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua @@ -1,12 +1,20 @@ -#%Module##################################################### -## enkf_chgres_recenter component - hera -############################################################# - -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load nemsio/2.2.3 -module load bacio/2.0.2 -module load w3nco/2.0.6 -module load ip/3.0.1 -module load sp/2.0.2 - -export FC=ifort +help([[ +Load environment for building enkf_chgres_recenter on Hera +]]) + +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") + +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) + +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("ip", os.getenv("ip_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("FC","mpiifort") diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.hera.lua b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.hera.lua index 9acce54639..dd59e25f98 100644 --- a/modulefiles/fv3gfs/enkf_chgres_recenter_nc.hera.lua +++ b/modulefiles/fv3gfs/enkf_chgres_recenter_nc.hera.lua @@ -1,14 +1,19 @@ -#%Module##################################################### -## enkf_chgres_recenter component - hera -############################################################# +help([[ +Load environment for building enkf_chgres_recenter_nc +]]) -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load bacio/2.0.2 -module load w3nco/2.0.6 -module load ip/3.0.1 -module load sp/2.0.2 -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -export FC=ifort +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("ip", os.getenv("ip_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("FC","mpiifort") diff --git a/modulefiles/fv3gfs/gaussian_sfcanl.hera.lua b/modulefiles/fv3gfs/gaussian_sfcanl.hera.lua index faa9921f48..74165019f6 100644 --- a/modulefiles/fv3gfs/gaussian_sfcanl.hera.lua +++ b/modulefiles/fv3gfs/gaussian_sfcanl.hera.lua @@ -1,17 +1,20 @@ -#%Module##################################################### -## gaussian_sfcanl build module for Hera -############################################################# +help([[ +Load environment for building gaussian_sfcanl on Hera +]]) -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load w3nco/2.0.6 -module load bacio/2.0.2 -module load nemsio/2.2.3 -module load sp/2.0.2 -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -export NETCDF_INCLUDE="-I${NETCDF}/include" -export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -L${HDF5}/lib -lhdf5 -lhdf5_fortran" +load(pathJoin("zlib", os.getenv("zlib_ver"))) +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) -#export FCOMP=$FCOMP +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("FCOMP","mpiifort") diff --git a/modulefiles/gfs_bufr.hera.lua b/modulefiles/gfs_bufr.hera.lua index 5d4ef5f7ac..5433bcf9d9 100644 --- a/modulefiles/gfs_bufr.hera.lua +++ b/modulefiles/gfs_bufr.hera.lua @@ -1,27 +1,26 @@ -#%Module##################################################### -## bufrsnd -############################################################# +help([[ +Load environment to build gfs_bufr on Hera +]]) -# Loading Intel Compiler Suite -module load intel -module load impi -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -# Loading nceplibs modules -module load sigio/2.1.1 -module load bacio/2.0.3 -module load w3nco/2.0.6 -module load bufr/11.3.0 -module load nemsio/2.2.3 -module load intelpython/3.6.8 -module load w3emc/2.3.1 +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") -module use /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load hdf5_parallel/1.10.6 -module load netcdf_parallel/4.7.4 -#module load w3emc_para/2.4.0 +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) +load(pathJoin("gempak", os.getenv("gempak_ver"))) -export myFC=$FCOMP -export myFCFLAGS="-O3 -convert big_endian -traceback -g -fp-model source -qopenmp" -export myCPP=/lib/cpp -export myCPPFLAGS="-P" +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("sigio", os.getenv("sigio_ver"))) +load(pathJoin("w3emc", os.getenv("w3emc_ver"))) +load(pathJoin("bufr", os.getenv("bufr_ver"))) + +setenv("myFC","mpiifort") +setenv("myFCFLAGS","-O3 -convert big_endian -traceback -g -fp-model source -qopenmp") +setenv("myCPP","/lib/cpp") +setenv("myCPPFLAGS","-P") diff --git a/modulefiles/gfs_fbwndgfs.hera.lua b/modulefiles/gfs_fbwndgfs.hera.lua index 60a8ccad54..19e4b5f96e 100644 --- a/modulefiles/gfs_fbwndgfs.hera.lua +++ b/modulefiles/gfs_fbwndgfs.hera.lua @@ -1,10 +1,19 @@ -#%Module##################################################### -## Module file for fbwndgfs -############################################################# - -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load bacio/2.0.3 -module load w3emc/2.3.1 -module load w3nco/2.0.6 -module load ip/3.0.1 -module load sp/2.0.2 +help([[ +Load environment to build fbwndgfs on Hera +]]) + +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") + +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("sigio", os.getenv("sigio_ver"))) +load(pathJoin("w3emc", os.getenv("w3emc_ver"))) +load(pathJoin("ip", os.getenv("ip_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("myFC","mpiifort") diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua index a60234f5f5..41c87aa64d 100644 --- a/modulefiles/module_base.hera.lua +++ b/modulefiles/module_base.hera.lua @@ -1,34 +1,35 @@ -#%Module###################################################################### -## -## FV3GFS prerequisites -## - -module load intel/18.0.5.274 -module load impi/2018.0.4 -module load wgrib2/2.0.8 -module load hpss/hpss -module load nco/4.7.0 -module load gempak/7.4.2 - -#Load from official NCEPLIBS -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load hdf5_parallel/1.10.6 -#module load netcdf_parallel/4.7.4 -module load g2tmpl/1.6.0 -module load grib_util/1.1.1 -module load crtm/2.3.0 -module load prod_util/1.1.0 - -module use -a /scratch1/NCEPDEV/global/gwv/lp/lib/modulefiles -module load netcdfp/4.7.4 -module load esmflocal/8.0.1.08bs - -#module use -a /scratch1/NCEPDEV/nems/emc.nemspara/soft/modulefiles -#module load esmf/8.0.1bs08 - -# python -module use -a /contrib/anaconda/modulefiles -module load anaconda/2.3.0 - -# waveprep -module load cdo/1.9.5 +help([[ +Load environment to run GFS on Hera +]]) + +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") + +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) + +load(pathJoin("esmf", os.getenv("esmf_ver"))) + +load(pathJoin("python", os.getenv("python_ver"))) +load(pathJoin("gempak", os.getenv("gempak_ver"))) +load(pathJoin("perl", os.getenv("perl_ver"))) +load(pathJoin("libjpeg", os.getenv("libjpeg_ver"))) + +load(pathJoin("cdo", os.getenv("cdo_ver"))) + +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("udunits", os.getenv("udunits_ver"))) +load(pathJoin("nco", os.getenv("nco_ver"))) +load(pathJoin("prod_util", os.getenv("prod_util_ver"))) +load(pathJoin("grib_util", os.getenv("grib_util_ver"))) +load(pathJoin("bufr_dump", os.getenv("bufr_dump_ver"))) +load(pathJoin("util_shared", os.getenv("util_shared_ver"))) +load(pathJoin("crtm", os.getenv("crtm_ver"))) +load(pathJoin("g2tmpl", os.getenv("g2tmpl_ver"))) +load(pathJoin("wgrib2", os.getenv("wgrib2_ver"))) + +setenv("USE_CFP","YES") + +whatis("Description: GFS run environment") diff --git a/modulefiles/modulefile.fv3nc2nemsio.hera.lua b/modulefiles/modulefile.fv3nc2nemsio.hera.lua index c18bab3def..2d59c4aca3 100644 --- a/modulefiles/modulefile.fv3nc2nemsio.hera.lua +++ b/modulefiles/modulefile.fv3nc2nemsio.hera.lua @@ -1,13 +1,19 @@ -#%Module##################################################### -## Module file for fv3nc2nemsio -############################################################# - -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load netcdf/4.7.0 -module load hdf5/1.10.5 -module load bacio/2.0.2 -module load nemsio/2.2.3 -module load w3nco/2.0.6 - -export FCMP="ifort" -export FFLAGS="-g -O2 -traceback" +help([[ +Load environment to build fv3nc2nemsio on Hera +]]) + +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") + +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) + +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) + +setenv("FCMP","mpiifort") +setenv("FFLAGS","-g -O2 -traceback") diff --git a/modulefiles/modulefile.regrid_nemsio.hera.lua b/modulefiles/modulefile.regrid_nemsio.hera.lua index 6280a02436..e92424b14a 100644 --- a/modulefiles/modulefile.regrid_nemsio.hera.lua +++ b/modulefiles/modulefile.regrid_nemsio.hera.lua @@ -1,17 +1,19 @@ -#%Module##################################################### -## Module file for regrid_nemsio -############################################################# +help([[ +Load environment to build regrid_nemsio on Hera +]]) -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load netcdf/4.7.0 -module load hdf5/1.10.5 -module load bacio/2.0.2 -module load nemsio/2.2.3 -module load w3nco/2.0.6 -module load sp/2.0.2 +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") -export FCMP="$FCOMP" -export NETCDF_LDFLAGS_F="-L${NETCDF}/lib -lnetcdf -lnetcdff -lnetcdf -L${HDF5}/lib -lhdf5 -lhdf5_hl -lhdf5 -lz" -export NETCDF_LDFLAGS="-L${NETCDF}/lib -lnetcdf -lnetcdff -lnetcdf -L${HDF5}/lib -lhdf5 -lhdf5_hl -lhdf5 -lz" -export NETCDF_INCLUDE=-I$NETCDF/include -#export FCMP="mpif90 -f90=ifort" +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) + +load(pathJoin("hdf5", os.getenv("hdf5_ver"))) +load(pathJoin("netcdf", os.getenv("netcdf_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) + +setenv("FCMP","mpiifort") diff --git a/modulefiles/modulefile.storm_reloc_v6.0.0.hera.lua b/modulefiles/modulefile.storm_reloc_v6.0.0.hera.lua index 36f96e01b9..237406dbbe 100644 --- a/modulefiles/modulefile.storm_reloc_v6.0.0.hera.lua +++ b/modulefiles/modulefile.storm_reloc_v6.0.0.hera.lua @@ -1,18 +1,25 @@ -#%Module##################################################### -## Module file for storm_reloc_v6.0.0 - Hera -############################################################# +help([[ +Load environment to build storm_reloc on Hera +]]) -module use -a /scratch2/NCEPDEV/nwprod/NCEPLIBS/modulefiles -module load w3emc/2.3.0 -module load w3nco/2.0.6 -module load bacio/2.0.2 -module load sp/2.0.2 -module load nemsio/2.2.3 -module load nemsiogfs/2.2.1 -module load sigio/2.1.1 -module load jasper/1.900.1 -module load png/1.2.44 -module load z/1.2.11 -module load g2/3.1.0 +prepend_path("MODULEPATH", "/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack") -set FC mpiifort +load(pathJoin("hpc", os.getenv("hpc_ver"))) +load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) +load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) + +load(pathJoin("jasper", os.getenv("jasper_ver"))) +load(pathJoin("libpng", os.getenv("libpng_ver"))) +load(pathJoin("png", os.getenv("1.6.35"))) +load(pathJoin("zlib", os.getenv("zlib_ver"))) + +load(pathJoin("bacio", os.getenv("bacio_ver"))) +load(pathJoin("w3nco", os.getenv("w3nco_ver"))) +load(pathJoin("nemsio", os.getenv("nemsio_ver"))) +load(pathJoin("nemsiogfs", os.getenv("nemsiogfs_ver"))) +load(pathJoin("sigio", os.getenv("sigio_ver"))) +load(pathJoin("w3emc", os.getenv("w3emc_ver"))) +load(pathJoin("sp", os.getenv("sp_ver"))) +load(pathJoin("g2", os.getenv("g2_ver"))) + +setenv("myFC","mpiifort") From 28d1a7ba3a26465bed7814d4948a072626ef2c60 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Fri, 11 Feb 2022 08:16:37 -0600 Subject: [PATCH 16/23] Remove unneeded module loads from enkf_chgres_recenter build - remove hdf5 and netcdf module loads from enkf_chgres_recenter modulefiles - reran builds to confirm Refs: #639 --- modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua | 3 --- modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua | 3 --- modulefiles/fv3gfs/enkf_chgres_recenter.wcoss2.lua | 3 --- 3 files changed, 9 deletions(-) diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua b/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua index 1eeb7b816a..37acc4a1f8 100644 --- a/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua +++ b/modulefiles/fv3gfs/enkf_chgres_recenter.hera.lua @@ -8,9 +8,6 @@ load(pathJoin("hpc", os.getenv("hpc_ver"))) load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -load(pathJoin("hdf5", os.getenv("hdf5_ver"))) -load(pathJoin("netcdf", os.getenv("netcdf_ver"))) - load(pathJoin("bacio", os.getenv("bacio_ver"))) load(pathJoin("w3nco", os.getenv("w3nco_ver"))) load(pathJoin("nemsio", os.getenv("nemsio_ver"))) diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua b/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua index 894649fe03..0962c7e469 100644 --- a/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua +++ b/modulefiles/fv3gfs/enkf_chgres_recenter.orion.lua @@ -8,9 +8,6 @@ load(pathJoin("hpc", os.getenv("hpc_ver"))) load(pathJoin("hpc-intel", os.getenv("hpc_intel_ver"))) load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) -load(pathJoin("hdf5", os.getenv("hdf5_ver"))) -load(pathJoin("netcdf", os.getenv("netcdf_ver"))) - load(pathJoin("bacio", os.getenv("bacio_ver"))) load(pathJoin("w3nco", os.getenv("w3nco_ver"))) load(pathJoin("nemsio", os.getenv("nemsio_ver"))) diff --git a/modulefiles/fv3gfs/enkf_chgres_recenter.wcoss2.lua b/modulefiles/fv3gfs/enkf_chgres_recenter.wcoss2.lua index 9ebe339c62..1ee5a124bb 100644 --- a/modulefiles/fv3gfs/enkf_chgres_recenter.wcoss2.lua +++ b/modulefiles/fv3gfs/enkf_chgres_recenter.wcoss2.lua @@ -7,9 +7,6 @@ load(pathJoin("craype", os.getenv("craype_ver"))) load(pathJoin("intel", os.getenv("intel_ver"))) load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) -load(pathJoin("hdf5", os.getenv("hdf5_ver"))) -load(pathJoin("netcdf", os.getenv("netcdf_ver"))) - load(pathJoin("bacio", os.getenv("bacio_ver"))) load(pathJoin("w3nco", os.getenv("w3nco_ver"))) load(pathJoin("nemsio", os.getenv("nemsio_ver"))) From 75fb6dadfee384dbbd6a9cd7d4cb4770e9d8160f Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Fri, 11 Feb 2022 08:20:35 -0600 Subject: [PATCH 17/23] Remove unneeded modules from fbwndgfs build - remove nemsio and sigio modules from gfs_fbwndgfs build - reran builds to confirm Refs: #639 --- modulefiles/gfs_fbwndgfs.hera.lua | 2 -- modulefiles/gfs_fbwndgfs.orion.lua | 2 -- modulefiles/gfs_fbwndgfs.wcoss2.lua | 2 -- 3 files changed, 6 deletions(-) diff --git a/modulefiles/gfs_fbwndgfs.hera.lua b/modulefiles/gfs_fbwndgfs.hera.lua index 19e4b5f96e..fa44dc3cf5 100644 --- a/modulefiles/gfs_fbwndgfs.hera.lua +++ b/modulefiles/gfs_fbwndgfs.hera.lua @@ -10,8 +10,6 @@ load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) load(pathJoin("bacio", os.getenv("bacio_ver"))) load(pathJoin("w3nco", os.getenv("w3nco_ver"))) -load(pathJoin("nemsio", os.getenv("nemsio_ver"))) -load(pathJoin("sigio", os.getenv("sigio_ver"))) load(pathJoin("w3emc", os.getenv("w3emc_ver"))) load(pathJoin("ip", os.getenv("ip_ver"))) load(pathJoin("sp", os.getenv("sp_ver"))) diff --git a/modulefiles/gfs_fbwndgfs.orion.lua b/modulefiles/gfs_fbwndgfs.orion.lua index 5c48c8bacb..32e52ea4e3 100644 --- a/modulefiles/gfs_fbwndgfs.orion.lua +++ b/modulefiles/gfs_fbwndgfs.orion.lua @@ -10,8 +10,6 @@ load(pathJoin("hpc-impi", os.getenv("hpc_impi_ver"))) load(pathJoin("bacio", os.getenv("bacio_ver"))) load(pathJoin("w3nco", os.getenv("w3nco_ver"))) -load(pathJoin("nemsio", os.getenv("nemsio_ver"))) -load(pathJoin("sigio", os.getenv("sigio_ver"))) load(pathJoin("w3emc", os.getenv("w3emc_ver"))) load(pathJoin("ip", os.getenv("ip_ver"))) load(pathJoin("sp", os.getenv("sp_ver"))) diff --git a/modulefiles/gfs_fbwndgfs.wcoss2.lua b/modulefiles/gfs_fbwndgfs.wcoss2.lua index 1cc43633f5..1a4b2abbbf 100755 --- a/modulefiles/gfs_fbwndgfs.wcoss2.lua +++ b/modulefiles/gfs_fbwndgfs.wcoss2.lua @@ -9,8 +9,6 @@ load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver"))) load(pathJoin("bacio", os.getenv("bacio_ver"))) load(pathJoin("w3nco", os.getenv("w3nco_ver"))) -load(pathJoin("nemsio", os.getenv("nemsio_ver"))) -load(pathJoin("sigio", os.getenv("sigio_ver"))) load(pathJoin("w3emc", os.getenv("w3emc_ver"))) load(pathJoin("ip", os.getenv("ip_ver"))) load(pathJoin("sp", os.getenv("sp_ver"))) From 7425fd645531c2ccde406f24c605fed65e02e7a2 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Fri, 11 Feb 2022 08:25:07 -0600 Subject: [PATCH 18/23] Add HPSS module load back into Hera module_base - was erroneously removed, added back into module_base.hera.lua - added companion hpss_ver to hera.ver Refs: #639 --- modulefiles/module_base.hera.lua | 1 + versions/hera.ver | 2 ++ 2 files changed, 3 insertions(+) diff --git a/modulefiles/module_base.hera.lua b/modulefiles/module_base.hera.lua index 41c87aa64d..59a30ef9cc 100644 --- a/modulefiles/module_base.hera.lua +++ b/modulefiles/module_base.hera.lua @@ -14,6 +14,7 @@ load(pathJoin("python", os.getenv("python_ver"))) load(pathJoin("gempak", os.getenv("gempak_ver"))) load(pathJoin("perl", os.getenv("perl_ver"))) load(pathJoin("libjpeg", os.getenv("libjpeg_ver"))) +load(pathJoin("hpss", os.getenv("hpss_ver"))) load(pathJoin("cdo", os.getenv("cdo_ver"))) diff --git a/versions/hera.ver b/versions/hera.ver index 0816c623bd..acf6c00fd9 100644 --- a/versions/hera.ver +++ b/versions/hera.ver @@ -1,3 +1,5 @@ export hpc_ver=1.1.0 export hpc_intel_ver=18.0.5.274 export hpc_impi_ver=2018.0.4 + +export hpss_ver=hpss From 1901756ef81028342525a14d30662c609294f57d Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Fri, 11 Feb 2022 09:14:09 -0600 Subject: [PATCH 19/23] Create wcoss2.ver - create empty wcoss2.ver to go alongside other new machine-specific version files - update machine-setup.sh to load $target.ver on all machines now Refs: #639 --- sorc/machine-setup.sh | 4 +--- versions/wcoss2.ver | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 versions/wcoss2.ver diff --git a/sorc/machine-setup.sh b/sorc/machine-setup.sh index dae5c12d11..cafcac7670 100644 --- a/sorc/machine-setup.sh +++ b/sorc/machine-setup.sh @@ -188,9 +188,7 @@ fi # Source versions file for build . ${HOMEgfs}/versions/build.ver -if [[ $target != wcoss2 ]] ; then - . ${HOMEgfs}/versions/${target}.ver -fi +. ${HOMEgfs}/versions/${target}.ver unset __ms_shell unset __ms_ksh_test diff --git a/versions/wcoss2.ver b/versions/wcoss2.ver new file mode 100644 index 0000000000..c130c0263e --- /dev/null +++ b/versions/wcoss2.ver @@ -0,0 +1 @@ +# Extra versions file for WCOSS2 - use as needed From 40253b9f3798878fe0f078afc38b26dabd13cd61 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Fri, 11 Feb 2022 09:52:34 -0600 Subject: [PATCH 20/23] Update SIGIO library variables in build_tropcy_NEMS.sh - replace SIGIO_LIB4 with SIGIO_LIB - replace SIGIO_INC4 with SIGIO_INC - remove two lines that set "4" variables to non-"4" variables Refs: #639 --- sorc/build_tropcy_NEMS.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sorc/build_tropcy_NEMS.sh b/sorc/build_tropcy_NEMS.sh index d04fa19378..b7e8138fbd 100755 --- a/sorc/build_tropcy_NEMS.sh +++ b/sorc/build_tropcy_NEMS.sh @@ -24,9 +24,6 @@ fi module use ${cwd}/../modulefiles module load modulefile.storm_reloc_v6.0.0.$target -SIGIO_LIB4=$SIGIO_LIB -SIGIO_INC4=$SIGIO_INC - export FC=$myFC export JASPER_LIB=${JASPER_LIB:-$JASPER_LIBRARIES/libjasper.a} @@ -36,8 +33,8 @@ export LIBS_SUP="${W3EMC_LIBd} ${W3NCO_LIBd}" echo lset echo lset export LIBS_REL="${W3NCO_LIB4}" -export LIBS_REL="${NEMSIOGFS_LIB} ${NEMSIO_LIB} ${LIBS_REL} ${SIGIO_LIB4} ${BACIO_LIB4} ${SP_LIBd}" -export LIBS_SIG="${SIGIO_INC4}" +export LIBS_REL="${NEMSIOGFS_LIB} ${NEMSIO_LIB} ${LIBS_REL} ${SIGIO_LIB} ${BACIO_LIB4} ${SP_LIBd}" +export LIBS_SIG="${SIGIO_INC}" export LIBS_SYN_GET="${W3NCO_LIB4}" export LIBS_SYN_MAK="${W3NCO_LIB4} ${BACIO_LIB4}" export LIBS_SYN_QCT="${W3NCO_LIB8}" From 7b3b96e0bb3b49f981277a5551cdb68cb959d4a5 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Tue, 15 Feb 2022 13:06:28 -0600 Subject: [PATCH 21/23] Add prod_util_ver to orion.ver - only available prod_util on Orion is prod_util/1.2.2 - add prod_util_ver=1.2.2 to orion.ver to override WCOSS2 version Refs: #639 --- versions/orion.ver | 2 ++ 1 file changed, 2 insertions(+) diff --git a/versions/orion.ver b/versions/orion.ver index 282a115be4..31ab42bcf1 100644 --- a/versions/orion.ver +++ b/versions/orion.ver @@ -1,3 +1,5 @@ export hpc_ver=1.1.0 export hpc_intel_ver=2018.4 export hpc_impi_ver=2018.4 + +export prod_util_ver=1.2.2 From 3aab53ff4aac3d782b202fb2656a6da162d83367 Mon Sep 17 00:00:00 2001 From: "Kate.Friedman" Date: Tue, 15 Feb 2022 19:10:25 +0000 Subject: [PATCH 22/23] Add prod_util_ver and cmake_ver to hera.ver - add overrides for prod_util and cmake versions to hera.ver - use available hpc-stack versions to override WCOSS2 defaults Refs: #639 --- versions/hera.ver | 2 ++ 1 file changed, 2 insertions(+) diff --git a/versions/hera.ver b/versions/hera.ver index acf6c00fd9..84dd613ad8 100644 --- a/versions/hera.ver +++ b/versions/hera.ver @@ -3,3 +3,5 @@ export hpc_intel_ver=18.0.5.274 export hpc_impi_ver=2018.0.4 export hpss_ver=hpss +export prod_util_ver=1.2.2 +export cmake_ver=3.20.0 From 238efed5e349b2b531d6e738279ff3b4babd45c4 Mon Sep 17 00:00:00 2001 From: "kate.friedman" Date: Tue, 15 Feb 2022 13:12:58 -0600 Subject: [PATCH 23/23] Add cmake_ver to orion.ver - override WCOSS2 default for cmake_ver and use 3.22.1 on Orion Refs: #639 --- versions/orion.ver | 1 + 1 file changed, 1 insertion(+) diff --git a/versions/orion.ver b/versions/orion.ver index 31ab42bcf1..9a8bcd3abb 100644 --- a/versions/orion.ver +++ b/versions/orion.ver @@ -3,3 +3,4 @@ export hpc_intel_ver=2018.4 export hpc_impi_ver=2018.4 export prod_util_ver=1.2.2 +export cmake_ver=3.22.1