Changeset 580 for palm


Ignore:
Timestamp:
Oct 5, 2010 1:59:11 PM (11 years ago)
Author:
heinze
Message:

Renaming of ws_vertical_gradient to subs_vertical_gradient, ws_vertical_gradient_level to subs_vertical_gradient_level and ws_vertical_gradient_level_ind to subs_vertical_gradient_level_i

Location:
palm/trunk/SOURCE
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/check_parameters.f90

    r568 r580  
    44! Current revisions:
    55! -----------------
    6 !
     6! Renaming of ws_vertical_gradient_level to subs_vertical_gradient_level
    77!
    88! Former revisions:
     
    10081008!
    10091009!-- Initialize large scale subsidence if required
    1010     IF ( ws_vertical_gradient_level(1) /= -9999999.9 )  THEN
     1010    IF ( subs_vertical_gradient_level(1) /= -9999999.9 )  THEN
    10111011       large_scale_subsidence = .TRUE.
    10121012       CALL init_w_subsidence
  • palm/trunk/SOURCE/header.f90

    r494 r580  
    44! Current revisions:
    55! -----------------
    6 !
     6! Renaming of ws_vertical_gradient to subs_vertical_gradient,
     7! ws_vertical_gradient_level to subs_vertical_gradient_level and
     8! ws_vertical_gradient_level_ind to subs_vertical_gradient_level_i
    79!
    810! Former revisions:
     
    14121414       coordinates = '   0.0'
    14131415       i = 1
    1414        DO  WHILE ( ws_vertical_gradient_level_ind(i) /= -9999 )
     1416       DO  WHILE ( subs_vertical_gradient_level_i(i) /= -9999 )
    14151417
    14161418          WRITE (coor_chr,'(E10.2,7X)')  &
    1417                                 w_subs(ws_vertical_gradient_level_ind(i))
     1419                                w_subs(subs_vertical_gradient_level_i(i))
    14181420          temperatures = TRIM( temperatures ) // ' ' // TRIM( coor_chr )
    14191421
    1420           WRITE (coor_chr,'(E10.2,7X)')  ws_vertical_gradient(i)
     1422          WRITE (coor_chr,'(E10.2,7X)')  subs_vertical_gradient(i)
    14211423          gradients = TRIM( gradients ) // ' ' // TRIM( coor_chr )
    14221424
    1423           WRITE (coor_chr,'(I10,7X)')  ws_vertical_gradient_level_ind(i)
     1425          WRITE (coor_chr,'(I10,7X)')  subs_vertical_gradient_level_i(i)
    14241426          slices = TRIM( slices ) // ' ' // TRIM( coor_chr )
    14251427
    1426           WRITE (coor_chr,'(F10.2,7X)')  ws_vertical_gradient_level(i)
     1428          WRITE (coor_chr,'(F10.2,7X)')  subs_vertical_gradient_level(i)
    14271429          coordinates = TRIM( coordinates ) // ' '  // TRIM( coor_chr )
    14281430
  • palm/trunk/SOURCE/modules.f90

    r565 r580  
    55! Current revisions:
    66! -----------------
    7 !
     7! Renaming of ws_vertical_gradient to subs_vertical_gradient,
     8! ws_vertical_gradient_level to subs_vertical_gradient_level and
     9! ws_vertical_gradient_level_ind to subs_vertical_gradient_level_i
    810!
    911! Former revisions:
     
    402404                ug_vertical_gradient_level_ind(10) = -9999, &
    403405                vg_vertical_gradient_level_ind(10) = -9999, &
    404                 ws_vertical_gradient_level_ind(10) = -9999
     406                subs_vertical_gradient_level_i(10) = -9999
    405407
    406408    INTEGER, DIMENSION(:), ALLOCATABLE ::  grid_level_count
     
    549551             wall_humidityflux(0:4) = 0.0, wall_qflux(0:4) = 0.0, &
    550552             wall_salinityflux(0:4) = 0.0, wall_scalarflux(0:4) = 0.0, &
    551              ws_vertical_gradient(10) = 0.0, &
    552              ws_vertical_gradient_level(10) = -9999999.9
     553             subs_vertical_gradient(10) = 0.0, &
     554             subs_vertical_gradient_level(10) = -9999999.9
    553555
    554556    REAL, DIMENSION(:), ALLOCATABLE ::  dp_smooth_factor
  • palm/trunk/SOURCE/parin.f90

    r559 r580  
    44! Current revisions:
    55! -----------------
    6 !
     6! Renaming of ws_vertical_gradient to subs_vertical_gradient and
     7! ws_vertical_gradient_level to subs_vertical_gradient_level
    78!
    89! Former revisions:
     
    145146             vg_vertical_gradient_level, v_bulk, wall_adjustment, &
    146147             wall_heatflux, wall_humidityflux, wall_scalarflux, &
    147              ws_vertical_gradient, ws_vertical_gradient_level
     148             subs_vertical_gradient, subs_vertical_gradient_level
    148149
    149150
  • palm/trunk/SOURCE/read_var_list.f90

    r482 r580  
    44! Current revisions:
    55! -----------------
    6 !
     6! Renaming of ws_vertical_gradient to subs_vertical_gradient,
     7! ws_vertical_gradient_level to subs_vertical_gradient_level and
     8! ws_vertical_gradient_level_ind to subs_vertical_gradient_level_i
    79!
    810! Former revisions:
     
    599601          CASE ( 'wall_adjustment' )
    600602             READ ( 13 )  wall_adjustment
    601           CASE ( 'ws_vertical_gradient' )
    602              READ ( 13 )  ws_vertical_gradient
    603           CASE ( 'ws_vertical_gradient_level' )
    604              READ ( 13 )  ws_vertical_gradient_level
    605           CASE ( 'ws_vertical_gradient_level_ind' )
    606              READ ( 13 )  ws_vertical_gradient_level_ind
     603          CASE ( 'subs_vertical_gradient' )
     604             READ ( 13 )  subs_vertical_gradient
     605          CASE ( 'subs_vertical_gradient_level' )
     606             READ ( 13 )  subs_vertical_gradient_level
     607          CASE ( 'subs_vertical_gradient_level_i' )
     608             READ ( 13 )  subs_vertical_gradient_level_i
    607609          CASE ( 'w_max' )
    608610             READ ( 13 )  w_max
  • palm/trunk/SOURCE/subsidence.f90

    r464 r580  
    44! Current revisions:
    55! -----------------
    6 !
     6! Renaming of ws_vertical_gradient to subs_vertical_gradient,
     7! ws_vertical_gradient_level to subs_vertical_gradient_level and
     8! ws_vertical_gradient_level_ind to subs_vertical_gradient_level_i
    79!
    810! Former revisions:
     
    7072     
    7173
    72       ws_vertical_gradient_level_ind(1) = 0
     74      subs_vertical_gradient_level_i(1) = 0
    7375      DO  k = 1, nzt+1
    7476         IF ( i < 11 ) THEN
    75             IF ( ws_vertical_gradient_level(i) < zu(k)  .AND. &
    76                  ws_vertical_gradient_level(i) >= 0.0 )  THEN
    77                gradient = ws_vertical_gradient(i) / 100.0
    78                ws_vertical_gradient_level_ind(i) = k - 1
     77            IF ( subs_vertical_gradient_level(i) < zu(k)  .AND. &
     78                 subs_vertical_gradient_level(i) >= 0.0 )  THEN
     79               gradient = subs_vertical_gradient(i) / 100.0
     80               subs_vertical_gradient_level_i(i) = k - 1
    7981               i = i + 1
    8082            ENDIF
     
    9496!--   In case of no given gradients for the subsidence/ascent velocity,
    9597!--   choose zero gradient
    96       IF ( ws_vertical_gradient_level(1) == -9999999.9 )  THEN
    97          ws_vertical_gradient_level(1) = 0.0
     98      IF ( subs_vertical_gradient_level(1) == -9999999.9 )  THEN
     99         subs_vertical_gradient_level(1) = 0.0
    98100      ENDIF
    99101
  • palm/trunk/SOURCE/write_var_list.f90

    r484 r580  
    44! Current revisions:
    55! -----------------
    6 !
     6! Renaming of ws_vertical_gradient to subs_vertical_gradient,
     7! ws_vertical_gradient_level to subs_vertical_gradient_level and
     8! ws_vertical_gradient_level_ind to subs_vertical_gradient_level_i
    79!
    810! Former revisions:
     
    517519    WRITE ( 14 )  'wall_adjustment               '
    518520    WRITE ( 14 )  wall_adjustment
    519     WRITE ( 14 )  'ws_vertical_gradient          '
    520     WRITE ( 14 )  ws_vertical_gradient
    521     WRITE ( 14 )  'ws_vertical_gradient_level    '
    522     WRITE ( 14 )  ws_vertical_gradient_level
    523     WRITE ( 14 )  'ws_vertical_gradient_level_ind'
    524     WRITE ( 14 )  ws_vertical_gradient_level_ind
     521    WRITE ( 14 )  'subs_vertical_gradient          '
     522    WRITE ( 14 )  subs_vertical_gradient
     523    WRITE ( 14 )  'subs_vertical_gradient_level    '
     524    WRITE ( 14 )  subs_vertical_gradient_level
     525    WRITE ( 14 )  'subs_vertical_gradient_level_i'
     526    WRITE ( 14 )  subs_vertical_gradient_level_i
    525527    WRITE ( 14 )  'w_max                         '
    526528    WRITE ( 14 )  w_max
Note: See TracChangeset for help on using the changeset viewer.