Changeset 4441 for palm/trunk/SOURCE/salsa_mod.f90

Timestamp:

Mar 4, 2020 7:20:35 PM (4 years ago)

Author:

suehring

Message:

Change order of dimension in surface arrays %frac, %emissivity and %albedo to allow for better vectorization in the radiation interactions; Set back turbulent length scale to 8 x grid spacing in the parametrized mode for the synthetic turbulence generator (was accidentally changed in last commit)

File:

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

palm/trunk/SOURCE/salsa_mod.f90

@@ -21 +21 @@
 ! Current revisions:
 ! -----------------
-! 
+! Change order of dimension in surface array %frac to allow for better 
+! vectorization.
 ! 
 ! Former revisions:
@@ -2712 +2713 @@
 !
 !--       Vegetation (LSM):
-          IF ( surf%frac(ind_veg_wall,m) > 0 )  THEN
+          IF ( surf%frac(m,ind_veg_wall) > 0 )  THEN
              veg_type_palm = surf%vegetation_type(m)
              SELECT CASE ( veg_type_palm )
@@ -2758 +2759 @@
 !
 !--       Pavement (LSM):
-          IF ( surf%frac(ind_pav_green,m) > 0 )  THEN
+          IF ( surf%frac(m,ind_pav_green) > 0 )  THEN
              pav_type_palm = surf%pavement_type(m)
              IF ( pav_type_palm == 0 )  THEN  ! error
@@ -2769 +2770 @@
 !
 !--       Water (LSM):
-          IF ( surf%frac(ind_wat_win,m) > 0 )  THEN
+          IF ( surf%frac(m,ind_wat_win) > 0 )  THEN
              wat_type_palm = surf%water_type(m)
              IF ( wat_type_palm == 0 )  THEN  ! error
@@ -2784 +2785 @@
 !
 !--       Wall surfaces (USM):
-          IF ( surf%frac(ind_veg_wall,m) > 0 )  THEN
+          IF ( surf%frac(m,ind_veg_wall) > 0 )  THEN
              match_veg_wall(m) = 15  ! urban in Z01
           ENDIF
 !
 !--       Green walls and roofs (USM):
-          IF ( surf%frac(ind_pav_green,m) > 0 )  THEN
+          IF ( surf%frac(m,ind_pav_green) > 0 )  THEN
              match_pav_green(m) =  6 ! (short) grass in Z01
           ENDIF
 !
 !--       Windows (USM):
-          IF ( surf%frac(ind_wat_win,m) > 0 )  THEN
+          IF ( surf%frac(m,ind_wat_win) > 0 )  THEN
              match_wat_win(m) = 15  ! urban in Z01
           ENDIF
@@ -4386 +4387 @@
                 END SELECT
              ENDDO
-             depo_sum = depo_sum + surf%frac(ind_pav_green,m) * depo
+             depo_sum = depo_sum + surf%frac(m,ind_pav_green) * depo
           ENDIF
 
@@ -4417 +4418 @@
                 END SELECT
              ENDDO
-             depo_sum = depo_sum + surf%frac(ind_veg_wall,m) * depo
+             depo_sum = depo_sum + surf%frac(m,ind_veg_wall) * depo
           ENDIF
 
@@ -4448 +4449 @@
                 END SELECT
              ENDDO
-             depo_sum = depo_sum + surf%frac(ind_wat_win,m) * depo
+             depo_sum = depo_sum + surf%frac(m,ind_wat_win) * depo
           ENDIF