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

Timestamp:

Nov 20, 2017 12:40:38 PM (6 years ago)

Author:

schwenkel

Message:

enable particle advection with grid stretching and some formatation changes in lpm

File:

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

palm/trunk/SOURCE/lpm_advec.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+!  Removed indices ilog and jlog which are no longer needed since particle box
+! locations are identical to scalar boxes and topography.
+
 ! 
 ! Former revisions:
@@ -167 +169 @@
     INTEGER(iwp) ::  i                           !< index variable along x
     INTEGER(iwp) ::  ip                          !< index variable along x 
-    INTEGER(iwp) ::  ilog                        !< index variable along x 
     INTEGER(iwp) ::  j                           !< index variable along y 
     INTEGER(iwp) ::  jp                          !< index variable along y 
-    INTEGER(iwp) ::  jlog                        !< index variable along y 
     INTEGER(iwp) ::  k                           !< index variable along z 
     INTEGER(iwp) ::  k_wall                      !< vertical index of topography top 
@@ -299 +299 @@
 !--       First, check if particle is located below first vertical grid level 
 !--       above topography (Prandtl-layer height)
-          ilog = particles(n)%x * ddx
-          jlog = particles(n)%y * ddy
-!
 !--       Determine vertical index of topography top
-          k_wall = get_topography_top_index( jlog, ilog, 's' )
+          k_wall = get_topography_top_index( jp, ip, 's' )
 
           IF ( constant_flux_layer  .AND.  zv(n) - zw(k_wall) < z_p )  THEN
@@ -327 +324 @@
 !--             Get friction velocity and momentum flux from new surface data 
 !--             types.
-                IF ( surf_def_h(0)%start_index(jlog,ilog) <=                   &
-                     surf_def_h(0)%end_index(jlog,ilog) )  THEN
-                   surf_start = surf_def_h(0)%start_index(jlog,ilog)
+                IF ( surf_def_h(0)%start_index(jp,ip) <=                   &
+                     surf_def_h(0)%end_index(jp,ip) )  THEN
+                   surf_start = surf_def_h(0)%start_index(jp,ip)
 !--                Limit friction velocity. In narrow canyons or holes the 
 !--                friction velocity can become very small, resulting in a too
@@ -335 +332 @@
                    us_int    = MAX( surf_def_h(0)%us(surf_start), 0.01_wp )  
                    usws_int  = surf_def_h(0)%usws(surf_start)
-                ELSEIF ( surf_lsm_h%start_index(jlog,ilog) <=                  &
-                         surf_lsm_h%end_index(jlog,ilog) )  THEN
-                   surf_start = surf_lsm_h%start_index(jlog,ilog)
+                ELSEIF ( surf_lsm_h%start_index(jp,ip) <=                  &
+                         surf_lsm_h%end_index(jp,ip) )  THEN
+                   surf_start = surf_lsm_h%start_index(jp,ip)
                    us_int    = MAX( surf_lsm_h%us(surf_start), 0.01_wp )  
                    usws_int  = surf_lsm_h%usws(surf_start)
-                ELSEIF ( surf_usm_h%start_index(jlog,ilog) <=                  &
-                         surf_usm_h%end_index(jlog,ilog) )  THEN
-                   surf_start = surf_usm_h%start_index(jlog,ilog)
+                ELSEIF ( surf_usm_h%start_index(jp,ip) <=                  &
+                         surf_usm_h%end_index(jp,ip) )  THEN
+                   surf_start = surf_usm_h%start_index(jp,ip)
                    us_int    = MAX( surf_usm_h%us(surf_start), 0.01_wp )  
                    usws_int  = surf_usm_h%usws(surf_start)
@@ -396 +393 @@
        DO  n = start_index(nb), end_index(nb)
 
-          ilog = particles(n)%x * ddx
-          jlog = particles(n)%y * ddy
 !
 !--       Determine vertical index of topography top
-          k_wall = get_topography_top_index( jlog,ilog, 's' )
+          k_wall = get_topography_top_index( jp,ip, 's' )
 
           IF ( constant_flux_layer  .AND.  zv(n) - zw(k_wall) < z_p )  THEN
@@ -427 +422 @@
 !--             Get friction velocity and momentum flux from new surface data 
 !--             types.
-                IF ( surf_def_h(0)%start_index(jlog,ilog) <=                   &
-                     surf_def_h(0)%end_index(jlog,ilog) )  THEN
-                   surf_start = surf_def_h(0)%start_index(jlog,ilog)
+                IF ( surf_def_h(0)%start_index(jp,ip) <=                   &
+                     surf_def_h(0)%end_index(jp,ip) )  THEN
+                   surf_start = surf_def_h(0)%start_index(jp,ip)
 !--                Limit friction velocity. In narrow canyons or holes the 
 !--                friction velocity can become very small, resulting in a too
@@ -435 +430 @@
                    us_int    = MAX( surf_def_h(0)%us(surf_start), 0.01_wp )  
                    vsws_int  = surf_def_h(0)%vsws(surf_start)
-                ELSEIF ( surf_lsm_h%start_index(jlog,ilog) <=                  &
-                         surf_lsm_h%end_index(jlog,ilog) )  THEN
-                   surf_start = surf_lsm_h%start_index(jlog,ilog)
+                ELSEIF ( surf_lsm_h%start_index(jp,ip) <=                  &
+                         surf_lsm_h%end_index(jp,ip) )  THEN
+                   surf_start = surf_lsm_h%start_index(jp,ip)
                    us_int    = MAX( surf_lsm_h%us(surf_start), 0.01_wp )  
                    vsws_int  = surf_lsm_h%vsws(surf_start)
-                ELSEIF ( surf_usm_h%start_index(jlog,ilog) <=                  &
-                         surf_usm_h%end_index(jlog,ilog) )  THEN
-                   surf_start = surf_usm_h%start_index(jlog,ilog)
+                ELSEIF ( surf_usm_h%start_index(jp,ip) <=                  &
+                         surf_usm_h%end_index(jp,ip) )  THEN
+                   surf_start = surf_usm_h%start_index(jp,ip)
                    us_int    = MAX( surf_usm_h%us(surf_start), 0.01_wp )  
                    vsws_int  = surf_usm_h%vsws(surf_start)