Index: LMDZ4/branches/LMDZ4-dev/libf/dyn3d/guide.F =================================================================== --- LMDZ4/branches/LMDZ4-dev/libf/dyn3d/guide.F (revision 1134) +++ LMDZ4/branches/LMDZ4-dev/libf/dyn3d/guide.F (revision 1135) @@ -3,4 +3,6 @@ ! subroutine guide(itau,ucov,vcov,teta,q,masse,ps) + + use netcdf IMPLICIT NONE @@ -225,20 +227,22 @@ c lecture d'un fichier netcdf pour determiner le nombre de niveaux if (guide_modele) then - if (ncidpl.eq.-99) ncidpl=NCOPN('apbp.nc',NCNOWRIT,rcod) + if (ncidpl.eq.-99) rcod=nf90_open('apbp.nc',Nf90_NOWRITe, + $ ncidpl) else if (guide_u) then - if (ncidpl.eq.-99) ncidpl=NCOPN('u.nc',NCNOWRIT,rcod) + if (ncidpl.eq.-99) rcod=nf90_open('u.nc',Nf90_NOWRITe,ncidpl) endif c if (guide_v) then - if (ncidpl.eq.-99) ncidpl=NCOPN('v.nc',NCNOWRIT,rcod) + if (ncidpl.eq.-99) rcod=nf90_open('v.nc',nf90_nowrite,ncidpl) endif c if (guide_T) then - if (ncidpl.eq.-99) ncidpl=NCOPN('T.nc',NCNOWRIT,rcod) + if (ncidpl.eq.-99) rcod=nf90_open('T.nc',nf90_nowrite,ncidpl) endif c if (guide_Q) then - if (ncidpl.eq.-99) ncidpl=NCOPN('hur.nc',NCNOWRIT,rcod) + if (ncidpl.eq.-99) rcod=nf90_open('hur.nc',nf90_nowrite, + $ ncidpl) endif c @@ -251,5 +255,5 @@ status=NF_INQ_DIMLEN(ncidpl,rid,nlev) print *,'nlev guide', nlev - call ncclos(ncidpl,rcod) + rcod = nf90_close(ncidpl) c Lecture du premier etat des reanalyses. call read_reanalyse(1,ps Index: LMDZ4/branches/LMDZ4-dev/libf/dyn3d/read_reanalyse.F =================================================================== --- LMDZ4/branches/LMDZ4-dev/libf/dyn3d/read_reanalyse.F (revision 1134) +++ LMDZ4/branches/LMDZ4-dev/libf/dyn3d/read_reanalyse.F (revision 1135) @@ -13,4 +13,6 @@ c Declarations c ----------------------------------------------------------------- + use netcdf + IMPLICIT NONE @@ -72,7 +74,7 @@ print *,'Vous êtes entrain de lire des données sur . niveaux modèle' - ncidpl=NCOPN('apbp.nc',NCNOWRIT,rcode) - varidap=NCVID(ncidpl,'AP',rcode) - varidbp=NCVID(ncidpl,'BP',rcode) + rcode=nf90_open('apbp.nc',nf90_nowrite,ncidpl) + rcode = nf90_inq_varid(ncidpl, 'AP', varidap) + rcode = nf90_inq_varid(ncidpl, 'BP', varidbp) print*,'ncidpl,varidap',ncidpl,varidap endif @@ -80,14 +82,14 @@ c Vent zonal if (guide_u) then - ncidu=NCOPN('u.nc',NCNOWRIT,rcode) - varidu=NCVID(ncidu,'UWND',rcode) - print*,'ncidu,varidu',ncidu,varidu - if (ncidpl.eq.-99) ncidpl=ncidu + rcode=nf90_open('u.nc',nf90_nowrite,ncidu) + rcode = nf90_inq_varid(ncidu, 'UWND', varidu) + print*,'ncidu,varidu',ncidu,varidu + if (ncidpl.eq.-99) ncidpl=ncidu endif c Vent meridien if (guide_v) then - ncidv=NCOPN('v.nc',NCNOWRIT,rcode) - varidv=NCVID(ncidv,'VWND',rcode) + rcode=nf90_open('v.nc',nf90_nowrite,ncidv) + rcode = nf90_inq_varid(ncidv, 'VWND', varidv) print*,'ncidv,varidv',ncidv,varidv if (ncidpl.eq.-99) ncidpl=ncidv @@ -96,6 +98,6 @@ c Temperature if (guide_T) then - ncidt=NCOPN('T.nc',NCNOWRIT,rcode) - varidt=NCVID(ncidt,'AIR',rcode) + rcode=nf90_open('T.nc',nf90_nowrite,ncidt) + rcode = nf90_inq_varid(ncidt, 'AIR', varidt) print*,'ncidt,varidt',ncidt,varidt if (ncidpl.eq.-99) ncidpl=ncidt @@ -104,6 +106,6 @@ c Humidite if (guide_Q) then - ncidQ=NCOPN('hur.nc',NCNOWRIT,rcode) - varidQ=NCVID(ncidQ,'RH',rcode) + rcode=nf90_open('hur.nc',nf90_nowrite,ncidQ) + rcode = nf90_inq_varid(ncidQ, 'RH', varidQ) print*,'ncidQ,varidQ',ncidQ,varidQ if (ncidpl.eq.-99) ncidpl=ncidQ @@ -112,6 +114,6 @@ c Pression de surface if ((guide_P).OR.(guide_modele)) then - ncidps=NCOPN('ps.nc',NCNOWRIT,rcode) - varidps=NCVID(ncidps,'SP',rcode) + rcode=nf90_open('ps.nc',nf90_nowrite,ncidps) + rcode = nf90_inq_varid(ncidps, 'SP', varidps) print*,'ncidps,varidps',ncidps,varidps endif @@ -119,12 +121,12 @@ c Coordonnee verticale if (.not.guide_modele) then - if (ncep) then - print*,'Vous etes entrain de lire des donnees NCEP' - varidpl=NCVID(ncidpl,'LEVEL',rcode) - else - print*,'Vous etes entrain de lire des donnees ECMWF' - varidpl=NCVID(ncidpl,'PRESSURE',rcode) - endif - print*,'ncidpl,varidpl',ncidpl,varidpl + if (ncep) then + print*,'Vous etes entrain de lire des donnees NCEP' + rcode = nf90_inq_varid(ncidpl, 'LEVEL', varidpl) + else + print*,'Vous etes entrain de lire des donnees ECMWF' + rcode = nf90_inq_varid(ncidpl, 'PRESSURE', varidpl) + endif + print*,'ncidpl,varidpl',ncidpl,varidpl endif ! endif (first) Index: LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/guide_p.F =================================================================== --- LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/guide_p.F (revision 1134) +++ LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/guide_p.F (revision 1135) @@ -4,4 +4,5 @@ subroutine guide_pp(itau,ucov,vcov,teta,q,masse,ps) USE parallel + use netcdf IMPLICIT NONE @@ -229,21 +230,26 @@ IF (mpi_rank==0) THEN if (guide_modele) then - if (ncidpl.eq.-99) ncidpl=NCOPN('apbp.nc',NCNOWRIT,rcod) - else - if (guide_u) then - if (ncidpl.eq.-99) ncidpl=NCOPN('u.nc',NCNOWRIT,rcod) - endif -c - if (guide_v) then - if (ncidpl.eq.-99) ncidpl=NCOPN('v.nc',NCNOWRIT,rcod) - endif -c - if (guide_T) then - if (ncidpl.eq.-99) ncidpl=NCOPN('T.nc',NCNOWRIT,rcod) - endif -c - if (guide_Q) then - if (ncidpl.eq.-99) ncidpl=NCOPN('hur.nc',NCNOWRIT,rcod) - endif + if (ncidpl.eq.-99) rcod=nf90_open('apbp.nc',Nf90_NOWRITe, + $ ncidpl) + else + if (guide_u) then + if (ncidpl.eq.-99) rcod=nf90_open('u.nc',Nf90_NOWRITe, + $ ncidpl) + endif +c + if (guide_v) then + if (ncidpl.eq.-99) rcod=nf90_open('v.nc',nf90_nowrite, + $ ncidpl) + endif +c + if (guide_T) then + if (ncidpl.eq.-99) rcod=nf90_open('T.nc',nf90_nowrite, + $ ncidpl) + endif +c + if (guide_Q) then + if (ncidpl.eq.-99) rcod=nf90_open('hur.nc',nf90_nowrite, + $ ncidpl) + endif c endif !guide_modele @@ -256,5 +262,5 @@ status=NF_INQ_DIMLEN(ncidpl,rid,nlev) print *,'nlev guide', nlev - call ncclos(ncidpl,rcod) + rcod = nf90_close(ncidpl) c Lecture du premier etat des reanalyses. call Gather_Field(ps,ip1jmp1,1,0) Index: LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/read_reanalyse.F =================================================================== --- LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/read_reanalyse.F (revision 1134) +++ LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/read_reanalyse.F (revision 1135) @@ -11,4 +11,5 @@ USE parallel + use netcdf c ----------------------------------------------------------------- c Declarations @@ -72,7 +73,7 @@ print *,'Vous êtes entrain de lire des données sur . niveaux modèle' - ncidpl=NCOPN('apbp.nc',NCNOWRIT,rcode) - varidap=NCVID(ncidpl,'AP',rcode) - varidbp=NCVID(ncidpl,'BP',rcode) + rcode=nf90_open('apbp.nc',nf90_nowrite,ncidpl) + rcode = nf90_inq_varid(ncidpl, 'AP', varidap) + rcode = nf90_inq_varid(ncidpl, 'BP', varidbp) print*,'ncidpl,varidap',ncidpl,varidap endif @@ -80,6 +81,6 @@ c Vent zonal if (guide_u) then - ncidu=NCOPN('u.nc',NCNOWRIT,rcode) - varidu=NCVID(ncidu,'UWND',rcode) + rcode=nf90_open('u.nc',nf90_nowrite,ncidu) + rcode = nf90_inq_varid(ncidu, 'UWND', varidu) print*,'ncidu,varidu',ncidu,varidu if (ncidpl.eq.-99) ncidpl=ncidu @@ -88,6 +89,6 @@ c Vent meridien if (guide_v) then - ncidv=NCOPN('v.nc',NCNOWRIT,rcode) - varidv=NCVID(ncidv,'VWND',rcode) + rcode=nf90_open('v.nc',nf90_nowrite,ncidv) + rcode = nf90_inq_varid(ncidv, 'VWND', varidv) print*,'ncidv,varidv',ncidv,varidv if (ncidpl.eq.-99) ncidpl=ncidv @@ -96,6 +97,6 @@ c Temperature if (guide_T) then - ncidt=NCOPN('T.nc',NCNOWRIT,rcode) - varidt=NCVID(ncidt,'AIR',rcode) + rcode=nf90_open('T.nc',nf90_nowrite,ncidt) + rcode = nf90_inq_varid(ncidt, 'AIR', varidt) print*,'ncidt,varidt',ncidt,varidt if (ncidpl.eq.-99) ncidpl=ncidt @@ -104,6 +105,6 @@ c Humidite if (guide_Q) then - ncidQ=NCOPN('hur.nc',NCNOWRIT,rcode) - varidQ=NCVID(ncidQ,'RH',rcode) + rcode=nf90_open('hur.nc',nf90_nowrite,ncidQ) + rcode = nf90_inq_varid(ncidQ, 'RH', varidQ) print*,'ncidQ,varidQ',ncidQ,varidQ if (ncidpl.eq.-99) ncidpl=ncidQ @@ -112,6 +113,6 @@ c Pression de surface if ((guide_P).OR.(guide_modele)) then - ncidps=NCOPN('ps.nc',NCNOWRIT,rcode) - varidps=NCVID(ncidps,'SP',rcode) + rcode=nf90_open('ps.nc',nf90_nowrite,ncidps) + rcode = nf90_inq_varid(ncidps, 'SP', varidps) print*,'ncidps,varidps',ncidps,varidps endif @@ -119,12 +120,12 @@ c Coordonnee verticale if (.not.guide_modele) then - if (ncep) then - print*,'Vous etes entrain de lire des donnees NCEP' - varidpl=NCVID(ncidpl,'LEVEL',rcode) - else - print*,'Vous etes entrain de lire des donnees ECMWF' - varidpl=NCVID(ncidpl,'PRESSURE',rcode) - endif - print*,'ncidpl,varidpl',ncidpl,varidpl + if (ncep) then + print*,'Vous etes entrain de lire des donnees NCEP' + rcode = nf90_inq_varid(ncidpl, 'LEVEL', varidpl) + else + print*,'Vous etes entrain de lire des donnees ECMWF' + rcode = nf90_inq_varid(ncidpl, 'PRESSURE', varidpl) + endif + print*,'ncidpl,varidpl',ncidpl,varidpl endif print*,'ncidu,varidpl',ncidu,varidpl Index: LMDZ4/branches/LMDZ4-dev/libf/phylmd/read_pstoke.F =================================================================== --- LMDZ4/branches/LMDZ4-dev/libf/phylmd/read_pstoke.F (revision 1134) +++ LMDZ4/branches/LMDZ4-dev/libf/phylmd/read_pstoke.F (revision 1135) @@ -18,4 +18,5 @@ C****************************************************************************** + use netcdf USE dimphy IMPLICIT NONE @@ -116,81 +117,81 @@ if (irec .eq. 0) then - ncidp=NCOPN('phystoke.nc',NCNOWRIT,rcode) - - varidps=NCVID(ncidp,'phis',rcode) + rcode=nf90_open('phystoke.nc',nf90_nowrite,ncidp) + + rcode = nf90_inq_varid(ncidp, 'phis', varidps) print*,'ncidp,varidps',ncidp,varidps - varidpl=NCVID(ncidp,'sig_s',rcode) + rcode = nf90_inq_varid(ncidp, 'sig_s', varidpl) print*,'ncidp,varidpl',ncidp,varidpl - varidai=NCVID(ncidp,'aire',rcode) + rcode = nf90_inq_varid(ncidp, 'aire', varidai) print*,'ncidp,varidai',ncidp,varidai c A FAIRE: Es-il necessaire de stocke t? - varidt=NCVID(ncidp,'t',rcode) + rcode = nf90_inq_varid(ncidp, 't', varidt) print*,'ncidp,varidt',ncidp,varidt - varidmfu=NCVID(ncidp,'mfu',rcode) + rcode = nf90_inq_varid(ncidp, 'mfu', varidmfu) print*,'ncidp,varidmfu',ncidp,varidmfu - varidmfd=NCVID(ncidp,'mfd',rcode) + rcode = nf90_inq_varid(ncidp, 'mfd', varidmfd) print*,'ncidp,varidmfd',ncidp,varidmfd - varidenu=NCVID(ncidp,'en_u',rcode) + rcode = nf90_inq_varid(ncidp, 'en_u', varidenu) print*,'ncidp,varidenu',ncidp,varidenu - variddeu=NCVID(ncidp,'de_u',rcode) + rcode = nf90_inq_varid(ncidp, 'de_u', variddeu) print*,'ncidp,variddeu',ncidp,variddeu - varidend=NCVID(ncidp,'en_d',rcode) + rcode = nf90_inq_varid(ncidp, 'en_d', varidend) print*,'ncidp,varidend',ncidp,varidend - varidded=NCVID(ncidp,'de_d',rcode) + rcode = nf90_inq_varid(ncidp, 'de_d', varidded) print*,'ncidp,varidded',ncidp,varidded - varidch=NCVID(ncidp,'coefh',rcode) + rcode = nf90_inq_varid(ncidp, 'coefh', varidch) print*,'ncidp,varidch',ncidp,varidch c abder (pour thermiques) - varidfmth=NCVID(ncidp,'fm_th',rcode) + rcode = nf90_inq_varid(ncidp, 'fm_th', varidfmth) print*,'ncidp,varidfmth',ncidp,varidfmth - varidenth=NCVID(ncidp,'en_th',rcode) + rcode = nf90_inq_varid(ncidp, 'en_th', varidenth) print*,'ncidp,varidenth',ncidp,varidenth - varidfi=NCVID(ncidp,'frac_impa',rcode) + rcode = nf90_inq_varid(ncidp, 'frac_impa', varidfi) print*,'ncidp,varidfi',ncidp,varidfi - varidfn=NCVID(ncidp,'frac_nucl',rcode) + rcode = nf90_inq_varid(ncidp, 'frac_nucl', varidfn) print*,'ncidp,varidfn',ncidp,varidfn - varidyu1=NCVID(ncidp,'pyu1',rcode) + rcode = nf90_inq_varid(ncidp, 'pyu1', varidyu1) print*,'ncidp,varidyu1',ncidp,varidyu1 - varidyv1=NCVID(ncidp,'pyv1',rcode) + rcode = nf90_inq_varid(ncidp, 'pyv1', varidyv1) print*,'ncidp,varidyv1',ncidp,varidyv1 - varidfts1=NCVID(ncidp,'ftsol1',rcode) + rcode = nf90_inq_varid(ncidp, 'ftsol1', varidfts1) print*,'ncidp,varidfts1',ncidp,varidfts1 - varidfts2=NCVID(ncidp,'ftsol2',rcode) + rcode = nf90_inq_varid(ncidp, 'ftsol2', varidfts2) print*,'ncidp,varidfts2',ncidp,varidfts2 - varidfts3=NCVID(ncidp,'ftsol3',rcode) + rcode = nf90_inq_varid(ncidp, 'ftsol3', varidfts3) print*,'ncidp,varidfts3',ncidp,varidfts3 - varidfts4=NCVID(ncidp,'ftsol4',rcode) + rcode = nf90_inq_varid(ncidp, 'ftsol4', varidfts4) print*,'ncidp,varidfts4',ncidp,varidfts4 - varidpsr1=NCVID(ncidp,'psrf1',rcode) + rcode = nf90_inq_varid(ncidp, 'psrf1', varidpsr1) print*,'ncidp,varidpsr1',ncidp,varidpsr1 - varidpsr2=NCVID(ncidp,'psrf2',rcode) + rcode = nf90_inq_varid(ncidp, 'psrf2', varidpsr2) print*,'ncidp,varidpsr2',ncidp,varidpsr2 - varidpsr3=NCVID(ncidp,'psrf3',rcode) + rcode = nf90_inq_varid(ncidp, 'psrf3', varidpsr3) print*,'ncidp,varidpsr3',ncidp,varidpsr3 - varidpsr4=NCVID(ncidp,'psrf4',rcode) + rcode = nf90_inq_varid(ncidp, 'psrf4', varidpsr4) print*,'ncidp,varidpsr4',ncidp,varidpsr4 Index: LMDZ4/branches/LMDZ4-dev/libf/phylmd/read_pstoke0.F =================================================================== --- LMDZ4/branches/LMDZ4-dev/libf/phylmd/read_pstoke0.F (revision 1134) +++ LMDZ4/branches/LMDZ4-dev/libf/phylmd/read_pstoke0.F (revision 1135) @@ -17,5 +17,5 @@ C****************************************************************************** - + use netcdf USE dimphy IMPLICIT NONE @@ -121,80 +121,80 @@ if (irec .eq. 0) then - ncidp=NCOPN('phystoke.nc',NCNOWRIT,rcode) - - varidps=NCVID(ncidp,'phis',rcode) + rcode=nf90_open('phystoke.nc',nf90_nowrite,ncidp) + + rcode = nf90_inq_varid(ncidp, 'phis', varidps) print*,'ncidp,varidps',ncidp,varidps - varidpl=NCVID(ncidp,'sig_s',rcode) + rcode = nf90_inq_varid(ncidp, 'sig_s', varidpl) print*,'ncidp,varidpl',ncidp,varidpl - varidai=NCVID(ncidp,'aire',rcode) + rcode = nf90_inq_varid(ncidp, 'aire', varidai) print*,'ncidp,varidai',ncidp,varidai - varidt=NCVID(ncidp,'t',rcode) + rcode = nf90_inq_varid(ncidp, 't', varidt) print*,'ncidp,varidt',ncidp,varidt - varidmfu=NCVID(ncidp,'mfu',rcode) + rcode = nf90_inq_varid(ncidp, 'mfu', varidmfu) print*,'ncidp,varidmfu',ncidp,varidmfu - varidmfd=NCVID(ncidp,'mfd',rcode) + rcode = nf90_inq_varid(ncidp, 'mfd', varidmfd) print*,'ncidp,varidmfd',ncidp,varidmfd - varidenu=NCVID(ncidp,'en_u',rcode) + rcode = nf90_inq_varid(ncidp, 'en_u', varidenu) print*,'ncidp,varidenu',ncidp,varidenu - variddeu=NCVID(ncidp,'de_u',rcode) + rcode = nf90_inq_varid(ncidp, 'de_u', variddeu) print*,'ncidp,variddeu',ncidp,variddeu - varidend=NCVID(ncidp,'en_d',rcode) + rcode = nf90_inq_varid(ncidp, 'en_d', varidend) print*,'ncidp,varidend',ncidp,varidend - varidded=NCVID(ncidp,'de_d',rcode) + rcode = nf90_inq_varid(ncidp, 'de_d', varidded) print*,'ncidp,varidded',ncidp,varidded - varidch=NCVID(ncidp,'coefh',rcode) + rcode = nf90_inq_varid(ncidp, 'coefh', varidch) print*,'ncidp,varidch',ncidp,varidch c Thermiques - varidfmth=NCVID(ncidp,'fm_th',rcode) + rcode = nf90_inq_varid(ncidp, 'fm_th', varidfmth) print*,'ncidp,varidfmth',ncidp,varidfmth - varidenth=NCVID(ncidp,'en_th',rcode) + rcode = nf90_inq_varid(ncidp, 'en_th', varidenth) print*,'ncidp,varidenth',ncidp,varidenth - varidfi=NCVID(ncidp,'frac_impa',rcode) + rcode = nf90_inq_varid(ncidp, 'frac_impa', varidfi) print*,'ncidp,varidfi',ncidp,varidfi - varidfn=NCVID(ncidp,'frac_nucl',rcode) + rcode = nf90_inq_varid(ncidp, 'frac_nucl', varidfn) print*,'ncidp,varidfn',ncidp,varidfn - varidyu1=NCVID(ncidp,'pyu1',rcode) + rcode = nf90_inq_varid(ncidp, 'pyu1', varidyu1) print*,'ncidp,varidyu1',ncidp,varidyu1 - varidyv1=NCVID(ncidp,'pyv1',rcode) + rcode = nf90_inq_varid(ncidp, 'pyv1', varidyv1) print*,'ncidp,varidyv1',ncidp,varidyv1 - varidfts1=NCVID(ncidp,'ftsol1',rcode) + rcode = nf90_inq_varid(ncidp, 'ftsol1', varidfts1) print*,'ncidp,varidfts1',ncidp,varidfts1 - varidfts2=NCVID(ncidp,'ftsol2',rcode) + rcode = nf90_inq_varid(ncidp, 'ftsol2', varidfts2) print*,'ncidp,varidfts2',ncidp,varidfts2 - varidfts3=NCVID(ncidp,'ftsol3',rcode) + rcode = nf90_inq_varid(ncidp, 'ftsol3', varidfts3) print*,'ncidp,varidfts3',ncidp,varidfts3 - varidfts4=NCVID(ncidp,'ftsol4',rcode) + rcode = nf90_inq_varid(ncidp, 'ftsol4', varidfts4) print*,'ncidp,varidfts4',ncidp,varidfts4 - varidpsr1=NCVID(ncidp,'psrf1',rcode) + rcode = nf90_inq_varid(ncidp, 'psrf1', varidpsr1) print*,'ncidp,varidpsr1',ncidp,varidpsr1 - varidpsr2=NCVID(ncidp,'psrf2',rcode) + rcode = nf90_inq_varid(ncidp, 'psrf2', varidpsr2) print*,'ncidp,varidpsr2',ncidp,varidpsr2 - varidpsr3=NCVID(ncidp,'psrf3',rcode) + rcode = nf90_inq_varid(ncidp, 'psrf3', varidpsr3) print*,'ncidp,varidpsr3',ncidp,varidpsr3 - varidpsr4=NCVID(ncidp,'psrf4',rcode) + rcode = nf90_inq_varid(ncidp, 'psrf4', varidpsr4) print*,'ncidp,varidpsr4',ncidp,varidpsr4