Changeset 3917

Timestamp:

Apr 18, 2019 11:46:37 AM (6 years ago)

Author:

raasch

Message:

in case of batch jobs on remote machines, copying files from SOURCES_FOR_RUN folder has been rearranged to avoid that input files with original names (e.g. ..._p3d) are copied into the temporary working catalog

File:

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

palm/trunk/SCRIPTS/palmrun

@@ -27 +27 @@
 # -----------------
 # $Id$
+# in case of batch jobs on remote machines, copying files from SOURCES_FOR_RUN folder has
+# been rearranged to avoid that input files with original names (e.g. ..._p3d) are copied
+# into the temporary working catalog
+# 
+# 3860 2019-04-04 06:23:27Z raasch
 # 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,
@@ -1979 +1984 @@
     if [[ $running_in_batch_mode = false ]]
     then
-          # CREATE THE DIRECTORY AND COPY FILES FROM SOURCES_FOR_RUN_... TO THAT
-          # FOLDER
+          # CREATE THE DIRECTORY
        mkdir -p  $tempdir
        chmod  go+rx  $tempdir
        cd  $tempdir
-       cp  ${fast_io_catalog}/${sources_for_run_catalog}/{*,.[!.]*}  $tempdir
        printf "\n  *** changed to temporary directory: $tempdir"
 
@@ -2171 +2174 @@
        printf "\n$dashes\n  *** all INPUT-files provided \n"
     fi
+
+       # NOW COPY FILES (*.f90, *.o, config files, etc.) FROM SOURCES_FOR_RUN_... TO THE TEMPORARY
+       # WORKING DIRECTORY
+    cp  ${fast_io_catalog}/${sources_for_run_catalog}/{*,.[!.]*}  $tempdir
 
 
@@ -2995 +3002 @@
     echo  "cd  $tempdir"                 >>  $jobfile
     echo  "export tempdir=$tempdir"      >>  $jobfile
-    echo  "cp  ${fast_io_catalog}/${sources_for_run_catalog}/{*,.[!.]*}  ."  >>  $jobfile
-    echo  "export PATH=.:\$PATH"         >>  $jobfile
+    echo  "cp  ${fast_io_catalog}/${sources_for_run_catalog}/.[!.]*  ."           >>  $jobfile
+    echo  "export PATH=.:${fast_io_catalog}/${sources_for_run_catalog}:\$PATH"    >>  $jobfile
     echo  "export execute_palmrun=true"  >>  $jobfile