Changeset 1438
- Timestamp:
- Jul 22, 2014 2:14:06 PM (10 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
-
data_output_mask.f90 (modified) (6 diffs)
-
init_masks.f90 (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/data_output_mask.f90
r1360 r1438 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! +nr, qc, qr 23 23 ! 24 24 ! Former revisions: … … 70 70 #if defined( __netcdf ) 71 71 USE arrays_3d, & 72 ONLY: e, p, pt, q, ql, ql_c, ql_v, rho, sa, tend, u, v, vpt, w 72 ONLY: e, nr, p, pt, q, qc, ql, ql_c, ql_v, qr, rho, sa, tend, u, & 73 v, vpt, w 73 74 74 75 USE averaging, & 75 ONLY: e_av, lpt_av, p_av, pc_av, pr_av, pt_av, q_av, ql_av, ql_c_av,&76 ql_ v_av, ql_vp_av, qv_av, rho_av, s_av, sa_av, u_av, v_av,&77 vpt_av, w_av76 ONLY: e_av, lpt_av, nr_av, p_av, pc_av, pr_av, pt_av, q_av, qc_av, & 77 ql_av, ql_c_av, ql_v_av, ql_vp_av, qv_av, qr_av, rho_av, s_av, & 78 sa_av, u_av, v_av, vpt_av, w_av 78 79 79 80 USE cloud_parameters, & … … 81 82 82 83 USE control_parameters, & 83 ONLY: cloud_physics, domask, domask_no, domask_time_count, mask_i, & 84 mask_j, mask_k, mask_size, mask_size_l, mask_start_l, & 85 max_masks, message_string, mid, netcdf_data_format, & 86 nz_do3d, simulated_time 87 84 ONLY: cloud_physics, domask, domask_no, domask_time_count, & 85 mask_i, mask_j, mask_k, mask_size, mask_size_l, & 86 mask_start_l, max_masks, message_string, mid, & 87 netcdf_data_format, nz_do3d, simulated_time 88 88 USE cpulog, & 89 89 ONLY: cpu_log, log_point 90 91 90 92 91 93 USE indices, & … … 192 194 ELSE 193 195 to_be_resorted => lpt_av 196 ENDIF 197 198 CASE ( 'nr' ) 199 IF ( av == 0 ) THEN 200 to_be_resorted => nr 201 ELSE 202 to_be_resorted => nr_av 194 203 ENDIF 195 204 … … 293 302 ENDIF 294 303 304 CASE ( 'qc' ) 305 IF ( av == 0 ) THEN 306 to_be_resorted => qc 307 ELSE 308 to_be_resorted => qc_av 309 ENDIF 310 295 311 CASE ( 'ql' ) 296 312 IF ( av == 0 ) THEN … … 367 383 ENDIF 368 384 385 CASE ( 'qr' ) 386 IF ( av == 0 ) THEN 387 to_be_resorted => qr 388 ELSE 389 to_be_resorted => qr_av 390 ENDIF 391 369 392 CASE ( 'rho' ) 370 393 IF ( av == 0 ) THEN -
palm/trunk/SOURCE/init_masks.f90
r1415 r1438 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! +nr, qc, qr 23 23 ! 24 24 ! Former revisions: … … 85 85 data_output_masks, data_output_masks_user, & 86 86 doav, doav_n, domask, domask_no, dz, dz_stretch_level, humidity,& 87 mask, masks, mask_scale, mask_i,&87 icloud_scheme, mask, masks, mask_scale, mask_i, & 88 88 mask_i_global, mask_j, mask_j_global, mask_k, mask_k_global, & 89 89 mask_loop, mask_size, mask_size_l, mask_start_l, mask_x, & 90 90 mask_x_loop, mask_xyz_dimension, mask_y, mask_y_loop, mask_z, & 91 91 mask_z_loop, max_masks, message_string, mid, & 92 netcdf_data_format, passive_scalar, ocean92 netcdf_data_format, passive_scalar, precipitation, ocean 93 93 94 94 USE grid_variables, & … … 252 252 unit = 'K' 253 253 254 CASE ( 'nr' ) 255 IF ( .NOT. cloud_physics ) THEN 256 WRITE ( message_string, * ) 'output of "', TRIM( var ), & 257 '" requires cloud_physics = .TRUE.' 258 CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 ) 259 ELSEIF ( icloud_scheme /= 0 ) THEN 260 message_string = 'output of "' // TRIM( var ) // '" requi' // & 261 'res cloud_scheme = seifert_beheng' 262 CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 ) 263 ELSEIF ( .NOT. precipitation ) THEN 264 message_string = 'output of "' // TRIM( var ) // '" requi' // & 265 'res precipitation = .TRUE.' 266 CALL message( 'check_parameters', 'PA0112', 1, 2, 0, 6, 0 ) 267 ENDIF 268 unit = '1/m3' 269 254 270 CASE ( 'pc', 'pr' ) 255 271 IF ( .NOT. particle_advection ) THEN … … 271 287 IF ( TRIM( var ) == 'vpt' ) unit = 'K' 272 288 289 CASE ( 'qc' ) 290 IF ( .NOT. cloud_physics ) THEN 291 message_string = 'output of "' // TRIM( var ) // '" requi' // & 292 'res cloud_physics = .TRUE.' 293 CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 ) 294 ELSEIF ( icloud_scheme /= 0 ) THEN 295 message_string = 'output of "' // TRIM( var ) // '" requi' // & 296 'res cloud_scheme = seifert_beheng' 297 CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 ) 298 ENDIF 299 unit = 'kg/kg' 300 273 301 CASE ( 'ql' ) 274 302 IF ( .NOT. ( cloud_physics .OR. cloud_droplets ) ) THEN … … 295 323 '" requires cloud_physics = .TRUE.' 296 324 CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 ) 325 ENDIF 326 unit = 'kg/kg' 327 328 CASE ( 'qr' ) 329 IF ( .NOT. cloud_physics ) THEN 330 message_string = 'output of "' // TRIM( var ) // '" requi' // & 331 'res cloud_physics = .TRUE.' 332 CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 ) 333 ELSEIF ( icloud_scheme /= 0 ) THEN 334 message_string = 'output of "' // TRIM( var ) // '" requi' // & 335 'res cloud_scheme = seifert_beheng' 336 CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 ) 337 ELSEIF ( .NOT. precipitation ) THEN 338 message_string = 'output of "' // TRIM( var ) // '" requi' // & 339 'res precipitation = .TRUE.' 340 CALL message( 'check_parameters', 'PA0112', 1, 2, 0, 6, 0 ) 297 341 ENDIF 298 342 unit = 'kg/kg'
Note: See TracChangeset
for help on using the changeset viewer.
