Changeset 801 for trunk/libIGCM/libIGCM_comp

Timestamp:

02/19/13 18:35:41 (11 years ago)

Author:

sdipsl

Message:

• Some adaptation so as to find and prepare tared restart on Ada.

File:

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

trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

@@ -716 +716 @@
               # Look after the tar file we want if we did not found it already
               if [ X${IsMatching} = X ] ; then
-                for PotentialTarFile in $( find ${RestartPath}/${RestartJobName}/RESTART -name "${RestartJobName}_*_restart.tar" -print ) ; do
+                for PotentialTarFile in $( IGCM_sys_RshArchive "find ${RestartPath}/${RestartJobName}/RESTART -name "${RestartJobName}_*_restart.tar" -print" ) ; do
                   IsMatching=$( echo ${PotentialTarFile##*/} | \
                         sed "s:^${RestartJobName}_::" | \
@@ -728 +728 @@
                 done
               fi
-              IGCM_debug_Print 1 "tar xvf ${TarFileFound} ${comp}_${generic_restart_file_name_in}*.${extension_in}"
-              tar xvf ${TarFileFound} ${comp}_${generic_restart_file_name_in}*.${extension_in}
+              TarFileLocation=$( IGCM_sys_PrepareTaredRestart ${TarFileFound} )
+              IGCM_debug_Print 1 "tar xvf ${TarFileLocation} ${comp}_${generic_restart_file_name_in}*.${extension_in}"
+              tar xvf ${TarFileLocation} ${comp}_${generic_restart_file_name_in}*.${extension_in}
               nb_restart_file=$( IGCM_sys_CountFileBuffer ${comp}_${generic_restart_file_name_in}_????.${extension_in} )
             fi
@@ -819 +820 @@
             # 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" -print ) ; do
+              for PotentialTarFile in $( IGCM_sys_RshArchive "find ${R_SAVE}/RESTART -name "${config_UserChoices_JobName}_*_restart.tar" -print" ) ; 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
@@ -827 +828 @@
               done
             fi
-            tar xvf ${TarFileFound} ${comp}_${generic_restart_file_name_in}*.${extension_in}
+            TarFileLocation=$( IGCM_sys_PrepareTaredRestart ${TarFileFound} )
+            IGCM_debug_Print 1 "tar xvf ${TarFileLocation} ${comp}_${generic_restart_file_name_in}*.${extension_in}"
+            tar xvf ${TarFileLocation} ${comp}_${generic_restart_file_name_in}*.${extension_in}
             nb_restart_file=$( IGCM_sys_CountFileBuffer ${comp}_${generic_restart_file_name_in}_????.${extension_in} )
           fi