Changeset 5267 for LMDZ6/trunk
- Timestamp:
- Oct 23, 2024, 5:34:46 PM (2 months ago)
- Location:
- LMDZ6/trunk/libf
- Files:
-
- 3 deleted
- 57 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/trunk/libf/dyn3d/abort_gcm.F90
r5246 r5267 6 6 SUBROUTINE abort_gcm(modname, message, ierr) 7 7 8 #ifdef CPP_IOIPSL9 8 USE IOIPSL 10 #else11 ! if not using IOIPSL, we still need to use (a local version of) getin_dump12 USE ioipsl_getincom13 #endif14 9 !! ug Pour les sorties XIOS 15 10 USE wxios … … 36 31 ENDIF 37 32 38 #ifdef CPP_IOIPSL39 33 call histclo 40 34 call restclo 41 #endif42 35 call getin_dump 43 36 ! call histclo(2) -
LMDZ6/trunk/libf/dyn3d/bilan_dyn.F90
r5246 r5267 10 10 ! vQ..A=Cp T + L * ... 11 11 12 #ifdef CPP_IOIPSL13 12 USE IOIPSL 14 #endif15 13 USE comconst_mod, ONLY: pi, cpp 16 14 USE comvert_mod, ONLY: presnivs … … 26 24 !==================================================================== 27 25 ! 28 ! Sous-programme consacre àdes diagnostics dynamiques de base26 ! Sous-programme consacre � des diagnostics dynamiques de base 29 27 ! 30 28 ! … … 89 87 real :: ww 90 88 91 ! variables dynamiques interm édiaires89 ! variables dynamiques interm�diaires 92 90 REAL :: vcont(iip1,jjm,llm),ucont(iip1,jjp1,llm) 93 91 REAL :: ang(iip1,jjp1,llm),unat(iip1,jjp1,llm) … … 97 95 REAL :: bern(iip1,jjp1,llm) 98 96 99 ! champ contenant les scalaires advect és.97 ! champ contenant les scalaires advect�s. 100 98 real :: Q(iip1,jjp1,llm,nQ) 101 99 102 ! champs cumul és100 ! champs cumul�s 103 101 real :: ps_cum(iip1,jjp1) 104 102 real :: masse_cum(iip1,jjp1,llm) … … 308 306 ! ---------------------------- 309 307 310 ! énergie cinétique308 ! �nergie cin�tique 311 309 ucont(:,:,:)=0 312 310 CALL covcont(llm,ucov,vcov,ucont,vcont) 313 311 CALL enercin(vcov,ucov,vcont,ucont,ecin) 314 312 315 ! moment cin étique313 ! moment cin�tique 316 314 do l=1,llm 317 315 ang(:,:,l)=ucov(:,:,l)+constang(:,:) … … 373 371 enddo 374 372 375 ! flux m éridien373 ! flux m�ridien 376 374 ! ------------- 377 375 do iQ=1,nQ … … 440 438 441 439 !===================================================================== 442 ! Transport m éridien440 ! Transport m�ridien 443 441 !===================================================================== 444 442 -
LMDZ6/trunk/libf/dyn3d/check_isotopes.F90
r5214 r5267 4 4 ntiso, iH2O, nzone, tracers, isoName, itZonIso 5 5 USE iso_params_mod, ONLY: tnat_H216O, tnat_H217O, tnat_H218O, tnat_HDO, tnat_HTO 6 #ifdef CPP_IOIPSL7 6 USE ioipsl, ONLY: getin 8 #else9 USE ioipsl_getincom, ONLY: getin10 #endif11 7 IMPLICIT NONE 12 8 include "dimensions.h" -
LMDZ6/trunk/libf/dyn3d/conf_gcm.F90
r4996 r5267 5 5 6 6 USE control_mod 7 #ifdef CPP_IOIPSL8 7 use IOIPSL 9 #else10 ! if not using IOIPSL, we still need to use (a local version of) getin11 use ioipsl_getincom12 #endif13 8 USE infotrac, ONLY : type_trac 14 9 use assert_m, only: assert -
LMDZ6/trunk/libf/dyn3d/dynetat0.F90
r5252 r5267 19 19 USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time 20 20 USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 21 #ifdef CPP_IOIPSL22 21 USE IOIPSL, ONLY: getin 23 #else24 USE ioipsl_getincom, ONLY: getin25 #endif26 22 USE iso_params_mod ! tnat_* and alpha_ideal_* 27 23 USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS -
LMDZ6/trunk/libf/dyn3d/dynredem.F90
r5084 r5267 4 4 ! Write the NetCDF restart file (initialization). 5 5 !------------------------------------------------------------------------------- 6 #ifdef CPP_IOIPSL7 6 USE IOIPSL 8 #endif9 7 USE strings_mod, ONLY: maxlen 10 8 USE infotrac, ONLY: nqtot, tracers … … 46 44 !=============================================================================== 47 45 modname='dynredem0'; fil=fichnom 48 #ifdef CPP_IOIPSL49 46 CALL ymds2ju(annee_ref, 1, iday_end, 0.0, zjulian) 50 47 CALL ju2ymds(zjulian, yyears0, mmois0, jjour0, hours) 51 #else 52 ! set yyears0, mmois0, jjour0 to 0,1,1 (hours is not used) 53 yyears0=0 54 mmois0=1 55 jjour0=1 56 #endif 48 57 49 58 50 tab_cntrl(:) = 0. -
LMDZ6/trunk/libf/dyn3d/fluxstokenc.F90
r5246 r5267 4 4 SUBROUTINE fluxstokenc(pbaru,pbarv,masse,teta,phi,phis, & 5 5 time_step,itau ) 6 #ifdef CPP_IOIPSL7 6 ! This routine is designed to work with ioipsl 8 7 … … 162 161 ENDIF ! if iadvtr.EQ.istdyn 163 162 164 #else 165 write(lunout,*) & 166 'fluxstokenc: Needs IOIPSL to function' 167 #endif 168 ! of #ifdef CPP_IOIPSL 163 164 169 165 RETURN 170 166 END SUBROUTINE fluxstokenc -
LMDZ6/trunk/libf/dyn3d/friction.F90
r5246 r5267 6 6 7 7 USE control_mod 8 #ifdef CPP_IOIPSL9 8 USE IOIPSL 10 #else 11 ! if not using IOIPSL, we still need to use (a local version of) getin 12 USE ioipsl_getincom 13 #endif 9 14 10 USE comconst_mod, ONLY: pi 15 11 IMPLICIT NONE -
LMDZ6/trunk/libf/dyn3d/gcm.F90
r5250 r5267 6 6 PROGRAM gcm 7 7 8 #ifdef CPP_IOIPSL9 8 USE IOIPSL 10 #else 11 ! if not using IOIPSL, we still need to use (a local version of) getin 12 USE ioipsl_getincom 13 #endif 9 14 10 15 11 … … 173 169 ! calend = 'earth_365d' 174 170 175 #ifdef CPP_IOIPSL176 171 if (calend == 'earth_360d') then 177 172 call ioconf_calendar('360_day') … … 187 182 call abort_gcm(modname,abort_message,1) 188 183 endif 189 #endif 184 190 185 !----------------------------------------------------------------------- 191 186 ! … … 325 320 ! endif 326 321 327 #ifdef CPP_IOIPSL328 322 mois = 1 329 323 heure = 0. … … 340 334 write(lunout,*)'jD_ref+jH_ref,an, mois, jour, heure' 341 335 write(lunout,*)jD_ref+jH_ref,an, mois, jour, heure 342 #else 343 ! Ehouarn: we still need to define JD_ref and JH_ref 344 ! and since we don't know how many days there are in a year 345 ! we set JD_ref to 0 (this should be improved ...) 346 jD_ref=0 347 jH_ref=0 348 #endif 336 349 337 350 338 … … 391 379 300 FORMAT('1'/,15x,'run du jour',i7,2x,'au jour',i7//) 392 380 393 #ifdef CPP_IOIPSL394 381 call ju2ymds(jD_ref + day_ini - day_ref, an, mois, jour, heure) 395 382 write (lunout,301)jour, mois, an … … 398 385 301 FORMAT('1'/,15x,'run du ', i2,'/',i2,'/',i4) 399 386 302 FORMAT('1'/,15x,' au ', i2,'/',i2,'/',i4) 400 #endif 387 401 388 402 389 !----------------------------------------------------------------------- … … 423 410 ecripar = .TRUE. 424 411 425 #ifdef CPP_IOIPSL426 412 time_step = zdtvr 427 413 if (ok_dyn_ins) then 428 414 ! initialize output file for instantaneous outputs 429 415 ! t_ops = iecri * daysec ! do operations every t_ops 430 t_ops =((1.0*iecri)/day_step) * daysec 416 t_ops =((1.0*iecri)/day_step) * daysec 431 417 t_wrt = daysec ! iecri * daysec ! write output every t_wrt 432 418 CALL inithist(day_ref,annee_ref,time_step, & … … 434 420 endif 435 421 436 IF (ok_dyn_ave) THEN 422 IF (ok_dyn_ave) THEN 437 423 ! initialize output file for averaged outputs 438 424 t_ops = iperiod * time_step ! do operations every t_ops … … 442 428 END IF 443 429 dtav = iperiod*dtvr/daysec 444 #endif 445 ! #endif of #ifdef CPP_IOIPSL 430 446 431 447 432 ! Choix des frequences de stokage pour le offline -
LMDZ6/trunk/libf/dyn3d/getparam.F90
r2094 r5267 3 3 ! 4 4 MODULE getparam 5 #ifdef CPP_IOIPSL6 5 USE IOIPSL 7 #else 8 ! if not using IOIPSL, we still need to use (a local version of) getin 9 USE ioipsl_getincom 10 #endif 6 11 7 12 8 INTERFACE getpar -
LMDZ6/trunk/libf/dyn3d/iniacademic.F90
r5214 r5267 9 9 use exner_hyb_m, only: exner_hyb 10 10 use exner_milieu_m, only: exner_milieu 11 #ifdef CPP_IOIPSL12 11 USE IOIPSL, ONLY: getin 13 #else 14 ! if not using IOIPSL, we still need to use (a local version of) getin 15 USE ioipsl_getincom, ONLY: getin 16 #endif 12 17 13 USE Write_Field 18 14 USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm -
LMDZ6/trunk/libf/dyn3d/leapfrog.F90
r5250 r5267 8 8 9 9 !IM : pour sortir les param. du modele dans un fis. netcdf 110106 10 #ifdef CPP_IOIPSL11 10 use IOIPSL 12 #endif13 11 USE infotrac, ONLY: nqtot, isoCheck 14 12 USE guide_mod, ONLY : guide_main … … 241 239 call check_isotopes_seq(q,ip1jmp1,'leapfrog 321') 242 240 243 #ifdef CPP_IOIPSL244 241 if (ok_guide) then 245 242 call guide_main(itau,ucov,vcov,teta,q,masse,ps) 246 243 endif 247 #endif 244 248 245 249 246 … … 355 352 !maf stokage du flux de masse pour traceurs OFF-LINE 356 353 357 #ifdef CPP_IOIPSL358 354 CALL fluxstokenc(pbaru,pbarv,masse,teta,phi,phis, & 359 355 dtvr, itau) 360 #endif 356 361 357 362 358 … … 451 447 ENDIF ! of IF (ip_ebil_dyn.ge.1 ) 452 448 !-jld 453 #ifdef CPP_IOIPSL 449 454 450 !IM decommenter les 6 lignes suivantes pour sortir quelques parametres dynamiques de LMDZ 455 451 !IM uncomment next 6 lines to get some parameters for LMDZ dynamics … … 460 456 ! 461 457 !#include "write_paramLMDZ_dyn.h" 462 ! 463 #endif 464 ! #endif of #ifdef CPP_IOIPSL 458 465 459 IF (CPPKEY_PHYS) THEN 466 460 CALL calfis( lafin , jD_cur, jH_cur, & … … 675 669 676 670 IF (ok_dynzon) THEN 677 #ifdef CPP_IOIPSL678 671 CALL bilan_dyn(2,dtvr*iperiod,dtvr*day_step*periodav, & 679 672 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q) 680 #endif 673 681 674 END IF 682 675 IF (ok_dyn_ave) THEN 683 #ifdef CPP_IOIPSL684 676 CALL writedynav(itau,vcov, & 685 677 ucov,teta,pk,phi,q,masse,ps,phis) 686 #endif 678 687 679 ENDIF 688 680 … … 704 696 vnat(:,l)=vcov(:,l)/cv(:) 705 697 enddo 706 #ifdef CPP_IOIPSL707 698 if (ok_dyn_ins) then 708 699 ! write(lunout,*) "leapfrog: call writehist, itau=",itau … … 714 705 ! call WriteField('masse',reshape(masse,(/iip1,jmp1,llm/))) 715 706 endif ! of if (ok_dyn_ins) 716 #endif 707 717 708 ! For some Grads outputs of fields 718 709 if (output_grads_dyn) then … … 812 803 813 804 IF (ok_dynzon) THEN 814 #ifdef CPP_IOIPSL815 805 CALL bilan_dyn(2,dtvr*iperiod,dtvr*day_step*periodav, & 816 806 ps,masse,pk,pbaru,pbarv,teta,phi,ucov,vcov,q) 817 #endif 807 818 808 ENDIF 819 809 IF (ok_dyn_ave) THEN 820 #ifdef CPP_IOIPSL821 810 CALL writedynav(itau,vcov, & 822 811 ucov,teta,pk,phi,q,masse,ps,phis) 823 #endif 812 824 813 ENDIF 825 814 … … 834 823 vnat(:,l)=vcov(:,l)/cv(:) 835 824 enddo 836 #ifdef CPP_IOIPSL837 825 if (ok_dyn_ins) then 838 826 ! write(lunout,*) "leapfrog: call writehist (b)", … … 840 828 CALL writehist(itau,vcov,ucov,teta,phi,q,masse,ps,phis) 841 829 endif ! of if (ok_dyn_ins) 842 #endif 830 843 831 ! For some Grads outputs 844 832 if (output_grads_dyn) then -
LMDZ6/trunk/libf/dyn3d_common/conf_planete.F90
r4379 r5267 4 4 SUBROUTINE conf_planete 5 5 ! 6 #ifdef CPP_IOIPSL7 6 USE IOIPSL 8 #else9 ! if not using IOIPSL, we still need to use (a local version of) getin10 USE ioipsl_getincom11 #endif12 7 USE comconst_mod, ONLY: pi, g, molmass, kappa, cpp, omeg, rad, & 13 8 year_day, daylen, daysec, ihf -
LMDZ6/trunk/libf/dyn3d_common/disvert.F90
r4257 r5267 3 3 SUBROUTINE disvert() 4 4 5 #ifdef CPP_IOIPSL6 5 use ioipsl, only: getin 7 #else8 USE ioipsl_getincom, only: getin9 #endif10 6 use new_unit_m, only: new_unit 11 7 use assert_m, only: assert -
LMDZ6/trunk/libf/dyn3d_common/disvert_noterre.F90
r5246 r5267 6 6 ! On l'utilise aussi pour Venus et Titan, legerment modifiee. 7 7 8 #ifdef CPP_IOIPSL9 8 use IOIPSL 10 #else 11 ! if not using IOIPSL, we still need to use (a local version of) getin 12 use ioipsl_getincom 13 #endif 9 14 10 USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt, & 15 11 nivsig,nivsigs,pa,preff,scaleheight … … 24 20 ! 25 21 !======================================================================= 26 ! Discretisation verticale en coordonn ée hybride (ou sigma)22 ! Discretisation verticale en coordonn�e hybride (ou sigma) 27 23 ! 28 24 !======================================================================= … … 208 204 ! Calcul au milieu des couches : 209 205 ! WARNING : le choix de placer le milieu des couches au niveau de 210 ! pression interm édiaire est arbitraire et pourrait etre modifié.206 ! pression interm�diaire est arbitraire et pourrait etre modifi�. 211 207 ! Le calcul du niveau pour la derniere couche 212 208 ! (on met la meme distance (en log pression) entre P(llm) 213 209 ! et P(llm -1) qu'entre P(llm-1) et P(llm-2) ) est 214 ! Specifique. Ce choix est sp écifiéici ET dans exner_milieu.F210 ! Specifique. Ce choix est sp�cifi� ici ET dans exner_milieu.F 215 211 216 212 DO l = 1, llm-1 … … 284 280 ! L'objectif est de calculer newsig telle que 285 281 ! (1 -pa/preff)*exp(1-1./newsig**2)+(pa/preff)*newsig = sig 286 ! Cela ne se r ésoud pas analytiquement:287 ! => on r ésoud par iterration bourrine282 ! Cela ne se r�soud pas analytiquement: 283 ! => on r�soud par iterration bourrine 288 284 ! ---------------------------------------------- 289 285 ! Information : where exp(1-1./x**2) become << x … … 320 316 newsig=(X2+newsig)*0.5 321 317 end if 322 ! Test : on arete lorsque on approxime sig à moins de 0.01 m près318 ! Test : on arete lorsque on approxime sig � moins de 0.01 m pr�s 323 319 ! (en pseudo altitude) : 324 320 IF(abs(10.*log(F)).LT.1.E-5) goto 999 -
LMDZ6/trunk/libf/dyn3d_common/iniconst.F90
r2601 r5267 5 5 6 6 USE control_mod 7 #ifdef CPP_IOIPSL8 7 use IOIPSL 9 #else 10 ! if not using IOIPSL, we still need to use (a local version of) getin 11 use ioipsl_getincom 12 #endif 8 13 9 USE comconst_mod, ONLY: im, imp1, jm, jmp1, lllm, lllmm1, lllmp1, & 14 10 unsim, pi, r, kappa, cpp, dtvr, dtphys -
LMDZ6/trunk/libf/dyn3d_common/initdynav.F90
r4046 r5267 3 3 subroutine initdynav(day0,anne0,tstep,t_ops,t_wrt) 4 4 5 #ifdef CPP_IOIPSL6 5 USE IOIPSL 7 #endif8 6 USE infotrac, ONLY : nqtot 9 7 use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid, & … … 47 45 real tstep, t_ops, t_wrt 48 46 49 #ifdef CPP_IOIPSL50 47 ! This routine needs IOIPSL to work 51 48 ! Variables locales … … 82 79 ! Creation de 3 fichiers pour les differentes grilles horizontales 83 80 ! Restriction de IOIPSL: seulement 2 coordonnees dans le meme fichier 84 ! Grille Scalaire 81 ! Grille Scalaire 85 82 call histbeg(dynhistave_file, iip1, rlong(:,1), jjp1, rlat(1,:), & 86 83 1, iip1, 1, jjp1, & … … 185 182 call histend(histuaveid) 186 183 call histend(histvaveid) 187 #else 188 write(lunout,*)"initdynav: Warning this routine should not be", & 189 " used without ioipsl" 190 #endif 191 ! of #ifdef CPP_IOIPSL 184 185 192 186 193 187 end subroutine initdynav -
LMDZ6/trunk/libf/dyn3d_common/initfluxsto.F90
r5246 r5267 6 6 fileid,filevid,filedid) 7 7 8 #ifdef CPP_IOIPSL9 8 USE IOIPSL 10 #endif11 9 USE comconst_mod, ONLY: pi 12 10 USE comvert_mod, ONLY: nivsigs … … 54 52 integer :: fileid, filevid,filedid 55 53 56 #ifdef CPP_IOIPSL57 54 ! This routine needs IOIPSL to work 58 55 ! Variables locales … … 222 219 endif 223 220 224 #else 225 ! tell the user this routine should be run with ioipsl 226 write(lunout,*)"initfluxsto: Warning this routine should not be", & 227 " used without ioipsl" 228 #endif 229 ! of #ifdef CPP_IOIPSL 221 222 230 223 return 231 224 end subroutine initfluxsto -
LMDZ6/trunk/libf/dyn3d_common/inithist.F90
r5246 r5267 4 4 subroutine inithist(day0,anne0,tstep,t_ops,t_wrt) 5 5 6 #ifdef CPP_IOIPSL7 6 USE IOIPSL 8 #endif9 7 USE infotrac, ONLY : nqtot 10 8 use com_io_dyn_mod, only : histid,histvid,histuid, & … … 52 50 real :: tstep, t_ops, t_wrt 53 51 54 #ifdef CPP_IOIPSL55 52 ! This routine needs IOIPSL to work 56 53 ! Variables locales … … 186 183 call histend(histuid) 187 184 call histend(histvid) 188 #else 189 ! tell the user this routine should be run with ioipsl 190 write(lunout,*)"inithist: Warning this routine should not be", & 191 " used without ioipsl" 192 #endif 193 ! of #ifdef CPP_IOIPSL 185 186 194 187 return 195 188 end subroutine inithist -
LMDZ6/trunk/libf/dyn3d_common/iso_verif_dyn.F90
r5214 r5267 33 33 34 34 LOGICAL FUNCTION iso_verif_aberrant_nostop(x, iso, q, err_msg) RESULT(lerr) 35 #ifdef CPP_IOIPSL36 35 USE IOIPSL, ONLY: getin 37 #else38 USE ioipsl_getincom, ONLY: getin39 #endif40 36 USE iso_params_mod, ONLY: tnat_HDO 41 37 IMPLICIT NONE -
LMDZ6/trunk/libf/dyn3d_common/writedynav.F90
r4046 r5267 3 3 subroutine writedynav(time, vcov, ucov, teta, ppk, phi, q, masse, ps, phis) 4 4 5 #ifdef CPP_IOIPSL6 5 USE ioipsl 7 #endif8 6 USE infotrac, ONLY : nqtot 9 7 use com_io_dyn_mod, only : histaveid, histvaveid, histuaveid … … 46 44 integer time 47 45 48 #ifdef CPP_IOIPSL49 46 ! This routine needs IOIPSL to work 50 47 ! Variables locales … … 53 50 INTEGER iq, ii, ll 54 51 real tm(ip1jmp1*llm) 55 REAL vnat(ip1jm, llm), unat(ip1jmp1, llm) 52 REAL vnat(ip1jm, llm), unat(ip1jmp1, llm) 56 53 logical ok_sync 57 54 integer itau_w … … 75 72 ! Appels a histwrite pour l'ecriture des variables a sauvegarder 76 73 77 ! Vents U 74 ! Vents U 78 75 79 76 call histwrite(histuaveid, 'u', itau_w, unat, & … … 129 126 ENDIF 130 127 131 #else 132 write(lunout, *) "writedynav: Warning this routine should not be", & 133 " used without ioipsl" 134 #endif 135 ! of #ifdef CPP_IOIPSL 128 129 136 130 137 131 end subroutine writedynav -
LMDZ6/trunk/libf/dyn3d_common/writehist.F90
r5246 r5267 4 4 subroutine writehist(time,vcov,ucov,teta,phi,q,masse,ps,phis) 5 5 6 #ifdef CPP_IOIPSL7 6 USE ioipsl 8 #endif9 7 USE infotrac, ONLY : nqtot 10 8 use com_io_dyn_mod, only : histid,histvid,histuid … … 53 51 54 52 55 #ifdef CPP_IOIPSL56 53 ! This routine needs IOIPSL to work 57 54 ! Variables locales … … 123 120 call histsync(histuid) 124 121 endif 125 #else 126 ! tell the user this routine should be run with ioipsl 127 write(lunout,*)"writehist: Warning this routine should not be", & 128 " used without ioipsl" 129 #endif 130 ! of #ifdef CPP_IOIPSL 122 123 131 124 return 132 125 end subroutine writehist -
LMDZ6/trunk/libf/dyn3dmem/abort_gcm.F90
r5246 r5267 6 6 SUBROUTINE abort_gcm(modname, message, ierr) 7 7 8 #ifdef CPP_IOIPSL9 8 USE IOIPSL 10 #else 11 ! if not using IOIPSL, we still need to use (a local version of) getin_dump 12 USE ioipsl_getincom 13 #endif 9 14 10 USE parallel_lmdz 15 11 INCLUDE "iniprint.h" … … 28 24 29 25 write(lunout,*) 'in abort_gcm' 30 #ifdef CPP_IOIPSL31 26 !$OMP MASTER 32 27 call histclo … … 36 31 endif 37 32 !$OMP END MASTER 38 #endif39 33 ! call histclo(2) 40 34 ! call histclo(3) -
LMDZ6/trunk/libf/dyn3dmem/bilan_dyn_loc.F90
r5246 r5267 10 10 ! vQ..A=Cp T + L * ... 11 11 12 #ifdef CPP_IOIPSL13 12 USE IOIPSL 14 #endif15 13 USE parallel_lmdz 16 14 USE mod_hallo … … 30 28 !==================================================================== 31 29 ! 32 ! Sous-programme consacre àdes diagnostics dynamiques de base30 ! Sous-programme consacre � des diagnostics dynamiques de base 33 31 ! 34 32 ! … … 88 86 real :: ww 89 87 90 ! variables dynamiques interm édiaires88 ! variables dynamiques interm�diaires 91 89 REAL,SAVE,ALLOCATABLE :: vcont(:,:,:),ucont(:,:,:) 92 90 REAL,SAVE,ALLOCATABLE :: ang(:,:,:),unat(:,:,:) … … 96 94 REAL,SAVE,ALLOCATABLE :: bern(:,:,:) 97 95 98 ! champ contenant les scalaires advect és.96 ! champ contenant les scalaires advect�s. 99 97 real,SAVE,ALLOCATABLE :: Q(:,:,:,:) 100 98 101 ! champs cumul és99 ! champs cumul�s 102 100 real,SAVE,ALLOCATABLE :: ps_cum(:,:) 103 101 real,SAVE,ALLOCATABLE :: masse_cum(:,:,:) … … 370 368 jje=jj_end 371 369 372 ! énergie cinétique370 ! �nergie cin�tique 373 371 ! ucont(:,jjb:jje,:)=0 374 372 … … 382 380 CALL enercin_loc(vcov,ucov,vcont,ucont,ecin) 383 381 384 ! moment cin étique382 ! moment cin�tique 385 383 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK) 386 384 do l=1,llm … … 490 488 enddo 491 489 492 ! flux m éridien490 ! flux m�ridien 493 491 ! ------------- 494 492 do iQ=1,nQ … … 642 640 643 641 !===================================================================== 644 ! Transport m éridien642 ! Transport m�ridien 645 643 !===================================================================== 646 644 -
LMDZ6/trunk/libf/dyn3dmem/check_isotopes_loc.F90
r5214 r5267 5 5 ntiso, iH2O, nzone, tracers, isoName, itZonIso 6 6 USE iso_params_mod, ONLY: tnat_H216O, tnat_H217O, tnat_H218O, tnat_HDO, tnat_HTO 7 #ifdef CPP_IOIPSL8 7 USE ioipsl, ONLY: getin 9 #else10 USE ioipsl_getincom, ONLY: getin11 #endif12 8 IMPLICIT NONE 13 9 include "dimensions.h" -
LMDZ6/trunk/libf/dyn3dmem/conf_gcm.F90
r4996 r5267 5 5 6 6 USE control_mod 7 #ifdef CPP_IOIPSL8 7 USE IOIPSL 9 #else 10 ! if not using IOIPSL, we still need to use (a local version of) getin 11 USE ioipsl_getincom 12 #endif 8 13 9 USE misc_mod 14 10 USE mod_filtre_fft, ONLY: use_filtre_fft … … 121 117 122 118 !Config Key = prt_level 123 !Config Desc = niveau d'impressions de d ébogage119 !Config Desc = niveau d'impressions de d�bogage 124 120 !Config Def = 0 125 !Config Help = Niveau d'impression pour le d ébogage121 !Config Help = Niveau d'impression pour le d�bogage 126 122 !Config (0 = minimum d'impression) 127 123 prt_level = 0 … … 921 917 922 918 !Config Key = use_mpi_alloc 923 !Config Desc = Utilise un buffer MPI en m �moire globale919 !Config Desc = Utilise un buffer MPI en m�moire globale 924 920 !Config Def = false 925 921 !Config Help = permet d'activer l'utilisation d'un buffer MPI 926 !Config en m �moire globale a l'aide de la fonction MPI_ALLOC.927 !Config Cela peut am �liorer la bande passante des transferts MPI922 !Config en m�moire globale a l'aide de la fonction MPI_ALLOC. 923 !Config Cela peut am�liorer la bande passante des transferts MPI 928 924 !Config d'un facteur 2 929 925 use_mpi_alloc=.FALSE. … … 933 929 !Config Desc = activation de la version strato 934 930 !Config Def = .FALSE. 935 !Config Help = active la version stratosph érique de LMDZ de F. Lott931 !Config Help = active la version stratosph�rique de LMDZ de F. Lott 936 932 937 933 ok_strato=.FALSE. -
LMDZ6/trunk/libf/dyn3dmem/dynetat0_loc.F90
r5252 r5267 20 20 USE temps_mod, ONLY: annee_ref, day_ini, day_ref, itau_dyn, start_time 21 21 USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0 22 #ifdef CPP_IOIPSL23 22 USE IOIPSL, ONLY: getin 24 #else25 USE ioipsl_getincom, ONLY: getin26 #endif27 23 USE iso_params_mod ! tnat_* and alpha_ideal_* 28 24 USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_REPROBUS -
LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.F90
r5084 r5267 4 4 ! Write the NetCDF restart file (initialization). 5 5 !------------------------------------------------------------------------------- 6 #ifdef CPP_IOIPSL7 6 USE IOIPSL 8 #endif9 7 USE parallel_lmdz 10 8 USE mod_hallo … … 53 51 IF(mpi_rank/=0) RETURN 54 52 55 #ifdef CPP_IOIPSL56 53 CALL ymds2ju(annee_ref, 1, iday_end, 0.0, zjulian) 57 54 CALL ju2ymds(zjulian, yyears0, mmois0, jjour0, hours) 58 #else 59 ! set yyears0, mmois0, jjour0 to 0,1,1 (hours is not used) 60 yyears0=0 61 mmois0=1 62 jjour0=1 63 #endif 55 64 56 65 57 tab_cntrl(:) = 0. -
LMDZ6/trunk/libf/dyn3dmem/friction_loc.F90
r5246 r5267 6 6 USE parallel_lmdz 7 7 USE control_mod 8 #ifdef CPP_IOIPSL9 8 USE IOIPSL 10 #else 11 ! if not using IOIPSL, we still need to use (a local version of) getin 12 USE ioipsl_getincom 13 #endif 9 14 10 USE comconst_mod, ONLY: pi 15 11 IMPLICIT NONE -
LMDZ6/trunk/libf/dyn3dmem/gcm.F90
r5250 r5267 5 5 PROGRAM gcm 6 6 7 #ifdef CPP_IOIPSL8 7 USE IOIPSL 9 #endif10 8 11 9 USE mod_const_mpi, ONLY: init_const_mpi … … 178 176 ! calend = 'earth_365d' 179 177 180 #ifdef CPP_IOIPSL181 178 if (calend == 'earth_360d') then 182 179 call ioconf_calendar('360_day') … … 195 192 call abort_gcm(modname,abort_message,1) 196 193 endif 197 #endif 194 198 195 199 196 … … 330 327 ! endif 331 328 332 #ifdef CPP_IOIPSL333 329 mois = 1 334 330 heure = 0. … … 345 341 write(lunout,*)'jD_ref+jH_ref,an, mois, jour, heure' 346 342 write(lunout,*)jD_ref+jH_ref,anref, moisref, jourref, heureref 347 #else 348 ! Ehouarn: we still need to define JD_ref and JH_ref 349 ! and since we don't know how many days there are in a year 350 ! we set JD_ref to 0 (this should be improved ...) 351 jD_ref=0 352 jH_ref=0 353 #endif 343 354 344 355 345 if (iflag_phys.eq.1) then … … 394 384 300 FORMAT('1'/,15x,'run du jour',i7,2x,'au jour',i7//) 395 385 396 #ifdef CPP_IOIPSL397 386 call ju2ymds(jD_ref + day_ini - day_ref, an, mois, jour, heure) 398 387 write (lunout,301)jour, mois, an … … 401 390 301 FORMAT('1'/,15x,'run du ', i2,'/',i2,'/',i4) 402 391 302 FORMAT('1'/,15x,' au ', i2,'/',i2,'/',i4) 403 #endif 392 404 393 405 394 !----------------------------------------------------------------------- … … 433 422 434 423 #define CPP_IOIPSL 435 #ifdef CPP_IOIPSL436 424 time_step = zdtvr 437 425 if (ok_dyn_ins) then 438 426 ! initialize output file for instantaneous outputs 439 427 ! t_ops = iecri * daysec ! do operations every t_ops 440 t_ops =((1.0*iecri)/day_step) * daysec 428 t_ops =((1.0*iecri)/day_step) * daysec 441 429 t_wrt = daysec ! iecri * daysec ! write output every t_wrt 442 430 CALL inithist_loc(day_ref,annee_ref,time_step, & … … 444 432 endif 445 433 446 IF (ok_dyn_ave) THEN 434 IF (ok_dyn_ave) THEN 447 435 ! initialize output file for averaged outputs 448 436 t_ops = iperiod * time_step ! do operations every t_ops … … 451 439 END IF 452 440 dtav = iperiod*dtvr/daysec 453 #endif454 #undef CPP_IOIPSL455 441 456 442 ! setting up DYN3D/XIOS inerface … … 460 446 endif 461 447 462 ! #endif of #ifdef CPP_IOIPSL463 448 ! 464 449 !----------------------------------------------------------------------- -
LMDZ6/trunk/libf/dyn3dmem/getparam.F90
r2094 r5267 3 3 ! 4 4 MODULE getparam 5 #ifdef CPP_IOIPSL6 5 USE IOIPSL 7 #else 8 ! if not using IOIPSL, we still need to use (a local version of) getin 9 USE ioipsl_getincom 10 #endif 6 11 7 12 8 INTERFACE getpar -
LMDZ6/trunk/libf/dyn3dmem/iniacademic_loc.F90
r5214 r5267 10 10 use exner_milieu_m, only: exner_milieu 11 11 USE parallel_lmdz, ONLY: ijb_u, ije_u, ijb_v, ije_v 12 #ifdef CPP_IOIPSL13 12 USE IOIPSL, ONLY: getin 14 #else 15 ! if not using IOIPSL, we still need to use (a local version of) getin 16 USE ioipsl_getincom, ONLY: getin 17 #endif 13 18 14 USE Write_Field 19 15 USE comconst_mod, ONLY: cpp, kappa, g, daysec, dtvr, pi, im, jm -
LMDZ6/trunk/libf/dyn3dmem/initdynav_loc.F90
r5246 r5267 4 4 subroutine initdynav_loc(day0,anne0,tstep,t_ops,t_wrt) 5 5 6 #ifdef CPP_IOIPSL7 6 ! This routine needs IOIPSL 8 7 USE IOIPSL 9 #endif 8 10 9 USE parallel_lmdz 11 10 use Write_field … … 56 55 real :: tstep, t_ops, t_wrt 57 56 58 #ifdef CPP_IOIPSL59 57 ! This routine needs IOIPSL 60 58 ! Variables locales … … 281 279 call histend(histuaveid) 282 280 call histend(histvaveid) 283 #else 284 write(lunout,*)'initdynav_loc: Needs IOIPSL to function' 285 #endif 286 ! #endif of #ifdef CPP_IOIPSL 281 287 282 end subroutine initdynav_loc -
LMDZ6/trunk/libf/dyn3dmem/initfluxsto_p.F90
r5246 r5267 6 6 fileid,filevid,filedid) 7 7 8 #ifdef CPP_IOIPSL9 8 ! This routine needs IOIPSL 10 9 USE IOIPSL 11 #endif 10 12 11 USE parallel_lmdz 13 12 use Write_field … … 58 57 integer :: fileid, filevid,filedid 59 58 60 #ifdef CPP_IOIPSL61 59 ! This routine needs IOIPSL 62 60 ! Variables locales … … 287 285 endif 288 286 289 #else 290 write(lunout,*)'initfluxsto_p: Needs IOIPSL to function' 291 #endif 292 ! #endif of #ifdef CPP_IOIPSL 287 293 288 return 294 289 end subroutine initfluxsto_p -
LMDZ6/trunk/libf/dyn3dmem/inithist_loc.F90
r5246 r5267 4 4 subroutine inithist_loc(day0,anne0,tstep,t_ops,t_wrt) 5 5 6 #ifdef CPP_IOIPSL7 6 ! This routine needs IOIPSL 8 7 USE IOIPSL 9 #endif 8 10 9 USE parallel_lmdz 11 10 use Write_field … … 54 53 real :: tstep, t_ops, t_wrt 55 54 56 #ifdef CPP_IOIPSL57 55 ! This routine needs IOIPSL 58 56 ! Variables locales … … 281 279 call histend(histuid) 282 280 call histend(histvid) 283 #else 284 write(lunout,*)'inithist_loc: Needs IOIPSL to function' 285 #endif 286 ! #endif of #ifdef CPP_IOIPSL 281 287 282 end subroutine inithist_loc -
LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.F90
r5258 r5267 317 317 call check_isotopes(q,ijb_u,ije_u,'leapfrog 321') 318 318 319 #ifdef CPP_IOIPSL320 319 if (ok_guide) then 321 320 call guide_main(itau,ucov,vcov,teta,q,masse,ps) 322 321 !$OMP BARRIER 323 322 endif 324 #endif 323 325 324 326 325 … … 1610 1609 !$OMP BARRIER 1611 1610 1612 #ifdef CPP_IOIPSL1613 1611 IF (ok_dynzon) THEN 1614 1612 … … 1622 1620 ucov,teta,pk,phi,q,masse,ps,phis) 1623 1621 ENDIF 1624 #endif 1622 1625 1623 1626 1624 … … 1643 1641 !$OMP BARRIER 1644 1642 1645 #ifdef CPP_IOIPSL1646 1643 if (ok_dyn_ins) then 1647 1644 CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q, & 1648 1645 masse,ps,phis) 1649 1646 endif 1650 #endif 1647 1651 1648 1652 1649 IF (ok_dyn_xios) THEN … … 1779 1776 ENDIF 1780 1777 1781 #ifdef CPP_IOIPSL1782 1778 ! ! Ehouarn: re-compute geopotential for outputs 1783 1779 !$OMP BARRIER … … 1796 1792 ucov,teta,pk,phi,q,masse,ps,phis) 1797 1793 ENDIF 1798 #endif 1794 1799 1795 1800 1796 … … 1811 1807 1812 1808 1813 #ifdef CPP_IOIPSL1814 1809 if (ok_dyn_ins) then 1815 1810 CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q, & 1816 1811 masse,ps,phis) 1817 1812 endif ! of if (ok_dyn_ins) 1818 #endif 1813 1819 1814 1820 1815 IF (ok_dyn_xios) THEN -
LMDZ6/trunk/libf/dyn3dmem/mod_const_mpi.F90
r4848 r5267 13 13 USE lmdz_mpi 14 14 15 #ifdef CPP_IOIPSL16 15 USE IOIPSL, ONLY: getin 17 #else 18 ! if not using IOIPSL, we still need to use (a local version of) getin 19 USE ioipsl_getincom, only: getin 20 #endif 16 21 17 ! Use of Oasis-MCT coupler 22 18 #ifdef CPP_OMCT -
LMDZ6/trunk/libf/dyn3dmem/parallel_lmdz.F90
r5207 r5267 5 5 USE mod_const_mpi 6 6 USE lmdz_mpi, ONLY : using_mpi 7 #ifdef CPP_IOIPSL8 7 use IOIPSL 9 #else 10 ! if not using IOIPSL, we still need to use (a local version of) getin 11 use ioipsl_getincom 12 #endif 8 13 9 INTEGER,PARAMETER :: halo_max=3 14 10 -
LMDZ6/trunk/libf/dyn3dmem/writedynav_loc.F90
r5246 r5267 5 5 masse,ps,phis) 6 6 7 #ifdef CPP_IOIPSL8 7 ! This routine needs IOIPSL 9 8 USE ioipsl 10 #endif 9 11 10 USE parallel_lmdz 12 11 USE misc_mod … … 63 62 64 63 65 #ifdef CPP_IOIPSL66 64 ! This routine needs IOIPSL 67 65 ! Variables locales … … 219 217 ENDIF 220 218 !$OMP END MASTER 221 #else 222 write(lunout,*)'writedynav_loc: Needs IOIPSL to function' 223 #endif 224 ! #endif of #ifdef CPP_IOIPSL 219 225 220 end subroutine writedynav_loc -
LMDZ6/trunk/libf/dyn3dmem/writehist_loc.F90
r5246 r5267 5 5 masse,ps,phis) 6 6 7 #ifdef CPP_IOIPSL8 7 ! This routine needs IOIPSL 9 8 USE ioipsl 10 #endif 9 11 10 USE parallel_lmdz 12 11 USE misc_mod … … 63 62 64 63 65 #ifdef CPP_IOIPSL66 64 ! This routine needs IOIPSL 67 65 ! Variables locales … … 218 216 endif 219 217 !$OMP END MASTER 220 #else 221 write(lunout,*)'writehist_loc: Needs IOIPSL to function' 222 #endif 223 ! #endif of #ifdef CPP_IOIPSL 218 224 219 end subroutine writehist_loc -
LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90
r5084 r5267 101 101 102 102 !--- Calendar choice 103 #ifdef CPP_IOIPSL104 103 calnd='gregorian' 105 104 SELECT CASE(calend) … … 116 115 END SELECT 117 116 WRITE(lunout,*)'CHOSEN CALENDAR: Earth '//TRIM(calnd) 118 #endif 117 119 118 120 119 #ifdef CPP_PARA -
LMDZ6/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90
r5204 r5267 96 96 USE phys_state_var_mod, ONLY: beta_aridity, delta_tsurf, awake_dens, cv_gen, & 97 97 ratqs_inter_ 98 !use ioipsl _getincom98 !use ioipsl 99 99 IMPLICIT NONE 100 100 !------------------------------------------------------------------------------- -
LMDZ6/trunk/libf/misc/strings_mod.F90
r5003 r5267 53 53 !============================================================================================================================== 54 54 SUBROUTINE getin_s(nam, val, def) 55 USE ioipsl _getincom, ONLY: getin55 USE ioipsl, ONLY: getin 56 56 IMPLICIT NONE 57 57 CHARACTER(LEN=*), INTENT(IN) :: nam … … 63 63 !============================================================================================================================== 64 64 SUBROUTINE getin_i(nam, val, def) 65 USE ioipsl _getincom, ONLY: getin65 USE ioipsl, ONLY: getin 66 66 IMPLICIT NONE 67 67 CHARACTER(LEN=*), INTENT(IN) :: nam … … 73 73 !============================================================================================================================== 74 74 SUBROUTINE getin_r(nam, val, def) 75 USE ioipsl _getincom, ONLY: getin75 USE ioipsl, ONLY: getin 76 76 IMPLICIT NONE 77 77 CHARACTER(LEN=*), INTENT(IN) :: nam … … 83 83 !============================================================================================================================== 84 84 SUBROUTINE getin_l(nam, val, def) 85 USE ioipsl _getincom, ONLY: getin85 USE ioipsl, ONLY: getin 86 86 IMPLICIT NONE 87 87 CHARACTER(LEN=*), INTENT(IN) :: nam -
LMDZ6/trunk/libf/phy_common/abort_physic.F90
r4600 r5267 2 2 SUBROUTINE abort_physic(modname, message, ierr) 3 3 4 #ifdef CPP_IOIPSL5 4 USE IOIPSL 6 #else 7 ! if not using IOIPSL, we still need to use (a local version of) getin_dump 8 USE ioipsl_getincom 9 #endif 5 10 6 USE mod_phys_lmdz_para 11 7 USE print_control_mod, ONLY: lunout … … 24 20 25 21 write(lunout,*) 'in abort_physic' 26 #ifdef CPP_IOIPSL27 22 !$OMP MASTER 28 23 call histclo … … 32 27 endif 33 28 !$OMP END MASTER 34 #endif35 29 36 30 write(lunout,*) 'Stopping in ', modname -
LMDZ6/trunk/libf/phy_common/ioipsl_getin_p_mod.F90
r2352 r5267 5 5 ! To use getin in a parallel context 6 6 !--------------------------------------------------------------------- 7 #ifdef CPP_IOIPSL8 7 USE ioipsl, ONLY: getin 9 #else10 USE ioipsl_getincom, ONLY: getin11 #endif12 8 USE mod_phys_lmdz_mpi_data, ONLY : is_mpi_root 13 9 USE mod_phys_lmdz_omp_data, ONLY : is_omp_root -
LMDZ6/trunk/libf/phydev/iophy.F90
r4729 r5267 34 34 USE print_control_mod, ONLY: lunout, prt_level 35 35 USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat 36 #ifdef CPP_IOIPSL37 36 USE ioipsl, only: flio_dom_set 38 #endif 37 39 38 use wxios, only: wxios_domain_param, using_xios 40 39 implicit none -
LMDZ6/trunk/libf/phylmd/Dust/phys_output_write_spl_mod.F90
r5084 r5267 828 828 ! ENDIF 829 829 830 #ifdef CPP_IOIPSL831 830 IF (.NOT. using_xios) THEN 832 831 IF (.NOT.ok_all_xml) THEN … … 836 835 ll=0 837 836 DO k=1, nlevSTD 838 bb2=clevSTD(k) 837 bb2=clevSTD(k) 839 838 IF (bb2.EQ."850".OR.bb2.EQ."700".OR. & 840 839 bb2.EQ."500".OR.bb2.EQ."200".OR. & … … 856 855 ENDIF 857 856 ENDIF !.NOT.using_xios 858 #endif 857 859 858 860 859 IF (using_xios) THEN … … 1470 1469 ENDIF 1471 1470 !!!!!!!!!!!! Sorties niveaux de pression NMC !!!!!!!!!!!!!!!!!!!! 1472 #ifdef CPP_IOIPSL1473 1474 1471 IF (.NOT. using_xios) THEN 1475 IF (.NOT.ok_all_xml) THEN 1472 IF (.NOT.ok_all_xml) THEN 1476 1473 ! ATTENTION, LES ANCIENS HISTWRITE ONT ETES CONSERVES EN ATTENDANT MIEUX: 1477 1474 ! Champs interpolles sur des niveaux de pression … … 1541 1538 ENDIF 1542 1539 ENDIF 1543 #endif 1540 1544 1541 1545 1542 IF (using_xios) THEN -
LMDZ6/trunk/libf/phylmd/dyn1d/1DUTILS.h
r5084 r5267 8 8 SUBROUTINE conf_unicol 9 9 ! 10 #ifdef CPP_IOIPSL11 10 use IOIPSL 12 #else 13 ! if not using IOIPSL, we still need to use (a local version of) getin 14 use ioipsl_getincom 15 #endif 11 16 12 USE print_control_mod, ONLY: lunout 17 13 IMPLICIT NONE -
LMDZ6/trunk/libf/phylmd/iophy.F90
r4848 r5267 43 43 USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat, klon_glo, grid_type, unstructured 44 44 USE print_control_mod, ONLY: prt_level,lunout 45 #ifdef CPP_IOIPSL46 45 USE ioipsl, ONLY: flio_dom_set 47 #endif 46 48 47 use wxios, ONLY: wxios_domain_param, wxios_domain_param_unstructured, wxios_context_init, using_xios 49 48 IMPLICIT NONE -
LMDZ6/trunk/libf/phylmd/moy_undefSTD.F90
r5084 r5267 5 5 USE netcdf 6 6 USE dimphy 7 #ifdef CPP_IOIPSL8 7 USE phys_state_var_mod 9 #endif10 8 USE wxios, ONLY: missing_val_xios => missing_val, using_xios 11 9 -
LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90
r5252 r5267 1493 1493 ! ENDIF 1494 1494 1495 #ifdef CPP_IOIPSL1496 1495 IF (.NOT. using_xios) THEN 1497 1496 IF (.NOT.ok_all_xml) THEN … … 1501 1500 ll=0 1502 1501 DO k=1, nlevSTD 1503 bb2=clevSTD(k) 1502 bb2=clevSTD(k) 1504 1503 IF (bb2.EQ."850".OR.bb2.EQ."700".OR. & 1505 1504 bb2.EQ."500".OR.bb2.EQ."200".OR. & … … 1521 1520 ENDIF 1522 1521 ENDIF 1523 #endif 1522 1524 1523 1525 1524 IF (using_xios) THEN … … 2620 2619 ENDIF !ok_4xCO2atm 2621 2620 !!!!!!!!!!!! Sorties niveaux de pression NMC !!!!!!!!!!!!!!!!!!!! 2622 #ifdef CPP_IOIPSL2623 2621 IF (.NOT. using_xios) THEN 2624 IF (.NOT.ok_all_xml) THEN 2622 IF (.NOT.ok_all_xml) THEN 2625 2623 ! ATTENTION, LES ANCIENS HISTWRITE ONT ETES CONSERVES EN ATTENDANT MIEUX: 2626 2624 ! Champs interpolles sur des niveaux de pression … … 2690 2688 ENDIF 2691 2689 ENDIF !.NOT. using_xios 2692 #endif 2690 2693 2691 2694 2692 IF (using_xios) THEN -
LMDZ6/trunk/libf/phylmd/physiq_mod.F90
r5265 r5267 1730 1730 ENDIF 1731 1731 1732 #ifdef CPP_IOIPSL1733 1734 1732 !$OMP MASTER 1735 1733 ! FH : if ok_sync=.true. , the time axis is written at each time step … … 1762 1760 #endif 1763 1761 1764 #endif1765 1762 ecrit_reg = ecrit_reg * un_jour 1766 1763 ecrit_tra = ecrit_tra * un_jour … … 5682 5679 ! Ecriture des sorties 5683 5680 !============================================================= 5684 #ifdef CPP_IOIPSL5685 5681 5686 5682 ! Recupere des varibles calcule dans differents modules … … 5742 5738 #endif 5743 5739 5744 #endif5745 5740 ! Petit appelle de sorties pour accompagner le travail sur phyex 5746 5741 if ( iflag_physiq == 1 ) then -
LMDZ6/trunk/libf/phylmd/plevel.F90
r5084 r5267 9 9 USE netcdf 10 10 USE dimphy 11 #ifdef CPP_IOIPSL 12 USE phys_state_var_mod, ONLY: missing_val_nf90 13 #endif 11 USE phys_state_var_mod, ONLY: missing_val_nf90 14 12 USE wxios, ONLY: missing_val_xios => missing_val, using_xios 15 13 IMPLICIT NONE -
LMDZ6/trunk/libf/phylmd/plevel_new.F90
r5084 r5267 10 10 USE netcdf 11 11 USE dimphy 12 #ifdef CPP_IOIPSL13 12 USE phys_state_var_mod, ONLY: missing_val_nf90 14 #endif15 13 USE wxios, ONLY: missing_val_xios=>missing_val, using_xios 16 14 -
LMDZ6/trunk/libf/phylmd/undefSTD.F90
r5084 r5267 5 5 USE netcdf 6 6 USE dimphy 7 #ifdef CPP_IOIPSL8 7 USE phys_state_var_mod 9 #endif10 8 USE wxios, ONLY: missing_val_xios => missing_val, using_xios 11 9 -
LMDZ6/trunk/libf/phylmdiso/isotopes_mod.F90
r5214 r5267 379 379 380 380 SUBROUTINE getinp_s(nam, val, def, lDisp) 381 USE ioipsl _getincom, ONLY: getin381 USE ioipsl, ONLY: getin 382 382 USE mod_phys_lmdz_mpi_data, ONLY : is_mpi_root 383 383 USE mod_phys_lmdz_omp_data, ONLY : is_omp_root … … 398 398 399 399 SUBROUTINE getinp_i(nam, val, def, lDisp) 400 USE ioipsl _getincom, ONLY: getin400 USE ioipsl, ONLY: getin 401 401 USE mod_phys_lmdz_mpi_data, ONLY : is_mpi_root 402 402 USE mod_phys_lmdz_omp_data, ONLY : is_omp_root … … 417 417 418 418 SUBROUTINE getinp_r(nam, val, def, lDisp) 419 USE ioipsl _getincom, ONLY: getin419 USE ioipsl, ONLY: getin 420 420 USE mod_phys_lmdz_mpi_data, ONLY : is_mpi_root 421 421 USE mod_phys_lmdz_omp_data, ONLY : is_omp_root … … 436 436 437 437 SUBROUTINE getinp_l(nam, val, def, lDisp) 438 USE ioipsl _getincom, ONLY: getin438 USE ioipsl, ONLY: getin 439 439 USE mod_phys_lmdz_mpi_data, ONLY : is_mpi_root 440 440 USE mod_phys_lmdz_omp_data, ONLY : is_omp_root -
LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90
r5265 r5267 1900 1900 ENDIF 1901 1901 1902 #ifdef CPP_IOIPSL1903 1904 1902 !$OMP MASTER 1905 1903 ! FH : if ok_sync=.true. , the time axis is written at each time step … … 1932 1930 #endif 1933 1931 1934 #endif1935 1932 ecrit_reg = ecrit_reg * un_jour 1936 1933 ecrit_tra = ecrit_tra * un_jour … … 7309 7306 ! Ecriture des sorties 7310 7307 !============================================================= 7311 #ifdef CPP_IOIPSL7312 7308 7313 7309 ! Recupere des varibles calcule dans differents modules … … 7373 7369 #endif 7374 7370 7375 #endif7376 7371 ! Petit appelle de sorties pour accompagner le travail sur phyex 7377 7372 if ( iflag_physiq == 1 ) then
Note: See TracChangeset
for help on using the changeset viewer.