From a65edcf55ef6c083b6ef89cefa59ed821d76225d Mon Sep 17 00:00:00 2001
From: Julie Prestopnik <jpresto@ucar.edu>
Date: Mon, 25 Sep 2023 13:24:50 -0600
Subject: [PATCH] Update install_met_env.generic

---
 .../config/install_met_env.generic            | 91 ++++++++++---------
 1 file changed, 49 insertions(+), 42 deletions(-)

diff --git a/internal/scripts/installation/config/install_met_env.generic b/internal/scripts/installation/config/install_met_env.generic
index f2ef8ccc3e..4fc616dd51 100644
--- a/internal/scripts/installation/config/install_met_env.generic
+++ b/internal/scripts/installation/config/install_met_env.generic
@@ -1,59 +1,66 @@
-#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
+# Specify 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 --embed`
 
-#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
-
-#General CFLAGS
-export CFLAGS="-Wall -g"
-
-#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
+# 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
+#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_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
+#export MET_HDF5=${EXTERNAL_LIBS}
+#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.
+# 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 to their installed locations.