Changeset 2232 for palm/trunk/SOURCE/lpm_boundary_conds.f90

Timestamp:

May 30, 2017 5:47:52 PM (7 years ago)

Author:

suehring

Message:

Adjustments according new topography and surface-modelling concept implemented

File:

• palm/trunk/SOURCE/lpm_boundary_conds.f90 (modified) (11 diffs)

palm/trunk/SOURCE/lpm_boundary_conds.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Adjustments to new topography and surface concept
+! Rename character range into location, as range is an intrinsic. 
 ! 
 ! Former revisions:
@@ -78 +79 @@
 !> (see offset_ocean_*)
 !------------------------------------------------------------------------------!
- SUBROUTINE lpm_boundary_conds( range )
+ SUBROUTINE lpm_boundary_conds( location )
  
 
@@ -94 +95 @@
 
     USE indices,                                                               &
-        ONLY:  nxl, nxr, nyn, nys, nz, nzb_s_inner
+        ONLY:  nxl, nxr, nyn, nys, nz, nzb, nzb_max, wall_flags_0
 
     USE kinds
@@ -107 +108 @@
     IMPLICIT NONE
 
-    CHARACTER (LEN=*) ::  range     !<
+    CHARACTER (LEN=*) ::  location     !<
     
     INTEGER(iwp) ::  inc            !< dummy for sorting algorithmus
@@ -118 +119 @@
     INTEGER(iwp) ::  j2             !< grid index (x) of current particle position
     INTEGER(iwp) ::  j3             !< grid index (x) of intermediate particle position
+    INTEGER(iwp) ::  k_wall         !< vertical index of topography top
     INTEGER(iwp) ::  n              !< particle number
     INTEGER(iwp) ::  t_index        !< running index for intermediate particle timesteps in reflection algorithmus
@@ -167 +169 @@
 
 
-    IF ( range == 'bottom/top' )  THEN
+    IF ( location == 'bottom/top' )  THEN
 
 !
@@ -232 +234 @@
        ENDDO
 
-    ELSEIF ( range == 'walls' )  THEN
+    ELSEIF ( location == 'walls' )  THEN
 
 
@@ -281 +283 @@
           ENDIF
 !
-!--       Walls aligned in xy layer at which particle can be possiblly reflected
-          zwall1 = zw(nzb_s_inner(j2,i2))
-          zwall2 = zw(nzb_s_inner(j1,i1))
-          zwall3 = zw(nzb_s_inner(j1,i2))
-          zwall4 = zw(nzb_s_inner(j2,i1))
+!--       Walls aligned in xy layer at which particle can be possiblly reflected.
+!--       The construct of MERGE and BTEST is used to determine the topography-
+!--       top index (former nzb_s_inner). 
+          zwall1 = zw( MAXLOC(                                                 &
+                          MERGE( 1, 0,                                         &
+                                 BTEST( wall_flags_0(nzb:nzb_max,j2,i2), 12 )  &
+                               ), DIM = 1                                      &
+                             ) - 1 )                                             
+          zwall2 = zw( MAXLOC(                                                 &
+                          MERGE( 1, 0,                                         &
+                                 BTEST( wall_flags_0(nzb:nzb_max,j1,i1), 12 )  &
+                               ), DIM = 1                                      &
+                             ) - 1 )  
+          zwall3 = zw( MAXLOC(                                                 &
+                          MERGE( 1, 0,                                         &
+                                 BTEST( wall_flags_0(nzb:nzb_max,j1,i2), 12 )  &
+                               ), DIM = 1                                      &
+                             ) - 1 )  
+          zwall4 = zw( MAXLOC(                                                 &
+                          MERGE( 1, 0,                                         &
+                                 BTEST( wall_flags_0(nzb:nzb_max,j2,i1), 12 )  &
+                               ), DIM = 1                                      &
+                             ) - 1 )  
 !
 !--       Initialize flags to check if particle reflection is necessary
@@ -469 +489 @@
 !--             constant is required, as the particle position do not 
 !--             necessarily exactly match the wall location due to rounding 
-!--             errors.   
+!--             errors. At first, determine index of topography top at (j3,i3)  
+                k_wall = MAXLOC(                                               &
+                            MERGE( 1, 0,                                       &
+                                 BTEST( wall_flags_0(nzb:nzb_max,j3,i3), 12 )  &
+                                 ), DIM = 1                                    &
+                               ) - 1  
                 IF ( ABS( pos_x - xwall ) < eps      .AND.                     &
-                     pos_z <= zw(nzb_s_inner(j3,i3)) .AND.                     &
+                     pos_z <= zw(k_wall)             .AND.                     &
                      reach_x(t_index)                .AND.                     &
                      .NOT. reflect_x )  THEN
@@ -504 +529 @@
 !
 !--             Check if a particle needs to be reflected at any xz-wall. If 
-!--             necessary, carry out reflection.
+!--             necessary, carry out reflection. At first, determine index of
+!--             topography top at (j3,i3)  
+                k_wall = MAXLOC(                                               &
+                            MERGE( 1, 0,                                       &
+                                 BTEST( wall_flags_0(nzb:nzb_max,j3,i3), 12 )  &
+                                 ), DIM = 1                                    &
+                               ) - 1  
                 IF ( ABS( pos_y - ywall ) < eps      .AND.                     &
-                     pos_z <= zw(nzb_s_inner(j3,i3)) .AND.                     &
+                     pos_z <= zw(k_wall)             .AND.                     &
                      reach_y(t_index)                .AND.                     &
                      .NOT. reflect_y ) THEN
@@ -525 +556 @@
 !
 !--             Check if a particle needs to be reflected at any xy-wall. If 
-!--             necessary, carry out reflection.
+!--             necessary, carry out reflection. 
                 IF ( downwards .AND. reach_z(t_index) .AND.                    &
                      .NOT. reflect_z )  THEN
-                   IF ( pos_z - zw(nzb_s_inner(j3,i3)) < eps ) THEN
+!
+!--                Determine index of topography top at (j3,i3) and chick if
+!--                particle is below.  
+                   k_wall = MAXLOC(                                            &
+                          MERGE( 1, 0,                                         &
+                                   BTEST( wall_flags_0(nzb:nzb_max,j3,i3), 12 )&
+                               ), DIM = 1                                      &
+                                  ) - 1  
+                   IF ( pos_z - zw(k_wall) < eps ) THEN
   
-                      pos_z = MAX( 2.0_wp * zw(nzb_s_inner(j3,i3)) - pos_z,    &
-                                   zw(nzb_s_inner(j3,i3)) )
+                      pos_z = MAX( 2.0_wp * zw(k_wall) - pos_z,    &
+                                   zw(k_wall) )
 
                       particles(n)%speed_z = - particles(n)%speed_z