From 3460f4b5cb1d007198597e973da56eb93a7e852f Mon Sep 17 00:00:00 2001 From: George McCabe <23407799+georgemccabe@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:41:05 -0700 Subject: [PATCH] fixed incorrect merge changes --- data/config/GridStatConfig_default | 1 - data/config/PointStatConfig_default | 1 - .../install_met_env.wcoss2_py3.10_secondary | 51 ------------------- .../modulefiles/11.1.0.lua_wcoss2 | 27 ---------- .../installation/modulefiles/11.1.0_acorn | 33 ------------ 5 files changed, 113 deletions(-) delete mode 100644 internal/scripts/installation/config/install_met_env.wcoss2_py3.10_secondary delete mode 100644 internal/scripts/installation/modulefiles/11.1.0.lua_wcoss2 delete mode 100644 internal/scripts/installation/modulefiles/11.1.0_acorn diff --git a/data/config/GridStatConfig_default b/data/config/GridStatConfig_default index aaeaccf337..adbb9a214b 100644 --- a/data/config/GridStatConfig_default +++ b/data/config/GridStatConfig_default @@ -270,7 +270,6 @@ ugrid_coordinates_file = ""; //////////////////////////////////////////////////////////////////////////////// - grid_weight_flag = NONE; tmp_dir = "/tmp"; output_prefix = ""; diff --git a/data/config/PointStatConfig_default b/data/config/PointStatConfig_default index d41da25450..9a8132dccc 100644 --- a/data/config/PointStatConfig_default +++ b/data/config/PointStatConfig_default @@ -305,7 +305,6 @@ ugrid_coordinates_file = ""; //////////////////////////////////////////////////////////////////////////////// - tmp_dir = "/tmp"; output_prefix = ""; version = "V12.0.0"; diff --git a/internal/scripts/installation/config/install_met_env.wcoss2_py3.10_secondary b/internal/scripts/installation/config/install_met_env.wcoss2_py3.10_secondary deleted file mode 100644 index fb0220c5a6..0000000000 --- a/internal/scripts/installation/config/install_met_env.wcoss2_py3.10_secondary +++ /dev/null @@ -1,51 +0,0 @@ -module reset -module use /apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304 -module load intel -module load PrgEnv-intel/8.3.3 -module load craype/2.7.17 -module load python/3.10.4 -module use /apps/dev/modulefiles/ -module load ve/evs/1.0 -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.7 -module load g2c/1.6.4 - -#export TEST_BASE=/apps/ops/para/libs/intel/19.1.3.304/met/11.1.0-rc1 -export TEST_BASE=$(pwd) -export LIB_DIR=${TEST_BASE}/external_libs -export BIN_DIR_PATH=${TEST_BASE}/bin -export COMPILER=intel_19.1.3.304 -export MET_SUBDIR=${TEST_BASE} -export MET_TARBALL=v11.1.0-rc1.tar.gz -export USE_MODULES=TRUE -export ADDTL_DIR=/apps/spack/gettext/0.21/intel/19.1.3.304/at2kdo4edvuhyzrt5g6zhwrdb7bdui4s/lib64 -export PYTHON_MODULE=python_3.10.4 -export MET_PYTHON=/apps/spack/python/3.10.4/intel/19.1.3.304/xqft4d45h4dp4xnbz2ue3nbxv65i6bgp -export MET_PYTHON_LIB=/apps/spack/python/3.10.4/intel/19.1.3.304/xqft4d45h4dp4xnbz2ue3nbxv65i6bgp/lib64 -export MET_PYTHON_CC=-I/apps/spack/python/3.10.4/intel/19.1.3.304/xqft4d45h4dp4xnbz2ue3nbxv65i6bgp/include/python3.10 -export MET_PYTHON_LD=-L/apps/spack/python/3.10.4/intel/19.1.3.304/xqft4d45h4dp4xnbz2ue3nbxv65i6bgp/lib64\ -lpython3.10\ -lcrypt\ -lintl\ -ldl\ -lutil\ -lm\ -lm -export MET_NETCDF=/apps/prod/hpc-stack/intel-19.1.3.304/netcdf/4.7.4 -# JY export MET_HDF5=/apps/prod/hpc-stack/intel-19.1.3.304/hdf5/1.10.6 -export MET_HDF5=${HDF5_ROOT} -export MET_BUFRLIB=/apps/ops/prod/libs/intel/19.1.3.304/bufr/11.6.0/lib64 -# JY export MET_GRIB2CLIB=/apps/ops/prod/libs/intel/19.1.3.304/g2c/1.6.4/lib64 -# JY export MET_GRIB2CINC=/apps/ops/prod/libs/intel/19.1.3.304/g2c/1.6.4/include -export MET_GRIB2CLIB=${g2c_ROOT}/lib64 -export MET_GRIB2CINC=${G2C_INC} -export MET_GSL=/apps/spack/gsl/2.7/intel/19.1.3.304/xks7dxbowrdxhjck5zxc4rompopocevb -export BUFRLIB_NAME=-lbufr_4 -export GRIB2CLIB_NAME=-lg2c -# JY export LIB_JASPER=/apps/spack/jasper/2.0.25/intel/19.1.3.304/sjib74krrorkyczqpqah4tvewmlnqdx4/lib64 -export LIB_JASPER=${JASPER_LIBDIR} -# JY export LIB_LIBPNG=/apps/spack/libpng/1.6.37/intel/19.1.3.304/4ohkronuhlyherusoszzrmur5ewvlwzh/lib -export LIB_LIBPNG=${LIBPNG_LIBDIR} -# JY export LIB_Z=/apps/spack/zlib/1.2.11/intel/19.1.3.304/hjotqkckeoyt6j6tibalwzrlfljcjtdh/lib -export LIB_Z=${ZLIB_LIBDIR} -export SET_D64BIT=FALSE -export MAKE_ARGS=-j -export CXXFLAGS="-std=c++11" diff --git a/internal/scripts/installation/modulefiles/11.1.0.lua_wcoss2 b/internal/scripts/installation/modulefiles/11.1.0.lua_wcoss2 deleted file mode 100644 index 457753be13..0000000000 --- a/internal/scripts/installation/modulefiles/11.1.0.lua_wcoss2 +++ /dev/null @@ -1,27 +0,0 @@ -help([[ -]]) - -local pkgName = myModuleName() -local pkgVersion = myModuleVersion() -local pkgNameVer = myModuleFullName() - -local hierA = hierarchyA(pkgNameVer,1) -local compNameVer = hierA[1] - - -conflict(pkgName) - -local opt = os.getenv("HPC_OPT") or os.getenv("OPT") or "/opt/modules" - -local base = pathJoin(opt,compNameVer,pkgName,pkgVersion) - -prepend_path("PATH", pathJoin(base,"bin")) - -setenv("MET_ROOT", base) -setenv("MET_BASE", pathJoin(base, "share", "met")) -setenv("MET_VERSION", pkgVersion) - -whatis("Name: ".. pkgName) -whatis("Version: " .. pkgVersion) -whatis("Category: applications") -whatis("Description: Model Evaluation Tools (MET)") \ No newline at end of file diff --git a/internal/scripts/installation/modulefiles/11.1.0_acorn b/internal/scripts/installation/modulefiles/11.1.0_acorn deleted file mode 100644 index 3712812827..0000000000 --- a/internal/scripts/installation/modulefiles/11.1.0_acorn +++ /dev/null @@ -1,33 +0,0 @@ -#%Module###################################################################### -## -## Model Evaluation Tools -## -proc ModulesHelp { } { - puts stderr "Sets up the paths and environment variables to use the Model Evaluation Tools v11.1.0-rc1 - *** 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 python/3.10.4 -module use /apps/dev/modulefiles/ -module load ve/evs/1.0 -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 /apps/sw_review/emc/MET/11.1.0-rc1 -set ver 11.1.0-rc1 -set share $base/share/met -set lib_base $base - -prepend-path PATH $base/bin - -setenv METversion V$ver -setenv MET_ROOT $base