Changeset 1520 for LMDZ5/trunk/libf/dyn3d/leapfrog.F
- Timestamp:
- May 23, 2011, 1:37:09 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/dyn3d/leapfrog.F
r1505 r1520 172 172 173 173 character*80 dynhist_file, dynhistave_file 174 character(len= 20) :: modname174 character(len=*),parameter :: modname="leapfrog" 175 175 character*80 abort_message 176 176 … … 193 193 itaufin = nday*day_step 194 194 itaufinp1 = itaufin +1 195 modname="leapfrog"196 195 197 196 … … 211 210 dq(:,:,:)=0. 212 211 CALL pression ( ip1jmp1, ap, bp, ps, p ) 213 CALL exner_hyb( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf ) 212 if (disvert_type==1) then 213 CALL exner_hyb( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf ) 214 else ! we assume that we are in the disvert_type==2 case 215 CALL exner_milieu( ip1jmp1, ps, p, beta, pks, pk, pkf ) 216 endif 214 217 215 218 c----------------------------------------------------------------------- … … 359 362 360 363 CALL pression ( ip1jmp1, ap, bp, ps, p ) 361 CALL exner_hyb( ip1jmp1, ps, p,alpha,beta,pks, pk, pkf ) 364 if (disvert_type==1) then 365 CALL exner_hyb( ip1jmp1, ps, p,alpha,beta,pks, pk, pkf ) 366 else ! we assume that we are in the disvert_type==2 case 367 CALL exner_milieu( ip1jmp1, ps, p, beta, pks, pk, pkf ) 368 endif 362 369 363 370 ! rdaym_ini = itau * dtvr / daysec … … 463 470 464 471 CALL pression ( ip1jmp1, ap, bp, ps, p ) 465 CALL exner_hyb( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf ) 472 if (disvert_type==1) then 473 CALL exner_hyb( ip1jmp1, ps, p,alpha,beta, pks, pk, pkf ) 474 else ! we assume that we are in the disvert_type==2 case 475 CALL exner_milieu( ip1jmp1, ps, p, beta, pks, pk, pkf ) 476 endif 466 477 467 478
Note: See TracChangeset
for help on using the changeset viewer.