Merge pull request #816 from GEOS-ESM/feature/v11-scm-setup-fix

v11: Fix for run scripts and spack

Author: sdrabenh

gcm_regress.j

@@ -90,7 +90,15 @@ setenv GEOSDIR @GEOSDIR
 setenv GEOSBIN @GEOSBIN
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib
+
+
+# We only prepend to DY/LD_LIBRARY_PATH if it exists
+if ( $?@LD_LIBRARY_PATH_CMD ) then
+   setenv @LD_LIBRARY_PATH_CMD "${@LD_LIBRARY_PATH_CMD}:${GEOSDIR}/lib"
+else
+   setenv @LD_LIBRARY_PATH_CMD "${GEOSDIR}/lib"
+endif
+
 # We only add BASEDIR to the @LD_LIBRARY_PATH_CMD if BASEDIR is defined (i.e., not running with Spack)
 if ( $?BASEDIR ) then
     setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib

gcm_run.j

@@ -33,7 +33,14 @@ setenv GEOSETC          @GEOSETC
 setenv GEOSUTIL         @GEOSSRC
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD "${LD_LIBRARY_PATH}:${GEOSDIR}/lib"
+
+# We only prepend to DY/LD_LIBRARY_PATH if it exists
+if ( $?@LD_LIBRARY_PATH_CMD ) then
+   setenv @LD_LIBRARY_PATH_CMD "${@LD_LIBRARY_PATH_CMD}:${GEOSDIR}/lib"
+else
+   setenv @LD_LIBRARY_PATH_CMD "${GEOSDIR}/lib"
+endif
+
 # We only add BASEDIR to the @LD_LIBRARY_PATH_CMD if BASEDIR is defined (i.e., not running with Spack)
 if ( $?BASEDIR ) then
     setenv @LD_LIBRARY_PATH_CMD "${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib"

scm_run.j

@@ -15,10 +15,16 @@ setenv GEOSETC          @INSTALLDIR/etc
 setenv GEOSUTIL         @INSTALLDIR
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD "${LD_LIBRARY_PATH}:${GEOSDIR}/lib"
+
+# We only prepend to DY/LD_LIBRARY_PATH if it exists
+if ( $?@LD_LIBRARY_PATH_CMD ) then
+   setenv @LD_LIBRARY_PATH_CMD "${@LD_LIBRARY_PATH_CMD}:${GEOSDIR}/lib"
+else
+   setenv @LD_LIBRARY_PATH_CMD "${GEOSDIR}/lib"
+endif
 # We only add BASEDIR to the @LD_LIBRARY_PATH_CMD if BASEDIR is defined (i.e., not running with Spack)
 if ( $?BASEDIR ) then
-    setenv @LD_LIBRARY_PATH_CMD "${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib"
+   setenv @LD_LIBRARY_PATH_CMD "${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib"
 endif
 
 setenv RUN_CMD "@RUN_CMD"