Changeset 1043

Timestamp:

Nov 6, 2012 6:18:09 AM (12 years ago)

Author:

raasch

Message:

further script adjustments for lckiaps

Location:

palm/trunk/SCRIPTS

Files:

• .mrun.config.kiaps (added)
• mrun (modified) (2 diffs)
• subjob (modified) (1 diff)

palm/trunk/SCRIPTS/mrun

@@ -4846 +4846 @@
     jobfile=jobfile.$RANDOM
 
-       # initialize the environment and load modules
-    if [[ "$init_cmds" != "" ]]
-    then
-       echo  "$init_cmds"        >>  $jobfile
-    fi
-    if [[ "$module_calls" != "" ]]
-    then
-       echo  "$module_calls"     >>  $jobfile
-    fi
 
        # TEMPORAERES VERZEICHNIS GENERIEREN UND NACH DORT WECHSELN
@@ -4867 +4858 @@
     else
        echo  "set +vx"                                   >>  $jobfile
+    fi
+
+
+       # initialize the environment and load modules
+    if [[ "$init_cmds" != "" ]]
+    then
+       echo  "$init_cmds"        >>  $jobfile
+    fi
+    if [[ "$module_calls" != "" ]]
+    then
+       echo  "$module_calls"     >>  $jobfile
     fi
 

palm/trunk/SCRIPTS/subjob

@@ -1373 +1373 @@
        then
           echo "qsub -J n  -s /bin/ksh  scpjob.$kennung"     >>  $job_to_send
+       elif [[ $remote_host = lckiaps ]]
+       then
+          echo "mv  scpjob.$kennung  $job_catalog"           >>  $job_to_send
+          echo "ssh ${remote_username}@${remote_addres}  \"$submcom ${job_catalog}/scpjob.$kennung\" "  >>  $job_to_send
+          echo "rm  ${job_catalog}/scpjob.$kennung"          >>  $job_to_send
        else
           echo "$submcom  scpjob.$kennung"      >>  $job_to_send
        fi
-       if [[ $remote_host != ibmku ]]
+       if [[ $remote_host != ibmku  &&  $remote_host != lckiaps ]]
        then
           echo "rm  scpjob.$kennung"            >>  $job_to_send