Changeset 1391 for trunk/libIGCM

Timestamp:

06/08/17 14:41:13 (7 years ago)

Author:

jgipsl

Message:

Change and add some echo.

Location:

trunk/libIGCM

Files:

• ins_job (modified) (1 diff)
• libIGCM_sys/libIGCM_sys.ksh (modified) (1 diff)

trunk/libIGCM/ins_job

@@ -218 +218 @@
   fi # if ( ! ${x_pm} )
   echo MPIEnvironment is ${MPIEnvironment}
-else
-  echo No option for Header regarding ProjectID, ProjectNode, ProjectCore or MPIEnvironment because we are not on curie or ada
+elif [ X"${SYSTEM}" == "Xlxiv8" ] || [ X"${SYSTEM}" == "Xifort_CICLAD" ] ; then
+  # obelix, ciclad, climserv
+  echo ""
+  echo "You need to check and maybe adapt headers in the main job especially the line: "
+  echo "  #PBS -l nodes=x:ppn=y "
+  echo "where x is the number of nodes, y the number of cores per node and x*y is the total number of cores for the job. "
+  echo "y must not be bigger than the maximum numer of cores per node on the machine (often 8 or 16)."
 fi # if [ X"${SYSTEM}" == "Xcurie" ]
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -52 +52 @@
 case $( hostname -s ) in
     ada*)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source ada Intel X-64 lib."
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for ada Intel X-64."
         CENTER=IDRIS
         SYSTEM=ada
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_ada.ksh;;
     curie*)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source curie Intel X-64 lib."
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for curie Intel X-64."
         CENTER=TGCC
         SYSTEM=curie
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_curie.ksh;;
     airain*)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source airain Intel X-64 lib."
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for airain Intel X-64."
         CENTER=TGCC
         SYSTEM=curie
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_curie.ksh;;
     asterix*|obelix*)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source obelix or asterix lib."
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for obelix or asterix."
         CENTER=LSCE
         SYSTEM=lxiv8
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_obelix.ksh;;
     ciclad*)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source ciclad lib for running at ciclad."
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for ciclad for running at ciclad."
         CENTER=IPSL-ciclad
         SYSTEM=ifort_CICLAD
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_ciclad.ksh;;
     camelot*|loholt1*|loholt2*|merlin*)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source ciclad lib for running at climserv."
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for ciclad for running at climserv."
         CENTER=IPSL-climserv
         SYSTEM=ifort_CICLAD
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_ciclad.ksh;;
     iitm*)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source iitm lib."
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for iitm."
         CENTER=IITM
         SYSTEM=iitm
         . ${libIGCM}/libIGCM_sys/libIGCM_sys_iitm.ksh;;
     *)
-        [ ! X${TaskType} = Xchecking ] && echo "sys source default lib."
+        [ ! X${TaskType} = Xchecking ] && echo "Source machine dependent settings for a default machine."
         CENTER=DEFAULT
         SYSTEM=default