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

Timestamp:

Mar 4, 2020 7:20:35 PM (5 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/chemistry_model_mod.f90 (modified) (15 diffs)

palm/trunk/SOURCE/chemistry_model_mod.f90

@@ -22 +22 @@
 ! Current revisions:
 ! -----------------
-! 
+! Change order of dimension in surface array %frac to allow for better 
+! vectorization.
 !
 ! Former revisions:
@@ -3533 +3534 @@
 !
 !--    Get land use for i,j and assign to DEPAC lu
-       IF ( surf_lsm_h%frac(ind_veg_wall,m) > 0 )  THEN
+       IF ( surf_lsm_h%frac(m,ind_veg_wall) > 0 )  THEN
           luv_palm = surf_lsm_h%vegetation_type(m)
           IF ( luv_palm == ind_luv_user )  THEN
@@ -3577 +3578 @@
        ENDIF
 
-       IF ( surf_lsm_h%frac(ind_pav_green,m) > 0 )  THEN
+       IF ( surf_lsm_h%frac(m,ind_pav_green) > 0 )  THEN
           lup_palm = surf_lsm_h%pavement_type(m)
           IF ( lup_palm == ind_lup_user )  THEN
@@ -3615 +3616 @@
        ENDIF
 
-       IF ( surf_lsm_h%frac(ind_wat_win,m) > 0 )  THEN
+       IF ( surf_lsm_h%frac(m,ind_wat_win) > 0 )  THEN
           luw_palm = surf_lsm_h%water_type(m)     
           IF ( luw_palm == ind_luw_user )  THEN
@@ -3675 +3676 @@
 !
 !--    Vegetation
-       IF ( surf_lsm_h%frac(ind_veg_wall,m) > 0 )  THEN
+       IF ( surf_lsm_h%frac(m,ind_veg_wall) > 0 )  THEN
 
 !
@@ -3812 +3813 @@
 !
 !--    Pavement
-       IF ( surf_lsm_h%frac(ind_pav_green,m) > 0 )  THEN
+       IF ( surf_lsm_h%frac(m,ind_pav_green) > 0 )  THEN
 !
 !--       No vegetation on pavements:
@@ -3939 +3940 @@
 !
 !--    Water
-       IF ( surf_lsm_h%frac(ind_wat_win,m) > 0 )  THEN
+       IF ( surf_lsm_h%frac(m,ind_wat_win) > 0 )  THEN
 !
 !--       No vegetation on water:
@@ -4073 +4074 @@
        DO  lsp = 1, nspec
 
-          bud(lsp) = surf_lsm_h%frac(ind_veg_wall,m) * bud_luv(lsp) + &
-               surf_lsm_h%frac(ind_pav_green,m) * bud_lup(lsp) + &
-               surf_lsm_h%frac(ind_wat_win,m) * bud_luw(lsp)
+          bud(lsp) = surf_lsm_h%frac(m,ind_veg_wall) * bud_luv(lsp) + &
+               surf_lsm_h%frac(m,ind_pav_green) * bud_lup(lsp) + &
+               surf_lsm_h%frac(m,ind_wat_win) * bud_luw(lsp)
 !
 !--       Compute new concentration:
@@ -4121 +4122 @@
 !
 !--    Get land use for i,j and assign to DEPAC lu
-       IF ( surf_usm_h%frac(ind_pav_green,m) > 0 )  THEN
+       IF ( surf_usm_h%frac(m,ind_pav_green) > 0 )  THEN
 !
 !--       For green urban surfaces (e.g. green roofs
@@ -4168 +4169 @@
        ENDIF
 
-       IF ( surf_usm_h%frac(ind_veg_wall,m) > 0 )  THEN
+       IF ( surf_usm_h%frac(m,ind_veg_wall) > 0 )  THEN
 !
 !--       For walls in USM assume concrete walls/roofs,
@@ -4210 +4211 @@
        ENDIF
 
-       IF ( surf_usm_h%frac(ind_wat_win,m) > 0 )  THEN
+       IF ( surf_usm_h%frac(m,ind_wat_win) > 0 )  THEN
 !
 !--       For windows in USM assume metal as this is
@@ -4295 +4296 @@
 !
 !--    Walls/roofs
-       IF ( surf_usm_h%frac(ind_veg_wall,m) > 0 )  THEN
+       IF ( surf_usm_h%frac(m,ind_veg_wall) > 0 )  THEN
 !
 !--       No vegetation on non-green walls:
@@ -4426 +4427 @@
 !
 !--    Green usm surfaces
-       IF ( surf_usm_h%frac(ind_pav_green,m) > 0 )  THEN
+       IF ( surf_usm_h%frac(m,ind_pav_green) > 0 )  THEN
 
 !
@@ -4564 +4565 @@
 !
 !--    Windows
-       IF ( surf_usm_h%frac(ind_wat_win,m) > 0 )  THEN
+       IF ( surf_usm_h%frac(m,ind_wat_win) > 0 )  THEN
 !
 !--       No vegetation on windows:
@@ -4696 +4697 @@
 
 
-          bud(lsp) = surf_usm_h%frac(ind_veg_wall,m) * bud_luu(lsp) + &
-               surf_usm_h%frac(ind_pav_green,m) * bud_lug(lsp) + &
-               surf_usm_h%frac(ind_wat_win,m) * bud_lud(lsp)
+          bud(lsp) = surf_usm_h%frac(m,ind_veg_wall) * bud_luu(lsp) + &
+               surf_usm_h%frac(m,ind_pav_green) * bud_lug(lsp) + &
+               surf_usm_h%frac(m,ind_wat_win) * bud_lud(lsp)
 !
 !--       Compute new concentration