Changeset 1135 for LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar

Timestamp:

Mar 26, 2009, 1:30:23 PM (16 years ago)

Author:

lguez

Message:

Translated calls using NetCDF 2.4 interface to calls using NetCDF 3.6
Fortran 90 interface.

Location:

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar

Files:

• guide_p.F (modified) (3 diffs)
• read_reanalyse.F (modified) (8 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/guide_p.F

@@ -4 +4 @@
       subroutine guide_pp(itau,ucov,vcov,teta,q,masse,ps)
       USE parallel
+      use netcdf
 
       IMPLICIT NONE
@@ -229 +230 @@
          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 +262 @@
           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)

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/read_reanalyse.F

@@ -11 +11 @@
 
        USE parallel
+       use netcdf
 c -----------------------------------------------------------------
 c   Declarations
@@ -72 +73 @@
             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 +81 @@
 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 +89 @@
 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 +97 @@
 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 +105 @@
 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 +113 @@
 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 +120 @@
 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