Changeset 829

Timestamp:

03/12/13 15:25:35 (11 years ago)

Author:

sdipsl

Message:

• Minimal changes so as to be able to DRYRUN after bash conversion using new_libIGCM function defined here /ccc/cont003/home/dsm/p86mart/.bash_alias see #113 #116

Location:

trunk/libIGCM

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (2 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)
• libIGCM_ensemble/libIGCM_ensemble.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -121 +121 @@
         unset card_UserChoices
       fi
-      eval set +A card_UserChoices -- \${${compname}_UserChoices[*]} > /dev/null 2>&1
+      eval card_UserChoices=( \${${compname}_UserChoices[*]} )
       IGCM_debug_Print 3 "${compname}_UserChoices_values:"
       for option in ${card_UserChoices[*]} ; do
@@ -204 +204 @@
                   IGCM_debug_Print 3 "${Dimension} time series activated with chunck for ${flag_post}"
                   eval TimeSeriesChunck${Dimension}=true
-                  eval set +A CHUNCK${Dimension}_COMP \${CHUNCK${Dimension}_COMP[*]} ${comp}
-                  eval set +A CHUNCK${Dimension}_FLAG \${CHUNCK${Dimension}_FLAG[*]} ${i}
-                  eval set +A CHUNCK${Dimension}_NAME \${CHUNCK${Dimension}_NAME[*]} ${flag_post}
-                  eval set +A CHUNCK${Dimension}_SIZE \${CHUNCK${Dimension}_SIZE[*]} ${chunck_size}
+                  eval CHUNCK${Dimension}_COMP[\${#CHUNCK${Dimension}_COMP[*]}]=${comp}
+                  eval CHUNCK${Dimension}_FLAG[\${#CHUNCK${Dimension}_FLAG[*]}]=${i}
+                  eval CHUNCK${Dimension}_NAME[\${#CHUNCK${Dimension}_NAME[*]}]=${flag_post}
+                  eval CHUNCK${Dimension}_SIZE[\${#CHUNCK${Dimension}_SIZE[*]}]=${chunck_size}
                 fi
               fi

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -375 +375 @@
     i=0
     until [ $i -ge $PeriodLengthInMonths ] ; do
-      if [ $(( month + i )) -lt 13 ] ; then
-        (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( month + i )) ) ))
+      if [ $(( 10#${month} + ${i} )) -lt 13 ] ; then
+        (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( 10#${month} + ${i} )) ) ))
       else
-        (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( month + i - 12 )) ) ))
+        (( PeriodLengthInDays  = PeriodLengthInDays + $( IGCM_date_DaysInMonth $year $(( 10#${month} + ${i} - 12 )) ) ))
       fi
       (( i=i+1 ))
@@ -606 +606 @@
   # Compute month_m1 (month minus 1M)
   # Compute yyyymm_m1 (yyyymm minus 1M)
-  month_m1=$(( month - 1 ))
+  month_m1=$(( 10#${month} - 1 ))
   if [ ${month_m1} = 0 ]; then
     month_m1=12
@@ -618 +618 @@
   # Compute month_p1 (month plus 1M)
   # Compute yyyymm_p1 (yyyymm plus 1M)
-  month_p1=$(( month + 1 ))
+  month_p1=$(( 10#${month} + 1 ))
   if [ ${month_p1} = 13 ]; then
     month_p1=01

trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh

@@ -403 +403 @@
       siecle=$( (( $siecle - 18 )) )
       StartYear="${siecle}$( echo $year | cut -c3-4 )"
-      StartMonth="${AlphaMonth[ (( $month - 1 )) ]}"
+      StartMonth="${AlphaMonth[ (( 10#${month} - 1 )) ]}"
       StartDir="${Name}${StartYear}${StartMonth}"
       ;;