# Changeset 996

Ignore:
Timestamp:
Sep 7, 2012 10:41:47 AM (10 years ago)
Message:

parameter use_prior_plot1d_parameters removed; little reformatting

Location:
palm/trunk/SOURCE
Files:
9 edited

Unmodified
Removed
• ## palm/trunk/SOURCE/boundary_conds.f90

 r979 ! Current revisions: ! ----------------- ! ! little reformatting ! ! Former revisions: ! !--       Calculate the phase speeds for u,v, and w, first local and then !--       average parallel along the outflow boundary. DO k = nzb+1, nzt+1 DO i = nxl, nxr !--       Calculate the phase speeds for u, v, and w, first local and then !--       average along the outflow boundary. DO  k = nzb+1, nzt+1 DO  i = nxl, nxr denom = u_m_s(k,0,i) - u_m_s(k,1,i) IF ( denom /= 0.0 )  THEN c_u(k,i) = -c_max * ( u(k,0,i) - u_m_s(k,0,i) )             & / ( denom * tsc(2) ) c_u(k,i) = -c_max * ( u(k,0,i) - u_m_s(k,0,i) ) / ( denom * tsc(2) ) IF ( c_u(k,i) < 0.0 )  THEN c_u(k,i) = 0.0 IF ( denom /= 0.0 )  THEN c_v(k,i) = -c_max * ( v(k,1,i) - v_m_s(k,1,i) )             & / ( denom * tsc(2) ) c_v(k,i) = -c_max * ( v(k,1,i) - v_m_s(k,1,i) ) / ( denom * tsc(2) ) IF ( c_v(k,i) < 0.0 )  THEN c_v(k,i) = 0.0 IF ( denom /= 0.0 )  THEN c_w(k,i) = -c_max * ( w(k,0,i) - w_m_s(k,0,i) )             & / ( denom * tsc(2) ) c_w(k,i) = -c_max * ( w(k,0,i) - w_m_s(k,0,i) ) / ( denom * tsc(2) ) IF ( c_w(k,i) < 0.0 )  THEN c_w(k,i) = 0.0 ! !--       Calculate the new velocities DO k = nzb+1, nzt+1 DO i = nxlg, nxrg DO  k = nzb+1, nzt+1 DO  i = nxlg, nxrg u_p(k,-1,i) = u(k,-1,i) - dt_3d * tsc(2) * c_u_m(k) *          & ( u(k,-1,i) - u(k,0,i) ) * ddy ! !--       Calculate the phase speeds for u,v, and w, first local and then !--       average parallel along the outflow boundary. DO k = nzb+1, nzt+1 DO i = nxl, nxr !--       Calculate the phase speeds for u, v, and w, first local and then !--       average along the outflow boundary. DO  k = nzb+1, nzt+1 DO  i = nxl, nxr denom = u_m_n(k,ny,i) - u_m_n(k,ny-1,i) IF ( denom /= 0.0 )  THEN c_u(k,i) = -c_max * ( u(k,ny,i) - u_m_n(k,ny,i) )           & / ( denom * tsc(2) ) c_u(k,i) = -c_max * ( u(k,ny,i) - u_m_n(k,ny,i) ) / ( denom * tsc(2) ) IF ( c_u(k,i) < 0.0 )  THEN c_u(k,i) = 0.0 IF ( denom /= 0.0 )  THEN c_v(k,i) = -c_max * ( v(k,ny,i) - v_m_n(k,ny,i) )           & / ( denom * tsc(2) ) c_v(k,i) = -c_max * ( v(k,ny,i) - v_m_n(k,ny,i) ) / ( denom * tsc(2) ) IF ( c_v(k,i) < 0.0 )  THEN c_v(k,i) = 0.0 IF ( denom /= 0.0 )  THEN c_w(k,i) = -c_max * ( w(k,ny,i) - w_m_n(k,ny,i) )           & / ( denom * tsc(2) ) c_w(k,i) = -c_max * ( w(k,ny,i) - w_m_n(k,ny,i) ) / ( denom * tsc(2) ) IF ( c_w(k,i) < 0.0 )  THEN c_w(k,i) = 0.0 ! !--       Calculate the new velocities DO k = nzb+1, nzt+1 DO i = nxlg, nxrg DO  k = nzb+1, nzt+1 DO  i = nxlg, nxrg u_p(k,ny+1,i) = u(k,ny+1,i) - dt_3d * tsc(2) * c_u_m(k) *      & ( u(k,ny+1,i) - u(k,ny,i) ) * ddy ! !--       Calculate the phase speeds for u,v, and w, first local and then !--       average parallel along the outflow boundary. DO k = nzb+1, nzt+1 DO j = nys, nyn !--       Calculate the phase speeds for u, v, and w, first local and then !--       average along the outflow boundary. DO  k = nzb+1, nzt+1 DO  j = nys, nyn denom = u_m_l(k,j,1) - u_m_l(k,j,2) IF ( denom /= 0.0 )  THEN c_u(k,j) = -c_max * ( u(k,j,1) - u_m_l(k,j,1) )             & / ( denom * tsc(2) ) c_u(k,j) = -c_max * ( u(k,j,1) - u_m_l(k,j,1) ) / ( denom * tsc(2) ) IF ( c_u(k,j) < 0.0 )  THEN c_u(k,j) = 0.0 IF ( denom /= 0.0 )  THEN c_v(k,j) = -c_max * ( v(k,j,0) - v_m_l(k,j,0) )             & / ( denom * tsc(2) ) c_v(k,j) = -c_max * ( v(k,j,0) - v_m_l(k,j,0) ) / ( denom * tsc(2) ) IF ( c_v(k,j) < 0.0 )  THEN c_v(k,j) = 0.0 IF ( denom /= 0.0 )  THEN c_w(k,j) = -c_max * ( w(k,j,0) - w_m_l(k,j,0) )             & / ( denom * tsc(2) ) c_w(k,j) = -c_max * ( w(k,j,0) - w_m_l(k,j,0) ) / ( denom * tsc(2) ) IF ( c_w(k,j) < 0.0 )  THEN c_w(k,j) = 0.0 ! !--       Calculate the new velocities DO k = nzb+1, nzt+1 DO i = nxlg, nxrg DO  k = nzb+1, nzt+1 DO  i = nxlg, nxrg u_p(k,j,0) = u(k,j,0) - dt_3d * tsc(2) * c_u_m(k) *            & ( u(k,j,0) - u(k,j,1) ) * ddx ! !--       Calculate the phase speeds for u,v, and w, first local and then !--       average parallel along the outflow boundary. DO k = nzb+1, nzt+1 DO j = nys, nyn !--       Calculate the phase speeds for u, v, and w, first local and then !--       average along the outflow boundary. DO  k = nzb+1, nzt+1 DO  j = nys, nyn denom = u_m_r(k,j,nx) - u_m_r(k,j,nx-1) IF ( denom /= 0.0 )  THEN c_u(k,j) = -c_max * ( u(k,j,nx) - u_m_r(k,j,nx) )           & / ( denom * tsc(2) ) c_u(k,j) = -c_max * ( u(k,j,nx) - u_m_r(k,j,nx) ) / ( denom * tsc(2) ) IF ( c_u(k,j) < 0.0 )  THEN c_u(k,j) = 0.0 IF ( denom /= 0.0 )  THEN c_v(k,j) = -c_max * ( v(k,j,nx) - v_m_r(k,j,nx) )           & / ( denom * tsc(2) ) c_v(k,j) = -c_max * ( v(k,j,nx) - v_m_r(k,j,nx) ) / ( denom * tsc(2) ) IF ( c_v(k,j) < 0.0 )  THEN c_v(k,j) = 0.0 IF ( denom /= 0.0 )  THEN c_w(k,j) = -c_max * ( w(k,j,nx) - w_m_r(k,j,nx) )           & / ( denom * tsc(2) ) c_w(k,j) = -c_max * ( w(k,j,nx) - w_m_r(k,j,nx) ) / ( denom * tsc(2) ) IF ( c_w(k,j) < 0.0 )  THEN c_w(k,j) = 0.0 ! !--       Calculate the new velocities DO k = nzb+1, nzt+1 DO i = nxlg, nxrg DO  k = nzb+1, nzt+1 DO  i = nxlg, nxrg u_p(k,j,nx+1) = u(k,j,nx+1) - dt_3d * tsc(2) * c_u_m(k) *      & ( u(k,j,nx+1) - u(k,j,nx) ) * ddx
• ## palm/trunk/SOURCE/check_parameters.f90

 r979 ! Current revisions: ! ----------------- ! ! little reformatting ! ! Former revisions: IF ( TRIM( var ) == 'u*'     )  unit = 'm/s' IF ( TRIM( var ) == 'z0*'    )  unit = 'm' IF ( TRIM( var ) == 'z0h*'    )  unit = 'm' IF ( TRIM( var ) == 'z0h*'   )  unit = 'm' !-- potential temperature, check the width of the damping layer IF ( bc_lr /= 'cyclic' ) THEN IF ( pt_damping_width < 0.0 .OR. pt_damping_width > REAL( nx * dx ) )  THEN IF ( pt_damping_width < 0.0  .OR. pt_damping_width > REAL( nx * dx ) )  THEN message_string = 'pt_damping_width out of range' CALL message( 'check_parameters', 'PA0124', 1, 2, 0, 6, 0 ) IF ( bc_ns /= 'cyclic' )  THEN IF ( pt_damping_width < 0.0 .OR. pt_damping_width > REAL( ny * dy ) )  THEN IF ( pt_damping_width < 0.0  .OR. pt_damping_width > REAL( ny * dy ) )  THEN message_string = 'pt_damping_width out of range' CALL message( 'check_parameters', 'PA0124', 1, 2, 0, 6, 0 )
• ## palm/trunk/SOURCE/init_1d_model.f90

 r979 ! Current revisions: ! ----------------- ! ! little reformatting ! ! Former revisions: usws1d = 0.0; usws1d_m = 0.0 vsws1d = 0.0; vsws1d_m = 0.0 z01d = roughness_length z01d  = roughness_length z0h1d = z0h_factor * z01d IF ( humidity .OR. passive_scalar )  qs1d = 0.0 ! !--                Stable stratification ts1d = kappa * ( pt_init(nzb+1) - pt_init(nzb) ) /      & ts1d = kappa * ( pt_init(nzb+1) - pt_init(nzb) ) /       & ( LOG( zu(nzb+1) / z0h1d ) + 5.0 * rif1d(nzb+1) * & ( zu(nzb+1) - z0h1d ) / zu(nzb+1) & !--                occur in the argument of the logarithm. IF ( a == 0.0  .OR.  b == 0.0 )  THEN ts1d = kappa * ( pt_init(nzb+1) - pt_init(nzb) ) /      & ts1d = kappa * ( pt_init(nzb+1) - pt_init(nzb) ) /       & ( LOG( zu(nzb+1) / z0h1d ) + 5.0 * rif1d(nzb+1) * & ( zu(nzb+1) - z0h1d ) / zu(nzb+1) & ! !--                Stable stratification qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /        & qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /         & ( LOG( zu(nzb+1) / z0h1d ) + 5.0 * rif1d(nzb+1) * & ( zu(nzb+1) - z0h1d ) / zu(nzb+1) & !--                occur in the argument of the logarithm. IF ( a == 1.0  .OR.  b == 1.0 )  THEN qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /        & qs1d = kappa * ( q_init(nzb+1) - q_init(nzb) ) /         & ( LOG( zu(nzb+1) / z0h1d ) + 5.0 * rif1d(nzb+1) * & ( zu(nzb+1) - z0h1d ) / zu(nzb+1) &

• ## palm/trunk/SOURCE/init_grid.f90

 r979 ! Current revisions: ! ----------------- ! ! little reformatting ! ! Former revisions: !-- steering the degradation of order of the applied advection scheme. !-- In case of non-cyclic lateral boundaries, the order of the advection !-- scheme is reduced at the lateral boundaries up to nzt. !-- scheme have to be reduced up to nzt (required at the lateral boundaries). nzb_max = MAXVAL( nzb_local ) IF ( inflow_l .OR. outflow_l .OR. inflow_r .OR. outflow_r .OR.    &