Changeset 287

Timestamp:

06/04/10 09:11:49 (14 years ago)

Author:

mmaipsl

Message:

PB, MM: Add TS_MO_YE means production of yearly mean from TS MOnthly files.

File:

• trunk/libIGCM/AA_create_ts (modified) (9 diffs)

trunk/libIGCM/AA_create_ts

@@ -72 +72 @@
 #-Q- titane ##MSUB -e nco.out        # Sortie standard
 #-Q- titane ##MSUB -o nco.out        # Sortie standard
+#-Q- lxiv8 ######################
+#-Q- lxiv8 ## OBELIX      LSCE ##
+#-Q- lxiv8 ######################
+#-Q- lxiv8 #PBS -N TS
+#-Q- lxiv8 #PBS -m a
+#-Q- lxiv8 #PBS -j oe
+#-Q- lxiv8 #PBS -q medium
+#-Q- lxiv8 #PBS -o TS.$$
+#-Q- lxiv8 #PBS -S /bin/ksh
 #-Q- default #!/bin/ksh
 #-Q- default ##################
@@ -108 +117 @@
 #D- Default : Value from AA_job if any. Usefull in StandAlone case if you want to continue a time series
 CompletedFlag=${CompletedFlag:=}
+CompletedFlag=$( IGCM_date_ConvertFormatToGregorian ${CompletedFlag} )
 
 #D- Flag to determine task type this script will perform.
@@ -421 +431 @@
             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 ))
@@ -431 +442 @@
             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
@@ -469 +481 @@
             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))
@@ -482 +495 @@
             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 ))
@@ -821 +835 @@
                     IGCM_sys_Rm ${file1} ${file2}
                 fi
+
                 #
                 if [ "${DEPOT}" = "TRUE" ] ; then
@@ -827 +842 @@
                     #${ncatted} -a modulo,time_counter,c,c," " ${file_out}
                     file_before=${config_UserChoices_JobName}_${DateBegin}_${DATE_FIN_JOB_B}_${FlagDir}_${var}.nc
+                    #
                     eval IGCM_sys_Put_Out ${file_out} \${R_OUT_${comp}}/Analyse/${TS_Dir}/${file_out}
                     [ "${FLAG_B}" = "TRUE" ] && eval MENAGE \${R_OUT_${comp}}/Analyse/${TS_Dir} ${file_before} ${file_out}
+                    #
+                    if [ ${FlagDir} = "1M" ] ; then
+                        # Compute yearly average considering calendar
+                        file_before_YE=${config_UserChoices_JobName}_${DateBegin}_${DATE_FIN_JOB_B}_1Y_${var}.nc
+                        file_out_YE=${config_UserChoices_JobName}_${DATE_BUILD_END}_1Y_${var}.nc
+                        #
+                        # Note that the date information in the outputfile is the date of the last contributing time step in the input file
+                        IGCM_sys_cdo -settunits,days -divdpy -yearsum -muldpm ${file_out} ${file_out_YE}
+                        #
+                        eval IGCM_sys_Put_Out ${file_out_YE} \${R_OUT_${comp}}/Analyse/TS_MO_YE/${file_out_YE}
+                        [ "${FLAG_B}" = "TRUE" ] && eval MENAGE \${R_OUT_${comp}}/Analyse/TS_MO_YE/ ${file_before_YE} ${file_out_YE}
+                    fi
+                    #
                     IGCM_sys_Rm ${file_out}
                     #
@@ -848 +877 @@
 # DODS copy
 for comp in ${config_ListOfComponents[*]} ; do
-    for TS_Dir in TS_YE TS_MO TS_DA TS_HF TS_INS ; do
+    for TS_Dir in TS_YE TS_MO TS_MO_YE TS_DA TS_HF TS_INS ; do
         IGCM_sys_TestDirArchive ${R_SAVE}/${comp}/Analyse/${TS_Dir}
         [ $? = 0 ] && IGCM_sys_Put_Dods ${comp}/Analyse/${TS_Dir}