Changeset 919

Timestamp:

08/13/13 14:29:16 (11 years ago)

Author:

sdipsl

Message:

Bugfix IGCM_date_DaysIn*Period. See #159

File:

• trunk/libIGCM/libIGCM_date/libIGCM_date.ksh (modified) (7 diffs)

trunk/libIGCM/libIGCM_date/libIGCM_date.ksh

@@ -838 +838 @@
   IGCM_debug_PushStack "IGCM_date_DaysInPreviousPeriod" $@
 
-  typeset Length Period PeriodLengthInYears PeriodLengthInMonths year0 i
+  typeset Length Period treatedYear PeriodLengthInYears PeriodLengthInMonths year0 i
 
   Period=${2}
@@ -869 +869 @@
     fi
     month=$( printf "%02i\n" ${month} )
+    treatedYear=0
     Length=0
     i=0
-    until [ $i -ge $PeriodLengthInMonths ] ; do
-      if [ $(( month + i )) -lt 13 ] ; then
-        (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month + i )) ) ))
-      else
+    for ((i = 0; i < ${PeriodLengthInMonths}; i += 1)) ; do
+
+      (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month + i - 12 * treatedYear )) ) ))
+
+      if [ $(( month + i )) -ge $(( 12 * (treatedYear + 1) )) ] ; then
         (( year = year0 + 1 ))
-        (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month + i - 12 )) ) ))
+        (( treatedYear = treatedYear + 1 ))
       fi
-      (( i = i + 1 ))
     done
     ;;
@@ -902 +903 @@
   IGCM_debug_PushStack "IGCM_date_DaysInNextPeriod" $@
 
-  typeset Length Period PeriodLengthInYears PeriodLengthInMonths year0 month0 i
+  typeset Length Period treatedYear PeriodLengthInYears PeriodLengthInMonths year0 month0 i
 
   Period=${2}
@@ -928 +929 @@
       (( year = year0 + 1 ))
     fi
+    treatedYear=0
     Length=0
     i=0
-    until [ $i -ge $PeriodLengthInMonths ] ; do
-      if [ $(( month0 + i )) -lt 13 ] ; then
-        (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month0 + i )) ) ))
-      else
+    for ((i = 0; i < ${PeriodLengthInMonths}; i += 1)) ; do
+
+      (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month0 + i - 12 * treatedYear )) ) ))
+
+      if [ $(( month0 + i )) -ge $(( 12 * (treatedYear + 1) )) ] ; then
         (( year = year0 + 1 ))
-        (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month0 + i - 12 )) ) ))
+        (( treatedYear = treatedYear + 1 ))
       fi
-      (( i = i + 1 ))
     done
     ;;
@@ -961 +963 @@
   IGCM_debug_PushStack "IGCM_date_DaysInCurrentPeriod" $@
 
-  typeset Length Period PeriodLengthInYears PeriodLengthInMonths year0 i
+  set -vx
+
+  typeset Length Period treatedYear PeriodLengthInYears PeriodLengthInMonths year0 i
 
   Period=${2}
@@ -987 +991 @@
     year=$( IGCM_date_SupressZeros ${year} )
     year0=year
+    treatedYear=0
     Length=0
     i=0
-    until [ $i -ge $PeriodLengthInMonths ] ; do
-      if [ $(( month + i )) -lt 13 ] ; then
-        (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month + i )) ) ))
-      else
+    for ((i = 0; i < ${PeriodLengthInMonths}; i += 1)) ; do
+
+      (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month + i - 12 * treatedYear )) ) ))
+
+      if [ $(( month + i )) -ge $(( 12 * (treatedYear + 1) )) ] ; then
         (( year = year0 + 1 ))
-        (( Length = Length + $( IGCM_date_DaysInMonth $year $(( month + i - 12 )) ) ))
+        (( treatedYear = treatedYear + 1 ))
       fi
-      (( i = i + 1 ))
     done
     ;;
@@ -1007 +1012 @@
   echo ${Length}
 
+  set +vx
+
   IGCM_debug_PopStack "IGCM_date_DaysInCurrentPeriod"
 }