Changeset 2455 for LMDZ5/trunk/libf/phylmd/dyn1d
- Timestamp:
- Feb 28, 2016, 12:30:51 PM (9 years ago)
- Location:
- LMDZ5/trunk/libf/phylmd/dyn1d
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/phylmd/dyn1d/1DUTILS.h
r2347 r2455 4344 4344 ! 4345 4345 INTEGER k,i 4346 REAL zx_qs, rh, tnew, d_rh 4346 REAL zx_qs, rh, tnew, d_rh, rhnew 4347 4347 4348 4348 ! Declaration des constantes et des fonctions thermodynamiques … … 4361 4361 print *,'temp ',t 4362 4362 print *,'hum ',q 4363 ! 4363 4364 DO k = 1,klev 4364 4365 DO i = 1,klon 4365 !!IF (paprs(i,1)-pplay(i,k) .GT. 10000.) THEN4366 IF (paprs(i,1)-pplay(i,k) .GT. 10000.) THEN 4366 4367 IF (t(i,k).LT.RTT) THEN 4367 4368 zx_qs = qsats(t(i,k))/(pplay(i,k)) … … 4374 4375 d_rh = 1./tau*(rh_targ(i,k)-rh) 4375 4376 ! 4376 tnew = t(i,k)+d_t(i,k) 4377 tnew = t(i,k)+d_t(i,k)*dtime 4378 !jyg< 4379 ! Formule pour q : 4380 ! d_q = (1/tau) [rh_targ*qsat(T_new) - q] 4381 ! 4382 ! Cette formule remplace d_q = (1/tau) [rh_targ - rh] qsat(T_new) 4383 ! qui n'était pas correcte. 4384 ! 4377 4385 IF (tnew.LT.RTT) THEN 4378 4386 zx_qs = qsats(tnew)/(pplay(i,k)) … … 4380 4388 zx_qs = qsatl(tnew)/(pplay(i,k)) 4381 4389 ENDIF 4382 d_q(i,k) = d_q(i,k) + d_rh*zx_qs 4383 ! 4384 print *,' k,d_t,rh,d_rh,d_q ', & 4385 k,d_t(i,k),rh,d_rh,d_q(i,k) 4386 !! ENDIF 4390 !! d_q(i,k) = d_q(i,k) + d_rh*zx_qs 4391 d_q(i,k) = d_q(i,k) + (1./tau)*(rh_targ(i,k)*zx_qs - q(i,k)) 4392 rhnew = (q(i,k)+d_q(i,k)*dtime)/zx_qs 4393 ! 4394 print *,' k,d_t,rh,d_rh,rhnew,d_q ', & 4395 k,d_t(i,k),rh,d_rh,rhnew,d_q(i,k) 4396 ENDIF 4387 4397 ! 4388 4398 ENDDO -
LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90
r2422 r2455 932 932 ! Call physiq : 933 933 !--------------------------------------------------------------------- 934 935 934 call physiq(ngrid,llm, & 936 firstcall,lastcall,timestep, &937 plev,play,phi,phis,presnivs, &938 u,v, rot, temp,q,omega2, &939 du_phys,dv_phys,dt_phys,dq,dpsrf)940 firstcall=.false.935 firstcall,lastcall,timestep, & 936 plev,play,phi,phis,presnivs, & 937 u,v, rot, temp,q,omega2, & 938 du_phys,dv_phys,dt_phys,dq,dpsrf) 939 firstcall=.false. 941 940 942 941 !---------------------------------------------------------------------
Note: See TracChangeset
for help on using the changeset viewer.