Changeset 1069


Ignore:
Timestamp:
Nov 28, 2012 4:18:43 PM (9 years ago)
Author:
maronga
Message:

allow usage of topography in combination with cloud physics, allow usage of topography in coupled ocean model, minor changes in mbuild and mrun

Location:
palm/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mbuild

    r1047 r1069  
    2020# Current revisions:
    2121# -----------------
     22# added copy of nc2vdf tools to remote host
     23#
    2224#
    2325# Former revisions:
     
    12841286                # KOENNEN DOLLAR-ZEICHEN NICHT BENUTZT WERDEN
    12851287             remote_ud=`echo $remote_ud | sed 's/\$HOME\///'`
    1286              /bin/scp  batch_scp mbuild mrun process_dvr_output .dvrserver.config subjob ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
    1287           else
    1288              scp  batch_scp mbuild mrun process_dvr_output .dvrserver.config subjob ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
     1288             /bin/scp  batch_scp mbuild mrun process_dvr_output .dvrserver.config subjob batch_nc2vdf nc2vdf nc2vdf.ncl nc2vdf.config ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
     1289          else
     1290             scp  batch_scp mbuild mrun process_dvr_output .dvrserver.config subjob batch_nc2vdf nc2vdf nc2vdf.ncl nc2vdf.config ${remote_username}@${remote_addres}:${remote_ud}/../SCRIPTS  >  /dev/null
    12891291          fi
    12901292
  • palm/trunk/SCRIPTS/mrun

    r1059 r1069  
    2222# Current revisions:
    2323# -----------------
    24 #
     24# bugfix: coupling mode was always set to mpi2, typos removed
     25
    2526#
    2627# Former revisions:
     
    559560    while read line
    560561    do
    561        if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" &&  ( $(echo $line | cut -d" " -s -f4) = $cond1 || $(echo $line | cut -d" " -s -f4)  = $cond2 ) ]]
     562       if [[ "$line" != ""  &&  $(echo $line | cut -c1) != "#" &&  $(echo $line | cut -d" " -s -f4) = $cond1 && $(echo $line | cut -d" " -s -f4)  = $cond2 ]]
    562563       then
    563564          coupled_mode="mpi2"
     
    22402241 then
    22412242    skip_check=true
    2242     reason="restart run.)"
     2243    reason="restart run."
    22432244 fi
    22442245
     
    24262427             locat=normal; exit
    24272428          else
    2428              printf "\n  *** Skipping parameter file check."
     2429             printf "\n  *** skipping parameter file check."
    24292430         
    24302431          fi
  • palm/trunk/SOURCE/check_parameters.f90

    r1066 r1069  
    2020! Current revisions:
    2121! -----------------
     22! allow usage of topography in combination with cloud physics
    2223!
    2324! Former revisions:
     
    558559          WRITE( action, '(A)' )  'galilei_transformation = .TRUE.'
    559560       ENDIF
    560        IF ( cloud_physics )  THEN
    561           WRITE( action, '(A)' )  'cloud_physics = .TRUE.'
    562        ENDIF
    563561       IF ( cloud_droplets )  THEN
    564           WRITE( action, '(A)' )  'cloud_droplets = .TRUE.'
     562          WRITE( action, '(A)' )  'cloud_droplets = .TRUE. (has not been tested)'
    565563       ENDIF
    566564       IF ( .NOT. prandtl_layer )  THEN
  • palm/trunk/SOURCE/init_grid.f90

    r1037 r1069  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! bugfix: added coupling_char to TOPOGRAPHY_DATA to allow topography in the ocean
     23!          model in case of coupled runs
    2324!
    2425! Former revisions:
     
    587588!--             Arbitrary irregular topography data in PALM format (exactly
    588589!--             matching the grid size and total domain size)
    589                 OPEN( 90, FILE='TOPOGRAPHY_DATA', STATUS='OLD', &
     590                OPEN( 90, FILE='TOPOGRAPHY_DATA'//coupling_char, STATUS='OLD', &
    590591                      FORM='FORMATTED', ERR=10 )
    591592                DO  j = ny, 0, -1
     
    595596                GOTO 12
    596597         
    597  10             message_string = 'file TOPOGRAPHY_DATA does not exist'
     598 10             message_string = 'file TOPOGRAPHY'//coupling_char//' does not exist'
    598599                CALL message( 'init_grid', 'PA0208', 1, 2, 0, 6, 0 )
    599600
    600  11             message_string = 'errors in file TOPOGRAPHY_DATA'
     601 11             message_string = 'errors in file TOPOGRAPHY_DATA'//coupling_char
    601602                CALL message( 'init_grid', 'PA0209', 1, 2, 0, 6, 0 )
    602603
Note: See TracChangeset for help on using the changeset viewer.