Changeset 1303 for trunk/libIGCM/ins_job

Timestamp:

03/16/16 17:02:22 (8 years ago)

Author:

mafoipsl

Message:

For curie, force node used in post-processing jobs to standard and delete related questions.

File:

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

trunk/libIGCM/ins_job

@@ -26 +26 @@
   ${b_n} [-h] [-v] [-e] 
   or on curie/TGCC :
-  ${b_n} [-h] [-v] [-e] [-p project] [-q type_of_node] [-c number of cores]
+  ${b_n} [-h] [-v] [-e] [-p project] [-c number of cores]
 
 Options :
@@ -34 +34 @@
 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
 "
@@ -84 +83 @@
   (p)  x_p=true
        ProjectID=${OPTARG} ;;
-  (q)  x_q=true
-       ProjectNode=${OPTARG} ;;
   (c)  x_c=true
        ProjectCore=${OPTARG} ;;
@@ -148 +145 @@
 #-
 # Define Project parameters to set up jobs header for Curie (TGCC)
-# on curie define ProjectID, ProjectNode and ProjectCore : option or answer
+# on curie define ProjectID  and ProjectCore : option or answer
+# on curie ProjectNode forced to standard since 16/3/2016
 #-
 
@@ -163 +161 @@
     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"
-    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"
+
+  #- ProjectNode forced to standard since 16/3/2016
+  ProjectNode="standard"
+
+  echo  ProjectID is ${ProjectID} and ProjectNode for PostProcessing is ${ProjectNode}
+
+  #- ProjectNode is known (standard since 16/3/2016) set ProjectCoreMax
+  ProjectCoreMax="16"
 
   if ( ! ${x_c} ) ; then
-    #- ProjectNode is known (option or answer), set ProjectCore
-    [ "${ProjectNode}" = "xlarge" ] && ProjectCore="8" || ProjectCore="4"
+    #- ProjectNode is known (standard since 16/3/2016), set ProjectCore to default or answer
+    ProjectCore="4"
     answerOK=false
 
@@ -202 +185 @@
       ProjectCore=${answer}
     fi
+
   fi # if ( ! ${x_c} )
+
   echo ProjectCore is ${ProjectCore}
-#- ProjectCore is set (option or answer)
-# let check minimum/maximum value 1/${ProjectCoreMax}
+  #- ProjectCore is set (option or answer)
 
 else