Changeset 1685 for palm/trunk/SOURCE
- Timestamp:
- Oct 8, 2015 7:32:13 AM (9 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 4 edited
-
lpm_advec.f90 (modified) (6 diffs)
-
lpm_exchange_horiz.f90 (modified) (3 diffs)
-
lpm_init.f90 (modified) (3 diffs)
-
lpm_pack_arrays.f90 (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/lpm_advec.f90
r1683 r1685 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 22 ! 21 ! TKE check for negative values (so far, only zero value was checked) 22 ! offset_ocean_nzt_m1 removed 23 ! 23 24 ! Former revisions: 24 25 ! ----------------- … … 94 95 ONLY: block_offset, c_0, density_ratio, dt_min_part, grid_particles, & 95 96 iran_part, log_z_z0, number_of_particles, number_of_sublayers, & 96 particles, particle_groups, offset_ocean_nzt, 97 offset_ocean_nzt_m1, sgs_wfu_part, sgs_wfv_part, sgs_wfw_part,&98 use_sgs_for_particles,vertical_particle_advection, z0_av_global97 particles, particle_groups, offset_ocean_nzt, sgs_wfu_part, & 98 sgs_wfv_part, sgs_wfw_part, use_sgs_for_particles, & 99 vertical_particle_advection, z0_av_global 99 100 100 101 USE statistics, & … … 289 290 !-- Same procedure for interpolation of the v velocity-component 290 291 DO n = start_index(nb), end_index(nb) 292 291 293 IF ( prandtl_layer .AND. particles(n)%z < z_p ) THEN 292 294 … … 417 419 ENDIF 418 420 ! 419 !-- Needed to avoid NaN particle velocities 420 IF ( e_int(n) == 0.0_wp ) THEN 421 !-- Needed to avoid NaN particle velocities (this might not be 422 !-- required any more) 423 IF ( e_int(n) <= 0.0_wp ) THEN 421 424 e_int(n) = 1.0E-20_wp 422 425 ENDIF … … 671 674 ENDIF 672 675 ! 673 !-- Needed to avoid NaN particle velocities 674 IF ( e_int(n) == 0.0_wp ) THEN 676 !-- Needed to avoid NaN particle velocities (this might not be 677 !-- required any more) 678 IF ( e_int(n) <= 0.0_wp ) THEN 675 679 e_int(n) = 1.0E-20_wp 676 680 ENDIF … … 1134 1138 ENDIF 1135 1139 1136 ! kw = particles(n)%z / dz 1137 kw = kp-1 ! ok for ocean??? ( + offset_ocean_nzt_m1 ???) 1140 kw = kp - 1 1138 1141 1139 1142 IF ( k == 0 ) THEN -
palm/trunk/SOURCE/lpm_exchange_horiz.f90
r1683 r1685 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! bugfix concerning vertical index offset in case of ocean 22 22 ! 23 23 ! Former revisions: … … 85 85 maximum_number_of_tailpoints, min_nr_particle, & 86 86 mpi_particle_type, number_of_tails, number_of_particles, & 87 offset_ocean_nzt, offset_ocean_nzt_m1, particles,&87 offset_ocean_nzt, particles, & 88 88 particle_tail_coordinates, particle_type, prt_count, & 89 89 tail_mask, trlp_count_sum, & … … 1079 1079 ip = ( particle_array(n)%x + 0.5_wp * dx ) * ddx 1080 1080 jp = ( particle_array(n)%y + 0.5_wp * dy ) * ddy 1081 kp = particle_array(n)%z / dz + 1 + offset_ocean_nzt _m11081 kp = particle_array(n)%z / dz + 1 + offset_ocean_nzt 1082 1082 1083 1083 IF ( ip >= nxl .AND. ip <= nxr .AND. jp >= nys .AND. jp <= nyn & -
palm/trunk/SOURCE/lpm_init.f90
r1683 r1685 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! bugfix concerning vertical index offset in case of ocean 22 22 ! 23 23 ! Former revisions: … … 128 128 number_of_initial_tails, number_of_particles, & 129 129 number_of_particle_groups, number_of_sublayers, & 130 number_of_tails, offset_ocean_nzt, offset_ocean_nzt_m1, & 130 number_of_tails, offset_ocean_nzt, offset_ocean_nzt_m1, & 131 131 particles, particle_advection_start, particle_groups, & 132 132 particle_groups_type, particles_per_point, & … … 760 760 ip = ( tmp_particle%x + 0.5_wp * dx ) * ddx 761 761 jp = ( tmp_particle%y + 0.5_wp * dy ) * ddy 762 kp = tmp_particle%z / dz + 1 + offset_ocean_nzt _m1762 kp = tmp_particle%z / dz + 1 + offset_ocean_nzt 763 763 764 764 IF ( seed_follows_topography ) THEN -
palm/trunk/SOURCE/lpm_pack_arrays.f90
r1683 r1685 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! bugfix concerning vertical index calculation in case of ocean 22 22 ! 23 23 ! Former revisions: … … 58 58 ONLY: deleted_tails, grid_particles, new_tail_id, & 59 59 number_of_particles, number_of_tails, offset_ocean_nzt, & 60 offset_ocean_nzt_m1, particles, particle_type, prt_count,&60 particles, particle_type, prt_count, & 61 61 particle_tail_coordinates, tail_mask, use_particle_tails 62 62 … … 202 202 203 203 USE control_parameters, & 204 ONLY: dz , atmos_ocean_sign204 ONLY: dz 205 205 206 206 USE indices, & … … 214 214 IMPLICIT NONE 215 215 216 INTEGER(iwp), INTENT(IN) :: ip 217 INTEGER(iwp), INTENT(IN) :: jp 218 INTEGER(iwp), INTENT(IN) :: kp 219 220 INTEGER(iwp) :: i 221 INTEGER(iwp) :: j 222 INTEGER(iwp) :: k 223 INTEGER(iwp) :: n 224 INTEGER(iwp) :: nn 225 INTEGER(iwp) :: m 226 INTEGER(iwp) :: sort_index 227 INTEGER(iwp) :: is 228 INTEGER(iwp) :: kk 229 230 INTEGER(iwp),DIMENSION(0:7) :: sort_count 216 INTEGER(iwp), INTENT(IN) :: ip 217 INTEGER(iwp), INTENT(IN) :: jp 218 INTEGER(iwp), INTENT(IN) :: kp 219 220 INTEGER(iwp) :: i 221 INTEGER(iwp) :: is 222 INTEGER(iwp) :: j 223 INTEGER(iwp) :: k 224 INTEGER(iwp) :: n 225 INTEGER(iwp) :: nn 226 INTEGER(iwp) :: m 227 INTEGER(iwp) :: sort_index 228 229 INTEGER(iwp), DIMENSION(0:7) :: sort_count 231 230 232 231 TYPE(particle_type), DIMENSION(number_of_particles,0:7) :: sort_particles … … 242 241 i = particles(n)%x * ddx 243 242 j = particles(n)%y * ddy 244 k = ( particles(n)%z + 0.5_wp * dz * atmos_ocean_sign ) / dz + & 245 offset_ocean_nzt 246 kk= particles(n)%z / dz + 1 + offset_ocean_nzt_m1 243 k = ( particles(n)%z + 0.5_wp * dz ) / dz + offset_ocean_nzt 247 244 IF ( i == ip ) sort_index = sort_index+4 248 245 IF ( j == jp ) sort_index = sort_index+2
Note: See TracChangeset
for help on using the changeset viewer.
