Ignore:
Timestamp:
Mar 11, 2007 11:50:04 AM (17 years ago)
Author:
raasch
Message:

preliminary update of further changes, running

File:
1 edited

Legend:

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

    r59 r60  
    77! particle_boundary_conds,
    88! vertical walls are regarded in the SGS model,
    9 ! + user_advec_particles
     9! + user_advec_particles, particles-package is now part of the defaut code
    1010! TEST: PRINT statements on unit 9 (commented out)
    1111!
     
    5050! Particle advection
    5151!------------------------------------------------------------------------------!
    52 #if defined( __particles )
    5352
    5453    USE arrays_3d
     
    6867    IMPLICIT NONE
    6968
    70     INTEGER ::  deleted_particles, deleted_tails, i, ie, ii, inc, is, j, jj,   &
    71                 js, k, kk, kw, m, n, nc, nn, psi, tlength, trlp_count,         &
    72                 trlp_count_sum, trlp_count_recv, trlp_count_recv_sum,          &
    73                 trlpt_count, trlpt_count_recv, trnp_count, trnp_count_sum,     &
    74                 trnp_count_recv, trnp_count_recv_sum, trnpt_count,             &
    75                 trnpt_count_recv, trrp_count, trrp_count_sum, trrp_count_recv, &
     69    INTEGER ::  agp, deleted_particles, deleted_tails, i, ie, ii, inc, is, j,  &
     70                jj, js, k, kk, kw, m, n, nc, nn, num_gp, psi, tlength,         &
     71                trlp_count, trlp_count_sum, trlp_count_recv,                   &
     72                trlp_count_recv_sum, trlpt_count, trlpt_count_recv,            &
     73                trnp_count, trnp_count_sum, trnp_count_recv,                   &
     74                trnp_count_recv_sum, trnpt_count, trnpt_count_recv,            &
     75                trrp_count, trrp_count_sum, trrp_count_recv,                   &
    7676                trrp_count_recv_sum, trrpt_count, trrpt_count_recv,            &
    7777                trsp_count, trsp_count_sum, trsp_count_recv,                   &
    7878                trsp_count_recv_sum, trspt_count, trspt_count_recv, nd
    7979
     80    INTEGER ::  gp_outside_of_building(1:8)
     81
    8082    LOGICAL ::  dt_3d_reached, dt_3d_reached_l, prt_position
    8183
    82     REAL    ::  aa, arg, bb, cc, dd, delta_r, dens_ratio, de_dx_int,           &
    83                 de_dx_int_l, de_dx_int_u, de_dy_int, de_dy_int_l, de_dy_int_u, &
    84                 de_dz_int, de_dz_int_l, de_dz_int_u, diss_int, diss_int_l,     &
    85                 diss_int_u, distance, dt_gap, dt_particle, d_radius, e_a,      &
    86                 e_int, e_int_l, e_int_u, e_mean_int, e_s, exp_arg, exp_term,   &
    87                 fs_int, gg, lagr_timescale, mean_r, new_r, p_int, pt_int,      &
    88                 pt_int_l, pt_int_u, q_int, q_int_l, q_int_u, ql_int, ql_int_l, &
    89                 ql_int_u, random_gauss, sl_r3, sl_r4, s_r3, s_r4, t_int,       &
    90                 u_int, u_int_l, u_int_u, vv_int, v_int, v_int_l, v_int_u,      &
    91                 w_int, w_int_l, w_int_u, x, y
     84    REAL    ::  aa, arg, bb, cc, dd, delta_r, dens_ratio, de_dt, de_dt_min,    &
     85                de_dx_int, de_dx_int_l, de_dx_int_u, de_dy_int, de_dy_int_l,   &
     86                de_dy_int_u, de_dz_int, de_dz_int_l, de_dz_int_u, diss_int,    &
     87                diss_int_l, diss_int_u, distance, dt_gap, dt_particle,         &
     88                dt_particle_m, d_radius, d_sum, e_a, e_int, e_int_l, e_int_u,  &
     89                e_mean_int, e_s, exp_arg, exp_term, fs_int, gg,                &
     90                lagr_timescale, mean_r, new_r, p_int, pt_int, pt_int_l,        &
     91                pt_int_u, q_int, q_int_l, q_int_u, ql_int, ql_int_l, ql_int_u, &
     92                random_gauss, sl_r3, sl_r4, s_r3, s_r4, t_int, u_int, u_int_l, &
     93                u_int_u, vv_int, v_int, v_int_l, v_int_u, w_int, w_int_l,      &
     94                w_int_u, x, y
     95
     96    REAL, DIMENSION(1:30) ::  de_dxi, de_dyi, de_dzi, dissi, d_gp_pl, ei
     97
     98    REAL    ::  location(1:30,1:3)
    9299
    93100    REAL, DIMENSION(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) ::  de_dx, de_dy, de_dz
     
    16871694!--             previous timestep the increase must not exceed 200%
    16881695
    1689                 dt_particle_old = particles(n)%age - particles(n)%age_m
    1690                 IF ( dt_particle > 2.0 * dt_particle_old )  THEN
    1691                    dt_particle = 2.0 * dt_particle_old
     1696                dt_particle_m = particles(n)%age - particles(n)%age_m
     1697                IF ( dt_particle > 2.0 * dt_particle_m )  THEN
     1698                   dt_particle = 2.0 * dt_particle_m
    16921699                ENDIF
    16931700
     
    17031710                de_dt_min = - e_int / dt_particle
    17041711
    1705                 de_dt = ( e_int - particles(n)%e_m ) / dt_particle_old
     1712                de_dt = ( e_int - particles(n)%e_m ) / dt_particle_m
    17061713
    17071714                IF ( de_dt < de_dt_min )  THEN
     
    343634438000 FORMAT (I6,1X,F7.2,4X,I6,5X,4(I3,1X,I4,'/',I4,2X),6X,I6)
    34373444
    3438 #endif
    34393445 END SUBROUTINE advec_particles
    34403446
     
    34473453! Extend particle memory
    34483454!------------------------------------------------------------------------------!
    3449 #if defined( __particles )
    34503455
    34513456    USE particle_attributes
     
    34863491    DEALLOCATE( tmp_particles, tmp_particle_mask )
    34873492
    3488 #endif
    34893493 END SUBROUTINE allocate_prt_memory
    34903494
     
    34973501! Extend tail memory
    34983502!------------------------------------------------------------------------------!
    3499 #if defined( __particles )
    35003503
    35013504    USE particle_attributes
     
    35403543    tail_mask(number_of_tails+1:maximum_number_of_tails) = .TRUE.
    35413544
    3542 #endif
    35433545 END SUBROUTINE allocate_tail_memory
    35443546
     
    36693671! Write particle data on restart file
    36703672!------------------------------------------------------------------------------!
    3671 #if defined( __particles )
    36723673
    36733674    USE control_parameters
     
    37263727    CLOSE ( 90 )
    37273728
    3728 #endif
    37293729 END SUBROUTINE write_particles
    37303730
     
    37363736! Interpolate collision efficiency from table
    37373737!------------------------------------------------------------------------------!
    3738 #if defined( __particles )
    37393738
    37403739    IMPLICIT NONE
     
    38143813    ENDIF
    38153814
    3816 #endif
    38173815 END SUBROUTINE collision_efficiency
    38183816
     
    38263824! Sort particles in the sequence the grid boxes are stored in memory
    38273825!------------------------------------------------------------------------------!
    3828 #if defined( __particles )
    38293826
    38303827    USE arrays_3d
     
    39113908    CALL cpu_log( log_point_s(47), 'sort_particles', 'stop' )
    39123909
    3913 #endif
    39143910 END SUBROUTINE sort_particles
Note: See TracChangeset for help on using the changeset viewer.