Changeset 1685 for palm/trunk/SOURCE/lpm_pack_arrays.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_pack_arrays.f90 (modified) (5 diffs)

palm/trunk/SOURCE/lpm_pack_arrays.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-! 
+! bugfix concerning vertical index calculation in case of ocean
 ! 
 ! Former revisions:
@@ -58 +58 @@
         ONLY:  deleted_tails, grid_particles, new_tail_id,                     &
                number_of_particles, number_of_tails, offset_ocean_nzt,         &
-               offset_ocean_nzt_m1, particles, particle_type, prt_count,       &
+               particles, particle_type, prt_count,                            &
                particle_tail_coordinates, tail_mask, use_particle_tails
 
@@ -202 +202 @@
 
       USE control_parameters,                                                  &
-          ONLY: dz,  atmos_ocean_sign
+          ONLY: dz
 
       USE indices,                                                             &
@@ -214 +214 @@
       IMPLICIT NONE
 
-      INTEGER(iwp), INTENT(IN)    :: ip
-      INTEGER(iwp), INTENT(IN)    :: jp
-      INTEGER(iwp), INTENT(IN)    :: kp
-
-      INTEGER(iwp)                :: i
-      INTEGER(iwp)                :: j
-      INTEGER(iwp)                :: k
-      INTEGER(iwp)                :: n
-      INTEGER(iwp)                :: nn
-      INTEGER(iwp)                :: m
-      INTEGER(iwp)                :: sort_index
-      INTEGER(iwp)                :: is
-      INTEGER(iwp)                :: kk
-
-      INTEGER(iwp),DIMENSION(0:7) :: sort_count
+      INTEGER(iwp), INTENT(IN) :: ip
+      INTEGER(iwp), INTENT(IN) :: jp
+      INTEGER(iwp), INTENT(IN) :: kp
+
+      INTEGER(iwp)             :: i
+      INTEGER(iwp)             :: is
+      INTEGER(iwp)             :: j
+      INTEGER(iwp)             :: k
+      INTEGER(iwp)             :: n
+      INTEGER(iwp)             :: nn
+      INTEGER(iwp)             :: m
+      INTEGER(iwp)             :: sort_index
+
+      INTEGER(iwp), DIMENSION(0:7) :: sort_count
 
       TYPE(particle_type), DIMENSION(number_of_particles,0:7) :: sort_particles
@@ -242 +241 @@
              i = particles(n)%x * ddx
              j = particles(n)%y * ddy
-             k = ( particles(n)%z + 0.5_wp * dz * atmos_ocean_sign ) / dz +    &
-                 offset_ocean_nzt
-             kk= particles(n)%z / dz + 1 + offset_ocean_nzt_m1
+             k = ( particles(n)%z + 0.5_wp * dz ) / dz + offset_ocean_nzt
              IF ( i == ip )  sort_index = sort_index+4
              IF ( j == jp )  sort_index = sort_index+2