Changeset 40 for trunk/libIGCM/libIGCM_comp

Timestamp:

12/08/08 19:23:38 (15 years ago)

Author:

sdipsl

Message:

SD : - Tweak IGCM_sys_RshArchive function for non IDRIS machine

• Comment out parallel restart case / work only in parallel not in sequential

File:

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

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -430 +430 @@
                         
                         eval Path_temp=\${Path_r}/${generic_restart_file_name_in}
-                        
-                        nb_restart_file=$( IGCM_sys_RshArchive ls ${Path_temp}_????.nc 2>/dev/null | wc -l )
-
-                        if [ ${nb_restart_file} -gt 1 ] ; then
-                            j=0
-                            until [ $j -ge $nb_restart_file ]; do
-                                j4=${j}
-                                eval IGCM_sys_Get ${Path_r}/${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
-                                IGCM_comp_PrepareDeletedFiles ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
+#                       IGCM_sys_RshArchive ls ${Path_temp}_????.nc 2>/dev/null | wc -l
+#                       nb_restart_file=$( IGCM_sys_RshArchive ls ${Path_temp}_????.nc 2>/dev/null | wc -l )
+
+#                       if [ ${nb_restart_file} -gt 2 ] ; then
+#                           j=0
+#                           until [ $j -ge $nb_restart_file ]; do
+#                               j4=${j}
+#                               eval IGCM_sys_Get ${Path_r}/${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
+#                               IGCM_comp_PrepareDeletedFiles ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
 #                               eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_out}_${j4}.nc" > /dev/null 2>&1
-                                (( j=j+1 ))
-                            done
-                        else
+#                               (( j=j+1 ))
+#                           done
+#                       else
                             eval IGCM_sys_Get ${Path_r}/${file_in_Name} ${file_out}  
                             IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
-                        fi
+#                       fi
                 
                         (( i=i+3 ))
@@ -483 +483 @@
 
                     eval Path_temp=\${R_OUT_${comp}_R}/${generic_restart_file_name_in}
-                        
-                    nb_restart_file=$( IGCM_sys_RshArchive ls ${Path_temp}_????.nc 2>/dev/null | wc -l )
-                    if [ ${nb_restart_file} -gt 1 ] ; then
-                        j=0
-                        until [ $j -ge $nb_restart_file ]; do
-                            j4=${j}
-                            eval IGCM_sys_Get \${R_OUT_${comp}_R}/${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
-                            IGCM_comp_PrepareDeletedFiles ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
+                    IGCM_debug_Print 1 "TEST RshArchive"
+#                   IGCM_sys_RshArchive ls ${Path_temp}_????.nc 2>/dev/null | wc -l
+#                   nb_restart_file=$( IGCM_sys_RshArchive ls ${Path_temp}_????.nc 2>/dev/null | wc -l )
+#                   IGCM_debug_Print 1 "nb_restart_file=${nb_restart_file}"
+#                   if [ ${nb_restart_file} -gt 2 ] ; then
+#                       j=0
+#                       until [ $j -ge $nb_restart_file ]; do
+#                           j4=${j}
+#                           eval IGCM_sys_Get \${R_OUT_${comp}_R}/${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
+#                           IGCM_comp_PrepareDeletedFiles ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
 #                           eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_out}_${j4}.nc" > /dev/null 2>&1
-
-                            (( j=j+1 ))
-                        done
-                    else
+#
+#                           (( j=j+1 ))
+#                       done
+#                   else
                         eval IGCM_sys_Get \${R_OUT_${comp}_R}/${file_in_Name} ${file_out}
                         IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
-                    fi
+#                   fi
 
                     (( i=i+3 ))
@@ -600 +602 @@
                 generic_restart_file_name_out=$( basename ${config_UserChoices_JobName}_${PeriodDateEnd}_${file_out} .nc )
                         
-                nb_restart_file=$( ls ${generic_restart_file_name_in}_????.nc 2>/dev/null | wc -l )
-
-                if [ ${nb_restart_file} -gt 1 ] ; then
-                    j=0
-                    until [ $j -ge $nb_restart_file ]; do
-                        j4=${j}
-                        eval IGCM_sys_Put_Rest ${generic_restart_file_name_in}_${j4}.nc \${R_OUT_${comp}_R}/${generic_restart_file_name_out}_${j4}.nc
-                        eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_in}_${j4}.nc" > /dev/null 2>&1
-                        (( j=j+1 ))
-                    done
-                else
+#               nb_restart_file=$( ls ${generic_restart_file_name_in}_????.nc 2>/dev/null | wc -l )
+#               IGCM_debug_Print 1 "TEST RshArchive"
+#               IGCM_debug_Print 1 "nb_restart_file=${nb_restart_file}"
+#               if [ ${nb_restart_file} -gt 2 ] ; then
+#                   j=0
+#                   until [ $j -ge $nb_restart_file ]; do
+#                       j4=${j}
+#                       eval IGCM_sys_Put_Rest ${generic_restart_file_name_in}_${j4}.nc \${R_OUT_${comp}_R}/${generic_restart_file_name_out}_${j4}.nc
+#                       eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${generic_restart_file_name_in}_${j4}.nc" > /dev/null 2>&1
+#                       (( j=j+1 ))
+#                   done
+#               else
                     eval IGCM_sys_Put_Rest ${file_in} \${R_OUT_${comp}_R}/${config_UserChoices_JobName}_${PeriodDateEnd}_${file_out}
                     eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${file_in}" > /dev/null 2>&1
-                fi
+#               fi
 
                 (( i=i+3 ))