Changeset 2031 for palm/trunk/SOURCE
- Timestamp:
- Oct 21, 2016 3:11:58 PM (8 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/average_3d_data.f90
r2012 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean and rho_av to rho_ocean_av 23 23 ! 24 24 ! Former revisions: … … 318 318 ENDDO 319 319 320 CASE ( 'rho ' )321 DO i = nxlg, nxrg 322 DO j = nysg, nyng 323 DO k = nzb, nzt+1 324 rho_ av(k,j,i) = rho_av(k,j,i) / REAL( average_count_3d, KIND=wp )320 CASE ( 'rho_ocean' ) 321 DO i = nxlg, nxrg 322 DO j = nysg, nyng 323 DO k = nzb, nzt+1 324 rho_ocean_av(k,j,i) = rho_ocean_av(k,j,i) / REAL( average_count_3d, KIND=wp ) 325 325 ENDDO 326 326 ENDDO -
palm/trunk/SOURCE/check_parameters.f90
r2027 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 299 299 ! 1179 2013-06-14 05:57:58Z raasch 300 300 ! checks and settings of buoyancy parameters and switches revised, 301 ! initial profile for rho added to hom (id=77)301 ! initial profile for rho_ocean added to hom (id=77) 302 302 ! 303 303 ! 1174 2013-05-31 10:28:08Z gryschka … … 2528 2528 hom(:,2,63,:) = SPREAD( zu, 2, statistic_regions+1 ) 2529 2529 2530 CASE ( 'rho ' )2530 CASE ( 'rho_ocean' ) 2531 2531 IF ( .NOT. ocean ) THEN 2532 2532 message_string = 'data_output_pr = ' // & … … 3005 3005 unit = 'kg/kg' 3006 3006 3007 CASE ( 'rho ' )3007 CASE ( 'rho_ocean' ) 3008 3008 IF ( .NOT. ocean ) THEN 3009 3009 message_string = 'output of "' // TRIM( var ) // '" requi' // & -
palm/trunk/SOURCE/data_output_2d.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean and rho_av to rho_ocean_av 23 23 ! 24 24 ! Former revisions: … … 157 157 USE arrays_3d, & 158 158 ONLY: dzw, e, nr, ol, p, pt, precipitation_amount, precipitation_rate,& 159 prr,q, qc, ql, ql_c, ql_v, ql_vp, qr, qsws, rho , s, sa, shf, &159 prr,q, qc, ql, ql_c, ql_v, ql_vp, qr, qsws, rho_ocean, s, sa, shf, & 160 160 ssws, tend, ts, u, us, v, vpt, w, z0, z0h, z0q, zu, zw 161 161 … … 769 769 CASE ( 'rho_xy', 'rho_xz', 'rho_yz' ) 770 770 IF ( av == 0 ) THEN 771 to_be_resorted => rho 772 ELSE 773 to_be_resorted => rho_ av771 to_be_resorted => rho_ocean 772 ELSE 773 to_be_resorted => rho_ocean_av 774 774 ENDIF 775 775 -
palm/trunk/SOURCE/data_output_3d.f90
r2012 r2031 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! renamed variable rho to rho_ocean and rho_av to rho_ocean_av 23 23 ! 24 24 ! Former revisions: … … 146 146 147 147 USE arrays_3d, & 148 ONLY: e, nr, p, pt, prr, q, qc, ql, ql_c, ql_v, qr, rho , s, sa, tend, &148 ONLY: e, nr, p, pt, prr, q, qc, ql, ql_c, ql_v, qr, rho_ocean, s, sa, tend, & 149 149 u, v, vpt, w 150 150 … … 531 531 ENDIF 532 532 533 CASE ( 'rho ' )534 IF ( av == 0 ) THEN 535 to_be_resorted => rho 536 ELSE 537 to_be_resorted => rho_ av533 CASE ( 'rho_ocean' ) 534 IF ( av == 0 ) THEN 535 to_be_resorted => rho_ocean 536 ELSE 537 to_be_resorted => rho_ocean_av 538 538 ENDIF 539 539 -
palm/trunk/SOURCE/data_output_mask.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean and rho_av to rho_ocean_av 23 23 ! 24 24 ! Former revisions: … … 102 102 #if defined( __netcdf ) 103 103 USE arrays_3d, & 104 ONLY: e, nr, p, pt, q, qc, ql, ql_c, ql_v, qr, rho , s, sa, tend, u, &104 ONLY: e, nr, p, pt, q, qc, ql, ql_c, ql_v, qr, rho_ocean, s, sa, tend, u, & 105 105 v, vpt, w 106 106 107 107 USE averaging, & 108 108 ONLY: e_av, lpt_av, nr_av, p_av, pc_av, pr_av, pt_av, q_av, qc_av, & 109 ql_av, ql_c_av, ql_v_av, ql_vp_av, qv_av, qr_av, rho_ av, s_av, &109 ql_av, ql_c_av, ql_v_av, ql_vp_av, qv_av, qr_av, rho_ocean_av, s_av, & 110 110 sa_av, u_av, v_av, vpt_av, w_av 111 111 … … 436 436 ENDIF 437 437 438 CASE ( 'rho ' )439 IF ( av == 0 ) THEN 440 to_be_resorted => rho 441 ELSE 442 to_be_resorted => rho_ av438 CASE ( 'rho_ocean' ) 439 IF ( av == 0 ) THEN 440 to_be_resorted => rho_ocean 441 ELSE 442 to_be_resorted => rho_ocean_av 443 443 ENDIF 444 444 -
palm/trunk/SOURCE/diffusivities.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 160 160 ! 161 161 !-- Determine the mixing length 162 dvar_dz = atmos_ocean_sign * & ! inverse effect of pt/rho gradient162 dvar_dz = atmos_ocean_sign * & ! inverse effect of pt/rho_ocean gradient 163 163 ( var(k+1,j,i) - var(k-1,j,i) ) * dd2zu(k) 164 164 IF ( dvar_dz > 0.0_wp ) THEN -
palm/trunk/SOURCE/eqn_state_seawater.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 115 115 116 116 USE arrays_3d, & 117 ONLY: hyp, prho, pt_p, rho , sa_p117 ONLY: hyp, prho, pt_p, rho_ocean, sa_p 118 118 USE indices, & 119 119 ONLY: nxl, nxr, nyn, nys, nzb_s_inner, nzt … … 181 181 ! 182 182 !-- In-situ density 183 rho (k,j,i) = pnom / pden183 rho_ocean(k,j,i) = pnom / pden 184 184 185 185 ENDDO … … 188 188 prho(nzt+1,j,i) = prho(nzt,j,i) 189 189 prho(nzb_s_inner(j,i),j,i) = prho(nzb_s_inner(j,i)+1,j,i) 190 rho (nzt+1,j,i) = rho(nzt,j,i)191 rho (nzb_s_inner(j,i),j,i) = rho(nzb_s_inner(j,i)+1,j,i)190 rho_ocean(nzt+1,j,i) = rho_ocean(nzt,j,i) 191 rho_ocean(nzb_s_inner(j,i),j,i) = rho_ocean(nzb_s_inner(j,i)+1,j,i) 192 192 193 193 ENDDO … … 205 205 206 206 USE arrays_3d, & 207 ONLY: hyp, prho, pt_p, rho , sa_p207 ONLY: hyp, prho, pt_p, rho_ocean, sa_p 208 208 209 209 USE indices, & … … 255 255 ! 256 256 !-- In-situ density 257 rho (k,j,i) = pnom / pden257 rho_ocean(k,j,i) = pnom / pden 258 258 259 259 … … 264 264 prho(nzt+1,j,i) = prho(nzt,j,i) 265 265 prho(nzb_s_inner(j,i),j,i) = prho(nzb_s_inner(j,i)+1,j,i) 266 rho (nzt+1,j,i) = rho(nzt,j,i)267 rho (nzb_s_inner(j,i),j,i) = rho(nzb_s_inner(j,i)+1,j,i)266 rho_ocean(nzt+1,j,i) = rho_ocean(nzt,j,i) 267 rho_ocean(nzb_s_inner(j,i),j,i) = rho_ocean(nzb_s_inner(j,i)+1,j,i) 268 268 269 269 END SUBROUTINE eqn_state_seawater_ij -
palm/trunk/SOURCE/flow_statistics.f90
r2027 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 212 212 USE arrays_3d, & 213 213 ONLY: ddzu, ddzw, e, hyp, km, kh, nr, ol, p, prho, prr, pt, q, qc, ql,& 214 qr, qs, qsws, qswst, rho , s, sa, ss, ssws, sswst, saswsb, &214 qr, qs, qsws, qswst, rho_ocean, s, sa, ss, ssws, sswst, saswsb, & 215 215 saswst, shf, td_lsa_lpt, td_lsa_q, td_sub_lpt, td_sub_q, & 216 216 time_vert, ts, tswst, u, ug, us, usws, uswst, vsws, v, vg, vpt, & … … 926 926 rmask(j,i,sr) 927 927 ENDIF 928 sums_l(k,64,tn) = sums_l(k,64,tn) + rho (k,j,i) * &928 sums_l(k,64,tn) = sums_l(k,64,tn) + rho_ocean(k,j,i) * & 929 929 rmask(j,i,sr) 930 930 sums_l(k,71,tn) = sums_l(k,71,tn) + prho(k,j,i) * & … … 1400 1400 hom(:,1,55,sr) = sums(:,55) ! w*u*u*/dz 1401 1401 hom(:,1,56,sr) = sums(:,56) ! w*p*/dz 1402 hom(:,1,57,sr) = sums(:,57) ! ( w"e + w"p"/rho )/dz1402 hom(:,1,57,sr) = sums(:,57) ! ( w"e + w"p"/rho_ocean )/dz 1403 1403 hom(:,1,58,sr) = sums(:,58) ! u"pt" 1404 1404 hom(:,1,59,sr) = sums(:,59) ! u*pt* … … 1407 1407 hom(:,1,62,sr) = sums(:,62) ! v*pt* 1408 1408 hom(:,1,63,sr) = sums(:,61) + sums(:,62) ! vpt_t 1409 hom(:,1,64,sr) = sums(:,64) ! rho 1409 hom(:,1,64,sr) = sums(:,64) ! rho_ocean 1410 1410 hom(:,1,65,sr) = sums(:,65) ! w"sa" 1411 1411 hom(:,1,66,sr) = sums(:,66) ! w*sa* 1412 1412 hom(:,1,67,sr) = sums(:,65) + sums(:,66) ! wsa 1413 1413 hom(:,1,68,sr) = sums(:,68) ! w*p* 1414 hom(:,1,69,sr) = sums(:,69) ! w"e + w"p"/rho 1414 hom(:,1,69,sr) = sums(:,69) ! w"e + w"p"/rho_ocean 1415 1415 hom(:,1,70,sr) = sums(:,70) ! q*2 1416 1416 hom(:,1,71,sr) = sums(:,71) ! prho … … 1706 1706 USE arrays_3d, & 1707 1707 ONLY: ddzu, ddzw, e, hyp, km, kh, nr, p, prho, pt, q, qc, ql, qr, qs, & 1708 qsws, qswst, rho , s, sa, saswsb, saswst, shf, ss, ssws, sswst, &1708 qsws, qswst, rho_ocean, s, sa, saswsb, saswst, shf, ss, ssws, sswst, & 1709 1709 td_lsa_lpt, td_lsa_q, td_sub_lpt, td_sub_q, time_vert, ts, & 1710 1710 tswst, u, ug, us, usws, uswst, vsws, v, vg, vpt, vswst, w, & … … 2786 2786 ENDIF 2787 2787 2788 !$acc parallel loop gang present( rflags_invers, rho , prho, rmask, sums_l ) create( s1, s2 )2788 !$acc parallel loop gang present( rflags_invers, rho_ocean, prho, rmask, sums_l ) create( s1, s2 ) 2789 2789 DO k = nzb, nzt_diff 2790 2790 s1 = 0 … … 2793 2793 DO i = nxl, nxr 2794 2794 DO j = nys, nyn 2795 s1 = s1 + rho (k,j,i) * rmask(j,i,sr) * rflags_invers(j,i,k+1)2795 s1 = s1 + rho_ocean(k,j,i) * rmask(j,i,sr) * rflags_invers(j,i,k+1) 2796 2796 s2 = s2 + prho(k,j,i) * rmask(j,i,sr) * rflags_invers(j,i,k+1) 2797 2797 ENDDO … … 3424 3424 hom(:,1,55,sr) = sums(:,55) ! w*u*u*/dz 3425 3425 hom(:,1,56,sr) = sums(:,56) ! w*p*/dz 3426 hom(:,1,57,sr) = sums(:,57) ! ( w"e + w"p"/rho )/dz3426 hom(:,1,57,sr) = sums(:,57) ! ( w"e + w"p"/rho_ocean )/dz 3427 3427 hom(:,1,58,sr) = sums(:,58) ! u"pt" 3428 3428 hom(:,1,59,sr) = sums(:,59) ! u*pt* … … 3431 3431 hom(:,1,62,sr) = sums(:,62) ! v*pt* 3432 3432 hom(:,1,63,sr) = sums(:,61) + sums(:,62) ! vpt_t 3433 hom(:,1,64,sr) = sums(:,64) ! rho 3433 hom(:,1,64,sr) = sums(:,64) ! rho_ocean 3434 3434 hom(:,1,65,sr) = sums(:,65) ! w"sa" 3435 3435 hom(:,1,66,sr) = sums(:,66) ! w*sa* 3436 3436 hom(:,1,67,sr) = sums(:,65) + sums(:,66) ! wsa 3437 3437 hom(:,1,68,sr) = sums(:,68) ! w*p* 3438 hom(:,1,69,sr) = sums(:,69) ! w"e + w"p"/rho 3438 hom(:,1,69,sr) = sums(:,69) ! w"e + w"p"/rho_ocean 3439 3439 hom(:,1,70,sr) = sums(:,70) ! q*2 3440 3440 hom(:,1,71,sr) = sums(:,71) ! prho -
palm/trunk/SOURCE/init_3d_model.f90
r2012 r2031 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 623 623 #if defined( __nopointer ) 624 624 ALLOCATE( prho(nzb:nzt+1,nysg:nyng,nxlg:nxrg), & 625 rho (nzb:nzt+1,nysg:nyng,nxlg:nxrg), &625 rho_ocean(nzb:nzt+1,nysg:nyng,nxlg:nxrg), & 626 626 sa(nzb:nzt+1,nysg:nyng,nxlg:nxrg), & 627 627 sa_p(nzb:nzt+1,nysg:nyng,nxlg:nxrg), & … … 634 634 sa_3(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 635 635 prho => prho_1 636 rho => rho_1 ! routines calc_mean_profile and diffusion_e require636 rho_ocean => rho_1 ! routines calc_mean_profile and diffusion_e require 637 637 ! density to be apointer 638 638 #endif -
palm/trunk/SOURCE/init_masks.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 350 350 unit = 'kg/kg' 351 351 352 CASE ( 'rho ' )352 CASE ( 'rho_ocean' ) 353 353 IF ( .NOT. ocean ) THEN 354 354 WRITE ( message_string, * ) 'output of "', TRIM( var ), & -
palm/trunk/SOURCE/init_ocean.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho_init to rho_ocean_init 23 23 ! 24 24 ! Former revisions: … … 90 90 REAL(wp) :: sa_l !< 91 91 92 REAL(wp), DIMENSION(nzb:nzt+1) :: rho_ init !<92 REAL(wp), DIMENSION(nzb:nzt+1) :: rho_ocean_init !< 93 93 94 94 ALLOCATE( hyp(nzb:nzt+1) ) … … 105 105 106 106 hyp(nzt) = hyp(nzt+1) + rho_surface * g * 0.5_wp * dzu(nzt+1) 107 rho_ init(nzt) = rho_surface107 rho_ocean_init(nzt) = rho_surface 108 108 109 109 DO k = nzt-1, 1, -1 … … 124 124 pt_l = 0.5_wp * ( pt_init(k) + pt_init(k+1) ) 125 125 126 rho_ init(k) = eqn_state_seawater_func( hyp(k), pt_l, sa_l )126 rho_ocean_init(k) = eqn_state_seawater_func( hyp(k), pt_l, sa_l ) 127 127 128 rho_reference = rho_reference + rho_ init(k) * dzu(k+1)128 rho_reference = rho_reference + rho_ocean_init(k) * dzu(k+1) 129 129 130 130 ENDDO … … 133 133 134 134 DO k = nzt-1, 0, -1 135 hyp(k) = hyp(k+1) + g * 0.5_wp * ( rho_ init(k) + rho_init(k+1 ) ) * &135 hyp(k) = hyp(k+1) + g * 0.5_wp * ( rho_ocean_init(k) + rho_ocean_init(k+1 ) ) * & 136 136 dzu(k+1) 137 137 ENDDO … … 161 161 ! 162 162 !-- Store initial density profile 163 hom(:,1,77,:) = SPREAD( rho_ init(:), 2, statistic_regions+1 )163 hom(:,1,77,:) = SPREAD( rho_ocean_init(:), 2, statistic_regions+1 ) 164 164 165 165 ! … … 168 168 ref_state(:) = prho_reference 169 169 ELSE 170 ref_state(:) = rho_ init(:)170 ref_state(:) = rho_ocean_init(:) 171 171 ENDIF 172 172 -
palm/trunk/SOURCE/land_surface_model_mod.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 257 257 residual_moisture = 9999999.9_wp, & !< NAMELIST m_res 258 258 rho_cp, & !< rho_surface * cp 259 rho_lv, & !< rho * l_v259 rho_lv, & !< rho_ocean * l_v 260 260 rd_d_rv, & !< r_d / r_v 261 261 saturation_moisture = 9999999.9_wp, & !< NAMELIST m_sat -
palm/trunk/SOURCE/microphysics_mod.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 82 82 ! 83 83 ! 1241 2013-10-30 11:36:58Z heinze 84 ! hyp and rho have to be calculated at each time step if data from external84 ! hyp and rho_ocean have to be calculated at each time step if data from external 85 85 ! file LSF_DATA are used 86 86 ! -
palm/trunk/SOURCE/modules.f90
r2012 r2031 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! renamed variable rho to rho_ocean and rho_av to rho_ocean_av 23 23 ! 24 24 ! Former revisions: … … 473 473 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE, TARGET :: & 474 474 e, e_p, nr, nr_p, p, prho, pt, pt_p, q, q_p, qc, ql, ql_c, ql_v, & 475 ql_vp, qr, qr_p, rho , s, s_p, sa, sa_p, te_m, tnr_m, tpt_m, tq_m, &475 ql_vp, qr, qr_p, rho_ocean, s, s_p, sa, sa_p, te_m, tnr_m, tpt_m, tq_m, & 476 476 tqr_m, ts_m, tsa_m, tu_m, tv_m, tw_m, u, u_p, v, v_p, vpt, w, w_p 477 477 #else … … 484 484 REAL(wp), DIMENSION(:,:,:), POINTER :: & 485 485 e, e_p, nr, nr_p, prho, pt, pt_p, q, q_p, qc, ql, ql_c, qr, qr_p, & 486 rho , s, s_p, sa, sa_p, te_m, tnr_m, tpt_m, tq_m, tqr_m, ts_m, &486 rho_ocean, s, s_p, sa, sa_p, te_m, tnr_m, tpt_m, tq_m, tqr_m, ts_m, & 487 487 tsa_m, tu_m, tv_m, tw_m, u, u_p, v, v_p, vpt, w, w_p 488 488 #endif … … 519 519 REAL(wp), DIMENSION(:,:,:), ALLOCATABLE, TARGET :: & 520 520 e_av, lpt_av, nr_av, p_av, pc_av, pr_av, prr_av, pt_av, q_av, qc_av, & 521 ql_av, ql_c_av, ql_v_av, ql_vp_av, qr_av, qv_av, rho_ av, s_av, sa_av,&521 ql_av, ql_c_av, ql_v_av, ql_vp_av, qr_av, qv_av, rho_ocean_av, s_av, sa_av,& 522 522 u_av, v_av, vpt_av, w_av 523 523 -
palm/trunk/SOURCE/netcdf_interface_mod.f90
r2012 r2031 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 778 778 CASE ( 'e', 'lpt', 'nr', 'p', 'pc', 'pr', 'prr', 'pt', 'q', & 779 779 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv', & 780 'rho ', 's', 'sa', 'vpt' )780 'rho_ocean', 's', 'sa', 'vpt' ) 781 781 782 782 grid_x = 'x' … … 1299 1299 !-- Most variables are defined on the scalar grid 1300 1300 CASE ( 'e', 'lpt', 'nr', 'p', 'pc', 'pr', 'prr', 'pt', 'q', & 1301 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv', 'rho ', &1301 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv', 'rho_ocean', & 1302 1302 's', 'sa', 'vpt' ) 1303 1303 … … 4403 4403 !-- Most variables are defined on the zu levels 4404 4404 CASE ( 'e', 'lpt', 'nr', 'p', 'pc', 'pr', 'prr', 'pt', 'q', & 4405 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv', 'rho ',&4405 'qc', 'ql', 'ql_c', 'ql_v', 'ql_vp', 'qr', 'qv', 'rho_ocean',& 4406 4406 's', 'sa', 'u', 'v', 'vpt' ) 4407 4407 -
palm/trunk/SOURCE/production_e.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 136 136 137 137 USE arrays_3d, & 138 ONLY: ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho , shf, &138 ONLY: ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho_ocean, shf, & 139 139 tend, tswst, u, v, vpt, w 140 140 … … 537 537 tend(k,j,i) = tend(k,j,i) + & 538 538 kh(k,j,i) * g / rho_reference * & 539 ( rho (k+1,j,i) - rho(k-1,j,i) ) * &539 ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * & 540 540 dd2zu(k) 541 541 ENDDO … … 576 576 DO k = nzb_s_inner(j,i)+1, nzt 577 577 tend(k,j,i) = tend(k,j,i) + & 578 kh(k,j,i) * g / rho (k,j,i) * &579 ( rho (k+1,j,i) - rho(k-1,j,i) ) * &578 kh(k,j,i) * g / rho_ocean(k,j,i) * & 579 ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * & 580 580 dd2zu(k) 581 581 ENDDO … … 742 742 743 743 USE arrays_3d, & 744 ONLY: ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho , shf, &744 ONLY: ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho_ocean, shf, & 745 745 tend, tswst, u, v, vpt, w 746 746 … … 806 806 !-- Calculate TKE production by shear 807 807 !$acc kernels present( ddzw, dd2zu, kh, km, nzb_diff_s_inner, nzb_diff_s_outer ) & 808 !$acc present( nzb_s_inner, pt, q, ql, qsws, qswst, rho ) &808 !$acc present( nzb_s_inner, pt, q, ql, qsws, qswst, rho_ocean ) & 809 809 !$acc present( shf, tend, tswst, u, v, vpt, w, wall_e_x, wall_e_y ) & 810 810 !$acc copyin( u_0, v_0 ) … … 1166 1166 tend(k,j,i) = tend(k,j,i) + & 1167 1167 kh(k,j,i) * g / rho_reference * & 1168 ( rho (k+1,j,i) - rho(k-1,j,i) ) * &1168 ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * & 1169 1169 dd2zu(k) 1170 1170 ENDIF … … 1212 1212 IF ( k > nzb_s_inner(j,i) ) THEN 1213 1213 tend(k,j,i) = tend(k,j,i) + & 1214 kh(k,j,i) * g / rho (k,j,i) * &1215 ( rho (k+1,j,i) - rho(k-1,j,i) ) * &1214 kh(k,j,i) * g / rho_ocean(k,j,i) * & 1215 ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * & 1216 1216 dd2zu(k) 1217 1217 ENDIF … … 1410 1410 1411 1411 USE arrays_3d, & 1412 ONLY: ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho , shf, &1412 ONLY: ddzw, dd2zu, kh, km, pt, q, ql, qsws, qswst, rho_ocean, shf, & 1413 1413 tend, tswst, u, v, vpt, w 1414 1414 … … 1766 1766 tend(k,j,i) = tend(k,j,i) + & 1767 1767 kh(k,j,i) * g / rho_reference * & 1768 ( rho (k+1,j,i) - rho(k-1,j,i) ) * dd2zu(k)1768 ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * dd2zu(k) 1769 1769 ENDDO 1770 1770 … … 1797 1797 DO k = nzb_s_inner(j,i)+1, nzt 1798 1798 tend(k,j,i) = tend(k,j,i) + & 1799 kh(k,j,i) * g / rho (k,j,i) * &1800 ( rho (k+1,j,i) - rho(k-1,j,i) ) * dd2zu(k)1799 kh(k,j,i) * g / rho_ocean(k,j,i) * & 1800 ( rho_ocean(k+1,j,i) - rho_ocean(k-1,j,i) ) * dd2zu(k) 1801 1801 ENDDO 1802 1802 -
palm/trunk/SOURCE/prognostic_equations.f90
r2012 r2031 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 215 215 nr, nr_p, nrsws, nrswst, pt, ptdf_x, ptdf_y, pt_init, pt_p, & 216 216 prho, q, q_init, q_p, qsws, qswst, qr, qr_p, qrsws, qrswst, rdf,& 217 rdf_sc, ref_state, rho , s, s_init, s_p, sa, sa_init, sa_p, &217 rdf_sc, ref_state, rho_ocean, s, s_init, s_p, sa, sa_init, sa_p, & 218 218 saswsb, saswst, shf, ssws, sswst, tend, & 219 219 te_m, tnr_m, tpt_m, tq_m, tqr_m, ts_m, tsa_m, tswst, tu_m, tv_m,& … … 562 562 IF ( .NOT. neutral ) THEN 563 563 IF ( ocean ) THEN 564 CALL buoyancy( i, j, rho , 3 )564 CALL buoyancy( i, j, rho_ocean, 3 ) 565 565 ELSE 566 566 IF ( .NOT. humidity ) THEN … … 1267 1267 IF ( .NOT. neutral ) THEN 1268 1268 IF ( ocean ) THEN 1269 CALL buoyancy( rho , 3 )1269 CALL buoyancy( rho_ocean, 3 ) 1270 1270 ELSE 1271 1271 IF ( .NOT. humidity ) THEN … … 2205 2205 IF ( .NOT. neutral ) THEN 2206 2206 IF ( ocean ) THEN 2207 CALL buoyancy( rho , 3 )2207 CALL buoyancy( rho_ocean, 3 ) 2208 2208 ELSE 2209 2209 IF ( .NOT. humidity ) THEN -
palm/trunk/SOURCE/read_3d_binary.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho_av to rho_ocean_av 23 23 ! 24 24 ! Former revisions: … … 712 712 IF ( k == 1 ) READ ( 13 ) seq_random_array 713 713 714 CASE ( 'rho_ av' )715 IF ( .NOT. ALLOCATED( rho_ av ) ) THEN716 ALLOCATE( rho_ av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )717 ENDIF 718 IF ( k == 1 ) READ ( 13 ) tmp_3d 719 rho_ av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) = &714 CASE ( 'rho_ocean_av' ) 715 IF ( .NOT. ALLOCATED( rho_ocean_av ) ) THEN 716 ALLOCATE( rho_ocean_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 717 ENDIF 718 IF ( k == 1 ) READ ( 13 ) tmp_3d 719 rho_ocean_av(:,nysc-nbgp:nync+nbgp,nxlc-nbgp:nxrc+nbgp) = & 720 720 tmp_3d(:,nysf-nbgp:nynf+nbgp,nxlf-nbgp:nxrf+nbgp) 721 721 -
palm/trunk/SOURCE/sum_up_3d_data.f90
r2025 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho to rho_ocean and rho_av to rho_ocean_av 23 23 ! 24 24 ! Former revisions: … … 130 130 USE arrays_3d, & 131 131 ONLY: dzw, e, nr, ol, p, pt, precipitation_rate, q, qc, ql, ql_c, & 132 ql_v, qr, qsws, rho , s, sa, shf, ssws, ts, u, us, v, vpt, w, z0,&132 ql_v, qr, qsws, rho_ocean, s, sa, shf, ssws, ts, u, us, v, vpt, w, z0,& 133 133 z0h, z0q 134 134 … … 136 136 ONLY: e_av, lpt_av, lwp_av, nr_av, ol_av, p_av, pc_av, pr_av, prr_av, & 137 137 precipitation_rate_av, pt_av, q_av, qc_av, ql_av, ql_c_av, & 138 ql_v_av, ql_vp_av, qr_av, qsws_av, qv_av, rho_ av, s_av, sa_av, &138 ql_v_av, ql_vp_av, qr_av, qsws_av, qv_av, rho_ocean_av, s_av, sa_av, & 139 139 shf_av, ssws_av, ts_av, u_av, us_av, v_av, vpt_av, w_av, z0_av, & 140 140 z0h_av, z0q_av … … 323 323 qv_av = 0.0_wp 324 324 325 CASE ( 'rho ' )326 IF ( .NOT. ALLOCATED( rho_ av ) ) THEN327 ALLOCATE( rho_ av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )328 ENDIF 329 rho_ av = 0.0_wp325 CASE ( 'rho_ocean' ) 326 IF ( .NOT. ALLOCATED( rho_ocean_av ) ) THEN 327 ALLOCATE( rho_ocean_av(nzb:nzt+1,nysg:nyng,nxlg:nxrg) ) 328 ENDIF 329 rho_ocean_av = 0.0_wp 330 330 331 331 CASE ( 's' ) … … 657 657 ENDDO 658 658 659 CASE ( 'rho ' )660 DO i = nxlg, nxrg 661 DO j = nysg, nyng 662 DO k = nzb, nzt+1 663 rho_ av(k,j,i) = rho_av(k,j,i) + rho(k,j,i)659 CASE ( 'rho_ocean' ) 660 DO i = nxlg, nxrg 661 DO j = nysg, nyng 662 DO k = nzb, nzt+1 663 rho_ocean_av(k,j,i) = rho_ocean_av(k,j,i) + rho_ocean(k,j,i) 664 664 ENDDO 665 665 ENDDO -
palm/trunk/SOURCE/surface_coupler.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 80 80 81 81 USE arrays_3d, & 82 ONLY: pt, shf, qsws, qswst_remote, rho , sa, saswst, total_2d_a, &82 ONLY: pt, shf, qsws, qswst_remote, rho_ocean, sa, saswst, total_2d_a, & 83 83 total_2d_o, tswst, u, usws, uswst, v, vsws, vswst 84 84 … … 421 421 !-- S'w' = -S * evaporation / ( rho_water * ( 1 - S ) ) 422 422 saswst = -1.0_wp * sa(nzt,:,:) * 0.001_wp * qswst_remote / & 423 ( rho (nzt,:,:) * ( 1.0_wp - sa(nzt,:,:) * 0.001_wp ) )423 ( rho_ocean(nzt,:,:) * ( 1.0_wp - sa(nzt,:,:) * 0.001_wp ) ) 424 424 ENDIF 425 425 … … 428 428 !-- (constants are the specific heat capacities for air and water) 429 429 !-- now tswst is the ocean top heat flux 430 tswst = tswst / rho (nzt,:,:) * cp / cpw430 tswst = tswst / rho_ocean(nzt,:,:) * cp / cpw 431 431 432 432 ! 433 433 !-- Adjust the momentum fluxes with respect to ocean density 434 uswst = uswst / rho (nzt,:,:)435 vswst = vswst / rho (nzt,:,:)434 uswst = uswst / rho_ocean(nzt,:,:) 435 vswst = vswst / rho_ocean(nzt,:,:) 436 436 437 437 ENDIF -
palm/trunk/SOURCE/time_integration.f90
r2012 r2031 20 20 ! Current revisions: 21 21 ! ------------------ 22 ! 22 ! renamed variable rho to rho_ocean 23 23 ! 24 24 ! Former revisions: … … 242 242 USE arrays_3d, & 243 243 ONLY: diss, dzu, e, e_p, nr_p, prho, pt, pt_p, pt_init, q_init, q, & 244 ql, ql_c, ql_v, ql_vp, qr_p, q_p, ref_state, rho , s, s_p, sa_p, &244 ql, ql_c, ql_v, ql_vp, qr_p, q_p, ref_state, rho_ocean, s, s_p, sa_p, & 245 245 tend, u, u_p, v, vpt, v_p, w, w_p 246 246 … … 482 482 ENDIF 483 483 IF ( ocean ) THEN 484 CALL calc_mean_profile( rho , 64 )484 CALL calc_mean_profile( rho_ocean, 64 ) 485 485 ref_state(:) = hom(:,1,64,0) 486 486 ENDIF … … 552 552 IF ( ocean ) THEN 553 553 CALL exchange_horiz( sa_p, nbgp ) 554 CALL exchange_horiz( rho , nbgp )554 CALL exchange_horiz( rho_ocean, nbgp ) 555 555 CALL exchange_horiz( prho, nbgp ) 556 556 ENDIF … … 620 620 IF ( ocean ) THEN 621 621 CALL exchange_horiz( sa_p, nbgp ) 622 CALL exchange_horiz( rho , nbgp )622 CALL exchange_horiz( rho_ocean, nbgp ) 623 623 CALL exchange_horiz( prho, nbgp ) 624 624 ENDIF … … 710 710 IF ( ocean ) THEN 711 711 CALL exchange_horiz( sa_p, nbgp ) 712 CALL exchange_horiz( rho , nbgp )712 CALL exchange_horiz( rho_ocean, nbgp ) 713 713 CALL exchange_horiz( prho, nbgp ) 714 714 ENDIF -
palm/trunk/SOURCE/urban_surface_mod.f90
r2025 r2031 21 21 ! Current revisions: 22 22 ! ------------------ 23 ! 23 ! renamed variable rho to rho_ocean 24 24 ! 25 25 ! Former revisions: … … 419 419 INTEGER(iwp), PARAMETER :: icsurf = 5 !< Surface skin layer heat capacity (J mâ2 Kâ1 ) 420 420 INTEGER(iwp), PARAMETER :: ithick = 6 !< thickness of the surface (wall, roof, land) ( m ) 421 INTEGER(iwp), PARAMETER :: irhoC = 7 !< volumetric heat capacity rho *C of the material ( J mâ3 Kâ1 )421 INTEGER(iwp), PARAMETER :: irhoC = 7 !< volumetric heat capacity rho_ocean*C of the material ( J mâ3 Kâ1 ) 422 422 INTEGER(iwp), PARAMETER :: ilambdah = 8 !< thermal conductivity λH of the wall (W mâ1 Kâ1 ) 423 423 CHARACTER(12), DIMENSION(:), ALLOCATABLE :: surface_type_names !< names of wall types (used only for reports) … … 2886 2886 IF ( plant_canopy ) THEN 2887 2887 pchf_prep(:) = r_d * (hyp(nzub:nzut) / 100000.0_wp)**0.286_wp & 2888 / (cp * hyp(nzub:nzut) * dx*dy*dz) !< equals to 1 / (rho * c_p * Vbox * T)2888 / (cp * hyp(nzub:nzut) * dx*dy*dz) !< equals to 1 / (rho_ocean * c_p * Vbox * T) 2889 2889 ENDIF 2890 2890 … … 3863 3863 ENDIF 3864 3864 3865 !-- volumetric heat capacity rho *C of the wall ( J mâ3 Kâ1 )3865 !-- volumetric heat capacity rho_ocean*C of the wall ( J mâ3 Kâ1 ) 3866 3866 rho_c_wall(:,l) = surface_params(irhoC, ip) 3867 3867 … … 3930 3930 pt1 = pt(k,j,i) 3931 3931 3932 !-- calculate rho * cp coefficient at surface layer3932 !-- calculate rho_ocean * cp coefficient at surface layer 3933 3933 rho_cp = cp * hyp(k) / ( r_d * pt1 * exn(k) ) 3934 3934 -
palm/trunk/SOURCE/write_3d_binary.f90
r2001 r2031 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! renamed variable rho_av to rho_ocean_av 23 23 ! 24 24 ! Former revisions: … … 256 256 ENDIF 257 257 IF ( ocean ) THEN 258 IF ( ALLOCATED( rho_ av ) ) THEN259 WRITE ( 14 ) 'rho_ av '; WRITE ( 14 ) rho_av258 IF ( ALLOCATED( rho_ocean_av ) ) THEN 259 WRITE ( 14 ) 'rho_ocean_av '; WRITE ( 14 ) rho_ocean_av 260 260 ENDIF 261 261 WRITE ( 14 ) 'sa '; WRITE ( 14 ) sa
Note: See TracChangeset
for help on using the changeset viewer.