Changeset 571 for branches/libIGCM_MPI_OpenMP/AA_create_ts

Timestamp:

03/07/12 10:39:55 (12 years ago)

Author:

mafoipsl

Message:

First try to merge libIGCM_MPI_OpenMP branch with libIGCM trunk revision 569. Tested on vargas with PackFrequency?=NONE included into config.card.

Location:

branches/libIGCM_MPI_OpenMP

Files:

• . (modified) (1 prop)
• AA_create_ts (modified) (12 diffs)

branches/libIGCM_MPI_OpenMP/AA_create_ts

@@ -99 +99 @@
 #-Q- titane ######################
 #-Q- titane #MSUB -r TS             # Nom du job                
-#-Q- titane #MSUB -N 1              # Reservation du noeud
+#-Q- titane #MSUB -eo
 #-Q- titane #MSUB -n 1              # Reservation du processus
 #-Q- titane #MSUB -T 86400          # Limite de temps elapsed du job
-#-Q- titane #MSUB -E "-j o"
-#-Q- titane #MSUB -E "-S /bin/ksh"
-#-Q- titane ##MSUB -e nco.out        # Sortie standard
-#-Q- titane ##MSUB -o nco.out        # Sortie standard
+#-Q- titane #MSUB -q mono
 #-Q- lxiv8 ######################
 #-Q- lxiv8 ## OBELIX      LSCE ##
@@ -146 +143 @@
 StandAlone=${StandAlone:=true}
 
-#D- Low level debug : to bypass lib test checks and stack construction
+#D- Path to libIGCM
 #D- Default : value from AA_job if any
+# WARNING For StandAlone use : To run this script on some machine (ulam and cesium)
+# WARNING you must check MirrorlibIGCM variable in sys library.
+# WARNING If this variable is true, you must use libIGCM_POST path instead
+# WARNING of your running libIGCM directory.
 libIGCM=${libIGCM:=::modipsl::/libIGCM}
-# WARNING for StandAlone used : To run this script on some machine,
-# you must check MirrorlibIGCM variable in sys library.
-# If this variable is true, you must use libIGCM_POST path instead
-# of your running libIGCM directory.
 
 #D- Flag to determine allready produced time series. Empty if you start from the beginning
@@ -271 +268 @@
 #==================================
 #R_SAVE : Job output directory
+#R_BUFR : Job output buffered directory
 if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then
     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' )
     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
+    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
     R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
 else
     R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
+    R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_JobName}
     R_DODS=${config_UserChoices_TagName}/${config_UserChoices_JobName}
 fi
@@ -469 +469 @@
 ########################################################################
 #
-#                          DEFINE DATE FUNCTIONS
-#
-########################################################################
-
-# Give the end of the next $1 period from $2 date
-function create_ts_next_date {
-    IGCM_debug_PushStack "create_ts_next_date" $@
-    typeset Length
-    case ${config_UserChoices_PeriodLength} in
-        *Y|*y) 
-            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' )
-            IGCM_date_GetYearMonth ${1} year month
-            year=$( IGCM_date_SupressZeros ${year} )
-            (( Length=0 ))
-            (( i=0 ))
-            until [ $i -ge $PeriodLengthInYears ] ; do
-                (( Length = Length + $( IGCM_date_DaysInYear $(( year + i + 1 )) ) )) 
-                (( i=i+1 ))
-            done
-            ;;
-        *M|*m) 
-            PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | awk -F '[mM]' '{print $1}' )
-            IGCM_date_GetYearMonth ${1} year month
-            year=$( IGCM_date_SupressZeros ${year} )
-            (( year0 = year ))
-            if [ $(( month + 1 )) -lt 13 ] ; then
-                month0=$(( month + 1 ))
-            else
-                month0=$(( month + 1 - 12 ))
-                (( year = year0 + 1 ))
-            fi
-            (( Length=0 ))
-            (( i=0 ))
-            until [ $i -ge $PeriodLengthInMonths ] ; do
-                if [ $(( month0 + i )) -lt 13 ] ; then
-                    (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month0 + i )) ) ))
-                else
-                    (( year = year0 + 1 ))
-                    (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month0 + i - 12 )) ) ))
-                fi
-                (( i=i+1 ))
-            done
-            ;;
-        *D|*d)
-            Length=$( echo ${config_UserChoices_PeriodLength} | sed -e "s/[dD]//" ) ;;
-        *)
-            IGCM_debug_Exit "create_ts " ${config_UserChoices_PeriodLength} " invalid PeriodLength : choose in *Y, *M, *D."
-            IGCM_debug_Verif_Exit_Post ;;
-    esac
-    echo ${Length}
-
-    IGCM_debug_PopStack "create_ts_next_date"
-}
-
-# Give the end of the actual $1 period from $2 date
-function create_ts_begin_date {
-    IGCM_debug_PushStack "create_ts_begin_date" $@
-    typeset Length
-    case ${config_UserChoices_PeriodLength} in
-        *Y|*y) 
-            PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | awk -F '[yY]' '{print $1}' )
-            IGCM_date_GetYearMonth ${1} year month
-            year=$( IGCM_date_SupressZeros ${year} )
-            if [ X${2} = Xend ] ; then
-                (( year = year - PeriodLengthInYears + 1))
-            fi
-            (( Length=0 ))
-            (( i=0 ))
-            until [ $i -ge $PeriodLengthInYears ] ; do
-                (( Length = Length + $( IGCM_date_DaysInYear $(( year + i )) ) )) 
-                (( i=i+1 ))
-            done
-            ;;
-        *M|*m) 
-            PeriodLengthInMonths=$( echo ${config_UserChoices_PeriodLength} | awk -F '[mM]' '{print $1}' )
-            IGCM_date_GetYearMonth ${1} year month
-            year=$( IGCM_date_SupressZeros ${year} )
-            if [ X${2} = Xend ] ; then
-                (( month = month - PeriodLengthInMonths + 1 ))
-            fi      
-            (( year0 = year ))
-            if [ $month -le 0 ] ; then
-                (( month = month + 12 ))
-                year=$( printf "%04i\n" $(( year - 1 )) )
-            fi
-            month=$( printf "%02i\n" ${month} )
-            (( Length=0 ))
-            (( i=0 ))
-            until [ $i -ge $PeriodLengthInMonths ] ; do
-                if [ $(( month + i )) -lt 13 ] ; then
-                    (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month + i )) ) ))
-                else
-                    (( year = year0 + 1 ))
-                    (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month + i - 12 )) ) ))
-                fi
-                (( i=i+1 ))
-            done
-            ;;
-        *D|*d)
-            Length=$( echo ${config_UserChoices_PeriodLength} | sed -e "s/[dD]//" ) ;;
-        *)
-            IGCM_debug_Exit "create_ts " ${config_UserChoices_PeriodLength} " invalid PeriodLength : choose in *Y, *M, *D."
-            IGCM_debug_Verif_Exit_Post ;;
-    esac
-    echo ${Length}
-
-    IGCM_debug_PopStack "create_ts_begin_date"
-}
-
-########################################################################
-#
 #               IS THERE SOME ALLREADY PRODUCED TIME SERIES ?
 #                 IF SO BRING THEM IN THE WORKING DIRECTORY
@@ -622 +511 @@
     # First Time Series Submission
     FIRST_PASS=TRUE
-    Length=$( create_ts_begin_date ${DateBegin} begin)
+    Length=$( IGCM_date_DaysInPreviousPeriod ${DateBegin} ${config_UserChoices_PeriodLength} begin)
     DATE_FIN_JOB_B=$( IGCM_date_AddDaysToGregorianDate ${DateBegin} $(( Length - 1 )) )
 else
@@ -692 +581 @@
     while [ ${DATE_COUNT} -lt ${PeriodDateEnd} ] ; do
         (( NBRE_FILE_TOT = NBRE_FILE_TOT + 1 ))
-        Length=$( create_ts_next_date ${DATE_COUNT} )
+        Length=$( IGCM_date_DaysInNextPeriod ${DATE_COUNT} ${config_UserChoices_PeriodLength} )
         DATE_COUNT=$( IGCM_date_AddDaysToGregorianDate ${DATE_COUNT} ${Length} )
     done
@@ -723 +612 @@
             DATE_COURANTE=${DATE_FIN_JOB_B_LOOP}
         else
-            Length=$( create_ts_next_date ${DATE_FIN_JOB_B_LOOP} )
+            Length=$( IGCM_date_DaysInNextPeriod ${DATE_FIN_JOB_B_LOOP} ${config_UserChoices_PeriodLength} )
             DATE_COURANTE=$( IGCM_date_AddDaysToGregorianDate ${DATE_FIN_JOB_B_LOOP} ${Length} )
         fi
@@ -740 +629 @@
 
         if [ ! ${FIRST_PASS} = TRUE ] && [ ${CURRENT_LOOP} -eq 1 ] ; then
-            Length=$( create_ts_next_date ${DATE_FIN_JOB_B_LOOP} )
+            Length=$( IGCM_date_DaysInNextPeriod ${DATE_FIN_JOB_B_LOOP} ${config_UserChoices_PeriodLength} )
             DATE_COURANTE=$( IGCM_date_AddDaysToGregorianDate ${DATE_FIN_JOB_B_LOOP} ${Length} )
         elif [ -z "${DATE_COURANTE}" ] ; then
             DATE_COURANTE=${DATE_FIN_JOB_B}
         else
-            Length=$( create_ts_next_date ${DATE_FIN} )
+            Length=$( IGCM_date_DaysInNextPeriod ${DATE_FIN} ${config_UserChoices_PeriodLength} )
             DATE_COURANTE=$( IGCM_date_AddDaysToGregorianDate ${DATE_FIN} ${Length} )
         fi
@@ -755 +644 @@
         while [ ${COMPTEUR} -lt ${NBRE_FILE_LOOP} ] ; do
             #
-            Length=$( create_ts_next_date ${DATE_LOOP} )
+            Length=$( IGCM_date_DaysInNextPeriod ${DATE_LOOP} ${config_UserChoices_PeriodLength} )
             DATE_LOOP=$( IGCM_date_AddDaysToGregorianDate ${DATE_LOOP} ${Length} )
             (( TotLength = TotLength + Length ))
@@ -772 +661 @@
         [ ${NBRE_FILE_LOOP} -eq 0 ] && NBRE_FILE_LOOP=${UNIX_MAX_LIMIT}
 
-        Length=$( create_ts_next_date ${DATE_FIN} )
+        Length=$( IGCM_date_DaysInNextPeriod ${DATE_FIN} ${config_UserChoices_PeriodLength} )
         DATE_COURANTE=$(IGCM_date_AddDaysToGregorianDate ${DATE_FIN} ${Length} )
         DATE_FIN=${PeriodDateEnd}
@@ -823 +712 @@
             while [ ${COMPTEUR} -le ${NBRE_FILE_LOOP} ] ; do
                 #
-                Length1=$( create_ts_begin_date ${DATE_LOOP} end)
+                Length1=$( IGCM_date_DaysInPreviousPeriod ${DATE_LOOP} ${config_UserChoices_PeriodLength} end)
                 DATE_TAB=$(  IGCM_date_AddDaysToGregorianDate ${DATE_LOOP} $(( 1 - Length1 )) )_${DATE_LOOP}
 
-                Length2=$( create_ts_next_date ${DATE_LOOP} end)
+                Length2=$( IGCM_date_DaysInNextPeriod ${DATE_LOOP} ${config_UserChoices_PeriodLength} )
                 DATE_LOOP=$( IGCM_date_AddDaysToGregorianDate ${DATE_LOOP} ${Length2} )
 
@@ -856 +745 @@
             # WE CAN CONCATENATE FILES AT THIS POINT
             [ "${FLAG_B}" = "TRUE" ] && DATE_BUILD_B=${DateBegin}_${DATE_FIN_JOB_B_LOOP_PREC}
-            Length=$( create_ts_begin_date ${DATE_COURANTE} end)
+            Length=$( IGCM_date_DaysInPreviousPeriod ${DATE_COURANTE} ${config_UserChoices_PeriodLength} end)
             DATE_BUILD1=$( IGCM_date_AddDaysToGregorianDate ${DATE_COURANTE} -$(( Length - 1 )) )
             DATE_BUILD=${DATE_BUILD1}_${DATE_FIN}