Changeset 5536 for LMDZ6/branches/contrails/libf/phylmd/Dust/read_surface.f90

Timestamp:

Feb 12, 2025, 10:08:35 AM (7 days ago)

Author:

aborella

Message:

Revert merge with trunk

Location:

LMDZ6/branches/contrails

Files:

• . (modified) (1 prop)
• libf/phylmd/Dust/read_surface.f90 (modified) (7 diffs)

LMDZ6/branches/contrails/libf/phylmd/Dust/read_surface.f90

@@ -31 +31 @@
        real surfa_glo(klon_glo,5)
 !
-       integer ncid, varid, rcode, varlatid,tmpid
-       integer start_(2),count_(2)
+       integer ncid, varid, rcode
+       integer start(2),count(2),status
        integer i,j,l,ig
        character*1 str1
@@ -41 +41 @@
       real, dimension(nbp_lat) :: lats
       real, dimension(nbp_lat) :: lats_glo
-      integer, dimension(1) :: start_j,endj
+      integer, dimension(1) :: startj,endj
 !JE20140526>>
 !$OMP MASTER
@@ -47 +47 @@
 
        print*,'Lecture du fichier donnees_lisa.nc' 
-       rcode=nf90_open('donnees_lisa.nc',nf90_nowrite,ncid)
-       if ( rcode /= 0 ) then ; call abort_physic('LMDZ','open donnees_lisa.nc dans read_vent',1) ; endif
-
+       ncid=nf90_open('donnees_lisa.nc',nf90_nowrite,rcode)
 
 !JE20140526<<: check if are inversed or not the latitude grid in donnes_lisa
@@ -56 +54 @@
       isinversed=.false.
       do i=1,5
-          if (i==1) aux4s='latu'
-          if (i==2) aux4s='LATU'
-          if (i==3) aux4s='LatU'
-          if (i==4) aux4s='Latu'
-          if (i==5) aux4s='latU'
-          rcode = nf90_inq_varid(ncid, aux4s, tmpid)
-          IF ((rcode==0).and.( .not. outcycle )) THEN
-            outcycle=.true.
-            varlatid=tmpid
-          ENDIF
+       if (i==1) aux4s='latu'
+       if (i==2) aux4s='LATU'
+       if (i==3) aux4s='LatU'
+       if (i==4) aux4s='Latu'
+       if (i==5) aux4s='latU'
+       status = nf90_inq_varid(ncid, aux4s, rcode)
+!       print *,'stat,i',status,i,outcycle,aux4s
+!       print *,'ifclause',status.NE. nf90_noerr ,outcycle == .false.
+       IF ((.not.(status.NE. nf90_noerr) ).and.( .not. outcycle )) THEN
+         outcycle=.true.
+         latstr=aux4s
+       ENDIF
       enddo ! check if it inversed lat
-      start_j(1)=1
+      startj(1)=1
+!      endj(1)=jjp1
       endj(1)=nbp_lat
-      rcode = nf90_get_var(ncid, varlatid, lats_glo, start_j, endj)
-      if ( .not. outcycle ) then ; call abort_physic('LMDZ','get lat dans read_surface',1) ; endif
+      varid=nf90_inq_varid(ncid,latstr,rcode)
 
-
+          status = nf90_get_var(ncid, varid, lats_glo, startj, endj)
+!      print *,latstr,varid,status,jjp1,rcode
+!      IF (status .NE. nf90_noerr) print*,'NOOOOOOO'
+!      print *,lats
+!stop
 
 ! check if netcdf is latitude inversed or not. 
@@ -82 +86 @@
           write(str1,'(i1)') i
           varname=trim(name)//str1
-          rcode=nf90_inq_varid(ncid,trim(varname),varid)
-          if ( rcode /= 0 ) then ; call abort_physic('LMDZ','get'//varname//'  dans read_vent',1) ; endif
+       print*,'lecture variable:',varname
+          varid=nf90_inq_varid(ncid,trim(varname),rcode)
 !          varid=nf90_inq_varid(ncid,varname,rcode)
 
@@ -89 +93 @@
 !  -----------------------------------------------------
 
-          start_(1)=1
-          start_(2)=1      
-          count_(1)=nbp_lon+1
-!          count_(1)=iip1
-          count_(2)=nbp_lat
-!          count_(2)=jjp1
+          start(1)=1
+          start(2)=1      
+          count(1)=nbp_lon+1
+!          count(1)=iip1
+          count(2)=nbp_lat
+!          count(2)=jjp1
 
 ! mise a zero des tableaux 
@@ -102 +106 @@
 ! Lecture
 ! -----------------------
-          rcode = nf90_get_var(ncid, varid, tmp_dyn_glo, start_, count_)
-          if ( rcode /= 0 ) then ; call abort_physic('LMDZ','get'//varname//'  dans read_vent',1) ; endif
+          status = nf90_get_var(ncid, varid, tmp_dyn_glo, start, count)
 
 !      call dump2d(iip1,jjp1,tmp_dyn,'tmp_dyn   ')