From fe9f40bbd7dd62e58af7057c0c1b69edd1efa5c7 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Wed, 30 Mar 2022 13:39:46 -0600 Subject: [PATCH 1/2] Updating configuration and modulefiles --- .../installation/config/install_MET_env.dell | 4 +-- .../installation/config/install_met_env.acorn | 35 ++++++++++++++++++ .../config/install_met_env.dogwood | 36 +++++++++++++++++++ .../installation/config/install_met_env.jet | 10 ++++-- .../installation/config/install_met_env.orion | 4 +-- .../config/install_met_env.stampede | 28 +++++++++++++++ .../config/install_met_env_all.casper | 29 ++++++++++----- .../config/install_met_env_all.cheyenne | 24 +++++++++---- .../config/install_met_env_all.hera | 14 +++++--- .../config/install_met_env_met_only.hera | 14 +++++--- .../config/install_met_env_met_only.jet | 28 +++++++++++++++ .../config/install_met_env_met_only.orion | 26 ++++++++++++++ .../config/install_met_env_met_only.stampede | 6 ++-- .../installation/modulefiles/10.0.0_casper | 20 ----------- scripts/installation/modulefiles/10.1.0_acorn | 34 ++++++++++++++++++ .../{10.0.0_cheyenne => 10.1.0_casper} | 14 ++++---- .../installation/modulefiles/10.1.0_cheyenne | 29 +++++++++++++++ .../modulefiles/{10.0.0_dell => 10.1.0_dell} | 6 ++-- .../installation/modulefiles/10.1.0_dogwood | 32 +++++++++++++++++ .../modulefiles/{10.0.0_hera => 10.1.0_hera} | 23 ++++++------ .../modulefiles/{10.0.0_jet => 10.1.0_jet} | 8 ++--- .../{10.0.0_orion => 10.1.0_orion} | 16 ++++----- .../{10.0.0_stampede => 10.1.0_stampede} | 7 ++-- 23 files changed, 354 insertions(+), 93 deletions(-) create mode 100644 scripts/installation/config/install_met_env.acorn create mode 100644 scripts/installation/config/install_met_env.dogwood create mode 100644 scripts/installation/config/install_met_env.stampede create mode 100644 scripts/installation/config/install_met_env_met_only.jet create mode 100644 scripts/installation/config/install_met_env_met_only.orion delete mode 100644 scripts/installation/modulefiles/10.0.0_casper create mode 100644 scripts/installation/modulefiles/10.1.0_acorn rename scripts/installation/modulefiles/{10.0.0_cheyenne => 10.1.0_casper} (70%) create mode 100644 scripts/installation/modulefiles/10.1.0_cheyenne rename scripts/installation/modulefiles/{10.0.0_dell => 10.1.0_dell} (93%) create mode 100644 scripts/installation/modulefiles/10.1.0_dogwood rename scripts/installation/modulefiles/{10.0.0_hera => 10.1.0_hera} (76%) rename scripts/installation/modulefiles/{10.0.0_jet => 10.1.0_jet} (87%) mode change 100755 => 100644 rename scripts/installation/modulefiles/{10.0.0_orion => 10.1.0_orion} (81%) rename scripts/installation/modulefiles/{10.0.0_stampede => 10.1.0_stampede} (82%) diff --git a/scripts/installation/config/install_MET_env.dell b/scripts/installation/config/install_MET_env.dell index 5c3dbdb673..76eae86a2c 100644 --- a/scripts/installation/config/install_MET_env.dell +++ b/scripts/installation/config/install_MET_env.dell @@ -9,12 +9,12 @@ module load libpng/1.2.59 module load gsl/2.1 module load g2c/1.6.3 -export TEST_BASE=/gpfs/dell2/emc/verification/noscrub/emc.metplus/met/10.0.0 +export TEST_BASE=/gpfs/dell2/emc/verification/noscrub/emc.metplus/met/10.1.0 export LIB_DIR=${TEST_BASE}/external_libs export BIN_DIR_PATH=${TEST_BASE}/exec export COMPILER=ips_18.0.5.274 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=met-10.0.0.20210510.tar.gz +export MET_TARBALL=met-10.1.0.20220314.tar.gz export USE_MODULES=TRUE export PYTHON_MODULE=python_3.6.3 export MET_PYTHON=/usrx/local/prod/packages/python/3.6.3/ diff --git a/scripts/installation/config/install_met_env.acorn b/scripts/installation/config/install_met_env.acorn new file mode 100644 index 0000000000..4a77956e6e --- /dev/null +++ b/scripts/installation/config/install_met_env.acorn @@ -0,0 +1,35 @@ +module use /apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304/ +module load intel +module load python/3.8.6 +module load netcdf/4.7.4 +module load hdf5/1.10.6 +module load bufr/11.5.0 +module load zlib/1.2.11 +module load jasper/2.0.25 +module load libpng/1.6.37 +module load gsl/2.7 +module load g2c/1.6.4 + +export TEST_BASE=/lfs/h1/emc/vpppg/noscrub/Julie.Prestopnik/MET/10.1.0 +export LIB_DIR=${TEST_BASE}/external_libs +export BIN_DIR_PATH=${TEST_BASE}/exec +export COMPILER=intel_19.1.3.304 +export MET_SUBDIR=${TEST_BASE} +export MET_TARBALL=met-10.1.0.20220314.tar.gz +export USE_MODULES=TRUE +export PYTHON_MODULE=python_3.8.6 +export MET_PYTHON=/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk +export MET_PYTHON_CC=-I/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/include/python3.8 +export MET_PYTHON_LD=-L/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/lib\ -lpython3.8\ -lpthread\ -ldl\ -lutil\ -lm\ -Xlinker\ -export-dynamic +export MET_NETCDF=/apps/prod/hpc-stack/intel-19.1.3.304/netcdf/4.7.4 +export MET_HDF5=/apps/prod/hpc-stack/intel-19.1.3.304/hdf5/1.10.6 +export MET_BUFRLIB=/apps/ops/prod/libs/intel/19.1.3.304/bufr/11.5.0/lib64 +export MET_GRIB2CLIB=/apps/ops/prod/libs/intel/19.1.3.304/g2c/1.6.4/lib64 +export MET_GRIB2CINC=/apps/ops/prod/libs/intel/19.1.3.304/g2c/1.6.4/include +export MET_GSL=/apps/spack/gsl/2.7/intel/19.1.3.304/xks7dxbowrdxhjck5zxc4rompopocevb +export BUFRLIB_NAME=-lbufr_4 +export GRIB2CLIB_NAME=-lg2c +export LIB_JASPER=/apps/spack/jasper/2.0.25/intel/19.1.3.304/sjib74krrorkyczqpqah4tvewmlnqdx4/lib64 +export LIB_LIBPNG=/apps/spack/libpng/1.6.37/intel/19.1.3.304/4ohkronuhlyherusoszzrmur5ewvlwzh/lib +export LIB_Z=/apps/spack/zlib/1.2.11/intel/19.1.3.304/hjotqkckeoyt6j6tibalwzrlfljcjtdh/lib +export SET_D64BIT=FALSE \ No newline at end of file diff --git a/scripts/installation/config/install_met_env.dogwood b/scripts/installation/config/install_met_env.dogwood new file mode 100644 index 0000000000..e1644ae7e7 --- /dev/null +++ b/scripts/installation/config/install_met_env.dogwood @@ -0,0 +1,36 @@ +module use /apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304/ +module load intel +module load python/3.8.6 +module load netcdf/4.7.4 +module load hdf5/1.10.6 +module load bufr/11.6.0 +module load zlib/1.2.11 +module load jasper/2.0.25 +module load libpng/1.6.37 +module load gsl/2.6 +module load g2c/1.6.4 + +export TEST_BASE=/lfs/h2/emc/vpppg/noscrub/Julie.Prestopnik/MET/10.1.0 +export LIB_DIR=${TEST_BASE}/external_libs +export BIN_DIR_PATH=${TEST_BASE}/exec +export COMPILER=intel_19.1.3.304 +export MET_SUBDIR=${TEST_BASE} +export MET_TARBALL=met-10.1.0.20220314.tar.gz +export USE_MODULES=TRUE +export PYTHON_MODULE=python_3.8.6 +export MET_PYTHON=/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk +export MET_PYTHON_CC=-I/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/include/python3.8 +export MET_PYTHON_LD=-L/apps/spack/python/3.8.6/intel/19.1.3.304/pjn2nzkjvqgmjw4hmyz43v5x4jbxjzpk/lib\ -lpython3.8\ -lpthread\ -ldl\ -lutil\ -lm\ -Xlinker\ -export-dynamic +export MET_NETCDF=/apps/prod/hpc-stack/intel-19.1.3.304/netcdf/4.7.4 +export MET_HDF5=/apps/prod/hpc-stack/intel-19.1.3.304/hdf5/1.10.6 +export MET_BUFRLIB=/apps/ops/prod/libs/intel/19.1.3.304/bufr/11.5.0/lib64 +export MET_GRIB2CLIB=/apps/ops/prod/libs/intel/19.1.3.304/g2c/1.6.4/lib64 +export MET_GRIB2CINC=/apps/ops/prod/libs/intel/19.1.3.304/g2c/1.6.4/include +export MET_GSL=$GSL_ROOT +export BUFRLIB_NAME=-lbufr_4 +export GRIB2CLIB_NAME=-lg2c +export LIB_JASPER=/apps/spack/jasper/2.0.25/intel/19.1.3.304/sjib74krrorkyczqpqah4tvewmlnqdx4/lib64 +export LIB_LIBPNG=/apps/spack/libpng/1.6.37/intel/19.1.3.304/4ohkronuhlyherusoszzrmur5ewvlwzh/lib +export LIB_Z=/apps/spack/zlib/1.2.11/intel/19.1.3.304/hjotqkckeoyt6j6tibalwzrlfljcjtdh/lib +export SET_D64BIT=FALSE + diff --git a/scripts/installation/config/install_met_env.jet b/scripts/installation/config/install_met_env.jet index 19cd1be739..ab9243074a 100644 --- a/scripts/installation/config/install_met_env.jet +++ b/scripts/installation/config/install_met_env.jet @@ -1,7 +1,11 @@ -export TEST_BASE=/contrib/met/10.0.0 -export COMPILER=intel_18.0.5.274 +module load intel/2022.1.2 impi/2022.1.2 +module load intel-tools +module load intelpython/3.6.5 + +export TEST_BASE=/contrib/met/10.1.0 +export COMPILER=intel_2020.2 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=met-10.0.0.20210510.tar.gz +export MET_TARBALL=met-10.1.0.20220314.tar.gz export USE_MODULES=TRUE export PYTHON_MODULE=intelpython_3.6.5 export MET_PYTHON=/apps/intel/intelpython3 diff --git a/scripts/installation/config/install_met_env.orion b/scripts/installation/config/install_met_env.orion index 790407dd51..dcad39eb26 100644 --- a/scripts/installation/config/install_met_env.orion +++ b/scripts/installation/config/install_met_env.orion @@ -1,10 +1,10 @@ module load intel/2020.2 module load intelpython3/2020.2 -export TEST_BASE=/apps/contrib/MET/10.0.0 +export TEST_BASE=/apps/contrib/MET/10.1.0 export COMPILER=intel_2020 export MET_SUBDIR=${TEST_BASE}/ -export MET_TARBALL=met-10.0.0.20210510.tar.gz +export MET_TARBALL=met-10.1.0.20220314.tar.gz export USE_MODULES=TRUE export MET_PYTHON=/apps/intel-2020.2/intel-2020.2/intelpython3 export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.7m diff --git a/scripts/installation/config/install_met_env.stampede b/scripts/installation/config/install_met_env.stampede new file mode 100644 index 0000000000..8b961c99e8 --- /dev/null +++ b/scripts/installation/config/install_met_env.stampede @@ -0,0 +1,28 @@ +module load intel/18.0.2 +module load python3/3.7.0 +module load hdf5/1.10.4 +module load netcdf/4.6.2 + +export TEST_BASE=/work2/06612/tg859120/stampede2/met/10.1.0 +export COMPILER=intel_18.0.2 +export MET_SUBDIR=${TEST_BASE}/ +export MET_TARBALL=met-10.1.0.20220314.tar.gz +export USE_MODULES=TRUE +export MET_PYTHON=/opt/apps/intel18/python3/3.7.0 +export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.7m +export MET_PYTHON_LD=-L${MET_PYTHON}/lib\ -lpython3.7m\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm +export MET_HDF5=/opt/apps/intel18/hdf5/1.10.4/x86_64/ +export MET_NETCDF=/opt/apps/intel18/netcdf/4.6.2/x86_64/ +#export EXTERNAL_LIBS=/work2/06612/tg859120/stampede2/met/10.1.0/external_libs +#export MET_GSL=${EXTERNAL_LIBS} +#export MET_BUFRLIB=${EXTERNAL_LIBS} +#export BUFRLIB_NAME=-lbufr +#export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib +#export MET_GRIB2CINC=${EXTERNAL_LIBS}/include +#export GRIB2CLIB_NAME=-lgrib2c +#export LIB_JASPER=${EXTERNAL_LIBS}/lib +#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +#export LIB_Z=${EXTERNAL_LIBS}/lib +#export SET_D64BIT=FALSE +#export CFLAGS="-Wall -g" +#export CXXFLAGS="-Wall -g" diff --git a/scripts/installation/config/install_met_env_all.casper b/scripts/installation/config/install_met_env_all.casper index 360d65ea44..f54f0bb00f 100644 --- a/scripts/installation/config/install_met_env_all.casper +++ b/scripts/installation/config/install_met_env_all.casper @@ -1,17 +1,30 @@ -module load intel/19.0.5 -module load python/3.7.5 -module load netcdf/4.7.4 +module load ncarenv/1.3 +module load intel/2021.2 +module load python/3.7.9 +module load netcdf/4.8.0 ncar_pylib -export TEST_BASE=/glade/p/ral/jntp/MET/MET_releases/casper/10.0.0 -export COMPILER=intel_19.0.5 +export TEST_BASE=/glade/p/ral/jntp/MET/MET_releases/casper/10.1.0 +export COMPILER=intel_2021.2 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=met-10.0.0.20210510.tar.gz +export MET_TARBALL=met-10.1.0.20220314.tar.gz export USE_MODULES=TRUE -export MET_PYTHON=/glade/u/apps/dav/opt/python/3.7.5/gnu/8.3.0/ +export MET_PYTHON=/glade/u/apps/ch/opt/python/3.7.9/gnu/9.1.0 export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.7m export MET_PYTHON_LD=-L${MET_PYTHON}/lib\ -lpython3.7m\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lm -export MET_NETCDF=/glade/u/apps/dav/opt/netcdf/4.7.3/intel/19.0.5 +export MET_NETCDF=/glade/u/apps/ch/opt/netcdf/4.8.0/intel/2021.2/ +export MET_HDF5=/glade/u/apps/ch/opt/netcdf/4.8.0/intel/2021.2/ +#export EXTERNAL_LIBS=/glade/p/ral/jntp/MET/MET_releases/casper/10.1.0/external_libs +#export MET_GSL=${EXTERNAL_LIBS} +#export MET_BUFRLIB=${EXTERNAL_LIBS} +#export BUFRLIB_NAME=-lbufr +#export MET_HDF5=${EXTERNAL_LIBS} +#export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib +#export MET_GRIB2CINC=${EXTERNAL_LIBS}/include +#export GRIB2CLIB_NAME=-lgrib2c +#export LIB_JASPER=${EXTERNAL_LIBS}/lib +#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +#export LIB_Z=${EXTERNAL_LIBS}/lib export SET_D64BIT=FALSE #export CFLAGS="-Wall -g" #export CXXFLAGS="-Wall -g" diff --git a/scripts/installation/config/install_met_env_all.cheyenne b/scripts/installation/config/install_met_env_all.cheyenne index 1c9b9533a6..a7f39a0064 100644 --- a/scripts/installation/config/install_met_env_all.cheyenne +++ b/scripts/installation/config/install_met_env_all.cheyenne @@ -1,18 +1,30 @@ module load ncarenv/1.3 -module load intel/19.0.5 +module load intel/2021.2 module load python/3.7.9 -module load netcdf/4.7.4 +module load netcdf/4.8.0 ncar_pylib -export TEST_BASE=/glade/p/ral/jntp/MET/MET_releases/10.0.0 -export COMPILER=intel_19.0.5 +export TEST_BASE=/glade/p/ral/jntp/MET/MET_releases/10.1.0 +export COMPILER=intel_2021.2 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=met-10.0.0.20210510.tar.gz +export MET_TARBALL=met-10.1.0.20220314.tar.gz export USE_MODULES=TRUE export MET_PYTHON=/glade/u/apps/ch/opt/python/3.7.9/gnu/9.1.0 export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.7m export MET_PYTHON_LD=-L${MET_PYTHON}/lib\ -lpython3.7m\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lm -export MET_NETCDF=/glade/u/apps/ch/opt/netcdf/4.7.4/intel/19.0.5/ +export MET_NETCDF=/glade/u/apps/ch/opt/netcdf/4.8.0/intel/2021.2/ +export MET_HDF5=/glade/u/apps/ch/opt/netcdf/4.8.0/intel/2021.2/ +#export EXTERNAL_LIBS=/glade/p/ral/jntp/MET/MET_releases/10.1.0/external_libs +#export MET_GSL=${EXTERNAL_LIBS} +#export MET_BUFRLIB=${EXTERNAL_LIBS} +#export BUFRLIB_NAME=-lbufr +#export MET_HDF5=${EXTERNAL_LIBS} +#export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib +#export MET_GRIB2CINC=${EXTERNAL_LIBS}/include +#export GRIB2CLIB_NAME=-lgrib2c +#export LIB_JASPER=${EXTERNAL_LIBS}/lib +#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +#export LIB_Z=${EXTERNAL_LIBS}/lib export SET_D64BIT=FALSE #export CFLAGS="-Wall -g" #export CXXFLAGS="-Wall -g" diff --git a/scripts/installation/config/install_met_env_all.hera b/scripts/installation/config/install_met_env_all.hera index a9ea2355bd..7ac6267a46 100644 --- a/scripts/installation/config/install_met_env_all.hera +++ b/scripts/installation/config/install_met_env_all.hera @@ -1,10 +1,14 @@ +module load intel/2022.1.2 impi/2022.1.2 +module load intel-tools +module load intelpython/3.6.5 + module use -a /contrib/anaconda/modulefiles -module load intel/18.0.5.274 -module load anaconda/latest -export TEST_BASE=/contrib/met/10.0.0 -export COMPILER=intel_18.0.5.274 +module load intel/2022.1.2 +module load anaconda/latest +export TEST_BASE=/contrib/met/10.1.0 +export COMPILER=intel_2022.1.2 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=met-10.0.0.20210510.tar.gz +export MET_TARBALL=met-10.1.0.20220314.tar.gz export USE_MODULES=TRUE export PYTHON_MODULE=anaconda_latest export MET_PYTHON=/contrib/anaconda/anaconda3/latest/ diff --git a/scripts/installation/config/install_met_env_met_only.hera b/scripts/installation/config/install_met_env_met_only.hera index 7966263813..591f42fa49 100644 --- a/scripts/installation/config/install_met_env_met_only.hera +++ b/scripts/installation/config/install_met_env_met_only.hera @@ -1,16 +1,20 @@ +module load intel/2022.1.2 impi/2022.1.2 +module load intel-tools +module load intelpython/3.6.5 + module use -a /contrib/anaconda/modulefiles -module load intel/18.0.5.274 +module load intel/2022.1.2 module load anaconda/latest -export TEST_BASE=/contrib/met/10.0.0 -export COMPILER=intel_18.0.5.274 +export TEST_BASE=/contrib/met/10.1.0 +export COMPILER=intel_2022.1.2 export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=met-10.0.0.20210510.tar.gz +export MET_TARBALL=met-10.1.0.20220314.tar.gz export USE_MODULES=TRUE export PYTHON_MODULE=anaconda_latest export MET_PYTHON=/contrib/anaconda/anaconda3/latest/ export MET_PYTHON_CC=-I${MET_PYTHON}include/python3.7m export MET_PYTHON_LD=-L${MET_PYTHON}/lib/python3.7/config-3.7m-x86_64-linux-gnu\ -L${MET_PYTHON}/lib\ -lpython3.7m\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -Xlinker\ -export-dynamic -export EXTERNAL_LIBS=/contrib/met/10.0.0/external_libs/ +export EXTERNAL_LIBS=/contrib/met/10.1.0/external_libs/ export MET_NETCDF=${EXTERNAL_LIBS} export MET_GSL=${EXTERNAL_LIBS} export MET_BUFRLIB=${EXTERNAL_LIBS} diff --git a/scripts/installation/config/install_met_env_met_only.jet b/scripts/installation/config/install_met_env_met_only.jet new file mode 100644 index 0000000000..ae0fc8fedb --- /dev/null +++ b/scripts/installation/config/install_met_env_met_only.jet @@ -0,0 +1,28 @@ +module load intel/2022.1.2 impi/2022.1.2 +module load intel-tools +module load intelpython/3.6.5 + +export TEST_BASE=/contrib/met/10.1.0 +export COMPILER=intel_2020.2 +export MET_SUBDIR=${TEST_BASE} +export MET_TARBALL=met-10.1.0.20220314.tar.gz +export USE_MODULES=TRUE +export PYTHON_MODULE=intelpython_3.6.5 +export MET_PYTHON=/apps/intel/intelpython3 +export MET_PYTHON_CC=-I/apps/intel/intelpython3/include/python3.6m +export MET_PYTHON_LD=-L/apps/intel/intelpython3/lib\ -lpython3.6m\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -Xlinker\ -export-dynamic +export MET_NETCDF=/apps/netcdf/4.6.1/intel/18.0.5.274 +export MET_HDF5=/apps/hdf5/1.10.4/intel_seq/18.0.5.274 +export EXTERNAL_LIBS=/contrib/met/10.1.0/external_libs/ +export MET_GSL=${EXTERNAL_LIBS} +export MET_BUFRLIB=${EXTERNAL_LIBS} +export BUFRLIB_NAME=-lbufr +export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib +export MET_GRIB2CINC=${EXTERNAL_LIBS}/include +export GRIB2CLIB_NAME=-lgrib2c +export LIB_JASPER=${EXTERNAL_LIBS}/lib +export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +export LIB_Z=${EXTERNAL_LIBS}/lib +export SET_D64BIT=FALSE +#export CFLAGS="-Wall -g" +#export CXXFLAGS="-Wall -g -lcurl" diff --git a/scripts/installation/config/install_met_env_met_only.orion b/scripts/installation/config/install_met_env_met_only.orion new file mode 100644 index 0000000000..a869ff8d27 --- /dev/null +++ b/scripts/installation/config/install_met_env_met_only.orion @@ -0,0 +1,26 @@ +module load intel/2020.2 +module load intelpython3/2020.2 + +export TEST_BASE=/apps/contrib/MET/10.1.0 +export COMPILER=intel_2020 +export MET_SUBDIR=${TEST_BASE}/ +export MET_TARBALL=met-10.1.0.20220314.tar.gz +export USE_MODULES=TRUE +export MET_PYTHON=/apps/intel-2020.2/intel-2020.2/intelpython3 +export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.7m +export MET_PYTHON_LD=-L${MET_PYTHON}/lib\ -lpython3.7m\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm +export EXTERNAL_LIBS=/apps/contrib/MET/10.1.0/external_libs +export MET_GSL=${EXTERNAL_LIBS} +export MET_BUFRLIB=${EXTERNAL_LIBS} +export BUFRLIB_NAME=-lbufr +export MET_HDF5=${EXTERNAL_LIBS} +export MET_NETCDF=${EXTERNAL_LIBS} +export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib +export MET_GRIB2CINC=${EXTERNAL_LIBS}/include +export GRIB2CLIB_NAME=-lgrib2c +export LIB_JASPER=${EXTERNAL_LIBS}/lib +export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +export LIB_Z=${EXTERNAL_LIBS}/lib +export SET_D64BIT=FALSE +export CFLAGS="-Wall -g" +export CXXFLAGS="-Wall -g" diff --git a/scripts/installation/config/install_met_env_met_only.stampede b/scripts/installation/config/install_met_env_met_only.stampede index 7113983130..18495660ab 100644 --- a/scripts/installation/config/install_met_env_met_only.stampede +++ b/scripts/installation/config/install_met_env_met_only.stampede @@ -3,17 +3,17 @@ module load python3/3.7.0 module load hdf5/1.10.4 module load netcdf/4.6.2 -export TEST_BASE=/work2/06612/tg859120/stampede2/met/10.0.0 +export TEST_BASE=/work2/06612/tg859120/stampede2/met/10.1.0 export COMPILER=intel_18.0.2 export MET_SUBDIR=${TEST_BASE}/ -export MET_TARBALL=met-10.0.0.20210510.tar.gz +export MET_TARBALL=met-10.1.0.20220314.tar.gz export USE_MODULES=TRUE export MET_PYTHON=/opt/apps/intel18/python3/3.7.0 export MET_PYTHON_CC=-I${MET_PYTHON}/include/python3.7m export MET_PYTHON_LD=-L${MET_PYTHON}/lib\ -lpython3.7m\ -lcrypt\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm export MET_HDF5=/opt/apps/intel18/hdf5/1.10.4/x86_64/ export MET_NETCDF=/opt/apps/intel18/netcdf/4.6.2/x86_64/ -export EXTERNAL_LIBS=/work2/06612/tg859120/stampede2/met/10.0.0/external_libs +export EXTERNAL_LIBS=/work2/06612/tg859120/stampede2/met/10.1.0/external_libs export MET_GSL=${EXTERNAL_LIBS} export MET_BUFRLIB=${EXTERNAL_LIBS} export BUFRLIB_NAME=-lbufr diff --git a/scripts/installation/modulefiles/10.0.0_casper b/scripts/installation/modulefiles/10.0.0_casper deleted file mode 100644 index 27504264a6..0000000000 --- a/scripts/installation/modulefiles/10.0.0_casper +++ /dev/null @@ -1,20 +0,0 @@ -#%Module###################################################################### -## -## Model Evaluation Tools -## -proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.0.0 *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" -} - -# The intel compiler is required to run MET -module load intel/19.0.5 -module load python/3.7.5 -module load netcdf/4.7.4 - -set base /glade/p/ral/jntp/MET/MET_releases/casper/10.0.0 -set ver 10.0.0 -set share $base/share/met - -prepend-path PATH $base/bin:/glade/p/ral/jntp/MET/MET_releases/casper/10.0.0/external_libs/bin - -setenv METversion V$ver diff --git a/scripts/installation/modulefiles/10.1.0_acorn b/scripts/installation/modulefiles/10.1.0_acorn new file mode 100644 index 0000000000..56d2d6d8dc --- /dev/null +++ b/scripts/installation/modulefiles/10.1.0_acorn @@ -0,0 +1,34 @@ +#%Module###################################################################### +## +## Model Evaluation Tools +## +proc ModulesHelp { } { + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 + *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" +} + +# The intel compiler is required to run MET + +module use /apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304/ +module load intel +module load python/3.8.6 +module load netcdf/4.7.4 +module load hdf5/1.10.6 +module load bufr/11.5.0 +module load zlib/1.2.11 +module load jasper/2.0.25 +module load libpng/1.6.37 +module load gsl/2.7 +module load g2c/1.6.4 + +set base /lfs/h2/emc/vpppg/noscrub/Julie.Prestopnik/MET/10.1.0 +set ver 10.1.0 +set share $base/share/met +set lib_base $base + +prepend-path PATH $base/exec + +setenv METversion V$ver +setenv MET_ROOT $base + + diff --git a/scripts/installation/modulefiles/10.0.0_cheyenne b/scripts/installation/modulefiles/10.1.0_casper similarity index 70% rename from scripts/installation/modulefiles/10.0.0_cheyenne rename to scripts/installation/modulefiles/10.1.0_casper index 98bd539cfc..ac50f68913 100644 --- a/scripts/installation/modulefiles/10.0.0_cheyenne +++ b/scripts/installation/modulefiles/10.1.0_casper @@ -3,23 +3,23 @@ ## Model Evaluation Tools ## proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.0.0 + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" } -# If they exist, remove ncdump and ncgen from /glade/p/ral/jntp/MET/MET_releases/10.0.0/external_libs/bin +# If they exist, remove ncdump and ncgen from /glade/p/ral/jntp/MET/MET_releases/casper/10.1.0/external_libs/bin # The intel compiler is required to run MET module load ncarenv/1.3 -module load intel/19.0.5 +module load intel/2021.2 module load python/3.7.9 -module load netcdf/4.7.4 +module load netcdf/4.8.0 -set base /glade/p/ral/jntp/MET/MET_releases/10.0.0 -set ver 10.0.0 +set base /glade/p/ral/jntp/MET/MET_releases/casper/10.1.0 +set ver 10.1.0 set share $base/share/met -prepend-path PATH $base/bin:/glade/p/ral/jntp/MET/MET_releases/10.0.0/external_libs/bin +prepend-path PATH $base/bin:/glade/p/ral/jntp/MET/MET_releases/casper/10.1.0/external_libs/bin setenv METversion V$ver diff --git a/scripts/installation/modulefiles/10.1.0_cheyenne b/scripts/installation/modulefiles/10.1.0_cheyenne new file mode 100644 index 0000000000..e3a408ff8f --- /dev/null +++ b/scripts/installation/modulefiles/10.1.0_cheyenne @@ -0,0 +1,29 @@ +#%Module###################################################################### +## +## Model Evaluation Tools +## +proc ModulesHelp { } { + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 + *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" +} + +# If they exist, remove ncdump and ncgen from /glade/p/ral/jntp/MET/MET_releases/10.1.0/external_libs/bin + +# The intel compiler is required to run MET +module load ncarenv/1.3 +module load intel/2021.2 +module load python/3.7.9 +module load netcdf/4.8.0 + +set base /glade/p/ral/jntp/MET/MET_releases/10.1.0 +set ver 10.1.0 +set share $base/share/met + +prepend-path PATH $base/bin:/glade/p/ral/jntp/MET/MET_releases/10.1.0/external_libs/bin + + +setenv METversion V$ver + +# setenv MET_BUFRLIB /glade/p/ral/jntp/MET/MET_releases/10.1.0/external_libs/libs +# setenv MET_GRIB2C /glade/p/ral/jntp/MET/MET_releases/10.1.0/external_libs +# setenv MET_GSL /glade/p/ral/jntp/MET/MET_releases/10.1.0/external_libs diff --git a/scripts/installation/modulefiles/10.0.0_dell b/scripts/installation/modulefiles/10.1.0_dell similarity index 93% rename from scripts/installation/modulefiles/10.0.0_dell rename to scripts/installation/modulefiles/10.1.0_dell index 05e23803e1..320248ca3a 100644 --- a/scripts/installation/modulefiles/10.0.0_dell +++ b/scripts/installation/modulefiles/10.1.0_dell @@ -3,7 +3,7 @@ ## Model Evaluation Tools ## proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.0.0 + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" } @@ -20,8 +20,8 @@ module load zlib/1.2.11 module load gsl/2.1 module load g2c/1.6.3 -set base /gpfs/dell2/emc/verification/noscrub/emc.metplus/met/10.0.0 -set ver 10.0.0 +set base /gpfs/dell2/emc/verification/noscrub/emc.metplus/met/10.1.0 +set ver 10.1.0 set share $base/share/met set lib_base $base diff --git a/scripts/installation/modulefiles/10.1.0_dogwood b/scripts/installation/modulefiles/10.1.0_dogwood new file mode 100644 index 0000000000..82d86411c3 --- /dev/null +++ b/scripts/installation/modulefiles/10.1.0_dogwood @@ -0,0 +1,32 @@ +#%Module###################################################################### +## +## Model Evaluation Tools +## +proc ModulesHelp { } { + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 + *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" +} + +# The intel compiler is required to run MET + +module use /apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304/ +module load intel +module load python/3.8.6 +module load netcdf/4.7.4 +module load hdf5/1.10.6 +module load bufr/11.6.0 +module load zlib/1.2.11 +module load jasper/2.0.25 +module load libpng/1.6.37 +module load gsl/2.6 +module load g2c/1.6.4 + +set base /lfs/h2/emc/vpppg/noscrub/Julie.Prestopnik/MET/10.1.0 +set ver 10.1.0 +set share $base/share/met +set lib_base $base + +prepend-path PATH $base/exec + +setenv METversion V$ver +setenv MET_ROOT $base diff --git a/scripts/installation/modulefiles/10.0.0_hera b/scripts/installation/modulefiles/10.1.0_hera similarity index 76% rename from scripts/installation/modulefiles/10.0.0_hera rename to scripts/installation/modulefiles/10.1.0_hera index 216c567fb8..7e3294d7f9 100644 --- a/scripts/installation/modulefiles/10.0.0_hera +++ b/scripts/installation/modulefiles/10.1.0_hera @@ -1,9 +1,9 @@ -#%Module###################################################################### +%Module###################################################################### ## ## Model Evaluation Tools ## proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.0.0 + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" } @@ -12,18 +12,16 @@ prereq intel prereq anaconda/latest set base /contrib/met -set ver 10.0.0 +set ver 10.1.0 set share $base/$ver/share/met -set lib_base $base/10.0.0 - +set lib_base $base/10.1.0 prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin - #prepend-path LD_LIBRARY_PATH $lib_base/external_libs/lib #setenv METversion $ver -#setenv MET_ROOT $base/$ver/met-10.0.0-beta5 +#setenv MET_ROOT $base/$ver/met-10.1.0 #setenv MET_CONFIG $share/config #setenv MET_POLY $share/poly #setenv MET_COLORTABLES $share/colortables @@ -35,13 +33,13 @@ prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin #setenv CXX icc #setenv F77 ifort -#module load intel/18.0.5.274 +#module load intel/2022.1.2 #module load anaconda/latest -#setenv libdir /contrib/met/10.0.0-beta5/external_libs/lib -#setenv incdir /contrib/met/10.0.0-beta5/external_libs/include -#setenv iprefix /contrib/met/10.0.0-beta5/external_libs -#setenv basedir /contrib/met/10.0.0-beta5/met-10.0.0-beta5 +#setenv libdir /contrib/met/10.1.0/external_libs/lib +#setenv incdir /contrib/met/10.1.0/external_libs/include +#setenv iprefix /contrib/met/10.1.0/external_libs +#setenv basedir /contrib/met/10.1.0/met-10.1.0 #setenv MET_HDF5 $iprefix #setenv MET_NETCDF $incdir @@ -65,4 +63,3 @@ prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin #setenv MET_FREETYPELIB $libdir #setenv MET_FREETYPEINC $incdir/freetype2 - diff --git a/scripts/installation/modulefiles/10.0.0_jet b/scripts/installation/modulefiles/10.1.0_jet old mode 100755 new mode 100644 similarity index 87% rename from scripts/installation/modulefiles/10.0.0_jet rename to scripts/installation/modulefiles/10.1.0_jet index 4d379eb920..907c61e609 --- a/scripts/installation/modulefiles/10.0.0_jet +++ b/scripts/installation/modulefiles/10.1.0_jet @@ -3,7 +3,7 @@ ## Model Evaluation Tools ## proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.0.0 + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" } @@ -12,10 +12,8 @@ prereq intelpython/3.6.5 prereq netcdf/4.6.1 prereq hdf5/1.10.4 -set base /contrib/met/10.0.0 -set ver 10.0.0 +set base /contrib/met/10.1.0 +set ver 10.1.0 set share $base/share/met prepend-path PATH $base/bin:$base/external_libs/bin:/apps/intel/intelpython3/bin:/apps/netcdf/4.6.1/intel/18.0.5.274/bin:/apps/hdf5/1.10.4/intel_seq/18.0.5.274/bin - - diff --git a/scripts/installation/modulefiles/10.0.0_orion b/scripts/installation/modulefiles/10.1.0_orion similarity index 81% rename from scripts/installation/modulefiles/10.0.0_orion rename to scripts/installation/modulefiles/10.1.0_orion index cbc04944f5..05f7971e9a 100644 --- a/scripts/installation/modulefiles/10.0.0_orion +++ b/scripts/installation/modulefiles/10.1.0_orion @@ -3,7 +3,7 @@ ## Model Evaluation Tools ## proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.0.0. + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0. *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" } @@ -11,9 +11,10 @@ prereq intel/2020.2 prereq intelpython3/2020.2 set base /apps/contrib/MET -set ver 10.0.0 +set ver 10.1.0 set share $base/$ver/share/met -set lib_base $base/10.0.0 +set lib_base $base/10.1.0 + prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin @@ -22,10 +23,10 @@ prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin #export F77=ifort #module load intel/2020.2 #module load intelpython3/2020.2 -#export libdir=/apps/contrib/met/10.0.0/external_libs/lib -#export incdir=/apps/contrib/met/10.0.0/external_libs/include -#export iprefix=/apps/contrib/met/10.0.0/external_libs -#export basedir=/apps/contrib/met/10.0.0/met-10.0.0 +#export libdir=/apps/contrib/met/10.1.0/external_libs/lib +#export incdir=/apps/contrib/met/10.1.0/external_libs/include +#export iprefix=/apps/contrib/met/10.1.0/external_libs +#export basedir=/apps/contrib/met/10.1.0/met-10.1.0 #export MET_HDF5=$iprefix #export MET_NETCDF=$incdir #export MET_GRIB2CINC=$incdir @@ -43,4 +44,3 @@ prepend-path PATH $base/$ver/bin:$lib_base/external_libs/bin #export MET_FONT_DIR=$basedir/fonts/ #export LDFLAGS=-Wl,--disable-new-dtags -Wl,-rpath,${libdir}:${MET_PYTHON}/lib #export CPPFLAGS=-I/apps/contrib/met/10.0.0/external_libs/include - diff --git a/scripts/installation/modulefiles/10.0.0_stampede b/scripts/installation/modulefiles/10.1.0_stampede similarity index 82% rename from scripts/installation/modulefiles/10.0.0_stampede rename to scripts/installation/modulefiles/10.1.0_stampede index baf04f43f0..aa62ef1fe6 100644 --- a/scripts/installation/modulefiles/10.0.0_stampede +++ b/scripts/installation/modulefiles/10.1.0_stampede @@ -3,7 +3,7 @@ ## Model Evaluation Tools ## proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.0.0 + puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" } @@ -12,8 +12,8 @@ module load python3/3.7.0 module load hdf5/1.10.4 module load netcdf/4.6.2 -set base /work2/06612/tg859120/stampede2/met/10.0.0 -set ver 10.0.0 +set base /work2/06612/tg859120/stampede2/met/10.1.0 +set ver 10.1.0 set share $base/share/met set lib_base $base @@ -21,3 +21,4 @@ prepend-path PATH $base/bin setenv METversion V$ver setenv MET_ROOT $base + From f8caa4693ec7ca1a72d2045b6e09ae8005588095 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Wed, 30 Mar 2022 13:45:00 -0600 Subject: [PATCH 2/2] Removed jet files --- .../installation/config/install_met_env.jet | 15 ---------- .../config/install_met_env_met_only.jet | 28 ------------------- scripts/installation/modulefiles/10.1.0_jet | 19 ------------- 3 files changed, 62 deletions(-) delete mode 100644 scripts/installation/config/install_met_env.jet delete mode 100644 scripts/installation/config/install_met_env_met_only.jet delete mode 100644 scripts/installation/modulefiles/10.1.0_jet diff --git a/scripts/installation/config/install_met_env.jet b/scripts/installation/config/install_met_env.jet deleted file mode 100644 index ab9243074a..0000000000 --- a/scripts/installation/config/install_met_env.jet +++ /dev/null @@ -1,15 +0,0 @@ -module load intel/2022.1.2 impi/2022.1.2 -module load intel-tools -module load intelpython/3.6.5 - -export TEST_BASE=/contrib/met/10.1.0 -export COMPILER=intel_2020.2 -export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=met-10.1.0.20220314.tar.gz -export USE_MODULES=TRUE -export PYTHON_MODULE=intelpython_3.6.5 -export MET_PYTHON=/apps/intel/intelpython3 -export MET_PYTHON_CC=-I/apps/intel/intelpython3/include/python3.6m -export MET_PYTHON_LD=-L/apps/intel/intelpython3/lib\ -lpython3.6m\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -Xlinker\ -export-dynamic -export MET_NETCDF=/apps/netcdf/4.6.1/intel/18.0.5.274 -export MET_HDF5=/apps/hdf5/1.10.4/intel_seq/18.0.5.274 diff --git a/scripts/installation/config/install_met_env_met_only.jet b/scripts/installation/config/install_met_env_met_only.jet deleted file mode 100644 index ae0fc8fedb..0000000000 --- a/scripts/installation/config/install_met_env_met_only.jet +++ /dev/null @@ -1,28 +0,0 @@ -module load intel/2022.1.2 impi/2022.1.2 -module load intel-tools -module load intelpython/3.6.5 - -export TEST_BASE=/contrib/met/10.1.0 -export COMPILER=intel_2020.2 -export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=met-10.1.0.20220314.tar.gz -export USE_MODULES=TRUE -export PYTHON_MODULE=intelpython_3.6.5 -export MET_PYTHON=/apps/intel/intelpython3 -export MET_PYTHON_CC=-I/apps/intel/intelpython3/include/python3.6m -export MET_PYTHON_LD=-L/apps/intel/intelpython3/lib\ -lpython3.6m\ -lpthread\ -ldl\ -lutil\ -lrt\ -lm\ -Xlinker\ -export-dynamic -export MET_NETCDF=/apps/netcdf/4.6.1/intel/18.0.5.274 -export MET_HDF5=/apps/hdf5/1.10.4/intel_seq/18.0.5.274 -export EXTERNAL_LIBS=/contrib/met/10.1.0/external_libs/ -export MET_GSL=${EXTERNAL_LIBS} -export MET_BUFRLIB=${EXTERNAL_LIBS} -export BUFRLIB_NAME=-lbufr -export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib -export MET_GRIB2CINC=${EXTERNAL_LIBS}/include -export GRIB2CLIB_NAME=-lgrib2c -export LIB_JASPER=${EXTERNAL_LIBS}/lib -export LIB_LIBPNG=${EXTERNAL_LIBS}/lib -export LIB_Z=${EXTERNAL_LIBS}/lib -export SET_D64BIT=FALSE -#export CFLAGS="-Wall -g" -#export CXXFLAGS="-Wall -g -lcurl" diff --git a/scripts/installation/modulefiles/10.1.0_jet b/scripts/installation/modulefiles/10.1.0_jet deleted file mode 100644 index 907c61e609..0000000000 --- a/scripts/installation/modulefiles/10.1.0_jet +++ /dev/null @@ -1,19 +0,0 @@ -#%Module###################################################################### -## -## Model Evaluation Tools -## -proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v10.1.0 - *** For help see the official MET webpage at http://www.dtcenter.org/met/users ***" -} - -prereq intel -prereq intelpython/3.6.5 -prereq netcdf/4.6.1 -prereq hdf5/1.10.4 - -set base /contrib/met/10.1.0 -set ver 10.1.0 -set share $base/share/met - -prepend-path PATH $base/bin:$base/external_libs/bin:/apps/intel/intelpython3/bin:/apps/netcdf/4.6.1/intel/18.0.5.274/bin:/apps/hdf5/1.10.4/intel_seq/18.0.5.274/bin