Changeset 1305 for trunk/libIGCM/ins_job

Timestamp:

03/22/16 17:24:25 (8 years ago)

Author:

aclsce

Message:

First implementation of Intel MPI environment for ADA-IDRIS machine (not fully validated, desactivated by default).

• insÃ_job : choice of MPI Enironment to use by answering a question or -m option (./ins_job -m Intel). Default is IBM Environment.
• libIGCM_sys_ada.ksh : added specific part for Intel Environment
  • mpirun command (instead of poe for IBM MPI)
  • build of new configuration "run_file"
  • specific header of the Job script -...

File:

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

trunk/libIGCM/ins_job

@@ -27 +27 @@
   or on curie/TGCC :
   ${b_n} [-h] [-v] [-e] [-p project] [-c number of cores]
-
+  or on ada /IDRIS
+  ${b_n} [-h] [-v] [-e] [-m MPI environment]
 Options :
   -h                  : help
@@ -35 +36 @@
   -p project          : add default project on curie
   -c number of cores  : add default number of cores for postprocessing on curie 1-16 or 1-128
+on ada only :
+  - m MPI environment : add default MPI environment (Intel MPI or IBM MPI)
 "
 }
@@ -74 +77 @@
 x_e=false;
 x_p=false;
-x_q=false;
 x_c=false;
-while getopts :hvec:p:q: V ; do
+x_m=false;
+while getopts :hvec:p:m: V ; do
   case $V in
   (h)  ins_job_Usage; exit 0;;
@@ -85 +88 @@
   (c)  x_c=true
        ProjectCore=${OPTARG} ;;
+  (m)  x_m=true
+       MPIEnvironment=${OPTARG} ;;
   (:)  echo ${b_n}" : -"${OPTARG}" option : missing value" 1>&2;
        exit 2;;
@@ -190 +195 @@
   echo ProjectCore is ${ProjectCore}
   #- ProjectCore is set (option or answer)
+# let check minimum/maximum value 1/${ProjectCoreMax}
+
+elif [ X"${SYSTEM}" == "Xada" ] ; then
+    if ( ! ${x_m} ) ; then
+        MPIEnvironment=IBM 
+#
+# Commented : waiting for full validation of Intel MPI Environment
+#       answerOK=false          
+#       while ( ! ${answerOK} ) ; do
+#           answer=""
+#           print - "Hit Enter or give MPI Environement (default is ${MPIEnvironment}), possible MPI environments are IBM (MPI IBM) and Intel (MPI Intel) :"
+#           read answer
+#           [ "X${answer}" == "X" ] || [ "X${answer}" == "XIBM" ] || [ "X${answer}" == "XIntel" ] && answerOK=true
+#       done
+
+#       if [ "X${answer}" != "X" ] ; then
+#           MPIEnvironment=${answer}
+#       fi
+    fi # if ( ! ${x_pm} )
+#  echo MPIEnvironment is ${MPIEnvironment}
 
 else
-  echo No option for Header regarding ProjectID, ProjectNode and ProjectCore because we are not on curie
+  echo No option for Header regarding ProjectID, ProjectNode, ProjectCore or MPIEnvironment because we are not on curie or ada
 fi # if [ X"${SYSTEM}" == "Xcurie" ]