Changeset 306

Timestamp:

Apr 27, 2009 2:11:40 PM (16 years ago)

Author:

letzel

Message:

• Typographical error (mrun)
• Use option -p for all scp calls (batch_scp)
• Modified output format (header)

Location:

palm/trunk

Files:

• SCRIPTS/batch_scp (modified) (5 diffs)
• SCRIPTS/mrun (modified) (1 diff)
• SOURCE/header.f90 (modified) (1 diff)

palm/trunk/SCRIPTS/batch_scp

@@ -44 +44 @@
      # 11/03/05 - Siggi - arguments are output in case of error exit
      # 25/10/05 - Siggi - put of catalogs realized
+     # 27/04/09 - Marcus- use option -p for all scp calls
 
 
@@ -537 +538 @@
              if [[ $catalog_copy = false ]]
              then
-                scp -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
+                scp -p -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
              else
-                scp -r -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
+                scp -p -r -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
              fi
           else
              if [[ $catalog_copy = false ]]
              then
-                scp $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
+                scp -p $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
              else
-                scp -r $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
+                scp -p -r $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
              fi
           fi
@@ -570 +571 @@
           fi
        else
-          scp $2 $remote_user@$1:${catalog_name}batch_scp_append_file.$random  > /dev/null
+          scp -p $2 $remote_user@$1:${catalog_name}batch_scp_append_file.$random  > /dev/null
           if [[ $? != 0 ]]
           then
@@ -612 +613 @@
           locat=ssh_failed_4; exit
        fi
-       scp $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
+       scp -p $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
        if [[ $? != 0 ]]
        then
@@ -631 +632 @@
        else
 
-          scp $remote_user@$1:$catalog_name$4$zyklusnr $2  > /dev/null
+          scp -p $remote_user@$1:$catalog_name$4$zyklusnr $2  > /dev/null
           if [[ $? != 0 ]]
           then

palm/trunk/SCRIPTS/mrun

@@ -1571 +1571 @@
           printf "\n         \"$source_path\" "
           printf "\n         is not under control of \"subversion\"."
-          printf "\n         Please do not use mrun-option \"-s LOCALLY MODIFIED\"\n"
+          printf "\n         Please do not use mrun-option \"-s LOCALLY_MODIFIED\"\n"
        fi
 

palm/trunk/SOURCE/header.f90

@@ -1453 +1453 @@
             '     using the ',A,' mode')
 151 FORMAT ('     with u_bulk = ',F7.3,' m/s and v_bulk = ',F7.3,' m/s')
-152 FORMAT (' --> External pressure gradient directly prescribed by the user:'/, &
-              2(1X,E12.5),'Pa/m', &
-             ' in x/y direction starting from dp_level_b =', F6.3, 'm', &
-             A /)
+152 FORMAT (' --> External pressure gradient directly prescribed by the user:',&
+           /'     ',2(1X,E12.5),'Pa/m in x/y direction', &
+           /'     starting from dp_level_b =', F8.3, 'm', A /)
 200 FORMAT (//' Run time and time step information:'/ &
              ' ----------------------------------'/)