Changeset 165 for trunk/LMDZ.MARS/libf
- Timestamp:
- Jun 17, 2011, 3:08:24 PM (13 years ago)
- Location:
- trunk/LMDZ.MARS/libf/phymars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.MARS/libf/phymars/calltherm_interface.F90
r161 r165 103 103 104 104 pq_therm(:,:,:)=0. 105 qtransport_thermals=.true. 105 106 call getin("qtransport_thermals",qtransport_thermals) 106 107 if(qtransport_thermals) then … … 119 120 buoyancyEst(:,:)=0. 120 121 122 dtke_thermals=.false. 121 123 call getin("dtke_thermals",dtke_thermals) 122 124 if(dtke_thermals) then -
trunk/LMDZ.MARS/libf/phymars/thermcell.F90
r161 r165 72 72 ! iflag_clos : USELESS ? [useless ?] 73 73 ! iflag_wake : USELESS ? [useless ?] 74 PARAMETER (r_aspect_thermals = 3.)74 PARAMETER (r_aspect_thermals = 1.5) 75 75 PARAMETER (l_mix_thermals = 30.) 76 76 PARAMETER (w2di_thermals = 1) -
trunk/LMDZ.MARS/libf/phymars/thermcell_main_mars.F90
r161 r165 324 324 alim_star(ig,1)=MAX((ztv(ig,1)-ztv(ig,2)),0.) & 325 325 & *sqrt(zlev(ig,2)) 326 ! & *zlev(ig,2) 326 327 lalim(ig)=2 327 328 alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,1) … … 334 335 alim_star(ig,l)=MAX((ztv(ig,l)-ztv(ig,l+1)),0.) & 335 336 & *sqrt(zlev(ig,l+1)) 337 ! & *zlev(ig,2) 336 338 lalim(ig)=l+1 337 339 alim_star_tot(ig)=alim_star_tot(ig)+alim_star(ig,l) … … 348 350 349 351 alim_star_tot(:)=1. 352 if(alim_star(1,1) .ne. 0.) then 353 print*, alim_star(:,:) 354 endif 350 355 351 356 !------------------------------------------------------------------------------ … … 403 408 if(active(ig)) then 404 409 405 if(l .lt. lalim(ig)) then406 ztva_est(ig,l)=(f_star(ig,l)*ztla(ig,l-1)+ &407 & alim_star(ig,l)*ztv(ig,l)) &408 & /(f_star(ig,l)+alim_star(ig,l))409 else410 ! if(l .lt. lalim(ig)) then 411 ! ztva_est(ig,l)=(f_star(ig,l)*ztla(ig,l-1)+ & 412 ! & alim_star(ig,l)*ztv(ig,l)) & 413 ! & /(f_star(ig,l)+alim_star(ig,l)) 414 ! else 410 415 ztva_est(ig,l)=ztla(ig,l-1) 411 endif416 ! endif 412 417 413 418 zdz=zlev(ig,l+1)-zlev(ig,l) … … 566 571 enddo 567 572 573 do l=1,nlay 574 do ig=1,ngrid 575 if (alim_star_tot(ig) > 1.e-10 ) then 576 alim_star(ig,l)=alim_star(ig,l)/alim_star_tot(ig) 577 endif 578 enddo 579 enddo 568 580 569 581 ! =========================================================================== … … 1154 1166 & fm(ig,k)*ztv(ig,k)+fm(ig,k)*ztva(ig,k)-fm(ig,k+1)*ztva(ig,k+1)) 1155 1167 if (ztv(ig,k) + ptimestep*zdthladj(ig,k) .le. 0.) then 1156 print*,'q<0 in thermcell_dTeta up: qenv .. dq : ', ztv(ig,k),ptimestep*zdthladj(ig,k) 1168 print*,'Teta<0 in thermcell_dTeta up: qenv .. dq : ', ztv(ig,k),ptimestep*zdthladj(ig,k) 1169 if(ztv(ig,k) .gt. 0.) then 1170 zdthladj(ig,k)=0. 1171 endif 1157 1172 endif 1158 1173 enddo … … 1211 1226 if (ztv(ig,k) + ptimestep*zdthladj_down(ig,k) .le. 0.) then 1212 1227 print*,'q<0 in thermcell_dTeta down: qenv .. dq : ', ztv(ig,k),ptimestep*zdthladj_down(ig,k) 1228 if(ztv(ig,k) .gt. 0.) then 1229 zdthladj(ig,k)=0. 1230 endif 1213 1231 endif 1214 1232 enddo
Note: See TracChangeset
for help on using the changeset viewer.