From c327f5e688777c1fc87999817ec034d809143ca5 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Wed, 22 May 2024 11:11:29 -0400 Subject: [PATCH] Updates for non-Baselibs runs --- gcm_archive.j | 5 ++++- gcm_forecast.tmpl | 7 +++++-- gcm_moveplot.j | 5 ++++- gcm_plot.tmpl | 5 ++++- gcm_post.j | 5 ++++- gcm_quickstat.j | 5 ++++- gcm_regress.j | 6 +++++- gcm_run.j | 6 +++++- gcm_run_benchmark.j | 6 +++++- scm_run.j | 6 +++++- 10 files changed, 45 insertions(+), 11 deletions(-) diff --git a/gcm_archive.j b/gcm_archive.j index ae169c34..a4a8ffcb 100644 --- a/gcm_archive.j +++ b/gcm_archive.j @@ -33,7 +33,10 @@ setenv SITE @SITE setenv GEOSBIN @GEOSBIN source $GEOSBIN/g5_modules -setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH} +if ( $?BASEDIR ) then + setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib +endif ####################################################################### # Archive Commands diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl index 4027063a..fd958308 100755 --- a/gcm_forecast.tmpl +++ b/gcm_forecast.tmpl @@ -31,8 +31,11 @@ setenv GEOSBIN @GEOSBIN setenv GEOSETC @GEOSETC setenv GEOSUTIL @GEOSSRC -@NATIVE_BUILD source $GEOSBIN/g5_modules -@NATIVE_BUILD setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib +source $GEOSBIN/g5_modules +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib +if ( $?BASEDIR ) then + setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib +endif setenv RUN_CMD "@RUN_CMD" diff --git a/gcm_moveplot.j b/gcm_moveplot.j index 271c9132..cfe19f21 100755 --- a/gcm_moveplot.j +++ b/gcm_moveplot.j @@ -34,7 +34,10 @@ setenv GEOSBIN @GEOSBIN setenv GEOSUTIL @GEOSSRC source $GEOSBIN/g5_modules -setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH} +if ( $?BASEDIR ) then + setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib +endif ####################################################################### # Experiment Specific Environment Variables diff --git a/gcm_plot.tmpl b/gcm_plot.tmpl index b02b92b4..e202c413 100755 --- a/gcm_plot.tmpl +++ b/gcm_plot.tmpl @@ -34,7 +34,10 @@ setenv GEOSBIN @GEOSBIN setenv GEOSUTIL @GEOSSRC source $GEOSBIN/g5_modules -setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH} +if ( $?BASEDIR ) then + setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib +endif ####################################################################### # Experiment Specific Environment Variables diff --git a/gcm_post.j b/gcm_post.j index 880a3d9d..7cc0be91 100755 --- a/gcm_post.j +++ b/gcm_post.j @@ -36,7 +36,10 @@ setenv GEOSUTIL @GEOSSRC setenv BATCHNAME "@POST_N" source $GEOSBIN/g5_modules -setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH} +if ( $?BASEDIR ) then + setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib +endif if( $?SLURM_NTASKS ) then setenv RUN_CMD "@RUN_CMD" diff --git a/gcm_quickstat.j b/gcm_quickstat.j index 5252044f..b1f355f9 100755 --- a/gcm_quickstat.j +++ b/gcm_quickstat.j @@ -29,7 +29,10 @@ setenv GEOSBIN @GEOSBIN setenv GEOSUTIL @GEOSSRC source $GEOSBIN/g5_modules -setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH} +if ( $?BASEDIR ) then + setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib +endif ####################################################################### # Quickstat Commands diff --git a/gcm_regress.j b/gcm_regress.j index 47ec9cb3..ee8a6c4f 100755 --- a/gcm_regress.j +++ b/gcm_regress.j @@ -90,7 +90,11 @@ setenv GEOSDIR @GEOSDIR setenv GEOSBIN @GEOSBIN source $GEOSBIN/g5_modules -setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib +# 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 +endif setenv RUN_CMD "@RUN_CMD" diff --git a/gcm_run.j b/gcm_run.j index 7a5dfc82..d7946e8d 100755 --- a/gcm_run.j +++ b/gcm_run.j @@ -33,7 +33,11 @@ setenv GEOSETC @GEOSETC setenv GEOSUTIL @GEOSSRC source $GEOSBIN/g5_modules -setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib +# 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 +endif setenv RUN_CMD "@RUN_CMD" diff --git a/gcm_run_benchmark.j b/gcm_run_benchmark.j index 3cf3a228..64321eda 100755 --- a/gcm_run_benchmark.j +++ b/gcm_run_benchmark.j @@ -33,7 +33,11 @@ setenv GEOSETC @GEOSETC setenv GEOSUTIL @GEOSSRC source $GEOSBIN/g5_modules -setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib +# 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 +endif setenv RUN_CMD "@RUN_CMD" diff --git a/scm_run.j b/scm_run.j index 531a9be7..dc185f7d 100755 --- a/scm_run.j +++ b/scm_run.j @@ -15,7 +15,11 @@ setenv GEOSETC @INSTALLDIR/etc setenv GEOSUTIL @INSTALLDIR source $GEOSBIN/g5_modules -setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib +setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib +# 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 +endif setenv RUN_CMD "$GEOSBIN/esma_mpirun -np "