Changeset 2232 for palm/trunk/SOURCE/calc_radiation.f90

Timestamp:

May 30, 2017 5:47:52 PM (7 years ago)

Author:

suehring

Message:

Adjustments according new topography and surface-modelling concept implemented

File:

• palm/trunk/SOURCE/calc_radiation.f90 (modified) (11 diffs)

palm/trunk/SOURCE/calc_radiation.f90

@@ -20 +20 @@
 ! Current revisions:
 ! -----------------
-! 
+! Adjustments to new topography concept
 ! 
 ! Former revisions:
@@ -105 +105 @@
 
        USE indices,                                                            &
-           ONLY:  nxl, nxr, nyn, nys, nzb, nzb_s_inner, nzt
+           ONLY:  nxl, nxr, nyn, nys, nzb, nzt, wall_flags_0
 
        USE kinds
@@ -153 +153 @@
              blackbody_emission(nzb) = sigma * temperature**4
 
-             DO  k = nzb_s_inner(j,i)+1, nzt
+             DO  k = nzb+1, nzt
 
                 k_help = ( nzt+nzb+1 ) - k
@@ -163 +163 @@
 
                 temperature     = pt(k,j,i) * t_d_pt(k) + l_d_cp * ql(k,j,i)
-                blackbody_emission(k) = sigma * temperature**4
+                blackbody_emission(k) = sigma * temperature**4                 &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
 
              ENDDO
@@ -179 +181 @@
              impinging_flux_at_top = blackbody_emission(nzb) - 100.0_wp
 
-             DO  k = nzb_s_inner(j,i)+1, nzt
+             DO  k = nzb+1, nzt
 !
 !--             Save some computational time, but this may cause load
@@ -222 +224 @@
                    tend(k,j,i) = tend(k,j,i) -                                 &
                                 ( pt_d_t(k) / ( rho_surface * cp ) *           &
-                                  ( df_p - df_m ) / dzw(k) )
+                                  ( df_p - df_m ) / dzw(k) )                   &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
 
                 ENDIF
@@ -250 +254 @@
 
        USE indices,                                                            &
-           ONLY:  nzb, nzb_s_inner, nzt
+           ONLY:  nzb, nzt, wall_flags_0
 
        USE kinds
@@ -295 +299 @@
        blackbody_emission(nzb) = sigma * temperature**4
 
-       DO  k = nzb_s_inner(j,i)+1, nzt
+       DO  k = nzb+1, nzt
           k_help = ( nzt+nzb+1 ) - k
           lwp_ground(k)   = lwp_ground(k-1) + rho_surface * ql(k,j,i) * dzw(k)
@@ -303 +307 @@
 
           temperature     = pt(k,j,i) * t_d_pt(k) + l_d_cp * ql(k,j,i)
-          blackbody_emission(k) = sigma * temperature**4
+          blackbody_emission(k) = sigma * temperature**4                       &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
 
        ENDDO
@@ -318 +324 @@
        impinging_flux_at_top = blackbody_emission(nzb) - 100.0_wp
 
-       DO  k = nzb_s_inner(j,i)+1, nzt
+       DO  k = nzb+1, nzt
 !
 !--       Store some computational time,
@@ -356 +362 @@
 !--          Compute tendency term         
              tend(k,j,i) = tend(k,j,i) - ( pt_d_t(k) / ( rho_surface * cp ) *  &
-                                         ( df_p - df_m ) / dzw(k) )
+                                         ( df_p - df_m ) / dzw(k) )            &
+                                      * MERGE( 1.0_wp, 0.0_wp,                 &
+                                               BTEST( wall_flags_0(k,j,i), 0 ) )
 
           ENDIF