--- trunk/libf/IOIPSL/Histcom/histdef.f90 2012/10/02 15:50:56 67 +++ trunk/IOIPSL/Histcom/histdef.f 2014/09/04 10:05:52 104 @@ -21,8 +21,8 @@ slab_ori, slab_sz, sopps, tax_last, tax_name, tax_name_length, & title, topp, unit_name, var_axid, var_haxid, var_zaxid, zax_name, & zax_size, zorig, zsize - USE ioget_calendar_m, ONLY: ioget_calendar - USE mathelp, ONLY: buildop + USE ioget_calendar_m, ONLY: ioget_calendar_real + USE buildop_m, ONLY: buildop INTEGER, INTENT(IN):: fileid ! (ID of the file the variable should be archived in) @@ -206,12 +206,12 @@ IF (szz/=zax_size(fileid, zid)) THEN str20 = zax_name(fileid, zid) - str70 = 'The size of the zoom does not correspond ' // & - 'to the size of the chosen vertical axis' WRITE (str71, '("Size of zoom in z:", I4)') szz WRITE (str72, '("Size declared for axis ", a, ":", I4)') & trim(str20), zax_size(fileid, zid) - CALL histerr(3, 'histdef', str70, str71, str72) + CALL histerr(3, 'histdef', 'The size of the zoom does not ' & + // 'correspond to the size of the chosen vertical axis', & + str71, str72) END IF ! Is the zoom smaler that the total size of the variable ? @@ -255,15 +255,15 @@ freq_opp(fileid, iv) = pfreq_opp freq_wrt(fileid, iv) = pfreq_wrt - CALL ioget_calendar(un_an, un_jour) + CALL ioget_calendar_real(un_an, un_jour) IF (pfreq_opp<0) THEN - CALL ioget_calendar(un_an) + CALL ioget_calendar_real(un_an) test_fopp = pfreq_opp*(-1.)*un_an/12.*un_jour ELSE test_fopp = pfreq_opp END IF IF (pfreq_wrt<0) THEN - CALL ioget_calendar(un_an) + CALL ioget_calendar_real(un_an) test_fwrt = pfreq_wrt*(-1.)*un_an/12.*un_jour ELSE test_fwrt = pfreq_wrt