Ignore:
Timestamp:
07/28/08 10:28:22 (14 years ago)
Author:
bellier
Message:

Adapting some tests to be conform with new versions of NETCDF

File:
1 edited

Legend:

Unmodified
Added
Removed
  • IOIPSL/trunk/src/restcom.f90

    r335 r367  
    658658! Get the calendar if possible. Else it will be gregorian. 
    659659!- 
    660   IF (tax_size_in(nb_fi) > 0 ) THEN 
    661     calendar = 'XXXXX' 
     660  IF (tax_size_in(nb_fi) > 0) THEN 
    662661    iret = NF90_GET_ATT(ncfid,tax_varid_in(nb_fi),'calendar',calendar) 
    663     IF ( INDEX(calendar,'XXXXX') < 0 ) THEN 
     662    IF (iret == NF90_NOERR) THEN 
    664663      CALL ioconf_calendar (calendar) 
    665664      IF (check) THEN 
     
    828827    cal = (/'JAN','FEB','MAR','APR','MAY','JUN', & 
    829828            'JUL','AUG','SEP','OCT','NOV','DEC'/) 
    830   CHARACTER(LEN=30) :: timenow,conv 
     829  CHARACTER(LEN=30) :: timenow 
    831830  LOGICAL :: check = .FALSE. 
    832831!--------------------------------------------------------------------- 
     
    951950!  5.2 Write global attributes 
    952951!- 
    953   conv='GDT 1.2' 
    954   iret = NF90_PUT_ATT(ncfid,NF90_GLOBAL,'Conventions',TRIM(conv)) 
     952  iret = NF90_PUT_ATT(ncfid,NF90_GLOBAL,'Conventions',"CF-1.1") 
    955953  iret = NF90_PUT_ATT(ncfid,NF90_GLOBAL,'file_name',TRIM(fname)) 
    956954!!  TO BE DONE LATER 
     
    21762174      iret =  NF90_PUT_ATT(ncfid,varid_out(fid,nbvar_out(fid)), & 
    21772175 &                         'long_name',TRIM(rest_lname)) 
    2178       rest_lname  = 'XXXXX' 
     2176      rest_lname = 'XXXXX' 
    21792177    ENDIF 
    21802178!--- 
Note: See TracChangeset for help on using the changeset viewer.