Changeset 1766

Timestamp:

06/11/12 17:25:38 (12 years ago)

Author:

aclsce

Message:

Modified to take into account new name of listfiles.

Location:

TOOLS/PACK_IPSL

Files:

• enlarge_my_files.sh (modified) (4 diffs)
• launch_ipsl_enlarge.sh (modified) (1 diff)

TOOLS/PACK_IPSL/enlarge_my_files.sh

@@ -62 +62 @@
 fi
 
-if [[ ! -d $PATH_SIMU/output_ncrcat || ! -d $PATH_SIMU/output_tar ]] ; then
+if [[ ! -d $PATH_SIMU/output_ncrcat || ! -d $PATH_SIMU/output_tar || ! -d $PATH_SIMU/restart_tar || ! -d $PATH_SIMU/store_cp || ! -d $PATH_SIMU/work_cp || ! -d $PATH_SIMU/debug_tar || ! -d $PATH_SIMU/other_tar ]] ; then
         `dirname $0`/enlarge_my_files.sh -h
         exit
@@ -129 +129 @@
 
         #-----------------------------------
-        # Set output file name from first and last files from the current set
+        # Set output file name from list name
+
+        fileout1=$( basename $set )
+        fileout=${fileout1%.list}
+
         filefirst=`head -n 1 $set`
-        fileoutpart1=`basename $filefirst | cut -d'_' -f-2`
-        filelast=`tail -n 1 $set`
-        fileoutpart2=`basename $filelast | cut -d'_' -f3-`
-
         diroutputfile=`dirname $filefirst | sed -e "s%$dirin%$dirout%"`
-#       outputfile=$diroutputfile/ncrcat_${fileoutpart1}_${fileoutpart2}
-        outputfile=$diroutputfile/${fileoutpart1}_${fileoutpart2}
+
+        outputfile=$diroutputfile/${fileout}
         mkdir -p $diroutputfile
         echo "Output file to write: $outputfile"
@@ -158 +158 @@
         # Try 2 times before fire "FAILED"
         ncrcatcmd=ncrcat
-        ncrcatoptions="--md5_digest"
-#       ncrcatoptions=""
+#       ncrcatoptions="--md5_digest"
+        ncrcatoptions=""
 
         cat $set | $ncrcatcmd $ncrcatoptions -O -x -v $varstoexclude -o $outputfile > $logfile 2>&1
@@ -222 +222 @@
         #-----------------------------------
         # Set output file name from list name
+
+        fileout1=$( basename $set )
+        fileout=${fileout1%.list}.tar
+        
         filefirst=`head -n 1 $set`
-        dirinputfile=`dirname $filefirst`
-        diroutputfile=`dirname $filefirst | sed -e "s%$dirin%$dirout%"`
+        diroutputfile=`dirname $filefirst | sed -e "s%$dirin%$dirout%"` 
+
+        outputfile=$diroutputfile/${fileout}
         mkdir -p $diroutputfile
-#           echo "Output file to write: $outputfile"
-        fileout1=$( basename $set )
-        outputfile=${fileout1%.list}.tar
         echo "Output file to write: $outputfile"
 

TOOLS/PACK_IPSL/launch_ipsl_enlarge.sh

@@ -37 +37 @@
     DEM_state=$( DEM_read_state ${IGCM_DEM}/config_card.liste ${CONFIG} )
 
-    DEM_write_state ${IGCM_DEM}/config_card.liste ${CONFIG} PackRunning
-    export PATH_SIMU=$( dirname $CONFIG )
-    ${EXE_DIR}/enlarge_my_files.sh ${INPUT_DMF_DATA} ${OUTPUT_STORE} ${OUTPUT_WORK}
+    if [[ "${DEM_state}" != "WriteListTarDone" ]] ; then
+
+        DEM_write_state ${IGCM_DEM}/config_card.liste ${CONFIG} PackRunning
+        export PATH_SIMU=$( dirname $CONFIG )
+        ${EXE_DIR}/enlarge_my_files.sh ${INPUT_DMF_DATA} ${OUTPUT_STORE} ${OUTPUT_WORK}
     
-    DEM_write_state ${IGCM_DEM}/config_card.liste ${CONFIG} PackDone
+        DEM_write_state ${IGCM_DEM}/config_card.liste ${CONFIG} PackDone
+
+    fi
 
 done