Changeset 146

Timestamp:

08/12/09 17:13:34 (15 years ago)

Author:

sdipsl

Message:

• Definition of Rebuild_DIR has been moved in IGCM_config_Initialize
• In libIGCM_config : remove expr call. Replaced by $(( ))

Location:

trunk/libIGCM

Files:

• AA_job (modified) (2 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (6 diffs)

trunk/libIGCM/AA_job

@@ -54 +54 @@
 #-Q- sx8mercure #PBS -m a                     # message a la fin du job
 #-Q- sx8mercure #PBS -j o                     # regroupement des sorties du job : standard error et output
+#-Q- sx8mercure ####PBS -A gen6178
 #-Q- sx8mercure #PBS -o Script_Output_::Jobname::.000001   # nom du fichier de sortie
 #-Q- sx8mercure #PBS -S /usr/bin/ksh          # shell de soumission
@@ -207 +208 @@
 IGCM_sys_MkdirWork ${RUN_DIR}
 IGCM_sys_Cd ${RUN_DIR}
-
-# --------------------------------------------------------------------==
-#D- Define REBUILD_DIR : 
-#D- where we store files needing rebuild process
-#D-  
-# --------------------------------------------------------------------==
-if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then
-    REBUILD_DIR=${R_SAVE}/TMP
-    IGCM_sys_MkdirArchive ${REBUILD_DIR}
-else
-    REBUILD_DIR=${RUN_DIR}
-fi
 
 # --------------------------------------------------------------------==

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -114 +114 @@
 
     # Day and Year of Initial State (Given in julian format)
-    InitDay=$(  expr $( IGCM_date_ConvertGregorianDateToJulian $DateBegin ) % 1000 )
-    InitYear=$( expr $( IGCM_date_ConvertGregorianDateToJulian $DateBegin ) / 1000 )
+    InitDay=$(( $( IGCM_date_ConvertGregorianDateToJulian $DateBegin ) % 1000 ))
+    InitYear=$(( $( IGCM_date_ConvertGregorianDateToJulian $DateBegin ) / 1000 ))
 
     #==================================
@@ -129 +129 @@
         IGCM_debug_Print 3 "${option} : ${auxprint}"
     done
-
-    #==================================
-    # Post : 
-    IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card Post
-
-    echo
-    IGCM_debug_Print 1 "DefineArrayFromOption : config_Post"
-
-    for option in ${config_Post[*]} ; do
-        IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/config.card Post ${option}
-        eval auxprint=\${config_Post_${option}}
-        IGCM_debug_Print 3 "${option} : ${auxprint}"
-    done
-
-    IGCM_debug_Print 1 "For now force RebuildFromArchive=true in libIGM_config"
-    config_Post_RebuildFromArchive=true
-    IGCM_debug_Print 3 "RebuildFromArchive : true"
 
     #================================================================#
@@ -195 +178 @@
     IGCM_sys_TestDirArchive ${R_SAVE}
     [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive"
+
+    #==================================
+    # Post : 
+    IGCM_card_DefineArrayFromSection ${SUBMIT_DIR}/config.card Post
+
+    echo
+    IGCM_debug_Print 1 "DefineArrayFromOption : config_Post"
+
+    for option in ${config_Post[*]} ; do
+        IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/config.card Post ${option}
+        eval auxprint=\${config_Post_${option}}
+        IGCM_debug_Print 3 "${option} : ${auxprint}"
+    done
+
+    # Define REBUILD_DIR : where we store files needing rebuild process
+    if [ X${config_Post_RebuildFromArchive} = Xtrue ] ; then
+        REBUILD_DIR=${R_SAVE}/TMP
+        IGCM_sys_MkdirArchive ${REBUILD_DIR}
+    else
+        REBUILD_DIR=${RUN_DIR}
+    fi
+
+    IGCM_debug_Print 1 "For now force RebuildFromArchive=true in libIGM_config"
+    config_Post_RebuildFromArchive=true
+    IGCM_debug_Print 3 "RebuildFromArchive : true"
 
     #====================================================
@@ -294 +302 @@
 
         eval PeriodDateBegin=${DateBegin} > /dev/null 2>&1
-        PeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${DateBegin} $( expr ${PeriodLengthInDays} - 1 ) )
+        PeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${DateBegin} $(( ${PeriodLengthInDays} - 1 )) )
         eval CumulPeriod=1 > /dev/null 2>&1
 
@@ -534 +542 @@
     #=================================================#
 
-    # To use this function, one must copu libIGCM.card from ${libIGCM} directory
+    # To use this function, one must copy libIGCM.card from ${libIGCM} directory
     # and put it in ${SUBMIT_DIR} directory. Ater modifications of ${SUBMIT_DIR}/libIGCM.card,
-    # variables define inside [UserChanges] will be modifyd for next Period of libIGCM main loop. 
+    # variables define inside [UserChanges] will be modified for next Period of libIGCM main loop. 
     if [ -f ${SUBMIT_DIR}/libIGCM.card ] ; then
         echo
@@ -603 +611 @@
 
     IGCM_config_Analyse_PeriodLength
-    PeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateBegin} $( expr ${PeriodLengthInDays} - 1 ) )
+    PeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateBegin} $(( ${PeriodLengthInDays} - 1 )) )
 
     # Debug Print :