Changeset 548 for trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

Timestamp:

02/09/12 19:04:14 (12 years ago)

Author:

sdipsl

Message:

Bugfix : when retrieving input ifiles from another filesystem than /dmnfs you must not use dmget ... it hangs forever ...

File:

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

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -299 +299 @@
             eval file_out_=\${${ListFilesName}[$i_]} > /dev/null 2>&1
             eval file_out=${file_out_}
-            
-            IGCM_sys_Get ${file_in} ${file_out}
-            #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
-
+
+            IGCM_sys_IsFileArchived ${file_in}
+            if [ ! $? = 0 ] ; then
+              IGCM_sys_Get ${file_in} ${file_out}
+              #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
+            else
+              IGCM_sys_Cp ${file_in} ${file_out}
+            fi
             (( i=i+2 ))
           done
@@ -418 +422 @@
         [ ${SmoothMax} -eq -1 ] && SmoothMax=${CumulPeriod}
         if ( [ X${ret} = Xtrue ] || ( [ ${Period} -eq 1 ] && [ ${CumulPeriod} -ge ${SmoothMin} ] && [ ${CumulPeriod} -le ${SmoothMax} ] ) ) ; then
-          #if ( [ X${ret} = Xtrue ] || [ ${Period} -eq 1 ] ) ; then
-          IGCM_sys_Get ${file_in} ${file_out}
-          #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
+
+          IGCM_sys_IsFileArchived ${file_in}
+          if [ ! $? = 0 ] ; then
+            IGCM_sys_Get ${file_in} ${file_out}
+            #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
+          else
+            IGCM_sys_Cp ${file_in} ${file_out}
+          fi
         fi
         (( i=i+3 ))
@@ -498 +507 @@
           eval file_out=${file_out_}
 
-          IGCM_sys_Get ${file_in} ${file_out}
+          IGCM_sys_IsFileArchived ${file_in}
+          if [ $? = 0 ] ; then
+            IGCM_sys_Get ${file_in} ${file_out}
+            #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
+          else
+            IGCM_sys_Cp ${file_in} ${file_out}
+          fi
 
           if [ X${file_out} != X. ] ; then