Changeset 367 for IOIPSL/trunk/src/restcom.f90

Timestamp:

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

Author:

bellier

Message:

Adapting some tests to be conform with new versions of NETCDF

File:

• IOIPSL/trunk/src/restcom.f90 (modified) (4 diffs)

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
 !---