Changeset 1685 for palm/trunk/SOURCE/lpm_advec.f90

Timestamp:

Oct 8, 2015 7:32:13 AM (9 years ago)

Author:

raasch

Message:

bugfix concerning vertical index calculation for particles in case of ocean runs

File:

• palm/trunk/SOURCE/lpm_advec.f90 (modified) (6 diffs)

palm/trunk/SOURCE/lpm_advec.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
-! 
+! TKE check for negative values (so far, only zero value was checked)
+! offset_ocean_nzt_m1 removed
+!
 ! Former revisions:
 ! -----------------
@@ -94 +95 @@
         ONLY:  block_offset, c_0, density_ratio, dt_min_part, grid_particles,  &
                iran_part, log_z_z0, number_of_particles, number_of_sublayers,  &
-               particles, particle_groups, offset_ocean_nzt,                   &
-               offset_ocean_nzt_m1, sgs_wfu_part, sgs_wfv_part, sgs_wfw_part,  &
-               use_sgs_for_particles, vertical_particle_advection, z0_av_global
+               particles, particle_groups, offset_ocean_nzt, sgs_wfu_part,     &
+               sgs_wfv_part, sgs_wfw_part, use_sgs_for_particles,              &
+               vertical_particle_advection, z0_av_global
         
     USE statistics,                                                            &
@@ -289 +290 @@
 !--    Same procedure for interpolation of the v velocity-component 
        DO  n = start_index(nb), end_index(nb)
+
           IF ( prandtl_layer  .AND.  particles(n)%z < z_p )  THEN
 
@@ -417 +419 @@
                 ENDIF
 !
-!--             Needed to avoid NaN particle velocities
-                IF ( e_int(n) == 0.0_wp )  THEN
+!--             Needed to avoid NaN particle velocities (this might not be
+!--             required any more)
+                IF ( e_int(n) <= 0.0_wp )  THEN
                    e_int(n) = 1.0E-20_wp
                 ENDIF
@@ -671 +674 @@
                 ENDIF
 !
-!--             Needed to avoid NaN particle velocities
-                IF ( e_int(n) == 0.0_wp )  THEN
+!--             Needed to avoid NaN particle velocities (this might not be
+!--             required any more)
+                IF ( e_int(n) <= 0.0_wp )  THEN
                    e_int(n) = 1.0E-20_wp
                 ENDIF
@@ -1134 +1138 @@
              ENDIF
 
- !           kw = particles(n)%z / dz
-             kw = kp-1                                    ! ok for ocean??? ( + offset_ocean_nzt_m1 ???)
+             kw = kp - 1
 
              IF ( k == 0 )  THEN