Changeset 1529 for LMDZ5/trunk/libf/dyn3d
- Timestamp:
- May 26, 2011, 5:17:33 PM (13 years ago)
- Location:
- LMDZ5/trunk/libf/dyn3d
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/dyn3d/gcm.F
r1454 r1529 408 408 c ------------------------------- 409 409 410 IF (call_iniphys.and.(iflag_phys .eq.1)) THEN410 IF (call_iniphys.and.(iflag_phys==1.or.iflag_phys>=100)) THEN 411 411 latfi(1)=rlatu(1) 412 412 lonfi(1)=0. … … 459 459 #endif 460 460 461 #ifdef CPP_EARTH 462 ! Create start file (startphy.nc) and boundary conditions (limit.nc) 463 ! for the Earth verstion 464 if (iflag_phys>=100) then 465 call iniaqua(ngridmx,latfi,lonfi,iflag_phys) 466 endif 467 #endif 468 461 469 ! if (planet_type.eq."earth") then 462 470 ! Write an Earth-format restart file 471 463 472 CALL dynredem0("restart.nc", day_end, phis) 464 473 ! endif -
LMDZ5/trunk/libf/dyn3d/iniacademic.F90
r1520 r1529 115 115 endif 116 116 117 academic_case: if (iflag_phys == 2) then117 academic_case: if (iflag_phys >= 2) then 118 118 ! initializations 119 119 … … 208 208 IF (.NOT. read_start) THEN 209 209 ! surface pressure 210 ps(:)=preff 210 if (iflag_phys>2) then 211 ps(:)=preff 212 else 213 ps(:)=101080. 214 endif 211 215 ! ground geopotential 212 216 phis(:)=0. -
LMDZ5/trunk/libf/dyn3d/leapfrog.F
r1520 r1529 149 149 logical ok_sync 150 150 parameter (ok_sync = .true.) 151 logical physic 151 152 152 153 data callinigrads/.true./ … … 193 194 itaufin = nday*day_step 194 195 itaufinp1 = itaufin +1 195 196 197 196 itau = 0 197 physic=.true. 198 if (iflag_phys==0.or.iflag_phys==2) physic=.false. 199 198 200 c iday = day_ini+itau/day_step 199 201 c time = REAL(itau-(iday-day_ini)*day_step)/day_step+time_0 … … 281 283 s apdiss = .TRUE. 282 284 IF( MOD(itau,iphysiq ).EQ.0.AND..NOT.forward 283 s .and. iflag_phys.EQ.1) apphys = .TRUE.285 s .and. physic ) apphys = .TRUE. 284 286 ELSE 285 287 ! Leapfrog/Matsuno time stepping … … 287 289 IF( MOD(itau+1,dissip_period).EQ.0 .AND. .NOT. forward ) 288 290 s apdiss = .TRUE. 289 IF( MOD(itau+1,iphysiq).EQ.0.AND. iflag_phys.EQ.1) apphys=.TRUE.291 IF( MOD(itau+1,iphysiq).EQ.0.AND.physic ) apphys=.TRUE. 290 292 END IF 291 293
Note: See TracChangeset
for help on using the changeset viewer.