Changeset 4443 for palm/trunk/SCRIPTS/palmrun

Timestamp:

Mar 5, 2020 3:31:21 PM (5 years ago)

Author:

raasch

Message:

add cycle number to initial files too (000), remove compatibility for cycle numbers which are less than three digits wide

File:

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

palm/trunk/SCRIPTS/palmrun

@@ -27 +27 @@
 # -----------------
 # $Id$
+# add cycle number to initial files too (000),
+# remove compatibility for cycle numbers which are less than three digits wide
+# 
+# 4425 2020-02-26 15:35:00Z raasch
 # hard coded path to the fileconnection file replaced by a path that is based on
 # the source path which has been given in the configuration file
@@ -1355 +1359 @@
           while  read line
           do
-                 # filename without path (i.e. after the last "/")
-              basefilename=$(basename ${line})
+                # filename without path (i.e. after the last "/")
+             basefilename=$(basename ${line})
    
-                 # check if there is an extension
-              extension=${basefilename##*.}
-              if [[ "$extension" = "${extin[$nr_of_input_files]}" ]]
-              then
-                 basefilename=${basefilename%.*}
-              fi
+                # check if there is an extension
+             extension=${basefilename##*.}
+             if [[ "$extension" = "${extin[$nr_of_input_files]}" ]]
+             then
+                basefilename=${basefilename%.*}
+             fi
    
-                 # check for an existing cycle number
-              cycle=${basefilename##*.}
-              if [[ $cycle =~ ^-?[0-9]+$ ]]
-              then
-                    # NUMBERS WITH LEADING ZEROS ARE INTERPRETED AS OCTAL NUMBERS
-                    # 10# EXPLICITLY SPECIFIES THE NUMBER BASE AS 10
-                 (( icycle = $((10#$cycle)) ))
-              else
-                 (( icycle = 0 ))
-              fi
+                # check for an existing cycle number
+             cycle=${basefilename##*.}
+             if [[ $cycle =~ ^-?[0-9]+$ ]]
+             then
+                   # NUMBERS WITH LEADING ZEROS ARE INTERPRETED AS OCTAL NUMBERS
+                   # 10# EXPLICITLY SPECIFIES THE NUMBER BASE AS 10
+                (( icycle = $((10#$cycle)) ))
+                explicit_cycle_number=true
+             else
+                (( icycle = 0 ))
+                explicit_cycle_number=false
+             fi
    
-              if (( icycle > maxcycle ))
-              then
-                 (( maxcycle = icycle ))
-   
-                    # FOR COMPATIBILITY REASONS WITH OLDER VERSIONS
-                    # CHECK IF CYCLE NUMBER CONTAINS LEADING ZEROS
-                 if [[ $(echo $cycle | cut -c1) = 0 ]]
-                 then
-                    leading_zero=true
-                 else
-                    leading_zero=false
-                 fi
-              fi
+             if (( icycle > maxcycle ))
+             then
+                (( maxcycle = icycle ))
+             fi
    
           done <filelist
           rm filelist
+
    
              # MAKE CYCLE NUMBER THREE DIGITS WIDE
-          if [[ $leading_zero = true ]]
-          then
-             cyclestring=`printf "%03d" $maxcycle`
-          else
-             cyclestring=$maxcycle
-          fi
+          cyclestring=`printf "%03d" $maxcycle`
+
    
              # APPEND CYCLE NUMBER TO FILENAME
-          if (( maxcycle > 0 ))
+          if [[ $explicit_cycle_number = true ]]
           then
              if [[ "${extin[$nr_of_input_files]}" != " "  &&   "${extin[$nr_of_input_files]}" != "" ]]
@@ -1420 +1414 @@
              # IS LATER USED FOR TRANSFERRING FILES WIHIN THE JOB (SEE END OF FILE)
           absnamein[$nr_of_input_files]=$filename
-          if (( maxcycle > 0 ))
+          if [[ $explicit_cycle_number = true ]]
           then
              if [[ "${actionin[$nr_of_input_files]}" = di ]]
@@ -1996 +1990 @@
     if [[ $running_in_batch_mode = false ]]
     then
+
           # CREATE THE DIRECTORY
        mkdir -p  $tempdir
@@ -2166 +2161 @@
                                  ln -f  ${absnamein[$i]}  ${localin[$i]}
                         fi
-                                # If "ln -f" fails or if "$link_local_input = false" do a normal "cp"
+                                # IF "ln -f" FAILS OR IF "$link_local_input = false" DO A NORMAL "cp"
                         if [[ ! -f "${localin[$i]}" ]]
                 then
@@ -2494 +2489 @@
           ls -1 -d $filename    >   filelist  2>/dev/null
           ls -1 -d $filename.*  >>  filelist  2>/dev/null
+          (( maxcycle = 0 ))
           while  read line
           do
@@ -2531 +2527 @@
           if [[ "${actionout[$i]}" = a ]]
           then
-             (( maxcycle = maxcycle - 1 ))
+             if (( maxcycle > 0 ))
+             then
+                (( maxcycle = maxcycle - 1 ))
+             fi
           fi
           
@@ -2554 +2553 @@
              fi
           fi
-          if (( cycnum[$i] > 0 ))
-          then
-             cyclestring=`printf "%03d" ${cycnum[$i]}`
-             pathout[$i]=${pathout[$i]}.$cyclestring
-          fi
-       fi           
+          cyclestring=`printf "%03d" ${cycnum[$i]}`
+          pathout[$i]=${pathout[$i]}.$cyclestring
+       fi
 
           # CHECK FOR SINGLE FILE (SERIAL RUN) OR DIRECTORY (ONE FILE PER CORE FOR PARELLEL EXECUTION)