Changeset 1885

Timestamp:

09/17/12 15:29:09 (12 years ago)

Author:

aclsce

Message:

• Option to delete input files
• set +x added to avoid too many prints
• double check by default

Location:

TOOLS/PACK_IPSL

Files:

• launch_and_measureTime.sh (modified) (5 diffs)
• loadParameters.sh (modified) (1 diff)
• load_batch_directives.sh (modified) (2 diffs)
• parallelPack.sh (modified) (4 diffs)
• showPackProgress.sh (modified) (6 diffs)

TOOLS/PACK_IPSL/launch_and_measureTime.sh

@@ -258 +258 @@
          do
              echo "rm -f${opt} $file" >> ${rmvedFiles}
-             # rm -f${opt} $file
+             if [ "x$deleteFiles" == "x1" ]
+             then
+                 rm -f${opt} $file
+             fi
          done     
      done
@@ -307 +310 @@
      do
          echo "rm -f $file" >> ${rmvedFiles}
-         # rm -f $file
+         if [ "x$deleteFiles" == "x1" ]
+         then
+             rm -f $file
+         fi
      done
      
@@ -314 +320 @@
      do
          echo "rm -f $file" >> ${rmvedFiles}
-         # rm -f $file
+         if [ "x$deleteFiles" == "x1" ]
+         then
+             rm -f $file
+         fi
      done     
      
@@ -334 +343 @@
 #MSUB -r pack_ipsl          # Nom du job                
 ### mutable directives ###
-#MSUB -o /ccc/dmfbuf/ipsl_logs/dsm/bacasable/ARNAUD/PSEUDO_DMNFS_PROGRESS/zIGCM_OUT/IPSLCM5/detailed_pack_output/pack_ipsl_%I.o
-#MSUB -e /ccc/dmfbuf/ipsl_logs/dsm/bacasable/ARNAUD/PSEUDO_DMNFS_PROGRESS/zIGCM_OUT/IPSLCM5/detailed_pack_output/pack_ipsl_%I.e
+#MSUB -o /ccc/dmfbuf/ipsl_logs/dsm/bacasable/ARNAUD/PSEUDO_DMNFS_PROGRESS/ARNAUD/IPSLCM5/detailed_pack_output/pack_ipsl_%I.o
+#MSUB -e /ccc/dmfbuf/ipsl_logs/dsm/bacasable/ARNAUD/PSEUDO_DMNFS_PROGRESS/ARNAUD/IPSLCM5/detailed_pack_output/pack_ipsl_%I.e
 #MSUB -n 16
 #MSUB -T 1500
@@ -342 +351 @@
 #MSUB -Qos test
 ########## batch directives : end ##########
+set +x
 
 export JOB_DIR=${LS_SUBCWD:-${PWD}}

TOOLS/PACK_IPSL/loadParameters.sh

@@ -2 +2 @@
 
 # nombre de listes a verifier par l'outil "check_ncrcat_list.sh"
-export nbListsToCheck=2
+export nbListsToCheck=1
 
 # Voulez vous le check ?
-export doYouWantCheck="no"
+export doYouWantCheck="yes"
 
 # Voulez vous recommencer les traitements depuis le debut ?

TOOLS/PACK_IPSL/load_batch_directives.sh

@@ -2 +2 @@
 
 # Directives Batch pour le code parallele
-export nbProcs="7"
+export nbProcs="16"
 
 # Duree max des traitements pour une instance du script "launch_and_measureTime.sh"
@@ -10 +10 @@
 # des traitements est indique par la variable "computationTime"),
 # tout proc mpi ayant fini sa tache s'arrete.
-export timeLimitBeforeEnd="1450"
+export timeLimitBeforeEnd="50"
 
 export projectName="tgcc0013"

TOOLS/PACK_IPSL/parallelPack.sh

@@ -114 +114 @@
 restartExecFromZero=0
 
+# indique si l'on veut effacer les fichiers d'entrée ou non
+deleteFiles=0
+
 # On charge les variables d'environnement 
 . load_ipslPack_env.sh
@@ -148 +151 @@
    -f)  restartExecFromZero=1 
         echo "force restart from the beginning ..."
+        ;;
+   -d)  deleteFiles=1
+        echo "force to delete input files ..."
         ;;
    -h|--help|-help)
@@ -163 +169 @@
         echo "   -f"
         echo "        Force to restart the treatments from the beginning"
+        echo "   -d"
+        echo "       force to delete input files ... "
         echo "---------------------------------------------------"
         exit
@@ -170 +178 @@
 done
 export restartExecFromZero=${restartExecFromZero}
+export deleteFiles=${deleteFiles}
 ######################################
 

TOOLS/PACK_IPSL/showPackProgress.sh

@@ -225 +225 @@
      
      listName=`echo $(basename $set) | sed 's;\.list$;;' | sed 's;\.nc$;;' `
-     ListNbInode=`cat $set |wc -l`
-     TotalNbInodes=$(( $TotalNbInodes + $ListNbInode ))
+     ListNbInode=`cat $set | wc -l`
+#     TotalNbInodes=$(( $TotalNbInodes + $ListNbInode ))
      statusfile=${set%%.list}.status
      status=$( progressStatus $statusfile ) # gpdebug : a retablir
@@ -351 +351 @@
 nbOfListsFailed=0
 nbOfListsNottreated=0
-TotalNbInodes=0
+#TotalNbInodes=0
 TotalSimuTar=0
 totalTime=0
@@ -476 +476 @@
      find $OUTPUT_WORK -printf "%y %s %p \n" >> ${IGCM_DEM}/ListingEnd.txt
  fi
-NbInodeAfter=`cat ${IGCM_DEM}/ListingEnd.txt |wc -l`
+
+if [ -e ${IGCM_DEM}/ListingEnd.txt ]
+then 
+    NbInodeAfter=`cat ${IGCM_DEM}/ListingEnd.txt |wc -l`
+fi
 
 if [ "x${outputFile}" == "x" ]
@@ -490 +494 @@
     echo "nb of fails : $nbOfListsFailed"
     echo "nb of not treated : ${nbOfListsNottreated}"
-    echo "nb of inodes packed : $TotalNbInodes"
+#    echo "nb of inodes packed : $TotalNbInodes"
     echo "nb simul full tared : $TotalSimuTar"
     echo "nb inode before : $NbInodeBefore"
@@ -510 +514 @@
     echo "nb of fails : $nbOfListsFailed" >> ${outputFile}
     echo "nb of not treated : ${nbOfListsNottreated}" >> ${outputFile}
-    echo "nb of inodes packed : $TotalNbInodes" >> ${outputFile}
+#    echo "nb of inodes packed : $TotalNbInodes" >> ${outputFile}
     echo "nb simul full tared : $TotalSimuTar" >> ${outputFile}
     echo "nb inode before : $NbInodeBefore" >> ${outputFile}
@@ -518 +522 @@
     else
 # Publication
-    echo "User;TotalNbSimu;NbOfSimuPacked;NbOfSimuFailed;NbOfSimuNottreated;TotalNbOfList;NbOfListsPacked;NbOfListsFailed;NbOfListsNottreated;TotalNbFiles;Nbfilestreated;Nbfilesafter;NbSimuTar" > ${outputFile}
-    echo "${USER};${TotalNbSimu};${nbOfSimuPacked};${nbOfSimuFailed};${nbOfSimuNottreated};${totalNbOfList};${nbOfListsPacked};$nbOfListsFailed;${nbOfListsNottreated};$TotalNbInodes;$NbInodeBefore;$NbInodeAfter;$TotalSimuTar" >> ${outputFile}
+    echo "User;TotalNbSimu;NbOfSimuPacked;NbOfSimuFailed;NbOfSimuNottreated;TotalNbOfList;NbOfListsPacked;NbOfListsFailed;NbOfListsNottreated;TotalNbFiles;Nbfilesafter;NbSimuTar" > ${outputFile}
+    echo "${USER};${TotalNbSimu};${nbOfSimuPacked};${nbOfSimuFailed};${nbOfSimuNottreated};${totalNbOfList};${nbOfListsPacked};$nbOfListsFailed;${nbOfListsNottreated};$NbInodeBefore;$NbInodeAfter;$TotalSimuTar" >> ${outputFile}
     fi
 fi