Changeset 590 for trunk/libIGCM/libIGCM_comp

Timestamp:

03/21/12 11:02:21 (12 years ago)

Author:

sdipsl

Message:

• can extract needed restart from a tar (up to 20 minutes on titane)
  • still to do : introduce a lag when cleaning the restart buffer so that we don't look into the tar too often
  • still to do : work on the clean_month procedure
• rebuild process submit pack_output process if needed
  • still to do : a pack_output able to submit create_ts/create_se if needed
• bugfixes/cosmetics/cleaning
• SX9 and titane OK.

File:

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

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -608 +608 @@
   echo
 
-  typeset Date_tmp Date_r Path_r do_start CompOldName Path_OUT Path_BUF Buffered
+  typeset Date_tmp Date_r Path_r do_start CompOldName Path_OUT Path_BUF
+  typeset Buffered Archived Tared PotentialTarFile IsMatching TarFileFound
   typeset comp compname comptagname card ListFilesName FileName0 NbFiles i i_ 
   typeset file_in file_out file_in_ file_out_ file_in_Name
@@ -637 +638 @@
         eval CompOldName=${comp}
       else
-                # Read component Restarts parameters
+        # Read component Restarts parameters
         IGCM_card_DefineVariableFromOption ${SUBMIT_DIR}/config.card ${comp} Restart
         eval do_start=\${config_${comp}_Restart} > /dev/null 2>&1
@@ -731 +732 @@
 
           if [ -f ${Path_BUF}*.nc ] ; then
+            IGCM_debug_Print 3 "Buffered restart"
             Buffered=true
+            Archived=false
+            Tared=false
             nb_restart_file=$(IGCM_sys_CountFileBuffer ${Path_BUF}_????.nc)
+          elif [ -f ${Path_OUT}*.nc ] ; then
+            IGCM_debug_Print 3 "Archived restart"
+            Buffered=false
+            Archived=true
+            Tared=false
+            nb_restart_file=$(IGCM_sys_CountFileArchive ${Path_OUT}_????.nc)
           else
+            IGCM_debug_Print 3 "Tared restart"
             Buffered=false
-            nb_restart_file=$(IGCM_sys_CountFileArchive ${Path_OUT}_????.nc)
+            Archived=false
+            Tared=true
+            # Look after the tar file we want if we did not found it already
+            if [ X${IsMatching} = X ] ; then
+              for PotentialTarFile in $( find ${R_SAVE}/RESTART -name "${config_UserChoices_JobName}_*_restart.tar" ) ; do
+                IsMatching=$( echo ${PotentialTarFile} | sed "s:^${config_UserChoices_JobName}_::" | sed "s:\.restart\.tar$::" | gawk -F_ -v restartdate=${LastPeriodDateEnd} '{if (($1 < restartdate) && ($2 > restartdate)) {print $1"_"$2}}' )
+                if [ ! X${IsMatching} = X ] ; then
+                  TarFileFound=${PotentialTarFile}
+                  break
+                fi
+              done
+            fi
+            tar xvf ${TarFileFound} ${comp}_${generic_restart_file_name_in}*.nc
+            nb_restart_file=$( IGCM_sys_CountFileBuffer ${comp}_${generic_restart_file_name_in}_????.nc )
           fi
 
@@ -742 +766 @@
             until [ $j -ge $nb_restart_file ]; do
               j4=${j}
-              if [ ${Buffered} ] ; then
+              if [ X${Buffered} = Xtrue ] ; then
                 IGCM_sys_GetBuffer ${Path_BUF}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
-              else
+              elif [ X${Archived} = Xtrue ] ; then
                 IGCM_sys_Get ${Path_OUT}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
+              elif [ X${Tared} = Xtrue ] ; then
+                IGCM_sys_Mv ${comp}_${generic_restart_file_name_in}_${j4}.nc ${generic_restart_file_name_out}_${j4}.nc
               fi
               (( j=j+1 ))
             done
           else
-            if [ ${Buffered} ] ; then
+            if [ X${Buffered} = Xtrue ] ; then
               eval IGCM_sys_GetBuffer \${R_BUF_${comp}_R}/${file_in_Name} ${file_out}
-            else
+            elif [ X${Archived} = Xtrue ] ; then
               eval IGCM_sys_Get \${R_OUT_${comp}_R}/${file_in_Name} ${file_out}
-            fi
-          fi
-
+            elif [ X${Tared} = Xtrue ] ; then
+              IGCM_sys_Mv ${comp}_${file_in_Name} ${file_out}
+            fi
+          fi
           (( i=i+3 ))
         done