Changeset 86


Ignore:
Timestamp:
May 16, 2007 4:00:18 PM (14 years ago)
Author:
raasch
Message:

small bugfixes

Location:
palm/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/INSTALL/example_rc

    r83 r86  
    11
    22 *************************           ----------------------------
    3  * PALM 3.2a  Rev: 82M   *           3D - run without 1D - prerun
     3 * PALM 3.2a  Rev: 83    *           3D - run without 1D - prerun
    44 *************************           ----------------------------
    55
  • palm/trunk/SCRIPTS/.mrun.config.default

    r83 r86  
    2121%host_identifier   breg*-en0   ibmb
    2222%host_identifier   berni*-en0  ibmb
     23%host_identifier   tgg*        lctit
    2324#
    2425#%remote_username   <replace by your linux cluster username>     lcmuk parallel
     
    4445%fopts             -axW:-cpp:-g:-CB:-inline_debug_info:-r8:-nbs:-convert:little:endian     lcmuk trace
    4546%lopts             -axW:-cpp:-g:-CB:-inline_debug_info:-r8:-nbs:-Vaxlib                    lcmuk trace
     47#
     48#%remote_username   <replace by your tsubame username>              lctit parallel
     49#%tmp_user_catalog  <replace by your user_catalog>                  lctit parallel
     50#%tmp_data_catalog  <replace by your data_catalog>                  lctit parallel
     51%cpp_options       -Mpreprocess:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf  lctit parallel
     52%netcdf_inc        -I:/home2/usr5/mkanda/netcdf-3.6.2/include      lctit parallel
     53%netcdf_lib        -L/home2/usr5/mkanda/netcdf-3.6.2/lib:-lnetcdf  lctit parallel
     54%compiler_name_ser pgf95                                           lctit parallel
     55%compiler_name     mpif90                                          lctit parallel
     56%fopts             -r8:-fast:-fastsse                              lctit parallel
     57%lopts             -r8:-fast:-fastsse                              lctit parallel
    4658#
    4759#%remote_username   <replace by your HLRN username>           ibmh parallel
  • palm/trunk/SOURCE/CURRENT_MODIFICATIONS

    r85 r86  
    1212Errors:
    1313------
    14 Bugfix: work_fft*_vec removed from some PRIVATE-declarations (poisfft.f90).
     14Bugfix: work_fft*_vec removed from some PRIVATE-declarations (poisfft).
    1515
    16 poisfft
     16Bugfix: field_chr renamed field_char (user_interface).
     17
     18poisfft, user_interface
  • palm/trunk/SOURCE/data_output_dvrp.f90

    r83 r86  
    3232! Actual revisions:
    3333! -----------------
     34! TEST: different colours for isosurfaces
    3435! TEST: write statements
    3536!
     
    103104!--       Set lock to avoid recursive calls of DVRP_STEERING_UPDATE
    104105          lock_steering_update = .TRUE.
    105     WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: vor steering_update'
    106     CALL local_flush( 9 )
     106!   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: vor steering_update'
     107!   CALL local_flush( 9 )
    107108          CALL DVRP_STEERING_UPDATE( m-1, data_output_dvrp )
    108     WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: nach steering_update'
    109     CALL local_flush( 9 )
     109!   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: nach steering_update'
     110!   CALL local_flush( 9 )
    110111          lock_steering_update = .FALSE.
    111112       ENDIF
     
    139140!--    Select the plot mode (in case of isosurface or slicer only if user has
    140141!--    defined a variable which shall be plotted; otherwise do nothing)
    141        IF ( mode_dvrp(m)(1:9) == 'particles'  .AND.  particle_advection )  THEN
    142 
    143     WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang particles'
    144     CALL local_flush( 9 )
     142       IF ( mode_dvrp(m)(1:9) == 'particles'  .AND.  particle_advection  .AND. &
     143            simulated_time >= particle_advection_start )  THEN
     144
     145!   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang particles'
     146!   CALL local_flush( 9 )
    145147!
    146148!--       DVRP-Calls for plotting particles:
     
    169171!
    170172!--          Particles have a tail
    171              WRITE (9,*) '--- before ALLOCATE  simtime=',simulated_time,' #of_tails=', number_of_tails, &
    172                            ' max#of_tp=', maximum_number_of_tailpoints
    173     CALL local_flush( 9 )
     173!            WRITE (9,*) '--- before ALLOCATE  simtime=',simulated_time,' #of_tails=', number_of_tails, &
     174!                          ' max#of_tp=', maximum_number_of_tailpoints
     175!   CALL local_flush( 9 )
    174176             ALLOCATE( psize(number_of_tails), p_t(number_of_tails),      &
    175177                       p_c(number_of_tails*maximum_number_of_tailpoints), &
     
    177179                       p_y(number_of_tails*maximum_number_of_tailpoints), &
    178180                       p_z(number_of_tails*maximum_number_of_tailpoints) )
    179              WRITE (9,*) '--- after ALLOCATE'
    180     CALL local_flush( 9 )
     181!            WRITE (9,*) '--- after ALLOCATE'
     182!   CALL local_flush( 9 )
    181183             psize = 0.0;  p_t = 0;  p_c = 0.0;  p_x = 0.0;  p_y = 0.0
    182184             p_z   = 0.0;
     
    187189                IF ( nn /= 0 )  THEN
    188190                   k = k + 1
    189                    IF ( simulated_time > 1338.0 )  THEN
    190                       WRITE (9,*) '--- particle ',n,' tail_id=',nn,' #of_tp=',particles(n)%tailpoints
    191     CALL local_flush( 9 )
    192                    ENDIF
     191!                  IF ( simulated_time > 1338.0 )  THEN
     192!                     WRITE (9,*) '--- particle ',n,' tail_id=',nn,' #of_tp=',particles(n)%tailpoints
     193!   CALL local_flush( 9 )
     194!                  ENDIF
    193195                   DO  j = 1, particles(n)%tailpoints
    194196                      i = i + 1
     
    200202                                                                superelevation
    201203                      p_c(i) = particle_tail_coordinates(j,4,nn)
    202                       IF ( simulated_time > 1338.0 )  THEN
    203                          WRITE (9,*) '--- tp= ',i,' x=',p_x(i),' y=',p_y(i), &
    204                                                  ' z=',p_z(i),' c=',p_c(i)
    205     CALL local_flush( 9 )
    206                       ENDIF
     204!                     IF ( simulated_time > 1338.0 )  THEN
     205!                        WRITE (9,*) '--- tp= ',i,' x=',p_x(i),' y=',p_y(i), &
     206!                                                ' z=',p_z(i),' c=',p_c(i)
     207!   CALL local_flush( 9 )
     208!                     ENDIF
    207209                   ENDDO
    208210                   psize(k) = particles(n)%dvrp_psize
    209211                   p_t(k)   = particles(n)%tailpoints - 1
    210                    IF ( simulated_time > 1338.0 )  THEN
    211                       WRITE (9,*) '--- t= ',k,' psize=',psize(k),' p_t=',p_t(k)
    212     CALL local_flush( 9 )
    213                    ENDIF
     212!                  IF ( simulated_time > 1338.0 )  THEN
     213!                     WRITE (9,*) '--- t= ',k,' psize=',psize(k),' p_t=',p_t(k)
     214!   CALL local_flush( 9 )
     215!                  ENDIF
    214216                ENDIF               
    215217             ENDDO
    216              WRITE (9,*) '--- after locally storing the particle attributes'
    217     CALL local_flush( 9 )
     218!            WRITE (9,*) '--- after locally storing the particle attributes'
     219!   CALL local_flush( 9 )
    218220          ENDIF
    219221
     
    238240                                     3, psize, p_c, p_t )
    239241             ELSE
    240                 WRITE (9,*) '--- before DVRP_PARTICLES'
    241     CALL local_flush( 9 )
     242!               WRITE (9,*) '--- before DVRP_PARTICLES'
     243!   CALL local_flush( 9 )
    242244                CALL DVRP_PARTICLES( m-1, number_of_tails, p_x, p_y, p_z, 15, &
    243245                                     psize, p_c, p_t )
    244                 WRITE (9,*) '--- after DVRP_PARTICLES'
    245                 WRITE (9,*) 'm-1 = ',m-1
    246                 WRITE (9,*) 'number_of_tails=', number_of_tails
    247                 WRITE (9,*) 'p_x =', p_x
    248                 WRITE (9,*) 'p_y =', p_y
    249                 WRITE (9,*) 'p_z =', p_z
    250                 WRITE (9,*) 'psize =', psize
    251                 WRITE (9,*) 'p_c =', p_c
    252                 WRITE (9,*) 'p_t =', p_t
    253 
    254     CALL local_flush( 9 )
     246!               WRITE (9,*) '--- after DVRP_PARTICLES'
     247!               WRITE (9,*) 'm-1 = ',m-1
     248!               WRITE (9,*) 'number_of_tails=', number_of_tails
     249!               WRITE (9,*) 'p_x =', p_x
     250!               WRITE (9,*) 'p_y =', p_y
     251!               WRITE (9,*) 'p_z =', p_z
     252!               WRITE (9,*) 'psize =', psize
     253!               WRITE (9,*) 'p_c =', p_c
     254!               WRITE (9,*) 'p_t =', p_t
     255
     256!   CALL local_flush( 9 )
    255257             ENDIF
    256258          ENDIF
    257259
    258260          CALL DVRP_VISUALIZE( m-1, 3, dvrp_filecount )
    259     WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende particles'
    260     CALL local_flush( 9 )
     261!   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende particles'
     262!   CALL local_flush( 9 )
    261263
    262264          DEALLOCATE( psize, p_c, p_t, p_x, p_y, p_z )
     
    313315                      DO  k = nzb, nz_do3d
    314316                         local_pf(i,j,k) = w(k,j,i)
     317                      ENDDO
     318                   ENDDO
     319                ENDDO
     320                DO  k = nzb, nz_do3d
     321                   DO  j = nys+1, nyn
     322                      DO  i = nxl, nxr+1
     323                         local_pf(i,j,k) = 0.25 * local_pf(i,j-1,k) + &
     324                                           0.50 * local_pf(i,j,k)   + &
     325                                           0.25 * local_pf(i,j+1,k)
    315326                      ENDDO
    316327                   ENDDO
     
    407418          IF ( mode_dvrp(m)(1:10) == 'isosurface' )  THEN
    408419
    409     WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang isosurface'
    410     CALL local_flush( 9 )
     420!   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang isosurface'
     421!   CALL local_flush( 9 )
    411422!
    412423!--          DVRP-Calls for plotting isosurfaces:
     
    417428!--          Preliminary settings for w!
    418429             IF ( output_variable == 'w' )  THEN
    419                 CALL DVRP_MATERIAL_RGB( m-1, 1, 0.3, 0.8, 0.3, 0.0 )
     430                IF ( tv == 1 )  THEN
     431                   CALL DVRP_MATERIAL_RGB( m-1, 1, 0.8, 0.1, 0.1, 0.0 )
     432                ELSE
     433                   CALL DVRP_MATERIAL_RGB( m-1, 1, 0.1, 0.1, 0.8, 0.0 )
     434                ENDIF
    420435             ELSE
    421436                CALL DVRP_MATERIAL_RGB( m-1, 1, 0.9, 0.9, 0.9, 0.0 )
     
    428443             CALL DVRP_THRESHOLD( m-1, threshold(tv) )
    429444             CALL DVRP_VISUALIZE( m-1, 1, dvrp_filecount )
    430     WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende isosurface'
    431     CALL local_flush( 9 )
     445!   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende isosurface'
     446!   CALL local_flush( 9 )
    432447
    433448             CALL cpu_log( log_point_s(26), 'dvrp_isosurface', 'stop' )
     
    435450          ELSEIF ( mode_dvrp(m)(1:6) == 'slicer' )  THEN
    436451
    437     WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang slicer'
    438     CALL local_flush( 9 )
     452!   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: anfang slicer'
     453!   CALL local_flush( 9 )
    439454!
    440455!--          DVRP-Calls for plotting slicers:
     
    465480             CALL cpu_log( log_point_s(27), 'dvrp_slicer', 'stop' )
    466481
    467     WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende slicer'
    468     CALL local_flush( 9 )
     482!   WRITE ( 9, * ) '*** myid=', myid, ' data_output_dvrp: ende slicer'
     483!   CALL local_flush( 9 )
    469484          ENDIF
    470485
     
    480495
    481496    CALL cpu_log( log_point(27), 'data_output_dvrp', 'stop' )
    482     WRITE ( 9, * ) '*** myid=', myid, ' Ende data_output_dvrp'
    483     CALL local_flush( 9 )
     497!   WRITE ( 9, * ) '*** myid=', myid, ' Ende data_output_dvrp'
     498!   CALL local_flush( 9 )
    484499
    485500#endif
  • palm/trunk/SOURCE/user_interface.f90

    r77 r86  
    44! Actual revisions:
    55! -----------------
    6 !
     6! Bugfix: field_chr renamed field_char
    77!
    88! Former revisions:
     
    163163!
    164164!    IF ( initializing_actions == 'read_restart_data' )  THEN
    165 !       READ ( 13 )  field_chr
    166 !       DO  WHILE ( TRIM( field_chr ) /= '*** end user ***' )
    167 !
    168 !          SELECT CASE ( TRIM( field_chr ) )
     165!       READ ( 13 )  field_char
     166!       DO  WHILE ( TRIM( field_char ) /= '*** end user ***' )
     167!
     168!          SELECT CASE ( TRIM( field_char ) )
    169169!
    170170!             CASE ( 'u2_av' )
     
    174174!             CASE DEFAULT
    175175!                PRINT*, '+++ user_init: unknown variable named "', &
    176 !                        TRIM( field_chr ), '" found in'
     176!                        TRIM( field_char ), '" found in'
    177177!                PRINT*, '               data from prior run on PE ', myid
    178178!                CALL local_stop
     
    180180!          END SELECT
    181181!
    182 !          READ ( 13 )  field_chr
     182!          READ ( 13 )  field_char
    183183!
    184184!       ENDDO
Note: See TracChangeset for help on using the changeset viewer.