Changeset 1274 for trunk/libIGCM/ins_job

Timestamp:

11/24/15 16:36:27 (9 years ago)

Author:

mafoipsl

Message:

For curie :

• Add a new option in AA_post_jobs header on curie : "-c ::default_core::" with the number of core reserved.
• Add 3 options to ins_job :
  • -p projet
  • -q standard/xlarge : with xlarge as default value. except for gencmip6 project
  • -c number of cores (default value is : 4 on standard node or 8 on xlarge node)
• For batch usage, it's possible to set these options on ins_job command line. See Usage.
• By default, 3 questions are asked interactively to the user.

With 4 or 8 cores per job we want to limit the number of simultaneous running jobs on one node
and eventually limit SCRATCH congestion.

File:

• trunk/libIGCM/ins_job (modified) (6 diffs)

trunk/libIGCM/ins_job

@@ -24 +24 @@
 
 Usage :
-  ${b_n} [-h] [-v] [-e] [-p project]
+  ${b_n} [-h] [-v] [-e] 
+  or on curie/TGCC :
+  ${b_n} [-h] [-v] [-e] [-p project] [-q type_of_node] [-c number of cores]
 
 Options :
-  -h          : help
-  -v          : verbose mode
-  -e          : turn on ensemble mode (hindcast/forecast or date restart)
-  -p project  : add default project on curie
+  -h                  : help
+  -v                  : verbose mode
+  -e                  : turn on ensemble mode (hindcast/forecast or date restart)
+on curie only : 
+  -p project          : add default project on curie
+  -q type_of_node     : add default type of nodes for postprocessing on curie standard/xlarge
+  -c number of cores  : add default number of cores for postprocessing on curie 1-16 or 1-128
 "
 }
@@ -70 +75 @@
 x_e=false;
 x_p=false;
-while getopts :hvep: V ; do
+x_q=false;
+x_c=false;
+while getopts :hvec:p:q: V ; do
   case $V in
   (h)  ins_job_Usage; exit 0;;
@@ -77 +84 @@
   (p)  x_p=true
        ProjectID=${OPTARG} ;;
+  (q)  x_q=true
+       ProjectNode=${OPTARG} ;;
+  (c)  x_c=true
+       ProjectCore=${OPTARG} ;;
   (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
        exit 2;;
@@ -136 +147 @@
 
 #-
-# Define Project ID to set up jobs header for Curie (TGCC)
-#-
-if ( ! ${x_p} ) ; then
-  if [ X"${SYSTEM}" == "Xcurie" ] ; then
+# Define Project parameters to set up jobs header for Curie (TGCC)
+# on curie define ProjectID, ProjectNode and ProjectCore : option or answer
+#-
+
+if [ X"${SYSTEM}" == "Xcurie" ] ; then
+  if ( ! ${x_p} ) ; then
     ProjectID=$( ccc_myproject | gawk '{ if ( $3 ~ /^project$/ && $4 !~ /^tgcc/ ) { print $4 } }' | head -n 1 )
-    ProjectID=${ProjectID:="gen2211"}
+    ProjectID=${ProjectID:="gencmip6"}
     answer=""
     print - "Hit Enter or give project ID (default is ${ProjectID}), possible projects are $( echo $( ccc_myproject | gawk '{ if ( $3 ~ /^project$/ && $4 !~ /^tgcc/ ) { print $4 } }' | sort -u ) ) :"
@@ -149 +162 @@
       ProjectID=${answer}
     fi
+  fi # if ( ! ${x_p} )
+  echo  ProjectID is ${ProjectID}
+
+  if ( ! ${x_q} ) ; then
+    #- ProjectID is known (option or answer), set ProjectNode
     [ "${ProjectID}" = "gencmip6" ] && ProjectNode="standard" || ProjectNode="xlarge"
-  fi
+    answerOK=false
+
+    while ( ! ${answerOK} ) ; do
+      answer=""
+      print - "Hit Enter or give TYPE OF NODE required for post-processing (default is \"${ProjectNode}\"), possible types of nodes are \"standard\" or \"xlarge\" : "
+      read answer
+      [ "X${answer}" == "X" ] || [ "X${answer}" == "Xstandard" ] || [ "X${answer}" == "Xxlarge" ] && answerOK=true
+    done
+
+    if [ "X${answer}" != "X" ] ; then
+      ProjectNode=${answer}
+    fi
+
+  fi # if ( ! ${x_q} )
+  echo ProjectNode is ${ProjectNode}
+
+  #- ProjectNode is known (option or answer) set ProjectCoreMax
+  [ "${ProjectNode}" = "xlarge" ] && ProjectCoreMax="128" || ProjectCoreMax="16"
+
+  if ( ! ${x_c} ) ; then
+    #- ProjectNode is known (option or answer), set ProjectCore
+    [ "${ProjectNode}" = "xlarge" ] && ProjectCore="8" || ProjectCore="4"
+    answerOK=false
+
+    while ( ! ${answerOK} ) ; do
+      answer=""
+      print - "Hit Enter or give NUMBER OF CORES required for post-processing (default is \"${ProjectCore}\"), possible numbers of cores are \"1\" to \"${ProjectCoreMax}\" : "
+      read answer
+      [ "X${answer}" == "X" ] || [ ${answer} -ge 1 -a ${answer} -le ${ProjectCoreMax} ] && answerOK=true
+    done
+
+    if [ "X${answer}" != "X" ] ; then
+      ProjectCore=${answer}
+    fi
+  fi # if ( ! ${x_c} )
+  echo ProjectCore is ${ProjectCore}
+#- ProjectCore is set (option or answer)
+# let check minimum/maximum value 1/${ProjectCoreMax}
+
 else
-  if [ X"${SYSTEM}" != "Xcurie" ] ; then
-    print - "\nOption -p invalid with this host (${SYSTEM}): it will be ignored" 1>&2;
-  fi
-fi
+  echo No option for Header regarding ProjectID, ProjectNode and ProjectCore because we are not on curie
+fi # if [ X"${SYSTEM}" == "Xcurie" ]
 
 #-
@@ -326 +380 @@
       -e "/^${W_P}/d"       \
       -e "s/::default_node::/${ProjectNode}/" \
+      -e "s/::default_core::/${ProjectCore}/" \
       -e "s/::default_project::/${ProjectID}/" \
       ${i} > ${j}'/'${n_f}