Changeset 1403 for LMDZ4/trunk/libf/phylmd/thermcell_old.F
- Timestamp:
- Jul 1, 2010, 11:02:53 AM (14 years ago)
- Location:
- LMDZ4/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ4/trunk
- Property svn:mergeinfo changed
-
LMDZ4/trunk/libf/phylmd/thermcell_old.F
r987 r1403 112 112 character (len=10) :: str10 113 113 114 character (len=20) :: modname='thermcell2002' 115 character (len=80) :: abort_message 116 114 117 LOGICAL vtest(klon),down 115 118 … … 336 339 if(w2di.eq.2) then 337 340 entr(ig,k)=entr(ig,k)+ 338 s ptimestep*(zzz-entr(ig,k))/ float(tho)341 s ptimestep*(zzz-entr(ig,k))/REAL(tho) 339 342 else 340 343 entr(ig,k)=zzz … … 379 382 c print*,'ig,l+1,ztv(ig,l+1)' 380 383 c print*, ig,l+1,ztv(ig,l+1) 381 c stop'dans thermiques'382 384 c endif 383 385 zw2(ig,l+1)=2.*RG*(ztv(ig,l)-ztv(ig,l+1))/ztv(ig,l+1) … … 395 397 c print*,'Tv ',(ztv(ig,ll),ll=1,klev) 396 398 c print*,'Entr ',(entr(ig,ll),ll=1,klev) 397 c stop'dans thermiques'398 399 c endif 399 400 ztva(ig,l)=(fmc(ig,l)*ztva(ig,l-1)+entr(ig,l)*ztv(ig,l)) … … 517 518 do ig=1,ngrid 518 519 if(fracd(ig,l).lt.0.1) then 519 stop'fracd trop petit' 520 else 520 abort_message = 'fracd trop petit' 521 CALL abort_gcm (modname,abort_message,1) 522 else 521 523 c vitesse descendante "diagnostique" 522 524 wd(ig,l)=fm(ig,l)/(fracd(ig,l)*rhobarz(ig,l)) … … 588 590 589 591 if (w2di.eq.1) then 590 fm0=fm0+ptimestep*(fm-fm0)/ float(tho)591 entr0=entr0+ptimestep*(entr-entr0)/ float(tho)592 fm0=fm0+ptimestep*(fm-fm0)/REAL(tho) 593 entr0=entr0+ptimestep*(entr-entr0)/REAL(tho) 592 594 else 593 595 fm0=fm … … 1000 1002 character*2 str2 1001 1003 character*10 str10 1004 1005 character (len=20) :: modname='thermcell_cld' 1006 character (len=80) :: abort_message 1002 1007 1003 1008 LOGICAL vtest(klon),down … … 1855 1860 if (l.eq.klev) then 1856 1861 print*,'THERMCELL PB ig=',ig,' l=',l 1857 stop 1862 abort_message = 'THERMCELL PB' 1863 CALL abort_gcm (modname,abort_message,1) 1858 1864 endif 1859 1865 ! if ((zw2(ig,l+1).gt.1.e-10).and.(zw2(ig,l).gt.1.e-10).and. … … 2164 2170 do ig=1,ngrid 2165 2171 if(fracd(ig,l).lt.0.1.and.(test(ig).eq.1)) then 2166 stop'fracd trop petit' 2172 abort_message = 'fracd trop petit' 2173 CALL abort_gcm (modname,abort_message,1) 2167 2174 else 2168 2175 c vitesse descendante "diagnostique" … … 2262 2269 2263 2270 if (w2di.eq.1) then 2264 fm0=fm0+ptimestep*(fm-fm0)/ float(tho)2265 entr0=entr0+ptimestep*(alim+entr-entr0)/ float(tho)2271 fm0=fm0+ptimestep*(fm-fm0)/REAL(tho) 2272 entr0=entr0+ptimestep*(alim+entr-entr0)/REAL(tho) 2266 2273 else 2267 2274 fm0=fm … … 2747 2754 character*10 str10 2748 2755 2756 character (len=20) :: modname='thermcell_eau' 2757 character (len=80) :: abort_message 2758 2749 2759 LOGICAL vtest(klon),down 2750 2760 LOGICAL Zsat(klon) … … 3410 3420 do ig=1,ngrid 3411 3421 if(fracd(ig,l).lt.0.1) then 3412 stop'fracd trop petit' 3422 abort_message = 'fracd trop petit' 3423 CALL abort_gcm (modname,abort_message,1) 3413 3424 else 3414 3425 c vitesse descendante "diagnostique" … … 3481 3492 3482 3493 if (w2di.eq.1) then 3483 fm0=fm0+ptimestep*(fm-fm0)/ float(tho)3484 entr0=entr0+ptimestep*(entr-entr0)/ float(tho)3494 fm0=fm0+ptimestep*(fm-fm0)/REAL(tho) 3495 entr0=entr0+ptimestep*(entr-entr0)/REAL(tho) 3485 3496 else 3486 3497 fm0=fm … … 3848 3859 character*10 str10 3849 3860 3861 character (len=20) :: modname='thermcell' 3862 character (len=80) :: abort_message 3863 3850 3864 LOGICAL vtest(klon),down 3851 3865 … … 4394 4408 do ig=1,ngrid 4395 4409 if(fracd(ig,l).lt.0.1) then 4396 stop'fracd trop petit' 4410 abort_message = 'fracd trop petit' 4411 CALL abort_gcm (modname,abort_message,1) 4397 4412 else 4398 4413 c vitesse descendante "diagnostique" … … 4477 4492 cRC 4478 4493 if (w2di.eq.1) then 4479 fm0=fm0+ptimestep*(fm-fm0)/ float(tho)4480 entr0=entr0+ptimestep*(entr-entr0)/ float(tho)4494 fm0=fm0+ptimestep*(fm-fm0)/REAL(tho) 4495 entr0=entr0+ptimestep*(entr-entr0)/REAL(tho) 4481 4496 else 4482 4497 fm0=fm … … 5257 5272 character*10 str10 5258 5273 5274 character (len=20) :: modname='thermcell_sec' 5275 character (len=80) :: abort_message 5276 5259 5277 LOGICAL vtest(klon),down 5260 5278 … … 5822 5840 do ig=1,ngrid 5823 5841 if(fracd(ig,l).lt.0.1) then 5824 stop'fracd trop petit' 5842 abort_message = 'fracd trop petit' 5843 CALL abort_gcm (modname,abort_message,1) 5825 5844 else 5826 5845 c vitesse descendante "diagnostique" … … 5905 5924 cRC 5906 5925 if (w2di.eq.1) then 5907 fm0=fm0+ptimestep*(fm-fm0)/ float(tho)5908 entr0=entr0+ptimestep*(entr-entr0)/ float(tho)5926 fm0=fm0+ptimestep*(fm-fm0)/REAL(tho) 5927 entr0=entr0+ptimestep*(entr-entr0)/REAL(tho) 5909 5928 else 5910 5929 fm0=fm
Note: See TracChangeset
for help on using the changeset viewer.