Changeset 1536

Timestamp:

07/03/20 15:16:53 (4 years ago)

Author:

rpennel

Message:

Add possibility to specify wall time with ins_job

Location:

trunk/libIGCM

Files:

• AA_job (modified) (3 diffs)
• ins_job (modified) (7 diffs)

trunk/libIGCM/AA_job

@@ -36 +36 @@
 #-Q- irene #MSUB -x                    # exclusive node. To specify only for MPMD together with the one below
 #-Q- irene #MSUB -E '--cpu_bind=none'
-#-Q- irene #MSUB -T 86400              # Wall clock limit (seconds)
+#-Q- irene #MSUB -T ::WallTime::              # Wall clock limit (seconds)
 #-Q- irene #MSUB -A ::default_project::
 #-Q- irene #MSUB -q skylake
@@ -54 +54 @@
 #-Q- irene-amd #MSUB -c ::openMPthreads::  # Number of openMP threads. To specify only for SMPD
 #-Q- irene-amd #MSUB -x                    # exclusive node. To specify only for MPMD together with the one below
-#-Q- irene-amd #MSUB -T 86400              # Wall clock limit (seconds)
+#-Q- irene-amd #MSUB -T ::WallTime::              # Wall clock limit (seconds)
 #-Q- irene-amd #MSUB -A ::default_project::
 #-Q- irene-amd #MSUB -q rome
@@ -71 +71 @@
 #-Q- jeanzay #SBATCH --cpus-per-task=::openMPthreads::  # Number of openMP threads.
 #-Q- jeanzay #SBATCH --hint=nomultithread         # 1 processus MPI par par physical core (no hyperthreading) 
-#-Q- jeanzay #SBATCH --time=00:30:00              # Wall clock limit (seconds)
+#-Q- jeanzay #SBATCH --time=::WallTime::             # Wall clock limit (minutes)
 #-Q- jeanzay #SBATCH --account ::default_project::@cpu
 #-Q- jeanzay

trunk/libIGCM/ins_job

@@ -40 +40 @@
 on ada only :
   - m MPI environment : add default MPI environment (Intel MPI or IBM MPI)
+  -t wall time        : change default wall time
 "
 }
@@ -83 +84 @@
 x_c=false;
 x_m=false;
-while getopts :hvefc:p:m:q:s: V ; do
+x_t=false;
+while getopts :hvefc:p:m:q:s:t: V ; do
   case $V in
   (h)  ins_job_Usage; exit 0;;
@@ -97 +99 @@
   (m)  x_m=true
        MPIEnvironment=${OPTARG} ;;
+  (t)  x_t=true
+       WallTime=${OPTARG} ;;
   (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
        exit 2;;
@@ -239 +243 @@
   #- ProjectCore is set (option or answer)
 
+  #- set WallTime if required
+  if ( ! ${x_t} ) ; then
+    #- default WallTime 1800 s 
+    WallTime=1800
+    answer=""
+    print - "Hit Enter or give required wall time in seconds for computing job (default is \"${WallTime}\" seconds, maximum is 86400 seconds) "
+    read answer
+
+    if [ "X${answer}" != "X" ] ; then
+      WallTime=${answer}
+    fi
+
+  fi # if ( ! ${x_t} )
+   
+  echo Wall time limit is ${WallTime} minutes
+
 elif [ X"${SYSTEM}" == "Xirene-amd" ] ; then
 
@@ -315 +335 @@
   #- ProjectCore is set (option or answer)
 
+  #- set WallTime if required
+  if ( ! ${x_t} ) ; then
+    #- default WallTime 1800 s 
+    WallTime=1800
+    answer=""
+    print - "Hit Enter or give required wall time in seconds for computing job (default is \"${WallTime}\" seconds, maximum is 86400 seconds) "
+    read answer
+
+    if [ "X${answer}" != "X" ] ; then
+      WallTime=${answer}
+    fi
+
+  fi # if ( ! ${x_t} )
+   
+  echo Wall time limit is ${WallTime} minutes
+
 elif [ X"${SYSTEM}" == "Xjeanzay" ] ; then
 
@@ -332 +368 @@
   fi # if ( ! ${x_p} )
 
-  ProjectID=${ProjectID}
   echo  ProjectID is ${ProjectID} at Jean-Zay
+
+  #- set WallTime if required
+  if ( ! ${x_t} ) ; then
+    #- default WallTime 30 minutes
+    WallTime=30
+    answer=""
+    print - "Hit Enter or give required wall time in minutes for computing job (default is \"${WallTime}\" minutes, maximum is 1200 minutes) "
+    read answer
+
+    if [ "X${answer}" != "X" ] ; then
+      WallTime=${answer}
+    fi
+
+  fi # if ( ! ${x_t} )
+   
+  echo Wall time limit is ${WallTime} minutes
 
 elif [ X"${SYSTEM}" == "Xada" ] ; then
@@ -511 +562 @@
       -e "s/::Jobname::/${JobName}/" \
       -e "s/::default_project::/${ProjectID}/" \
+      -e "s/::WallTime::/${WallTime}/" \
       ${F_JOB} > ${j}'/'${n_f}
   chmod u+x ${j}'/'${n_f}