Changeset 1876 for TOOLS

Timestamp:

09/12/12 17:05:43 (12 years ago)

Author:

gpincka

Message:

correction pour simu type 'tar full'

Location:

TOOLS/PACK_IPSL

Files:

• enlarge_my_files.sh (modified) (7 diffs)
• launch_ipsl_enlarge.sh (modified) (1 diff)
• showPackProgress.sh (modified) (1 diff)
• tar_full_simu.sh (deleted)

TOOLS/PACK_IPSL/enlarge_my_files.sh

@@ -280 +280 @@
             #-----------------------------------
             # nbtries = number of lines from status file (first comment line gives 1 for the first try)
-            # nbtries=`wc -l $statusfile | cut -d' ' -f1`               
+            nbtries=`wc -l $statusfile | cut -d' ' -f1`         
             # echo "Nb of tries: $nbtries"
 
@@ -364 +364 @@
             #-----------------------------------
             # nbtries = number of lines from status file (first comment line gives 1 for the first try)
-            # nbtries=`wc -l $statusfile | cut -d' ' -f1`               
+            nbtries=`wc -l $statusfile | cut -d' ' -f1`         
             # echo "Nb of tries: $nbtries"
 
@@ -440 +440 @@
             #-----------------------------------
             # nbtries = number of lines from status file (first comment line gives 1 for the first try)
-            # nbtries=`wc -l $statusfile | cut -d' ' -f1`               
+            nbtries=`wc -l $statusfile | cut -d' ' -f1`         
             # echo "Nb of tries: $nbtries"
 
@@ -516 +516 @@
             #-----------------------------------
             # nbtries = number of lines from status file (first comment line gives 1 for the first try)
-            # nbtries=`wc -l $statusfile | cut -d' ' -f1`               
+            nbtries=`wc -l $statusfile | cut -d' ' -f1`         
             # echo "Nb of tries: $nbtries"
 
@@ -585 +585 @@
             #-----------------------------------
             # nbtries = number of lines from status file (first comment line gives 1 for the first try)
-            # nbtries=`wc -l $statusfile | cut -d' ' -f1`               
+            nbtries=`wc -l $statusfile | cut -d' ' -f1`         
             # echo "Nb of tries: $nbtries"
 
@@ -627 +627 @@
     done
 fi
-# if [ "$baseNameOfListFile" == "tar_full_simul.list" ]
+
 for set in $( ls ${PATH_SIMU}/*.list | grep "tar_full_simul" )
 do
@@ -650 +650 @@
                 printf "====> "
                 tail -1 $statusfile
-                exit 0
+                continue
         fi
-
+        
+        #-----------------------------------
+        # nbtries = number of lines from status file (first comment line gives 1 for the first try)
+        nbtries=`wc -l $statusfile | cut -d' ' -f1`         
+        # echo "Nb of tries: $nbtries"
+            
         #-----------------------------------
         # Set output file name from list name
         # echo "PATH_SIMU=$PATH_SIMU"
         dirOfOutputFile=`echo $PATH_SIMU | sed "s;${IGCM_DEM};${OUTPUT_STORE};" `
-        fileout=${dirnameOfListFile}.tar
+        # echo "dirOfOutputFile=$dirOfOutputFile"
+        dirOfOutputFile_Up=$( dirname $dirOfOutputFile )
+        PATH_SIMU_NAME=$( basename $dirOfOutputFile )
+        fileout=${PATH_SIMU_NAME}.tar
         # echo "dirnameOfListFile=$dirnameOfListFile"
-        outputfile=$dirOfOutputFile/${fileout}
-        mkdir -p $dirOfOutputFile
+        outputfile=$dirOfOutputFile_Up/${fileout}
+        # echo "outputfile=$outputfile"
+        # exit 1 # gpdebug : a virer
+        mkdir -p $dirOfOutputFile_Up
         echo "Output file to write: $outputfile  tar_full_simul"
         

TOOLS/PACK_IPSL/launch_ipsl_enlarge.sh

@@ -128 +128 @@
         DEM_write_state ${IGCM_DEM}/config_card.liste ${CONFIG} TarRunning
         export PATH_SIMU=$( dirname $CONFIG )
-        ${EXE_DIR}/tar_full_simu.sh  ${INPUT_DMF_DATA} ${OUTPUT_STORE} ${CONFIG}
-        
+        # ${EXE_DIR}/tar_full_simu.sh  ${INPUT_DMF_DATA} ${OUTPUT_STORE} ${CONFIG}
+        ${EXE_DIR}/enlarge_my_files.sh  ${INPUT_DMF_DATA} ${OUTPUT_STORE} ${CONFIG}
         DEM_write_state ${IGCM_DEM}/config_card.liste ${CONFIG} TarDone
 

TOOLS/PACK_IPSL/showPackProgress.sh

@@ -250 +250 @@
          nbOfListsNottreated=$(( $nbOfListsNottreated + 1 ))
          simuOK=$(( $simuOK && 0 )) # marque une simu pas OK
-     simutreated=$(( $simutreated && 0 )) # marque une simu non completement traitee
+         simutreated=$(( $simutreated && 0 )) # marque une simu non completement traitee
      fi