Changeset 2385

Timestamp:

Sep 4, 2017 12:08:40 PM (7 years ago)

Author:

raasch

Message:

job-catalog changes in palmrun

File:

• palm/trunk/SCRIPTS/palmrun (modified) (3 diffs)

palm/trunk/SCRIPTS/palmrun

@@ -80 +80 @@
  hostfile=""
  hp=""
- job_directory=""
  keep_data_from_previous_run=false
  link_local_input=false
  link_local_output=false
  loader_options=""
+ local_jobcatalog=""
  locat=normal
  makefile=""
@@ -99 +99 @@
  restart_run=false
  return_address=""
+ remote_jobcatalog=""
  remote_username=""
  running_in_batch_mode=false
@@ -2428 +2429 @@
 
           echo " *** transfer of job to remote host via scp"
-          echo "     scp $ssh_key $PORTOPT $jobfile ${remote_username}@${remote_ip}:${job_directory}/${host}_${job_id}"
-          scp $ssh_key $PORTOPT $jobfile ${remote_username}@${remote_ip}:${job_directory}/${host}_${job_id}
+          echo "     scp $ssh_key $PORTOPT $jobfile ${remote_username}@${remote_ip}:${remote_jobcatalog}/${host}_${job_id}"
+          scp $ssh_key $PORTOPT $jobfile ${remote_username}@${remote_ip}:${remote_jobcatalog}/${host}_${job_id}
 
           echo " "
           echo " *** submit the job"
-          echo "     cd $job_directory; $submit_command ${host}_${job_id}; rm ${host}_${job_id}  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>&1"
-          echo "cd $job_directory; $submit_command ${host}_${job_id}; rm ${host}_${job_id}"  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>&1
+          echo "     cd $remote_jobcatalog; $submit_command ${host}_${job_id}; rm ${host}_${job_id}  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>&1"
+          echo "cd $remote_jobcatalog; $submit_command ${host}_${job_id}; rm ${host}_${job_id}"  |  ssh  -q  $ssh_key $SSH_PORTOPT  ${remote_username}@${remote_ip}  2>&1
 
        elif [[ $create_batch_job = true ]]
        then
 
-          eval  job_directory=$job_directory
-          cp  $jobfile  ${job_directory}/${host}_${job_id}
-          cd $job_directory
+          eval  local_jobcatalog=$local_jobcatalog
+          cp  $jobfile  ${local_jobcatalog}/${host}_${job_id}
+          cd $local_jobcatalog
           echo " "
           echo "--- submit the job"