Changeset 2963 for palm/trunk/SOURCE/data_output_2d.f90

Timestamp:

Apr 12, 2018 2:47:44 PM (6 years ago)

Author:

suehring

Message:

Minor revision of static input file checks, bugfix in initialization of surface-fractions in LSM; minor bugfix in initialization of albedo at window-surfaces; for clearer access of albedo and emissivity introduce index for vegetation/wall, pavement/green-wall and water/window surfaces

File:

• palm/trunk/SOURCE/data_output_2d.f90 (modified) (4 diffs)

palm/trunk/SOURCE/data_output_2d.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Introduce index for vegetation/wall, pavement/green-wall and water/window 
+! surfaces, for clearer access of surface fraction, albedo, emissivity, etc. .
+! 
+! 2817 2018-02-19 16:32:21Z knoop
 ! Preliminary gust module interface implemented
 ! 
@@ -263 +267 @@
 
     USE surface_mod,                                                           &
-        ONLY:  surf_def_h, surf_lsm_h, surf_usm_h
+        ONLY:  ind_pav_green, ind_veg_wall, ind_wat_win, surf_def_h,           &
+               surf_lsm_h, surf_usm_h
 
     USE turbulence_closure_mod,                                                &
@@ -568 +573 @@
                       i                   = surf_usm_h%i(m)            
                       j                   = surf_usm_h%j(m)
-                      local_pf(i,j,nzb+1) = surf_usm_h%frac(0,m)     *          &
+                      local_pf(i,j,nzb+1) = surf_usm_h%frac(ind_veg_wall,m)  *  &
                                             surf_usm_h%wghf_eb(m)        +      &
-                                            surf_usm_h%frac(1,m)     *          &
+                                            surf_usm_h%frac(ind_pav_green,m) *  &
                                             surf_usm_h%wghf_eb_green(m)  +      &
-                                            surf_usm_h%frac(2,m)     *          &
+                                            surf_usm_h%frac(ind_wat_win,m)   *  &
                                             surf_usm_h%wghf_eb_window(m)
                    ENDDO
@@ -915 +920 @@
                       j   = surf_usm_h%j(m)
                       local_pf(i,j,nzb+1) =                                          &
-                                 ( surf_usm_h%frac(0,m) * surf_usm_h%r_a(m)       +  & 
-                                   surf_usm_h%frac(1,m) * surf_usm_h%r_a_green(m) +  & 
-                                   surf_usm_h%frac(2,m) * surf_usm_h%r_a_window(m) )
+                                 ( surf_usm_h%frac(ind_veg_wall,m)  *                &
+                                   surf_usm_h%r_a(m)       +                         & 
+                                   surf_usm_h%frac(ind_pav_green,m) *                &
+                                   surf_usm_h%r_a_green(m) +                         & 
+                                   surf_usm_h%frac(ind_wat_win,m)   *                &
+                                   surf_usm_h%r_a_window(m) )
                    ENDDO
                 ELSE