Changeset 416 for palm/trunk/SCRIPTS

Timestamp:

Dec 18, 2009 8:42:25 AM (15 years ago)

Author:

weinreis

Message:

mrun and subjob modified for archiving

Location:

palm/trunk/SCRIPTS

Files:

• mrun (modified) (3 diffs)
• subjob (modified) (3 diffs)

palm/trunk/SCRIPTS/mrun

@@ -192 +192 @@
      # 29/09/09 - Siggi  - default value for archiving is false, option "-A"
      #                     switches on archiving, archiving on SGI-ICE enabled
-     # 16/10/09 - Carolin - adjustments for archiving on SGI-ICE of binary files;
-     #                      adjustment for special1q
-
+     # 16/10/09 - Carolin- adjustments for archiving on SGI-ICE of binary files;
+     #                     adjustment for special1q
+     # 18/12/09 - Carolin- modification of archiving (permq)
+     #
  
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
@@ -3749 +3750 @@
 #                         echo "*** files = \"$files\" "
 #                         echo "*** all_files = \"$all_files\" "
-                         echo "tar  cvf \$PERM/${frelout[$i]}/${frelout[$i]}.node_$inode.tar $files"   >> archive_${frelout[$i]}
+                        echo "tar  cvf \$PERM/${frelout[$i]}/${frelout[$i]}.node_$inode.tar $files"   >> archive_${frelout[$i]}
+                        ### echo "tar  cvf ${frelout[$i]}.node_$inode.tar $files"   >> archive_${frelout[$i]}
+                        ### echo "cp ${frelout[$i]}.node_$inode.tar \$PERM/${frelout[$i]}/"   >> archive_${frelout[$i]}
+                         ###echo "rm ${frelout[$i]}.node_$inode.tar"   >> archive_${frelout[$i]}
 #                         echo "dsmc incremental  \$PERM/${frelout[$i]}/${frelout[$i]}.node_$inode.tar" >> archive_${frelout[$i]}
 #                         echo "dsmmigrate \$PERM/${frelout[$i]}/${frelout[$i]}.node_$inode.tar"        >> archive_${frelout[$i]}
@@ -3794 +3798 @@
                    then
 #                      subjob  -d  -v  -q cdata  -X 0  -m 1000  -t 43200  -c $job_catalog  archive_${frelout[$i]}
-                      subjob   -v  -q dataq  -X 1 -T 1  -m 1000  -t 10800  -c $job_catalog  archive_${frelout[$i]}
+                      subjob   -v  -q permq  -X 1 -T 1  -m 1000  -t 172800  -c $job_catalog  archive_${frelout[$i]}
                    elif [[ $localhost = nech ]]
                    then

palm/trunk/SCRIPTS/subjob

@@ -107 +107 @@
      # 03/09/09 - Siggi - PBS sgi feature directive only used if explicitly
      #                    set in the config file by the user
-     # 16/10/09 - Carolin adjustments for archiving on SGI-ICE of binary files;
-     #                      adding special1q
+     # 16/10/09 - Carolin-adjustments for archiving on SGI-ICE of binary files;
+     #                    adding special1q
      # 01/12/09 - BjornM- re-adjustments for lcxt4, added sno (130.75.105.113)
+     # 16/10/09 - Carolin-adding permq
+     #
 
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
@@ -386 +388 @@
                  esac;;
         (lcsgib|lcsgih)   case  $ndq  in
-                     (testq|serialq|smallq|mediumq|bigq|workq|dataq|special1q)       error=false;;
+                     (testq|serialq|smallq|mediumq|bigq|workq|dataq|permq|special1q)       error=false;;
                      (*)                                     error=true;;
                  esac;;
@@ -769 +771 @@
     fi
     
-    if [[ $queue = dataq ]]
+    if [[ $queue = dataq || $queue = permq ]]
     then
        feature_directive="#PBS -l feature=data"
     fi
 
-    if [[ $queue = testq  ||  $queue = workq  ||  $queue = dataq  ||  $queue = serialq  ||  $queue = special1q ]]
+    if [[ $queue = testq  ||  $queue = workq  ||  $queue = dataq  ||  $queue = permq ||  $queue = serialq  ||  $queue = special1q ]]
     then
        queue_directive="#PBS -q $queue"