Changeset 103 for trunk/libIGCM

Timestamp:

04/15/09 17:06:13 (15 years ago)

Author:

mmaipsl

Message:

Enhancement for calendars.
Before we had 360d, noleap and gregorian (or leap) calendars.
There was no bug.
Now we add "all_leap" (for 366 days in year).

File:

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

trunk/libIGCM/libIGCM_date/libIGCM_date.ksh

@@ -23 +23 @@
 #D-libIGCM_date
 #D-This ksh library handles date calculs and convertions in different calendars. 
+#D-  types of calendars are possible :
+#D-
+#D-  - gregorian (other name leap) :
+#D-      The normal calendar. The time origin for the
+#D-      julian day in this case is 24 Nov -4713.
+#D-  - noleap :
+#D-      A 365 day year without leap years.
+#D-  - all_leap :
+#D-      A 366 day year with only leap years.
+#D-  - 360d :
+#D-      Year of 360 days with month of equal length.
 
 # Number of digit in the year
@@ -158 +169 @@
 
     # What is the calendar :
-    if [ "${config_UserChoices_CalendarType}" = "360d" ] ; then
-        if [ X$2 = X ] ; then
-            echo 360
-        else
-            eval $2=360 > /dev/null 2>&1
-        fi
+    case ${config_UserChoices_CalendarType} in
+        360d)
+            if [ X$2 = X ] ; then
+                echo 360
+            else
+                eval $2=360 > /dev/null 2>&1
+            fi
 #       IGCM_debug_PopStack "IGCM_date_DaysInYear"
-        return
-    else
-        if [ "${config_UserChoices_CalendarType}" = "noleap" ] ; then
+            return;;
+        noleap)
             if [ X$2 = X ] ; then
                 echo 365
@@ -175 +186 @@
 
 #           IGCM_debug_PopStack "IGCM_date_DaysInYear"
-            return
-        fi
-    fi
+            return;;
+        all_leap)
+            if [ X$2 = X ] ; then
+                echo 366
+            else
+                eval $2=366 > /dev/null 2>&1
+            fi
+
+#               IGCM_debug_PopStack "IGCM_date_DaysInYear"
+            return;;
+    esac
 
     typeset y a
@@ -616 +635 @@
     elif [ "${config_UserChoices_CalendarType}" = "noleap" ] ; then
         res=$(( ( ( $yyyy1 - $yyyy2 ) * 365 ) + $res ))
+    elif [ "${config_UserChoices_CalendarType}" = "all_leap" ] ; then
+        res=$(( ( ( $yyyy1 - $yyyy2 ) * 366 ) + $res ))
     elif ( [ "${config_UserChoices_CalendarType}" = "leap" ] || [ "${config_UserChoices_CalendarType}" = "gregorian" ] ) ; then
         while [ $yyyy2 -lt $yyyy1 ]
@@ -724 +745 @@
             noleap)
                 aux=-365;;
-            leap) 
+            all_leap) 
+                aux=-366;;
+            leap|gregorian)
                 aux=-366;;
         esac
@@ -736 +759 @@
             noleap)
                 aux=364635;;
-            leap) 
+            all_leap) 
+                aux=365634;;
+            leap|gregorian)
                 aux=364877;;
         esac
@@ -748 +773 @@
             noleap)
                 aux=693135;;
-            leap) 
+            all_leap) 
+                aux=695034;;
+            leap|gregorian)
                 aux=693595;;
         esac