prefer seconds for timedelta to avoid problems with long timeranges

Author: Davide Cesari

bin/grib_api_csv.F90

@@ -142,7 +142,7 @@ SUBROUTINE grib_api_csv_export(v7d, vg6d, iun, header)
 DO l = 1, SIZE(vg6d%time)
   CALL getval(vg6d%time(l), isodate=csv_time, simpledate=csv_simpletime)
   DO k = 1, SIZE(vg6d%timerange)
-    veriftime = vg6d%time(l) + timedelta_new(msec=vg6d%timerange(k)%p1*1000)
+    veriftime = vg6d%time(l) + timedelta_new(sec=vg6d%timerange(k)%p1)
     CALL getval(veriftime, simpledate=csv_simplevertime)
     DO j = 1, SIZE(vg6d%level)
 ! TODO handle coupling of variables on a single csv record (e.g. U/V)

vol7d/stat_proc_engine.F90

@@ -68,7 +68,7 @@ SUBROUTINE recompute_stat_proc_agg_common(itime, itimerange, stat_proc, tri, &
 ! the shortest interval available is used, the longest could be used
 ! obtaining more data but worse
   lstart = itime(1) - &
-   timedelta_new(msec=MINVAL(itimerange(:)%p2, mask=tr_mask(:))*1000)
+   timedelta_new(sec=MINVAL(itimerange(:)%p2, mask=tr_mask(:)))
 
   lstart = lstart-(MOD(lstart, step)) ! round to step, check the - sign!!!
 ENDIF
@@ -102,7 +102,7 @@ SUBROUTINE recompute_stat_proc_agg_common(itime, itimerange, stat_proc, tri, &
 
   nval = nval + 1
   map_tr(nval) = j ! mappatura per ottimizzare il successivo ciclo sui timerange
-  dt1 = timedelta_new(msec=itimerange(j)%p2*1000)
+  dt1 = timedelta_new(sec=itimerange(j)%p2)
 
   ! calcolo il numero teorico di intervalli in ingresso che
   ! contribuiscono all'intervallo corrente in uscita
@@ -497,10 +497,10 @@ SUBROUTINE recompute_stat_proc_agg_common_exp(itime, itimerange, stat_proc, tri,
 minp2 = MINVAL(itimerange(:)%p2, mask=mask_timerange)
 minp1mp2 = MINVAL(itimerange(:)%p1 - itimerange(:)%p2, mask=mask_timerange)
 IF (time_definition == 0) THEN ! reference time
-  lstart = lstart + timedelta_new(msec=1000*minp1mp2)
-  lend = lend + timedelta_new(msec=1000*maxp1)
+  lstart = lstart + timedelta_new(sec=minp1mp2)
+  lend = lend + timedelta_new(sec=maxp1)
 ELSE ! verification time
-  lstart = lstart - timedelta_new(msec=1000*minp2)
+  lstart = lstart - timedelta_new(sec=minp2)
   lstart = lstart - (MOD(lstart, step)) ! round to step, check the - sign!!!
 ENDIF
 #ifdef DEBUG
@@ -617,8 +617,8 @@ SUBROUTINE time_timerange_get_period(time, timerange, time_definition, &
 TYPE(timedelta) :: p1, p2
 
 
-p1 = timedelta_new(msec=timerange%p1*1000) ! end of period
-p2 = timedelta_new(msec=timerange%p2*1000) ! length of period
+p1 = timedelta_new(sec=timerange%p1) ! end of period
+p2 = timedelta_new(sec=timerange%p2) ! length of period
 
 IF (time == datetime_miss .OR. .NOT.c_e(timerange%p1) .OR. .NOT.c_e(timerange%p2) .OR. &
  (timerange%p1 > 0 .AND. timerange%p1 < timerange%p2) .OR. &

vol7d/vol7d_dballe_class.F03

@@ -711,7 +711,7 @@ subroutine dba2v7d(this,metaanddatav,time_definition, set_network)
   do i =1,size(metaanddatav)
     metaanddatav(i)%metadata%datetime%datetime = &
      metaanddatav(i)%metadata%datetime%datetime - &
-     timedelta_new(msec=metaanddatav(i)%metadata%timerange%vol7d_timerange%p1*1000)
+     timedelta_new(sec=metaanddatav(i)%metadata%timerange%vol7d_timerange%p1)
   end do
 end if
 

vol7d/vol7d_dballeold_class.F90

@@ -894,7 +894,7 @@ SUBROUTINE vol7d_dballe_importvvns_dba(this, var, network, coordmin, coordmax, t
 
                                 ! take in account time_definition
   if (this%vol7d%time_definition == 0) buffer(i)%time = buffer(i)%time - &
-   timedelta_new(msec=buffer(i)%timerange%p1*1000)
+   timedelta_new(sec=buffer(i)%timerange%p1)
 
 end do
 
@@ -3202,7 +3202,7 @@ SUBROUTINE vol7d_dballe_importvvns_file(this, var, network, coordmin, coordmax,
 
       ! take in account time_definition
       IF (this%vol7d%time_definition == 0) buffer(nd)%time = buffer(nd)%time - &
-       timedelta_new(msec=buffer(nd)%timerange%p1*1000)
+       timedelta_new(sec=buffer(nd)%timerange%p1)
 
                                 ! put ana in bufferana becouse we can have no station data but we need ana
                                 !todo ; we have to do the same for network but I am tired ....      

vol7d/vol7d_serialize_dballe_class.F03

@@ -509,7 +509,7 @@ SUBROUTINE vol7d_serialize_export(this, metaanddatal)
   if (this%v7d%time_definition == 0) then
     metaanddata%metadata%datetime%datetime = &
      metaanddata%metadata%datetime%datetime + &
-     timedelta_new(msec=metaanddata%metadata%timerange%vol7d_timerange%p1*1000)
+     timedelta_new(sec=metaanddata%metadata%timerange%vol7d_timerange%p1)
   end if
 
 !!  set to missing

volgrid6d/gridinfo_class.F90

@@ -641,7 +641,7 @@ SUBROUTINE time_import_gribapi(this,gaid)
       CALL grib_get(gaid,'lengthOfTimeRange',p2g)
       CALL grib_get(gaid,'indicatorOfUnitForTimeRange',unit)
       CALL g2_interval_to_second(unit, p2g, p2)
-      this = this + timedelta_new(msec=p2*1000)
+      this = this + timedelta_new(sec=p2)
     ELSE IF ((status == GRIB_SUCCESS .AND. ttimeincr == 2) .OR. &
      status /= GRIB_SUCCESS) THEN ! usual case
 ! do nothing
@@ -679,7 +679,7 @@ SUBROUTINE time_export_gribapi(this, gaid, timerange)
   IF (timerange%p1 >= timerange%p2) THEN ! forecast-like
     CALL code_referencetime(this)
   ELSE IF (timerange%p1 == 0) THEN ! analysis-like
-    CALL code_referencetime(this-timedelta_new(msec=timerange%p2*1000))
+    CALL code_referencetime(this-timedelta_new(sec=timerange%p2))
   ELSE ! bad timerange
     CALL l4f_log( L4F_ERROR, 'Timerange with 0>p1>p2 cannot be exported in grib2')
     CALL raise_error()
@@ -906,7 +906,7 @@ SUBROUTINE timerange_export_gribapi(this, gaid, reftime)
       CALL timerange_v7d_to_g2(this%p1-this%p2,p1,unit)
       CALL grib_set(gaid,'indicatorOfUnitOfTimeRange',unit)
       CALL grib_set(gaid,'forecastTime',p1)
-      CALL code_endoftimeinterval(reftime+timedelta_new(msec=this%p1*1000))
+      CALL code_endoftimeinterval(reftime+timedelta_new(sec=this%p1))
 ! Successive times processed have same start time of forecast,
 ! forecast time is incremented
       CALL grib_set(gaid,'typeOfStatisticalProcessing',this%timerange)

volgrid6d/volgrid6d_class.F90

@@ -871,7 +871,7 @@ SUBROUTINE import_from_gridinfo(this, gridinfo, force, dup_mode, clone)
 
 correctedtime = gridinfo%time
 IF (this%time_definition == 1) correctedtime = correctedtime + &
- timedelta_new(msec=gridinfo%timerange%p1*1000)
+ timedelta_new(sec=gridinfo%timerange%p1)
 itime = index(this%time, correctedtime)
 IF (itime == 0 .AND. lforce) THEN
   itime = index(this%time, datetime_miss)
@@ -1005,7 +1005,7 @@ SUBROUTINE export_to_gridinfo(this, gridinfo, itime, itimerange, ilevel, ivar, &
 
 IF (this%time_definition == 1) THEN
   correctedtime = this%time(itime) - &
-   timedelta_new(msec=this%timerange(itimerange)%p1*1000)
+   timedelta_new(sec=this%timerange(itimerange)%p1)
 ELSE
   correctedtime = this%time(itime)
 ENDIF
@@ -1094,7 +1094,7 @@ SUBROUTINE import_from_gridinfovv(this, gridinfov, dup_mode, clone, decode, &
   IF (time_definition == 1) THEN
     DO i = 1, gridinfov%arraysize
       correctedtime(i) = correctedtime(i) + &
-       timedelta_new(msec=gridinfov%array(i)%timerange%p1*1000)
+       timedelta_new(sec=gridinfov%array(i)%timerange%p1)
     ENDDO
   ENDIF
 ENDIF
@@ -1934,10 +1934,10 @@ SUBROUTINE volgrid6d_v7d_transform_compute(this, volgrid6d_in, vol7d_out, &
       do itimerange=1,ntimerange
         if (vol7d_out%time_definition > volgrid6d_in%time_definition) then
           validitytime(itime,itimerange) = &
-           volgrid6d_in%time(itime) + timedelta_new(msec=volgrid6d_in%timerange(itimerange)%p1*1000)
+           volgrid6d_in%time(itime) + timedelta_new(sec=volgrid6d_in%timerange(itimerange)%p1)
         else
           validitytime(itime,itimerange) = &
-           volgrid6d_in%time(itime) - timedelta_new(msec=volgrid6d_in%timerange(itimerange)%p1*1000)
+           volgrid6d_in%time(itime) - timedelta_new(sec=volgrid6d_in%timerange(itimerange)%p1)
         end if
       end do
     end do
@@ -2097,10 +2097,10 @@ SUBROUTINE volgrid6d_v7d_transform(this, volgrid6d_in, vol7d_out, v7d, &
       do itimerange=1,ntimerange
         if (time_definition > volgrid6d_in%time_definition) then
           validitytime(itime,itimerange) = &
-           volgrid6d_in%time(itime) + timedelta_new(msec=volgrid6d_in%timerange(itimerange)%p1*1000)
+           volgrid6d_in%time(itime) + timedelta_new(sec=volgrid6d_in%timerange(itimerange)%p1)
         else
           validitytime(itime,itimerange) = &
-           volgrid6d_in%time(itime) - timedelta_new(msec=volgrid6d_in%timerange(itimerange)%p1*1000)
+           volgrid6d_in%time(itime) - timedelta_new(sec=volgrid6d_in%timerange(itimerange)%p1)
         end if
       end do
     end do