Changeset 904

Timestamp:

08/08/13 14:53:22 (11 years ago)

Author:

sdipsl

Message:

• handle *Y packed files. See #134
• whitespace-cleanup

File:

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

trunk/libIGCM/AA_create_se

@@ -2 +2 @@
 #-Q- curie ## CURIE   TGCC/CEA ##
 #-Q- curie ######################
-#-Q- curie #MSUB -r SE             # Nom du job               
+#-Q- curie #MSUB -r SE             # Nom du job
 #-Q- curie #MSUB -eo
 #-Q- curie #MSUB -n 1              # Reservation du processus
@@ -20 +20 @@
 #-Q- ada # Nom du travail LoadLeveler
 #-Q- ada # @ job_name   = SE
-#-Q- ada # Fichier de sortie standard du travail       
+#-Q- ada # Fichier de sortie standard du travail
 #-Q- ada # @ output     = $(job_name).$(jobid)
 #-Q- ada # Fichier de sortie d'erreur du travail
@@ -43 +43 @@
 #-Q- titane ## TITANE   CEA ##
 #-Q- titane ######################
-#-Q- titane #MSUB -r SE             # Nom du job                
+#-Q- titane #MSUB -r SE             # Nom du job
 #-Q- titane #MSUB -eo
 #-Q- titane #MSUB -n 1              # Reservation du processus
@@ -95 +95 @@
 
 #D- Flag to determine if rebuild process has been performed asynchronously
-#D- Possible value true or false. 
+#D- Possible value true or false.
 #D- If true raw files has allready been patched by rebuild job
 #D- If false create_ts will patch the raw files
@@ -328 +328 @@
     case ${config_UserChoices_PeriodLength} in
       # For Yearly simulation :
-      1Y|1y)
+      *Y|*y)
+        PeriodLengthInYears=$( echo ${config_UserChoices_PeriodLength} | sed -e 's/[yY]//' )
         (( an = an_deb ))
         # Initialize array
@@ -336 +337 @@
         unset liste_file_se_tmp
         while [ ${an} -le ${an_fin} ] ; do
-          moisL=$( IGCM_date_DaysInMonth ${an} ${mois} )
           #
           an4=$(printf "%04i\n" ${an} )
           #
-          diy=$( IGCM_date_DaysInYear $an4 )
-          afin=$( IGCM_date_AddDaysToGregorianDate ${an4}0101 $(( diy - 1 )) )
+          Length=$( IGCM_date_DaysInCurrentPeriod ${an4}0101 ${config_UserChoices_PeriodLength} )
+          afin=$( IGCM_date_AddDaysToGregorianDate ${an4}0101 ${Length}-1 )
+          #
           date=${an4}0101_${afin}
           #set +A liste_file_se ${liste_file_se[*]} ${file_path}${config_UserChoices_JobName}_${date}_${file}.nc
@@ -347 +348 @@
           liste_file_se[${#liste_file_se[*]}]=${file_path}${config_UserChoices_JobName}_${date}_${file}.nc
           liste_file_se_tmp[${#liste_file_se_tmp[*]}]=${config_UserChoices_JobName}_${date}_${file}.nc
-          (( an = an + 1 ))
+          (( an = an + ${PeriodLengthInYears} ))
         done
         #
@@ -525 +526 @@
     var_unlim=$(ncdump -h ${RESULT_SE}|grep UNLIMITED| cut -d ' ' -f 1)
 
-    # Put correct climatological axis following calendar 
+    # Put correct climatological axis following calendar
     case ${config_UserChoices_CalendarType} in
       360d|360_day)
@@ -568 +569 @@
 export POST_DIR; export SUBMIT_DIR; export libIGCM; export R_INIT; export R_BC; export StandAlone
 export RESOL_ATM; export RESOL_OCE ; export RESOL_ICE ; export RESOL_MBG ; export RESOL_SRF ; export RESOL_SBG
-export R_SAVE; export config_UserChoices_JobName; export config_UserChoices_TagName; export YEARS; export DIR_OUT 
+export R_SAVE; export config_UserChoices_JobName; export config_UserChoices_TagName; export YEARS; export DIR_OUT
 listVarEnv="POST_DIR,SUBMIT_DIR,libIGCM,R_INIT,R_BC,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_SBG,R_SAVE,config_UserChoices_JobName,config_UserChoices_TagName,YEARS,DIR_OUT"
 export listVarEnv;