Changeset 4026 for palm/trunk
- Timestamp:
- Jun 12, 2019 4:50:15 PM (5 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/land_surface_model_mod.f90
r4024 r4026 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Further revision of last commit in order to avoid any side effects when 28 ! albedo type is not set in namelist and default albedo type changes. 29 ! 30 ! 4024 2019-06-12 14:06:46Z suehring 27 31 ! Bugfix in albedo initialization, caused crashes in rrtmg calls 28 32 ! … … 2792 2796 ALLOCATE ( surf_lsm_h%albedo_type(0:2,1:surf_lsm_h%ns) ) 2793 2797 ALLOCATE ( surf_lsm_h%emissivity(0:2,1:surf_lsm_h%ns) ) 2794 surf_lsm_h%albedo_type = albedo_type 2798 ! 2799 !-- Initialize albedo type according to its default type, in order to set values 2800 !-- independent on default albedo_type in radiation model. 2801 surf_lsm_h%albedo_type(ind_veg_wall,:) = & 2802 INT( vegetation_pars(ind_v_at,vegetation_type) ) 2803 surf_lsm_h%albedo_type(ind_wat_win,:) = & 2804 INT( water_pars(ind_w_at,water_type) ) 2805 surf_lsm_h%albedo_type(ind_pav_green,:) = & 2806 INT( pavement_pars(ind_p_at,pavement_type) ) 2795 2807 surf_lsm_h%emissivity = emissivity 2796 2808 DO l = 0, 3 2797 2809 ALLOCATE ( surf_lsm_v(l)%albedo_type(0:2,1:surf_lsm_v(l)%ns) ) 2798 2810 ALLOCATE ( surf_lsm_v(l)%emissivity(0:2,1:surf_lsm_v(l)%ns) ) 2799 surf_lsm_v(l)%albedo_type = albedo_type 2811 ! 2812 !-- Initialize albedo type according to its default type, in order to 2813 !-- set values independent on default albedo_type in radiation model. 2814 surf_lsm_v(l)%albedo_type(ind_veg_wall,:) = & 2815 INT( vegetation_pars(ind_v_at,vegetation_type) ) 2816 surf_lsm_v(l)%albedo_type(ind_wat_win,:) = & 2817 INT( water_pars(ind_w_at,water_type) ) 2818 surf_lsm_v(l)%albedo_type(ind_pav_green,:) = & 2819 INT( pavement_pars(ind_p_at,pavement_type) ) 2800 2820 surf_lsm_v(l)%emissivity = emissivity 2801 2821 ENDDO -
palm/trunk/SOURCE/pmc_interface_mod.f90
r4011 r4026 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Masked topography at boundary grid points in mass conservation, in order to 28 ! avoid that mean velocities within topography are imposed 29 ! 30 ! 4011 2019-05-31 14:34:03Z hellstea 27 31 ! Mass (volume) flux correction included to ensure global mass conservation for child domains. 28 32 ! … … 5288 5292 DO j = nys, nyn 5289 5293 DO k = nzb + 1, nzt 5290 u(k,j,i) = u(k,j,i) + u_corr_left 5294 u(k,j,i) = u(k,j,i) + u_corr_left & 5295 * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 1 ) ) 5291 5296 ENDDO 5292 5297 ENDDO … … 5299 5304 DO j = nys, nyn 5300 5305 DO k = nzb + 1, nzt 5301 u(k,j,i) = u(k,j,i) + u_corr_right 5306 u(k,j,i) = u(k,j,i) + u_corr_right & 5307 * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 1 ) ) 5302 5308 ENDDO 5303 5309 ENDDO … … 5310 5316 DO j = nysg, nys 5311 5317 DO k = nzb + 1, nzt 5312 v(k,j,i) = v(k,j,i) + v_corr_south 5318 v(k,j,i) = v(k,j,i) + v_corr_south & 5319 * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 2 ) ) 5313 5320 ENDDO 5314 5321 ENDDO … … 5321 5328 DO j = nyn+1, nyng 5322 5329 DO k = nzb + 1, nzt 5323 v(k,j,i) = v(k,j,i) + v_corr_north 5330 v(k,j,i) = v(k,j,i) + v_corr_north & 5331 * MERGE( 1.0_wp, 0.0_wp, BTEST( wall_flags_0(k,j,i), 2 ) ) 5324 5332 ENDDO 5325 5333 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.