Changeset 2393


Ignore:
Timestamp:
Sep 4, 2017 4:05:45 PM (7 years ago)
Author:
knoop
Message:

syntax change in palmrun variable substitution

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palmrun

    r2388 r2393  
    17701770
    17711771       # REPLACE PARAMETERS IN THE EXECUTION COMMAND WITH REAL VALUES
    1772     line=`echo  "${execute_command}" | sed 's/@MPI_TASKS@/$mpi_tasks/g' | sed 's/@TASKS_PER_NODE@/$tasks_per_node/g'`
    1773     line2=`echo  "${execute_command}" | sed 's/@MPI_TASKS@/1/g' | sed 's/@TASKS_PER_NODE@/1/g' | sed 's/palm/combine_plot_fields.x/g'`
     1772    line=`echo  "${execute_command}" | sed 's/{{MPI_TASKS}}/$mpi_tasks/g' | sed 's/{{TASKS_PER_NODE}}/$tasks_per_node/g'`
     1773    line2=`echo  "${execute_command}" | sed 's/{{MPI_TASKS}}/1/g' | sed 's/{{TASKS_PER_NODE}}/1/g' | sed 's/palm/combine_plot_fields.x/g'`
    17741774    eval line=\"$line\"
    17751775    execute_command="$line"
     
    23012301    do
    23022302       (( i = i + 1 ))
    2303        line=`echo  "${batch_directive[$i]}" | sed 's/@JOB_ID@/$job_id/g' | sed 's/@JOBFILE@/$job_protocol_file/g' | sed 's/@CPU_HOURS@/$cpu_hours/g' | sed 's/@CPU_MINUTES@/$cpu_minutes/g' | sed 's/@CPU_SECONDS@/$cpu_seconds/g' | sed 's/@NODES@/$nodes/g' | sed 's/@CORES@/$cores/g' | sed 's/@TASKS_PER_NODE@/$tasks_per_node/g' | sed 's/@LOCAL_HOSTNAME@/${local_hostname}/g' | sed 's/@HOST@/${host}/g' | sed 's/@FNAME@/$fname/g' | sed 's/@QUEUE@/$queue/g'`
     2303       line=`echo  "${batch_directive[$i]}" | sed 's/{{JOB_ID}}/$job_id/g' | sed 's/{{JOBFILE}}/$job_protocol_file/g' | sed 's/{{CPU_HOURS}}/$cpu_hours/g' | sed 's/{{CPU_MINUTES}}/$cpu_minutes/g' | sed 's/{{CPU_SECONDS}}/$cpu_seconds/g' | sed 's/{{NODES}}/$nodes/g' | sed 's/{{CORES}}/$cores/g' | sed 's/{{TASKS_PER_NODE}}/$tasks_per_node/g' | sed 's/{{LOCAL_HOSTNAME}}/${local_hostname}/g' | sed 's/{{HOST}}/${host}/g' | sed 's/{{FNAME}}/$fname/g' | sed 's/{{QUEUE}}/$queue/g'`
    23042304       eval line=\"$line\"
    23052305       echo  "$line"                               >>  $jobfile
     
    23232323       do
    23242324          (( i = i + 1 ))
    2325           line=`echo  "${batch_directive_transfer[$i]}" | sed 's/@JOB_ID@/$job_id/g' | sed 's/@JOBFILE@/$job_protocol_file/g' | sed 's/@JOB_TRANSFER_PROTOCOL_FILE@/$job_transfer_protocol_file/g' | sed 's/@CPU_HOURS@/$cpu_hours/g' | sed 's/@CPU_MINUTES@/$cpu_minutes/g' | sed 's/@CPU_SECONDS@/$cpu_seconds/g' | sed 's/@NODES@/$nodes/g' | sed 's/@TASKS_PER_NODE@/$tasks_per_node/g' | sed 's/@LOCAL_HOSTNAME@/${local_hostname}/g' | sed 's/@HOST@/${host}/g' | sed 's/@FNAME@/$fname/g'`
     2325          line=`echo  "${batch_directive_transfer[$i]}" | sed 's/{{JOB_ID}}/$job_id/g' | sed 's/{{JOBFILE}}/$job_protocol_file/g' | sed 's/{{JOB_TRANSFER_PROTOCOL_FILE}}/$job_transfer_protocol_file/g' | sed 's/{{CPU_HOURS}}/$cpu_hours/g' | sed 's/{{CPU_MINUTES}}/$cpu_minutes/g' | sed 's/{{CPU_SECONDS}}/$cpu_seconds/g' | sed 's/{{NODES}}/$nodes/g' | sed 's/{{TASKS_PER_NODE}}/$tasks_per_node/g' | sed 's/{{LOCAL_HOSTNAME}}/${local_hostname}/g' | sed 's/{{HOST}}/${host}/g' | sed 's/{{FNAME}}/$fname/g'`
    23262326          eval line=\"$line\"
    23272327          echo  "$line"                            >>  $jobfile
Note: See TracChangeset for help on using the changeset viewer.