Changeset 1960 for palm/trunk/SOURCE/header.f90
- Timestamp:
- Jul 12, 2016 4:34:24 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/header.f90
r1958 r1960 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! Treat humidity and passive scalar separately. 22 ! Modify misleading information concerning humidity. 23 ! Bugfix, change unit for humidity flux. 22 24 ! 23 25 ! Former revisions: … … 266 268 267 269 USE arrays_3d, & 268 ONLY: pt_init, qsws, q_init, sa_init, shf, ug, vg, w_subs, zu, zw 270 ONLY: pt_init, qsws, q_init, s_init, sa_init, shf, ug, vg, w_subs, zu,& 271 zw 269 272 270 273 USE control_parameters … … 1022 1025 1023 1026 IF ( passive_scalar ) THEN 1024 IF ( ibc_ q_b == 0 ) THEN1027 IF ( ibc_s_b == 0 ) THEN 1025 1028 r_lower = 's(0) = s_surface' 1026 1029 ELSE 1027 1030 r_lower = 's(0) = s(1)' 1028 1031 ENDIF 1029 IF ( ibc_ q_t == 0 ) THEN1032 IF ( ibc_s_t == 0 ) THEN 1030 1033 r_upper = 's(nzt) = s_top' 1031 1034 ELSE … … 1052 1055 ENDIF 1053 1056 ENDIF 1054 IF ( passive_scalar .AND. constant_ waterflux ) THEN1055 WRITE ( io, 313 ) surface_ waterflux1057 IF ( passive_scalar .AND. constant_scalarflux ) THEN 1058 WRITE ( io, 313 ) surface_scalarflux 1056 1059 ENDIF 1057 1060 ENDIF … … 1070 1073 WRITE ( io, 309 ) top_salinityflux 1071 1074 ENDIF 1072 IF ( humidity .OR. passive_scalar ) THEN 1073 WRITE ( io, 315 ) 1074 ENDIF 1075 IF ( humidity ) WRITE ( io, 315 ) 1076 IF ( passive_scalar ) WRITE ( io, 315 ) 1075 1077 ENDIF 1076 1078 … … 1083 1085 WRITE ( io, 312 ) 1084 1086 ENDIF 1085 IF ( passive_scalar .AND. .NOT. constant_ waterflux ) THEN1087 IF ( passive_scalar .AND. .NOT. constant_scalarflux ) THEN 1086 1088 WRITE ( io, 314 ) 1087 1089 ENDIF … … 1153 1155 !-- Initial humidity profile 1154 1156 !-- Building output strings, starting with surface humidity 1155 IF ( humidity .OR. passive_scalar) THEN1157 IF ( humidity ) THEN 1156 1158 WRITE ( temperatures, '(E8.1)' ) q_surface 1157 1159 gradients = '--------' … … 1181 1183 ENDDO 1182 1184 1183 IF ( humidity ) THEN 1184 IF ( .NOT. nudging ) THEN 1185 WRITE ( io, 421 ) TRIM( coordinates ), TRIM( temperatures ), & 1186 TRIM( gradients ), TRIM( slices ) 1187 ENDIF 1188 ELSE 1189 WRITE ( io, 422 ) TRIM( coordinates ), TRIM( temperatures ), & 1185 IF ( .NOT. nudging ) THEN 1186 WRITE ( io, 421 ) TRIM( coordinates ), TRIM( temperatures ), & 1190 1187 TRIM( gradients ), TRIM( slices ) 1191 1188 ENDIF 1192 1189 ENDIF 1190 ! 1191 !-- Initial scalar profile 1192 !-- Building output strings, starting with surface humidity 1193 IF ( passive_scalar ) THEN 1194 WRITE ( temperatures, '(E8.1)' ) s_surface 1195 gradients = '--------' 1196 slices = ' 0' 1197 coordinates = ' 0.0' 1198 i = 1 1199 DO WHILE ( s_vertical_gradient_level_ind(i) /= -9999 ) 1200 1201 WRITE (coor_chr,'(E8.1,4X)') s_init(q_vertical_gradient_level_ind(i)) 1202 temperatures = TRIM( temperatures ) // ' ' // TRIM( coor_chr ) 1203 1204 WRITE (coor_chr,'(E8.1,4X)') s_vertical_gradient(i) 1205 gradients = TRIM( gradients ) // ' ' // TRIM( coor_chr ) 1206 1207 WRITE (coor_chr,'(I8,4X)') s_vertical_gradient_level_ind(i) 1208 slices = TRIM( slices ) // ' ' // TRIM( coor_chr ) 1209 1210 WRITE (coor_chr,'(F8.1,4X)') s_vertical_gradient_level(i) 1211 coordinates = TRIM( coordinates ) // ' ' // TRIM( coor_chr ) 1212 1213 IF ( i == 10 ) THEN 1214 EXIT 1215 ELSE 1216 i = i + 1 1217 ENDIF 1218 1219 ENDDO 1220 1221 WRITE ( io, 422 ) TRIM( coordinates ), TRIM( temperatures ), & 1222 TRIM( gradients ), TRIM( slices ) 1223 ENDIF 1193 1224 1194 1225 ! … … 1995 2026 310 FORMAT (//' 1D-Model:'// & 1996 2027 ' Rif value range: ',F6.2,' <= rif <=',F6.2) 1997 311 FORMAT (' Predefined constant humidity flux: ',E10.3,' m/s')2028 311 FORMAT (' Predefined constant humidity flux: ',E10.3,' kg/kg m/s') 1998 2029 312 FORMAT (' Predefined surface humidity') 1999 2030 313 FORMAT (' Predefined constant scalar flux: ',E10.3,' kg/(m**2 s)') … … 2158 2189 430 FORMAT (//' Cloud physics quantities / methods:'/ & 2159 2190 ' ----------------------------------'/) 2160 431 FORMAT (' Humidity is treated as purely passive scalar (no condensati', & 2161 'on)') 2191 431 FORMAT (' Humidity is considered, bu no condensation') 2162 2192 432 FORMAT (' Bulk scheme with liquid water potential temperature and'/ & 2163 2193 ' total water content is used.'/ &
Note: See TracChangeset
for help on using the changeset viewer.