Changeset 118 for trunk/libIGCM

Timestamp:

05/05/09 12:10:56 (15 years ago)

Author:

mmaipsl

Message:

Replace the two big analyses of PeriodLength? by a new function IGCM_config_Analyse_PeriodLength.
Add PID at the end of Script_Output saved files.

File:

• trunk/libIGCM/libIGCM_config/libIGCM_config.ksh (modified) (4 diffs)

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -198 +198 @@
 
 #===================================
+function IGCM_config_Analyse_PeriodLength
+{
+    IGCM_debug_PushStack "IGCM_config_Analyse_PeriodLength"
+
+    theyear=$1
+    themonth=$2
+
+    # Determine number of day(s) in PeriodLength :
+    case ${config_UserChoices_PeriodLength} in
+        *Y|*y)
+            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[yY]' '{print $1}' ) 
+            IGCM_debug_Print 1 "Number of years for PeriodLength : ${PeriodLengthInYears}"
+            PeriodLengthInDays=0
+            i=0
+            until [ $i -ge $PeriodLengthInYears ] ; do 
+                (( PeriodLengthInDays = PeriodLengthInDays + $( IGCM_date_DaysInYear $(( year + i )) ) )) 
+                (( i=i+1 )) 
+            done 
+            ;;
+        *M|*m)
+            PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[mM]' '{print $1}' ) 
+            IGCM_debug_Print 1 "Number of months for PeriodLength : ${PeriodLengthInMonths}"
+            typeset year1 
+            PeriodLengthInDays=0
+            year1=year
+            i=0
+            until [ $i -ge $PeriodLengthInMonths ] ; do 
+                if [ $(( month + i )) -lt 13 ] ; then 
+                    (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( month + i )) ) ))  
+                else 
+                    (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( month + i - 12 )) ) ))  
+                fi 
+                (( i=i+1 )) 
+            done 
+            ;;
+        *D|*d)  
+            PeriodLengthInDays=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[dD]' '{print $1}' ) ;;
+        *) 
+            IGCM_debug_Exit "IGCM_config_Analyse_PeriodLength " ${config_UserChoices_PeriodLength} " invalid period length : choose in *Y, *M, *D."
+            IGCM_debug_Verif_Exit ;;
+    esac
+
+    IGCM_debug_PopStack "IGCM_config_Analyse_PeriodLength"
+
+}
+
+#===================================
 function IGCM_config_PeriodStart
 {
@@ -218 +265 @@
 
         IGCM_date_GetYearMonth $DateBegin year month
-
-        case ${config_UserChoices_PeriodLength} in
-            *Y|*y)
-                PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[yY]' '{print $1}' ) 
-                IGCM_debug_Print 1 "Number of years for PeriodLength : ${PeriodLengthInYears}"
-                PeriodLengthInDays=0
-                i=0
-                until [ $i -ge $PeriodLengthInYears ] ; do 
-                    (( PeriodLengthInDays = PeriodLengthInDays + $( IGCM_date_DaysInYear $(( year + i )) ) )) 
-                    (( i=i+1 )) 
-                done 
-                ;;
-            *M|*m)
-                PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[mM]' '{print $1}' ) 
-                IGCM_debug_Print 1 "Number of months for PeriodLength : ${PeriodLengthInMonths}"
-                typeset year1 
-                PeriodLengthInDays=0
-                year1=year
-                i=0
-                until [ $i -ge $PeriodLengthInMonths ] ; do 
-                    if [ $(( month + i )) -lt 13 ] ; then 
-                        (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( month + i )) ) ))  
-                    else 
-                        (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( month + i - 12 )) ) ))  
-                    fi 
-                    (( i=i+1 )) 
-                done 
-                ;;
-            *D|*d)  
-                PeriodLengthInDays=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[dD]' '{print $1}' ) ;;
-            *) 
-                IGCM_debug_Exit "IGCM_config_PeriodStart " ${config_UserChoices_PeriodLength} " invalid period length : choose in *Y, *M, *D."
-                IGCM_debug_Verif_Exit ;;
-        esac
+        IGCM_config_Analyse_PeriodLength  $year $month
 
         eval PeriodDateBegin=${DateBegin} > /dev/null 2>&1
@@ -306 +320 @@
             IGCM_debug_Print 1 "Try to save previous ksh job output"
             IGCM_sys_Cd ${SUBMIT_DIR}/
-            IGCM_sys_Put_Out ${Last_Script_Output_Name} ${R_OUT_KSH}/
+            IGCM_sys_Put_Out ${Last_Script_Output_Name} ${R_OUT_KSH}/${Last_Script_Output_Name}.$$
             IGCM_sys_Cd ${RUN_DIR}
         else
@@ -523 +537 @@
     IGCM_date_GetYearMonth $PeriodDateBegin year month
 
-    # Determine number of day(s) in PeriodLength :
-    case ${config_UserChoices_PeriodLength} in
-        *Y|*y)
-            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[yY]' '{print $1}' ) 
-            IGCM_debug_Print 1 "Number of years for PeriodLength : ${PeriodLengthInYears}"
-            PeriodLengthInDays=0
-            i=0
-            until [ $i -ge $PeriodLengthInYears ] ; do 
-                (( PeriodLengthInDays = PeriodLengthInDays + $( IGCM_date_DaysInYear $(( year + i )) ) )) 
-                (( i=i+1 )) 
-            done 
-            ;;
-        *M|*m)
-            PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[mM]' '{print $1}' ) 
-            IGCM_debug_Print 1 "Number of months for PeriodLength : ${PeriodLengthInMonths}"
-            typeset year1 
-            PeriodLengthInDays=0
-            year1=year
-            i=0
-            until [ $i -ge $PeriodLengthInMonths ] ; do 
-                if [ $(( month + i )) -lt 13 ] ; then 
-                    (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( month + i )) ) ))  
-                else 
-                    (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( month + i - 12 )) ) ))  
-                fi 
-                (( i=i+1 )) 
-            done 
-            ;;
-        *D|*d)  
-            PeriodLengthInDays=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[dD]' '{print $1}' ) ;;
-    esac
+    IGCM_config_Analyse_PeriodLength $year $month
     PeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateBegin} $( expr ${PeriodLengthInDays} - 1 ) )