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

Timestamp:

Jul 20, 2017 5:27:19 PM (7 years ago)

Author:

suehring

Message:

get topograpyh top index via function call

File:

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

palm/trunk/SOURCE/urban_surface_mod.f90

@@ -21 +21 @@
 ! Current revisions:
 ! ------------------
-! 
+! Get topography top index via Function call 
 ! 
 ! Former revisions:
@@ -603 +603 @@
 !
 !--                 Find topography top index
-                    k_topo = MAXLOC( MERGE( 1, 0,                              &
-                                             BTEST( wall_flags_0(:,j,i), 12 )  &
-                                           ), DIM = 1                          &
-                                   ) - 1
+                    k_topo = get_topography_top_index( j, i, 's' )
+
                     DO k = nzt+1, 0, -1
                         IF ( lad_s(k,j,i) /= 0.0_wp )  THEN
@@ -706 +704 @@
                  DO  j = ijdb(3,ids), ijdb(4,ids)
 
-                    k_topo =   MAXLOC( MERGE( 1, 0,                            &
-                                             BTEST( wall_flags_0(:,j,i), 12 )  &
-                                            ), DIM = 1                         &
-                                     ) - 1
-                    k_topo2 =  MAXLOC( MERGE( 1, 0,                            &
-                                             BTEST( wall_flags_0(:,j-jdir(ids),i-idir(ids)), 12 )  &
-                                            ), DIM = 1                         &
-                                     ) - 1 
+                    k_topo  = get_topography_top_index( j, i, 's' )
+                    k_topo2 = get_topography_top_index( j-jdir(ids), i-idir(ids), 's' )
 
                     k = nzut - MAX( k_topo, k_topo2 )
@@ -732 +724 @@
 !
 !--                 Find topography top index
-                    k_topo = MAXLOC( MERGE( 1, 0,                              &
-                                             BTEST( wall_flags_0(:,j,i), 12 )  &
-                                          ), DIM = 1                           &
-                                   ) - 1
+                    k_topo = get_topography_top_index( j, i, 's' )
+
                     DO k = k_topo + 1, pct(j,i)
                         ipcgb = ipcgb + 1
@@ -813 +803 @@
                 DO i = ijdb(1,ids), ijdb(2,ids)
                     DO j = ijdb(3,ids), ijdb(4,ids)
-                        k_topo =   MAXLOC( MERGE( 1, 0,                        &
-                                             BTEST( wall_flags_0(:,j,i), 12 )  &
-                                                ), DIM = 1                     &
-                                         ) - 1
-                        k_topo2 =  MAXLOC( MERGE( 1, 0,                        &
-                                             BTEST( wall_flags_0(:,j-jdir(ids),i-idir(ids)), 12 )  &
-                                                ), DIM = 1                     &
-                                         ) - 1 
+                        k_topo  = get_topography_top_index( j, i, 's' )
+                        k_topo2 = get_topography_top_index( j-jdir(ids), i-idir(ids), 's' )
+
                         DO k = MAX(k_topo,k_topo2)+1, nzut
                             isurf = isurf + 1
@@ -1929 +1914 @@
             DO i = nxl, nxr
                 DO j = nys, nyn
-                    k = MAXLOC(                                                &
-                                MERGE( 1, 0,                                   &
-                                       BTEST( wall_flags_0(:,j,i), 12 )        &
-                                     ), DIM = 1                                &
-                              ) - 1
+                    k = get_topography_top_index( j, i, 's' )
 
                     usm_lad(k:nzut, j, i) = lad_s(0:nzut-k, j, i)
@@ -3806 +3787 @@
 !
 !--             Following expression equals former kk = k - nzb_s_inner(j,i) 
-                kk = k - ( MAXLOC(                                             &
-                                MERGE( 1, 0,                                   &
-                                       BTEST( wall_flags_0(:,j,i), 12 )        &
-                                     ), DIM = 1                                &
-                               ) - 1                                           &
-                         )  !- lad arrays are defined flat
+                kk = k - ( get_topography_top_index( j, i, 's' ) )  !- lad arrays are defined flat
                 pc_heating_rate(kk, j, i) = (pcbinsw(ipcgb) + pcbinlw(ipcgb)) &
                     * pchf_prep(k) * pt(k, j, i) !-- = dT/dt