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_read_restart_file.f90

    r1818 r1822  
    1919! Current revisions:
    2020! ------------------
    21 !
     21! Tails removed. Unused variables removed.
    2222!
    2323! Former revisions:
     
    5454
    5555    USE indices,                                                               &
    56         ONLY:  nx, nxl, nxlg, nxr, nxrg, ny, nyn, nyng, nys, nysg, nz, nzb, nzt
     56        ONLY:  nxl, nxlg, nxr, nxrg, nyn, nyng, nys, nysg, nzb, nzt
    5757
    5858    USE kinds
     
    6464        ONLY:  alloc_factor, bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,         &
    6565               grid_particles, maximum_number_of_particles,                    &
    66                maximum_number_of_tailpoints, maximum_number_of_tails,          &
    67                min_nr_particle, new_tail_id, number_of_particles,              &
    68                number_of_particle_groups, number_of_tails, particles,          &
    69                particle_groups, particle_tail_coordinates, particle_type,      &
    70                prt_count, sort_count, tail_mask, time_prel,                    &
    71                time_write_particle_data, uniform_particles,                    &
    72                use_particle_tails, zero_particle
     66               min_nr_particle, number_of_particles, number_of_particle_groups,&
     67               particle_groups, particle_type, prt_count, time_prel,           &
     68               time_write_particle_data, uniform_particles, zero_particle
    7369
    7470    USE pegrid
     
    10096!-- First compare the version numbers
    10197    READ ( 90 )  version_on_file
    102     particle_binary_version = '3.2'
     98    particle_binary_version = '4.0'
    10399    IF ( TRIM( version_on_file ) /= TRIM( particle_binary_version ) )  THEN
    104100       message_string = 'version mismatch concerning data from prior ' // &
     
    114110!-- min_nr_particle, the remainder is initialized by zero_particle to avoid
    115111!-- errors.
    116 #if defined( __twocachelines )
    117     zero_particle = particle_type( 0.0_wp, 0.0_sp, 0.0_sp, 0.0_sp, 0.0_sp,  &
    118                                    0.0_sp, 0.0_sp, 0.0_wp, 0.0_wp, 0.0_wp,  &
    119                                    0, .FALSE., 0.0_wp, 0.0_wp, 0.0_wp,      &
    120                                    0.0_sp, 0.0_sp, 0.0_sp, 0.0_sp, 0.0_sp,  &
    121                                    0.0_sp, 0, 0, 0, -1)
    122 #else
    123112    zero_particle = particle_type( 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
    124113                                   0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp,  &
     
    126115                                   0.0_wp, 0.0_wp, 0.0_wp, 0.0_wp, 0, 0, 0, &
    127116                                   0, .FALSE., -1)
    128 #endif
    129 
    130117!
    131118!-- Read some particle parameters and the size of the particle arrays,
    132119!-- allocate them and read their contents.
    133120    READ ( 90 )  bc_par_b, bc_par_lr, bc_par_ns, bc_par_t,                  &
    134                  maximum_number_of_tailpoints, maximum_number_of_tails,     &
    135                  number_of_particle_groups, number_of_tails,                &
    136                  particle_groups, time_prel, time_write_particle_data,      &
    137                  uniform_particles
     121                 number_of_particle_groups, particle_groups, time_prel,     &
     122                 time_write_particle_data, uniform_particles
    138123
    139124    ALLOCATE( prt_count(nzb:nzt+1,nysg:nyng,nxlg:nxrg),                     &
     
    177162    ENDDO
    178163
    179 !
    180 !-- particle tails currently not available
    181 !    IF ( use_particle_tails )  THEN
    182 !       ALLOCATE( particle_tail_coordinates(maximum_number_of_tailpoints,5, &
    183 !                 maximum_number_of_tails),                                 &
    184 !                 new_tail_id(maximum_number_of_tails),                     &
    185 !                 tail_mask(maximum_number_of_tails) )
    186 !       READ ( 90 )  particle_tail_coordinates
    187 !    ENDIF
    188 
    189164    CLOSE ( 90 )
    190165!
Note: See TracChangeset for help on using the changeset viewer.