Changeset 1577 for LMDZ5/trunk/libf/dyn3d
- Timestamp:
- Oct 20, 2011, 5:06:47 PM (13 years ago)
- Location:
- LMDZ5/trunk/libf/dyn3d
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ5/trunk/libf/dyn3d/conf_gcm.F
r1563 r1577 155 155 nday = 10 156 156 CALL getin('nday',nday) 157 158 !Config Key = starttime 159 !Config Desc = Heure de depart de la simulation 160 !Config Def = 0 161 !Config Help = Heure de depart de la simulation 162 !Config en jour 163 starttime = 0 164 CALL getin('starttime',starttime) 157 165 158 166 !Config Key = day_step -
LMDZ5/trunk/libf/dyn3d/control_mod.F90
r1502 r1577 10 10 IMPLICIT NONE 11 11 12 REAL :: periodav 12 REAL :: periodav, starttime 13 13 INTEGER :: nday,day_step,iperiod,iapp_tracvl,nsplit_phys 14 14 INTEGER :: iconser,iecri,dissip_period,iphysiq,iecrimoy -
LMDZ5/trunk/libf/dyn3d/dynetat0.F
r1421 r1577 119 119 day_ini = tab_cntrl(30) 120 120 itau_dyn = tab_cntrl(31) 121 start_time = tab_cntrl(32) 121 122 c ................................................................. 122 123 c -
LMDZ5/trunk/libf/dyn3d/dynredem.F
r1563 r1577 120 120 tab_cntrl(30) = REAL(iday_end) 121 121 tab_cntrl(31) = REAL(itau_dyn + itaufin) 122 c start_time: start_time of simulation (not necessarily 0.) 123 tab_cntrl(32) = start_time 122 124 c 123 125 c ......................................................... -
LMDZ5/trunk/libf/dyn3d/gcm.F
r1563 r1577 305 305 C on remet le calendrier à zero si demande 306 306 c 307 IF (start_time /= starttime) then 308 WRITE(lunout,*)' GCM: Attention l''heure de depart lue dans le' 309 &,' fichier restart ne correspond pas à celle lue dans le run.def' 310 IF (raz_date == 1) then 311 WRITE(lunout,*)'Je prends l''heure lue dans run.def' 312 start_time = starttime 313 ELSE 314 WRITE(lunout,*)'Je m''arrete' 315 CALL abort 316 ENDIF 317 ENDIF 307 318 IF (raz_date == 1) THEN 308 319 annee_ref = anneeref -
LMDZ5/trunk/libf/dyn3d/leapfrog.F
r1529 r1577 224 224 1 CONTINUE 225 225 226 jD_cur = jD_ref + day_ini - day_ref + int (itau * dtvr / daysec) 227 jH_cur = jH_ref + & 226 jD_cur = jD_ref + day_ini - day_ref + & 227 & int (itau * dtvr / daysec) 228 jH_cur = jH_ref + start_time + & 228 229 & (itau * dtvr / daysec - int(itau * dtvr / daysec)) 230 jD_cur = jD_cur + int(jH_cur) 231 jH_cur = jH_cur - int(jH_cur) 229 232 230 233 … … 372 375 ! rdaym_ini = itau * dtvr / daysec 373 376 ! rdayvrai = rdaym_ini + day_ini 374 jD_cur = jD_ref + day_ini - day_ref 375 $ + int (itau * dtvr / daysec) 376 jH_cur = jH_ref + & 377 & (itau * dtvr / daysec - int(itau * dtvr / daysec)) 377 ! jD_cur = jD_ref + day_ini - day_ref 378 ! $ + int (itau * dtvr / daysec) 379 ! jH_cur = jH_ref + & 380 ! & (itau * dtvr / daysec - int(itau * dtvr / daysec)) 381 jD_cur = jD_ref + day_ini - day_ref + & 382 & int (itau * dtvr / daysec) 383 jH_cur = jH_ref + start_time + & 384 & (itau * dtvr / daysec - int(itau * dtvr / daysec)) 385 jD_cur = jD_cur + int(jH_cur) 386 jH_cur = jH_cur - int(jH_cur) 378 387 ! write(lunout,*)'itau, jD_cur = ', itau, jD_cur, jH_cur 379 388 ! call ju2ymds(jD_cur+jH_cur, an, mois, jour, secondes) … … 652 661 ! if (planet_type.eq."earth") then 653 662 ! Write an Earth-format restart file 654 CALL dynredem1("restart.nc", 0.0,663 CALL dynredem1("restart.nc",start_time, 655 664 & vcov,ucov,teta,q,masse,ps) 656 665 ! endif ! of if (planet_type.eq."earth") … … 763 772 IF(itau.EQ.itaufin) THEN 764 773 ! if (planet_type.eq."earth") then 765 CALL dynredem1("restart.nc", 0.0,774 CALL dynredem1("restart.nc",start_time, 766 775 & vcov,ucov,teta,q,masse,ps) 767 776 ! endif ! of if (planet_type.eq."earth") -
LMDZ5/trunk/libf/dyn3d/temps.h
r1279 r1577 14 14 15 15 COMMON/temps/itaufin, dt, day_ini, day_end, annee_ref, day_ref, & 16 & itau_dyn, itau_phy, jD_ref, jH_ref, calend 16 & itau_dyn, itau_phy, jD_ref, jH_ref, calend, & 17 & start_time 18 17 19 18 20 INTEGER itaufin 19 21 INTEGER itau_dyn, itau_phy 20 22 INTEGER day_ini, day_end, annee_ref, day_ref 21 REAL dt, jD_ref, jH_ref 23 REAL dt, jD_ref, jH_ref, start_time 22 24 CHARACTER (len=10) :: calend 23 25
Note: See TracChangeset
for help on using the changeset viewer.