Changeset 1024
- Timestamp:
- Aug 30, 2013, 1:25:28 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 22 added
- 11 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/arch/arch-GNOMEp.fcm
r843 r1024 5 5 %FPP_FLAGS -P -traditional 6 6 %FPP_DEF NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_FFTW 7 %BASE_FFLAGS - real-size 64 -ip -mkl=parallel -fp-model precise -align common -mcmodel=large -shared-intel7 %BASE_FFLAGS -auto -real-size 64 -ip -mkl=parallel -fp-model precise -align common -mcmodel=large -shared-intel 8 8 %PROD_FFLAGS -O2 9 9 %DEV_FFLAGS -O2 -
trunk/LMDZ.COMMON/arch/arch-GNOMEp_large.fcm
r870 r1024 1 %COMPILER /opt/intel2/composer_xe_2011_sp1.6.233/bin/intel64/ifort 1 %COMPILER /opt/intel2/composer_xe_2011_sp1.6.233/bin/intel64/ifort 2 2 %LINK /opt/intel2/composer_xe_2011_sp1.6.233/bin/intel64/ifort -i_dynamic 3 3 %AR ar … … 5 5 %FPP_FLAGS -P -traditional 6 6 %FPP_DEF NC_DOUBLE BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_FFTW 7 %BASE_FFLAGS - real-size 64 -ip -mkl=parallel -fp-model precise -align common -mcmodel=large -shared-intel7 %BASE_FFLAGS -auto -real-size 64 -ip -mkl=parallel -fp-model precise -align common -mcmodel=large -shared-intel 8 8 %PROD_FFLAGS -O2 9 9 %DEV_FFLAGS -O2 -
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) -
trunk/LMDZ.COMMON/libf/dyn3dpar/conf_gcm.F
r1022 r1024 378 378 CALL getin('dissip_pupstart',dissip_pupstart ) 379 379 380 ! top_bound sponge: only active if ok_strato=.true. andiflag_top_bound!=0380 ! top_bound sponge: only active if iflag_top_bound!=0 381 381 ! iflag_top_bound=0 for no sponge 382 382 ! iflag_top_bound=1 for sponge over 4 topmost layers -
trunk/LMDZ.COMMON/libf/dyn3dpar/gcm.F
r1022 r1024 310 310 & teta,q,masse,ps,phis, time_0) 311 311 endif ! of if (planet_type.eq."mars") 312 312 313 ! Load relaxation fields (simple nudging). AS 09/2013 314 ! --------------------------------------------------- 315 if (planet_type.eq."generic") then 316 if (ok_guide) then 317 CALL relaxetat0("relax.nc") 318 endif 319 endif 320 313 321 c write(73,*) 'ucov',ucov 314 322 c write(74,*) 'vcov',vcov -
trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F
r1022 r1024 28 28 use cpdet_mod, only: cpdet,tpot2t_glo_p,t2tpot_glo_p 29 29 use sponge_mod_p, only: callsponge,mode_sponge,sponge_p 30 use comuforc_h 30 31 31 32 #ifdef CPP_XIOS … … 33 34 USE wxios 34 35 #endif 36 35 37 IMPLICIT NONE 36 38 … … 315 317 316 318 #ifdef CPP_IOIPSL 319 IF (planet_type.eq."earth") THEN 317 320 if (ok_guide) then 318 321 !$OMP MASTER … … 321 324 !$OMP BARRIER 322 325 endif 326 ENDIF 323 327 #endif 324 328 … … 437 441 apdiss=.false. 438 442 endif 443 444 #ifdef NODYN 445 apdiss=.false. 446 #endif 447 439 448 440 449 cym ---> Pour le moment … … 662 671 rdaym_ini = itau * dtvr / daysec 663 672 673 #ifdef NODYN 674 WRITE(lunout,*)"NO DYN !!!!!" 675 dv(:,:) = 0.D+0 676 du(:,:) = 0.D+0 677 dteta(:,:) = 0.D+0 678 dq(:,:,:) = 0.D+0 679 dp(:) = 0.D+0 680 #else 664 681 ! ADAPTATION GCM POUR CP(T) 665 682 ! CALL caldyn_p … … 690 707 cc$OMP END MASTER 691 708 709 710 ! Simple zonal wind nudging for generic planetary model 711 ! AS 09/2013 712 ! --------------------------------------------------- 713 if (planet_type.eq."generic") then 714 if (ok_guide) then 715 du(:,:) = du(:,:) + ((uforc(:,:)-ucov(:,:)) / facwind) 716 endif 717 endif 718 692 719 c----------------------------------------------------------------------- 693 720 c calcul des tendances advection des traceurs (dont l'humidite) … … 766 793 cc$OMP END MASTER 767 794 795 ! NODYN precompiling flag 796 #endif 768 797 769 798 c$OMP MASTER -
trunk/LMDZ.UNIVERSAL/README.aymeric
r992 r1024 1 2 3 gnome 4 tests 5 makelmdz_fcm -d 128x96x64 -b 17x23 -arch GNOMEp -parallel mpi -p generic gcm 6 makelmdz_fcm -d 256x192x64 -b 17x23 -arch GNOMEp_large -parallel mpi -p generic gcm 7 1 8 2 9 ***** en parallele dans LMDZ.UNIVERSAL -
trunk/LMDZ.UNIVERSAL/deftank/PROTO_saturn_strato/diagfi.def
r992 r1024 5 5 u 6 6 v 7 p 7 8 ISR 8 9 ASR -
trunk/LMDZ.UNIVERSAL/deftank/PROTO_saturn_tropostrato/run.def
r996 r1024 238 238 239 239 ###################### SPONGE LAYER IN OLD DYNAMICS 240 ###################### -- this is ignored by LMDZ5 241 # Avec sponge layer242 callsponge = .true.243 # Sponge: mode0(u=v=0), mode1(u=umoy,v=0), mode2(u=umoy,v=vmoy)244 mode_sponge= 2245 # Sponge: hauteur de sponge (km)246 hsponge= 50247 # Sponge: tetasponge (secondes)248 tetasponge = 50000249 ###################### 240 ###################### -- this is ignored by LMDZ5 !!! NO LONGER !!! 241 ## Avec sponge layer 242 # callsponge = .true. 243 ## Sponge: mode0(u=v=0), mode1(u=umoy,v=0), mode2(u=umoy,v=vmoy) 244 # mode_sponge= 2 245 ## Sponge: hauteur de sponge (km) 246 # hsponge= 50 247 ## Sponge: tetasponge (secondes) 248 # tetasponge = 50000 249 ####################### 250 250 251 251 # some definitions for the physics, in file 'callphys.def' -
trunk/LMDZ.UNIVERSAL/deftank/launch.gnome
r975 r1024 1 1 ####################################################################### 2 2 ####################################################################### nom 3 # @ job_name = LMDZ_ GENERIC3 # @ job_name = LMDZ_UNIVERSAL 4 4 ####################################################################### MPICH / serial 5 5 # @ job_type = MPICH 6 6 ####################################################################### 8 / 16 / 20 / 32 / 64 7 # @ total_tasks = 648 ####################################################################### A / B / C / AP / BP / CP 9 # @ class = BP7 # @ total_tasks = 16 8 ####################################################################### A / B / C / AP / BP / CP / PP 9 # @ class = PP 10 10 ####################################################################### 24gb (cf. llps pendant fonctionnement) 11 11 # @ resources = ConsumableCpus(1)ConsumableMemory(3000mb)
Note: See TracChangeset
for help on using the changeset viewer.