Ignore:
Timestamp:
Apr 7, 2016 7:49:42 AM (5 years ago)
Author:
hoffmann
Message:

changes in LPM and bulk cloud microphysics

File:
1 edited

Legend:

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

    r1818 r1822  
    1919! Current revisions:
    2020! ------------------
    21 !
     21! Tails removed.
     22!
     23! Initialization of sgs model not necessary for the use of cloud_droplets and
     24! use_sgs_for_particles.
     25!
     26! lpm_release_set integrated.
     27!
     28! Unused variabled removed.
    2229!
    2330! Former revisions:
     
    108115        ONLY:  lpm_exchange_horiz, lpm_move_particle
    109116
     117    USE lpm_init_mod,                                                          &
     118        ONLY: lpm_create_particle, PHASE_RELEASE
     119
    110120    USE lpm_pack_arrays_mod,                                                   &
    111121        ONLY:  lpm_pack_all_arrays
    112122
    113123    USE particle_attributes,                                                   &
    114         ONLY:  collision_kernel, deleted_particles, deleted_tails,             &
     124        ONLY:  collision_kernel, deleted_particles,                            &
    115125               dt_write_particle_data, dt_prel, end_time_prel,                 &
    116126               grid_particles, number_of_particles, number_of_particle_groups, &
    117127               particles, particle_groups, prt_count, trlp_count_sum,          &
    118                tail_mask, time_prel, time_sort_particles,                      &
     128               time_prel,                                                      &
    119129               time_write_particle_data, trlp_count_recv_sum, trnp_count_sum,  &
    120130               trnp_count_recv_sum, trrp_count_sum, trrp_count_recv_sum,       &
    121                trsp_count_sum, trsp_count_recv_sum, use_particle_tails,        &
     131               trsp_count_sum, trsp_count_recv_sum,                            &
    122132               use_sgs_for_particles, write_particle_statistics
    123133
     
    159169
    160170!
    161 !-- Initialize arrays for marking those particles/tails to be deleted after the
     171!-- Initialize arrays for marking those particles to be deleted after the
    162172!-- (sub-) timestep
    163173    deleted_particles = 0
    164 
    165     IF ( use_particle_tails )  THEN
    166        tail_mask = .TRUE.
    167     ENDIF
    168     deleted_tails = 0
    169 
    170174
    171175!
     
    202206    IF ( time_prel >= dt_prel  .AND.  end_time_prel > simulated_time )  THEN
    203207
    204        CALL lpm_release_set
     208       CALL lpm_create_particle(PHASE_RELEASE)
    205209!
    206210!--    The MOD function allows for changes in the output interval with
     
    240244!--    velocity variances)
    241245
    242        IF ( use_sgs_for_particles )  CALL lpm_init_sgs_tke
     246       IF ( use_sgs_for_particles  .AND.  .NOT. cloud_droplets )  THEN
     247          CALL lpm_init_sgs_tke
     248       ENDIF
    243249
    244250       DO  i = nxl, nxr
     
    361367       deleted_particles = 0
    362368
    363        IF ( use_particle_tails )  THEN
    364           tail_mask     = .TRUE.
    365        ENDIF
    366        deleted_tails = 0
    367 
    368 
    369369       IF ( dt_3d_reached )  EXIT
    370370
     
    387387    IF ( collision_kernel == 'none' )  CALL lpm_set_attributes
    388388
    389 
    390389!
    391390!-- Set particle attributes defined by the user
    392391    CALL user_lpm_set_attributes
    393 
    394 
    395 !
    396 !-- particle tails currently not available
    397 !
    398 !-- If required, add the current particle positions to the particle tails
    399 !   IF ( use_particle_tails )  CALL lpm_extend_tails
    400 
    401392
    402393!
Note: See TracChangeset for help on using the changeset viewer.