Changeset 306


Ignore:
Timestamp:
Apr 27, 2009 2:11:40 PM (13 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:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/batch_scp

    r169 r306  
    4444     # 11/03/05 - Siggi - arguments are output in case of error exit
    4545     # 25/10/05 - Siggi - put of catalogs realized
     46     # 27/04/09 - Marcus- use option -p for all scp calls
    4647
    4748
     
    537538             if [[ $catalog_copy = false ]]
    538539             then
    539                 scp -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
     540                scp -p -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
    540541             else
    541                 scp -r -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
     542                scp -p -r -q -v $2 $remote_user@$1:$catalog_name$4$zyklusnr
    542543             fi
    543544          else
    544545             if [[ $catalog_copy = false ]]
    545546             then
    546                 scp $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
     547                scp -p $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
    547548             else
    548                 scp -r $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
     549                scp -p -r $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
    549550             fi
    550551          fi
     
    570571          fi
    571572       else
    572           scp $2 $remote_user@$1:${catalog_name}batch_scp_append_file.$random  > /dev/null
     573          scp -p $2 $remote_user@$1:${catalog_name}batch_scp_append_file.$random  > /dev/null
    573574          if [[ $? != 0 ]]
    574575          then
     
    612613          locat=ssh_failed_4; exit
    613614       fi
    614        scp $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
     615       scp -p $2 $remote_user@$1:$catalog_name$4$zyklusnr  > /dev/null
    615616       if [[ $? != 0 ]]
    616617       then
     
    631632       else
    632633
    633           scp $remote_user@$1:$catalog_name$4$zyklusnr $2  > /dev/null
     634          scp -p $remote_user@$1:$catalog_name$4$zyklusnr $2  > /dev/null
    634635          if [[ $? != 0 ]]
    635636          then
  • palm/trunk/SCRIPTS/mrun

    r291 r306  
    15711571          printf "\n         \"$source_path\" "
    15721572          printf "\n         is not under control of \"subversion\"."
    1573           printf "\n         Please do not use mrun-option \"-s LOCALLY MODIFIED\"\n"
     1573          printf "\n         Please do not use mrun-option \"-s LOCALLY_MODIFIED\"\n"
    15741574       fi
    15751575
  • palm/trunk/SOURCE/header.f90

    r292 r306  
    14531453            '     using the ',A,' mode')
    14541454151 FORMAT ('     with u_bulk = ',F7.3,' m/s and v_bulk = ',F7.3,' m/s')
    1455 152 FORMAT (' --> External pressure gradient directly prescribed by the user:'/, &
    1456               2(1X,E12.5),'Pa/m', &
    1457              ' in x/y direction starting from dp_level_b =', F6.3, 'm', &
    1458              A /)
     1455152 FORMAT (' --> External pressure gradient directly prescribed by the user:',&
     1456           /'     ',2(1X,E12.5),'Pa/m in x/y direction', &
     1457           /'     starting from dp_level_b =', F8.3, 'm', A /)
    14591458200 FORMAT (//' Run time and time step information:'/ &
    14601459             ' ----------------------------------'/)
Note: See TracChangeset for help on using the changeset viewer.