Changeset 2281 for palm

Timestamp:

Jun 13, 2017 11:34:50 AM (7 years ago)

Author:

suehring

Message:

Clean-up unnecessary index access to surface type

Location:

palm/trunk/SOURCE

Files:

• pmc_interface_mod.f90 (modified) (2 diffs)
• surface_layer_fluxes_mod.f90 (modified) (12 diffs)

palm/trunk/SOURCE/pmc_interface_mod.f90

@@ -5671 +5671 @@
 !--          For simplicity anterpolate within buildings and under elevated
 !--          terrain too
-             DO  kk = kcb, kct
+             DO  kk = kcb, kct-1
 !
 !--             ijfc and kfc are precomputed in pmci_init_anterp_tophat
@@ -5690 +5690 @@
 
              ENDDO
+             fc(kct,jj,ii) = fc(kct,jj,ii)
+
           ENDDO
        ENDDO

palm/trunk/SOURCE/surface_layer_fluxes_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Clean-up unnecessary index access to surface type
+! 
+! 2233 2017-05-30 18:08:54Z suehring
 !
 ! 2232 2017-05-30 17:47:52Z suehring
@@ -1200 +1203 @@
              i   = surf%i(m)            
              j   = surf%j(m)
-             k   = surf%k(m)
 
              z_mo = surf%z_mo(m)
@@ -1319 +1321 @@
        ELSEIF ( TRIM( most_method ) == 'lookup' )  THEN
 
-          !$OMP PARALLEL DO PRIVATE( i, j, k, z_mo, li ) FIRSTPRIVATE( li_bnd ) LASTPRIVATE( li_bnd )
+          !$OMP PARALLEL DO PRIVATE( i, j, z_mo, li ) FIRSTPRIVATE( li_bnd ) LASTPRIVATE( li_bnd )
           DO  m = 1, surf%ns
 
              i   = surf%i(m)            
              j   = surf%j(m)
-             k   = surf%k(m)
 !
 !--          If the bulk Richardson number is outside the range of the lookup
@@ -1461 +1462 @@
 !--       Compute u* at upward-facing surfaces
           IF ( .NOT. downward )  THEN
-             !$OMP PARALLEL  DO PRIVATE( k, z_mo )
+             !$OMP PARALLEL  DO PRIVATE( z_mo )
              DO  m = 1, surf%ns
 
-                k    = surf%k(m)
                 z_mo = surf%z_mo(m)
 !
@@ -1478 +1478 @@
 !--       any stability. 
           ELSE
-             !$OMP PARALLEL  DO PRIVATE( k, z_mo )
+             !$OMP PARALLEL  DO PRIVATE( z_mo )
              DO  m = 1, surf%ns
 
-                k    = surf%k(m)
                 z_mo = surf%z_mo(m)
 !
@@ -1611 +1610 @@
 !--    land-surface model, in order to compute aerodynamical resistance.
        IF ( surf_vertical )  THEN
-          !$OMP PARALLEL DO PRIVATE( i, j, k )
+          !$OMP PARALLEL DO PRIVATE( i, j )
           DO  m = 1, surf%ns 
 
              i          =  surf%i(m)            
              j          =  surf%j(m)
-             k          =  surf%k(m)
              surf%ts(m) = -surf%shf(m) / ( surf%us(m) + 1E-30_wp )
 !
@@ -1713 +1711 @@
 !--       Compute q* at vertical surfaces
           IF ( surf_vertical )  THEN
-             !$OMP PARALLEL DO PRIVATE( i, j, k )
+             !$OMP PARALLEL DO PRIVATE( i, j )
              DO  m = 1, surf%ns  
 
                 i          =  surf%i(m)            
                 j          =  surf%j(m)
-                k          =  surf%k(m)
                 surf%qs(m) = -surf%qsws(m) / ( surf%us(m) + 1E-30_wp )
 
@@ -1733 +1730 @@
 !
 !--          For a given scalar flux in the surface layer
-             !$OMP PARALLEL DO PRIVATE( i, j, k )
+             !$OMP PARALLEL DO PRIVATE( i, j )
              DO  m = 1, surf%ns  
                 i   = surf%i(m)            
                 j   = surf%j(m)
-                k   = surf%k(m)
                 surf%ss(m) = -surf%ssws(m) / ( surf%us(m) + 1E-30_wp )
              ENDDO
@@ -1744 +1740 @@
 !--       At vertical surfaces
           IF ( surf_vertical )  THEN
-             !$OMP PARALLEL DO PRIVATE( i, j, k )
+             !$OMP PARALLEL DO PRIVATE( i, j )
              DO  m = 1, surf%ns  
                 i          =  surf%i(m)            
                 j          =  surf%j(m)
-                k          =  surf%k(m)
                 surf%ss(m) = -surf%ssws(m) / ( surf%us(m) + 1E-30_wp )
              ENDDO
@@ -1924 +1919 @@
           IF (  .NOT.  constant_scalarflux  .AND.  passive_scalar  .AND.       &
                 .NOT.  downward )  THEN
-             !$OMP PARALLEL DO PRIVATE( i, j, k )
+             !$OMP PARALLEL DO PRIVATE( i, j )
              DO  m = 1, surf%ns   
 
                 i    = surf%i(m)            
                 j    = surf%j(m)
-                k    = surf%k(m)
                 surf%ssws(m) = -surf%ss(m) * surf%us(m)
 
@@ -1938 +1932 @@
           IF ( cloud_physics  .AND.  microphysics_seifert  .AND.              &
                .NOT. downward)  THEN
-             !$OMP PARALLEL DO PRIVATE( i, j, k )
+             !$OMP PARALLEL DO PRIVATE( i, j )
              DO  m = 1, surf%ns   
 
                 i    = surf%i(m)            
                 j    = surf%j(m)
-                k    = surf%k(m)
 
                 surf%qrsws(m) = -surf%qrs(m) * surf%us(m)
@@ -2050 +2043 @@
              ENDIF
 
-             !$OMP PARALLEL DO PRIVATE( i, j, k, dum, z_mo )
+             !$OMP PARALLEL DO PRIVATE( i, j, dum, z_mo )
              DO  m = 1, surf%ns  
                 i = surf%i(m)            
                 j = surf%j(m)
-                k = surf%k(m)
 
                 z_mo = surf%z_mo(m)