Changeset 4044 for palm/trunk/SOURCE/lagrangian_particle_model_mod.f90

Timestamp:

Jun 19, 2019 12:28:27 PM (5 years ago)

Author:

schwenkel

Message:

Bugfix in case of grid strecting: corrected calculation of k-Index

File:

• palm/trunk/SOURCE/lagrangian_particle_model_mod.f90 (modified) (7 diffs)

palm/trunk/SOURCE/lagrangian_particle_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix in case of grid strecting: corrected calculation of k-Index
+!
+! 4043 2019-06-18 16:59:00Z schwenkel
 ! Remove min_nr_particle, Add lpm_droplet_interactions_ptq into module
 ! 
@@ -186 +189 @@
                particle_maximum_age, iran,                                     & 
                simulated_time, topography, dopts_time_count,                   &
-               time_since_reference_point, rho_surface, u_gtrans, v_gtrans
+               time_since_reference_point, rho_surface, u_gtrans, v_gtrans,    &
+               dz_stretch_level, dz_stretch_level_start
 
     USE cpulog,                                                                &
@@ -682 +686 @@
 
 14 CONTINUE
-    
+
  END SUBROUTINE lpm_parin
  
@@ -1329 +1333 @@
                                ip = INT( tmp_particle%x * ddx )
                                jp = INT( tmp_particle%y * ddy )
-                               kp = INT( tmp_particle%z / dz(1) + 1 + offset_ocean_nzt )
-                               DO WHILE( zw(kp) < tmp_particle%z ) 
-                                  kp = kp + 1
-                               ENDDO
-                               DO WHILE( zw(kp-1) > tmp_particle%z )
-                                  kp = kp - 1
-                               ENDDO 
+!
+!--                            In case of stretching the actual k index is found iteratively
+                               IF ( dz_stretch_level .NE. -9999999.9  .OR.           &
+                                    dz_stretch_level_start(1) .NE. -9999999.9 ) THEN
+                                  kp = MINLOC( ABS( tmp_particle%z - zu ), DIM = 1 ) - 1
+                               ELSE
+                                  kp = INT( tmp_particle%z / dz(1) + 1 + offset_ocean_nzt )
+                               ENDIF
 !
 !--                            Determine surface level. Therefore, check for
@@ -6923 +6928 @@
 
        ALLOCATE(rvlp(MAX(1,trlp_count_recv)))
-!      
+!
 !--    This MPI_SENDRECV should work even with odd mixture on 32 and 64 Bit 
 !--    variables in structure particle_type (due to the calculation of par_size)
@@ -6990 +6995 @@
        trsp_count  = nr_move_south
        trnp_count  = nr_move_north
-       
+
        trsp(1:nr_move_south) = move_also_south(1:nr_move_south)
        trnp(1:nr_move_north) = move_also_north(1:nr_move_north)
@@ -7338 +7343 @@
        ip = particle_array(n)%x * ddx
        jp = particle_array(n)%y * ddy
-       kp = particle_array(n)%z / dz(1) + 1 + offset_ocean_nzt
-!
-!--    In case of grid stretching a particle might be above or below the  
-!--    previously calculated particle grid box (indices).     
-       DO WHILE( zw(kp) < particle_array(n)%z )
-          kp = kp + 1
-       ENDDO
-
-       DO WHILE( zw(kp-1) > particle_array(n)%z )
-          kp = kp - 1
-       ENDDO
+!
+!--    In case of stretching the actual k index must be found
+       IF ( dz_stretch_level .NE. -9999999.9  .OR.         &
+            dz_stretch_level_start(1) .NE. -9999999.9 ) THEN
+          kp = MINLOC( ABS( particle_array(n)%z - zu ), DIM = 1 ) - 1
+       ELSE
+          kp = INT( particle_array(n)%z / dz(1) + 1 + offset_ocean_nzt )
+       ENDIF
 
        IF ( ip >= nxl  .AND.  ip <= nxr  .AND.  jp >= nys  .AND.  jp <= nyn    &