Changes in trunk/libIGCM/libIGCM_date/libIGCM_date.ksh [23:7]

File:

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

trunk/libIGCM/libIGCM_date/libIGCM_date.ksh

@@ -153 +153 @@
 function IGCM_date_DaysInYear
 {
-#    IGCM_debug_PushStack "IGCM_date_DaysInYear" $@
+    IGCM_debug_PushStack "IGCM_date_DaysInYear" $@
     # return the number of days in a year
     # usage IGCM_date_DaysInYear yyyy
@@ -159 +159 @@
     # 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
-#       IGCM_debug_PopStack "IGCM_date_DaysInYear"
+        echo 360
+        IGCM_debug_PopStack "IGCM_date_DaysInYear"
         return
     else
         if [ "${config_UserChoices_CalendarType}" = "noleap" ] ; then
-            if [ X$2 = X ] ; then
-                echo 365
-            else
-                eval $2=365 > /dev/null 2>&1
-            fi
-
-#           IGCM_debug_PopStack "IGCM_date_DaysInYear"
+            echo 365
+            IGCM_debug_PopStack "IGCM_date_DaysInYear"
             return
         fi
     fi
-
-    typeset y a
 
     # if there is no argument on the command line, 
@@ -195 +184 @@
 
     # if it is evenly divisible by 400 it must be a leap year
-    a=$(( $y % 400 ))
+    a=$( expr $y \% 400 )
     if [ $a = 0 ]
         then
-        if [ X$2 = X ] ; then
-            echo 366
-        else
-            eval $2=366 > /dev/null 2>&1
-        fi
-
-#       IGCM_debug_PopStack "IGCM_date_DaysInYear"
+        echo 366
+        IGCM_debug_PopStack "IGCM_date_DaysInYear"
         return
     fi
 
     #if it is evenly divisible by 100 it must not be a leap year
-    a=$(( $y % 100 ))
+    a=$( expr $y \% 100 )
     if [ $a = 0 ]
         then
-        if [ X$2 = X ] ; then
-            echo 365
-        else
-            eval $2=365 > /dev/null 2>&1
-        fi
-
-#       IGCM_debug_PopStack "IGCM_date_DaysInYear"
+        echo 365
+        IGCM_debug_PopStack "IGCM_date_DaysInYear"
         return
     fi
         
     # if it is evenly divisible by 4 it must be a leap year
-    a=$(( $y % 4 ))
+    a=$( expr $y \% 4 )
     if [ $a = 0 ]
         then
-        if [ X$2 = X ] ; then
-            echo 366
-        else
-            eval $2=366 > /dev/null 2>&1
-        fi
-
-#       IGCM_debug_PopStack "IGCM_date_DaysInYear"
+        echo 366
+        IGCM_debug_PopStack "IGCM_date_DaysInYear"
         return
     fi
 
     # otherwise it is not a leap year
-    if [ X$2 = X ] ; then
-        echo 365
-    else
-        eval $2=365 > /dev/null 2>&1
-    fi
-
-#    IGCM_debug_PopStack "IGCM_date_DaysInYear"
+    echo 365
+
+    IGCM_debug_PopStack "IGCM_date_DaysInYear"
 }
 
@@ -257 +227 @@
 function IGCM_date_DaysInMonth
 {
-#    IGCM_debug_PushStack "IGCM_date_DaysInMonth" $@
+    IGCM_debug_PushStack "IGCM_date_DaysInMonth" $@
 
     # calculates the number of days in a month 
     # usage IGCM_date_DaysInMonth yyyy mm
     # or IGCM_date_DaysInMonth yyyymmdd
-    
+
     # What is the calendar :
     if [ "${config_UserChoices_CalendarType}" = "360d" ] ; then
-        if [ X$3 = X ] ; then
-            echo 30
-        else
-            eval $3=30 > /dev/null 2>&1
-        fi
-
-#       IGCM_debug_PopStack "IGCM_date_DaysInMonth"
+        echo 30
+        IGCM_debug_PopStack "IGCM_date_DaysInMonth"
         return
     fi
-
-    typeset ymd y m diy
 
     # if there are no command line arguments then assume that a yyyymmdd is being
@@ -288 +251 @@
         ymd=$1
     else
-        ymd=$(( ( $1 * 10000 ) + ( $2 * 100 ) + 1 ))
+        ymd=$( expr \( \( $1 \* 10000 \) \+ \( $2 \* 100 \) \+ 1 \) )
     fi
 
     # extract the year and the month
-    y=$(( $ymd / 10000 )) ;
-    m=$(( ( $ymd % 10000 ) / 100 )) ;
+    y=$( expr $ymd / 10000 ) ;
+    m=$( expr \( $ymd \% 10000 \) / 100 ) ;
 
     # 30 days hath september etc.
     case $m in
         1|3|5|7|8|10|12) 
-            if [ X$3 = X ] ; then
-                echo 31
-            else
-                eval $3=31 > /dev/null 2>&1
-            fi
-
-#           IGCM_debug_PopStack "IGCM_date_DaysInMonth"
+            echo 31
+            IGCM_debug_PopStack "IGCM_date_DaysInMonth"
             return ;;
         4|6|9|11) 
-            if [ X$3 = X ] ; then
-                echo 30
-            else
-                eval $3=30 > /dev/null 2>&1
-            fi
-        
-#           IGCM_debug_PopStack "IGCM_date_DaysInMonth"
+            echo 30     
+            IGCM_debug_PopStack "IGCM_date_DaysInMonth"
             return ;;
         *) ;;
@@ -321 +274 @@
     # Use IGCM_date_DaysInYear to get the number of days in the year and return a value
     # accordingly.
-    IGCM_date_DaysInYear $y diy
+    diy=$( IGCM_date_DaysInYear $y )
     case $diy in
         365) 
-            if [ X$3 = X ] ; then
-                echo 28
-            else
-                eval $3=28 > /dev/null 2>&1
-            fi
-
-#           IGCM_debug_PopStack "IGCM_date_DaysInMonth"
+            echo 28
+            IGCM_debug_PopStack "IGCM_date_DaysInMonth"
             return ;;
         366) 
-            if [ X$3 = X ] ; then
-                echo 29
-            else
-                eval $3=29 > /dev/null 2>&1
-            fi
-
-#           IGCM_debug_PopStack "IGCM_date_DaysInMonth"
+            echo 29
+            IGCM_debug_PopStack "IGCM_date_DaysInMonth"
             return ;;
     esac
 
-#    IGCM_debug_PopStack "IGCM_date_DaysInMonth"
+    IGCM_debug_PopStack "IGCM_date_DaysInMonth"
 }
 
@@ -360 +303 @@
     # usage IGCM_date_ConvertGregorianDateToJulian 19980429
 
-    typeset dt y m d x jul
-
     # if there is no command line argument, then assume that the date
     # is coming in on a pipe and use read to collect it    
@@ -372 +313 @@
 
     # break the yyyymmdd into separate parts for year, month and day
-    y=$(( $dt / 10000 ))
-    m=$(( ( $dt % 10000 ) / 100 ))
-    d=$(( ( $dt % 100 ) ))
+    y=$( expr $dt / 10000 )
+    m=$( expr \( $dt \% 10000 \) / 100 )
+    d=$( expr \( $dt \% 100 \) )
 
     # add the days in each month up to (but not including the month itself)
@@ -382 +323 @@
     # and add them to 14.
     x=1
-    while [ $x -lt $m ]
+    while [ $( expr $x \< $m ) = 1 ]
       do
-      IGCM_date_DaysInMonth $y $x md
-      d=$(( $d + $md ))
-      x=$(( $x + 1 ))
+      md=$( IGCM_date_DaysInMonth $y $x )
+      d=$( expr \( $d \+ $md \) )
+      x=$( expr \( $x \+ 1 \) )
     done
 
     # combine the year and day back together again and you have the julian date.
-    jul=$(( ( $y * 1000 ) + $d ))
+    jul=$( expr \( $y \* 1000 \) + $d )
     echo $jul
 
@@ -410 +351 @@
     # usage IGCM_date_ConvertJulianDateToGregorian 1998213
 
-    typeset dt y m d md grg
-
     # if there is no command line argument, assume one is being 
     # piped in and read it
@@ -422 +361 @@
         
     # break apart the year and the days
-    y=$(( $dt / 1000 ))
-    d=$(( $dt % 1000 ))
+    y=$( expr $dt / 1000 )
+    d=$( expr $dt \% 1000 )
         
     # subtract the number of days in each month starting from 1
@@ -430 +369 @@
     # month to get the correct day of the month
     m=1
-    while [ $d -gt 0 ]
+    while [ $( expr $d \> 0 ) = 1 ]
       do
-      IGCM_date_DaysInMonth $y $m md
-      d=$(( $d - $md ))
-      m=$(( $m + 1 ))
+      md=$( IGCM_date_DaysInMonth $y $m )
+      d=$( expr $d \- $md )
+      m=$( expr $m \+ 1 )
     done
 
-    d=$(( $d + $md ))
+    d=$( expr $d \+ $md )
 
     # the loop steps one past the correct month, so back up the month
-    m=$(( $m - 1 ))
+    m=$( expr $m \- 1 )
 
     # assemble the results into a gregorian date
-    grg=$(( ( $y * 10000 ) + ( $m * 100 ) + $d ))
+    grg=$( expr \( $y \* 10000 \) \+ \( $m \* 100 \) \+ $d )
     echo $( IGCM_date_GregorianDigit $grg )
 
@@ -463 +402 @@
     # usage IGCM_date_AddDaysToJulianDate 1998312 { ,-}14
 
-    typeset dif yd d y diy
-
     # Read the difference from the command lines
     # and the date from the command line, or standard input
@@ -477 +414 @@
 
     # Break it into pieces
-    d=$(( $yd % 1000 ))
-    y=$(( $yd / 1000 ))
+    d=$( expr $yd \% 1000 )
+    y=$( expr $yd / 1000 )
 
     # Add the number of days (if days is negative this results is
     # a subtraction)
-    d=$(( $d + $dif ))
+    d=$( expr $d \+ $dif )
 
     # Extract the days in the year
-    IGCM_date_DaysInYear $y diy
+    diy=$( IGCM_date_DaysInYear $y )
 
     # If the calculated day exceeds the days in the year, 
@@ -492 +429 @@
     # test until you end up with a day number that falls within the
     # days of the year
-    while [ $d -gt $diy ]
+    while [ $( expr $d \> $diy ) = 1 ]
       do
-      d=$(( $d - $diy ))
-      y=$(( $y + 1 ))
-      IGCM_date_DaysInYear $y diy
+      d=$( expr $d - $diy )
+      y=$( expr $y \+ 1 )
+      diy=$( IGCM_date_DaysInYear $y )
     done
 
@@ -504 +441 @@
     # loop on this test until you end up with a number that
     # falls within the days of the year
-    while [ $d -lt 1 ]
+    while [ $( expr $d \< 1 ) = 1 ]
       do
-      y=$(( $y - 1 ))
-      IGCM_date_DaysInYear $y diy
-      d=$(( $d + $diy ))
+      y=$( expr $y - 1 )
+      diy=$( IGCM_date_DaysInYear $y )
+      d=$( expr $d \+ $diy )
     done
 
     # put the year and day back together and echo the result
-    yd=$(( ( $y * 1000 ) + $d ))
+    yd=$( expr \( $y \* 1000 \) + $d )
 
     echo $yd
@@ -602 +539 @@
 
     # Break the dates in to year and day portions
-    yyyy1=$(( $jul1 / 1000 ))
-    yyyy2=$(( $jul2 / 1000 ))
-    ddd1=$(( $jul1 % 1000 ))
-    ddd2=$(( $jul2 % 1000 ))
+    yyyy1=$( expr $jul1 / 1000 )
+    yyyy2=$( expr $jul2 / 1000 )
+    ddd1=$( expr $jul1 \% 1000 )
+    ddd2=$( expr $jul2 \% 1000 )
 
     # Subtract days
-    res=$(( $ddd1 - $ddd2 ))
+    res=$( expr $ddd1 - $ddd2 )
 
     # Then add days in year until year2 matches year1
 
     if [ "${config_UserChoices_CalendarType}" = "360d" ] ; then
-        res=$(( ( ( $yyyy1 - $yyyy2 ) * 360 ) + $res ))
+        res=$( expr \( \( $yyyy1 \- $yyyy2 \) \* 360 \) \+ $res )
     elif [ "${config_UserChoices_CalendarType}" = "noleap" ] ; then
-        res=$(( ( ( $yyyy1 - $yyyy2 ) * 365 ) + $res ))
+        res=$( expr \( \( $yyyy1 \- $yyyy2 \) \* 365 \) \+ $res )
     elif ( [ "${config_UserChoices_CalendarType}" = "leap" ] || [ "${config_UserChoices_CalendarType}" = "gregorian" ] ) ; then
         while [ $yyyy2 -lt $yyyy1 ]
           do
-          IGCM_date_DaysInYear $yyyy2 diy
-          res=$(( $res + $diy ))
-          yyyy2=$(( $yyyy2 + 1 ))
+          diy=$( IGCM_date_DaysInYear $yyyy2 )
+          res=$( expr $res + $diy )
+          yyyy2=$( expr $yyyy2 + 1 )
         done
     fi
@@ -630 +567 @@
     if [ $1 -lt $2 ]
         then
-        res=$(( $res * -1 ))
+        res=$( expr $res \* -1 )
     fi
  
@@ -753 +690 @@
         num=19000101
     fi
-    echo $(( $( IGCM_date_DaysBetweenGregorianDate $1 ${num} ) + $aux ))
+    echo $( expr \( $( IGCM_date_DaysBetweenGregorianDate $1 ${num} ) \+ $aux \) )
 
     IGCM_debug_PopStack "IGCM_date_DaysSinceJC"