Skip to content

Commit

Permalink
Merge w/ CVS-GEOSadas-5_27_1
Browse files Browse the repository at this point in the history
  • Loading branch information
rtodling committed Oct 26, 2020
1 parent 4ff249a commit 7ab3247
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions MAPL_Base/MAPL_ExtDataGridCompMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2393,7 +2393,7 @@ subroutine UpdateBracketTime(item,cTime,bSide,interpTime,fileTime,file_processed
! Convert year offset to the future value
yrOffset = iYr - cYearOff
! Determine the template time
call ESMF_TimeSet(newTime,yy=iYr,mm=imm,dd=idd,h=ihr,m=imn,s=isc,__RC__)
call OffsetTimeYear(cTime,yrOffset,newTime,__RC__)
ftime = item%reff_time
n = 0
do while (.not.found)
Expand Down Expand Up @@ -2428,8 +2428,7 @@ subroutine UpdateBracketTime(item,cTime,bSide,interpTime,fileTime,file_processed
! yrOffset: Number of years added from current time to get file time
Do While ((.not.found).and.(abs(yrOffset).lt.maxOffset))
yrOffset = yrOffset - 1
iYr = refYear + yrOffset
call ESMF_TimeSet(newTime,yy=iyr,mm=imm,dd=idd,h=ihr,m=imn,s=isc,__RC__)
call OffsetTimeYear(cTime,yrOffset,newTime,__RC__)
! Error check - if the new time is before the first file time,
! all is lost
If (newTime.lt.xTSeries(1)) exit
Expand Down

0 comments on commit 7ab3247

Please sign in to comment.