From 46fa764f8d6718729024c07d5e8a694c4c56647f Mon Sep 17 00:00:00 2001 From: Joseph McClenaghan Date: Mon, 29 Apr 2024 18:29:14 -0400 Subject: [PATCH 1/2] fix PPPL_PORTAL qsub file --- platform/qsub/qsub.PPPL_PORTAL | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/qsub/qsub.PPPL_PORTAL b/platform/qsub/qsub.PPPL_PORTAL index a47805fc5..e1596a013 100755 --- a/platform/qsub/qsub.PPPL_PORTAL +++ b/platform/qsub/qsub.PPPL_PORTAL @@ -7,10 +7,11 @@ echo "#SBATCH -e $SIMDIR/batch.err" >> $bfile echo "#SBATCH -t $WALLTIME" >> $bfile echo "#SBATCH -n $cores_used" >> $bfile -if [ -n $MEMPERNODE ] +if [ -n "$MEMPERNODE" ] +then + echo "#SBATCH --mem $MEMPERNODE" >> $bfile +elif [ -n "$MEMPERCPU" ] then - echo "#SBATCH --mem $MEMNODE" >> $bfile -elif [ -n $MEMPERCPU ] echo "#SBATCH --mem-per-cpu $MEMPERCPU" >> $bfile else echo "#SBATCH --mem-per-cpu 4GB" >> $bfile From f1cca1585e0c167f56d1efd0a8805006d4ab21e0 Mon Sep 17 00:00:00 2001 From: Will DeShazer Date: Mon, 29 Apr 2024 18:35:45 -0700 Subject: [PATCH 2/2] Update qsub.OMEGA Bugfix: MEMNODE was changed to MEMPERNODE --- platform/qsub/qsub.OMEGA | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/qsub/qsub.OMEGA b/platform/qsub/qsub.OMEGA index 4a8cca730..d2f058acb 100644 --- a/platform/qsub/qsub.OMEGA +++ b/platform/qsub/qsub.OMEGA @@ -7,10 +7,10 @@ echo "#SBATCH -e $SIMDIR/batch.err" >> $bfile echo "#SBATCH -t $WALLTIME" >> $bfile echo "#SBATCH -n $cores_used" >> $bfile -if [ -n $MEMPERNODE ] +if [ -n "$MEMPERNODE" ] then - echo "#SBATCH --mem $MEMNODE" >> $bfile -elif [ -n $MEMPERCPU ] + echo "#SBATCH --mem $MEMPERNODE" >> $bfile +elif [ -n "$MEMPERCPU" ] echo "#SBATCH --mem-per-cpu $MEMPERCPU" >> $bfile else echo "#SBATCH --mem-per-cpu 16GB" >> $bfile