Changeset 412

Timestamp:

01/28/11 17:22:24 (13 years ago)

Author:

sdipsl

Message:

• Bug fix due to the scope of function variables.

Doing aux=$( myfunction ) : this makes the function be called in a separate ksh process, which cannot dynamically share variables back to the parent shell.

File:

• trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh (modified) (6 diffs)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -306 +306 @@
 {
     IGCM_debug_PushStack "IGCM_SmoothModulo"
+
+    set -vx
     typeset defVector ModValue
 
     eval set +A defVector -- $( echo "${1}" | \
         gawk -F ':' '{print ($1 == "" ? 1 : $1) " " (NF==3 ? ($2 == "" ? 1 : $2) : 1) " " (NF==3 ? ($3 == "" ? -1 : $3) : ($2 == "" ? -1 : $2))}' )
+
+    # Save Smooth Min and Max. Needed to call IGCM_sys_Get when appropriate
+    arr[1]=${defVector[0]}
+    arr[2]=${defVector[2]}
 
     # Test limits : 
@@ -317 +323 @@
          ( [ ${2} -le ${defVector[2]} ] || \
            [ ${defVector[2]} -lt 0 ] ) ) ; then
-
-        # Save Smooth Min and Max. Needed to call IGCM_sys_Get when appropriate
-        SmoothMin=${defVector[0]}
-        SmoothMax=${defVector[2]}
         # Test modulo
         ModValue=$( expr \( ${2} - ${defVector[0]} \) % ${defVector[1]} )
         if [ ${ModValue} -eq 0 ] ;  then
-            echo true
+            arr[3]=true
+            echo ${arr[@]}
             IGCM_debug_PopStack "IGCM_SmoothModulo"
             return 1
         else
-            echo false
+            arr[3]=false
+            echo ${arr[@]}
             IGCM_debug_PopStack "IGCM_SmoothModulo"
             return 0
         fi
     else
-        echo false
+        arr[3]=false
+        echo ${arr[@]}
         IGCM_debug_PopStack "IGCM_SmoothModulo"
         return 0
@@ -344 +349 @@
     IGCM_debug_PushStack "IGCM_comp_GetInputSmoothFiles"
 
+    set -vx
+
     # Debug Print :
     echo
@@ -349 +356 @@
     echo
 
-    typeset comp compname comptagname card ListFilesName FileName0 NbFiles i i_ i__
-    typeset file_in_ file_in file_out_ file_out ret SmoothDef
+    typeset comp compname comptagname card ListFilesName FileName0 NbFiles j i i_ i__
+    typeset file_in_ file_in file_out_ file_out ret SmoothDef aux val
 
     for comp in ${config_ListOfComponents[*]} ; do
-
         echo "-----"
         # Define component
@@ -373 +379 @@
             (( i=0 ))
             until [ $i -ge $NbFiles ]; do
-
                 eval file_in_=\${${ListFilesName}[$i]} > /dev/null 2>&1
                 eval file_in=${file_in_}
@@ -384 +389 @@
                 eval SmoothDef=\${${ListFilesName}[$i__]}
                 IGCM_debug_Print 3 "  ${file_in} ${SmoothDef}"
-                eval ret=$( IGCM_SmoothModulo ${SmoothDef} ${CumulPeriod} )
-                if ( [ X${ret} = Xtrue ] || ( [ ${Period} -eq 1 ] && [ ${CumulPeriod} -ge ${SmoothMin} ] && [ ${CumulPeriod} -le ${SmoothMax} ) ) ; then
+                aux=$( IGCM_SmoothModulo ${SmoothDef} ${CumulPeriod} )
+                j=1
+                for val in ${aux} ; do
+                    [ ${j} -eq 1 ] && SmoothMin=${val}
+                    [ ${j} -eq 2 ] && SmoothMax=${val}
+                    [ ${j} -eq 3 ] && ret=${val}
+                    (( j=j+1 ))
+                done
+                if ( [ X${ret} = Xtrue ] || ( [ ${Period} -eq 1 ] && [ ${CumulPeriod} -ge ${SmoothMin} ] && [ ${CumulPeriod} -le ${SmoothMax} ] ) ) ; then
                     IGCM_sys_Get ${file_in} ${file_out}
                     #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}