Changeset 4168 for palm/trunk/SOURCE/urban_surface_mod.f90

Timestamp:

Aug 16, 2019 1:50:17 PM (5 years ago)

Author:

suehring

Message:

Replace get_topography_top_index functions by pre-calculated arrays in order to save computational resources

File:

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

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -28 +28 @@
 ! -----------------
 ! $Id$
+! Replace function get_topography_top_index by topo_top_ind
+! 
+! 4148 2019-08-08 11:26:00Z suehring
 ! - Add anthropogenic heat output factors for heating and cooling to building
 !   data base
@@ -538 +541 @@
     USE indices,                                                               &
         ONLY:  nx, ny, nnx, nny, nnz, nxl, nxlg, nxr, nxrg, nyn, nyng, nys,    &
-               nysg, nzb, nzt, nbgp, wall_flags_0
+               nysg, nzb, nzt, nbgp, topo_top_ind, wall_flags_0
 
     USE, INTRINSIC :: iso_c_binding 
@@ -559 +562 @@
 
     USE surface_mod,                                                           &
-        ONLY:  get_topography_top_index_ji, get_topography_top_index,          &
-               ind_pav_green, ind_veg_wall, ind_wat_win, surf_usm_h,           &
+        ONLY:  ind_pav_green, ind_veg_wall, ind_wat_win, surf_usm_h,           &
                surf_usm_v, surface_restore_elements
 
@@ -6159 +6161 @@
                     READ( 151, *, err=12, end=13 )  i, j, k, heat
                     IF ( i >= nxl  .AND.  i <= nxr  .AND.  j >= nys  .AND.  j <= nyn )  THEN
-                        IF ( k <= naheatlayers  .AND.  k > get_topography_top_index_ji( j, i, 's' ) )  THEN
+                        IF ( k <= naheatlayers  .AND.  k > topo_top_ind(j,i,0) )  THEN
 !--                         write heat into the array
                             aheat(k,j,i) = heat
@@ -7394 +7396 @@
               ELSE
                  WRITE(9,*) 'Problem reading USM data:'
-                 WRITE(9,*) l,i,j,kw,get_topography_top_index_ji( j, i, 's' )
-                 WRITE(9,*) ii,iw,jw,kw,get_topography_top_index_ji( jw, iw, 's' )
+                 WRITE(9,*) l,i,j,kw,topo_top_ind(j,i,0)
+                 WRITE(9,*) ii,iw,jw,kw,topo_top_ind(jw,iw,0)
                  WRITE(9,*) usm_par(ii,jw,iw),usm_par(ii+1,jw,iw)
                  WRITE(9,*) usm_par(ii+2,jw,iw),usm_par(ii+3,jw,iw)
@@ -8614 +8616 @@
 !--         TO_DO: activate, if testcase is available
 !--         !$OMP PARALLEL DO PRIVATE (i, j, k, acoef, rho_cp)
-!--         it may also improve performance to move get_topography_top_index_ji before the k-loop
+!--         it may also improve performance to move topo_top_ind before the k-loop
             DO i = nxl, nxr
                DO j = nys, nyn
                   DO k = nz_urban_b, min(nz_urban_t,naheatlayers)
-                     IF ( k > get_topography_top_index_ji( j, i, 's' ) ) THEN
+                     IF ( k > topo_top_ind(j,i,0) ) THEN
 !
 !--                    increase of pt in box i,j,k in time dt_3d