--- trunk/libf/IOIPSL/Histcom/histend.f90	2012/07/26 14:37:37	62
+++ trunk/Sources/IOIPSL/Histcom/histend.f	2015/04/29 15:47:56	134
@@ -9,14 +9,14 @@
     ! This subroutine ends the declaration of variables, sets the time
     ! axes in the NetCDF file and puts it into write mode.
 
-    USE ioipslmpp, ONLY: ioipslmpp_addatt
     USE errioipsl, ONLY: histerr
     USE histcom_var, ONLY: date0, freq_opp, freq_wrt, fullop, &
          missing_val, name, nb_tax, nb_var, ncdf_ids, ncvar_ids, regular, &
          tax_name, tdimid, tid, title, topp, unit_name, var_axid, var_zaxid, &
          xid, yid, zax_ids, zax_name
-    USE ioget_calendar_m, ONLY: ioget_calendar
-    USE calendar, ONLY: ju2ymds
+    USE ioget_calendar_m, ONLY: ioget_calendar_str
+    USE ioipslmpp, ONLY: ioipslmpp_addatt
+    USE ju2ymds_m, ONLY: ju2ymds
     USE netcdf, ONLY: nf90_float, nf90_unlimited
     use netcdf95, only: nf95_def_dim, nf95_def_var, nf95_put_att, nf95_enddef
 
@@ -24,14 +24,14 @@
 
     ! Local:
     INTEGER ncid, varid
-    INTEGER iret, ndim, iv, itx, ziv
+    INTEGER ndim, iv, itx, ziv
     INTEGER itax
     INTEGER dims(4), dim_cnt
     INTEGER year, month, day, hours, minutes
     REAL sec
     REAL rtime0
     CHARACTER(len=20) tname, tunit
-    CHARACTER(len=30) str30
+    CHARACTER(len=42) str30
     CHARACTER(len=80) ttitle
     CHARACTER(len=120) assoc
     CHARACTER(len=70) str70
@@ -74,7 +74,7 @@
        WRITE(str70, 7000) year, month, day, hours, minutes, int(sec)
        call nf95_put_att(ncid, tdimid(fileid, itx), 'units', trim(str70))
 
-       CALL ioget_calendar(str30)
+       CALL ioget_calendar_str(str30)
        call nf95_put_att(ncid, tdimid(fileid, itx), 'calendar', trim(str30))
 
        call nf95_put_att(ncid, tdimid(fileid, itx), 'title', 'Time')