From fee91204919fa20d26cc611b47a50ef4f795a143 Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Mon, 11 Apr 2022 15:02:07 -0700 Subject: [PATCH] Add discrete keyword and increase number of years for CalendarTime (#2943) * Increased number of years from 11 to 21 For #2942 * Added discrete keyword For #2942 * Removed discrete from ZeroOrderHold This is needed because the assignment is not in a when clause --- .../CDL/Continuous/Sources/CalendarTime.mo | 7 ++++- .../Controls/OBC/CDL/Discrete/Sampler.mo | 23 +++------------- .../Controls/OBC/CDL/Discrete/TriggeredMax.mo | 26 +++---------------- .../OBC/CDL/Discrete/TriggeredMovingMean.mo | 8 +++++- .../OBC/CDL/Discrete/ZeroOrderHold.mo | 4 +-- Buildings/package.mo | 21 +++++++++++++-- 6 files changed, 42 insertions(+), 47 deletions(-) diff --git a/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo b/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo index e49242612a3..adae91da1cb 100644 --- a/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo +++ b/Buildings/Controls/OBC/CDL/Continuous/Sources/CalendarTime.mo @@ -38,7 +38,7 @@ model CalendarTime protected final constant Integer firstYear=2010 "First year that is supported, i.e. the first year in timeStampsNewYear[:]"; - final constant Integer lastYear=firstYear+11 + final constant Integer lastYear=firstYear+21 "Last year that is supported (actual building automation system need to support a larger range)"; Buildings.Utilities.Time.CalendarTime calTim( final zerTim=zerTim, @@ -92,6 +92,11 @@ This is within the 2010-2020 range and is therefore allowed. revisions="