From 055c14c0743c6b585501997bc2358a7661518052 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Fri, 18 Aug 2023 15:10:44 -0600 Subject: [PATCH 1/7] Updates before testing --- .../config/install_met_env.generic | 92 ++++++++++--------- 1 file changed, 51 insertions(+), 41 deletions(-) diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic index f2ef8ccc3e..869f824a14 100644 --- a/internal/scripts/installation/config/install_met_env.generic +++ b/internal/scripts/installation/config/install_met_env.generic @@ -1,59 +1,69 @@ -#Find the directory this script is called from +# Find the directory this script is called from DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -#Required -#Directory that is the root of the compile -export TEST_BASE=$DIR/../ +# Required +# Directory that is the root of the compile +export TEST_BASE=$DIR -#Required -#Compiler options = gnu, intel, ics, ips, PrgEnv-intel, or pgi -#Compiler+version can be used for machines using modules e.g. gnu_6.3.0 -export COMPILER=gnu +# Required +# Format is compiler_version (e.g. gnu_8.3.0) +# Compiler options = gnu, intel, ics, ips, PrgEnv-intel, or pgi +# Version is used for gnu in compilation of BUFRLIB and HDF5 +export COMPILER=gnu_8.3.0 -#Required -#Root directory for creating/untaring met source code - usually same as TEST_BASE +# Required +# Root directory for creating/untaring met source code - usually same as TEST_BASE export MET_SUBDIR=${TEST_BASE} -#Required -#The name of the met tarbal usually downloaded with version from dtcenter.org and includes a version -# example - met-9.0.1.20200423.tar.gz -#met.tar.gz is used for compiling from cloned github repo -export MET_TARBALL=met.tar.gz +# Required +# The name of the met tarbal usually downloaded with version from dtcenter.org and includes a version +# example - v11.1.0.tar.gz +export MET_TARBALL=v11.1.0.tar.gz -#Required -#Specifiy if machine useds modules for loading software +# Required +# Specifiy if machine useds modules for loading software export USE_MODULES=FALSE -#Root directory of your python install -export PYTHON_LOC="$(python3-config --prefix)" +# Root directory of your python install, containing the bin, include, lib, and share directories +export MET_PYTHON=`python3-config --prefix` -#Directory of your python executable -export MET_PYTHON=${PYTHON_LOC} +# Python ldflags created using python3-config +export MET_PYTHON_LD=`python3-config --ldflags` -#Python ldflags created using python3-config -export MET_PYTHON_LD="$(python3-config --ldflags)" +# Python cflags created using python3-config +export MET_PYTHON_CC=`python3-config --cflags` -#Python cflags created using python3-config -export MET_PYTHON_CC="$(python3-config --cflags)" +# Use MAKE_ARGS to sped up the compilation of the external libaries and/or MET +# MAKE_ARGS can be set "-j #" where # is replaced with the number of +# cores to use (as an integer) or to simply "-j" to use all available cores. +export MAKE_ARGS=-j -#64 bit machine or not -export SET_D64BIT=FALSE +# If you've already use the script to compiled these libaries and don't need to +# compile them again, please comment out the export statements with a "#" symbol +# in front. If you have these installed in a location other than ${EXTERNAL_LIBS}, +# you can provide the appropriate path below and uncomment the line. +#export EXTERNAL_LIBS=${TEST_BASE}/external_libs +#export MET_GSL=${EXTERNAL_LIBS} +#export MET_BUFRLIB=${EXTERNAL_LIBS}/lib +#export BUFRLIB_NAME=-lbufr +#export LIB_JASPER=${EXTERNAL_LIBS}/lib +#export LIB_LIBPNG=${EXTERNAL_LIBS}/lib +#export LIB_Z=${EXTERNAL_LIBS}/lib +#export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib +#export MET_GRIB2CINC=${EXTERNAL_LIBS}/include +#export GRIB2CLIB_NAME=-lgrib2c +#export MET_HDF5=${EXTERNAL_LIBS} +#export MET_NETCDF=${EXTERNAL_LIBS} -#General CFLAGS -export CFLAGS="-Wall -g" +# The optional libraries HDF4, HDFEOS, FREETYPE, and CAIRO are used for the +# following, not widely used tools, MODIS-Regrid, lidar2nc, and MODE Graphics. +# To enable the compilation of these libraries, set the compilation flags for +# the library (e.g. COMPILE_HDF, COMPILE_HDFEOS, COMPILE_CAIRO, +# COMPILE_FREETYPE) to any value in the environment config file. If these +# libraries have already been installed and don't need to be reinstalled, set +# MET_HDF, MET_HDFEOS, MET_FREETYPEINC, MET_FREETYPELIB, MET_CAIROINC, +# and MET_CAIROLIB -#General CXXLAGS -export CXXFLAGS="-Wall -g" #Normally should be omitted or set to TRUE - only used if building from github repo export USE_MET_TAR_FILE=FALSE - -#If you've already compiled these and don't need to compile them again, set the following -#export EXTERNAL_LIBS=${TEST_BASE}/external_libs -#export MET_GRIB2CLIB=${EXTERNAL_LIBS}/lib -#export MET_GRIB2CINC=${EXTERNAL_LIBS}/include -#export GRIB2CLIB_NAME=-lgrib2c -#export MET_BUFRLIB=${EXTERNAL_LIBS}/lib -#export BUFRLIB_NAME=-lbufr -#export MET_NETCDF=${EXTERNAL_LIBS}/lib -# Also, don't forget to set the following options to zero within the compile script if you've already compiled those libraries as well: COMPILE_GSL, COMPILE_HDF, COMPILE_HDFEOS, COMPILE_CAIRO, COMPILE_FREETYPE From 3b03255c566a4a93fb8aec230738b59242f6be76 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Mon, 21 Aug 2023 10:25:49 -0600 Subject: [PATCH 2/7] Updated to work with compile_met_all.sh script --- .../scripts/installation/config/install_met_env.generic | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic index 869f824a14..b38ef86737 100644 --- a/internal/scripts/installation/config/install_met_env.generic +++ b/internal/scripts/installation/config/install_met_env.generic @@ -3,7 +3,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # Required # Directory that is the root of the compile -export TEST_BASE=$DIR +export TEST_BASE=${DIR} # Required # Format is compiler_version (e.g. gnu_8.3.0) @@ -28,7 +28,7 @@ export USE_MODULES=FALSE export MET_PYTHON=`python3-config --prefix` # Python ldflags created using python3-config -export MET_PYTHON_LD=`python3-config --ldflags` +export MET_PYTHON_LD=`python3-config --ldflags --embed` # Python cflags created using python3-config export MET_PYTHON_CC=`python3-config --cflags` @@ -63,7 +63,3 @@ export MAKE_ARGS=-j # libraries have already been installed and don't need to be reinstalled, set # MET_HDF, MET_HDFEOS, MET_FREETYPEINC, MET_FREETYPELIB, MET_CAIROINC, # and MET_CAIROLIB - - -#Normally should be omitted or set to TRUE - only used if building from github repo -export USE_MET_TAR_FILE=FALSE From 7b08e5d3915011c6911fb5a89e9238c3067ffdd5 Mon Sep 17 00:00:00 2001 From: Julie Prestopnik Date: Mon, 21 Aug 2023 10:36:02 -0600 Subject: [PATCH 3/7] Updated to be 12.0.0 since this is in develop --- internal/scripts/installation/config/install_met_env.generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic index b38ef86737..a491429c3b 100644 --- a/internal/scripts/installation/config/install_met_env.generic +++ b/internal/scripts/installation/config/install_met_env.generic @@ -18,7 +18,7 @@ export MET_SUBDIR=${TEST_BASE} # Required # The name of the met tarbal usually downloaded with version from dtcenter.org and includes a version # example - v11.1.0.tar.gz -export MET_TARBALL=v11.1.0.tar.gz +export MET_TARBALL=v12.0.0.tar.gz # Required # Specifiy if machine useds modules for loading software From 8b9090af93fbddc6091fe70d05a35f0e3527cf49 Mon Sep 17 00:00:00 2001 From: j-opatz <59586397+j-opatz@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:25:18 -0600 Subject: [PATCH 4/7] corrected spelling --- internal/scripts/installation/config/install_met_env.generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic index a491429c3b..9b1117eaba 100644 --- a/internal/scripts/installation/config/install_met_env.generic +++ b/internal/scripts/installation/config/install_met_env.generic @@ -21,7 +21,7 @@ export MET_SUBDIR=${TEST_BASE} export MET_TARBALL=v12.0.0.tar.gz # Required -# Specifiy if machine useds modules for loading software +# Specify if machine useds modules for loading software export USE_MODULES=FALSE # Root directory of your python install, containing the bin, include, lib, and share directories From 31e24cd17aa1cea5b256483d55f576b76910477b Mon Sep 17 00:00:00 2001 From: j-opatz <59586397+j-opatz@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:35:16 -0600 Subject: [PATCH 5/7] Updated instructions, changed tense of wording --- .../scripts/installation/config/install_met_env.generic | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic index 9b1117eaba..83df5a11ef 100644 --- a/internal/scripts/installation/config/install_met_env.generic +++ b/internal/scripts/installation/config/install_met_env.generic @@ -38,7 +38,7 @@ export MET_PYTHON_CC=`python3-config --cflags` # cores to use (as an integer) or to simply "-j" to use all available cores. export MAKE_ARGS=-j -# If you've already use the script to compiled these libaries and don't need to +# If you've already used the script to compile these libaries and don't need to # compile them again, please comment out the export statements with a "#" symbol # in front. If you have these installed in a location other than ${EXTERNAL_LIBS}, # you can provide the appropriate path below and uncomment the line. @@ -56,10 +56,10 @@ export MAKE_ARGS=-j #export MET_NETCDF=${EXTERNAL_LIBS} # The optional libraries HDF4, HDFEOS, FREETYPE, and CAIRO are used for the -# following, not widely used tools, MODIS-Regrid, lidar2nc, and MODE Graphics. +# following, not widely used tools: MODIS-Regrid, lidar2nc, and MODE Graphics. # To enable the compilation of these libraries, set the compilation flags for # the library (e.g. COMPILE_HDF, COMPILE_HDFEOS, COMPILE_CAIRO, # COMPILE_FREETYPE) to any value in the environment config file. If these # libraries have already been installed and don't need to be reinstalled, set # MET_HDF, MET_HDFEOS, MET_FREETYPEINC, MET_FREETYPELIB, MET_CAIROINC, -# and MET_CAIROLIB +# and MET_CAIROLIB to their installed locations From 5a64e270fdfab10a8b344503cae1159e7da19b04 Mon Sep 17 00:00:00 2001 From: jprestop Date: Tue, 22 Aug 2023 16:43:57 -0600 Subject: [PATCH 6/7] Adding period --- internal/scripts/installation/config/install_met_env.generic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic index 83df5a11ef..0789e8fa3e 100644 --- a/internal/scripts/installation/config/install_met_env.generic +++ b/internal/scripts/installation/config/install_met_env.generic @@ -62,4 +62,4 @@ export MAKE_ARGS=-j # COMPILE_FREETYPE) to any value in the environment config file. If these # libraries have already been installed and don't need to be reinstalled, set # MET_HDF, MET_HDFEOS, MET_FREETYPEINC, MET_FREETYPELIB, MET_CAIROINC, -# and MET_CAIROLIB to their installed locations +# and MET_CAIROLIB to their installed locations. From 2f49945401f0c33a6bf74d1c6d73f415c1ecb72e Mon Sep 17 00:00:00 2001 From: jprestop Date: Wed, 23 Aug 2023 11:49:52 -0600 Subject: [PATCH 7/7] Reword information about the external libraries --- .../scripts/installation/config/install_met_env.generic | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic index 0789e8fa3e..5c6c5f42d0 100644 --- a/internal/scripts/installation/config/install_met_env.generic +++ b/internal/scripts/installation/config/install_met_env.generic @@ -38,10 +38,11 @@ export MET_PYTHON_CC=`python3-config --cflags` # cores to use (as an integer) or to simply "-j" to use all available cores. export MAKE_ARGS=-j -# If you've already used the script to compile these libaries and don't need to -# compile them again, please comment out the export statements with a "#" symbol -# in front. If you have these installed in a location other than ${EXTERNAL_LIBS}, -# you can provide the appropriate path below and uncomment the line. +# If users have already installed these libraries and would like to make use of +# them, uncomment out the export statements. If those pre-existing libraries are +# in the external_libs directory, no further edits are needed; however, users +# that have the pre-existing libraries not in the external_libs directory will +# need to update the paths to the appropriate location. #export EXTERNAL_LIBS=${TEST_BASE}/external_libs #export MET_GSL=${EXTERNAL_LIBS} #export MET_BUFRLIB=${EXTERNAL_LIBS}/lib