Changeset 1024 for trunk/LMDZ.COMMON/libf/dyn3d
- Timestamp:
- Aug 30, 2013, 1:25:28 PM (11 years ago)
- Location:
- trunk/LMDZ.COMMON/libf/dyn3d
- Files:
-
- 2 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F
r1022 r1024 351 351 CALL getin('dissip_pupstart',dissip_pupstart ) 352 352 353 ! top_bound sponge: only active if ok_strato=.true. andiflag_top_bound!=0353 ! top_bound sponge: only active if iflag_top_bound!=0 354 354 ! iflag_top_bound=0 for no sponge 355 355 ! iflag_top_bound=1 for sponge over 4 topmost layers -
trunk/LMDZ.COMMON/libf/dyn3d/gcm.F
r1022 r1024 288 288 & teta,q,masse,ps,phis, time_0) 289 289 endif ! of if (planet_type.eq."mars") 290 290 291 ! Load relaxation fields (simple nudging). AS 09/2013 292 ! --------------------------------------------------- 293 if (planet_type.eq."generic") then 294 if (ok_guide) then 295 CALL relaxetat0("relax.nc") 296 endif 297 endif 298 291 299 c write(73,*) 'ucov',ucov 292 300 c write(74,*) 'vcov',vcov -
trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F
r1022 r1024 22 22 use cpdet_mod, only: cpdet,tpot2t,t2tpot 23 23 use sponge_mod, only: callsponge,mode_sponge,sponge 24 use comuforc_h 25 24 26 IMPLICIT NONE 25 27 … … 295 297 296 298 #ifdef CPP_IOIPSL 299 IF (planet_type.eq."earth") THEN 297 300 if (ok_guide) then 298 301 call guide_main(itau,ucov,vcov,teta,q,masse,ps) 299 302 endif 303 ENDIF 300 304 #endif 301 305 … … 363 367 endif 364 368 369 #ifdef NODYN 370 apdiss=.false. 371 #endif 372 365 373 c----------------------------------------------------------------------- 366 374 c calcul des tendances dynamiques: … … 376 384 377 385 time = jD_cur + jH_cur 386 387 #ifdef NODYN 388 WRITE(lunout,*)"NO DYN !!!!!" 389 dv(:,:) = 0.D+0 390 du(:,:) = 0.D+0 391 dteta(:,:) = 0.D+0 392 dq(:,:,:) = 0.D+0 393 dp(:) = 0.D+0 394 #else 378 395 CALL caldyn 379 396 $ ( itau,ucov,vcov,teta,ps,masse,pk,pkf,tsurpk,phis , 380 397 $ phi,conser,du,dv,dteta,dp,w, pbaru,pbarv, time ) 381 398 399 ! Simple zonal wind nudging for generic planetary model 400 ! AS 09/2013 401 ! --------------------------------------------------- 402 if (planet_type.eq."generic") then 403 if (ok_guide) then 404 du(:,:) = du(:,:) + ((uforc(:,:)-ucov(:,:)) / facwind) 405 endif 406 endif 382 407 383 408 c----------------------------------------------------------------------- … … 426 451 vcov=vcov+dvtidal*dt 427 452 ENDIF 453 454 ! NODYN precompiling flag 455 #endif 428 456 429 457 c .P.Le Van (26/04/94 ajout de finvpold dans l'appel d'integrd)
Note: See TracChangeset
for help on using the changeset viewer.