Changeset 1707 for LMDZ5/branches/testing/libf/dyn3dpar/gcm.F
- Timestamp:
- Jan 11, 2013, 10:19:19 AM (11 years ago)
- Location:
- LMDZ5/branches/testing
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/branches/testing
- Property svn:mergeinfo changed
/LMDZ5/trunk merged: 1670-1692,1694-1703,1705-1706
- Property svn:mergeinfo changed
-
LMDZ5/branches/testing/libf/dyn3dpar/gcm.F
r1665 r1707 418 418 419 419 CALL inidissip( lstardis, nitergdiv, nitergrot, niterh , 420 * tetagdiv, tetagrot , tetatemp 420 * tetagdiv, tetagrot , tetatemp, vert_prof_dissip) 421 421 422 422 c----------------------------------------------------------------------- 423 423 c Initialisation de la physique : 424 424 c ------------------------------- 425 IF (call_iniphys.and. iflag_phys.eq.1) THEN425 IF (call_iniphys.and.(iflag_phys==1.or.iflag_phys>=100)) THEN 426 426 latfi(1)=rlatu(1) 427 427 lonfi(1)=0. … … 446 446 ! Physics: 447 447 #ifdef CPP_PHYS 448 CALL iniphysiq(ngridmx,llm,daysec,day_ini,dtphys/nsplit_phys , 449 , latfi,lonfi,airefi,zcufi,zcvfi,rad,g,r,cpp ) 448 CALL iniphysiq(ngridmx,llm,daysec,day_ini,dtphys/nsplit_phys, 449 & latfi,lonfi,airefi,zcufi,zcvfi,rad,g,r,cpp, 450 & iflag_phys) 450 451 #endif 451 452 call_iniphys=.false. 452 ENDIF ! of IF (call_iniphys.and.(iflag_phys .eq.1))453 ENDIF ! of IF (call_iniphys.and.(iflag_phys==1.or.iflag_phys>=100)) 453 454 454 455 … … 481 482 301 FORMAT('1'/,15x,'run du ', i2,'/',i2,'/',i4) 482 483 302 FORMAT('1'/,15x,' au ', i2,'/',i2,'/',i4) 483 #endif484 485 #ifdef CPP_PHYS486 ! Create start file (startphy.nc) and boundary conditions (limit.nc)487 ! for the Earth verstion488 if (iflag_phys>=100) then489 call iniaqua(ngridmx,latfi,lonfi,iflag_phys)490 endif491 484 #endif 492 485
Note: See TracChangeset
for help on using the changeset viewer.