Changeset 1471 for trunk

Timestamp:

10/18/18 16:45:26 (5 years ago)

Author:

mafoipsl

Message:

MAF+AC+AC : simplification of ins_job on Irene. xlarge or standard is proposed only if the project has xlarge hours.

File:

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

trunk/libIGCM/ins_job

@@ -25 +25 @@
 Usage :
   ${b_n} [-h] [-v] [-e] 
-  or on curie/TGCC :
-  ${b_n} [-h] [-v] [-e] [-p project] [-c number of cores]
   or on irene/TGCC :
-  ${b_n} [-h] [-v] [-e] [-p project] [-s post-project] [-q type_of_node] [-c number of cores]
+  ${b_n} [-h] [-v] [-e] [-p project] [-q type_of_node] [-c number of cores]
   or on ada /IDRIS
   ${b_n} [-h] [-v] [-e] [-m MPI environment]
@@ -38 +36 @@
 on irene only : 
   -p project          : add default project on irene
-  -s post-project     : add default project use for post-processing on irene
   -q type_of_node     : add default type of nodes for postprocessing on irene skylake/xlarge 
   -c number of cores  : add default number of cores for postprocessing on irene 1-112
@@ -84 +81 @@
 x_p=false;
 x_q=false;
-x_s=false;
 x_c=false;
 x_m=false;
@@ -95 +91 @@
   (p)  x_p=true
        ProjectID=${OPTARG} ;;
-  (s)  x_s=true
-       PostID=${OPTARG} ;;
   (q)  x_q=true
        ProjectNode=${OPTARG} ;;
@@ -172 +166 @@
   #- set ProjectID if required
   if ( ! ${x_p} ) ; then
+    print - "Wait for the next question ..."
     #- default ProjectID
     ProjectID=$( ccc_myproject | grep -i irene |grep -i skylake | gawk '{ if ( $3 ~ /^project$/ && $4 !~ /^tgcc/ ) { print $4 } }' | sort -u | grep -v gencmip6 | head -n 1 )
-    ProjectID=${ProjectID:="gch0316"}
     answer=""
-    print - "Wait for the next question ..."
     print - "Hit Enter or give project ID (default is ${ProjectID}), possible projects are $( echo $( ccc_myproject | grep -i irene | grep -i skylake | gawk '{ if ( $3 ~ /^project$/ && $4 !~ /^tgcc/ ) { print $4 } }' | grep -v gencmip6 | sort -u ) ) or other xxxcmip6 : $(for i in $(groups) ; do echo $i|grep -v gencmip6|grep .cmip6 1>/dev/null 2>&1 && echo -n $i " " ; done ; echo ) "
     read answer
@@ -193 +186 @@
      #- default ProjectNode 
      ProjectNode="xlarge"
-     answerOK=false 
+     #- is xlarge possible for ${ProjectID} ?
+     echo $(ccc_myproject | grep -i irene | grep -i xlarge | gawk '{ if ( $3 ~ /^project$/ && $4 !~ /^tgcc/ ) { print $4 } }' | grep -v gencmip6 | sort -u) $(for i in $(groups) ; do echo $i|grep -v gencmip6|grep .cmip6 1>/dev/null 2>&1 && echo -n $i " " ; done ) | grep ${ProjectID} >/dev/null 2>&1  || ProjectNode="skylake"
+
+     if [ "X${ProjectNode}" == "Xxlarge" ] ; then
+       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 \"skylake\" or \"xlarge\" : " 
-       read answer 
-       [ "X${answer}" == "X" ] || [ "X${answer}" == "Xskylake" ] || [ "X${answer}" == "Xxlarge" ] && answerOK=true 
-     done 
+       while ( ! ${answerOK} ) ; do 
+         answer="" 
+         print - "Hit Enter or give TYPE OF NODE required for post-processing (default is \"${ProjectNode}\"), possible types of nodes are \"skylake\" or \"xlarge\" : " 
+         read answer 
+         [ "X${answer}" == "X" ] || [ "X${answer}" == "Xskylake" ] || [ "X${answer}" == "Xxlarge" ] && answerOK=true 
+       done 
   
-     if [ "X${answer}" != "X" ] ; then 
-       ProjectNode=${answer} 
-     fi 
+       if [ "X${answer}" != "X" ] ; then 
+         ProjectNode=${answer} 
+       fi 
+
+     else
+       print - "PostProcessing will be done on ${ProjectNode}"
+     fi
   
   fi # if ( ! ${x_q} ) 
@@ -223 +224 @@
     while ( ! ${answerOK} ) ; do
       answer=""
+      print - "possible numbers of cores are \"1\" to \"${ProjectCoreMax}\" for ${ProjectNode} : "
       print - "Hit Enter or give NUMBER OF CORES required for post-processing (default is \"${ProjectCore}\")"
-      print - "possible numbers of cores are \"1\" to \"${ProjectCoreMax}\" for ${ProjectNode} : "
       read answer
       [ "X${answer}" == "X" ] || [ ${answer} -ge 1 -a ${answer} -le ${ProjectCoreMax} ] && answerOK=true
@@ -237 +238 @@
   echo ProjectCore for post-processing is ${ProjectCore}
   #- ProjectCore is set (option or answer)
-
-  #- ProjetCore is known (option or answer) set PostID : project ID for post-processing
-
-  if ( ! ${x_s} ) ; then
-    #- ProjetCore is known (option or answer) set PostID : project ID for post-processing
-    PostID=$( ccc_myproject | grep -i irene | grep -i ${ProjectNode} | gawk '{ if ( $3 ~ /^project$/ && $4 !~ /^tgcc/ ) { print $4 } }' | sort -u | grep -v gencmip6 | head -n 1 )
-    PostID=${PostID:="${ProjectID}"}
-    answer=""
-    print - "Wait for the next question ..."
-    print - "Hit Enter or give project ID (default is ${PostID}), possible projects are $( echo $( ccc_myproject | grep -i irene | grep -i ${ProjectNode} | gawk '{ if ( $3 ~ /^project$/ && $4 !~ /^tgcc/ ) { print $4 } }' | grep -v gencmip6 | sort -u ) ) or other xxxcmip6 : $(for i in $(groups) ; do echo $i|grep -v gencmip6|grep .cmip6 1>/dev/null 2>&1 && echo -n $i " " ; done ; echo ) "
-    read answer
-
-    if [ "X${answer}" != "X" ] ; then
-      PostID=${answer}
-    fi
-
-  fi # if ( ! ${x_p} )
-
-  echo  PostID is ${PostID} at Irene on ${ProjectNode} for post-processing
 
 elif [ X"${SYSTEM}" == "Xada" ] ; then
@@ -456 +438 @@
       -e "s/::default_core::/${ProjectCore}/" \
       -e "s/::default_project::/${ProjectID}/" \
-      -e "s/::default_post_project::/${PostID}/" \
+      -e "s/::default_post_project::/${ProjectID}/" \
       ${i} > ${j}'/'${n_f}
   chmod u+x ${j}'/'${n_f}