Changeset 1416


Ignore:
Timestamp:
Jun 4, 2014 4:04:03 PM (7 years ago)
Author:
suehring
Message:

Bugfixes concerning new particle structure

Location:
palm/trunk/SOURCE
Files:
3 edited

Legend:

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

    r1360 r1416  
    2020! Current revisions:
    2121! ------------------
    22 !
     22! user_lpm_advec is called for each gridpoint.
     23! Bugfix: in order to prevent an infinite loop, time_loop_done is set .TRUE.
     24! at the head of the do-loop. 
    2325!
    2426! Former revisions:
     
    223225       CALL cpu_log( log_point_s(44), 'lpm_advec', 'start' )
    224226       CALL cpu_log( log_point_s(44), 'lpm_advec', 'pause' )
     227       
     228       grid_particles(:,:,:)%time_loop_done = .TRUE.
    225229!
    226230!--    If particle advection includes SGS velocity components, calculate the
     
    287291!--             User-defined actions after the calculation of the new particle
    288292!--             position
    289                 CALL user_lpm_advec
     293                CALL user_lpm_advec(i,j,k)
    290294!
    291295!--             Apply boundary conditions to those particles that have crossed
  • palm/trunk/SOURCE/user_lpm_advec.f90

    r1360 r1416  
    1  SUBROUTINE user_lpm_advec
     1 SUBROUTINE user_lpm_advec( ip, jp, kp )
    22
    33!--------------------------------------------------------------------------------!
     
    2020! Current revisions:
    2121! -----------------
    22 !
     22! Provide template for new particle structure.
     23! Moreover, user_lpm_advec is called for each gridpoint.
    2324!
    2425! Former revisions:
     
    6566!
    6667!-- Here the user-defined actions follow
    67 !     DO  ip = nxl, nxr
    68 !        DO  jp = nys, nyn
    69 !           DO  kp = nzb+1, nzt
    70 !              number_of_particles = prt_count(kp,jp,ip)
    71 !              particles => grid_particles(kp,jp,ip)%particles(1:number_of_particles)
    72 !              IF ( number_of_particles <= 0 )  CYCLE
    73 !              DO  n = 1, number_of_particles
     68!   number_of_particles = prt_count(kp,jp,ip)
     69!   particles => grid_particles(kp,jp,ip)%particles(1:number_of_particles)
     70!   IF ( number_of_particles <= 0 )  CYCLE
     71!   DO  n = 1, number_of_particles
    7472!
    75 !              ENDDO
    76 !           ENDDO
    77 !        ENDDO
    78 !     ENDDO
    79    
     73!   ENDDO
    8074
    8175 END SUBROUTINE user_lpm_advec
  • palm/trunk/SOURCE/user_lpm_init.f90

    r1360 r1416  
    2020! Current revisions:
    2121! -----------------
    22 !
     22! load module indices
    2323!
    2424! Former revisions:
     
    4949! Modification of initial particles by the user.
    5050!------------------------------------------------------------------------------!
     51    USE indices
    5152
    5253    USE kinds
Note: See TracChangeset for help on using the changeset viewer.