Changeset 3918 for palm/trunk
- Timestamp:
- Apr 18, 2019 1:33:11 PM (6 years ago)
- Location:
- palm/trunk
- Files:
-
- 3 edited
-
SOURCE/urban_surface_mod.f90 (modified) (6 diffs)
-
TESTS/cases/urban_environment/case_config.yml (modified) (1 diff)
-
TESTS/cases/urban_environment_restart/case_config.yml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/urban_surface_mod.f90
r3914 r3918 28 28 ! ----------------- 29 29 ! $Id$ 30 ! Set green fraction to zero also at vertical surfaces 31 ! 32 ! 3914 2019-04-17 16:02:02Z suehring 30 33 ! In order to obtain correct surface temperature during spinup set window 31 34 ! fraction to zero (only during spinup) instead of just disabling … … 4459 4462 surf_usm_h%lai(m) = building_pars_f%pars_xy(ind_lai_r,j,i) 4460 4463 4461 IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= &4462 building_pars_f%fill ) THEN4463 surf_usm_h%rho_c_wall(nzb_wall,m) = &4464 building_pars_f%pars_xy(ind_hc1,j,i)4465 surf_usm_h%rho_c_wall(nzb_wall+1,m) = &4466 building_pars_f%pars_xy(ind_hc1,j,i)4467 ENDIF4468 4469 4470 IF ( building_pars_f%pars_xy(ind_hc2,j,i) /= &4471 building_pars_f%fill ) &4472 surf_usm_h%rho_c_wall(nzb_wall+2,m) = &4473 building_pars_f%pars_xy(ind_hc2,j,i)4474 4475 IF ( building_pars_f%pars_xy(ind_hc3,j,i) /= &4476 building_pars_f%fill ) &4477 surf_usm_h%rho_c_wall(nzb_wall+3,m) = &4478 building_pars_f%pars_xy(ind_hc3,j,i)4464 ! IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= & 4465 ! building_pars_f%fill ) THEN 4466 ! surf_usm_h%rho_c_wall(nzb_wall,m) = & 4467 ! building_pars_f%pars_xy(ind_hc1,j,i) 4468 ! surf_usm_h%rho_c_wall(nzb_wall+1,m) = & 4469 ! building_pars_f%pars_xy(ind_hc1,j,i) 4470 ! ENDIF 4471 ! 4472 ! 4473 ! IF ( building_pars_f%pars_xy(ind_hc2,j,i) /= & 4474 ! building_pars_f%fill ) & 4475 ! surf_usm_h%rho_c_wall(nzb_wall+2,m) = & 4476 ! building_pars_f%pars_xy(ind_hc2,j,i) 4477 ! 4478 ! IF ( building_pars_f%pars_xy(ind_hc3,j,i) /= & 4479 ! building_pars_f%fill ) & 4480 ! surf_usm_h%rho_c_wall(nzb_wall+3,m) = & 4481 ! building_pars_f%pars_xy(ind_hc3,j,i) 4479 4482 4480 4483 IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= & … … 4495 4498 building_pars_f%pars_xy(ind_hc3,j,i) 4496 4499 4497 IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= &4498 building_pars_f%fill ) THEN4499 surf_usm_h%rho_c_window(nzb_wall,m) = &4500 building_pars_f%pars_xy(ind_hc1,j,i)4501 surf_usm_h%rho_c_window(nzb_wall+1,m) = &4502 building_pars_f%pars_xy(ind_hc1,j,i)4503 ENDIF4504 IF ( building_pars_f%pars_xy(ind_hc2,j,i) /= &4505 building_pars_f%fill ) &4506 surf_usm_h%rho_c_window(nzb_wall+2,m) = &4507 building_pars_f%pars_xy(ind_hc2,j,i)4508 4509 IF ( building_pars_f%pars_xy(ind_hc3,j,i) /= &4510 building_pars_f%fill ) &4511 surf_usm_h%rho_c_window(nzb_wall+3,m) = &4512 building_pars_f%pars_xy(ind_hc3,j,i)4500 ! IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= & 4501 ! building_pars_f%fill ) THEN 4502 ! surf_usm_h%rho_c_window(nzb_wall,m) = & 4503 ! building_pars_f%pars_xy(ind_hc1,j,i) 4504 ! surf_usm_h%rho_c_window(nzb_wall+1,m) = & 4505 ! building_pars_f%pars_xy(ind_hc1,j,i) 4506 ! ENDIF 4507 ! IF ( building_pars_f%pars_xy(ind_hc2,j,i) /= & 4508 ! building_pars_f%fill ) & 4509 ! surf_usm_h%rho_c_window(nzb_wall+2,m) = & 4510 ! building_pars_f%pars_xy(ind_hc2,j,i) 4511 ! 4512 ! IF ( building_pars_f%pars_xy(ind_hc3,j,i) /= & 4513 ! building_pars_f%fill ) & 4514 ! surf_usm_h%rho_c_window(nzb_wall+3,m) = & 4515 ! building_pars_f%pars_xy(ind_hc3,j,i) 4513 4516 4514 4517 IF ( building_pars_f%pars_xy(ind_tc1,j,i) /= & … … 4751 4754 building_pars_f%pars_xy(ind_lai_w,j,i) 4752 4755 4753 IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= &4754 building_pars_f%fill ) THEN4755 surf_usm_v(l)%rho_c_wall(nzb_wall,m) = &4756 building_pars_f%pars_xy(ind_hc1,j,i)4757 surf_usm_v(l)%rho_c_wall(nzb_wall+1,m) = &4758 building_pars_f%pars_xy(ind_hc1,j,i)4759 ENDIF4760 4761 4762 IF ( building_pars_f%pars_xy(ind_hc2,j,i) /= &4763 building_pars_f%fill ) &4764 surf_usm_v(l)%rho_c_wall(nzb_wall+2,m) = &4765 building_pars_f%pars_xy(ind_hc2,j,i)4766 4767 IF ( building_pars_f%pars_xy(ind_hc3,j,i) /= &4768 building_pars_f%fill ) &4769 surf_usm_v(l)%rho_c_wall(nzb_wall+3,m) = &4770 building_pars_f%pars_xy(ind_hc3,j,i)4756 ! IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= & 4757 ! building_pars_f%fill ) THEN 4758 ! surf_usm_v(l)%rho_c_wall(nzb_wall,m) = & 4759 ! building_pars_f%pars_xy(ind_hc1,j,i) 4760 ! surf_usm_v(l)%rho_c_wall(nzb_wall+1,m) = & 4761 ! building_pars_f%pars_xy(ind_hc1,j,i) 4762 ! ENDIF 4763 ! 4764 ! 4765 ! IF ( building_pars_f%pars_xy(ind_hc2,j,i) /= & 4766 ! building_pars_f%fill ) & 4767 ! surf_usm_v(l)%rho_c_wall(nzb_wall+2,m) = & 4768 ! building_pars_f%pars_xy(ind_hc2,j,i) 4769 ! 4770 ! IF ( building_pars_f%pars_xy(ind_hc3,j,i) /= & 4771 ! building_pars_f%fill ) & 4772 ! surf_usm_v(l)%rho_c_wall(nzb_wall+3,m) = & 4773 ! building_pars_f%pars_xy(ind_hc3,j,i) 4771 4774 4772 4775 IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= & … … 4787 4790 building_pars_f%pars_xy(ind_hc3,j,i) 4788 4791 4789 IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= &4790 building_pars_f%fill ) THEN4791 surf_usm_v(l)%rho_c_window(nzb_wall,m) = &4792 building_pars_f%pars_xy(ind_hc1,j,i)4793 surf_usm_v(l)%rho_c_window(nzb_wall+1,m) = &4794 building_pars_f%pars_xy(ind_hc1,j,i)4795 ENDIF4796 IF ( building_pars_f%pars_xy(ind_hc2,j,i) /= &4797 building_pars_f%fill ) &4798 surf_usm_v(l)%rho_c_window(nzb_wall+2,m) = &4799 building_pars_f%pars_xy(ind_hc2,j,i)4800 4801 IF ( building_pars_f%pars_xy(ind_hc3,j,i) /= &4802 building_pars_f%fill ) &4803 surf_usm_v(l)%rho_c_window(nzb_wall+3,m) = &4804 building_pars_f%pars_xy(ind_hc3,j,i)4792 ! IF ( building_pars_f%pars_xy(ind_hc1,j,i) /= & 4793 ! building_pars_f%fill ) THEN 4794 ! surf_usm_v(l)%rho_c_window(nzb_wall,m) = & 4795 ! building_pars_f%pars_xy(ind_hc1,j,i) 4796 ! surf_usm_v(l)%rho_c_window(nzb_wall+1,m) = & 4797 ! building_pars_f%pars_xy(ind_hc1,j,i) 4798 ! ENDIF 4799 ! IF ( building_pars_f%pars_xy(ind_hc2,j,i) /= & 4800 ! building_pars_f%fill ) & 4801 ! surf_usm_v(l)%rho_c_window(nzb_wall+2,m) = & 4802 ! building_pars_f%pars_xy(ind_hc2,j,i) 4803 ! 4804 ! IF ( building_pars_f%pars_xy(ind_hc3,j,i) /= & 4805 ! building_pars_f%fill ) & 4806 ! surf_usm_v(l)%rho_c_window(nzb_wall+3,m) = & 4807 ! building_pars_f%pars_xy(ind_hc3,j,i) 4805 4808 4806 4809 IF ( building_pars_f%pars_xy(ind_tc1,j,i) /= & … … 5047 5050 DO m = 1, surf_usm_h%ns 5048 5051 IF ( surf_usm_h%frac(ind_pav_green,m) > 0.0_wp ) THEN 5052 surf_usm_h%frac(ind_veg_wall,m) = surf_usm_h%frac(ind_veg_wall,m)& 5053 + surf_usm_h%frac(ind_pav_green,m) 5049 5054 surf_usm_h%frac(ind_pav_green,m) = 0.0_wp 5050 surf_usm_h%frac(ind_veg_wall,m) = 1.0_wp5051 5055 ENDIF 5056 ENDDO 5057 DO l = 0, 3 5058 DO m = 1, surf_usm_v(l)%ns 5059 IF ( surf_usm_v(l)%frac(ind_pav_green,m) > 0.0_wp ) THEN 5060 surf_usm_v(l)%frac(ind_veg_wall,m) = & 5061 surf_usm_v(l)%frac(ind_veg_wall,m)& 5062 + surf_usm_v(l)%frac(ind_pav_green,m) 5063 surf_usm_v(l)%frac(ind_pav_green,m) = 0.0_wp 5064 ENDIF 5065 ENDDO 5052 5066 ENDDO 5053 5067 -
palm/trunk/TESTS/cases/urban_environment/case_config.yml
r3633 r3918 7 7 8 8 allowed_number_of_cores: 9 - 110 9 - 2 11 10 - 4 -
palm/trunk/TESTS/cases/urban_environment_restart/case_config.yml
r3734 r3918 7 7 8 8 allowed_number_of_cores: 9 - 110 9 - 2 11 10 - 4
Note: See TracChangeset
for help on using the changeset viewer.
