Changeset 151

Timestamp:

08/13/09 19:22:53 (15 years ago)

Author:

sdipsl

Message:

• Reduce restart movement between iteration (--> mv restart start)
• Reduce binary movement between iteration (reuse same binary if size does not change)

Location:

trunk/libIGCM

Files:

• libIGCM_comp/libIGCM_comp.ksh (modified) (10 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (2 diffs)

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -433 +433 @@
         eval compname=\${config_ListOfComponents_${comp}[0]} > /dev/null 2>&1
         eval comptagname=\${config_ListOfComponents_${comp}[1]} > /dev/null 2>&1
+        #
+        card=${SUBMIT_DIR}/COMP/${compname}.card
+        #
+        IGCM_card_DefineArrayFromOption ${card} RestartFiles List
+        ListFilesName=${compname}_RestartFiles_List
+        eval FileName0=\${${ListFilesName}[0]} > /dev/null 2>&1
 
         # Debug Print :
         IGCM_debug_Print 3 "restart ${compname}"
-
-        card=${SUBMIT_DIR}/COMP/${compname}.card        
 
         if ( ${FirstInitialize} ) ; then
@@ -471 +475 @@
             if [ "${do_start}" = "y" ] ; then
 
-                IGCM_card_DefineArrayFromOption ${card} RestartFiles List
-                ListFilesName=${compname}_RestartFiles_List
-                eval FileName0=\${${ListFilesName}[0]} > /dev/null 2>&1
-                
                 if ( [ X${FileName0} != X${NULL_STR} ] && [ X${FileName0} != XNONE ] ) ; then
                     eval NbFiles=\${#${ListFilesName}[@]} > /dev/null 2>&1
@@ -503 +503 @@
                                 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
+                                #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
                             eval IGCM_sys_Get ${Path_r}/${file_in_Name} ${file_out}  
-                            IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
+                            #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
                         fi
                 
@@ -522 +522 @@
                 fi
             fi
-        else
-            # if not FirstInitialize
+        elif [ ${Period} -eq 1 ] ; then
+            # if not FirstInitialize and first loop of this job
 
             # Restore Restarts files
             #-----------------------
-            IGCM_card_DefineArrayFromOption ${card} RestartFiles List
-            ListFilesName=${compname}_RestartFiles_List
-            eval FileName0=\${${ListFilesName}[0]} > /dev/null 2>&1
-            
             if ( [ X${FileName0} != X${NULL_STR} ] && [ X${FileName0} != XNONE ] ) ; then
                 eval NbFiles=\${#${ListFilesName}[@]} > /dev/null 2>&1
@@ -555 +551 @@
                             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
+                            #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 ))
@@ -562 +558 @@
                     else
                         eval IGCM_sys_Get \${R_OUT_${comp}_R}/${file_in_Name} ${file_out}
-                        IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
+                        #IGCM_comp_PrepareDeletedFiles ${file_in} ${file_out}
                     fi
 
@@ -601 +597 @@
         eval ExeNameIn=\${config_Executable_${comp}[0]}
         eval ExeNameOut=\${config_Executable_${comp}[1]}
-        if [ -f ${R_EXE}/${ExeNameIn} ]  ; then
+
+        if [ ${Period} -eq 1 ] && [ -f ${R_EXE}/${ExeNameIn} ] ; then
             eval IGCM_sys_Cp ${R_EXE}/${ExeNameIn} ${ExeNameOut}
             if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then
                 eval IGCM_sys_Chmod +rx ${RUN_DIR}/${ExeNameOut}
-            fi
+            fi
+        elif [ -f ${R_EXE}/${ExeNameIn} ] && [ ! -f ${RUN_DIR}/${ExeNameOut} ] ; then
+            eval IGCM_sys_Cp ${R_EXE}/${ExeNameIn} ${ExeNameOut}
+            if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then
+                eval IGCM_sys_Chmod +rx ${RUN_DIR}/${ExeNameOut}
+            fi
         fi
 
@@ -630 +632 @@
     typeset ListTextName TextName0
     typeset comp compname comptagname card ListFilesName FileName0 NbFiles SaveOnArchive
-    typeset i i_ file_in file_in_ file_out file_out_ generic_file_name nb_rebuild_file
+    typeset i i_ file_in file_in_ file_out file_out_ file_outin file_outin_ generic_file_name nb_rebuild_file
     typeset -Z4 j4
     for comp in ${config_ListOfComponents[*]} ; do
@@ -661 +663 @@
                 eval file_out_=\${${ListFilesName}[$i_]} > /dev/null 2>&1
                 eval file_out=${file_out_}
-                
-                generic_restart_file_name_in=$( basename ${file_in} .nc )
-                generic_restart_file_name_out=$( basename ${config_UserChoices_JobName}_${PeriodDateEnd}_${file_out} .nc )
+
+                (( i_ = i+2 ))
+                eval file_outin_=\${${ListFilesName}[$i_]} > /dev/null 2>&1
+                eval file_outin=${file_outin_}
+
+                generic_restart_file_name_in=$(    basename ${file_in} .nc )
+                generic_restart_file_name_out=$(   basename ${config_UserChoices_JobName}_${PeriodDateEnd}_${file_out} .nc )
+                generic_restart_file_name_outin=$( basename ${file_outin} .nc )
                         
                 nb_restart_file=$( ls ${generic_restart_file_name_in}_????.nc 2>/dev/null | wc -l ) 
@@ -671 +678 @@
                         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
+                        [ ! ${file_in} = ${file_outin} ] && IGCM_sys_Mv ${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_outin}_${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
+                    [ ! ${file_in} = ${file_outin} ] && IGCM_sys_Mv ${file_in} ${file_outin}
+                    #eval FileToBeDeleted[${#FileToBeDeleted[@]}]="${file_in}" > /dev/null 2>&1
                 fi
 

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -486 +486 @@
             fi
             ExeDate=${ExeDate}_${LS_comp[7]}
-
-            eval FileToBeDeleted[${#FileToBeDeleted[@]}]=${ExeNameOut}
         fi
 
@@ -499 +497 @@
         (( i=i+1 ))
 
-        if [ ${ExeSize} -ne ${LastCompExeSize} ] ; then 
+        if [ ${ExeSize} -ne ${LastCompExeSize} ] ; then
             if ( ${FirstInitialize} ) ; then
                 IGCM_debug_Print 1 "Put first ${ExeNameIn} in ${R_OUT_EXE} !"
             else
                 IGCM_debug_Print 1 "${ExeNameIn} has changed in ${R_EXE} !"
+                eval FileToBeDeleted[${#FileToBeDeleted[@]}]=${ExeNameOut}
             fi
             eval IGCM_sys_Put_Out ${ExeNameOut} ${R_OUT_EXE}/${PREFIX}_${ExeNameIn}
+            IGCM_sys_Chmod u+xw ${ExeNameOut}
         fi
     done