Changeset 3196
- Timestamp:
- Aug 13, 2018 12:26:14 PM (6 years ago)
- Location:
- palm/trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/palmrungui_files/mainwindow.ui
r2825 r3196 84 84 <property name="geometry"> 85 85 <rect> 86 <x>1 20</x>86 <x>150</x> 87 87 <y>20</y> 88 88 <width>90</width> … … 102 102 <x>10</x> 103 103 <y>20</y> 104 <width> 91</width>104 <width>131</width> 105 105 <height>21</height> 106 106 </rect> … … 122 122 <property name="geometry"> 123 123 <rect> 124 <x>2 10</x>124 <x>250</x> 125 125 <y>20</y> 126 126 <width>90</width> … … 345 345 </property> 346 346 </widget> 347 <zorder>line_jobname</zorder>348 <zorder>pushButton</zorder>349 <zorder>label</zorder>350 <zorder>list_jobname</zorder>351 <zorder>drop_job</zorder>352 <zorder>label_usercode</zorder>353 <zorder>palm_logo</zorder>354 <zorder>label_8</zorder>355 347 </widget> 356 348 <widget class="QGroupBox" name="group_execution"> … … 1136 1128 <x>341</x> 1137 1129 <y>82</y> 1138 <width>12 8</width>1130 <width>129</width> 1139 1131 <height>189</height> 1140 1132 </rect> 1141 1133 </property> 1142 1134 <property name="title"> 1143 <string>St &art</string>1135 <string>Sta&rt</string> 1144 1136 </property> 1145 1137 <property name="separatorsCollapsible"> -
palm/trunk/SOURCE/land_surface_model_mod.f90
r3161 r3196 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Added maximum aerodynamic resistance of 300. 28 ! 29 ! 3161 2018-07-23 09:30:10Z maronga 27 30 ! Increased roughness of asphalt surfaces to account for turbulence production 28 31 ! by traffic and other obstacles … … 1915 1918 ! 1916 1919 !-- Make sure that the resistance does not drop to zero for neutral 1917 !-- stratification. 1918 IF ( surf%r_a(m) < 1.0_wp ) surf%r_a(m) = 1.0_wp 1920 !-- stratification. Also, set a maximum resistance to avoid the breakdown of 1921 !-- MOST for locations with zero wind speed 1922 IF ( surf%r_a(m) < 1.0_wp ) surf%r_a(m) = 1.0_wp 1923 IF ( surf%r_a(m) > 300.0_wp ) surf%r_a(m) = 300.0_wp 1919 1924 ! 1920 1925 !-- Second step: calculate canopy resistance r_canopy -
palm/trunk/SOURCE/urban_surface_mod.f90
r3176 r3196 28 28 ! ----------------- 29 29 ! $Id$ 30 ! Added maximum aerodynamic resistance of 300 for horiztonal surfaces. 31 ! 32 ! 3176 2018-07-26 17:12:48Z suehring 30 33 ! Bugfix, update virtual potential surface temparture, else heat fluxes on 31 34 ! roofs might become unphysical … … 7373 7376 ! ( surf_usm_h%ts(m) * surf_usm_h%us(m) + 1.0E-20_wp ) 7374 7377 7375 !-- make sure that the resistance does not drop to zero7378 !-- Make sure that the resistance does not drop to zero 7376 7379 IF ( surf_usm_h%r_a(m) < 1.0_wp ) & 7377 7380 surf_usm_h%r_a(m) = 1.0_wp … … 7380 7383 IF ( surf_usm_h%r_a_window(m) < 1.0_wp ) & 7381 7384 surf_usm_h%r_a_window(m) = 1.0_wp 7385 7386 ! 7387 !-- Make sure that the resistacne does not exceed a maxmium value in case 7388 !-- of zero velocities 7389 IF ( surf_usm_h%r_a(m) > 300.0_wp ) & 7390 surf_usm_h%r_a(m) = 300.0_wp 7391 IF ( surf_usm_h%r_a_green(m) > 300.0_wp ) & 7392 surf_usm_h%r_a_green(m) = 300.0_wp 7393 IF ( surf_usm_h%r_a_window(m) > 300.0_wp ) & 7394 surf_usm_h%r_a_window(m) = 300.0_wp 7395 7382 7396 7383 7397 !-- factor for shf_eb … … 7579 7593 ! 7580 7594 !-- Limit aerodynamic resistance 7581 IF ( surf_usm_v(l)%r_a(m) < 1.0_wp ) &7582 surf_usm_v(l)%r_a(m) = 1.0_wp7595 IF ( surf_usm_v(l)%r_a(m) < 1.0_wp ) surf_usm_v(l)%r_a(m) = 1.0_wp 7596 7583 7597 7584 7598 f_shf = rho_cp / surf_usm_v(l)%r_a(m)
Note: See TracChangeset
for help on using the changeset viewer.