Changeset 1529 for LMDZ5/trunk
- Timestamp:
- May 26, 2011, 5:17:33 PM (14 years ago)
- Location:
- LMDZ5/trunk/libf
- Files:
-
- 1 added
- 4 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 -
LMDZ5/trunk/libf/phylmd/physiq.F
r1527 r1529 1881 1881 & write(lunout,*)'Longitude solaire ',zlongi,solarlong0,dist 1882 1882 1883 1884 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 1885 ! Calcul de l'ensoleillement : 1886 ! ============================ 1887 ! Pour une solarlong0=1000., on calcule un ensoleillement moyen sur 1888 ! l'annee a partir d'une formule analytique. 1889 ! Cet ensoleillement est symmétrique autour de l'équateur et 1890 ! non nul aux poles. 1891 IF (abs(solarlong0-1000.)<1.e-4) then 1892 call zenang_an(cycle_diurne,jH_cur,rlat,rlon,rmu0,fract) 1893 ELSE 1883 1894 ! Avec ou sans cycle diurne 1884 IF (cycle_diurne) THEN 1885 zdtime=dtime*REAL(radpas) ! pas de temps du rayonnement (s) 1886 CALL zenang(zlongi,jH_cur,zdtime,rlat,rlon,rmu0,fract) 1887 ELSE 1888 CALL angle(zlongi, rlat, fract, rmu0) 1895 IF (cycle_diurne) THEN 1896 zdtime=dtime*REAL(radpas) ! pas de temps du rayonnement (s) 1897 CALL zenang(zlongi,jH_cur,zdtime,rlat,rlon,rmu0,fract) 1898 ELSE 1899 CALL angle(zlongi, rlat, fract, rmu0) 1900 ENDIF 1889 1901 ENDIF 1890 1902
Note: See TracChangeset
for help on using the changeset viewer.