From 11a1e9b5bddcac7c7f94cc925c4aadf6db59dbf0 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Thu, 8 Oct 2020 15:13:18 -0400 Subject: [PATCH 1/2] Fixes #563. Fixes for Leap Year Extrapolation --- base/MAPL_ExtDataGridCompMod.F90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/MAPL_ExtDataGridCompMod.F90 b/base/MAPL_ExtDataGridCompMod.F90 index 0d692254e0a3..0bc65a4c8394 100644 --- a/base/MAPL_ExtDataGridCompMod.F90 +++ b/base/MAPL_ExtDataGridCompMod.F90 @@ -2416,7 +2416,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) @@ -2452,8 +2452,8 @@ 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 From 65cb85831f09c4fa0bc203d1dd902831c9980f16 Mon Sep 17 00:00:00 2001 From: Matthew Thompson Date: Fri, 9 Oct 2020 12:03:00 -0400 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index babb41d398f7..0585d5a14d13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.3.2] - 2020-10-09 +### Fixed + +- Fixed a bug in ExtData when extrapolating on a Leap Day (#563) + ### Added - Added a deflate and bit shaving option to Regrid_Util.x