Changeset 1452 for trunk/libIGCM

Timestamp:

05/31/18 16:54:43 (6 years ago)

Author:

sdipsl

Message:

• Have clean_latestPackperiod properly working with PeriodLength?=1Y and alike, not only PeriodLength?=1M and alike

File:

• trunk/libIGCM/AA_clean_latestPackperiod (modified) (3 diffs)

trunk/libIGCM/AA_clean_latestPackperiod

@@ -102 +102 @@
 fi
 
-
+PreviousPeriodDateBegin=$( IGCM_date_ConvertFormatToGregorian ${run_Configuration_PeriodDateBegin} )
 PreviousPeriodDateEnd=$( IGCM_date_ConvertFormatToGregorian ${run_Configuration_PeriodDateEnd} )
-PreviousPeriodDateBegin=$( IGCM_date_ConvertFormatToGregorian ${run_Configuration_PeriodDateBegin} )
 
 IGCM_date_GetYearMonth ${PreviousPeriodDateEnd} PreviousPeriodYear PreviousPeriodMonth
@@ -212 +211 @@
 
   # Get previous period begin and end dates
-  PreviousPeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateEnd} \
-                               -$( IGCM_date_DaysInMonth ${PeriodYear} ${PeriodMonth} ) )
+  PreviousPeriodDateEnd=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateBegin} -1 )
+  Length=$( IGCM_date_DaysInPreviousPeriod ${PreviousPeriodDateEnd} ${config_UserChoices_PeriodLength} )
+  echo "PreviousPeriodDateEnd, Length : $Length $PreviousPeriodDateEnd"
+  PreviousPeriodDateBegin=$( IGCM_date_AddDaysToGregorianDate ${PreviousPeriodDateEnd} -$(( Length - 1 )) )
+  echo "PreviousPeriodDateBegin PreviousPeriodDateEnd :" $PreviousPeriodDateBegin $PreviousPeriodDateEnd
   IGCM_date_GetYearMonth ${PreviousPeriodDateEnd} PreviousPeriodYear PreviousPeriodMonth
 
-  PreviousPeriodDateBegin=$( IGCM_date_AddDaysToGregorianDate ${PeriodDateBegin} \
-                         -$( IGCM_date_DaysInMonth ${PreviousPeriodYear} ${PreviousPeriodMonth} ) )
 done
 
@@ -281 +281 @@
   if [ ! X${run_PostProcessing_TimeSeriesCompleted} = X ] ; then
 
-    printf "${Green}TimeSeriesCompleted in run.card : ${run_PostProcessing_TimeSeriesCompleted}. Do we need to change it? (AAAAMMDD) ${NoColor}"
-
+    printf "${Green}TimeSeriesCompleted in run.card : ${run_PostProcessing_TimeSeriesCompleted}. Do we need to initialize it? (y/n) ${NoColor}"
+    
     read reponse
     case ${reponse} in
-      0*|1*|2*|3*|4*|5*|6*|7*|8*|9*)
-        #Update run.card 
-        cp ${SUBMIT_DIR}/run.card ${SUBMIT_DIR}/run.card.old
-        IGCM_card_WriteOption ${SUBMIT_DIR}/run.card PostProcessing TimeSeriesCompleted "${reponse}"
-        ;;
-      *)
-        echo "Nothing to do !"
-        ;;
+    oui|OUI|o|y|yes|YES)
+      #Update run.card 
+      cp ${SUBMIT_DIR}/run.card ${SUBMIT_DIR}/run.card.old
+      IGCM_card_WriteOption ${SUBMIT_DIR}/run.card.verbose PostProcessing TimeSeriesCompleted ""
+      ;;
+    *)
+      echo "Nothing to do !"
+      ;;
     esac
   fi