Changeset 616 for trunk/libIGCM/libIGCM_sys

Timestamp:

03/29/12 10:56:09 (12 years ago)

Author:

sdipsl

Message:

• Merge libIGCM_MPI_OpenMP branch within the trunk
• trunk will shortly be tagged libIGCM_2.0_beta

Location:

trunk/libIGCM/libIGCM_sys

Files:

• libIGCM_sys.ksh (modified) (1 diff)
• libIGCM_sys_mercure.ksh (modified) (2 diffs)
• libIGCM_sys_mercurex9.ksh (modified) (2 diffs)
• libIGCM_sys_titane.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys.ksh

@@ -34 +34 @@
     echo "===================================================="
 fi
+
+#====================================================
+#- set PackDefault false by default
+PackDefault=false 
 
 case $( hostname -s ) in

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh

@@ -135 +135 @@
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-#typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${CSCRATCHDIR}/TMPDIR_IGCM/${JOBID}}
 typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${TMPDIR}}
 
@@ -721 +720 @@
 #D-* Purpose: rm tmpdir (dummy function most of the time batch
 #D-                      scheduler will do the job)
+#D-           Dummy function on mercure front-end
 #D-* Examples:
 #D-
 function IGCM_sys_RmRunDir {
-  IGCM_debug_PushStack "IGCM_sys_RmRunDir" -- $@
-  if ( $DEBUG_sys ) ; then
-    echo "IGCM_sys_RmRunDir :" $@
-  fi
-
-  typeset RET
-
-  echo rm $@ > out_rsync 2>&1
-  \rm $@ >> out_rsync 2>&1
-  RET=$?
-
-  if [ ${RET} -gt 0 ] ; then
-    echo "IGCM_sys_RmRunDir : error."
-    cat out_rsync
-    IGCM_debug_Exit "IGCM_sys_RmRunDir"
-  else
-    \rm out_rsync
-  fi
-  IGCM_debug_PopStack "IGCM_sys_RmRunDir"
+    IGCM_debug_PushStack "IGCM_sys_RmRunDir" -- $@
+    if ( $DEBUG_sys ) ; then
+        echo "IGCM_sys_RmRunDir :" $@
+        echo "Dummy call, let the scheduler do that."
+    fi
+    IGCM_debug_PopStack "IGCM_sys_RmRunDir"
 }
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

@@ -170 +170 @@
 #- Max number of arguments passed to nco operator or demigration command
 UNIX_MAX_LIMIT=360
+
+#====================================================
+#- set PackDefault true on NEC SX9
+PackDefault=true
+
+#====================================================
+#- Default number of MPI task for IPSL coupled model
+#- required for backward compatibility
+#-
+DEFAULT_NUM_PROC_OCE=1
+DEFAULT_NUM_PROC_CPL=1
+(( DEFAULT_NUM_PROC_ATM = BATCH_NUM_PROC_TOT - 1 ))
+DEFAULT_NUM_PROC_TOTAL=${BATCH_NUM_PROC_TOT}
 
 #D-#==================================================
@@ -285 +298 @@
   Job ended   : ${DateEnd}
   Output files are available in ${R_SAVE}
+  Files to be rebuild are temporarily available in ${REBUILD_DIR}
+  Pre-packed files are temporarily available in ${R_BUFR}
   Script files, Script Outputs and Debug files (if necessary) are available in ${SUBMIT_DIR}
 END_MAIL

trunk/libIGCM/libIGCM_sys/libIGCM_sys_titane.ksh

@@ -188 +188 @@
 #- Max number of arguments passed to nco operator or demigration command
 UNIX_MAX_LIMIT=360
+
+#====================================================
+#- set PackDefault true on titane
+PackDefault=true
+
+NUM_COREPERNODE=8
+        
+#====================================================
+#- Default number of MPI task for IPSL coupled model
+#- required for backward compatibility
+#-
+DEFAULT_NUM_PROC_OCE=5
+DEFAULT_NUM_PROC_CPL=1
+DEFAULT_NUM_PROC_ATM=26
+DEFAULT_NUM_PROC_TOTAL=32
 
 #D-#==================================================
@@ -334 +349 @@
   Job ended   : ${DateEnd}
   Output files are available in ${R_SAVE}
+  Files to be rebuild are temporarily available in ${REBUILD_DIR}
+  Pre-packed files are temporarily available in ${R_BUFR}
   Script files, Script Outputs and Debug files (if necessary) are available in ${SUBMIT_DIR}
 END_MAIL