Home


About us
PALM
PALM-4U
Installation
Release notes
Documentation
Getting Help
Gallery
Developers area

Changeset 181 for palm/trunk/SOURCE


Ignore:
Timestamp:
Jul 30, 2008 7:07:47 AM (16 years ago)
Author:
raasch
Message:

bugfixes + adjustments for SGI ICE system

Location:
palm/trunk/SOURCE
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r179 r181  
    4242Changed:
    4343-------
     44Strict grid matching along z is not needed for mg-solver. (check_parameters)
     45
    4446Sharp lateral edges of the plant canopy introduced. Before smaller
    4547values of the leaf area density than those applied in the prognostic
    … …  
    7274Workaround for getting information about the coupling mode. (palm)
    7375
    74 advec_s_ups, advec_u_ups, advec_v_ups, advec_w_ups, calc_spectra, check_open, init_3d_model, modules, palm, parin, poisfft, read_var_list, read_3d_binary, transpose, write_var_list, write_3d_binary
     76Format adjustments in order to allow CPU# > 999. (cpu_statistics)
     77
     78advec_s_ups, advec_u_ups, advec_v_ups, advec_w_ups, calc_spectra, check_open, check_parameters, cpu_statistics, init_3d_model, modules, palm, parin, poisfft, read_var_list, read_3d_binary, transpose, write_var_list, write_3d_binary
    7579
    7680
    7781Errors:
    7882------
     83Bugfix: zero assignments to tendency arrays in case of restarts (init_3d_model)
     84
     85Bugfix: wrong grid level used in multigrid solver, routine restrict (poismg)
     86
    7987Bugfix: Construction of vertical profiles when 10 gradients have been
    8088specified in the parameter list (ug, vg, pt, q, sa, lad). (check_parameters)
    … …  
    109117
    110118
    111 check_parameters, flow_statistics, init_dvrp, local_stop, plant_canopy_model, pres, read_3d_binary, user_interface, write_3d_binary
     119check_parameters, flow_statistics, init_dvrp, init_3d_model, local_stop, plant_canopy_model, poismg, pres, read_3d_binary, user_interface, write_3d_binary
    112120

  • palm/trunk/SOURCE/check_parameters.f90

    r177 r181  
    55! -----------------
    66! Bug fix: Construction of vertical profiles when 10 gradients have been
    7 ! specified in the parameter list (ug, vg, pt, q, sa, lad) 
    8 !
     7! specified in the parameter list (ug, vg, pt, q, sa, lad)
     8!   
     9! Strict grid matching along z is not needed for mg-solver.
    910! Leaf area density (LAD) explicitly set to its surface value at k=0
    1011! Case of reading data for recycling included in initializing_actions,
    … …  
    369370       CALL local_stop
    370371    ENDIF
    371     IF ( ( psolver == 'poisfft_hybrid'  .OR.  psolver == 'multigrid' )  .AND.  &
    372          ( nxra > nxr  .OR.  nyna > nyn  .OR.  nza > nz ) )  THEN
     372    IF ( psolver == 'poisfft_hybrid'  .AND.                     &
     373         ( nxra > nxr  .OR.  nyna > nyn  .OR.  nza > nz )  .OR. &
     374          psolver == 'multigrid'      .AND.                     &
     375         ( nxra > nxr  .OR.  nyna > nyn ) )  THEN
    373376       IF ( myid == 0 )  THEN
    374377          PRINT*, '+++ check_parameters:'

  • palm/trunk/SOURCE/cpu_statistics.f90

    r83 r181  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Format adjustments in order to allow CPU# > 999
    77!
    88! Former revisions:
    … …  
    125125       CALL check_open( 18 )
    126126       WRITE ( 18, 100 )  TRIM( run_description_header ),        &
    127                           numprocs * threads_per_task, numprocs, &
     127                          numprocs * threads_per_task, pdims(1), pdims(2), &
    128128                          threads_per_task
    129129       DO
    … …  
    249249
    250250
    251 100 FORMAT (A/11('-')//'CPU measures for ',I3,' PEs (',I3,' tasks *',I3,    &
    252             &' threads):'/ &
    253              &'--------------------------------------------------'//        &
     251100 FORMAT (A/11('-')//'CPU measures for ',I5,' PEs (',I5,'(x) * ',I5,'(y', &
     252            &') tasks *',I5,' threads):'/ &
     253             &'----------------------------------------------------------', &
     254             &'------------'//&
    254255            &'place:                        mean        counts      min  ', &
    255256             &'     max       rms'/ &

  • palm/trunk/SOURCE/init_3d_model.f90

    r163 r181  
    77! Actual revisions:
    88! -----------------
     9! Bugfix: zero assignments to tendency arrays in case of restarts
    910! Further amendments to and modifications in the initialisation of the plant
    1011! canopy model
    1112! Allocation of hom_sum moved to parin, initialization of spectrum_x|y directly
    1213! after allocating theses arrays,
    13 ! read data for recycling added as new initialization option
     14! read data for recycling added as new initialization option,
     15! dummy allocation for diss
    1416!
    1517! Former revisions:
    … …  
    235237    IF ( use_sgs_for_particles )  THEN
    236238       ALLOCATE ( diss(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) )
     239    ELSE
     240       ALLOCATE ( diss(2,2,2) )  ! required because diss is used as a
     241                                 ! formal parameter
    237242    ENDIF
    238243
    … …  
    10461051       IF ( humidity  .OR.  passive_scalar )  q_p = q
    10471052       IF ( ocean )  sa_p = sa
     1053
     1054!
     1055!--    Allthough tendency arrays are set in prognostic_equations, they have
     1056!--    have to be predefined here because they are used (but multiplied with 0)
     1057!--    there before they are set.
     1058       IF ( timestep_scheme(1:5) == 'runge' )  THEN
     1059          te_m = 0.0; tpt_m = 0.0; tu_m = 0.0; tv_m = 0.0; tw_m = 0.0
     1060          IF ( humidity  .OR.  passive_scalar )  tq_m = 0.0
     1061          IF ( ocean )  tsa_m = 0.0
     1062       ENDIF
    10481063
    10491064    ELSE

  • palm/trunk/SOURCE/init_pegrid.f90

    r163 r181  
    44! Actual revisions:
    55! -----------------
     6! ATTENTION: nnz_x undefined problem still has to be solved!!!!!!!!
     7! nz is used instead nnz for calculating mg-levels
    68! Collect on PE0 horizontal index bounds from all other PEs,
    79! broadcast the id of the inflow PE (using the respective communicator)
    … …  
    340342
    341343       sendrecvcount_zx = nnx * nny * nnz_x
     344
     345    ELSE
     346!
     347!---   Setting of dummy values because otherwise variables are undefined in
     348!---   the next step  x --> y
     349!---   WARNING: This case has still to be clarified!!!!!!!!!!!!
     350       nnz_x  = 1
     351       nzb_x  = 1
     352       nzt_xa = 1
     353       nzt_x  = 1
     354       nny_x  = nny
    342355
    343356    ENDIF
    … …  
    694707       ENDDO
    695708
    696        k = nnz
     709       k = nz    ! do not use nnz because it might be > nz due to transposition
     710                 ! requirements
    697711       DO WHILE ( MOD( k, 2 ) == 0  .AND.  k /= 2 )
    698712          k = k / 2

  • palm/trunk/SOURCE/poismg.f90

    r139 r181  
    88! Actual revisions:
    99! -----------------
    10 !
     10! Bugfix: grid_level+1 has to be used in restrict for flags-array
    1111!
    1212! Former revisions:
    … …  
    274274!
    275275!-- Choose flag array of the upper level
    276     SELECT CASE ( l )
     276    SELECT CASE ( l+1 )
    277277       CASE ( 1 )
    278278          flags => wall_flags_1
Note: See TracChangeset for help on using the changeset viewer.
                                                                                                                                                                                                                                                                                                                                                                               
  | Impressum | ©Leibniz Universität Hannover |