Changeset 367 for IOIPSL/trunk

Timestamp:

07/28/08 10:28:22 (16 years ago)

Author:

bellier

Message:

Adapting some tests to be conform with new versions of NETCDF

Location:

IOIPSL/trunk/src

Files:

• flincom.f90 (modified) (5 diffs)
• restcom.f90 (modified) (4 diffs)

IOIPSL/trunk/src/flincom.f90

@@ -368 +368 @@
 !-
   INTEGER :: iret, vid, fid, nbdim, i, iilast, jjlast
-  INTEGER :: it, len, gdtt_id, old_id, iv, gdtmaf_id
+  INTEGER :: gdtt_id, old_id, iv, gdtmaf_id
   CHARACTER(LEN=250) :: name
   CHARACTER(LEN=80) :: units, calendar
@@ -391 +391 @@
       iideb, iilen, iilast, jjdeb, jjlen, jjlast
 !-
-! 1.0 get all infos on the file  we if it is not yet opened
+! 1.0 get all infos on the file
 !-
 ! Either the fid_out has not been initialized (0 or very large)
@@ -599 +599 @@
 !---
     ALLOCATE(vec_tmp(ttm))
-    iret = NF90_GET_VAR (fid, vid, vec_tmp, &
-             start=(/ 1 /), count=(/ ttm /))
+    iret = NF90_GET_VAR (fid,vid,vec_tmp,start=(/ 1 /),count=(/ ttm /))
     itaus(1:ttm) = NINT(vec_tmp(1:ttm))
     DEALLOCATE(vec_tmp)
@@ -609 +608 @@
 !---
 !-- Find the calendar
-    calendar='XXXX'
-    iret = NF90_GET_ATT (fid, gdtmaf_id, 'calendar', calendar)
-    IF ( INDEX(calendar,'XXXX') < 1 ) THEN
-       CALL ioconf_calendar(calendar)
+    iret = NF90_GET_ATT (fid,gdtmaf_id,'calendar',calendar)
+    IF (iret == NF90_NOERR) THEN
+      CALL ioconf_calendar(calendar)
     ENDIF
 !--
     units = ''
-    iret = NF90_GET_ATT (fid, vid, 'units', units)
+    iret = NF90_GET_ATT (fid,vid,'units',units)
     IF (gdtt_id > 0) THEN
       units = units(INDEX(units,'since')+6:LEN_TRIM(units))
@@ -1629 +1627 @@
   LOGICAL :: check = .FALSE.
 !---------------------------------------------------------------------
+  IF (check) THEN
+    WRITE (*,*) 'flinget_scal in file with id ',fid_in
+  ENDIF
+!-
   fid = ncids(fid_in)
 !-

IOIPSL/trunk/src/restcom.f90

@@ -658 +658 @@
 ! Get the calendar if possible. Else it will be gregorian.
 !-
-  IF (tax_size_in(nb_fi) > 0 ) THEN
-    calendar = 'XXXXX'
+  IF (tax_size_in(nb_fi) > 0) THEN
     iret = NF90_GET_ATT(ncfid,tax_varid_in(nb_fi),'calendar',calendar)
-    IF ( INDEX(calendar,'XXXXX') < 0 ) THEN
+    IF (iret == NF90_NOERR) THEN
       CALL ioconf_calendar (calendar)
       IF (check) THEN
@@ -828 +827 @@
     cal = (/'JAN','FEB','MAR','APR','MAY','JUN', &
             'JUL','AUG','SEP','OCT','NOV','DEC'/)
-  CHARACTER(LEN=30) :: timenow,conv
+  CHARACTER(LEN=30) :: timenow
   LOGICAL :: check = .FALSE.
 !---------------------------------------------------------------------
@@ -951 +950 @@
 !  5.2 Write global attributes
 !-
-  conv='GDT 1.2'
-  iret = NF90_PUT_ATT(ncfid,NF90_GLOBAL,'Conventions',TRIM(conv))
+  iret = NF90_PUT_ATT(ncfid,NF90_GLOBAL,'Conventions',"CF-1.1")
   iret = NF90_PUT_ATT(ncfid,NF90_GLOBAL,'file_name',TRIM(fname))
 !!  TO BE DONE LATER
@@ -2176 +2174 @@
       iret =  NF90_PUT_ATT(ncfid,varid_out(fid,nbvar_out(fid)), &
  &                         'long_name',TRIM(rest_lname))
-      rest_lname  = 'XXXXX'
+      rest_lname = 'XXXXX'
     ENDIF
 !---