Changeset 149

Timestamp:

Feb 28, 2008 3:47:22 PM (17 years ago)

Author:

letzel

Message:

Modifications of mrun concerning hard links:

• link of restart files with long file name possible
• If environment variable link_local_output is set to true, mrun tries "ln -f" on local output and resorts to "cp" or "cp -r" on error

File:

• palm/trunk/SCRIPTS/mrun (modified) (6 diffs)

palm/trunk/SCRIPTS/mrun

@@ -136 +136 @@
      #                     queues
      # 30/10/07 - Marcus - further adjustments for queues on lctit
-
+     # 14/02/08 - Bjoern - link of restart files with long file name possible
+     # 28/02/08 - Marcus - If environment variable link_local_output is set to 
+     #                     true, mrun tries "ln -f" on local output and resorts 
+     #                     to "cp" or "cp -r" on error
  
     # VARIABLENVEREINBARUNGEN + DEFAULTWERTE
@@ -182 +185 @@
  job_on_file=""
  keep_data_from_previous_run=false
+ link_local_output=false
  localhost_realname=$(hostname)
  local_compile=false
@@ -2330 +2334 @@
              then
                 mkdir  ${localin[$i]}
-                ln  $tmp_data_catalog/${frelin[$i]}/*  ${localin[$i]}
+                cd $tmp_data_catalog/${frelin[$i]}
+                for file in $(ls *)
+                do
+                   ln $file $TEMPDIR/${localin[$i]}
+                done
+                cd $TEMPDIR
                 got_tmp[$i]=true
              elif [[ -d "$WORK/${frelin[$i]}"  &&  $ignore_archive_error = true ]]
@@ -3098 +3107 @@
                 printf "\n              $tmp_data_catalog/${frelout[$i]} (temporary data catalog)\n"
                 mkdir  $tmp_data_catalog/${frelout[$i]}
-                ln -f  ${localout[$i]}/*  $tmp_data_catalog/${frelout[$i]}
+                cd ${localout[$i]}
+                for file in $(ls *)
+                do
+                   ln -f $file $tmp_data_catalog/${frelout[$i]}
+                done
+                cd $TEMPDIR
              fi
 
@@ -3412 +3426 @@
              then
                 printf "\n  >>> OUTPUT: ${localout[$i]}  to  ${pathout[$i]}.${extout[$i]}\n"
-                cp  ${localout[$i]}  ${pathout[$i]}.${extout[$i]}
+                if [[ $link_local_output = true ]]
+                then
+                    printf "      using ln -f\n"
+                    ln -f  ${localout[$i]}  ${pathout[$i]}.${extout[$i]}
+                fi
+                # If "ln -f" fails of if "$link_local_output = false" do a normal "cp"
+                if [[ ! -f "${pathout[$i]}.${extout[$i]}" ]]
+                then
+                    if [[ $link_local_output = true ]]
+                    then
+                        printf "      ln failed, using cp...\n"
+                    fi
+                    cp  ${localout[$i]}  ${pathout[$i]}.${extout[$i]}
+                fi
              else
                 printf "\n  >>> OUTPUT: ${localout[$i]}  to  ${pathout[$i]}\n"
-                cp  ${localout[$i]}  ${pathout[$i]}
+                if [[ $link_local_output = true ]]
+                then
+                    printf "      using ln -f\n"
+                    ln -f  ${localout[$i]}  ${pathout[$i]}
+                fi
+                # If "ln -f" fails of if "$link_local_output = false" do a normal "cp"
+                if [[ ! -f "${pathout[$i]}" ]]
+                then
+                    if [[ $link_local_output = true ]]
+                    then
+                        printf "      ln failed, using cp...\n"
+                    fi
+                    cp  ${localout[$i]}  ${pathout[$i]}
+                fi
              fi
 
@@ -3426 +3466 @@
                 # PER MOVE UMBENANNT WERDEN
              printf "\n  >>> OUTPUT: ${localout[$i]}/_....  to  ${pathout[$i]}\n"
-             cp -r  ${localout[$i]}  ${pathout[$i]}
+             if [[ $link_local_output = true ]]
+             then
+                 printf "      using ln -f\n"
+                 mkdir  ${pathout[$i]}
+                 cd ${localout[$i]}
+                 for file in $(ls *)
+                 do
+                   ln -f $file  ${pathout[$i]}
+                 done
+                 cd $TEMPDIR
+             fi
+             # If "ln -f" fails of if "$link_local_output = false" do a normal "cp -r"
+             if [[ ! -f "${pathout[$i]}/_0000" ]]
+             then
+                 if [[ $link_local_output = true ]]
+                 then
+                     printf "      ln failed for .../_0000, using cp...\n"
+                 fi
+                 cp -r  ${localout[$i]}  ${pathout[$i]}
+             fi
 
           fi