Changeset 725 for trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

Timestamp:

10/18/12 09:13:37 (12 years ago)

Author:

sdipsl

Message:

• prepare sys lib to be able to run/store on scratchdir when running TEST simulation
• bugfix : rebuild can't overwrite existing files neither write things in a tmp file before moving it to a final file. So we need to clean things up for him
• cosmetics

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh (modified) (6 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

@@ -128 +128 @@
 
 #====================================================
-#- ARCHIVE (dedicated to large files)
-typeset -r ARCHIVE=${CCCSTOREDIR}
-
-#- ARCHIVE (dedicated to small/medium files)
-typeset -r STORAGE=${CCCWORKDIR}
-
-#====================================================
 #- IN
 typeset -r R_IN=${R_IN:=/ccc/work/cont003/dsm/p86ipsl/IGCM}
@@ -140 +133 @@
 
 #====================================================
+#- ARCHIVE (dedicated to large files)
+typeset ARCHIVE=${CCCSTOREDIR}
+
+#====================================================
+#- STORAGE (dedicated to small/medium files)
+typeset STORAGE=${CCCWORKDIR}
+
+#====================================================
 #- R_OUT
-typeset -r R_OUT=${ARCHIVE}/IGCM_OUT
+typeset R_OUT=${ARCHIVE}/IGCM_OUT
 
 #====================================================
 #- R_FIG (hosting figures : monitoring and atlas, and/or small files)
-typeset -r R_FIG=${STORAGE}/IGCM_OUT
+typeset R_FIG=${STORAGE}/IGCM_OUT
 
 #====================================================
@@ -183 +184 @@
 (( DEFAULT_NUM_PROC_ATM = BATCH_NUM_PROC_TOT - 1 ))
 DEFAULT_NUM_PROC_TOTAL=${BATCH_NUM_PROC_TOT}
+
+#D-#==================================================
+#D-function IGCM_sys_ChangeArchive
+#D-* Purpose: if SpaceName=TEST everything is stored on SCRATCHDIR
+#D-* Examples:
+#D-
+function IGCM_sys_ChangeArchive {
+  IGCM_debug_PushStack "IGCM_sys_ChangeArchive"
+
+  ARCHIVE=${SCRATCHDIR}
+  STORAGE=${SCRATCHDIR}
+  R_OUT=${ARCHIVE}/IGCM_OUT
+  R_FIG=${STORAGE}/IGCM_OUT
+
+  IGCM_debug_Print 1 "ARCHIVE has been redefined = ${ARCHIVE}"
+  IGCM_debug_Print 1 "STORAGE has been redefined = ${STORAGE}"
+  IGCM_debug_Print 1 "R_OUT   has been redefined = ${R_OUT}"
+  IGCM_debug_Print 1 "R_FIG   has been redefined = ${R_FIG}"
+
+  IGCM_debug_PopStack "IGCM_sys_ChangeArchive"
+}
 
 #D-#==================================================
@@ -1567 +1589 @@
   fi
 
-  typeset NB_ESSAI DELAI status i
+  typeset NB_ESSAI DELAI status i lastArg
   # number of tentative
   NB_ESSAI=3
@@ -1582 +1604 @@
       \rm out_rsync
       IGCM_debug_Print 2 "IGCM_sys_rebuild : ${i}/${NB_ESSAI} sleep ${DELAI} seconds and try again."
+      eval lastArg=\$$#
+      \rm ${lastArg}
     else
       \rm out_rsync
@@ -1589 +1613 @@
   done
 
-  if [ $? -gt 0 ] ; then
+  if [ ${status} -gt 0 ] ; then
     echo "IGCM_sys_rebuild : rebuild error"
     IGCM_debug_Exit "rebuild"