Changeset 20 for palm/trunk
- Timestamp:
- Feb 26, 2007 12:12:32 AM (18 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 9 edited
-
check_parameters.f90 (modified) (1 diff)
-
diffusion_e.f90 (modified) (3 diffs)
-
diffusion_s.f90 (modified) (4 diffs)
-
diffusion_u.f90 (modified) (3 diffs)
-
diffusion_v.f90 (modified) (3 diffs)
-
diffusion_w.f90 (modified) (3 diffs)
-
parin.f90 (modified) (2 diffs)
-
read_var_list.f90 (modified) (2 diffs)
-
write_var_list.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/check_parameters.f90
r19 r20 806 806 ENDIF 807 807 808 IF ( surface_heatflux == 9999999.9 ) constant_heatflux = .FALSE. 809 IF ( top_heatflux == 9999999.9 ) THEN 810 constant_top_heatflux = .FALSE. 811 ELSE 812 use_top_fluxes = .TRUE. ! because this is currently the only choice 813 ENDIF 808 IF ( surface_heatflux == 9999999.9 ) constant_heatflux = .FALSE. 809 IF ( top_heatflux == 9999999.9 ) constant_top_heatflux = .FALSE. 814 810 815 811 ! -
palm/trunk/SOURCE/diffusion_e.f90
r19 r20 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Bugfix: ddzw dimensioned 1:nzt"+1" 6 7 ! Calculation extended for gridpoint nzt 7 8 ! … … 51 52 INTEGER :: i, j, k 52 53 REAL :: dpt_dz, l_stable, phi_m 53 REAL :: ddzu(1:nzt+1), dd2zu(1:nzt), ddzw(1:nzt ), &54 REAL :: ddzu(1:nzt+1), dd2zu(1:nzt), ddzw(1:nzt+1), & 54 55 l_grid(1:nzt), zu(0:nzt+1) 55 56 REAL, DIMENSION(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) :: diss, tend … … 166 167 INTEGER :: i, j, k 167 168 REAL :: dpt_dz, l_stable, phi_m 168 REAL :: ddzu(1:nzt+1), dd2zu(1:nzt), ddzw(1:nzt ), &169 REAL :: ddzu(1:nzt+1), dd2zu(1:nzt), ddzw(1:nzt+1), & 169 170 l_grid(1:nzt), zu(0:nzt+1) 170 171 REAL, DIMENSION(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) :: diss, tend -
palm/trunk/SOURCE/diffusion_s.f90
r19 r20 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! Bugfix: ddzw dimensioned 1:nzt"+1" 6 7 ! Calculation extended for gridpoint nzt, fluxes can be given at top, 7 ! +s_flux_t in parameter list, s_flux renamed s_flux_b 8 ! +s_flux_t in parameter list, s_flux renamed s_flux_b, 8 9 ! 9 10 ! Former revisions: … … 50 51 INTEGER :: i, j, k 51 52 REAL :: vertical_gridspace 52 REAL :: ddzu(1:nzt+1), ddzw(1:nzt )53 REAL :: ddzu(1:nzt+1), ddzw(1:nzt+1) 53 54 REAL :: tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) 54 55 REAL, DIMENSION(:,:), POINTER :: s_flux_b, s_flux_t … … 134 135 tend(k,j,i) = tend(k,j,i) & 135 136 + ( - s_flux_t(j,i) & 136 - 0.5 * ( kh(k-1,j,i)+kh(k,j,i) )&137 * ( s(k,j,i)-s(k-1,j,i) )&138 * ddzu(k)&137 - 0.5 * ( kh(k-1,j,i)+kh(k,j,i) ) & 138 * ( s(k,j,i)-s(k-1,j,i) ) & 139 * ddzu(k) & 139 140 ) * ddzw(k) 140 141 … … 161 162 INTEGER :: i, j, k 162 163 REAL :: vertical_gridspace 163 REAL :: ddzu(1:nzt+1), ddzw(1:nzt )164 REAL :: ddzu(1:nzt+1), ddzw(1:nzt+1) 164 165 REAL :: tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) 165 166 REAL, DIMENSION(:,:), POINTER :: s_flux_b, s_flux_t -
palm/trunk/SOURCE/diffusion_u.f90
r4 r20 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: ddzw dimensioned 1:nzt"+1" 7 7 ! 8 8 ! Former revisions: … … 52 52 INTEGER :: i, j, k 53 53 REAL :: kmym_x, kmym_y, kmyp_x, kmyp_y, kmzm, kmzp, usvs 54 REAL :: ddzu(1:nzt+1), ddzw(1:nzt ), km_damp_y(nys-1:nyn+1)54 REAL :: ddzu(1:nzt+1), ddzw(1:nzt+1), km_damp_y(nys-1:nyn+1) 55 55 REAL :: z0(nys-1:nyn+1,nxl-1:nxr+1) 56 56 REAL :: tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) … … 201 201 INTEGER :: i, j, k 202 202 REAL :: kmym_x, kmym_y, kmyp_x, kmyp_y, kmzm, kmzp, usvs 203 REAL :: ddzu(1:nzt+1), ddzw(1:nzt ), km_damp_y(nys-1:nyn+1)203 REAL :: ddzu(1:nzt+1), ddzw(1:nzt+1), km_damp_y(nys-1:nyn+1) 204 204 REAL :: z0(nys-1:nyn+1,nxl-1:nxr+1) 205 205 REAL :: tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) -
palm/trunk/SOURCE/diffusion_v.f90
r4 r20 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: ddzw dimensioned 1:nzt"+1" 7 7 ! 8 8 ! Former revisions: … … 52 52 INTEGER :: i, j, k 53 53 REAL :: kmxm_x, kmxm_y, kmxp_x, kmxp_y, kmzm, kmzp, vsus 54 REAL :: ddzu(1:nzt+1), ddzw(1:nzt ), km_damp_x(nxl-1:nxr+1)54 REAL :: ddzu(1:nzt+1), ddzw(1:nzt+1), km_damp_x(nxl-1:nxr+1) 55 55 REAL :: z0(nys-1:nyn+1,nxl-1:nxr+1) 56 56 REAL :: tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) … … 201 201 INTEGER :: i, j, k 202 202 REAL :: kmxm_x, kmxm_y, kmxp_x, kmxp_y, kmzm, kmzp, vsus 203 REAL :: ddzu(1:nzt+1), ddzw(1:nzt ), km_damp_x(nxl-1:nxr+1)203 REAL :: ddzu(1:nzt+1), ddzw(1:nzt+1), km_damp_x(nxl-1:nxr+1) 204 204 REAL :: z0(nys-1:nyn+1,nxl-1:nxr+1) 205 205 REAL :: tend(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) -
palm/trunk/SOURCE/diffusion_w.f90
r4 r20 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: ddzw dimensioned 1:nzt"+1" 7 7 ! 8 8 ! Former revisions: … … 51 51 REAL :: kmxm_x, kmxm_z, kmxp_x, kmxp_z, kmym_y, kmym_z, kmyp_y, & 52 52 kmyp_z, wsus, wsvs 53 REAL :: ddzu(1:nzt+1), ddzw(1:nzt ), km_damp_x(nxl-1:nxr+1), &53 REAL :: ddzu(1:nzt+1), ddzw(1:nzt+1), km_damp_x(nxl-1:nxr+1), & 54 54 km_damp_y(nys-1:nyn+1) 55 55 REAL :: z0(nys-1:nyn+1,nxl-1:nxr+1) … … 199 199 REAL :: kmxm_x, kmxm_z, kmxp_x, kmxp_z, kmym_y, kmym_z, kmyp_y, & 200 200 kmyp_z, wsus, wsvs 201 REAL :: ddzu(1:nzt+1), ddzw(1:nzt ), km_damp_x(nxl-1:nxr+1), &201 REAL :: ddzu(1:nzt+1), ddzw(1:nzt+1), km_damp_x(nxl-1:nxr+1), & 202 202 km_damp_y(nys-1:nyn+1) 203 203 REAL :: z0(nys-1:nyn+1,nxl-1:nxr+1) -
palm/trunk/SOURCE/parin.f90
r19 r20 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! +top_heatflux in inipar6 ! +top_heatflux, use_top_fluxes in inipar 7 7 ! 8 8 ! Former revisions: … … 74 74 ug_vertical_gradient, ug_vertical_gradient_level, & 75 75 ups_limit_e, ups_limit_pt, ups_limit_u, ups_limit_v, & 76 ups_limit_w, use_surface_fluxes, use_ug_for_galilei_tr, & 77 use_upstream_for_tke, vg_surface, vg_vertical_gradient, & 76 ups_limit_w, use_surface_fluxes, use_top_fluxes, & 77 use_ug_for_galilei_tr, use_upstream_for_tke, & 78 vg_surface, vg_vertical_gradient, & 78 79 vg_vertical_gradient_level, wall_adjustment, & 79 80 wall_heatflux -
palm/trunk/SOURCE/read_var_list.f90
r19 r20 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! +top_heatflux 6 ! +top_heatflux, use_top_fluxes 7 7 ! 8 8 ! Former revisions: … … 372 372 CASE ( 'use_surface_fluxes' ) 373 373 READ ( 13 ) use_surface_fluxes 374 CASE ( 'use_top_fluxes' ) 375 READ ( 13 ) use_top_fluxes 374 376 CASE ( 'use_ug_for_galilei_tr' ) 375 377 READ ( 13 ) use_ug_for_galilei_tr -
palm/trunk/SOURCE/write_var_list.f90
r19 r20 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! +top_heatflux 6 ! +top_heatflux, use_top_fluxes 7 7 ! 8 8 ! Former revisions: … … 338 338 WRITE ( 14 ) 'use_surface_fluxes ' 339 339 WRITE ( 14 ) use_surface_fluxes 340 WRITE ( 14 ) 'use_top_fluxes ' 341 WRITE ( 14 ) use_top_fluxes 340 342 WRITE ( 14 ) 'use_ug_for_galilei_tr ' 341 343 WRITE ( 14 ) use_ug_for_galilei_tr
Note: See TracChangeset
for help on using the changeset viewer.
