Changeset 3860

Timestamp:

Apr 4, 2019 6:23:27 AM (6 years ago)

Author:

raasch

Message:

check added, that it is not allowed to set option -b if the configuration file has been setup for running batch jobs on remote hosts, local time added to terminal output before and after saving output files

File:

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

palm/trunk/SCRIPTS/palmrun

@@ -27 +27 @@
 # -----------------
 # $Id$
+# check added, that it is not allowed to set option -b if the configuration file has been setup
+# for running batch jobs on remote hosts,
+# local time added to terminal output before and after saving output files
+# 
+# 3725 2019-02-07 10:11:02Z raasch
 # error messages for failed restarts extended
 # 
@@ -612 +617 @@
  if [[ "$fast_io_catalog" = "" ]]
  then
-    printf "\n  +++ no fast_io_catalog found in $config_file"
+    printf "\n\n  +++ no fast_io_catalog found in $config_file"
     printf "\n      Please add line \"fast_io_catalog ...\" to that file."
     locat=config_file; exit
@@ -618 +623 @@
  if [[ "$compiler_name" = "" ]]
  then
-    printf "\n  +++ no compiler name found in $config_file"
+    printf "\n\n  +++ no compiler name found in $config_file"
     printf "\n      Please add line \"compiler_name ...\" to that file."
     locat=config_file; exit
@@ -624 +629 @@
  if [[ "$compiler_name_ser" = "" ]]
  then
-    printf "\n  +++ no compiler name for non-paralle compilation found in $config_file"
+    printf "\n\n  +++ no compiler name for non-paralle compilation found in $config_file"
     printf "\n      Please add line \"compiler_name_ser ...\" to that file."
     locat=config_file; exit
@@ -630 +635 @@
  if [[ "$compiler_options" = "" ]]
  then
-    printf "\n  +++ no compiler options found in $config_file"
+    printf "\n\n  +++ no compiler options found in $config_file"
     printf "\n      Please add line \"compiler_options ...\" to that file."
     locat=config_file; exit
@@ -636 +641 @@
  if [[ "$execute_command" = "" ]]
  then
-    printf "\n  +++ no execute command found in $config_file"
+    printf "\n\n  +++ no execute command found in $config_file"
     printf "\n      Please add line \"execute_command ...\" to that file."
     locat=config_file; exit
@@ -645 +650 @@
     if [[ $hostfile != auto  &&  ! -f $hostfile ]]
     then
-       printf "\n  +++ no hostfile \"$hostfile\" found"
+       printf "\n\n  +++ no hostfile \"$hostfile\" found"
        printf "\n      Please check line \"hostfile ...\" in $config_file"
        locat=config_file; exit    
@@ -672 +677 @@
         if [[ "$remote_jobcatalog" = "" ]]
         then
-           printf "\n  +++ no remote jobcatalog found in $config_file"
+           printf "\n\n  +++ no remote jobcatalog found in $config_file"
            printf "\n      Please add line \"remote_jobcatalog ...\" to that file."
            locat=config_file; exit
         fi
- 
+
+           # CHECK THAT OPTION -b (SUBMITTING BATCH JOB ON LOCAL HOST) HASN'T BEEN SET 
+        if [[ $create_batch_job = true ]]
+        then
+           printf "\n\n  +++ option -b must not be set because configuration file has been setup"
+           printf "\n      for running jobs on a remote host"
+           locat=config_file; exit
+        fi
 
      fi
@@ -2427 +2439 @@
        if (( i == 1 ))
        then
-          printf "\n\n  *** saving OUTPUT-files:"
+          timestring=`date +%H:%M:%S`
+          printf "\n\n  *** saving OUTPUT-files:     local time: $timestring"
 
              # GET RUN NUMBER ASSIGNED BY PALM
@@ -2735 +2748 @@
     if (( i != 0 ))
     then
+       timestring=`date +%H:%M:%S`
        if [[ $transfer_problems = true ]]
        then
-          printf "\n$dashes\n  *** OUTPUT-files saved"
+          printf "\n$dashes\n  *** OUTPUT-files saved       local time: $timestring"
           printf "\n  +++ WARNING: some data transfers failed! \n"
        else
-          printf "\n$dashes\n  *** all OUTPUT-files saved \n"
+          printf "\n$dashes\n  *** all OUTPUT-files saved       local time: $timestring \n"
        fi
     fi