Changeset 189


Ignore:
Timestamp:
Aug 13, 2008 5:09:26 PM (13 years ago)
Author:
letzel
Message:
  • changed: allow 100 spectra levels instead of 10 for consistency with define_netcdf_header
Location:
palm/trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/DOC/app/chapter_3.7.html

    r108 r189  
    11<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
    2 <html>
    3 <head>
     2<html><head>
    43
    54  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=windows-1252">
    6   <title>PALM chapter 3.7</title>
     5 
    76 
    8   <meta name="GENERATOR" content="StarOffice 7 (Win32)">
     7  <title>PALM chapter 3.7</title><meta name="GENERATOR" content="StarOffice 7 (Win32)">
    98 
    109  <meta name="AUTHOR" content="Siegfried Raasch">
     
    2019@page { size: 21cm 29.7cm }
    2120-->
    22   </style>
    23 </head>
     21  </style></head>
    2422
    2523<body style="direction: ltr;" lang="en-US">
     
    121119 </td>
    122120 <td>
    123       <p>see section 4.2</p>
     121      <p>see section <a href="chapter_4.2.html#particle_parameters">4.2</a></p>
    124122
    125123      </td>
     
    143141
    144142      <td>
    145       <p>see section 4.2</p>
     143      <p>see section <a href="chapter_4.2.html#dvrp_graphics">4.2</a></p>
    146144 </td>
    147145 </tr>
     
    162160 <td>
    163161      <p>see
    164 section <a href="chapter_4.2.html#spectra_package">4.2</a></p>
     162section <a href="chapter_4.2.html#spectra">4.2</a></p>
    165163
    166164      </td>
     
    176174change:&nbsp;</i> $Id$</p>
    177175
    178 </body>
    179 </html>
     176</body></html>
  • palm/trunk/DOC/app/chapter_4.2.html

    r144 r189  
    1118011180
    1118111181
    11182       <td style="vertical-align: top;">I(10)</td>
     11182      <td style="vertical-align: top;">I(100)</td>
    1118311183
    1118411184
     
    1120211202
    1120311203
    11204 Spectra can be calculated for up to ten levels.</td>
     11204Spectra can be calculated for up to 100 levels.</td>
    1120511205
    1120611206
     
    1141711417
    1141811418
    11419  <td style="vertical-align: top;">I(10)</td>
     11419 <td style="vertical-align: top;">I(100)</td>
    1142011420
    1142111421
  • palm/trunk/DOC/app/chapter_4.6.html

    r166 r189  
    6565-->
    6666  </style></head>
    67 
    6867<body style="direction: ltr;" lang="en-US">
    6968
     
    20212020     
    20222021      <p>I
    2023 (10)</p>
     2022(100)</p>
    20242023
    20252024
     
    94949493     
    94959494      <p>I
    9496 (10)</p>
     9495(100)</p>
    94979496
    94989497
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r187 r189  
    4242Changed:
    4343-------
     44Allow 100 spectra levels instead of 10 for consistency with
     45define_netcdf_header (calc_spectra, data_output_spectra, header, modules,
     46netcdf)
     47
    4448Modification of the integrated version of the profile function for momentum
    4549for unstable stratification; more consistent flux definitions. (wall_fluxes,
     
    8387(init_1d_model)
    8488
    85 advec_s_ups, advec_u_ups, advec_v_ups, advec_w_ups, calc_spectra, check_open, check_parameters, cpu_statistics, init_1d_model, init_3d_model, modules, palm, parin, poisfft, production_e, read_var_list, read_3d_binary, transpose, wall_fluxes, write_var_list, write_3d_binary
     89advec_s_ups, advec_u_ups, advec_v_ups, advec_w_ups, calc_spectra, check_open, check_parameters, cpu_statistics, data_output_spectra, header, init_1d_model, init_3d_model, modules, netcdf, palm, parin, poisfft, production_e, read_var_list, read_3d_binary, transpose, wall_fluxes, write_var_list, write_3d_binary
    8690
    8791
  • palm/trunk/SOURCE/calc_spectra.f90

    r164 r189  
    44! Actual revisions:
    55! -----------------
     6! allow 100 spectra levels instead of 10 for consistency with
     7! define_netcdf_header
    68! user-defined spectra, arguments removed from transpose routines
    79!
     
    223225    REAL, DIMENSION(0:nx)      ::  work
    224226    REAL, DIMENSION(0:nx/2)    ::  sums_spectra_l
    225     REAL, DIMENSION(0:nx/2,10) ::  sums_spectra
     227    REAL, DIMENSION(0:nx/2,100)::  sums_spectra
    226228
    227229    REAL, DIMENSION(0:nxa,nys_x:nyn_xa,nzb_x:nzt_xa) ::  ddd
     
    234236!-- Loop over all levels defined by the user
    235237    n = 1
    236     DO WHILE ( comp_spectra_level(n) /= 999999  .AND.  n <= 10 )
     238    DO WHILE ( comp_spectra_level(n) /= 999999  .AND.  n <= 100 )
    237239
    238240       k = comp_spectra_level(n)
     
    333335    REAL, DIMENSION(0:ny)      ::  work
    334336    REAL, DIMENSION(0:ny/2)    ::  sums_spectra_l
    335     REAL, DIMENSION(0:ny/2,10) ::  sums_spectra
     337    REAL, DIMENSION(0:ny/2,100)::  sums_spectra
    336338
    337339    REAL, DIMENSION(0:nya,nxl_yd:nxr_yda,nzb_yd:nzt_yda) :: ddd
     
    345347!-- Loop over all levels defined by the user
    346348    n = 1
    347     DO WHILE ( comp_spectra_level(n) /= 999999  .AND.  n <= 10 )
     349    DO WHILE ( comp_spectra_level(n) /= 999999  .AND.  n <= 100 )
    348350
    349351       k = comp_spectra_level(n)
  • palm/trunk/SOURCE/data_output_spectra.f90

    r144 r189  
    44! Actual revisions:
    55! -----------------
     6! allow 100 spectra levels instead of 10 for consistency with
     7! define_netcdf_header
    68! user-defined spectra
    79!
     
    270272    INTEGER                  :: cranz, labforx = 3, labfory = 3, legpos = 3, &
    271273                                timodex = 1
    272     INTEGER, DIMENSION(1:10) :: cucol = 1, klist = 999999, lstyle = 0
     274    INTEGER, DIMENSION(1:100):: cucol = 1, klist = 999999, lstyle = 0
    273275    LOGICAL                  :: datleg = .TRUE., grid = .TRUE., &
    274276                                lclose = .TRUE., rand = .TRUE., &
     
    278280    REAL                     :: gwid = 0.1, rlegfak = 0.7, uxmin, uxmax, &
    279281                                uymin, uymax
    280     REAL, DIMENSION(1:10)    :: lwid = 0.6
    281     REAL, DIMENSION(10)      :: uyma, uymi
     282    REAL, DIMENSION(1:100)   :: lwid = 0.6
     283    REAL, DIMENSION(100)     :: uyma, uymi
    282284
    283285    NAMELIST /RAHMEN/  cranz, datleg, rtext, swap
     
    301303!-- different quantities u, v, w, pt and q)
    302304    DO  k = 1, n_sp_x
    303        IF ( k < 10 )  THEN
     305       IF ( k < 100 )  THEN
    304306          IF ( pr == 3 )  THEN
    305307             WRITE ( 82, 100 )  '#', k, header_char( pr ),        &
     
    351353!-- Calculate klist-values from the available comp_spectra_level values
    352354    i = 1; k = 1
    353     DO WHILE ( i <= 10  .AND.  plot_spectra_level(i) /= 999999 )
     355    DO WHILE ( i <= 100  .AND.  plot_spectra_level(i) /= 999999 )
    354356       DO WHILE ( k <= n_sp_x  .AND. &
    355357                  plot_spectra_level(i) >= comp_spectra_level(k) )
     
    398400100 FORMAT (A,I1,1X,A,1X,I4,'m ',A)
    399401101 FORMAT (A,I2,1X,A,1X,I4,'m ',A)
    400 102 FORMAT (E15.7,10(1X,E15.7))
     402102 FORMAT (E15.7,100(1X,E15.7))
    401403103 FORMAT ('NEXT')
    402404104 FORMAT ('time averaged over',F7.1,' s')
     
    429431    INTEGER                  :: cranz, labforx = 3, labfory = 3, legpos = 3, &
    430432                                timodex = 1
    431     INTEGER, DIMENSION(1:10) :: cucol = 1, klist = 999999, lstyle = 0
     433    INTEGER, DIMENSION(1:100):: cucol = 1, klist = 999999, lstyle = 0
    432434    LOGICAL                  :: datleg = .TRUE., grid = .TRUE., &
    433435                                lclose = .TRUE., rand = .TRUE., &
     
    437439    REAL                     :: gwid = 0.1, rlegfak = 0.7, uxmin, uxmax, &
    438440                                uymin, uymax
    439     REAL, DIMENSION(1:10)    :: lwid = 0.6
    440     REAL, DIMENSION(10)      :: uyma, uymi
     441    REAL, DIMENSION(1:100)   :: lwid = 0.6
     442    REAL, DIMENSION(100)     :: uyma, uymi
    441443
    442444    NAMELIST /RAHMEN/  cranz, datleg, rtext, swap
     
    460462!-- different quantities u, v, w, pt and q)
    461463    DO  k = 1, n_sp_y
    462        IF ( k < 10 )  THEN
     464       IF ( k < 100 )  THEN
    463465          IF ( pr == 3 ) THEN
    464466             WRITE ( 84, 100 )  '#', k, header_char( pr ),        &
     
    510512!-- Calculate klist-values from the available comp_spectra_level values
    511513    j = 1; k = 1
    512     DO WHILE ( j <= 10  .AND.  plot_spectra_level(j) /= 999999 )
     514    DO WHILE ( j <= 100  .AND.  plot_spectra_level(j) /= 999999 )
    513515       DO WHILE ( k <= n_sp_y  .AND. &
    514516                  plot_spectra_level(j) >= comp_spectra_level(k) )
     
    557559100 FORMAT (A,I1,1X,A,1X,I4,'m ',A)
    558560101 FORMAT (A,I2,1X,A,1X,I4,'m ',A)
    559 102 FORMAT (E15.7,10(1X,E15.7))
     561102 FORMAT (E15.7,100(1X,E15.7))
    560562103 FORMAT ('NEXT')
    561563104 FORMAT ('time averaged over',F7.1,' s')
  • palm/trunk/SOURCE/header.f90

    r167 r189  
    44! Actual revisions:
    55! -----------------
     6! allow 100 spectra levels instead of 10 for consistency with
     7! define_netcdf_header
    68! Bugfix in the output of the characteristic levels of potential temperature,
    79! geostrophic wind, scalar concentration, humidity and leaf area density
     
    964966       WRITE ( io, 372 )  ( data_output_sp(i), i = 1,10 ),     &
    965967                          ( spectra_direction(i), i = 1,10 ),  &
    966                           ( comp_spectra_level(i), i = 1,10 ), &
    967                           ( plot_spectra_level(i), i = 1,10 ), &
     968                          ( comp_spectra_level(i), i = 1,100 ), &
     969                          ( plot_spectra_level(i), i = 1,100 ), &
    968970                          averaging_interval_sp, dt_averaging_input_pr
    969971    ENDIF
     
    14921494372 FORMAT ('       Arrays:     ', 10(A5,',')/                         &
    14931495            '       Directions: ', 10(A5,',')/                         &
    1494             '       height levels  k = ', 9(I3,','),I3,'.'/            &
     1496            '       height levels  k = ', 20(I3,',')/                  &
     1497            '                          ', 20(I3,',')/                  &
     1498            '                          ', 20(I3,',')/                  &
     1499            '                          ', 20(I3,',')/                  &
     1500            '                          ', 19(I3,','),I3,'.'/           &
    14951501            '       height levels selected for standard plot:'/        &
    1496             '                      k = ', 9(I3,','),I3,'.'/            &
     1502            '                      k = ', 20(I3,',')/                  &
     1503            '                          ', 20(I3,',')/                  &
     1504            '                          ', 20(I3,',')/                  &
     1505            '                          ', 20(I3,',')/                  &
     1506            '                          ', 19(I3,','),I3,'.'/           &
    14971507            '       Time averaged over ', F7.1, ' s,' /                &
    14981508            '       Profiles for the time averaging are taken every ', &
  • palm/trunk/SOURCE/modules.f90

    r163 r189  
    55! Actual revisions:
    66! -----------------
     7! allow 100 spectra levels instead of 10 for consistency with
     8! define_netcdf_header
    79! +canopy_heat_flux, cthf, lai,
    810! +leaf_surface_concentration, scalar_exchange_coefficient, sec, sls
     
    11151117    INTEGER ::  klist_x = 0, klist_y = 0, n_sp_x = 0, n_sp_y = 0
    11161118
    1117     INTEGER ::  comp_spectra_level(10) = 999999,                   &
    1118                 lstyles(10) = (/ 0, 7, 3, 10, 1, 4, 9, 2, 6, 8 /), &
    1119                 plot_spectra_level(10) = 999999
     1119    INTEGER ::  comp_spectra_level(100) = 999999,                   &
     1120                lstyles(100) = (/ 0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1121                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1122                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1123                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1124                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1125                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1126                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1127                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1128                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8,    &
     1129                                  0, 7, 3, 10, 1, 4, 9, 2, 6, 8 /), &
     1130                plot_spectra_level(100) = 999999
    11201131
    11211132    REAL    ::  time_to_start_sp = 0.0
  • palm/trunk/SOURCE/netcdf.f90

    r175 r189  
    77! Current revisions:
    88! ------------------
     9! consistently allow 100 spectra levels instead of 10
    910! bug fix in the determination of the number of output heights for spectra
    1011!
     
    30593060!--       shall be output
    30603061          ns = 1
    3061           DO WHILE ( comp_spectra_level(ns) /= 999999  .AND.  ns <= 10 )
     3062          DO WHILE ( comp_spectra_level(ns) /= 999999  .AND.  ns <= 100 )
    30623063             ns = ns + 1
    30633064          ENDDO
Note: See TracChangeset for help on using the changeset viewer.