Changeset 771 for palm/trunk
- Timestamp:
- Oct 27, 2011 10:56:21 AM (13 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/average_3d_data.f90
r668 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! +lpt_av 7 7 ! Former revisions: 8 8 ! ----------------- … … 75 75 ENDDO 76 76 77 CASE ( 'lpt' ) 78 DO i = nxlg, nxrg 79 DO j = nysg, nyng 80 DO k = nzb, nzt+1 81 lpt_av(k,j,i) = lpt_av(k,j,i) / REAL( average_count_3d ) 82 ENDDO 83 ENDDO 84 ENDDO 85 77 86 CASE ( 'lwp*' ) 78 87 DO i = nxlg, nxrg -
palm/trunk/SOURCE/check_parameters.f90
r768 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! +lpt 7 7 ! 8 8 ! Former revisions: … … 2563 2563 unit = 'm2/s2' 2564 2564 2565 CASE ( 'lpt' ) 2566 IF ( .NOT. cloud_physics ) THEN 2567 message_string = 'output of "' // TRIM( var ) // '" requi' // & 2568 'res cloud_physics = .TRUE. or cloud_droplets = .TRUE.' 2569 CALL message( 'check_parameters', 'PA0347', 1, 2, 0, 6, 0 ) 2570 ENDIF 2571 unit = 'K' 2572 2565 2573 CASE ( 'pc', 'pr' ) 2566 2574 IF ( .NOT. particle_advection ) THEN -
palm/trunk/SOURCE/data_output_2d.f90
r760 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! +lpt 7 7 ! 8 8 ! Former revisions: … … 230 230 ELSE 231 231 to_be_resorted => e_av 232 ENDIF 233 IF ( mode == 'xy' ) level_z = zu 234 235 CASE ( 'lpt_xy', 'lpt_xz', 'lpt_yz' ) 236 IF ( av == 0 ) THEN 237 to_be_resorted => pt 238 ELSE 239 to_be_resorted => lpt_av 232 240 ENDIF 233 241 IF ( mode == 'xy' ) level_z = zu -
palm/trunk/SOURCE/data_output_3d.f90
r760 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! +lpt 7 7 ! 8 8 ! Former revisions: … … 166 166 ELSE 167 167 to_be_resorted => e_av 168 ENDIF 169 170 CASE ( 'lpt' ) 171 IF ( av == 0 ) THEN 172 to_be_resorted => pt 173 ELSE 174 to_be_resorted => lpt_av 168 175 ENDIF 169 176 -
palm/trunk/SOURCE/data_output_mask.f90
r668 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! +lpt 6 7 ! 7 8 ! Former revisions: … … 113 114 ELSE 114 115 to_be_resorted => e_av 116 ENDIF 117 118 CASE ( 'lpt' ) 119 IF ( av == 0 ) THEN 120 to_be_resorted => pt 121 ELSE 122 to_be_resorted => lpt_av 115 123 ENDIF 116 124 -
palm/trunk/SOURCE/init_masks.f90
r596 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! +lpt 7 7 ! 8 8 ! Former revisions: … … 170 170 unit = 'm2/s2' 171 171 172 CASE ( 'lpt' ) 173 IF ( .NOT. cloud_physics ) THEN 174 WRITE ( message_string, * ) 'output of "', TRIM( var ), & 175 '" requires cloud_physics = .TRUE.' 176 CALL message( 'init_masks', 'PA0348', 1, 2, 0, 6, 0 ) 177 ENDIF 178 unit = 'K' 179 172 180 CASE ( 'pc', 'pr' ) 173 181 IF ( .NOT. particle_advection ) THEN -
palm/trunk/SOURCE/modules.f90
r768 r771 5 5 ! Current revisions: 6 6 ! ----------------- 7 ! 7 ! +lpt_av 8 8 ! 9 9 ! Former revisions: … … 323 323 324 324 REAL, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: & 325 e_av, p_av, pc_av, pr_av, pt_av, q_av, ql_av, ql_c_av, ql_v_av,&326 ql_v p_av, qv_av, rho_av, s_av, sa_av, u_av, v_av, vpt_av, w_av327 325 e_av, lpt_av, p_av, pc_av, pr_av, pt_av, q_av, ql_av, ql_c_av, & 326 ql_v_av, ql_vp_av, qv_av, rho_av, s_av, sa_av, u_av, v_av, vpt_av, & 327 w_av 328 328 END MODULE averaging 329 329 -
palm/trunk/SOURCE/netcdf.f90
r601 r771 7 7 ! Current revisions: 8 8 ! ------------------ 9 ! 9 ! +lpt 10 10 ! 11 11 ! Former revisions: … … 417 417 ! 418 418 !-- Most variables are defined on the scalar grid 419 CASE ( 'e', ' p', 'pc', 'pr', 'pt', 'q', 'ql', 'ql_c', 'ql_v', &420 'ql_v p', 'qv', 'rho', 's', 'sa', 'vpt' )419 CASE ( 'e', 'lpt', 'p', 'pc', 'pr', 'pt', 'q', 'ql', 'ql_c', & 420 'ql_v', 'ql_vp', 'qv', 'rho', 's', 'sa', 'vpt' ) 421 421 422 422 grid_x = 'x' … … 945 945 ! 946 946 !-- Most variables are defined on the scalar grid 947 CASE ( 'e', ' p', 'pc', 'pr', 'pt', 'q', 'ql', 'ql_c', 'ql_v', &948 'ql_v p', 'qv', 'rho', 's', 'sa', 'vpt' )947 CASE ( 'e', 'lpt', 'p', 'pc', 'pr', 'pt', 'q', 'ql', 'ql_c', & 948 'ql_v', 'ql_vp', 'qv', 'rho', 's', 'sa', 'vpt' ) 949 949 950 950 grid_x = 'x' … … 1507 1507 ! 1508 1508 !-- Most variables are defined on the zu grid 1509 CASE ( 'e_xy', ' p_xy', 'pc_xy', 'pr_xy', 'pt_xy', 'q_xy',&1510 'q l_xy', 'ql_c_xy', 'ql_v_xy', 'ql_vp_xy',&1509 CASE ( 'e_xy', 'lpt_xy', 'p_xy', 'pc_xy', 'pr_xy', 'pt_xy',& 1510 'q_xy', 'ql_xy', 'ql_c_xy', 'ql_v_xy', 'ql_vp_xy', & 1511 1511 'qv_xy', 'rho_xy', 's_xy', 'sa_xy', 'vpt_xy' ) 1512 1512 … … 2093 2093 ! 2094 2094 !-- Most variables are defined on the zu grid 2095 CASE ( 'e_xz', ' p_xz', 'pc_xz', 'pr_xz', 'pt_xz', 'q_xz',&2096 'q l_xz', 'ql_c_xz', 'ql_v_xz', 'ql_vp_xz', 'qv_xz',&2097 ' rho_xz', 's_xz', 'sa_xz', 'vpt_xz' )2095 CASE ( 'e_xz', 'lpt_xz', 'p_xz', 'pc_xz', 'pr_xz', 'pt_xz', & 2096 'q_xz', 'ql_xz', 'ql_c_xz', 'ql_v_xz', 'ql_vp_xz', & 2097 'qv_xz', 'rho_xz', 's_xz', 'sa_xz', 'vpt_xz' ) 2098 2098 2099 2099 grid_x = 'x' … … 2679 2679 ! 2680 2680 !-- Most variables are defined on the zu grid 2681 CASE ( 'e_yz', ' p_yz', 'pc_yz', 'pr_yz', 'pt_yz', 'q_yz',&2682 'q l_yz', 'ql_c_yz', 'ql_v_yz', 'ql_vp_yz', 'qv_yz',&2683 ' rho_yz', 's_yz', 'sa_yz', 'vpt_yz' )2681 CASE ( 'e_yz', 'lpt_yz', 'p_yz', 'pc_yz', 'pr_yz', 'pt_yz',& 2682 'q_yz', 'ql_yz', 'ql_c_yz', 'ql_v_yz', 'ql_vp_yz', & 2683 'qv_yz', 'rho_yz', 's_yz', 'sa_yz', 'vpt_yz' ) 2684 2684 2685 2685 grid_x = 'x' … … 3717 3717 ! 3718 3718 !-- Most variables are defined on the zu levels 3719 CASE ( 'e', ' p', 'pc', 'pr', 'pt', 'q', 'ql', 'ql_c', 'ql_v',&3720 'ql_v p', 'qv', 'rho', 's', 'sa', 'u', 'v', 'vpt' )3719 CASE ( 'e', 'lpt', 'p', 'pc', 'pr', 'pt', 'q', 'ql', 'ql_c', & 3720 'ql_v', 'ql_vp', 'qv', 'rho', 's', 'sa', 'u', 'v', 'vpt' ) 3721 3721 3722 3722 grid_z = 'zu' -
palm/trunk/SOURCE/read_3d_binary.f90
r668 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! +lpt_av 6 7 ! 7 8 ! Former revisions: … … 395 396 tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp) 396 397 398 CASE ( 'lpt_av' ) 399 IF ( .NOT. ALLOCATED( lpt_av ) ) THEN 400 ALLOCATE( lpt_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg )) 401 ENDIF 402 IF ( k == 1 ) READ ( 13 ) tmp_3d 403 lpt_av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) = & 404 tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp) 405 397 406 CASE ( 'lwp_av' ) 398 407 IF ( .NOT. ALLOCATED( lwp_av ) ) THEN -
palm/trunk/SOURCE/sum_up_3d_data.f90
r668 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! lpt_av 6 7 ! 7 8 ! Former revisions: … … 71 72 e_av = 0.0 72 73 74 CASE ( 'lpt' ) 75 IF ( .NOT. ALLOCATED( lpt_av ) ) THEN 76 ALLOCATE( lpt_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 77 ENDIF 78 lpt_av = 0.0 79 73 80 CASE ( 'lwp*' ) 74 81 IF ( .NOT. ALLOCATED( lwp_av ) ) THEN … … 239 246 DO k = nzb, nzt+1 240 247 e_av(k,j,i) = e_av(k,j,i) + e(k,j,i) 248 ENDDO 249 ENDDO 250 ENDDO 251 252 CASE ( 'lpt' ) 253 DO i = nxlg, nxrg 254 DO j = nysg, nyng 255 DO k = nzb, nzt+1 256 lpt_av(k,j,i) = lpt_av(k,j,i) + pt(k,j,i) 241 257 ENDDO 242 258 ENDDO -
palm/trunk/SOURCE/write_3d_binary.f90
r760 r771 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! +lpt 7 7 ! 8 8 ! Former revisions: … … 102 102 WRITE ( 14 ) 'km_m '; WRITE ( 14 ) km_m 103 103 ENDIF 104 IF ( ALLOCATED( lpt_av ) ) THEN 105 WRITE ( 14 ) 'lpt_av '; WRITE ( 14 ) lpt_av 106 ENDIF 104 107 IF ( ALLOCATED( lwp_av ) ) THEN 105 108 WRITE ( 14 ) 'lwp_av '; WRITE ( 14 ) lwp_av
Note: See TracChangeset
for help on using the changeset viewer.