Changeset 2404 for palm/trunk/SCRIPTS/palmrun

Timestamp:

Sep 5, 2017 9:33:14 AM (7 years ago)

Author:

raasch

Message:

further simplifications in palmrun and palmbuild

File:

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

palm/trunk/SCRIPTS/palmrun

@@ -110 +110 @@
  threads_per_task=1
  tmpcreate=false
- tmp_data_catalog=""
  transfer_problems=false
  user_source_path=""
@@ -121 +120 @@
 
     # ERROR HANDLING IN CASE OF EXIT
- trap 'rm -rf  $working_directory/tmp_mrun
-       if [[ $locat != normal  &&  $locat != control_c ]]
+ trap 'if [[ $locat != normal  &&  $locat != control_c ]]
        then
 
@@ -152 +150 @@
 
     # ACTIONS IN CASE OF TERMINAL-BREAK (CONTROL-C):
- trap 'rm -rf  $working_directory/tmp_mrun
-       [[ $tmpcreate = true ]]  &&  (cd; rm -rf $TEMPDIR)
+ trap '[[ $tmpcreate = true ]]  &&  (cd; rm -rf $TEMPDIR)
        printf "\n+++ palmrun killed by \"^C\" \n\n"
        locat=control_c
@@ -297 +294 @@
 
 
+    # CHECK, IF THE ACTIVATION_STRING_LIST HAS BEEN GIVEN
+ if [[ "$activation_string_list" = "" ]]
+ then
+    printf "\n\n  +++ no activation string list given: "
+    printf "\n        please set palmrun option \"-a\" "
+    locat=palmrun_option; exit  
+ fi
+
+
+    # SET VARIABLE TO ACTIVATE PALM BINARY OUTPUT FOR RESTARTS
+ if [[ $(echo $activation_string_list | grep -c "restart") != 0 ]]
+ then
+    write_binary=true
+ else
+    write_binary=false
+ fi
+
+
     # READ AND EVALUATE THE CONFIGURATION-FILE
  [[ $silent = false ]]  &&  printf "\n\n    Reading the configuration file... "
@@ -439 +454 @@
  fi
 
- if [[ "$write_binary" = "" ]]
- then
-    write_binary=false
- fi
 
     # DETERMINE THE CALL STATUS
@@ -611 +622 @@
  then
  
-    if [[ ! -d ${tmp_user_catalog}/SOURCES_FOR_RUN_$fname ]]
-    then
-       printf "\n  +++ directory ${tmp_user_catalog}/SOURCES_FOR_RUN_$fname is missing"
+    if [[ ! -d ${fast_io_catalog}/SOURCES_FOR_RUN_$fname ]]
+    then
+       printf "\n  +++ directory ${fast_io_catalog}/SOURCES_FOR_RUN_$fname is missing"
        printf "\n      Please check the output of the palmrun-call"
        printf "\n      that you did on your local host."
@@ -659 +670 @@
              # LIST ALL MODIFIED SOURCE CODE FILES
           Filenames=""
-          svn status  >  tmp_mrun
+          svn status  >  tmp_svnstatus
           while  read line
           do
@@ -672 +683 @@
                 fi
              fi
-          done < tmp_mrun
+          done < tmp_svnstatus
+          rm -rf  tmp_svnstatus
 
 
@@ -1170 +1182 @@
     job_id=${fname}.$run_id
 
-    TEMPDIR=$tmp_user_catalog/$job_id
+    TEMPDIR=$fast_io_catalog/$job_id
  fi
 
@@ -1547 +1559 @@
        tmpcreate=true
        cd  $TEMPDIR
-       cp  $tmp_user_catalog/SOURCES_FOR_RUN_$fname/{*,.[!.]*}  $TEMPDIR
+       cp  $fast_io_catalog/SOURCES_FOR_RUN_$fname/{*,.[!.]*}  $TEMPDIR
        printf "\n  *** changed to temporary directory: $TEMPDIR"
 
@@ -1927 +1939 @@
           if [[ $running_on_remote = true  &&  "$remote_loginnode" != "" ]]
           then
-             printf "\n  *** SCP transfers to local host via remote login-node \"$remote_loginnode\" "
+             printf "\n  *** in case of SCP transfers to local host"
+             printf "\n      they will be done via remote login-node \"$remote_loginnode\" "
           fi
           printf "\n$dashes"
@@ -2026 +2039 @@
                 if [[ "$remote_loginnode" != "" ]]
                 then
-                   echo "cd $TEMPDIR; ${tmp_user_catalog}/SOURCES_FOR_RUN_${fname}/batch_scp $PORTOPT $catalog_option $append_option -b -m $usecycle_option -u $local_username $return_address  ${localout[$i]} \"${pathout[$i]}\" ${remote_hostname}_${fname}${endout[$i]}  ${extout[$i]}"  |  ssh -q $remote_username@$remote_loginnode
+                   echo "cd $TEMPDIR; ${fast_io_catalog}/SOURCES_FOR_RUN_${fname}/batch_scp $PORTOPT $catalog_option $append_option -b -m $usecycle_option -u $local_username $return_address  ${localout[$i]} \"${pathout[$i]}\" ${remote_hostname}_${fname}${endout[$i]}  ${extout[$i]}"  |  ssh -q $remote_username@$remote_loginnode
                 else
                    batch_scp $PORTOPT $catalog_option $append_option -b -m $usecycle_option -u $local_username $return_address  ${localout[$i]} "${pathout[$i]}" ${remote_hostname}_${fname}${endout[$i]}  ${extout[$i]}
@@ -2301 +2314 @@
     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' | sed 's/{{MEMORY}}/$memory/g'`
        eval line=\"$line\"
        echo  "$line"                               >>  $jobfile
@@ -2330 +2343 @@
 
        echo "set -x"                               >>  $jobfile
-       echo "${tmp_user_catalog}/SOURCES_FOR_RUN_${fname}/batch_scp  $PORTOPT  -d  -w 10  -u $local_username $local_ip  $job_protocol_file_remote  \"$local_jobcatalog\"  ${host}_${fname}"  >>  $jobfile
+       echo "${fast_io_catalog}/SOURCES_FOR_RUN_${fname}/batch_scp  $PORTOPT  -d  -w 10  -u $local_username $local_ip  $job_protocol_file_remote  \"$local_jobcatalog\"  ${host}_${fname}"  >>  $jobfile
        echo "%%END%%"                              >>  $jobfile
        echo "echo \" *** submitting job for transfering the job protocol file to $local_ip\" "  >>  $jobfile
        echo "$submit_command  $scpjob_file"        >>  $jobfile
        echo "rm $scpjob_file"                      >>  $jobfile
-       echo "rm $job_transfer_protocol_file"       >>  $jobfile
+       echo "rm -rf $job_transfer_protocol_file"   >>  $jobfile
        echo "set -x"                               >>  $jobfile
        echo "     ' exit"                          >>  $jobfile
@@ -2365 +2378 @@
     echo  "cd  $TEMPDIR"                 >>  $jobfile
     echo  "export TEMPDIR=$TEMPDIR"      >>  $jobfile
-    echo  "cp  $tmp_user_catalog/SOURCES_FOR_RUN_$fname/{*,.[!.]*}  ."  >>  $jobfile
+    echo  "cp  $fast_io_catalog/SOURCES_FOR_RUN_$fname/{*,.[!.]*}  ."  >>  $jobfile
     echo  "export PATH=.:\$PATH"         >>  $jobfile
     echo  "export execute_palmrun=true"  >>  $jobfile