Changeset 7685

Timestamp:

2017-02-15T17:24:10+01:00 (7 years ago)

Author:

timgraham

Message:

Added option to specify required memory for jobs submitted to a compute node

Location:

branches/UKMO/dev_r7681_rebuild_nemo/NEMOGCM/TOOLS/REBUILD_NEMO

Files:

• BATCH_TEMPLATES/rebuild_nemo_batch_PW7_METO (modified) (1 diff)
• BATCH_TEMPLATES/rebuild_nemo_batch_XC40_METO (modified) (1 diff)
• rebuild_nemo (modified) (5 diffs)

branches/UKMO/dev_r7681_rebuild_nemo/NEMOGCM/TOOLS/REBUILD_NEMO/BATCH_TEMPLATES/rebuild_nemo_batch_PW7_METO

@@ -8 +8 @@
 #@ error           = $(job_name).$(jobid).out
 #@ notification    = never
-#@ resources       = ConsumableMemory(48gb)
+#@ resources       = ConsumableMemory(MEMORY)
 #@ node            = 1
 #@ parallel_threads = 8

branches/UKMO/dev_r7681_rebuild_nemo/NEMOGCM/TOOLS/REBUILD_NEMO/BATCH_TEMPLATES/rebuild_nemo_batch_XC40_METO

@@ -3 +3 @@
 #PBS -q shared
 #PBS -l ncpus=NTHREADS
+#PBS -l mem=MEMORY
 #PBS -l walltime=1:0:0
 

branches/UKMO/dev_r7681_rebuild_nemo/NEMOGCM/TOOLS/REBUILD_NEMO/rebuild_nemo

@@ -18 +18 @@
    echo "            -d deflate_level   deflate level for output files (key_netcdf4 only)"
    echo "            -n namelist        full path to namelist file to be created (otherwise default nam_rebuild+_process_id is used)"
+   echo "            -r memory          Memory to request on compute node including units (Default = 10Gb)"
    echo
    exit 1
 }
 
-while getopts c:n:t:d:lm opt
+while getopts c:n:t:d:r:lm opt
 do
   case ${opt} in
@@ -39 +40 @@
       m) 
          NMASK="TRUE"
+         echo "mask"
       ;;
       d)
@@ -45 +47 @@
       n)
          nam_rebuild=${OPTARG}
+      ;;
+      r)
+         MEMORY=${OPTARG}
       ;;
   esac
@@ -62 +67 @@
 export OMP_NUM_THREADS=${OMP_NUM_THREADS:-1}
 nam_rebuild=${nam_rebuild:-nam_rebuild_$$}
+MEMORY=${MEMORY:-10Gb}
 
 if [[ -n ${DIM1} && -n ${DIM2} ]] ; then
@@ -96 +102 @@
    #The process ID is appended to the end of the file name so it is unique
    cat ${script_dir}/BATCH_TEMPLATES/${batch_file} | sed -e"s/NTHREADS/${OMP_NUM_THREADS}/" \
+      -e"s/MEMORY/${MEMORY}/" \
       -e"s:INDIR:${script_dir}:" \
       -e"s/NAMELIST/${nam_rebuild}/" > ${batch_file}_$$.sh