Changeset 124 for trunk/libIGCM/libIGCM_config

Timestamp:

05/18/09 11:28:59 (15 years ago)

Author:

mmaipsl

Message:

MM: add another IGCM_config_Analyse_PeriodLength call and suppress arguments in this function.

File:

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

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -206 +206 @@
     IGCM_debug_PushStack "IGCM_config_Analyse_PeriodLength"
 
-    theyear=$1
-    themonth=$2
+    echo "config_UserChoices_PeriodLength : " ${config_UserChoices_PeriodLength} ${month} ${year}
+
+    typeset i
 
     # Determine number of day(s) in PeriodLength :
     case ${config_UserChoices_PeriodLength} in
         *Y|*y)
+#MM a enlever apres les tests 
+            echo " ${config_UserChoices_PeriodLength} | gawk -F '[yY]' " '{print $1}' 
             PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | gawk -F '[yY]' '{print $1}' ) 
             IGCM_debug_Print 1 "Number of years for PeriodLength : ${PeriodLengthInYears}"
@@ -224 +227 @@
             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 
@@ -269 +270 @@
 
         IGCM_date_GetYearMonth $DateBegin year month
-        IGCM_config_Analyse_PeriodLength  $year $month
+        IGCM_config_Analyse_PeriodLength
 
         eval PeriodDateBegin=${DateBegin} > /dev/null 2>&1
@@ -331 +332 @@
 
         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}' ) ;;
-            *) 
-                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
 
         IGCM_card_WriteOption ${SUBMIT_DIR}/run.card Configuration PeriodState "Running"
@@ -467 +434 @@
         eval ExeNameIn=\${config_Executable_${comp}[0]}
         eval ExeNameOut=\${config_Executable_${comp}[1]}
+        # Only if we really have an executable for the component :
         if [ X${ExeNameIn} = X\"\" ] ; then
             # If there is no exe file for this component
@@ -606 +574 @@
     IGCM_date_GetYearMonth $PeriodDateBegin year month
 
-    IGCM_config_Analyse_PeriodLength $year $month
+    IGCM_config_Analyse_PeriodLength
     PeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateBegin} $( expr ${PeriodLengthInDays} - 1 ) )