Changeset 2393 for palm/trunk

Timestamp:

Sep 4, 2017 4:05:45 PM (7 years ago)

Author:

knoop

Message:

syntax change in palmrun variable substitution

File:

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

palm/trunk/SCRIPTS/palmrun

@@ -1770 +1770 @@
 
        # REPLACE PARAMETERS IN THE EXECUTION COMMAND WITH REAL VALUES
-    line=`echo  "${execute_command}" | sed 's/@MPI_TASKS@/$mpi_tasks/g' | sed 's/@TASKS_PER_NODE@/$tasks_per_node/g'`
-    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'`
+    line=`echo  "${execute_command}" | sed 's/{{MPI_TASKS}}/$mpi_tasks/g' | sed 's/{{TASKS_PER_NODE}}/$tasks_per_node/g'`
+    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'`
     eval line=\"$line\"
     execute_command="$line"
@@ -2301 +2301 @@
     do
        (( i = i + 1 ))
-       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'`
+       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'`
        eval line=\"$line\"
        echo  "$line"                               >>  $jobfile
@@ -2323 +2323 @@
        do
           (( i = i + 1 ))
-          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'`
+          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'`
           eval line=\"$line\"
           echo  "$line"                            >>  $jobfile