Changeset 1701 for palm/trunk
- Timestamp:
- Nov 2, 2015 7:43:04 AM (8 years ago)
- Location:
- palm/trunk
- Files:
-
- 5 edited
-
SCRIPTS/subjob (modified) (2 diffs)
-
SOURCE/check_parameters.f90 (modified) (2 diffs)
-
SOURCE/data_output_2d.f90 (modified) (9 diffs)
-
SOURCE/flow_statistics.f90 (modified) (5 diffs)
-
SOURCE/radiation_model.f90 (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/subjob
r1623 r1701 23 23 # Current revisions: 24 24 # ------------------ 25 # 25 # Bugfix: added missing init_cmds for lccrayh/lccrayb 26 26 # 27 27 # Former revisions: … … 841 841 $featuredir 842 842 843 $init_cmds 843 844 $module_calls 844 845 -
palm/trunk/SOURCE/check_parameters.f90
r1692 r1701 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Bugfix: definition of rad_net timeseries was missing 22 22 ! 23 23 ! Former revisions: … … 3116 3116 ENDIF 3117 3117 3118 CASE ( 'rad_net' ) 3119 IF ( (.NOT. radiation) .OR. radiation_scheme == 'constant' ) THEN 3120 message_string = 'data_output_pr = ' // & 3121 TRIM( data_output_pr(i) ) // ' is not ava' // & 3122 'lable for radiation = .FALSE. or ' // & 3123 'radiation_scheme = "constant"' 3124 CALL message( 'check_parameters', 'PA0408', 1, 2, 0, 6, 0 ) 3125 ELSE 3126 dopr_index(i) = 101 3127 dopr_unit(i) = 'W/m2' 3128 hom(:,2,101,:) = SPREAD( zw, 2, statistic_regions+1 ) 3129 ENDIF 3130 3118 3131 CASE ( 'rad_lw_in' ) 3119 3132 IF ( (.NOT. radiation) .OR. radiation_scheme == 'constant' ) THEN -
palm/trunk/SOURCE/data_output_2d.f90
r1692 r1701 15 15 ! 16 16 ! Copyright 1997-2015 Leibniz Universitaet Hannover 17 !--------------------------------------------------------------------------------!17 !--------------------------------------------------------------------------------! 18 18 ! 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Bugfix in output of RRTGM data 22 22 ! 23 23 ! Former revisions: … … 953 953 to_be_resorted => rad_lw_in_av 954 954 ENDIF 955 IF ( mode == 'xy' ) level_z = zu 955 956 956 957 CASE ( 'rad_lw_out_xy', 'rad_lw_out_xz', 'rad_lw_out_yz' ) … … 960 961 to_be_resorted => rad_lw_out_av 961 962 ENDIF 963 IF ( mode == 'xy' ) level_z = zu 962 964 963 965 CASE ( 'rad_lw_cs_hr_xy', 'rad_lw_cs_hr_xz', 'rad_lw_cs_hr_yz' ) … … 967 969 to_be_resorted => rad_lw_cs_hr_av 968 970 ENDIF 971 IF ( mode == 'xy' ) level_z = zw 969 972 970 973 CASE ( 'rad_lw_hr_xy', 'rad_lw_hr_xz', 'rad_lw_hr_yz' ) … … 974 977 to_be_resorted => rad_lw_hr_av 975 978 ENDIF 979 IF ( mode == 'xy' ) level_z = zw 976 980 977 981 CASE ( 'rad_sw_in_xy', 'rad_sw_in_xz', 'rad_sw_in_yz' ) … … 981 985 to_be_resorted => rad_sw_in_av 982 986 ENDIF 987 IF ( mode == 'xy' ) level_z = zu 983 988 984 989 CASE ( 'rad_sw_out_xy', 'rad_sw_out_xz', 'rad_sw_out_yz' ) … … 988 993 to_be_resorted => rad_sw_out_av 989 994 ENDIF 995 IF ( mode == 'xy' ) level_z = zu 990 996 991 997 CASE ( 'rad_sw_cs_hr_xy', 'rad_sw_cs_hr_xz', 'rad_sw_cs_hr_yz' ) … … 995 1001 to_be_resorted => rad_sw_cs_hr_av 996 1002 ENDIF 1003 IF ( mode == 'xy' ) level_z = zw 997 1004 998 1005 CASE ( 'rad_sw_hr_xy', 'rad_sw_hr_xz', 'rad_sw_hr_yz' ) … … 1002 1009 to_be_resorted => rad_sw_hr_av 1003 1010 ENDIF 1011 IF ( mode == 'xy' ) level_z = zw 1004 1012 1005 1013 CASE ( 'rho_xy', 'rho_xz', 'rho_yz' ) -
palm/trunk/SOURCE/flow_statistics.f90
r1692 r1701 1196 1196 sums_l(k,108,tn) = sums_l(k,108,tn) + rad_sw_cs_hr(k,j,i) & 1197 1197 * rmask(j,i,sr) 1198 sums_l(k,109,tn) = sums_l(k,10 8,tn) + rad_sw_hr(k,j,i) &1198 sums_l(k,109,tn) = sums_l(k,109,tn) + rad_sw_hr(k,j,i) & 1199 1199 * rmask(j,i,sr) 1200 1200 ENDDO … … 1401 1401 1402 1402 IF ( radiation_scheme == 'rrtmg' ) THEN 1403 #if defined ( __rrtmg ) 1403 1404 hom(:,1,106,sr) = sums(:,106) ! rad_lw_cs_hr 1404 1405 hom(:,1,107,sr) = sums(:,107) ! rad_lw_hr … … 1406 1407 hom(:,1,109,sr) = sums(:,109) ! rad_sw_hr 1407 1408 1408 #if defined ( __rrtmg )1409 1409 hom(:,1,110,sr) = sums(:,110) ! rrtm_aldif 1410 1410 hom(:,1,111,sr) = sums(:,111) ! rrtm_aldir … … 1588 1588 ts_value(dots_rad+1,sr) = hom(nzb,1,102,sr) ! rad_lw_in 1589 1589 ts_value(dots_rad+2,sr) = hom(nzb,1,103,sr) ! rad_lw_out 1590 ts_value(dots_rad+3,sr) = hom(nzb,1,104,sr) ! rad_ lw_in1591 ts_value(dots_rad+4,sr) = hom(nzb,1,105,sr) ! rad_ lw_out1590 ts_value(dots_rad+3,sr) = hom(nzb,1,104,sr) ! rad_sw_in 1591 ts_value(dots_rad+4,sr) = hom(nzb,1,105,sr) ! rad_sw_out 1592 1592 1593 1593 #if defined ( __rrtmg ) … … 3529 3529 ts_value(dots_rad+1,sr) = hom(nzb,1,102,sr) ! rad_lw_in 3530 3530 ts_value(dots_rad+2,sr) = hom(nzb,1,103,sr) ! rad_lw_out 3531 ts_value(dots_rad+3,sr) = hom(nzb,1,104,sr) ! rad_ lw_in3532 ts_value(dots_rad+4,sr) = hom(nzb,1,105,sr) ! rad_ lw_out3531 ts_value(dots_rad+3,sr) = hom(nzb,1,104,sr) ! rad_sw_in 3532 ts_value(dots_rad+4,sr) = hom(nzb,1,105,sr) ! rad_sw_out 3533 3533 3534 3534 #if defined ( __rrtmg ) -
palm/trunk/SOURCE/radiation_model.f90
r1692 r1701 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Bugfixes: wrong index for output of timeseries, setting of nz_snd_end 22 22 ! 23 23 ! Former revisions: … … 628 628 dots_num = dots_num + 5 629 629 630 dots_label(dots_rad +1) = "rad_net"631 dots_label(dots_rad+ 2) = "rad_lw_in"632 dots_label(dots_rad+ 3) = "rad_lw_out"633 dots_label(dots_rad+ 4) = "rad_sw_in"634 dots_label(dots_rad+ 5) = "rad_sw_out"630 dots_label(dots_rad) = "rad_net" 631 dots_label(dots_rad+1) = "rad_lw_in" 632 dots_label(dots_rad+2) = "rad_lw_out" 633 dots_label(dots_rad+3) = "rad_sw_in" 634 dots_label(dots_rad+4) = "rad_sw_out" 635 635 dots_unit(dots_rad:dots_rad+4) = "W/m2" 636 636 … … 1161 1161 ! 1162 1162 ! !-- Allocate temporary array for storing pressure data 1163 ALLOCATE( hyp_snd_tmp( nzb+1:nz_snd) )1163 ALLOCATE( hyp_snd_tmp(1:nz_snd) ) 1164 1164 hyp_snd_tmp = 0.0_wp 1165 1165 … … 1173 1173 ! 1174 1174 !-- Allocate temporary array for storing temperature data 1175 ALLOCATE( t_snd_tmp( nzb+1:nz_snd) )1175 ALLOCATE( t_snd_tmp(1:nz_snd) ) 1176 1176 t_snd_tmp = 0.0_wp 1177 1177 … … 1186 1186 !-- Calculate start of sounding data 1187 1187 nz_snd_start = nz_snd + 1 1188 nz_snd_end = nz_snd _end1188 nz_snd_end = nz_snd + 1 1189 1189 1190 1190 ! … … 1199 1199 1200 1200 IF ( nz_snd_start <= nz_snd ) THEN 1201 nz_snd_end = nz_snd - 11201 nz_snd_end = nz_snd 1202 1202 END IF 1203 1203 … … 1205 1205 ! 1206 1206 !-- Calculate of total grid points for RRTMG calculations 1207 nzt_rad = nzt + nz_snd_end - nz_snd_start + 21207 nzt_rad = nzt + nz_snd_end - nz_snd_start + 1 1208 1208 1209 1209 !
Note: See TracChangeset
for help on using the changeset viewer.
