Changeset 1296 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

Timestamp:

03/11/16 12:15:32 (8 years ago)

Author:

sdipsl

Message:

• Bugfix on ciclad. MPMD was broken. SPMD hybrid MPI/OpenMP was partly broken.
• cleaning

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh (modified) (3 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -145 +145 @@
 #- set PackDefault to true on ada
 PackDefault=true
-
-#====================================================
-#- Number of core per node (max number of OpenMP task)
-NUM_COREPERNODE=8
 
 #====================================================
@@ -1255 +1251 @@
 #D-
 function IGCM_sys_ListJobInQueue {
-  IGCM_debug_PushStack "IGCM_sys_ListJobInQueue"
+  IGCM_debug   cat ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$
+    \rm ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$
+    IGCM_debug_PopStack "IGCM_sys_atlas"
+    return 1
+  else
+    IGCM_debug_PopStack "IGCM_sys_atlas"
+    return 0
+  fi
+
+  IGCM_debug_PopStack "IGCM_sys_atlas"
+}
+
+_PushStack "IGCM_sys_ListJobInQueue"
   if ( $DEBUG_sys ) ; then
     echo "IGCM_sys_ListJobInQueue"
@@ -1290 +1298 @@
   if [ ${status} -gt 0 ] ; then
     echo "IGCM_sys_atlas : error code ${status}"
-    cat ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$
-    \rm ${OUTCOMMAND_PATH}/out_command_${LOGIN}.$$
-    IGCM_debug_PopStack "IGCM_sys_atlas"
-    return 1
-  else
-    IGCM_debug_PopStack "IGCM_sys_atlas"
-    return 0
-  fi
-
-  IGCM_debug_PopStack "IGCM_sys_atlas"
-}
-
+