diff --git a/design/FY2018/NFP-Improve Year Awareness.md b/design/FY2018/NFP-Improve Year Awareness.md new file mode 100644 index 00000000000..6b88d67c053 --- /dev/null +++ b/design/FY2018/NFP-Improve Year Awareness.md @@ -0,0 +1,215 @@ +# NFP: Improve Year-Awareness of EnergyPlus # + +## Justification for New Feature ## + +Users and interface developers are requesting that EnergyPlus handle dates in a more standard way to facilitate actual-weather simulations (both single year and multiple years) and the post-processing of the simulation results. Many of the packages available for results processing use “real” dates that require valid, internally consistent data (e.g. the year 2016 is a leap year and must include February 29). EnergyPlus already properly simulates most situations if correct input is supplied, but does not always produce readily processed output and there are many ways to produce simulations that cannot be represented with valid dates and times. + +## Overview ## + +EnergyPlus will be modified to always have a real year associated with the simulation and output appropriate dates and times. Simulations that would violate date and time rules (e.g. simulate 2016 without February 29) will no longer be allowed unless requested. Information from the weather file information will no longer take precedence over objects in the input simulation file. Some weather file inputs (e.g. the leap year flag) will always be ignored. + +The **RunPeriod** and **RunPeriod:CustomRange** objects will be combined into a single **RunPeriod** object that specifies start and end dates as valid calendar dates. Schedule:File will be extended to allow multiple years in a single schedule file. The simulation year will be added SQLite output. + +## Approach ## + +EnergyPlus already handles dates correctly when asked to by the user, this work will eliminate the paths that allow users to ask EnergyPlus to handle dates incorrectly. The steps to this result are given below. + +1. Annual Outputs: (not in original NFP) Add an annual output frequency to output at the end of each calendar year. + +2. RunPeriod Consolidation: **RunPeriod** and **RunPeriod:CustomRange** will be combined into a single object that fully specifies dates. The table below gives the details on what will be added or removed from RunPeriod. See Appendix A for the new RunPeriod IDD. + +3. Time Consolidation: Date and time tracking and updating is now currently spread across at least three namespaces (DataEnvironment, WeatherManager, and SimulationManager). While this does present some maintenance issues, it will also be an impediment to OO conversion. Where possible, time tracking should be consolidated. + +4. Schedule Additions (Delayed): Currently, multiyear simulations repeat the same single year schedule, which is unlikely to a problem for many multiyear simulations. However, there are situations where schedules might change from year to year (e.g. school occupancy schedules) and some calibration studies might require more flexibility (e.g. efficiency measures applied partway through a calibration data set). In these situations, it is necessary to provide some way for users to have multiyear schedules. Currently, EnergyPlus translates all schedules into a single "Year Schedule" container. This makes it difficult to directly support multiyear schedules. For true multiyear simulations, this will need to be addressed. + + | | RunPeriod Field | Notes | + | :-: | :----------------------------------------- | ---------------------- | + | A1 | Name | Required | + | N1 | Begin Month | Required | + | N2 | Begin Day of Month | Required | + | New | Begin Year | Computed if not input | + | A2 | Day of Week for Start Day | Computed if not input | + | N3 | End Month | Required | + | N4 | End Day of Month | Required | + | New | End Year | Computed if not input | + | A3 | Use Weather File Holidays and Special Days | | + | A4 | Use Weather File Daylight Saving Period | | + | A5 | Apply Weekend Holiday Rule | | + | A6 | Use Weather File Rain Indicators | | + | A7 | Use Weather File Snow Indicators | | + | N5 | Number of Times Runperiod to be Repeated | *Remove* | + | A8 | Increment Day of Week on repeat | *Remove* | + | N6 | Start Year | *Remove* (redundant) | + | New | Treat Weather as Actual | Be strict about dates | + +See Appendix C for details of the "Computed if not input" fields. + +## Testing/Validation/Data Sources ## +Existing EnergyPlus test files will be modified to produce several models that are multiyear simulations. + +## Input Output Reference Documentation ## +The documentation of the **RunPeriod** object will be modified to reflect the new behavior. Schedule documentation will be will be developed if needed. + +## Engineering Reference ## +The Engineering Reference will be checked to make sure that it documents the new behavior. + +## Example File and Transition Changes ## +To objects will need to be transitioned **RunPeriod** and **RunPeriod:CustomRange**. All example files will be transitioned to the new **RunPeriod** object. There are no **RunPeriod:CustomRange** tests. + +### RunPeriod Transition ### +Not all old **RunPeriod** objects can be perfectly transitioned to the new **RunPeriod**. The relevant scenarios are given below: + +#### Minimal RunPeriod (mm/dd to mm/dd) +Set the begin and end dates from the input, leave the rest as default. + +#### Start Year Specified (mm/dd/yyyy to mm/dd) #### +Set the begin and end dates from the input, set "Begin Year" to input start year, then leave the rest as default. + +#### Start Year and Weekday Specified (W, mm/dd/yyyy to mm/dd) #### +Set the begin and end dates from the input, set "Begin Year" to input start year, then leave the rest as default. Compute the correct starting day for the input begin date and year. Set this as the value for "Day of Week for Start Day". If the input and computed weekday do not match, issue a warning. + +#### Minimal RunPeriod with N>1 Repeats ((mm/dd to mm/dd) x N) +Set the begin and end dates from the input, leave the rest as default. Set the "Begin Year" to 2017 (since 2017 starts on a Sunday) and compute the "End Year" by adding N to 2017. + +#### Start Year Specified with N>1 Repeats ((mm/dd/yyyy to mm/dd) x N) #### +Set the begin and end dates from the input, set "Begin Year" to input start year, then leave the rest as default. Compute the "End Year" by adding N to the "Begin Year". + +#### Start Year and Weekday Specified with N>1 Repeats ((W, mm/dd/yyyy to mm/dd) x N) #### +Set the begin and end dates from the input, set "Begin Year" to input start year, then leave the rest as default. Compute the correct starting day for the input begin date and year. Set this as the value for "Day of Week for Start Day". If the input and computed weekday do not match, issue a warning. Compute the "End Year" by adding N to the "Begin Year". + +#### Any RunPeriod with "Increment Day of Week on repeat" Enabled #### +This option will no longer be supported. Warn and complete transition as above. + +## Appendix A: New RunPeriod IDD Object ## + +``` +RunPeriod, + \memo Specify a range of dates and other parameters for a simulation. + \memo Multiple run periods may be input, but they may not overlap. + \min-fields 7 + A1 , \field Name + \reference RunPeriodsAndDesignDays + \note descriptive name (used in reporting mainly) + \note if blank, weather file title is used. if not blank, must be unique + N1 , \field Begin Month + \required-field + \minimum 1 + \maximum 12 + \type integer + N2 , \field Begin Day of Month + \required-field + \minimum 1 + \maximum 31 + \type integer + N3, \field Begin Year + \note start year of the simulation, if this field is specified it must agree with the Day of Week for Start Day + N4 , \field End Month + \required-field + \minimum 1 + \maximum 12 + \type integer + N5 , \field End Day of Month + \required-field + \minimum 1 + \maximum 31 + \type integer + N6, \field End Year + \note end year of simulation, if specified + A2 , \field Day of Week for Start Day + \note =[Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday]; + \default Sunday + \type choice + \key Sunday + \key Monday + \key Tuesday + \key Wednesday + \key Thursday + \key Friday + \key Saturday + A3, \field Use Weather File Holidays and Special Days + \note If yes or blank, use holidays as specified on Weatherfile. + \note If no, do not use the holidays specified on the Weatherfile. + \note Note: You can still specify holidays/special days using the RunPeriodControl:SpecialDays object(s). + \type choice + \default Yes + \key Yes + \key No + A4, \field Use Weather File Daylight Saving Period + \note If yes or blank, use daylight saving period as specified on Weatherfile. + \note If no, do not use the daylight saving period as specified on the Weatherfile. + \type choice + \default Yes + \key Yes + \key No + A5, \field Apply Weekend Holiday Rule + \note if yes and single day holiday falls on weekend, "holiday" occurs on following Monday + \type choice + \key Yes + \key No + \default No + A6, \field Use Weather File Rain Indicators + \type choice + \key Yes + \key No + \default Yes + A7, \field Use Weather File Snow Indicators + \type choice + \key Yes + \key No + \default Yes + A8; \field Treat Weather as Actual + \type choice + \key Yes + \key No + \default No +``` + +All date and time tracking, which is presently split among a number of the managers, will be consolidated in SimulationManager. A Schedule:MultiYear object will be added in order to allow users to schedule years separately. + +## Appendix B: Incomplete Survey of Current Behavior ## +There are presently two paths to multiyear simulations, one using repeated run periods and the second using a custom range object: + +1. Repeated years: Use RunPeriod, set ‘Number of Times Runperiod to be Repeated’ to 2 or more. +2. Multiple years: Use RunPeriod:CustomRange. This requires that the the EPW DataPeriods contain the date range given in the RunPeriod:CustomRange object and that the beginning date and first hour exist in the EPW. The minimal steps to duplicate a 2-year simulation run through path #1 are: + * Create a RunPeriod:CustomRange object with the appropriate dates and delete the RunPeriod object + * Duplicate the weather by copy-pasting all 8760 entries of the EPW file at the end of the EPW file + * Edit the EPW data periods to include the start year and end years + * Edit the first data line of the EPW to have the start year (all of the other years get ignored) + +Another important case to consider are multiyear simulations with leap years. Following the two paths: + +1. Repeated years: Add a specific starting year to the RunPeriod object and add February 29 to the EPW. For a simulation of two years (one non-leap year followed by a leap year), E+ warns about a skipped February 29 data for the first year. If the EPW file does not have Febuary 29, that date is silently skipped. +2. Multiple years: Set the year interval, EnergyPlus works as expected. + +## Appendix C: Development Team Comments ## + +**Jason Glazer, Re: February 29:** Assuming that the TMY3 or IWEC or what ever does not have a February 29 day of data, what are you going to do for February 29? If it is repeating the February 28 data that could be introduce errors since no smoothing would be done from February 28 midnight to February 29 1AM. + +*Response:* The ability to skip the leap day is retained in the current implementation, there are too many EPWs in the wild that are missing that day. + +**Jason Glazer, Re: Outputs:** The year of the simulation should also appear in the tabular output file in the input verification and output summary table and perhaps other outputs. + +*Response:* The current implementation includes annual outputs in the ESO. + +**Dan Macumber, Re: Begin/End Year:** What happens if End Year is specified but Begin Year is not or End Year < Begin Year, etc. + +*Response:* These would be invalid and are severe errors. + +**Lixing Gu, Re: Removal of repetition field:** When this field is removed, how do you keep the same existing capability to allow multiyear simulations using the same single year weather? + +*Response:* The number of years in the old repetition field will need to be reflected in the difference between the start year and the end year in the input object, and the "Treat as Actual Weather" field should be set to "No" (which is the default) to get nearly the current behavior. The one difference will be that the weekdays are incremented and not reset; leap years (or the lack thereof) are handled the same way as they are currently in the repeated run period scenario. + +**Dan Macumber, Re: Output Changes:** Could this be a new field in an output request object? The default could be to not include years in output for one release, then the default could change to include years, then the option could be deprecated. + +**Jason Glazer, Re: Output Changes:** I think that it is important that timestamped output be an option for the normal ESO/MTR output files even if not supported by ReadVarsESO immediately. Although it would be good if ReadVarsESO was modified to support this new format. + +*Response:* An additional annual output frequency was added to provide output at a yearly frequency. As part of that work, a year field was added to the SQL output and a yearly timestamp was added to the ESO/MTR. + +## Appendix D: Design and Implementation ## + +Very little is changed structurally in the code. The crucial point of implementation is the determination of a start year. The general approach is to use the start month and day with other inputs to get the year. + +* If only the begin month and day are specified, then the default weekday (Sunday) is used to determine a year. +* If the begin year is specified and the weekday is not, the corresponding weekday is looked up. +* If the weekday is specified, then then the corresponding year is determined. +* If both begin year and weekday are specified, the inputs are verified. \ No newline at end of file diff --git a/doc/input-output-reference/src/overview/group-location-climate-weather-file-access.tex b/doc/input-output-reference/src/overview/group-location-climate-weather-file-access.tex index 85504634f29..cfd885c1eff 100644 --- a/doc/input-output-reference/src/overview/group-location-climate-weather-file-access.tex +++ b/doc/input-output-reference/src/overview/group-location-climate-weather-file-access.tex @@ -567,175 +567,170 @@ \subsubsection{Inputs}\label{inputs-3-020} \subsection{RunPeriod}\label{runperiod} -The RunPeriod object describes the elements necessary to create a weather file simulation. Multiple run periods may be input. EnergyPlus accepts weather files in the special EnergyPlus weather format (described briefly below this document and in more detail in the Auxiliary Programs document). These files can describe Daylight Saving Time periods as well as holidays within their definitions. The RunPeriod object allows the user to override the use of both the Daylight Saving Period (i.e. use or ignore) and holidays that are embedded within the weather file. Note that the weather file also may contain design condition information, typical and extreme period information, ground temperatures based on air temperature calculations. - -\subsubsection{Inputs}\label{inputs-4-018} - -\paragraph{Field: Name}\label{field-name-4-015} - -This optional field allows the RunPeriod to be named for output reporting. When left blank, the weather file location name is used. Note that the weather file location name will be appended to this name in tabular/summary reports. - -\paragraph{Field: Begin Month}\label{field-begin-month-1} - -This numeric field should contain the starting month number (1 = January, 2 = February, etc.) for the annual run period desired. - -\paragraph{Field: Begin Day of Month}\label{field-begin-day-of-month-1} - -This numeric field should contain the starting day of the starting month (must be valid for month) for the annual run period desired. - -\paragraph{Field: End Month}\label{field-end-month-1} - -This numeric field should contain the ending month number (1 = January, 2 = February, etc.) for the annual run period desired. - -\paragraph{Field: End Day of Month}\label{field-end-day-of-month-1} - -This numeric field should contain the ending day of the ending month (must be valid for month) for the annual run period desired. - -\paragraph{Field: Day of Week for Start Day}\label{field-day-of-week-for-start-day-2} - -For flexibility, the day of week indicated on the weather file can be overridden by this field's value. Valid days of the week (Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday) must be entered in this field. To clarify, this value will be used as the Start Day (type) for this run period and subsequent days will be implemented. If a blank or UseWeatherFile is entered here, then the starting day type will be calculated from the weather file (ref: Auxiliary Programs document about Data Periods). - -\paragraph{Field: Use Weather File Holidays and Special Days}\label{field-use-weather-file-holidays-and-special-days} - -Weather files can contain holiday designations or other kinds of special days. These day types cause a corresponding day's schedule (see SCHEDULE definitions below) to be used during that day. This field should contain the word \textbf{Yes} if holidays or other special days indicated directly on the weather file should retain their ``day type'' or \textbf{No} if holidays or other special days on the weather file should be ignored. Reference the RunPeriodControl:SpecialDays object below to enter your own special days and holidays. - -Note that a blank or null field in this field will indicate \textbf{Yes}. - -\paragraph{Field: Use Weather File Daylight Saving Period}\label{field-use-weather-file-daylight-saving-period-2} - -Weather files can contain indicators of Daylight Saving period days. For flexibility, you may want to ignore these designations on the weather file. This field should contain the word \textbf{Yes} if you will accept daylight saving period days as contained on the weather file (note: not all weather files may actually have this period) or \textbf{No} if you wish to ignore Daylight Saving period days that may be on the weather file. - -Note that a blank or null field in this field will indicate \textbf{Yes}. - -\paragraph{Field: Apply Weekend Holiday Rule}\label{field-apply-weekend-holiday-rule} - -In some countries (notably the US), when holidays fall on weekends, they are often observed on a weekday close to the holiday day. (Usually if the specific day falls on a Saturday, the observed day is Friday; if on a Sunday, the observed day is Monday). EnergyPlus will represent this custom using the value in this field. If the field is \textbf{Yes}, then specific date holidays that have a duration of one day, will be ``observed'' on the Monday after the day. (Specific day holidays are such as January 1 -- a day-month combination). If the field is blank or \textbf{No}, then the holiday will be shown on the day-month as entered. As this option is listed at the RunPeriod, all applicable special days for the run will use the rule -- there is no override for individual special days. - -Note that a blank or null field in this field will indicate \textbf{No}. - -\begin{callout} -Note: EnergyPlus processed weather files available on the EnergyPlus web site: \url{https://www.energyplus.net/weather} have neither special days specified nor daylight saving period. However, DDY (Design Day) files produced from the ASHRAE Design Conditions that accompany the EPW files may include a DaylightSavingPeriod object for certain locations. -\end{callout} - -\paragraph{Field: Use Weather File Rain Indicators}\label{field-use-weather-file-rain-indicators} - -Weather files can contain ``rain'' indicators. (EPW field ``Present Weather Codes'' -- described in the AuxiliaryPrograms document). In turn, rain indicates wet surfaces which changes the film convection coefficient for the surface. Other models may use rain as well (Ground Heat Exchangers). Entering ``\textbf{Yes}'' in this field allows the weather file conditions to represent ``Rain''; entering ``\textbf{No}'' in the field ``turns off'' the rain indicator for this period. You might use this to be able to compare two ``same location'' weather files of different years, origins, etc. - -\paragraph{Field: Use Weather File Snow Indicators}\label{field-use-weather-file-snow-indicators} - -Weather files can contain ``snow'' indicators. (EPW field ``Snow Depth'' \textgreater{} 0 indicates ``Snow on the ground''). In turn, snow changes the reflectivity of the ground and cascades changes of this reflectivity. Entering ``\textbf{Yes}'' in this field allows the weather file conditions to represent ``Snow''; entering ``\textbf{No}'' in the field ``turns off'' the snow indicator for this period. You might use this to be able to compare two ``same location'' weather files of different years, origins, etc. - -\paragraph{Field: Number of Times Runperiod to be Repeated}\label{field-number-of-times-runperiod-to-be-repeated} - -This numeric field represents the number of times (usually years) the simulation has to be carried out in a multi runperiod simulation. The default value is set to 1. The number of years of simulation, in case of a Ground Loop Heat Exchanger (GLHE) simulation, should be equal to the length of simulation field in GLHE object. Note that you can specify a number of simulation years with a shorter run period (e.g. 1 week) and EnergyPlus will repeat the simulation of the shorter run period for that many times. Note that repeating will work with any weather file that contains the start date and end date in a ``Data Period'' (refer to Auxiliary Programs document for more documentation on weather file contents). - -\paragraph{Field: Increment Day of Week on Repeat}\label{field-increment-day-of-week-on-repeat} - -When repeating RunPeriods (see previous field), you can choose to increment the day of week at the end of the period to have a more continuous day type. Enter \textbf{Yes} to increment the day of the week (default). An entry of \textbf{No} will keep the same day of week values as in the first time through. - -\paragraph{Field: Start Year}\label{field-start-year} - -When repeating a period, you might (for whatever reason), choose to have a specific year as a starting year. Enter an appropriate 4 digit year in this field. Refer to Auxiliary Programs document for more documentation on weather file contents, particularly in using leap year data (or not) within weather files. - -And, as shown in an IDF: - -\begin{lstlisting} -RunPeriod, ! Winter Simulation - Winter Simulation, !- Name - 12, !- Begin Month - 1, !- Begin Day of Month - 3, !- End Month - 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day - Yes, !- Use Weather File Holidays and Special Days - Yes, !- Use Weather File Daylight Saving Period - No, !- Apply Weekend Holiday Rule - Yes, !- Use Weather File Rain Indicators - Yes; !- Use Weather File Snow Indicators - -! Multiple year simulation example -RunPeriod, - Multiple Years, !- Name - 1, !- Begin Month - 1, !- Begin Day of Month - 12, !- End Month - 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day - Yes, !- Use Weather File Holidays and Special Days - Yes, !- Use Weather File Daylight Saving Period - No, !- Apply Weekend Holiday Rule - Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 3; !- Number of Times Runperiod to be Repeated -\end{lstlisting} - -\subsection{RunPeriod:CustomRange}\label{runperiodcustomrange} - -The RunPeriod:CustomRange object describes the elements necessary to use a specially crafted (likely multiple year) weather file in a simulation. These kinds of weather files and simulations might be useful for matching utility periods or simulating several years of differing weather data. Multiple run periods may be input. EnergyPlus accepts weather files in the special EnergyPlus weather format (described briefly below this document and in more detail in the Auxiliary Programs document). In order to effectively use this object, however, you will need to use a text editor (EnergyPlus weather files area simple text files) or possibly a spreadsheet program and then save to a csv (comma separated variable) file. Weather files can describe Daylight Saving Time periods as well as holidays within their definitions. The RunPeriod:CustomRange object allows the user to override the use of both the Daylight Saving Period (i.e. use or ignore) and holidays that are embedded within the weather file. Note that the weather file also may contain design condition information, typical and extreme period information, ground temperatures based on air temperature calculations. +The RunPeriod object describes the elements necessary to create a weather file simulation. Multiple run +periods may be input. EnergyPlus accepts weather files in the special EnergyPlus weather format +(described briefly below this document and in more detail in the Auxiliary Programs document). These files +can describe Daylight Saving Time periods as well as holidays within their definitions. Note that the weather +file also may contain design condition information, typical and extreme period information, ground +temperatures based on air temperature calculations. The RunPeriod object allows the user to override the use +of both the Daylight Saving Period (i.e. use or ignore) and holidays that are embedded within the weather +file. The object also describes the elements necessary to use a specially crafted (likely multiple year) +weather file in a simulation. These kinds of weather files and simulations might be useful for matching +utility periods or simulating several years of differing weather data. Leap days are required when using +actual weather (see ``Treat as Actual Weather'' below), but will be processed and used during leap years +when the days are present in the weather file and enabled in the weather file header. Note that when the +weather is treated as non-actual, the leap day will be skipped if it is not present, resulting in incorrect +day types for the remainder of the year. \subsubsection{Inputs}\label{inputs-5-016} \paragraph{Field: Name}\label{field-name-5-012} -This optional field allows the RunPeriod to be named for output reporting. When left blank, the weather file location name is used. Note that the weather file location name will be appended to this name in tabular/summary reports. +This optional field allows the RunPeriod to be named for output reporting. When left blank, the weather file +location name is used. Note that the weather file location name will be appended to this name in +tabular/summary reports. \paragraph{Field: Begin Month}\label{field-begin-month-2} -This numeric field should contain the starting month number (1 = January, 2 = February, etc.) for the annual run period desired. +This numeric field should contain the starting month number (1 = January, 2 = February, etc.) for the annual +run period desired. \paragraph{Field: Begin Day of Month}\label{field-begin-day-of-month-2} -This numeric field should contain the starting day of the starting month (must be valid for month) for the annual run period desired. +This numeric field should contain the starting day of the starting month (must be valid for month) for the +annual run period desired. \paragraph{Field: Begin Year}\label{field-begin-year} -This numeric field should contain the beginning year for the custom range. Though all EnergyPlus (EPW) weather files contain a year/year field, the RunPeriod object does not use this field (previous object). The \textbf{RunPeriod:CustomRange} object causes the program to look specifically for the begin date specified by these three fields (i.e. Begin Month, Begin Day of Month, Begin Year). +This optional numeric field may contain the beginning year for the range. If this field is specified +along with the \textbf{Day of Week for Start Day}, the inputs are validated to make sure that the date is +valid. If this field is not specified, then a year will be selected based upon other inputs (which, in the +case of the day of the week, may be defaulted). \paragraph{Field: End Month}\label{field-end-month-2} -This numeric field should contain the ending month number (1 = January, 2 = February, etc.) for the annual run period desired. +This numeric field should contain the ending month number (1 = January, 2 = February, etc.) for the annual +run period desired. \paragraph{Field: End Day of Month}\label{field-end-day-of-month-2} -This numeric field should contain the ending day of the ending month (must be valid for month) for the annual run period desired. +This numeric field should contain the ending day of the ending month (must be valid for month) for the +annual run period desired. \paragraph{Field: End Year}\label{field-end-year} -This numeric field should contain the end year for the custom range. Though all EnergyPlus (EPW) weather files contain a year/year field, the RunPeriod object does not use this field (previous object). The \textbf{RunPeriod:CustomRange} object causes the program to look specifically for the end date specified by these three fields (i.e. End Month, End Day of Month, End Year). +This optional numeric field should contain the end year for the range. It is only allowed to be specified +when the \textbf{Begin Year} is given and must be after the \textbf{Begin Year}. If it is not specified, +it will be set to be the first occurrence of \textbf{End Month/End Day of Month} after the start date. Note +that this could be several years after the start date (e.g. if the end date is specified as a leap day 2/29). \paragraph{Field: Day of Week for Start Day}\label{field-day-of-week-for-start-day-3} -For flexibility, the day of week indicated on the weather file can be overridden by this field's value. Valid days of the week (Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday) must be entered in this field. To clarify, this value will be used as the Start Day (type) for this run period and subsequent days will be implemented. If a blank or UseWeatherFile is entered here, then the starting day type will be calculated from the weather file (ref: Auxiliary Programs document about Data Periods). +This field allows the start day of the week to be specified. Valid days of the week (Sunday, Monday, Tuesday, +Wednesday, Thursday, Friday, Saturday) may be entered in this field. To clarify, this value will be used as +the Start Day (type) for this run period and subsequent days will be implemented. If the field is blank, +then the starting day type defaults to Sunday. \paragraph{Field: Use Weather File Holidays and Special Days}\label{field-use-weather-file-holidays-and-special-days-1} -Weather files can contain holiday designations or other kinds of special days. These day types cause a corresponding day's schedule (see SCHEDULE definitions below) to be used during that day. This field should contain the word \textbf{Yes} if holidays or other special days indicated directly on the weather file should retain their ``day type'' or \textbf{No} if holidays or other special days on the weather file should be ignored. Reference the RunPeriodControl:SpecialDays object below to enter your own special days and holidays. +Weather files can contain holiday designations or other kinds of special days. These day types cause a +corresponding day's schedule (see SCHEDULE definitions below) to be used during that day. This field +should contain the word \textbf{Yes} if holidays or other special days indicated directly on the weather +file should retain their ``day type'' or \textbf{No} if holidays or other special days on the weather file +should be ignored. Reference the RunPeriodControl:SpecialDays object below to enter your own special days +and holidays. Note that a blank or null field in this field will indicate \textbf{Yes}. \paragraph{Field: Use Weather File Daylight Saving Period}\label{field-use-weather-file-daylight-saving-period-3} -Weather files can contain indicators of Daylight Saving period days. For flexibility, you may want to ignore these designations on the weather file. This field should contain the word \textbf{Yes} if you will accept daylight saving period days as contained on the weather file (note: not all weather files may actually have this period) or \textbf{No} if you wish to ignore Daylight Saving period days that may be on the weather file. +Weather files can contain indicators of Daylight Saving period days. For flexibility, you may want to ignore +these designations on the weather file. This field should contain the word \textbf{Yes} if you will accept +daylight saving period days as contained on the weather file (note: not all weather files may actually have +this period) or \textbf{No} if you wish to ignore Daylight Saving period days that may be on the weather file. Note that a blank or null field in this field will indicate \textbf{Yes}. \paragraph{Field: Apply Weekend Holiday Rule}\label{field-apply-weekend-holiday-rule-1} -In some countries (notably the US), when holidays fall on weekends, they are often observed on a weekday close to the holiday day. (Usually if the specific day falls on a Saturday, the observed day is Friday; if on a Sunday, the observed day is Monday). EnergyPlus will represent this custom using the value in this field. If the field is \textbf{Yes}, then specific date holidays that have a duration of one day, will be ``observed'' on the Monday after the day. (Specific day holidays are such as January 1 -- a day-month combination). If the field is blank or \textbf{No}, then the holiday will be shown on the day-month as entered. As this option is listed at the RunPeriod, all applicable special days for the run will use the rule -- there is no override for individual special days. +In some countries (notably the US), when holidays fall on weekends, they are often observed on a weekday +close to the holiday day. (Usually if the specific day falls on a Saturday, the observed day is Friday; +if on a Sunday, the observed day is Monday). EnergyPlus will represent this custom using the value in +this field. If the field is \textbf{Yes}, then specific date holidays that have a duration of one day, +will be ``observed'' on the Monday after the day. (Specific day holidays are such as January 1 -- a +day-month combination). If the field is blank or \textbf{No}, then the holiday will be shown on the +day-month as entered. As this option is listed at the RunPeriod, all applicable special days for the run +will use the rule -- there is no override for individual special days. Note that a blank or null field in this field will indicate \textbf{No}. \begin{callout} -Note: EnergyPlus processed weather files available on the EnergyPlus web site: \url{https://www.energyplus.net/weather} have neither special days specified nor daylight saving period. However, DDY (Design Day) files produced from the ASHRAE Design Conditions that accompany the EPW files may include a DaylightSavingPeriod object for certain locations. +Note: EnergyPlus processed weather files available on the EnergyPlus web site: \url{https://www.energyplus.net/weather} +have neither special days specified nor daylight saving period. However, DDY (Design Day) files produced +from the ASHRAE Design Conditions that accompany the EPW files may include a DaylightSavingPeriod object +for certain locations. \end{callout} \paragraph{Field: Use Weather File Rain Indicators}\label{field-use-weather-file-rain-indicators-1} -Weather files can contain ``rain'' indicators. (EPW field ``Present Weather Codes'' -- described in the AuxiliaryPrograms document). In turn, rain indicates wet surfaces which changes the film convection coefficient for the surface. Other models may use rain as well (Ground Heat Exchangers). Entering ``\textbf{Yes}'' in this field allows the weather file conditions to represent ``Rain''; entering ``\textbf{No}'' in the field ``turns off'' the rain indicator for this period. You might use this to be able to compare two ``same location'' weather files of different years, origins, etc. +Weather files can contain ``rain'' indicators. (EPW field ``Present Weather Codes'' -- described in the +AuxiliaryPrograms document). In turn, rain indicates wet surfaces which changes the film convection +coefficient for the surface. Other models may use rain as well (Ground Heat Exchangers). Entering +``\textbf{Yes}'' in this field allows the weather file conditions to represent ``Rain''; entering +``\textbf{No}'' in the field ``turns off'' the rain indicator for this period. You might use this +to be able to compare two ``same location'' weather files of different years, origins, etc. \paragraph{Field: Use Weather File Snow Indicators}\label{field-use-weather-file-snow-indicators-1} -Weather files can contain ``snow'' indicators. (EPW field ``Snow Depth'' \textgreater{} 0 indicates ``Snow on the ground''). In turn, snow changes the reflectivity of the ground and cascades changes of this reflectivity. Entering ``\textbf{Yes}'' in this field allows the weather file conditions to represent ``Snow''; entering ``\textbf{No}'' in the field ``turns off'' the snow indicator for this period. You might use this to be able to compare two ``same location'' weather files of different years, origins, etc. +Weather files can contain ``snow'' indicators. (EPW field ``Snow Depth'' \textgreater{} 0 indicates +``Snow on the ground''). In turn, snow changes the reflectivity of the ground and cascades changes of this +reflectivity. Entering ``\textbf{Yes}'' in this field allows the weather file conditions to represent +``Snow''; entering ``\textbf{No}'' in the field ``turns off'' the snow indicator for this period. You might +use this to be able to compare two ``same location'' weather files of different years, origins, etc. + +\paragraph{Field: Treat Weather as Actual}\label{field-treat-weather-as-actual} + +This field determines how stringent date matching between this object and the weather file is. Though all +EnergyPlus (EPW) weather files contain a year field, this data is not typically used. Specifying +``\textbf{Yes}'' in this field causes the program to look specifically for the begin date (i.e. Begin Month, +Begin Day of Month, Begin Year) and for the end date (i.e. End Month, End Day of Month, End Year) and require +that leap days be present for leap years. + +And, as shown in an IDF: + +\begin{lstlisting} +RunPeriod, ! Winter Simulation +Winter Simulation, !- Name +12, !- Begin Month +1, !- Begin Day of Month +, !- Begin Year +3, !- End Month +31, !- End Day of Month +, !- End Year +UseWeatherFile, !- Day of Week for Start Day +Yes, !- Use Weather File Holidays and Special Days +Yes, !- Use Weather File Daylight Saving Period +No, !- Apply Weekend Holiday Rule +Yes, !- Use Weather File Rain Indicators +Yes; !- Use Weather File Snow Indicators + +! Actual weather simulation example +RunPeriod, +Multiple Years, !- Name +1, !- Begin Month +1, !- Begin Day of Month +2010, !- Begin Year +12, !- End Month +31, !- End Day of Month +, !- End Year +UseWeatherFile, !- Day of Week for Start Day +Yes, !- Use Weather File Holidays and Special Days +Yes, !- Use Weather File Daylight Saving Period +No, !- Apply Weekend Holiday Rule +Yes, !- Use Weather File Rain Indicators +Yes, !- Use Weather File Snow Indicators +Yes; !- Treat Weather as Actual +\end{lstlisting} \subsection{RunPeriodControl:SpecialDays}\label{runperiodcontrolspecialdays} diff --git a/idd/Energy+.idd.in b/idd/Energy+.idd.in index 4db7bb26523..3465ec4bdfb 100644 --- a/idd/Energy+.idd.in +++ b/idd/Energy+.idd.in @@ -1273,13 +1273,13 @@ SizingPeriod:WeatherFileConditionType, \default Yes RunPeriod, - \memo Specified a range of dates and other parameters for a weather file simulation. + \memo Specify a range of dates and other parameters for a simulation. \memo Multiple run periods may be input, but they may not overlap. - \min-fields 11 + \min-fields 7 A1 , \field Name \reference RunPeriodsAndDesignDays \note descriptive name (used in reporting mainly) - \note if blank, weather file title is used. if not blank, must be unique + \note If blank, weather file title is used. If not blank, must be unique N1 , \field Begin Month \required-field \minimum 1 @@ -1290,19 +1290,25 @@ RunPeriod, \minimum 1 \maximum 31 \type integer - N3 , \field End Month + N3, \field Begin Year + \note Start year of the simulation, if this field is specified it must agree with the Day of Week for Start Day + \note If this field is blank, the year will be selected to match the weekday, which is Sunday if not specified + N4 , \field End Month \required-field \minimum 1 \maximum 12 \type integer - N4 , \field End Day of Month + N5 , \field End Day of Month \required-field \minimum 1 \maximum 31 \type integer + N6, \field End Year + \note end year of simulation, if specified A2 , \field Day of Week for Start Day - \note =|Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday]; - \default UseWeatherFile + \note =[Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday]; + \note If no year is input, this field will default to Sunday + \note If a year is input and this field is blank, the correct weekday is determined \type choice \key Sunday \key Monday @@ -1311,7 +1317,6 @@ RunPeriod, \key Thursday \key Friday \key Saturday - \key UseWeatherFile A3, \field Use Weather File Holidays and Special Days \note If yes or blank, use holidays as specified on Weatherfile. \note If no, do not use the holidays specified on the Weatherfile. @@ -1343,96 +1348,11 @@ RunPeriod, \key Yes \key No \default Yes - N5, \field Number of Times Runperiod to be Repeated - \type integer - \minimum 1 - \default 1 - A8, \field Increment Day of Week on repeat - \type choice - \key Yes - \key No - \default Yes - N6; \field Start Year - \note this is the start year for the start date. If the leap year is "Yes" in the weather file header - \note (that is HOLIDAYS/SPECIAL DAYS header first field), then any year which is a leap year will assume - \note there will be a Feb 29. A repeat of this runperiod will automatically increment the year. - -RunPeriod:CustomRange, - \memo run simulation for a custom created weather file - \min-fields 13 - A1 , \field Name - \reference RunPeriodsAndDesignDays - \note descriptive name (used in reporting mainly) - \note if blank, weather file title is used. if not blank, must be unique - N1 , \field Begin Month - \required-field - \minimum 1 - \maximum 12 - \type integer - N2 , \field Begin Day of Month - \required-field - \minimum 1 - \maximum 31 - \type integer - N3, \field Begin Year - \required-field - \note must be start year of this date on weather file - N4 , \field End Month - \required-field - \minimum 1 - \maximum 12 - \type integer - N5 , \field End Day of Month - \required-field - \minimum 1 - \maximum 31 - \type integer - N6, \field End Year - \required-field - \note must be end year of this date on weather file - A2 , \field Day of Week for Start Day - \note =|Sunday|Monday|Tuesday|Wednesday|Thursday|Friday|Saturday]; - \default UseWeatherFile - \type choice - \key Sunday - \key Monday - \key Tuesday - \key Wednesday - \key Thursday - \key Friday - \key Saturday - \key UseWeatherFile - A3, \field Use Weather File Holidays and Special Days - \note If yes or blank, use holidays as specified on Weatherfile. - \note If no, do not use the holidays specified on the Weatherfile. - \note Note: You can still specify holidays/special days using the RunPeriodControl:SpecialDays object(s). - \type choice - \default Yes - \key Yes - \key No - A4, \field Use Weather File Daylight Saving Period - \note If yes or blank, use daylight saving period as specified on Weatherfile. - \note If no, do not use the daylight saving period as specified on the Weatherfile. - \type choice - \default Yes - \key Yes - \key No - A5, \field Apply Weekend Holiday Rule - \note if yes and single day holiday falls on weekend, "holiday" occurs on following Monday + A8; \field Treat Weather as Actual \type choice \key Yes \key No \default No - A6, \field Use Weather File Rain Indicators - \type choice - \key Yes - \key No - \default Yes - A7; \field Use Weather File Snow Indicators - \type choice - \key Yes - \key No - \default Yes RunPeriodControl:SpecialDays, \min-fields 4 diff --git a/performance_tests/15zonePSZ.idf b/performance_tests/15zonePSZ.idf index 2005935779b..6227b290220 100644 --- a/performance_tests/15zonePSZ.idf +++ b/performance_tests/15zonePSZ.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/15zonePTAC.idf b/performance_tests/15zonePTAC.idf index 48c79cb5af2..e517c7b940f 100644 --- a/performance_tests/15zonePTAC.idf +++ b/performance_tests/15zonePTAC.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/15zonePVAV.idf b/performance_tests/15zonePVAV.idf index fb91547cbf5..9071b254f49 100644 --- a/performance_tests/15zonePVAV.idf +++ b/performance_tests/15zonePVAV.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/15zonevav.idf b/performance_tests/15zonevav.idf index 894375e9993..37f26b9c15a 100644 --- a/performance_tests/15zonevav.idf +++ b/performance_tests/15zonevav.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/15zonevav_no_reports.idf b/performance_tests/15zonevav_no_reports.idf index f3c5ba58c75..bd268e00457 100644 --- a/performance_tests/15zonevav_no_reports.idf +++ b/performance_tests/15zonevav_no_reports.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/30zonePSZ.idf b/performance_tests/30zonePSZ.idf index 69e2c0d4fcf..69d1100fce8 100644 --- a/performance_tests/30zonePSZ.idf +++ b/performance_tests/30zonePSZ.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/30zonePTAC.idf b/performance_tests/30zonePTAC.idf index 80548b87c4d..8a0a2917e1d 100644 --- a/performance_tests/30zonePTAC.idf +++ b/performance_tests/30zonePTAC.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/30zonePVAV.idf b/performance_tests/30zonePVAV.idf index e0a40a8f0d1..01d5bc289a9 100644 --- a/performance_tests/30zonePVAV.idf +++ b/performance_tests/30zonePVAV.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/30zonevav.idf b/performance_tests/30zonevav.idf index 8f5f35ede97..2ce822c89d3 100644 --- a/performance_tests/30zonevav.idf +++ b/performance_tests/30zonevav.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/45zonePSZ.idf b/performance_tests/45zonePSZ.idf index 2a002d8e30f..1587c17c6f1 100644 --- a/performance_tests/45zonePSZ.idf +++ b/performance_tests/45zonePSZ.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/45zonePTAC.idf b/performance_tests/45zonePTAC.idf index 0ea5a836583..60cb0d04a44 100644 --- a/performance_tests/45zonePTAC.idf +++ b/performance_tests/45zonePTAC.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/45zonePVAV.idf b/performance_tests/45zonePVAV.idf index f948d48e178..4c1d863c8ea 100644 --- a/performance_tests/45zonePVAV.idf +++ b/performance_tests/45zonePVAV.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/45zonevav.idf b/performance_tests/45zonevav.idf index 8503a50f921..c28a07d739d 100644 --- a/performance_tests/45zonevav.idf +++ b/performance_tests/45zonevav.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf b/performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf index 4b61f592adc..f27e6f66e05 100644 --- a/performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf +++ b/performance_tests/BenchmarkHospitalNew_USA_CA_SAN_FRANCISCO.idf @@ -126,8 +126,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf b/performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf index 042bb22b914..68c9f264dbd 100644 --- a/performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf +++ b/performance_tests/BenchmarkLargeOfficeNew_USA_CA_SAN_FRANCISCO_10_windows_per_zone.idf @@ -114,8 +114,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf b/performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf index 3f906829a46..dc3b1e8a744 100644 --- a/performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf +++ b/performance_tests/Benchmarklargeofficenew_usa_ca_san_francisco_no_reports.idf @@ -114,8 +114,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/Inactive/10zone1vav.idf b/performance_tests/Inactive/10zone1vav.idf index 9c729371c31..1703c7b8f94 100644 --- a/performance_tests/Inactive/10zone1vav.idf +++ b/performance_tests/Inactive/10zone1vav.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/20zone1vav.idf b/performance_tests/Inactive/20zone1vav.idf index a3674f8d37b..bcbfcc68798 100644 --- a/performance_tests/Inactive/20zone1vav.idf +++ b/performance_tests/Inactive/20zone1vav.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/30zone1vav.idf b/performance_tests/Inactive/30zone1vav.idf index a583646ba9a..186084047c6 100644 --- a/performance_tests/Inactive/30zone1vav.idf +++ b/performance_tests/Inactive/30zone1vav.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/40zone1vav.idf b/performance_tests/Inactive/40zone1vav.idf index 6ca65ab8701..e718669e390 100644 --- a/performance_tests/Inactive/40zone1vav.idf +++ b/performance_tests/Inactive/40zone1vav.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/50zone1vav.idf b/performance_tests/Inactive/50zone1vav.idf index 87fb6383566..90879e955be 100644 --- a/performance_tests/Inactive/50zone1vav.idf +++ b/performance_tests/Inactive/50zone1vav.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/60Zone1PVAV.idf b/performance_tests/Inactive/60Zone1PVAV.idf index 87e73637ebb..838596fd623 100644 --- a/performance_tests/Inactive/60Zone1PVAV.idf +++ b/performance_tests/Inactive/60Zone1PVAV.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/60Zone1VAV.idf b/performance_tests/Inactive/60Zone1VAV.idf index b170747f88e..09ba0b173f5 100644 --- a/performance_tests/Inactive/60Zone1VAV.idf +++ b/performance_tests/Inactive/60Zone1VAV.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/60zone2PVAV.idf b/performance_tests/Inactive/60zone2PVAV.idf index 95225f00850..a18dd8091a5 100644 --- a/performance_tests/Inactive/60zone2PVAV.idf +++ b/performance_tests/Inactive/60zone2PVAV.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/60zone3PVAV.idf b/performance_tests/Inactive/60zone3PVAV.idf index d2154772957..503cb9317a0 100644 --- a/performance_tests/Inactive/60zone3PVAV.idf +++ b/performance_tests/Inactive/60zone3PVAV.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/60zone6PVAV.idf b/performance_tests/Inactive/60zone6PVAV.idf index e5d2a6739f3..31839a59be9 100644 --- a/performance_tests/Inactive/60zone6PVAV.idf +++ b/performance_tests/Inactive/60zone6PVAV.idf @@ -57,15 +57,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CZ03RV2, !- Name diff --git a/performance_tests/Inactive/benchmarklargeofficenew_usa_ca_san_francisco.idf b/performance_tests/Inactive/benchmarklargeofficenew_usa_ca_san_francisco.idf index 1f552881392..4fefdd0b0f9 100644 --- a/performance_tests/Inactive/benchmarklargeofficenew_usa_ca_san_francisco.idf +++ b/performance_tests/Inactive/benchmarklargeofficenew_usa_ca_san_francisco.idf @@ -114,8 +114,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/performance_tests/PipingSystem_Underground_FHX.idf b/performance_tests/PipingSystem_Underground_FHX.idf index 91886e751a7..55d200cd9d8 100644 --- a/performance_tests/PipingSystem_Underground_FHX.idf +++ b/performance_tests/PipingSystem_Underground_FHX.idf @@ -76,8 +76,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/src/EnergyPlus/DataEnvironment.cc b/src/EnergyPlus/DataEnvironment.cc index fdfee07e9e9..0230e168f40 100644 --- a/src/EnergyPlus/DataEnvironment.cc +++ b/src/EnergyPlus/DataEnvironment.cc @@ -160,7 +160,7 @@ namespace DataEnvironment { bool EMSWindSpeedOverrideOn(false); // EMS flag for outdoor air wind speed Real64 EMSWindSpeedOverrideValue; // EMS override value for outdoor air wind speed Real64 WaterMainsTemp; // Current water mains temperature - int Year; // Current calendar year of the simulation + int Year; // Current calendar year of the simulation from the weather file int YearTomorrow; // Tomorrow's calendar year of the simulation Array1D SOLCOS(3); // Solar direction cosines at current time step Real64 CloudFraction; // Fraction of sky covered by clouds @@ -180,6 +180,7 @@ namespace DataEnvironment { std::string WeatherFileLocationTitle; // Location Title from Weather File std::string CurMnDyHr; // Current Month/Day/Hour timestamp info std::string CurMnDy; // Current Month/Day timestamp info + std::string CurMnDyYr; // Current Month/Day/Year timestamp info int CurEnvirNum; // current environment number int TotDesDays(0); // Total number of Design days to Setup int TotRunDesPersDays(0); // Total number of Run Design Periods [Days] (Weather data) to Setup @@ -309,6 +310,7 @@ namespace DataEnvironment { WeatherFileLocationTitle = std::string(); CurMnDyHr = std::string(); CurMnDy = std::string(); + CurMnDyYr = std::string(); CurEnvirNum = int(); TotDesDays = 0; TotRunDesPersDays = 0; diff --git a/src/EnergyPlus/DataEnvironment.hh b/src/EnergyPlus/DataEnvironment.hh index 9f01dbf7e05..82b32df85d7 100644 --- a/src/EnergyPlus/DataEnvironment.hh +++ b/src/EnergyPlus/DataEnvironment.hh @@ -134,7 +134,7 @@ namespace DataEnvironment { extern bool EMSWindSpeedOverrideOn; // EMS flag for outdoor air wind speed extern Real64 EMSWindSpeedOverrideValue; // EMS override value for outdoor air wind speed extern Real64 WaterMainsTemp; // Current water mains temperature - extern int Year; // Current calendar year of the simulation + extern int Year; // Current calendar year of the simulation from the weather file extern int YearTomorrow; // Tomorrow's calendar year of the simulation extern Array1D SOLCOS; // Solar direction cosines at current time step extern Real64 CloudFraction; // Fraction of sky covered by clouds @@ -154,6 +154,7 @@ namespace DataEnvironment { extern std::string WeatherFileLocationTitle; // Location Title from Weather File extern std::string CurMnDyHr; // Current Month/Day/Hour timestamp info extern std::string CurMnDy; // Current Month/Day timestamp info + extern std::string CurMnDyYr; // Current Month/Day/Year timestamp info extern int CurEnvirNum; // current environment number extern int TotDesDays; // Total number of Design days to Setup extern int TotRunDesPersDays; // Total number of Run Design Periods [Days] (Weather data) to Setup diff --git a/src/EnergyPlus/General.cc b/src/EnergyPlus/General.cc index 524fd9a2517..c63b0ecb979 100644 --- a/src/EnergyPlus/General.cc +++ b/src/EnergyPlus/General.cc @@ -1922,7 +1922,7 @@ namespace General { ShowSevereError("Invalid Julian date Entered=" + String); ErrorsFound = true; } else { - InvJulianDay(FstNum, PMonth, PDay, 0); + InvOrdinalDay(FstNum, PMonth, PDay, 0); DateType = 1; } } else { @@ -2186,7 +2186,7 @@ namespace General { } } - int JulianDay(int const Month, // Month, 1..12 + int OrdinalDay(int const Month, // Month, 1..12 int const Day, // Day of Month, not validated by month int const LeapYearValue // 1 if leap year indicated, 0 if not ) @@ -2250,7 +2250,7 @@ namespace General { return JulianDay; } - void InvJulianDay(int const Number, int &PMonth, int &PDay, int const LeapYr) + void InvOrdinalDay(int const Number, int &PMonth, int &PDay, int const LeapYr) { // SUBROUTINE INFORMATION: @@ -2447,7 +2447,7 @@ namespace General { ) { // J. Glazer - August 2017 - int firstDayOfMonth = JulianDay(monthNumber, 1, DataEnvironment::CurrentYearIsLeapYear); + int firstDayOfMonth = OrdinalDay(monthNumber, 1, DataEnvironment::CurrentYearIsLeapYear); int dayOfWeekForFirstDay = (DataEnvironment::RunPeriodStartDayOfWeek + firstDayOfMonth - 1) % 7; int jdatForNth; if (dayOfWeek >= dayOfWeekForFirstDay) { diff --git a/src/EnergyPlus/General.hh b/src/EnergyPlus/General.hh index 7375e3e49eb..59989c3d1c0 100644 --- a/src/EnergyPlus/General.hh +++ b/src/EnergyPlus/General.hh @@ -237,12 +237,12 @@ namespace General { int const Month, bool &ErrorsFound); - int JulianDay(int const Month, // Month, 1..12 - int const Day, // Day of Month, not validated by month - int const LeapYearValue // 1 if leap year indicated, 0 if not + int OrdinalDay(int const Month, // Month, 1..12 + int const Day, // Day of Month, not validated by month + int const LeapYearValue // 1 if leap year indicated, 0 if not ); - void InvJulianDay(int const Number, int &PMonth, int &PDay, int const LeapYr); + void InvOrdinalDay(int const Number, int &PMonth, int &PDay, int const LeapYr); bool BetweenDates(int const TestDate, // Date to test int const StartDate, // Start date in sequence diff --git a/src/EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc b/src/EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc index c0cd3b4dbe5..6614ce5b9ef 100644 --- a/src/EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc +++ b/src/EnergyPlus/GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc @@ -175,11 +175,10 @@ void FiniteDiffGroundTempsModel::getWeatherData() // RE-ENGINEERED na // PURPOSE OF THIS SUBROUTINE: - // Finds correct envrionment for reading all weather data. Loops over all weather data in weather file + // Finds correct environment for reading all weather data. Loops over all weather data in weather file // and data structure containing daily average of required weather data. // USE STATEMENTS: - using General::JulianDay; using WeatherManager::GetNextEnvironment; using WeatherManager::ManageWeather; using WeatherManager::ResetEnvironmentCounter; @@ -231,9 +230,9 @@ void FiniteDiffGroundTempsModel::getWeatherData() Environment(NumOfEnvrn).KindOfEnvrn = ksReadAllWeatherData; RPReadAllWeatherData = true; WeathSimReq = true; - RunPeriodInput(TotRunPers).StartDate = JulianDay(1, 1, 0); - RunPeriodInput(TotRunPers).EndDate = JulianDay(12, 31, 0); - RunPeriodInput(TotRunPers).MonWeekDay = 0; + RunPeriodInput(TotRunPers).startJulianDate = 1; // JulianDay( 1, 1, 0 ); + RunPeriodInput(TotRunPers).endJulianDate = 365; // JulianDay( 12, 31, 0 ); + RunPeriodInput(TotRunPers).monWeekDay = 0; SetupEnvironmentTypes(); @@ -259,8 +258,10 @@ void FiniteDiffGroundTempsModel::getWeatherData() NumOfWarmupDays = 0; annualAveAirTemp_num = 0.0; + // Protect against array bounds error + int maxSimDays = min(NumDaysInYear, NumOfDayInEnvrn); - while ((DayOfSim < NumOfDayInEnvrn) || (WarmupFlag)) { // Begin day loop ... + while ((DayOfSim < maxSimDays) || (WarmupFlag)) { // Begin day loop ... ++DayOfSim; diff --git a/src/EnergyPlus/ScheduleManager.cc b/src/EnergyPlus/ScheduleManager.cc index 6b43b409c79..b3a523e5d16 100644 --- a/src/EnergyPlus/ScheduleManager.cc +++ b/src/EnergyPlus/ScheduleManager.cc @@ -235,7 +235,6 @@ namespace ScheduleManager { // Uses the standard get routines in the InputProcessor. // Using/Aliasing - using General::JulianDay; using General::ProcessDateString; using General::RoundSigDigits; using General::TrimSigDigits; @@ -1251,8 +1250,8 @@ namespace ScheduleManager { EndMonth = int(Numbers(NumPointer + 3)); EndDay = int(Numbers(NumPointer + 4)); NumPointer += 4; - StartPointer = JulianDay(StartMonth, StartDay, 1); - EndPointer = JulianDay(EndMonth, EndDay, 1); + StartPointer = General::OrdinalDay(StartMonth, StartDay, 1); + EndPointer = General::OrdinalDay(EndMonth, EndDay, 1); if (StartPointer <= EndPointer) { for (Count = StartPointer; Count <= EndPointer; ++Count) { ++DaysInYear(Count); @@ -1390,7 +1389,7 @@ namespace ScheduleManager { ErrorsFound = true; goto Through_exit; } else { - EndPointer = JulianDay(EndMonth, EndDay, 1); + EndPointer = General::OrdinalDay(EndMonth, EndDay, 1); if (EndPointer == 366) { if (FullYearSet) { ShowSevereError(RoutineName + CurrentModuleObject + "=\"" + Schedule(SchNum).Name + @@ -2368,7 +2367,6 @@ namespace ScheduleManager { // Using/Aliasing using DataGlobals::OutputFileDebug; - using General::InvJulianDay; using General::RoundSigDigits; // Locals @@ -2565,7 +2563,7 @@ namespace ScheduleManager { TS = Schedule(Count).WeekSchedulePointer(NumF); while (Schedule(Count).WeekSchedulePointer(NumF) == TS && NumF <= 366) { if (NumF == 366) { - InvJulianDay(NumF, PMon, PDay, 1); + General::InvOrdinalDay(NumF, PMon, PDay, 1); { IOFlags flags; flags.ADVANCE("No"); @@ -2576,7 +2574,7 @@ namespace ScheduleManager { if (NumF > 366) break; // compound If might have a problem unless this included. } if (NumF <= 366) { - InvJulianDay(NumF - 1, PMon, PDay, 1); + General::InvOrdinalDay(NumF - 1, PMon, PDay, 1); { IOFlags flags; flags.ADVANCE("No"); @@ -2599,7 +2597,7 @@ namespace ScheduleManager { TS = Schedule(Count).WeekSchedulePointer(NumF); while (Schedule(Count).WeekSchedulePointer(NumF) == TS && NumF <= 366) { if (NumF == 366) { - InvJulianDay(NumF, PMon, PDay, 1); + General::InvOrdinalDay(NumF, PMon, PDay, 1); gio::write(OutputFileDebug, fmtA) << " Through: " + RoundSigDigits(PMon) + '/' + RoundSigDigits(PDay) + ','; iDayP = 0; for (DT = 2; DT <= 6; ++DT) { @@ -2651,7 +2649,7 @@ namespace ScheduleManager { if (NumF > 366) break; // compound If might have a problem unless this included. } if (NumF <= 366) { - InvJulianDay(NumF - 1, PMon, PDay, 1); + General::InvOrdinalDay(NumF - 1, PMon, PDay, 1); gio::write(OutputFileDebug, fmtA) << " Through: " + RoundSigDigits(PMon) + '/' + RoundSigDigits(PDay) + ','; iDayP = 0; for (DT = 2; DT <= 6; ++DT) { @@ -2875,7 +2873,6 @@ namespace ScheduleManager { // Using/Aliasing using DataEnvironment::DayOfYear_Schedule; - using General::JulianDay; // Return value Real64 LookUpScheduleValue(0.0); @@ -2944,7 +2941,7 @@ namespace ScheduleManager { } if (WhichHour > 24) { while (WhichHour > 24) { - WeekSchedulePointer = Schedule(ScheduleIndex).WeekSchedulePointer(JulianDay(MonthTomorrow, DayOfMonthTomorrow, 1)); + WeekSchedulePointer = Schedule(ScheduleIndex).WeekSchedulePointer(General::OrdinalDay(MonthTomorrow, DayOfMonthTomorrow, 1)); if (DayOfWeekTomorrow <= 7 && HolidayIndexTomorrow > 0) { DaySchedulePointer = WeekSchedule(WeekSchedulePointer).DaySchedulePointer(7 + HolidayIndexTomorrow); } else { diff --git a/src/EnergyPlus/SimulationManager.cc b/src/EnergyPlus/SimulationManager.cc index 4aa83365fc6..d62db7eae05 100644 --- a/src/EnergyPlus/SimulationManager.cc +++ b/src/EnergyPlus/SimulationManager.cc @@ -238,9 +238,9 @@ namespace SimulationManager { using DataEnvironment::CurrentOverallSimDay; using DataEnvironment::EndMonthFlag; using DataEnvironment::EnvironmentName; - using DataEnvironment::TotalOverallSimDays; using DataEnvironment::TotDesDays; using DataEnvironment::TotRunDesPersDays; + using DataEnvironment::TotalOverallSimDays; using DataHVACGlobals::TimeStepSys; using BranchInputManager::InvalidBranchDefinitions; @@ -253,12 +253,12 @@ namespace SimulationManager { using DataErrorTracking::AskForConnectionsReport; using DataErrorTracking::ExitDuringSimulations; using DemandManager::InitDemandManagers; + using EMSManager::CheckIfAnyEMS; + using EMSManager::ManageEMS; using EconomicLifeCycleCost::ComputeLifeCycleCostAndReport; using EconomicLifeCycleCost::GetInputForLifeCycleCost; using EconomicTariff::ComputeTariff; // added for computing annual utility costs using EconomicTariff::WriteTabularTariffReports; - using EMSManager::CheckIfAnyEMS; - using EMSManager::ManageEMS; using ExteriorEnergyUse::ManageExteriorEnergyUse; using General::TrimSigDigits; using HVACControllers::DumpAirLoopStatistics; @@ -282,8 +282,8 @@ namespace SimulationManager { using namespace DataTimings; using DataSystemVariables::FullAnnualRun; using FaultsManager::CheckAndReadFaults; - using OutputProcessor::isFinalYear; using OutputProcessor::ResetAccumulationWhenWarmupComplete; + using OutputProcessor::isFinalYear; using PlantPipingSystemsManager::CheckIfAnyBasements; using PlantPipingSystemsManager::CheckIfAnySlabs; using PlantPipingSystemsManager::SimulateGroundDomains; @@ -532,11 +532,11 @@ namespace SimulationManager { cWarmupDay = TrimSigDigits(NumOfWarmupDays); DisplayString("Warming up {" + cWarmupDay + '}'); } else if (DayOfSim == 1) { - DisplayString("Starting Simulation at " + CurMnDy + " for " + EnvironmentName); + DisplayString("Starting Simulation at " + DataEnvironment::CurMnDyYr + " for " + EnvironmentName); gio::write(OutputFileInits, Format_700) << NumOfWarmupDays; ResetAccumulationWhenWarmupComplete(); } else if (DisplayPerfSimulationFlag) { - DisplayString("Continuing Simulation at " + CurMnDy + " for " + EnvironmentName); + DisplayString("Continuing Simulation at " + DataEnvironment::CurMnDyYr + " for " + EnvironmentName); DisplayPerfSimulationFlag = false; } // for simulations that last longer than a week, identify when the last year of the simulation is started @@ -698,9 +698,9 @@ namespace SimulationManager { using DataEnvironment::IgnoreBeamRadiation; using DataEnvironment::IgnoreDiffuseRadiation; using DataEnvironment::IgnoreSolarRadiation; + using DataHVACGlobals::LimitNumSysSteps; using DataHVACGlobals::deviationFromSetPtThresholdClg; using DataHVACGlobals::deviationFromSetPtThresholdHtg; - using DataHVACGlobals::LimitNumSysSteps; using General::RoundSigDigits; using namespace DataIPShortCuts; @@ -1517,8 +1517,8 @@ namespace SimulationManager { using OutputProcessor::NumTotalIVariable; using OutputProcessor::NumTotalRVariable; using OutputProcessor::NumVarMeterArrays; - using OutputReportTabular::maxUniqueKeyCount; using OutputReportTabular::MonthlyFieldSetInputCount; + using OutputReportTabular::maxUniqueKeyCount; using SolarShading::MAXHCArrayBounds; using SolarShading::maxNumberOfFigures; using namespace DataRuntimeLanguage; @@ -2813,15 +2813,15 @@ void Resimulate(bool &ResimExt, // Flag to resimulate the exterior energy use si using DemandManager::DemandManagerHBIterations; using DemandManager::DemandManagerHVACIterations; using ExteriorEnergyUse::ManageExteriorEnergyUse; + using HVACManager::SimHVAC; using HeatBalanceAirManager::InitAirHeatBalance; using HeatBalanceSurfaceManager::InitSurfaceHeatBalance; - using HVACManager::SimHVAC; using RefrigeratedCase::ManageRefrigeratedCaseRacks; using ZoneTempPredictorCorrector::ManageZoneAirUpdates; // using HVACManager::CalcAirFlowSimple; using DataContaminantBalance::Contaminant; - using DataHeatBalance::ZoneAirMassFlow; using DataHVACGlobals::UseZoneTimeStepHistory; // , InitDSwithZoneHistory + using DataHeatBalance::ZoneAirMassFlow; using ZoneContaminantPredictorCorrector::ManageZoneContaminanUpdates; using namespace ZoneEquipmentManager; // using ZoneEquipmentManager::CalcAirFlowSimple; diff --git a/src/EnergyPlus/SizingManager.cc b/src/EnergyPlus/SizingManager.cc index 42719a98e99..26db4f05a86 100644 --- a/src/EnergyPlus/SizingManager.cc +++ b/src/EnergyPlus/SizingManager.cc @@ -2019,7 +2019,7 @@ namespace SizingManager { // store timing description of Last occurance of max int Month(0); int DayOfMonth(0); - General::InvJulianDay(DayLoop, Month, DayOfMonth, 1); + General::InvOrdinalDay(DayLoop, Month, DayOfMonth, 1); std::string MonthDayString; static gio::Fmt MnDyFmt("(I2.2,'/',I2.2)"); gio::write(MonthDayString, MnDyFmt) << Month << DayOfMonth; diff --git a/src/EnergyPlus/SolarShading.cc b/src/EnergyPlus/SolarShading.cc index d5e02405b06..ddf6a910b05 100644 --- a/src/EnergyPlus/SolarShading.cc +++ b/src/EnergyPlus/SolarShading.cc @@ -8781,7 +8781,7 @@ namespace SolarShading { // Calculate average Equation of Time, Declination Angle for this period if (!WarmupFlag) { - DisplayString("Updating Shadowing Calculations, Start Date=" + CurMnDy); + DisplayString("Updating Shadowing Calculations, Start Date=" + CurMnDyYr); DisplayPerfSimulationFlag = true; } diff --git a/src/EnergyPlus/SurfaceGeometry.cc b/src/EnergyPlus/SurfaceGeometry.cc index da26c3067b9..aeba0d087e4 100644 --- a/src/EnergyPlus/SurfaceGeometry.cc +++ b/src/EnergyPlus/SurfaceGeometry.cc @@ -8228,7 +8228,6 @@ namespace SurfaceGeometry { // Using/Aliasing using namespace DataIPShortCuts; - using General::JulianDay; using General::TrimSigDigits; // SUBROUTINE LOCAL VARIABLE DECLARATIONS: @@ -8270,10 +8269,10 @@ namespace SurfaceGeometry { StormWindow(StormWinNum).StormWinDistance = rNumericArgs(1); StormWindow(StormWinNum).MonthOn = rNumericArgs(2); StormWindow(StormWinNum).DayOfMonthOn = rNumericArgs(3); - StormWindow(StormWinNum).DateOn = JulianDay(StormWindow(StormWinNum).MonthOn, StormWindow(StormWinNum).DayOfMonthOn, 1); + StormWindow(StormWinNum).DateOn = General::OrdinalDay(StormWindow(StormWinNum).MonthOn, StormWindow(StormWinNum).DayOfMonthOn, 1); StormWindow(StormWinNum).MonthOff = rNumericArgs(4); StormWindow(StormWinNum).DayOfMonthOff = rNumericArgs(5); - StormWindow(StormWinNum).DateOff = JulianDay(StormWindow(StormWinNum).MonthOff, StormWindow(StormWinNum).DayOfMonthOff, 1); + StormWindow(StormWinNum).DateOff = General::OrdinalDay(StormWindow(StormWinNum).MonthOff, StormWindow(StormWinNum).DayOfMonthOff, 1); if (StormWindow(StormWinNum).DateOn == StormWindow(StormWinNum).DateOff) { ShowSevereError(cCurrentModuleObject + ": Date On = Date Off -- not allowed, occurred in WindowProperty:StormWindow Input #" + diff --git a/src/EnergyPlus/ThermalComfort.cc b/src/EnergyPlus/ThermalComfort.cc index 9c6c37a0e07..286a382604f 100644 --- a/src/EnergyPlus/ThermalComfort.cc +++ b/src/EnergyPlus/ThermalComfort.cc @@ -2584,7 +2584,6 @@ namespace ThermalComfort { using DataEnvironment::Month; using DataEnvironment::OutDryBulbTemp; using DataHVACGlobals::SysTimeElapsed; - using General::InvJulianDay; using OutputReportTabular::GetColumnUsingTabs; using OutputReportTabular::StrToReal; diff --git a/src/EnergyPlus/WeatherManager.cc b/src/EnergyPlus/WeatherManager.cc index 8c276db76c8..abc6ced4e35 100644 --- a/src/EnergyPlus/WeatherManager.cc +++ b/src/EnergyPlus/WeatherManager.cc @@ -46,10 +46,10 @@ // POSSIBILITY OF SUCH DAMAGE. // C++ Headers +#include #include #include #include -#include // ObjexxFCL Headers #include @@ -176,6 +176,13 @@ namespace WeatherManager { static std::string const BlankString; Array1D_string const DaysOfWeek(7, {"SUNDAY", "MONDAY", "TUESDAY", "WEDNESDAY", "THURSDAY", "FRIDAY", "SATURDAY"}); + std::map weekDayLookUp{{"SUNDAY", WeekDay::Sunday}, + {"MONDAY", WeekDay::Monday}, + {"TUESDAY", WeekDay::Tuesday}, + {"WEDNESDAY", WeekDay::Wednesday}, + {"THURSDAY", WeekDay::Thursday}, + {"FRIDAY", WeekDay::Friday}, + {"SATURDAY", WeekDay::Saturday}}; bool Debugout(false); @@ -682,7 +689,7 @@ namespace WeatherManager { // do some calculations for natural convection from the bottom of the ship Real64 const distanceFromBottomOfHull = 12; // meters, assumed for now - // this Prandtl correction is from Incropera & Dewitt, Intro to HT, eq 9.20 + // this Prandtl correction is from Incropera & Dewitt, Intro to HT, eq 9.20 Real64 const prandtlCorrection = (0.75 * pow(waterPrandtlNumber, 0.5)) / pow(0.609 + 1.221 * pow(waterPrandtlNumber, 0.5) + 1.238 * waterPrandtlNumber, 0.25); // calculate the Grashof number @@ -796,8 +803,6 @@ namespace WeatherManager { // Using/Aliasing using General::BetweenDates; - using General::InvJulianDay; - using General::JulianDay; using namespace DataSystemVariables; using DataHeatBalance::AdaptiveComfortRequested_ASH55; using DataHeatBalance::AdaptiveComfortRequested_CEN15251; @@ -844,7 +849,6 @@ namespace WeatherManager { std::string EnDate; std::string string; std::string cTotalEnvDays; - int NumDays; int DSTActStMon; int DSTActStDay; int DSTActEnMon; @@ -852,7 +856,6 @@ namespace WeatherManager { int RunStJDay; int RunEnJDay; bool OkRun; - int ThisWeekDay; int TWeekDay; Array1D_int MonWeekDay(12); Array1D_int ActEndDayOfMonth(12); @@ -1074,40 +1077,53 @@ namespace WeatherManager { UseRainValues = Environment(Envrn).UseRain; UseSnowValues = Environment(Envrn).UseSnow; + bool missingLeap(false); // Defer acting on anything found here until after the other range checks (see below) + if (Environment(Envrn).ActualWeather && !WFAllowsLeapYears) { + for (int year = Environment(Envrn).StartYear; year <= Environment(Envrn).EndYear; year++) { + if (isLeapYear(year)) { + ShowSevereError( + "GetNextEnvironment: Weatherfile does not support leap years but runperiod includes a leap year (" + + std::to_string(year) + ")"); + missingLeap = true; + } + } + } + OkRun = false; - ThisWeekDay = 0; - for (Loop = 1; Loop <= NumDataPeriods; ++Loop) { - if (!Environment(Envrn).ActualWeather) { - RunStJDay = JulianDay(DataPeriods(Loop).StMon, DataPeriods(Loop).StDay, LeapYearAdd); - RunEnJDay = JulianDay(DataPeriods(Loop).EnMon, DataPeriods(Loop).EnDay, LeapYearAdd); - if (!BetweenDates(Environment(Envrn).StartJDay, RunStJDay, RunEnJDay)) continue; - if (!BetweenDates(Environment(Envrn).EndJDay, RunStJDay, RunEnJDay)) continue; - OkRun = true; - if (RunStJDay > Environment(Envrn).StartJDay) { - NumDays = RunStJDay - Environment(Envrn).StartJDay; - } else { - NumDays = Environment(Envrn).StartJDay - RunStJDay; + + if (Environment(Envrn).ActualWeather) { + // Actual weather + for (auto &dataperiod : DataPeriods) { + int runStartJulian = dataperiod.DataStJDay; + int runEndJulian = dataperiod.DataEnJDay; + if (!dataperiod.HasYearData) { + ShowSevereError("GetNextEnvironment: Actual weather runperiod has been entered but weatherfile DATA PERIOD " + "does not have year included in start/end date."); + ShowContinueError("...to match the RunPeriod, the DATA PERIOD should be mm/dd/yyyy for both, or"); + ShowContinueError("...set \"Treat Weather as Actual\" to \"No\"."); } - ThisWeekDay = mod(DataPeriods(Loop).WeekDay + NumDays - 1, 7) + 1; + if (!BetweenDates(Environment(Envrn).StartDate, runStartJulian, runEndJulian)) continue; + if (!BetweenDates(Environment(Envrn).EndDate, runStartJulian, runEndJulian)) continue; + OkRun = true; break; - } else { // Actual Weather - RunStJDay = DataPeriods(Loop).DataStJDay; - RunEnJDay = DataPeriods(Loop).DataEnJDay; - if (!DataPeriods(Loop).HasYearData) { - ShowSevereError("GetNextEnvironment: Runperiod:CustomRange has been entered but weatherfile DATA PERIOD does " - "not have year included in start/end date."); - ShowContinueError("...to match the RunPeriod, the DATA PERIOD should be mm/dd/yyyy for both."); + } + } else { + // Typical (or just non-actual) weather + for (auto &dataperiod : DataPeriods) { + // Since this is not actual weather, there may be issues with this calculation + // Assume the weather data starts the same year as the simulation, so LeapYearAdd is what + // should be used. + int runStartOrdinal = General::OrdinalDay(dataperiod.StMon, dataperiod.StDay, LeapYearAdd); + // This one is harder, leave as is for now. What about multiple years of data? + int runEndOrdinal = General::OrdinalDay(dataperiod.EnMon, dataperiod.EnDay, LeapYearAdd); + if (runStartOrdinal == 1 && (runEndOrdinal == 366 || runEndOrdinal == 365)) { + // Complete year(s) of weather data, will wrap around + OkRun = true; + break; } - if (!BetweenDates(Environment(Envrn).StartDate, RunStJDay, RunEnJDay)) continue; - if (!BetweenDates(Environment(Envrn).EndDate, RunStJDay, RunEnJDay)) continue; + if (!BetweenDates(Environment(Envrn).StartJDay, runStartOrdinal, runEndOrdinal)) continue; + if (!BetweenDates(Environment(Envrn).EndJDay, runStartOrdinal, runEndOrdinal)) continue; OkRun = true; - if (RunStJDay > Environment(Envrn).StartDate) { - NumDays = RunStJDay - Environment(Envrn).StartDate; - } else { - NumDays = Environment(Envrn).StartDate - RunStJDay; - } - ThisWeekDay = mod(DataPeriods(Loop).WeekDay + NumDays - 1, 7) + 1; - break; } } @@ -1140,29 +1156,33 @@ namespace WeatherManager { EnDate += "/"; } if (NumDataPeriods == 1) { - ShowContinueError("Weather Data Period (Start=" + StDate + ",End=" + EnDate); + ShowContinueError("Weather Data Period (Start=" + StDate + ",End=" + EnDate + ')'); } else { ShowContinueError("Multiple Weather Data Periods 1st (Start=" + StDate + ",End=" + EnDate + ')'); } ShowFatalError(RoutineName + "Program terminates due to preceding condition."); } + if (missingLeap) { + // Bail out now if we still need to + ShowFatalError(RoutineName + "Program terminates due to preceding condition."); + } + // Following builds Environment start/end for ASHRAE 55 warnings gio::write(StDate, DateFormat) << Environment(Envrn).StartMonth << Environment(Envrn).StartDay; gio::write(EnDate, DateFormat) << Environment(Envrn).EndMonth << Environment(Envrn).EndDay; - if (Environment(Envrn).ActualWeather) { - string = RoundSigDigits(Environment(Envrn).StartYear); - StDate += "/" + string; - string = RoundSigDigits(Environment(Envrn).EndYear); - EnDate += "/" + string; - } else if (Environment(Envrn).CurrentYear > 0 && Environment(Envrn).TreatYearsAsConsecutive) { - string = RoundSigDigits(Environment(Envrn).CurrentYear); - StDate += "/" + string; - string = RoundSigDigits(Environment(Envrn).CurrentYear + Environment(Envrn).NumSimYears); - EnDate += "/" + string; - } + StDate += "/" + RoundSigDigits(Environment(Envrn).StartYear); + EnDate += "/" + RoundSigDigits(Environment(Envrn).EndYear); EnvironmentStartEnd = StDate + " - " + EnDate; + if (Environment(Envrn).DayOfWeek == 0) { // Use Sunday + TWeekDay = 1; + MonWeekDay = DataPeriods(Loop).MonWeekDay; + } else { + TWeekDay = Environment(Envrn).DayOfWeek; + MonWeekDay = Environment(Envrn).MonWeekDay; + } + if (DoWeatherInitReporting) { if (Environment(Envrn).UseDST) { AlpUseDST = "Yes"; @@ -1190,28 +1210,12 @@ namespace WeatherManager { AlpUseSnow = "No"; } cTotalEnvDays = RoundSigDigits(Environment(Envrn).TotalDays); - if (Environment(Envrn).DayOfWeek == 0) { // Uses Weather file start - gio::write(OutputFileInits, EnvNameFormat) - << Environment(Envrn).Title << kindOfRunPeriod << StDate << EnDate << ValidDayNames(ThisWeekDay) - << cTotalEnvDays << "UseWeatherFile" << AlpUseDST << AlpUseSpec << ApWkRule << AlpUseRain << AlpUseSnow; - TWeekDay = ThisWeekDay; - MonWeekDay = DataPeriods(Loop).MonWeekDay; - } else { - gio::write(OutputFileInits, EnvNameFormat) - << Environment(Envrn).Title << kindOfRunPeriod << StDate << EnDate - << ValidDayNames(Environment(Envrn).DayOfWeek) << cTotalEnvDays << "Use RunPeriod Specified Day" << AlpUseDST - << AlpUseSpec << ApWkRule << AlpUseRain << AlpUseSnow; - TWeekDay = Environment(Envrn).DayOfWeek; - MonWeekDay = Environment(Envrn).MonWeekDay; - } - } else { // just in case - if (Environment(Envrn).DayOfWeek == 0) { // Uses Weather file start - TWeekDay = ThisWeekDay; - MonWeekDay = DataPeriods(Loop).MonWeekDay; - } else { - TWeekDay = Environment(Envrn).DayOfWeek; - MonWeekDay = Environment(Envrn).MonWeekDay; - } + + gio::write(OutputFileInits, EnvNameFormat) + << Environment(Envrn).Title << kindOfRunPeriod << StDate << EnDate << ValidDayNames(TWeekDay) + << cTotalEnvDays << "Use RunPeriod Specified Day" << AlpUseDST + << AlpUseSpec << ApWkRule << AlpUseRain << AlpUseSnow; + } if (!DoingSizing && !KickOffSimulation) { @@ -1229,8 +1233,8 @@ namespace WeatherManager { ErrorsFound = true; } if (DataPeriods(1).StMon == 1 && DataPeriods(1).StDay == 1) { - RunStJDay = JulianDay(DataPeriods(1).StMon, DataPeriods(1).StDay, LeapYearAdd); - RunEnJDay = JulianDay(DataPeriods(1).EnMon, DataPeriods(1).EnDay, LeapYearAdd); + RunStJDay = General::OrdinalDay(DataPeriods(1).StMon, DataPeriods(1).StDay, LeapYearAdd); + RunEnJDay = General::OrdinalDay(DataPeriods(1).EnMon, DataPeriods(1).EnDay, LeapYearAdd); if (RunEnJDay - RunStJDay + 1 != 365) { ShowSevereError(RoutineName + "AdaptiveComfort Reporting does not work correctly with weather files " "that do not contain 365 days."); @@ -1253,13 +1257,11 @@ namespace WeatherManager { // Only need to set Week days for Run Days RunPeriodStartDayOfWeek = TWeekDay; WeekDayTypes = 0; - JDay5Start = JulianDay(Environment(Envrn).StartMonth, Environment(Envrn).StartDay, LeapYearAdd); - JDay5End = JulianDay(Environment(Envrn).EndMonth, Environment(Envrn).EndDay, LeapYearAdd); - if (JDay5End >= JDay5Start) { - curSimDayForEndOfRunPeriod = DayOfSim + (JDay5End - JDay5Start) + LeapYearAdd; - } else { - curSimDayForEndOfRunPeriod = DayOfSim + JulianDay(12, 31, LeapYearAdd) - JDay5Start + JDay5End; - } + JDay5Start = General::OrdinalDay(Environment(Envrn).StartMonth, Environment(Envrn).StartDay, LeapYearAdd); + JDay5End = General::OrdinalDay(Environment(Envrn).EndMonth, Environment(Envrn).EndDay, LeapYearAdd); + + curSimDayForEndOfRunPeriod = Environment(Envrn).TotalDays; + Loop = JDay5Start; while (true) { WeekDayTypes(Loop) = TWeekDay; @@ -1280,9 +1282,7 @@ namespace WeatherManager { DaylightSavingIsActive = true; } Environment(Envrn).SetWeekDays = false; - if (Environment(Envrn).ActualWeather) { - curSimDayForEndOfRunPeriod = Environment(Envrn).TotalDays; - } + if (DaylightSavingIsActive) { SetDSTDateRanges(MonWeekDay, DSTIndex, DSTActStMon, DSTActStDay, DSTActEnMon, DSTActEnDay); } @@ -1803,7 +1803,6 @@ namespace WeatherManager { // na // Using/Aliasing - using General::JulianDay; // Argument array dimensioning @@ -1897,8 +1896,8 @@ namespace WeatherManager { } DSTIndex = 0; - JDay = JulianDay(ActStartMonth, ActStartDay, LeapYearAdd); - JDay1 = JulianDay(ActEndMonth, ActEndDay, LeapYearAdd); + JDay = General::OrdinalDay(ActStartMonth, ActStartDay, LeapYearAdd); + JDay1 = General::OrdinalDay(ActEndMonth, ActEndDay, LeapYearAdd); if (JDay1 >= JDay) { DSTIndex({JDay, JDay1}) = 1; } else { @@ -1928,8 +1927,6 @@ namespace WeatherManager { // na // Using/Aliasing - using General::InvJulianDay; - using General::JulianDay; // Argument array dimensioning @@ -1961,7 +1958,7 @@ namespace WeatherManager { for (Loop = 1; Loop <= NumSpecialDays; ++Loop) { if (SpecialDays(Loop).WthrFile && !UseSpecialDays) continue; if (SpecialDays(Loop).DateType <= MonthDay) { - JDay = JulianDay(SpecialDays(Loop).Month, SpecialDays(Loop).Day, LeapYearAdd); + JDay = General::OrdinalDay(SpecialDays(Loop).Month, SpecialDays(Loop).Day, LeapYearAdd); if (SpecialDays(Loop).Duration == 1 && Environment(Envrn).ApplyWeekendRule) { if (WeekDayTypes(JDay) == 1) { // Sunday, must go to Monday @@ -1974,7 +1971,7 @@ namespace WeatherManager { if (JDay == 366 && LeapYearAdd == 0) JDay = 1; } } - InvJulianDay(JDay, SpecialDays(Loop).ActStMon, SpecialDays(Loop).ActStDay, LeapYearAdd); + General::InvOrdinalDay(JDay, SpecialDays(Loop).ActStMon, SpecialDays(Loop).ActStDay, LeapYearAdd); } else if (SpecialDays(Loop).DateType == NthDayInMonth) { if (SpecialDays(Loop).WeekDay >= MonWeekDay(SpecialDays(Loop).Month)) { ThisDay = SpecialDays(Loop).WeekDay - MonWeekDay(SpecialDays(Loop).Month) + 1; @@ -1989,7 +1986,7 @@ namespace WeatherManager { } SpecialDays(Loop).ActStMon = SpecialDays(Loop).Month; SpecialDays(Loop).ActStDay = ThisDay; - JDay = JulianDay(SpecialDays(Loop).Month, ThisDay, LeapYearAdd); + JDay = General::OrdinalDay(SpecialDays(Loop).Month, ThisDay, LeapYearAdd); } else { // LastWeekDayInMonth ThisDay = SpecialDays(Loop).WeekDay - MonWeekDay(SpecialDays(Loop).Month) + 1; while (ThisDay + 7 <= ActEndDayOfMonth(SpecialDays(Loop).Month)) { @@ -1997,7 +1994,7 @@ namespace WeatherManager { } SpecialDays(Loop).ActStMon = SpecialDays(Loop).Month; SpecialDays(Loop).ActStDay = ThisDay; - JDay = JulianDay(SpecialDays(Loop).Month, ThisDay, LeapYearAdd); + JDay = General::OrdinalDay(SpecialDays(Loop).Month, ThisDay, LeapYearAdd); } if (SpecialDayTypes(JDay) != 0) { ShowWarningError(RoutineName + "Special Day definition (" + SpecialDays(Loop).Name + @@ -2044,8 +2041,6 @@ namespace WeatherManager { // USE STATEMENTS: // na // Using/Aliasing - using General::InvJulianDay; - using General::JulianDay; // Locals // SUBROUTINE ARGUMENT DEFINITIONS: @@ -2187,8 +2182,6 @@ namespace WeatherManager { SetSpecialDayDates(Environment(Envrn).MonWeekDay); } ++YearOfSim; - DataGlobals::CalendarYear += 1; - DataGlobals::CalendarYearChr = std::to_string(DataGlobals::CalendarYear); FirstSimDayofYear = 1; ReadWeatherForDay(FirstSimDayofYear, Envrn, false); // Read tomorrow's weather } else { @@ -2215,7 +2208,7 @@ namespace WeatherManager { if (DatesShouldBeReset) { if (Environment(Envrn).TreatYearsAsConsecutive) { ++Environment(Envrn).CurrentYear; - Environment(Envrn).IsLeapYear = IsLeapYear(Environment(Envrn).CurrentYear); + Environment(Envrn).IsLeapYear = isLeapYear(Environment(Envrn).CurrentYear); CurrentYearIsLeapYear = Environment(Envrn).IsLeapYear; if (CurrentYearIsLeapYear) { if (WFAllowsLeapYears) { @@ -2228,11 +2221,11 @@ namespace WeatherManager { } // need to reset MonWeekDay and WeekDayTypes if (!CurrentYearIsLeapYear) { - JDay5Start = JulianDay(Environment(Envrn).StartMonth, Environment(Envrn).StartDay, 0); - JDay5End = JulianDay(Environment(Envrn).EndMonth, Environment(Envrn).EndDay, 0); + JDay5Start = General::OrdinalDay(Environment(Envrn).StartMonth, Environment(Envrn).StartDay, 0); + JDay5End = General::OrdinalDay(Environment(Envrn).EndMonth, Environment(Envrn).EndDay, 0); } else { - JDay5Start = JulianDay(Environment(Envrn).StartMonth, Environment(Envrn).StartDay, LeapYearAdd); - JDay5End = JulianDay(Environment(Envrn).EndMonth, Environment(Envrn).EndDay, LeapYearAdd); + JDay5Start = General::OrdinalDay(Environment(Envrn).StartMonth, Environment(Envrn).StartDay, LeapYearAdd); + JDay5End = General::OrdinalDay(Environment(Envrn).EndMonth, Environment(Envrn).EndDay, LeapYearAdd); } if (!Environment(Envrn).ActualWeather) curSimDayForEndOfRunPeriod = DayOfSim + Environment(Envrn).RawSimDays + LeapYearAdd - 1; @@ -2262,7 +2255,7 @@ namespace WeatherManager { } else if ((Month == 1 && DayOfMonth == 1) && DatesShouldBeReset && (Jan1DatesShouldBeReset)) { if (Environment(Envrn).TreatYearsAsConsecutive) { ++Environment(Envrn).CurrentYear; - Environment(Envrn).IsLeapYear = IsLeapYear(Environment(Envrn).CurrentYear); + Environment(Envrn).IsLeapYear = isLeapYear(Environment(Envrn).CurrentYear); CurrentYearIsLeapYear = Environment(Envrn).IsLeapYear; if (CurrentYearIsLeapYear && !WFAllowsLeapYears) CurrentYearIsLeapYear = false; if (DayOfSim < curSimDayForEndOfRunPeriod && CurrentYearIsLeapYear) ++curSimDayForEndOfRunPeriod; @@ -2466,13 +2459,13 @@ namespace WeatherManager { // INTERPOL(IBLAST) legacy code. // Using/Aliasing - using General::JulianDay; using ScheduleManager::UpdateScheduleValues; using namespace GroundTemperatureManager; // SUBROUTINE PARAMETER DEFINITIONS: static char time_stamp[10]; static char day_stamp[6]; + static char day_year_stamp[11]; static std::string const RoutineName("SetCurrentWeather"); // SUBROUTINE LOCAL VARIABLE DECLARATIONS: @@ -2484,12 +2477,12 @@ namespace WeatherManager { NextHour = HourOfDay + 1; - if (HourOfDay == 24) { + if (HourOfDay == 24) { // Should investigate whether EndDayFlag is always set here and use that instead NextHour = 1; } - if (HourOfDay == 1) { - DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + if (HourOfDay == 1) { // Should investigate whether BeginDayFlag is always set here and use that instead + DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); } UpdateScheduleValues(); @@ -2498,6 +2491,8 @@ namespace WeatherManager { CurMnDyHr = time_stamp; std::sprintf(day_stamp, "%02d/%02d", Month, DayOfMonth); CurMnDy = day_stamp; + std::sprintf(day_year_stamp, "%02d/%02d/%04d", Month, DayOfMonth, DataGlobals::CalendarYear); + DataEnvironment::CurMnDyYr = day_year_stamp; WeightNow = Interpolation(TimeStep); WeightPreviousHour = 1.0 - WeightNow; @@ -2704,7 +2699,6 @@ namespace WeatherManager { // This subroutine reads the appropriate day of EPW weather data. // Using/Aliasing - using General::JulianDay; using General::RoundSigDigits; using ScheduleManager::GetScheduleValuesForDay; @@ -3308,11 +3302,17 @@ namespace WeatherManager { SkipThisDay = false; } + if (Environment(Environ).ActualWeather && CurrentYearIsLeapYear) { + if (WMonth == 3 && WDay == 1 && DataEnvironment::Month == 2 && DataEnvironment::DayOfMonth == 28) { + ShowFatalError("ReadEPlusWeatherForDay: Current year is a leap year, but Feb29 data is missing."); + } + } + TomorrowVariables.Year = WYear; TomorrowVariables.Month = WMonth; TomorrowVariables.DayOfMonth = WDay; - TomorrowVariables.DayOfYear = JulianDay(WMonth, WDay, LeapYearAdd); - TomorrowVariables.DayOfYear_Schedule = JulianDay(WMonth, WDay, 1); + TomorrowVariables.DayOfYear = General::OrdinalDay(WMonth, WDay, LeapYearAdd); + TomorrowVariables.DayOfYear_Schedule = General::OrdinalDay(WMonth, WDay, 1); CalculateDailySolarCoeffs(TomorrowVariables.DayOfYear, A, B, @@ -4113,7 +4113,6 @@ namespace WeatherManager { // ASHRAE Handbook of Fundamentals? // Using/Aliasing - using General::JulianDay; using General::RoundSigDigits; using ScheduleManager::GetSingleDayScheduleValues; @@ -4215,7 +4214,7 @@ namespace WeatherManager { DesignDay(EnvrnNum).Year = CurrentYear; // f90 date_and_time implemented. full 4 digit year !+ 1900 DesignDay(EnvrnNum).Month = DesDayInput(EnvrnNum).Month; DesignDay(EnvrnNum).DayOfMonth = DesDayInput(EnvrnNum).DayOfMonth; - DesignDay(EnvrnNum).DayOfYear = JulianDay(DesignDay(EnvrnNum).Month, DesignDay(EnvrnNum).DayOfMonth, 0); + DesignDay(EnvrnNum).DayOfYear = General::OrdinalDay(DesignDay(EnvrnNum).Month, DesignDay(EnvrnNum).DayOfMonth, 0); gio::write(CurMnDy, MnDyFmt) << DesDayInput(EnvrnNum).Month << DesDayInput(EnvrnNum).DayOfMonth; // EnvironmentName = DesDayInput( EnvrnNum ).Title; RunPeriodEnvironment = false; @@ -5652,7 +5651,6 @@ namespace WeatherManager { // Legacy subroutine CKBLDE. // Using/Aliasing - using General::JulianDay; // SUBROUTINE ARGUMENT DEFINITIONS: // na @@ -5871,8 +5869,6 @@ namespace WeatherManager { static bool ErrorsFound(false); int RPD1; int RPD2; - int RP; // number of run periods - int RPAW; // number of run periods, actual weather // FLOW: @@ -5880,9 +5876,7 @@ namespace WeatherManager { TotDesDays = inputProcessor->getNumObjectsFound("SizingPeriod:DesignDay"); RPD1 = inputProcessor->getNumObjectsFound("SizingPeriod:WeatherFileDays"); RPD2 = inputProcessor->getNumObjectsFound("SizingPeriod:WeatherFileConditionType"); - RP = inputProcessor->getNumObjectsFound("RunPeriod"); - RPAW = inputProcessor->getNumObjectsFound("RunPeriod:CustomRange"); - TotRunPers = RP + RPAW; + TotRunPers = inputProcessor->getNumObjectsFound("RunPeriod"); NumOfEnvrn = TotDesDays + TotRunPers + RPD1 + RPD2; if (TotRunPers > 0) { WeathSimReq = true; @@ -5970,6 +5964,30 @@ namespace WeatherManager { } } + static int findYearForWeekday(int const month, int const day, WeekDay const weekday) + { + // Find a year that goes with a month/day and a weekday. A lookup table is used with the most recent year that includes + // the date with the weekday specified. + + // Tu, W, Th, F, Sa, Su, M, Tu, W, Th, F, Sa, Su + static std::array defaultYear{{2013, 2014, 2015, 2010, 2011, 2017, 2007, 2013, 2014, 2015, 2010, 2011, 2017}}; + + int rem = calculateDayOfYear(month, day) % 7; + return defaultYear[static_cast(weekday) - rem + 5]; // static_cast(weekday) - rem + 1 + 4 + } + + static int findLeapYearForWeekday(int const month, int const day, WeekDay const weekday) + { + // Find a leap year that goes with a month/day and a weekday. A lookup table is used with the most recent year that includes + // the date with the weekday specified. + + // Tu, W, Th, F, Sa, Su, M, Tu, W, Th, F, Sa, Su + static std::array defaultLeapYear{{2008, 1992, 2004, 2016, 2000, 2012, 1996, 2008, 1992, 2004, 2016, 2000, 2012}}; + + int rem = calculateDayOfYear(month, day, true) % 7; + return defaultLeapYear[static_cast(weekday) - rem + 5]; // static_cast(weekday) - rem + 1 + 4 + } + void GetRunPeriodData(int &TotRunPers, // Total number of Run Periods requested bool &ErrorsFound) { @@ -5986,7 +6004,6 @@ namespace WeatherManager { // simulation dates // Using/Aliasing - using General::JulianDay; using General::TrimSigDigits; using namespace DataSystemVariables; using namespace DataIPShortCuts; @@ -5997,16 +6014,6 @@ namespace WeatherManager { int IOStat; // IO Status when calling get input subroutine int Loop; int Count; - int RP; // number of run periods - int RPAW; // number of run periods, actual weather - int Ptr; - int LocalLeapYearAdd; - - // Object Data - - // FLOW: - RP = inputProcessor->getNumObjectsFound("RunPeriod"); - RPAW = inputProcessor->getNumObjectsFound("RunPeriod:CustomRange"); // Call Input Get routine to retrieve annual run data RunPeriodInput.allocate(TotRunPers); @@ -6014,12 +6021,12 @@ namespace WeatherManager { cCurrentModuleObject = "RunPeriod"; Count = 0; - if (!WFAllowsLeapYears) { - LocalLeapYearAdd = 0; - } else { - LocalLeapYearAdd = 1; - } - for (Loop = 1; Loop <= RP; ++Loop) { + // if ( ! WFAllowsLeapYears ) { + // LocalLeapYearAdd = 0; + //} else { + // LocalLeapYearAdd = 1; + //} + for (Loop = 1; Loop <= TotRunPers; ++Loop) { inputProcessor->getObjectItem(cCurrentModuleObject, Loop, cAlphaArgs, @@ -6032,318 +6039,205 @@ namespace WeatherManager { cAlphaFieldNames, cNumericFieldNames); + // A1, \field Name if (!lAlphaFieldBlanks(1)) { GlobalNames::VerifyUniqueInterObjectName( RunPeriodInputUniqueNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); } ++Count; - RunPeriodInput(Loop).Title = cAlphaArgs(1); + // Loop = RP + Ptr; + RunPeriodInput(Loop).title = cAlphaArgs(1); // set the start and end day of month from user input // N1 , \field Begin Month // N2 , \field Begin Day of Month - // N3 , \field End Month - // N4 , \field End Day of Month - RunPeriodInput(Loop).StartMonth = int(rNumericArgs(1)); - RunPeriodInput(Loop).StartDay = int(rNumericArgs(2)); - RunPeriodInput(Loop).EndMonth = int(rNumericArgs(3)); - RunPeriodInput(Loop).EndDay = int(rNumericArgs(4)); - - // N5, \field Number of Times Runperiod to be Repeated - if (int(rNumericArgs(5)) == 0) { - RunPeriodInput(Loop).NumSimYears = 1; - } else { - RunPeriodInput(Loop).NumSimYears = int(rNumericArgs(5)); - } - - // N6; \field Start Year - if (int(rNumericArgs(6)) == 0) { - RunPeriodInput(Loop).BeginYear = AutoCalculate; - RunPeriodInput(Loop).TreatYearsAsConsecutive = false; - } else { - RunPeriodInput(Loop).BeginYear = int(rNumericArgs(6)); - RunPeriodInput(Loop).TreatYearsAsConsecutive = true; - } + // N3, \field Start Year + // N4 , \field End Month + // N5 , \field End Day of Month + // N6, \field End Year + RunPeriodInput(Loop).startMonth = int(rNumericArgs(1)); + RunPeriodInput(Loop).startDay = int(rNumericArgs(2)); + RunPeriodInput(Loop).startYear = int(rNumericArgs(3)); + RunPeriodInput(Loop).endMonth = int(rNumericArgs(4)); + RunPeriodInput(Loop).endDay = int(rNumericArgs(5)); + RunPeriodInput(Loop).endYear = int(rNumericArgs(6)); + RunPeriodInput(Loop).TreatYearsAsConsecutive = true; if (FullAnnualRun && Loop == 1) { - RunPeriodInput(Loop).StartMonth = 1; - RunPeriodInput(Loop).StartDay = 1; - RunPeriodInput(Loop).EndMonth = 12; - RunPeriodInput(Loop).EndDay = 31; + RunPeriodInput(Loop).startMonth = 1; + RunPeriodInput(Loop).startDay = 1; + RunPeriodInput(Loop).endMonth = 12; + RunPeriodInput(Loop).endDay = 31; } - { - auto const SELECT_CASE_var(RunPeriodInput(Loop).StartMonth); - - if ((SELECT_CASE_var == 1) || (SELECT_CASE_var == 3) || (SELECT_CASE_var == 5) || (SELECT_CASE_var == 7) || (SELECT_CASE_var == 8) || - (SELECT_CASE_var == 10) || (SELECT_CASE_var == 12)) { - if (RunPeriodInput(Loop).StartDay > 31) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(2) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(1) + "=[" + TrimSigDigits(RunPeriodInput(Loop).StartMonth) + "]."); - ErrorsFound = true; - } - } else if ((SELECT_CASE_var == 4) || (SELECT_CASE_var == 6) || (SELECT_CASE_var == 9) || (SELECT_CASE_var == 11)) { - if (RunPeriodInput(Loop).StartDay > 30) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(2) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(1) + "=[" + TrimSigDigits(RunPeriodInput(Loop).StartMonth) + "]."); - ErrorsFound = true; - } - } else if (SELECT_CASE_var == 2) { - if (RunPeriodInput(Loop).StartDay > 28 + LocalLeapYearAdd) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(2) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(1) + "=[" + TrimSigDigits(RunPeriodInput(Loop).StartMonth) + "]."); - ErrorsFound = true; - } - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cNumericFieldNames(2) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).StartMonth) + ']'); + // Validate year inputs + if (RunPeriodInput(Loop).startYear == 0) { + if (RunPeriodInput(Loop).endYear != 0) { // Have to have an input start year to input an end year + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + + ", end year cannot be specified if the start year is not."); ErrorsFound = true; } + } else if (RunPeriodInput(Loop).startYear < 1583) { // Bail on the proleptic Gregorian calendar + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", start year (" + + std::to_string(RunPeriodInput(Loop).startYear) + ") is too early, please choose a date after 1582."); + ErrorsFound = true; } - { - auto const SELECT_CASE_var(RunPeriodInput(Loop).EndMonth); - - if ((SELECT_CASE_var == 1) || (SELECT_CASE_var == 3) || (SELECT_CASE_var == 5) || (SELECT_CASE_var == 7) || (SELECT_CASE_var == 8) || - (SELECT_CASE_var == 10) || (SELECT_CASE_var == 12)) { - if (RunPeriodInput(Loop).EndDay > 31) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(4) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).EndDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(3) + "=[" + TrimSigDigits(RunPeriodInput(Loop).EndMonth) + "]."); - ErrorsFound = true; - } - } else if ((SELECT_CASE_var == 4) || (SELECT_CASE_var == 6) || (SELECT_CASE_var == 9) || (SELECT_CASE_var == 11)) { - if (RunPeriodInput(Loop).EndDay > 30) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(4) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).EndDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(3) + "=[" + TrimSigDigits(RunPeriodInput(Loop).EndMonth) + "]."); - ErrorsFound = true; - } - } else if (SELECT_CASE_var == 2) { - if (RunPeriodInput(Loop).EndDay > 28 + LocalLeapYearAdd) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(4) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).EndDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(3) + "=[" + TrimSigDigits(RunPeriodInput(Loop).EndMonth) + "]."); - ErrorsFound = true; - } - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cNumericFieldNames(3) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).EndMonth) + ']'); - ErrorsFound = true; - } + if (RunPeriodInput(Loop).endYear != 0 && RunPeriodInput(Loop).startYear > RunPeriodInput(Loop).endYear) { + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", start year (" + + std::to_string(RunPeriodInput(Loop).startYear) + ") is after the end year (" + + std::to_string(RunPeriodInput(Loop).endYear) + ")."); + ErrorsFound = true; } // A2 , \field Day of Week for Start Day - if (lAlphaFieldBlanks(2) || cAlphaArgs(2) == "USEWEATHERFILE") { - RunPeriodInput(Loop).DayOfWeek = 0; // Defaults to Day of Week from Weather File - } else { - RunPeriodInput(Loop).DayOfWeek = UtilityRoutines::FindItemInList(cAlphaArgs(2), DaysOfWeek, 7); - if (RunPeriodInput(Loop).DayOfWeek == 0) { + bool inputWeekday = false; + if (!lAlphaFieldBlanks(2)) { // Have input + auto result = weekDayLookUp.find(cAlphaArgs(2)); + if (result == weekDayLookUp.end()) { ShowWarningError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(2) + " invalid (Day of Week) [" + - cAlphaArgs(2) + " for Start is not Valid, DayofWeek from WeatherFile will be used."); + cAlphaArgs(2) + "] for Start is not valid, Sunday will be used."); + RunPeriodInput(Loop).startWeekDay = WeekDay::Sunday; + } else { + RunPeriodInput(Loop).startWeekDay = result->second; + inputWeekday = true; } - } - - // A3, \field Use Weather File Holidays and Special Days - if (lAlphaFieldBlanks(3) || UtilityRoutines::SameString(cAlphaArgs(3), "YES")) { - RunPeriodInput(Loop).UseHolidays = true; - } else if (UtilityRoutines::SameString(cAlphaArgs(3), "NO")) { - RunPeriodInput(Loop).UseHolidays = false; - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(3) + " invalid [" + cAlphaArgs(3) + ']'); - ErrorsFound = true; - } - - // A4, \field Use Weather File Daylight Saving Period - if (lAlphaFieldBlanks(4) || UtilityRoutines::SameString(cAlphaArgs(4), "YES")) { - RunPeriodInput(Loop).UseDST = true; - } else if (UtilityRoutines::SameString(cAlphaArgs(4), "NO")) { - RunPeriodInput(Loop).UseDST = false; - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(4) + " invalid [" + cAlphaArgs(4) + ']'); - ErrorsFound = true; - } - - // A5, \field Apply Weekend Holiday Rule - if (lAlphaFieldBlanks(5) || UtilityRoutines::SameString(cAlphaArgs(5), "YES")) { - RunPeriodInput(Loop).ApplyWeekendRule = true; - } else if (UtilityRoutines::SameString(cAlphaArgs(5), "NO")) { - RunPeriodInput(Loop).ApplyWeekendRule = false; - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(5) + " invalid [" + cAlphaArgs(5) + ']'); - ErrorsFound = true; - } - - // A6, \field Use Weather File Rain Indicators - if (lAlphaFieldBlanks(6) || UtilityRoutines::SameString(cAlphaArgs(6), "YES")) { - RunPeriodInput(Loop).UseRain = true; - } else if (UtilityRoutines::SameString(cAlphaArgs(6), "NO")) { - RunPeriodInput(Loop).UseRain = false; - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(6) + " invalid [" + cAlphaArgs(6) + ']'); - ErrorsFound = true; - } - - // A7, \field Use Weather File Snow Indicators - if (lAlphaFieldBlanks(7) || UtilityRoutines::SameString(cAlphaArgs(7), "YES")) { - RunPeriodInput(Loop).UseSnow = true; - } else if (UtilityRoutines::SameString(cAlphaArgs(7), "NO")) { - RunPeriodInput(Loop).UseSnow = false; - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(7) + " invalid [" + cAlphaArgs(7) + ']'); - ErrorsFound = true; - } - - // A8, \field Increment Day of Week on repeat - if (lAlphaFieldBlanks(8) || UtilityRoutines::SameString(cAlphaArgs(8), "YES")) { - RunPeriodInput(Loop).RollDayTypeOnRepeat = true; - } else if (UtilityRoutines::SameString(cAlphaArgs(8), "NO")) { - RunPeriodInput(Loop).RollDayTypeOnRepeat = false; - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ' ' + cAlphaFieldNames(8) + " invalid [" + cAlphaArgs(8) + - ']'); - ErrorsFound = true; - } - - // calculate the annual start and end dates from the user inputted month and day - RunPeriodInput(Loop).StartDate = JulianDay(RunPeriodInput(Loop).StartMonth, RunPeriodInput(Loop).StartDay, LeapYearAdd); - RunPeriodInput(Loop).EndDate = JulianDay(RunPeriodInput(Loop).EndMonth, RunPeriodInput(Loop).EndDay, LeapYearAdd); - RunPeriodInput(Loop).MonWeekDay = 0; - if (RunPeriodInput(Loop).DayOfWeek != 0 && !ErrorsFound) { - SetupWeekDaysByMonth( - RunPeriodInput(Loop).StartMonth, RunPeriodInput(Loop).StartDay, RunPeriodInput(Loop).DayOfWeek, RunPeriodInput(Loop).MonWeekDay); - } - } - - cCurrentModuleObject = "RunPeriod:CustomRange"; - Count = 0; - for (Ptr = 1; Ptr <= RPAW; ++Ptr) { - inputProcessor->getObjectItem(cCurrentModuleObject, - Ptr, - cAlphaArgs, - NumAlpha, - rNumericArgs, - NumNumeric, - IOStat, - lNumericFieldBlanks, - lAlphaFieldBlanks, - cAlphaFieldNames, - cNumericFieldNames); - - if (!lAlphaFieldBlanks(1)) { - GlobalNames::VerifyUniqueInterObjectName( - RunPeriodInputUniqueNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); - } - ++Count; - Loop = RP + Ptr; - RunPeriodInput(Loop).Title = cAlphaArgs(1); - - // set the start and end day of month from user input - // N1 , \field Begin Month - // N2 , \field Begin Day of Month - // N3, \field Start Year - // N4 , \field End Month - // N5 , \field End Day of Month - // N6, \field End Year - RunPeriodInput(Loop).StartMonth = int(rNumericArgs(1)); - RunPeriodInput(Loop).StartDay = int(rNumericArgs(2)); - RunPeriodInput(Loop).StartYear = int(rNumericArgs(3)); - RunPeriodInput(Loop).EndMonth = int(rNumericArgs(4)); - RunPeriodInput(Loop).EndDay = int(rNumericArgs(5)); - RunPeriodInput(Loop).EndYear = int(rNumericArgs(6)); - RunPeriodInput(Loop).TreatYearsAsConsecutive = true; - - if (FullAnnualRun && Loop == 1) { - RunPeriodInput(Loop).StartMonth = 1; - RunPeriodInput(Loop).StartDay = 1; - RunPeriodInput(Loop).EndMonth = 12; - RunPeriodInput(Loop).EndDay = 31; - } - - { - auto const SELECT_CASE_var(RunPeriodInput(Loop).StartMonth); - - if ((SELECT_CASE_var == 1) || (SELECT_CASE_var == 3) || (SELECT_CASE_var == 5) || (SELECT_CASE_var == 7) || (SELECT_CASE_var == 8) || - (SELECT_CASE_var == 10) || (SELECT_CASE_var == 12)) { - if (RunPeriodInput(Loop).StartDay > 31) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(2) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(1) + "=[" + TrimSigDigits(RunPeriodInput(Loop).StartMonth) + "]."); - ErrorsFound = true; - } - } else if ((SELECT_CASE_var == 4) || (SELECT_CASE_var == 6) || (SELECT_CASE_var == 9) || (SELECT_CASE_var == 11)) { - if (RunPeriodInput(Loop).StartDay > 30) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(2) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(1) + "=[" + TrimSigDigits(RunPeriodInput(Loop).StartMonth) + "]."); - ErrorsFound = true; - } - } else if (SELECT_CASE_var == 2) { - if (RunPeriodInput(Loop).StartDay > 28 + LeapYearAdd) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(2) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(1) + "=[" + TrimSigDigits(RunPeriodInput(Loop).StartMonth) + "]."); + } else { // No input, set the default as Sunday. This may get overriden below + RunPeriodInput(Loop).startWeekDay = WeekDay::Sunday; + } + + // Validate the dates now that the weekday field has been looked at + if (RunPeriodInput(Loop).startMonth == 2 && RunPeriodInput(Loop).startDay == 29) { + // Requested start date is a leap year + if (RunPeriodInput(Loop).startYear == 0) { // No input starting year + RunPeriodInput(Loop).startYear = + findLeapYearForWeekday(RunPeriodInput(Loop).startMonth, RunPeriodInput(Loop).startDay, RunPeriodInput(Loop).startWeekDay); + } else { // Have an input start year + if (!isLeapYear(RunPeriodInput(Loop).startYear)) { // Start year is not a leap year + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", start year (" + + std::to_string(RunPeriodInput(Loop).startYear) + + ") is not a leap year but the requested start date is 2/29."); ErrorsFound = true; + } else { // Start year is a leap year + WeekDay weekday = + calculateDayOfWeek(RunPeriodInput(Loop).startYear, RunPeriodInput(Loop).startMonth, RunPeriodInput(Loop).startDay); + if (inputWeekday) { // Check for correctness of input + if (weekday != RunPeriodInput(Loop).startWeekDay) { + ShowWarningError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", start weekday (" + cAlphaArgs(2) + + ") does not match the start year (" + std::to_string(RunPeriodInput(Loop).startYear) + + "), corrected to " + DaysOfWeek(static_cast(weekday)) + "."); + RunPeriodInput(Loop).startWeekDay = weekday; + } + } else { // Set the weekday if it was not input + RunPeriodInput(Loop).startWeekDay = weekday; + } } - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ' ' + cNumericFieldNames(2) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).StartMonth) + ']'); + } + } else { + // Non leap-day start date + if (!validMonthDay(RunPeriodInput(Loop).startMonth, RunPeriodInput(Loop).startDay)) { + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", Invalid input start month/day (" + + TrimSigDigits(RunPeriodInput(Loop).startMonth) + '/' + TrimSigDigits(RunPeriodInput(Loop).startDay) + ')'); ErrorsFound = true; + } else { // Month/day is valid + if (RunPeriodInput(Loop).startYear == 0) { // No input starting year + RunPeriodInput(Loop).startYear = + findYearForWeekday(RunPeriodInput(Loop).startMonth, RunPeriodInput(Loop).startDay, RunPeriodInput(Loop).startWeekDay); + } else { // Have an input starting year + WeekDay weekday = + calculateDayOfWeek(RunPeriodInput(Loop).startYear, RunPeriodInput(Loop).startMonth, RunPeriodInput(Loop).startDay); + if (inputWeekday) { // Check for correctness of input + if (weekday != RunPeriodInput(Loop).startWeekDay) { + ShowWarningError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", start weekday (" + cAlphaArgs(2) + + ") does not match the start year (" + std::to_string(RunPeriodInput(Loop).startYear) + + "), corrected to " + DaysOfWeek(static_cast(weekday)) + "."); + RunPeriodInput(Loop).startWeekDay = weekday; + } + } else { // Set the weekday if it was not input + RunPeriodInput(Loop).startWeekDay = weekday; + } + } } } - { - auto const SELECT_CASE_var(RunPeriodInput(Loop).EndMonth); + // Compute the Julian date of the start date + RunPeriodInput(Loop).startJulianDate = + computeJulianDate(RunPeriodInput(Loop).startYear, RunPeriodInput(Loop).startMonth, RunPeriodInput(Loop).startDay); - if ((SELECT_CASE_var == 1) || (SELECT_CASE_var == 3) || (SELECT_CASE_var == 5) || (SELECT_CASE_var == 7) || (SELECT_CASE_var == 8) || - (SELECT_CASE_var == 10) || (SELECT_CASE_var == 12)) { - if (RunPeriodInput(Loop).EndDay > 31) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(4) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).EndDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(3) + "=[" + TrimSigDigits(RunPeriodInput(Loop).EndMonth) + "]."); - ErrorsFound = true; - } - } else if ((SELECT_CASE_var == 4) || (SELECT_CASE_var == 6) || (SELECT_CASE_var == 9) || (SELECT_CASE_var == 11)) { - if (RunPeriodInput(Loop).EndDay > 30) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(4) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).EndDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(3) + "=[" + TrimSigDigits(RunPeriodInput(Loop).EndMonth) + "]."); - ErrorsFound = true; + // Validate the end date + if (RunPeriodInput(Loop).endMonth == 2 && RunPeriodInput(Loop).endDay == 29) { + // Requested end date is a leap year + if (RunPeriodInput(Loop).endYear == 0) { // No input end year + if (isLeapYear(RunPeriodInput(Loop).startYear) && RunPeriodInput(Loop).startMonth < 3) { + // The run period is from some date on or before 2/29 through 2/29 + RunPeriodInput(Loop).endYear = RunPeriodInput(Loop).startYear; + } else { + // There might be a better approach here, but for now just loop forward for the next leap year + for (int yr = RunPeriodInput(Loop).startYear + 1; yr < RunPeriodInput(Loop).startYear + 10; yr++) { + if (isLeapYear(yr)) { + RunPeriodInput(Loop).endYear = yr; + break; + } + } } - } else if (SELECT_CASE_var == 2) { - if (RunPeriodInput(Loop).EndDay > 28 + LeapYearAdd) { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", " + cNumericFieldNames(4) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).EndDay) + ']'); - ShowContinueError("Indicated " + cNumericFieldNames(3) + "=[" + TrimSigDigits(RunPeriodInput(Loop).EndMonth) + "]."); + } else { // Have an input end year + if (!isLeapYear(RunPeriodInput(Loop).endYear)) { // End year is not a leap year + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", end year (" + + std::to_string(RunPeriodInput(Loop).startYear) + ") is not a leap year but the requested end date is 2/29."); ErrorsFound = true; + } else { + RunPeriodInput(Loop).endJulianDate = + computeJulianDate(RunPeriodInput(Loop).endYear, RunPeriodInput(Loop).endMonth, RunPeriodInput(Loop).endDay); + if (RunPeriodInput(Loop).startJulianDate > RunPeriodInput(Loop).endJulianDate) { + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", start Julian date (" + + std::to_string(RunPeriodInput(Loop).startJulianDate) + ") is after the end Julian date (" + + std::to_string(RunPeriodInput(Loop).endJulianDate) + ")."); + ErrorsFound = true; + } } - } else { - ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cNumericFieldNames(3) + " invalid=[" + - TrimSigDigits(RunPeriodInput(Loop).EndMonth) + ']'); + } + } else { + // Non leap-day end date + if (!validMonthDay(RunPeriodInput(Loop).endMonth, RunPeriodInput(Loop).endDay)) { + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", Invalid input end month/day (" + + TrimSigDigits(RunPeriodInput(Loop).startMonth) + '/' + TrimSigDigits(RunPeriodInput(Loop).startDay) + ')'); ErrorsFound = true; + } else { // Month/day is valid + if (RunPeriodInput(Loop).endYear == 0) { // No input end year + // Assume same year as start year + RunPeriodInput(Loop).endYear = RunPeriodInput(Loop).startYear; + RunPeriodInput(Loop).endJulianDate = + computeJulianDate(RunPeriodInput(Loop).endYear, RunPeriodInput(Loop).endMonth, RunPeriodInput(Loop).endDay); + if (RunPeriodInput(Loop).startJulianDate > RunPeriodInput(Loop).endJulianDate) { + RunPeriodInput(Loop).endJulianDate = 0; // Force recalculation later + RunPeriodInput(Loop).endYear += 1; + } + } else { // Have an input end year + RunPeriodInput(Loop).endJulianDate = + computeJulianDate(RunPeriodInput(Loop).endYear, RunPeriodInput(Loop).endMonth, RunPeriodInput(Loop).endDay); + if (RunPeriodInput(Loop).startJulianDate > RunPeriodInput(Loop).endJulianDate) { + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + ", start Julian date (" + + std::to_string(RunPeriodInput(Loop).startJulianDate) + ") is after the end Julian date (" + + std::to_string(RunPeriodInput(Loop).endJulianDate) + ")."); + ErrorsFound = true; + } + } } } - // A2 , \field Day of Week for Start Day - if (lAlphaFieldBlanks(2) || cAlphaArgs(2) == "USEWEATHERFILE") { - RunPeriodInput(Loop).DayOfWeek = 0; // Defaults to Day of Week from Weather File - } else { - RunPeriodInput(Loop).DayOfWeek = UtilityRoutines::FindItemInList(cAlphaArgs(2), DaysOfWeek, 7); - if (RunPeriodInput(Loop).DayOfWeek == 0) { - ShowWarningError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(2) + " invalid (Day of Week) [" + - cAlphaArgs(2) + " for Start is not Valid, DayofWeek from WeatherFile will be used."); - } + if (RunPeriodInput(Loop).endJulianDate == 0) { + RunPeriodInput(Loop).endJulianDate = + computeJulianDate(RunPeriodInput(Loop).endYear, RunPeriodInput(Loop).endMonth, RunPeriodInput(Loop).endDay); } + RunPeriodInput(Loop).numSimYears = RunPeriodInput(Loop).endYear - RunPeriodInput(Loop).startYear + 1; + // A3, \field Use Weather File Holidays and Special Days if (lAlphaFieldBlanks(3) || UtilityRoutines::SameString(cAlphaArgs(3), "YES")) { - RunPeriodInput(Loop).UseHolidays = true; + RunPeriodInput(Loop).useHolidays = true; } else if (UtilityRoutines::SameString(cAlphaArgs(3), "NO")) { - RunPeriodInput(Loop).UseHolidays = false; + RunPeriodInput(Loop).useHolidays = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(3) + " invalid [" + cAlphaArgs(3) + ']'); ErrorsFound = true; @@ -6351,9 +6245,9 @@ namespace WeatherManager { // A4, \field Use Weather File Daylight Saving Period if (lAlphaFieldBlanks(4) || UtilityRoutines::SameString(cAlphaArgs(4), "YES")) { - RunPeriodInput(Loop).UseDST = true; + RunPeriodInput(Loop).useDST = true; } else if (UtilityRoutines::SameString(cAlphaArgs(4), "NO")) { - RunPeriodInput(Loop).UseDST = false; + RunPeriodInput(Loop).useDST = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(4) + " invalid [" + cAlphaArgs(4) + ']'); ErrorsFound = true; @@ -6361,9 +6255,9 @@ namespace WeatherManager { // A5, \field Apply Weekend Holiday Rule if (lAlphaFieldBlanks(5) || UtilityRoutines::SameString(cAlphaArgs(5), "YES")) { - RunPeriodInput(Loop).ApplyWeekendRule = true; + RunPeriodInput(Loop).applyWeekendRule = true; } else if (UtilityRoutines::SameString(cAlphaArgs(5), "NO")) { - RunPeriodInput(Loop).ApplyWeekendRule = false; + RunPeriodInput(Loop).applyWeekendRule = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(5) + " invalid [" + cAlphaArgs(5) + ']'); ErrorsFound = true; @@ -6371,9 +6265,9 @@ namespace WeatherManager { // A6, \field Use Weather File Rain Indicators if (lAlphaFieldBlanks(6) || UtilityRoutines::SameString(cAlphaArgs(6), "YES")) { - RunPeriodInput(Loop).UseRain = true; + RunPeriodInput(Loop).useRain = true; } else if (UtilityRoutines::SameString(cAlphaArgs(6), "NO")) { - RunPeriodInput(Loop).UseRain = false; + RunPeriodInput(Loop).useRain = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(6) + " invalid [" + cAlphaArgs(6) + ']'); ErrorsFound = true; @@ -6381,30 +6275,31 @@ namespace WeatherManager { // A7, \field Use Weather File Snow Indicators if (lAlphaFieldBlanks(7) || UtilityRoutines::SameString(cAlphaArgs(7), "YES")) { - RunPeriodInput(Loop).UseSnow = true; + RunPeriodInput(Loop).useSnow = true; } else if (UtilityRoutines::SameString(cAlphaArgs(7), "NO")) { - RunPeriodInput(Loop).UseSnow = false; + RunPeriodInput(Loop).useSnow = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(7) + " invalid [" + cAlphaArgs(7) + ']'); ErrorsFound = true; } + // A8, \field Treat Weather as Actual + if (lAlphaFieldBlanks(8) || UtilityRoutines::SameString(cAlphaArgs(8), "NO")) { + RunPeriodInput(Loop).actualWeather = false; + } else if (UtilityRoutines::SameString(cAlphaArgs(8), "YES")) { + RunPeriodInput(Loop).actualWeather = true; + } else { + ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(8) + " invalid [" + cAlphaArgs(8) + ']'); + ErrorsFound = true; + } + + RunPeriodInput(Loop).dayOfWeek = static_cast(RunPeriodInput(Loop).startWeekDay); + // calculate the annual start and end days from the user inputted month and day - RunPeriodInput(Loop).ActualWeather = true; - JGDate(GregorianToJulian, - RunPeriodInput(Loop).StartDate, - RunPeriodInput(Loop).StartYear, - RunPeriodInput(Loop).StartMonth, - RunPeriodInput(Loop).StartDay); - JGDate(GregorianToJulian, - RunPeriodInput(Loop).EndDate, - RunPeriodInput(Loop).EndYear, - RunPeriodInput(Loop).EndMonth, - RunPeriodInput(Loop).EndDay); - RunPeriodInput(Loop).MonWeekDay = 0; - if (RunPeriodInput(Loop).DayOfWeek != 0 && !ErrorsFound) { + RunPeriodInput(Loop).monWeekDay = 0; + if (RunPeriodInput(Loop).dayOfWeek != 0 && !ErrorsFound) { SetupWeekDaysByMonth( - RunPeriodInput(Loop).StartMonth, RunPeriodInput(Loop).StartDay, RunPeriodInput(Loop).DayOfWeek, RunPeriodInput(Loop).MonWeekDay); + RunPeriodInput(Loop).startMonth, RunPeriodInput(Loop).startDay, RunPeriodInput(Loop).dayOfWeek, RunPeriodInput(Loop).monWeekDay); } } @@ -6415,12 +6310,12 @@ namespace WeatherManager { TotRunPers = 1; WeathSimReq = true; RunPeriodInput.allocate(TotRunPers); - RunPeriodInput(1).StartDate = JulianDay(RunPeriodInput(1).StartMonth, RunPeriodInput(1).StartDay, LeapYearAdd); - RunPeriodInput(1).EndDate = JulianDay(RunPeriodInput(1).EndMonth, RunPeriodInput(1).EndDay, LeapYearAdd); - RunPeriodInput(1).MonWeekDay = 0; - if (RunPeriodInput(1).DayOfWeek != 0 && !ErrorsFound) { + RunPeriodInput(1).startJulianDate = General::OrdinalDay(RunPeriodInput(1).startMonth, RunPeriodInput(1).startDay, LeapYearAdd); + RunPeriodInput(1).endJulianDate = General::OrdinalDay(RunPeriodInput(1).endMonth, RunPeriodInput(1).endDay, LeapYearAdd); + RunPeriodInput(1).monWeekDay = 0; + if (RunPeriodInput(1).dayOfWeek != 0 && !ErrorsFound) { SetupWeekDaysByMonth( - RunPeriodInput(1).StartMonth, RunPeriodInput(1).StartDay, RunPeriodInput(1).DayOfWeek, RunPeriodInput(1).MonWeekDay); + RunPeriodInput(1).startMonth, RunPeriodInput(1).startDay, RunPeriodInput(1).dayOfWeek, RunPeriodInput(1).monWeekDay); } } else if (TotRunPers > 1 && FullAnnualRun) { TotRunPers = 1; @@ -6441,7 +6336,6 @@ namespace WeatherManager { // simulation dates // Using/Aliasing - using General::JulianDay; using General::TrimSigDigits; using namespace DataSystemVariables; using namespace DataIPShortCuts; @@ -6498,93 +6392,95 @@ namespace WeatherManager { GlobalNames::VerifyUniqueInterObjectName( RunPeriodDesignInputUniqueNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); ++Count; - RunPeriodDesignInput(Count).Title = cAlphaArgs(1); - RunPeriodDesignInput(Count).PeriodType = "User Selected WeatherFile RunPeriod (Design)"; + RunPeriodDesignInput(Count).title = cAlphaArgs(1); + RunPeriodDesignInput(Count).periodType = "User Selected WeatherFile RunPeriod (Design)"; // set the start and end day of month from user input - RunPeriodDesignInput(Count).StartMonth = int(rNumericArgs(1)); - RunPeriodDesignInput(Count).StartDay = int(rNumericArgs(2)); - RunPeriodDesignInput(Count).EndMonth = int(rNumericArgs(3)); - RunPeriodDesignInput(Count).EndDay = int(rNumericArgs(4)); + RunPeriodDesignInput(Count).startMonth = int(rNumericArgs(1)); + RunPeriodDesignInput(Count).startDay = int(rNumericArgs(2)); + RunPeriodDesignInput(Count).endMonth = int(rNumericArgs(3)); + RunPeriodDesignInput(Count).endDay = int(rNumericArgs(4)); { - auto const SELECT_CASE_var(RunPeriodDesignInput(Count).StartMonth); + auto const SELECT_CASE_var(RunPeriodDesignInput(Count).startMonth); if ((SELECT_CASE_var == 1) || (SELECT_CASE_var == 3) || (SELECT_CASE_var == 5) || (SELECT_CASE_var == 7) || (SELECT_CASE_var == 8) || (SELECT_CASE_var == 10) || (SELECT_CASE_var == 12)) { - if (RunPeriodDesignInput(Count).StartDay > 31) { - ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cNumericFieldNames(2) + - " invalid (Day of Month) [" + TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); + if (RunPeriodDesignInput(Count).startDay > 31) { + ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cNumericFieldNames(2) + + " invalid (Day of Month) [" + TrimSigDigits(RunPeriodInput(Loop).startDay) + ']'); ErrorsFound = true; } } else if ((SELECT_CASE_var == 4) || (SELECT_CASE_var == 6) || (SELECT_CASE_var == 9) || (SELECT_CASE_var == 11)) { - if (RunPeriodDesignInput(Count).StartDay > 30) { - ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cNumericFieldNames(2) + - " invalid (Day of Month) [" + TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); + if (RunPeriodDesignInput(Count).startDay > 30) { + ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cNumericFieldNames(2) + + " invalid (Day of Month) [" + TrimSigDigits(RunPeriodInput(Loop).startDay) + ']'); ErrorsFound = true; } } else if (SELECT_CASE_var == 2) { - if (RunPeriodDesignInput(Count).StartDay > 28 + LeapYearAdd) { - ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cNumericFieldNames(2) + - " invalid (Day of Month) [" + TrimSigDigits(RunPeriodInput(Loop).StartDay) + ']'); + if (RunPeriodDesignInput(Count).startDay > 28 + LeapYearAdd) { + ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cNumericFieldNames(2) + + " invalid (Day of Month) [" + TrimSigDigits(RunPeriodInput(Loop).startDay) + ']'); ErrorsFound = true; } } else { - ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cNumericFieldNames(1) + - " invalid (Month) [" + TrimSigDigits(RunPeriodInput(Loop).StartMonth) + ']'); + ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cNumericFieldNames(1) + + " invalid (Month) [" + TrimSigDigits(RunPeriodInput(Loop).startMonth) + ']'); ErrorsFound = true; } } if (lAlphaFieldBlanks(2)) { - RunPeriodDesignInput(Count).DayOfWeek = 2; // Defaults to Monday + RunPeriodDesignInput(Count).dayOfWeek = 2; // Defaults to Monday } else { - RunPeriodDesignInput(Count).DayOfWeek = UtilityRoutines::FindItemInList(cAlphaArgs(2), ValidNames, 12); - if (RunPeriodDesignInput(Count).DayOfWeek == 0 || RunPeriodDesignInput(Count).DayOfWeek == 8) { - ShowWarningError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cAlphaFieldNames(1) + + RunPeriodDesignInput(Count).dayOfWeek = UtilityRoutines::FindItemInList(cAlphaArgs(2), ValidNames, 12); + if (RunPeriodDesignInput(Count).dayOfWeek == 0 || RunPeriodDesignInput(Count).dayOfWeek == 8) { + ShowWarningError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cAlphaFieldNames(1) + " invalid (Day of Week) [" + cAlphaArgs(1) + " for Start is not Valid, Monday will be Used."); - RunPeriodDesignInput(Count).DayOfWeek = 2; // Defaults to Monday + RunPeriodDesignInput(Count).dayOfWeek = 2; // Defaults to Monday } } if (lAlphaFieldBlanks(3) || UtilityRoutines::SameString(cAlphaArgs(3), "YES")) { - RunPeriodDesignInput(Count).UseDST = true; + RunPeriodDesignInput(Count).useDST = true; } else if (UtilityRoutines::SameString(cAlphaArgs(3), "NO")) { - RunPeriodDesignInput(Count).UseDST = false; + RunPeriodDesignInput(Count).useDST = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(3) + " invalid [" + cAlphaArgs(3) + ']'); ErrorsFound = true; } if (lAlphaFieldBlanks(4) || UtilityRoutines::SameString(cAlphaArgs(4), "YES")) { - RunPeriodDesignInput(Count).UseRain = true; - RunPeriodDesignInput(Count).UseSnow = true; + RunPeriodDesignInput(Count).useRain = true; + RunPeriodDesignInput(Count).useSnow = true; } else if (UtilityRoutines::SameString(cAlphaArgs(4), "NO")) { - RunPeriodDesignInput(Count).UseRain = false; - RunPeriodDesignInput(Count).UseSnow = false; + RunPeriodDesignInput(Count).useRain = false; + RunPeriodDesignInput(Count).useSnow = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(4) + " invalid [" + cAlphaArgs(4) + ']'); ErrorsFound = true; } // calculate the annual start and end days from the user inputted month and day - RunPeriodDesignInput(Count).StartDate = - JulianDay(RunPeriodDesignInput(Count).StartMonth, RunPeriodDesignInput(Count).StartDay, LeapYearAdd); - RunPeriodDesignInput(Count).EndDate = JulianDay(RunPeriodDesignInput(Count).EndMonth, RunPeriodDesignInput(Count).EndDay, LeapYearAdd); - if (RunPeriodDesignInput(Count).StartDate <= RunPeriodDesignInput(Count).EndDate) { - RunPeriodDesignInput(Count).TotalDays = - (RunPeriodDesignInput(Count).EndDate - RunPeriodDesignInput(Count).StartDate + 1) * RunPeriodDesignInput(Count).NumSimYears; + RunPeriodDesignInput(Count).startJulianDate = + General::OrdinalDay(RunPeriodDesignInput(Count).startMonth, RunPeriodDesignInput(Count).startDay, LeapYearAdd); + RunPeriodDesignInput(Count).endJulianDate = + General::OrdinalDay(RunPeriodDesignInput(Count).endMonth, RunPeriodDesignInput(Count).endDay, LeapYearAdd); + if (RunPeriodDesignInput(Count).startJulianDate <= RunPeriodDesignInput(Count).endJulianDate) { + RunPeriodDesignInput(Count).totalDays = + (RunPeriodDesignInput(Count).endJulianDate - RunPeriodDesignInput(Count).startJulianDate + 1) * + RunPeriodDesignInput(Count).numSimYears; } else { - RunPeriodDesignInput(Count).TotalDays = - (JulianDay(12, 31, LeapYearAdd) - RunPeriodDesignInput(Count).StartDate + 1 + RunPeriodDesignInput(Count).EndDate) * - RunPeriodDesignInput(Count).NumSimYears; + RunPeriodDesignInput(Count).totalDays = (General::OrdinalDay(12, 31, LeapYearAdd) - RunPeriodDesignInput(Count).startJulianDate + 1 + + RunPeriodDesignInput(Count).endJulianDate) * + RunPeriodDesignInput(Count).numSimYears; } - RunPeriodDesignInput(Count).MonWeekDay = 0; - if (RunPeriodDesignInput(1).DayOfWeek != 0 && !ErrorsFound) { - SetupWeekDaysByMonth(RunPeriodDesignInput(1).StartMonth, - RunPeriodDesignInput(1).StartDay, - RunPeriodDesignInput(1).DayOfWeek, - RunPeriodDesignInput(1).MonWeekDay); + RunPeriodDesignInput(Count).monWeekDay = 0; + if (RunPeriodDesignInput(1).dayOfWeek != 0 && !ErrorsFound) { + SetupWeekDaysByMonth(RunPeriodDesignInput(1).startMonth, + RunPeriodDesignInput(1).startDay, + RunPeriodDesignInput(1).dayOfWeek, + RunPeriodDesignInput(1).monWeekDay); } } @@ -6604,93 +6500,93 @@ namespace WeatherManager { GlobalNames::VerifyUniqueInterObjectName( RunPeriodDesignInputUniqueNames, cAlphaArgs(1), cCurrentModuleObject, cAlphaFieldNames(1), ErrorsFound); ++Count; - RunPeriodDesignInput(Count).Title = cAlphaArgs(1); - RunPeriodDesignInput(Count).PeriodType = "User Selected WeatherFile Typical/Extreme Period (Design)=" + cAlphaArgs(2); + RunPeriodDesignInput(Count).title = cAlphaArgs(1); + RunPeriodDesignInput(Count).periodType = "User Selected WeatherFile Typical/Extreme Period (Design)=" + cAlphaArgs(2); // Period Selection if (!lAlphaFieldBlanks(2)) { WhichPeriod = UtilityRoutines::FindItem(cAlphaArgs(2), TypicalExtremePeriods, &TypicalExtremeData::MatchValue); if (WhichPeriod != 0) { - RunPeriodDesignInput(Count).StartDay = TypicalExtremePeriods(WhichPeriod).StartDay; - RunPeriodDesignInput(Count).StartMonth = TypicalExtremePeriods(WhichPeriod).StartMonth; - RunPeriodDesignInput(Count).StartDate = TypicalExtremePeriods(WhichPeriod).StartJDay; - RunPeriodDesignInput(Count).EndDay = TypicalExtremePeriods(WhichPeriod).EndDay; - RunPeriodDesignInput(Count).EndMonth = TypicalExtremePeriods(WhichPeriod).EndMonth; - RunPeriodDesignInput(Count).EndDate = TypicalExtremePeriods(WhichPeriod).EndJDay; - RunPeriodDesignInput(Count).TotalDays = TypicalExtremePeriods(WhichPeriod).TotalDays; + RunPeriodDesignInput(Count).startDay = TypicalExtremePeriods(WhichPeriod).StartDay; + RunPeriodDesignInput(Count).startMonth = TypicalExtremePeriods(WhichPeriod).StartMonth; + RunPeriodDesignInput(Count).startJulianDate = TypicalExtremePeriods(WhichPeriod).StartJDay; + RunPeriodDesignInput(Count).endDay = TypicalExtremePeriods(WhichPeriod).EndDay; + RunPeriodDesignInput(Count).endMonth = TypicalExtremePeriods(WhichPeriod).EndMonth; + RunPeriodDesignInput(Count).endJulianDate = TypicalExtremePeriods(WhichPeriod).EndJDay; + RunPeriodDesignInput(Count).totalDays = TypicalExtremePeriods(WhichPeriod).TotalDays; } else { WhichPeriod = UtilityRoutines::FindItem(cAlphaArgs(2), TypicalExtremePeriods, &TypicalExtremeData::MatchValue1); if (WhichPeriod != 0) { - RunPeriodDesignInput(Count).StartDay = TypicalExtremePeriods(WhichPeriod).StartDay; - RunPeriodDesignInput(Count).StartMonth = TypicalExtremePeriods(WhichPeriod).StartMonth; - RunPeriodDesignInput(Count).StartDate = TypicalExtremePeriods(WhichPeriod).StartJDay; - RunPeriodDesignInput(Count).EndDay = TypicalExtremePeriods(WhichPeriod).EndDay; - RunPeriodDesignInput(Count).EndMonth = TypicalExtremePeriods(WhichPeriod).EndMonth; - RunPeriodDesignInput(Count).EndDate = TypicalExtremePeriods(WhichPeriod).EndJDay; - RunPeriodDesignInput(Count).TotalDays = TypicalExtremePeriods(WhichPeriod).TotalDays; - ShowWarningError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cAlphaFieldNames(2) + '=' + + RunPeriodDesignInput(Count).startDay = TypicalExtremePeriods(WhichPeriod).StartDay; + RunPeriodDesignInput(Count).startMonth = TypicalExtremePeriods(WhichPeriod).StartMonth; + RunPeriodDesignInput(Count).startJulianDate = TypicalExtremePeriods(WhichPeriod).StartJDay; + RunPeriodDesignInput(Count).endDay = TypicalExtremePeriods(WhichPeriod).EndDay; + RunPeriodDesignInput(Count).endMonth = TypicalExtremePeriods(WhichPeriod).EndMonth; + RunPeriodDesignInput(Count).endJulianDate = TypicalExtremePeriods(WhichPeriod).EndJDay; + RunPeriodDesignInput(Count).totalDays = TypicalExtremePeriods(WhichPeriod).TotalDays; + ShowWarningError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cAlphaFieldNames(2) + '=' + cAlphaArgs(2) + " matched to " + TypicalExtremePeriods(WhichPeriod).MatchValue); } else { WhichPeriod = UtilityRoutines::FindItem(cAlphaArgs(2), TypicalExtremePeriods, &TypicalExtremeData::MatchValue2); if (WhichPeriod != 0) { - RunPeriodDesignInput(Count).StartDay = TypicalExtremePeriods(WhichPeriod).StartDay; - RunPeriodDesignInput(Count).StartMonth = TypicalExtremePeriods(WhichPeriod).StartMonth; - RunPeriodDesignInput(Count).StartDate = TypicalExtremePeriods(WhichPeriod).StartJDay; - RunPeriodDesignInput(Count).EndDay = TypicalExtremePeriods(WhichPeriod).EndDay; - RunPeriodDesignInput(Count).EndMonth = TypicalExtremePeriods(WhichPeriod).EndMonth; - RunPeriodDesignInput(Count).EndDate = TypicalExtremePeriods(WhichPeriod).EndJDay; - RunPeriodDesignInput(Count).TotalDays = TypicalExtremePeriods(WhichPeriod).TotalDays; - ShowWarningError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cAlphaFieldNames(2) + + RunPeriodDesignInput(Count).startDay = TypicalExtremePeriods(WhichPeriod).StartDay; + RunPeriodDesignInput(Count).startMonth = TypicalExtremePeriods(WhichPeriod).StartMonth; + RunPeriodDesignInput(Count).startJulianDate = TypicalExtremePeriods(WhichPeriod).StartJDay; + RunPeriodDesignInput(Count).endDay = TypicalExtremePeriods(WhichPeriod).EndDay; + RunPeriodDesignInput(Count).endMonth = TypicalExtremePeriods(WhichPeriod).EndMonth; + RunPeriodDesignInput(Count).endJulianDate = TypicalExtremePeriods(WhichPeriod).EndJDay; + RunPeriodDesignInput(Count).totalDays = TypicalExtremePeriods(WhichPeriod).TotalDays; + ShowWarningError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cAlphaFieldNames(2) + '=' + cAlphaArgs(2) + " matched to " + TypicalExtremePeriods(WhichPeriod).MatchValue); } else { - ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cAlphaFieldNames(2) + + ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cAlphaFieldNames(2) + " invalid (not on Weather File)=" + cAlphaArgs(2)); ErrorsFound = true; } } } } else { - ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cAlphaFieldNames(2) + + ShowSevereError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cAlphaFieldNames(2) + " invalid (blank)."); ErrorsFound = true; } if (lAlphaFieldBlanks(3)) { - RunPeriodDesignInput(Count).DayOfWeek = 2; // Defaults to Monday + RunPeriodDesignInput(Count).dayOfWeek = 2; // Defaults to Monday } else { - RunPeriodDesignInput(Count).DayOfWeek = UtilityRoutines::FindItemInList(cAlphaArgs(3), ValidNames, 12); - if (RunPeriodDesignInput(Count).DayOfWeek == 0 || RunPeriodDesignInput(Count).DayOfWeek == 8) { - ShowWarningError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).Title + ' ' + cAlphaFieldNames(3) + + RunPeriodDesignInput(Count).dayOfWeek = UtilityRoutines::FindItemInList(cAlphaArgs(3), ValidNames, 12); + if (RunPeriodDesignInput(Count).dayOfWeek == 0 || RunPeriodDesignInput(Count).dayOfWeek == 8) { + ShowWarningError(cCurrentModuleObject + ": object=" + RunPeriodDesignInput(Count).title + ' ' + cAlphaFieldNames(3) + " invalid (Day of Week) [" + cAlphaArgs(3) + " for Start is not Valid, Monday will be Used."); - RunPeriodDesignInput(Count).DayOfWeek = 2; // Defaults to Monday + RunPeriodDesignInput(Count).dayOfWeek = 2; // Defaults to Monday } } if (lAlphaFieldBlanks(4) || UtilityRoutines::SameString(cAlphaArgs(4), "YES")) { - RunPeriodDesignInput(Count).UseDST = true; + RunPeriodDesignInput(Count).useDST = true; } else if (UtilityRoutines::SameString(cAlphaArgs(4), "NO")) { - RunPeriodDesignInput(Count).UseDST = false; + RunPeriodDesignInput(Count).useDST = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(4) + " invalid [" + cAlphaArgs(4) + ']'); ErrorsFound = true; } if (lAlphaFieldBlanks(5) || UtilityRoutines::SameString(cAlphaArgs(5), "YES")) { - RunPeriodDesignInput(Count).UseRain = true; - RunPeriodDesignInput(Count).UseSnow = true; + RunPeriodDesignInput(Count).useRain = true; + RunPeriodDesignInput(Count).useSnow = true; } else if (UtilityRoutines::SameString(cAlphaArgs(5), "NO")) { - RunPeriodDesignInput(Count).UseRain = false; - RunPeriodDesignInput(Count).UseSnow = false; + RunPeriodDesignInput(Count).useRain = false; + RunPeriodDesignInput(Count).useSnow = false; } else { ShowSevereError(cCurrentModuleObject + ": object #" + TrimSigDigits(Loop) + cAlphaFieldNames(5) + " invalid [" + cAlphaArgs(5) + ']'); ErrorsFound = true; } - RunPeriodDesignInput(1).MonWeekDay = 0; - if (RunPeriodDesignInput(1).DayOfWeek != 0 && !ErrorsFound) { - SetupWeekDaysByMonth(RunPeriodDesignInput(1).StartMonth, - RunPeriodDesignInput(1).StartDay, - RunPeriodDesignInput(1).DayOfWeek, - RunPeriodDesignInput(1).MonWeekDay); + RunPeriodDesignInput(1).monWeekDay = 0; + if (RunPeriodDesignInput(1).dayOfWeek != 0 && !ErrorsFound) { + SetupWeekDaysByMonth(RunPeriodDesignInput(1).startMonth, + RunPeriodDesignInput(1).startDay, + RunPeriodDesignInput(1).dayOfWeek, + RunPeriodDesignInput(1).monWeekDay); } } } @@ -6837,7 +6733,6 @@ namespace WeatherManager { // na // Using/Aliasing - using General::JulianDay; // Locals // SUBROUTINE ARGUMENT DEFINITIONS: @@ -6866,7 +6761,7 @@ namespace WeatherManager { Warn = 0; - JDay = JulianDay(SpecialDays(Loop).Month, SpecialDays(Loop).Day, LeapYearAdd) - 1; + JDay = General::OrdinalDay(SpecialDays(Loop).Month, SpecialDays(Loop).Day, LeapYearAdd) - 1; for (Loop1 = 1; Loop1 <= SpecialDays(Loop).Duration; ++Loop1) { ++JDay; @@ -8086,25 +7981,25 @@ namespace WeatherManager { // Initialize Site:GroundTemperature:BuildingSurface object siteBuildingSurfaceGroundTempsPtr = GetGroundTempModelAndInit("SITE:GROUNDTEMPERATURE:BUILDINGSURFACE", ""); if (siteBuildingSurfaceGroundTempsPtr) { - ErrorsFound = siteBuildingSurfaceGroundTempsPtr->errorsFound; + ErrorsFound = siteBuildingSurfaceGroundTempsPtr->errorsFound ? true : ErrorsFound; } // Initialize Site:GroundTemperature:FCFactorMethod object siteFCFactorMethodGroundTempsPtr = GetGroundTempModelAndInit("SITE:GROUNDTEMPERATURE:FCFACTORMETHOD", ""); if (siteFCFactorMethodGroundTempsPtr) { - ErrorsFound = siteFCFactorMethodGroundTempsPtr->errorsFound; + ErrorsFound = siteFCFactorMethodGroundTempsPtr->errorsFound ? true : ErrorsFound; } // Initialize Site:GroundTemperature:Shallow object siteShallowGroundTempsPtr = GetGroundTempModelAndInit("SITE:GROUNDTEMPERATURE:SHALLOW", ""); if (siteShallowGroundTempsPtr) { - ErrorsFound = siteShallowGroundTempsPtr->errorsFound; + ErrorsFound = siteShallowGroundTempsPtr->errorsFound ? true : ErrorsFound; } // Initialize Site:GroundTemperature:Deep object siteDeepGroundTempsPtr = GetGroundTempModelAndInit("SITE:GROUNDTEMPERATURE:DEEP", ""); if (siteDeepGroundTempsPtr) { - ErrorsFound = siteDeepGroundTempsPtr->errorsFound; + ErrorsFound = siteDeepGroundTempsPtr->errorsFound ? true : ErrorsFound; } } @@ -8779,7 +8674,6 @@ namespace WeatherManager { // reads in the line and processes as appropriate. // Using/Aliasing - using General::JulianDay; // SUBROUTINE PARAMETER DEFINITIONS: static gio::Fmt fmtLD("*"); @@ -9103,13 +8997,14 @@ namespace WeatherManager { } } TypicalExtremePeriods(Count).StartJDay = - JulianDay(TypicalExtremePeriods(Count).StartMonth, TypicalExtremePeriods(Count).StartDay, 0); - TypicalExtremePeriods(Count).EndJDay = JulianDay(TypicalExtremePeriods(Count).EndMonth, TypicalExtremePeriods(Count).EndDay, 0); + General::OrdinalDay(TypicalExtremePeriods(Count).StartMonth, TypicalExtremePeriods(Count).StartDay, 0); + TypicalExtremePeriods(Count).EndJDay = + General::OrdinalDay(TypicalExtremePeriods(Count).EndMonth, TypicalExtremePeriods(Count).EndDay, 0); if (TypicalExtremePeriods(Count).StartJDay <= TypicalExtremePeriods(Count).EndJDay) { TypicalExtremePeriods(Count).TotalDays = TypicalExtremePeriods(Count).EndJDay - TypicalExtremePeriods(Count).StartJDay + 1; } else { - TypicalExtremePeriods(Count).TotalDays = - JulianDay(12, 31, LeapYearAdd) - TypicalExtremePeriods(Count).StartJDay + 1 + TypicalExtremePeriods(Count).EndJDay; + TypicalExtremePeriods(Count).TotalDays = General::OrdinalDay(12, 31, LeapYearAdd) - TypicalExtremePeriods(Count).StartJDay + + 1 + TypicalExtremePeriods(Count).EndJDay; } } @@ -9291,16 +9186,16 @@ namespace WeatherManager { ++Count; } for (Count = 1; Count <= NumEPWTypExtSets; ++Count) { - // JulianDay (Month,Day,LeapYearValue) + // General::OrdinalDay (Month,Day,LeapYearValue) TypicalExtremePeriods(Count).StartJDay = - JulianDay(TypicalExtremePeriods(Count).StartMonth, TypicalExtremePeriods(Count).StartDay, LeapYearAdd); + General::OrdinalDay(TypicalExtremePeriods(Count).StartMonth, TypicalExtremePeriods(Count).StartDay, LeapYearAdd); TypicalExtremePeriods(Count).EndJDay = - JulianDay(TypicalExtremePeriods(Count).EndMonth, TypicalExtremePeriods(Count).EndDay, LeapYearAdd); + General::OrdinalDay(TypicalExtremePeriods(Count).EndMonth, TypicalExtremePeriods(Count).EndDay, LeapYearAdd); if (TypicalExtremePeriods(Count).StartJDay <= TypicalExtremePeriods(Count).EndJDay) { TypicalExtremePeriods(Count).TotalDays = TypicalExtremePeriods(Count).EndJDay - TypicalExtremePeriods(Count).StartJDay + 1; } else { - TypicalExtremePeriods(Count).TotalDays = - JulianDay(12, 31, LeapYearAdd) - TypicalExtremePeriods(Count).StartJDay + 1 + TypicalExtremePeriods(Count).EndJDay; + TypicalExtremePeriods(Count).TotalDays = General::OrdinalDay(12, 31, LeapYearAdd) - TypicalExtremePeriods(Count).StartJDay + + 1 + TypicalExtremePeriods(Count).EndJDay; } } @@ -9427,9 +9322,9 @@ namespace WeatherManager { } if (DataPeriods(CurCount).StYear == 0 || DataPeriods(CurCount).EnYear == 0) { DataPeriods(CurCount).DataStJDay = - JulianDay(DataPeriods(CurCount).StMon, DataPeriods(CurCount).StDay, LeapYearAdd); + General::OrdinalDay(DataPeriods(CurCount).StMon, DataPeriods(CurCount).StDay, LeapYearAdd); DataPeriods(CurCount).DataEnJDay = - JulianDay(DataPeriods(CurCount).EnMon, DataPeriods(CurCount).EnDay, LeapYearAdd); + General::OrdinalDay(DataPeriods(CurCount).EnMon, DataPeriods(CurCount).EnDay, LeapYearAdd); if (DataPeriods(CurCount).DataStJDay <= DataPeriods(CurCount).DataEnJDay) { DataPeriods(CurCount).NumDays = DataPeriods(CurCount).DataEnJDay - DataPeriods(CurCount).DataStJDay + 1; } else { @@ -9989,8 +9884,6 @@ namespace WeatherManager { // Using/Aliasing using General::BetweenDates; - using General::InvJulianDay; - using General::JulianDay; // Locals // SUBROUTINE ARGUMENT DEFINITIONS: @@ -10007,9 +9900,6 @@ namespace WeatherManager { // SUBROUTINE LOCAL VARIABLE DECLARATIONS: int Loop; - int Loop1; - int JDay1; - int JDay2; int LocalLeapYearAdd; // Transfer weather file information to the Environment derived type @@ -10020,33 +9910,33 @@ namespace WeatherManager { auto &env = Environment(Envrn); auto &runPer = RunPeriodDesignInput(Loop); - env.StartMonth = runPer.StartMonth; - env.StartDay = runPer.StartDay; - env.StartJDay = JulianDay(runPer.StartMonth, runPer.StartDay, LeapYearAdd); - env.TotalDays = runPer.TotalDays; - env.EndMonth = runPer.EndMonth; - env.EndDay = runPer.EndDay; - env.EndJDay = JulianDay(runPer.EndMonth, runPer.EndDay, LeapYearAdd); - env.NumSimYears = runPer.NumSimYears; + env.StartMonth = runPer.startMonth; + env.StartDay = runPer.startDay; + env.StartJDay = General::OrdinalDay(runPer.startMonth, runPer.startDay, LeapYearAdd); + env.TotalDays = runPer.totalDays; + env.EndMonth = runPer.endMonth; + env.EndDay = runPer.endDay; + env.EndJDay = General::OrdinalDay(runPer.endMonth, runPer.endDay, LeapYearAdd); + env.NumSimYears = runPer.numSimYears; if (env.StartJDay <= env.EndJDay) { env.TotalDays = (env.EndJDay - env.StartJDay + 1) * env.NumSimYears; } else { - env.TotalDays = (JulianDay(12, 31, LeapYearAdd) - env.StartJDay + 1 + env.EndJDay) * env.NumSimYears; + env.TotalDays = (General::OrdinalDay(12, 31, LeapYearAdd) - env.StartJDay + 1 + env.EndJDay) * env.NumSimYears; } TotRunDesPersDays += env.TotalDays; - env.UseDST = runPer.UseDST; - env.UseHolidays = runPer.UseHolidays; - env.Title = runPer.Title; - env.cKindOfEnvrn = runPer.PeriodType; + env.UseDST = runPer.useDST; + env.UseHolidays = runPer.useHolidays; + env.Title = runPer.title; + env.cKindOfEnvrn = runPer.periodType; env.KindOfEnvrn = ksRunPeriodDesign; env.DesignDayNum = 0; env.RunPeriodDesignNum = Loop; - env.DayOfWeek = runPer.DayOfWeek; - env.MonWeekDay = runPer.MonWeekDay; + env.DayOfWeek = runPer.dayOfWeek; + env.MonWeekDay = runPer.monWeekDay; env.SetWeekDays = false; - env.ApplyWeekendRule = runPer.ApplyWeekendRule; - env.UseRain = runPer.UseRain; - env.UseSnow = runPer.UseSnow; + env.ApplyWeekendRule = runPer.applyWeekendRule; + env.UseRain = runPer.useRain; + env.UseSnow = runPer.useSnow; ++Envrn; } @@ -10055,83 +9945,75 @@ namespace WeatherManager { auto &env = Environment(Envrn); auto &runPer = RunPeriodInput(Loop); - env.StartMonth = runPer.StartMonth; - env.StartDay = runPer.StartDay; - env.EndMonth = runPer.EndMonth; - env.EndDay = runPer.EndDay; - env.NumSimYears = runPer.NumSimYears; - if (runPer.ActualWeather) { - env.CurrentYear = runPer.StartYear; - env.IsLeapYear = IsLeapYear(runPer.StartYear); - env.TreatYearsAsConsecutive = true; - env.StartYear = runPer.StartYear; - env.EndYear = runPer.EndYear; - JGDate(GregorianToJulian, env.StartDate, env.StartYear, env.StartMonth, env.StartDay); - JGDate(GregorianToJulian, env.EndDate, env.EndYear, env.EndMonth, env.EndDay); - env.StartJDay = env.StartDate; - env.EndJDay = env.EndDate; + env.StartMonth = runPer.startMonth; + env.StartDay = runPer.startDay; + env.StartYear = runPer.startYear; + env.EndMonth = runPer.endMonth; + env.EndDay = runPer.endDay; + env.EndYear = runPer.endYear; + env.NumSimYears = runPer.numSimYears; + env.CurrentYear = runPer.startYear; + env.IsLeapYear = runPer.isLeapYear; + env.TreatYearsAsConsecutive = true; + if (runPer.actualWeather) { + // This will require leap years to be present, thus Julian days can be used for all the calculations + env.StartJDay = env.StartDate = runPer.startJulianDate; + env.EndJDay = env.EndDate = runPer.endJulianDate; env.TotalDays = env.EndDate - env.StartDate + 1; env.RawSimDays = env.EndDate - env.StartDate + 1; env.MatchYear = true; env.ActualWeather = true; - } else if (runPer.BeginYear < 100) { // std RunPeriod - env.CurrentYear = 0; - if (!WFAllowsLeapYears) { - env.IsLeapYear = false; // explicit set - LocalLeapYearAdd = 0; - } else { - env.IsLeapYear = true; // explicit set - LocalLeapYearAdd = 1; - } - env.TreatYearsAsConsecutive = false; + } else { // std RunPeriod env.RollDayTypeOnRepeat = runPer.RollDayTypeOnRepeat; - env.StartJDay = JulianDay(runPer.StartMonth, runPer.StartDay, LocalLeapYearAdd); - env.EndJDay = JulianDay(runPer.EndMonth, runPer.EndDay, LocalLeapYearAdd); - // need message if isleapyear and wfleapyearind=0 - if (env.StartJDay <= env.EndJDay) { + + if (env.StartYear == env.EndYear) { + // Short-circuit all the calculations, we're in a single year + if (!WFAllowsLeapYears) { + env.IsLeapYear = false; // explicit set + LocalLeapYearAdd = 0; + } else { + env.IsLeapYear = true; // explicit set + LocalLeapYearAdd = 1; + } + env.StartJDay = General::OrdinalDay(runPer.startMonth, runPer.startDay, LocalLeapYearAdd); + env.EndJDay = General::OrdinalDay(runPer.endMonth, runPer.endDay, LocalLeapYearAdd); env.RawSimDays = (env.EndJDay - env.StartJDay + 1); - env.TotalDays = (env.EndJDay - env.StartJDay + 1) * env.NumSimYears; + env.TotalDays = env.RawSimDays; } else { - env.RawSimDays = (JulianDay(12, 31, LeapYearAdd) - env.StartJDay + 1 + env.EndJDay); - env.TotalDays = (JulianDay(12, 31, LeapYearAdd) - env.StartJDay + 1 + env.EndJDay) * env.NumSimYears; - } - - } else { // Using Runperiod and StartYear option. - env.CurrentYear = runPer.BeginYear; - env.IsLeapYear = IsLeapYear(env.CurrentYear); - env.TreatYearsAsConsecutive = true; - env.RollDayTypeOnRepeat = runPer.RollDayTypeOnRepeat; - env.StartJDay = JulianDay(runPer.StartMonth, runPer.StartDay, LeapYearAdd); - env.EndJDay = JulianDay(runPer.EndMonth, runPer.EndDay, LeapYearAdd); - env.TotalDays = 0; - for (Loop1 = 1; Loop1 <= env.NumSimYears; ++Loop1) { - if (!IsLeapYear(runPer.BeginYear - 1 + Loop1) || !WFAllowsLeapYears) { - JDay1 = JulianDay(runPer.StartMonth, runPer.StartDay, 0); - JDay2 = JulianDay(runPer.EndMonth, runPer.EndDay, 0); - if (JDay1 <= JDay2) { - if (Loop1 == 1) env.RawSimDays = (JDay2 - JDay1 + 1); - env.TotalDays += (JDay2 - JDay1 + 1); - } else { - if (Loop1 == 1) env.RawSimDays = JulianDay(12, 31, 0) - JDay1 + 1 + JDay2; - env.TotalDays += JulianDay(12, 31, 0) - JDay1 + 1 + JDay2; + // Environment crosses year boundaries + env.RollDayTypeOnRepeat = runPer.RollDayTypeOnRepeat; + env.StartJDay = General::OrdinalDay(runPer.startMonth, runPer.startDay, runPer.isLeapYear ? 1 : 0); + env.EndJDay = General::OrdinalDay(runPer.endMonth, runPer.endDay, isLeapYear(runPer.endYear) ? 1 : 0); + env.TotalDays = 366 - env.StartJDay + env.EndJDay + 365 * std::max(env.NumSimYears - 2, 0); + if (WFAllowsLeapYears) { + // First year + if (env.StartJDay < 28) { + if (isLeapYear(env.StartYear)) { + ++env.TotalDays; + } } - } else { // Leap Year - JDay1 = JulianDay(runPer.StartMonth, runPer.StartDay, 1); - JDay2 = JulianDay(runPer.EndMonth, runPer.EndDay, 1); - if (JDay1 <= JDay2) { - env.TotalDays += (JDay2 - JDay1 + 1); - } else { - env.TotalDays += JulianDay(12, 31, 1) - JDay1 + 1 + JDay2; + // Middle years + for (int yr = env.StartYear + 1; yr < env.EndYear; ++yr) { + if (isLeapYear(yr)) { + ++env.TotalDays; + } + } + // Last year + if (env.EndJDay > 28) { + if (isLeapYear(env.EndYear)) { + ++env.TotalDays; + } } } + env.RawSimDays = env.TotalDays; } } - env.UseDST = runPer.UseDST; - env.UseHolidays = runPer.UseHolidays; - if (runPer.Title == BlankString) { + env.UseDST = runPer.useDST; + env.UseHolidays = runPer.useHolidays; + if (runPer.title == BlankString) { env.Title = WeatherFileLocationTitle; } else { - env.Title = runPer.Title; + env.Title = runPer.title; } if (env.KindOfEnvrn == ksReadAllWeatherData) { env.cKindOfEnvrn = "ReadAllWeatherDataRunPeriod"; @@ -10139,17 +10021,17 @@ namespace WeatherManager { env.cKindOfEnvrn = "WeatherFileRunPeriod"; env.KindOfEnvrn = ksRunPeriodWeather; } - env.DayOfWeek = runPer.DayOfWeek; - env.MonWeekDay = runPer.MonWeekDay; + env.DayOfWeek = runPer.dayOfWeek; + env.MonWeekDay = runPer.monWeekDay; env.SetWeekDays = false; - env.ApplyWeekendRule = runPer.ApplyWeekendRule; - env.UseRain = runPer.UseRain; - env.UseSnow = runPer.UseSnow; + env.ApplyWeekendRule = runPer.applyWeekendRule; + env.UseRain = runPer.useRain; + env.UseSnow = runPer.useSnow; ++Envrn; } } - bool IsLeapYear(int const Year) + bool isLeapYear(int const Year) { // FUNCTION INFORMATION: @@ -10170,9 +10052,6 @@ namespace WeatherManager { // USE STATEMENTS: // na - // Return value - bool YesNo; - // Locals // FUNCTION ARGUMENT DEFINITIONS: @@ -10188,13 +10067,12 @@ namespace WeatherManager { // FUNCTION LOCAL VARIABLE DECLARATIONS: // na - YesNo = false; if (mod(Year, 4) == 0) { // Potential Leap Year if (!(mod(Year, 100) == 0 && mod(Year, 400) != 0)) { - YesNo = true; + return true; } } - return YesNo; + return false; } void JGDate(int const jflag, // indicates direction of conversion, @@ -10278,6 +10156,60 @@ namespace WeatherManager { // c } + int computeJulianDate(int const gyyyy, // input/output gregorian year, should be specified as 4 digits + int const gmm, // input/output gregorian month + int const gdd // input/output gregorian day + ) + { + // SUBROUTINE INFORMATION: + // AUTHOR Jason DeGraw + // DATE WRITTEN 10/25/2017 + // MODIFIED na + // RE-ENGINEERED na + + // PURPOSE OF THIS SUBROUTINE: + // Split the former JGDate function in two. Convert a gregorian + // date to actual julian date. the advantage of storing a julian date + // in the jdate format rather than a 5 digit format is that any + // number of days can be add or subtracted to jdate and + // that result is a proper julian date. + + // METHODOLOGY EMPLOYED: + // + + // REFERENCES: + // for discussion of this algorithm, + // see cacm, vol 11, no 10, oct 1968, page 657 + + // USE STATEMENTS: + // na + + // Locals + // SUBROUTINE ARGUMENT DEFINITIONS: + // na + + // SUBROUTINE PARAMETER DEFINITIONS: + // na + + // INTERFACE BLOCK SPECIFICATIONS: + // na + + // DERIVED TYPE DEFINITIONS: + // na + + // SUBROUTINE LOCAL VARIABLE DECLARATIONS: + int tyyyy; // integer*4 variable needed for double precision arithmetic + int tmm; // integer*4 variable needed for double precision arithmetic + int tdd; // integer*4 variable needed for double precision arithmetic + int l; // temporary variable used in conversion. + + tyyyy = gyyyy; + tmm = gmm; + tdd = gdd; + l = (tmm - 14) / 12; + return tdd - 32075 + 1461 * (tyyyy + 4800 + l) / 4 + 367 * (tmm - 2 - l * 12) / 12 - 3 * ((tyyyy + 4900 + l) / 100) / 4; + } + int CalculateDayOfWeek(int const JulianDate) // from JGDate calculation { @@ -10336,6 +10268,165 @@ namespace WeatherManager { return DayOfWeek; } + WeekDay calculateDayOfWeek(int const year, int const month, int const day) + { + + // FUNCTION INFORMATION: + // AUTHOR Linda Lawrie + // DATE WRITTEN March 2012 + // MODIFIED October 2017, Jason DeGraw + // RE-ENGINEERED na + + // PURPOSE OF THIS FUNCTION: + // Calculate the correct day of week. + + // METHODOLOGY EMPLOYED: + // Zeller's algorithm. + + // REFERENCES: + // http://en.wikipedia.org/wiki/Zeller%27s_congruence + // and other references around the web. + + // USE STATEMENTS: + // na + + // Locals + // FUNCTION ARGUMENT DEFINITIONS: + + // FUNCTION PARAMETER DEFINITIONS: + // na + // FUNCTION LOCAL VARIABLE DECLARATIONS: + int Gyyyy(year); // Gregorian yyyy + int Gmm(month); // Gregorian mm + + // Jan, Feb are 13, 14 months of previous year + if (Gmm < 3) { + Gmm += 12; + --Gyyyy; + } + + DayOfWeek = mod(day + (13 * (Gmm + 1) / 5) + Gyyyy + (Gyyyy / 4) + 6 * (Gyyyy / 100) + (Gyyyy / 400), 7); + if (DayOfWeek == 0) DayOfWeek = 7; + + return static_cast(DayOfWeek); + } + + int calculateDayOfYear(int const Month, int const Day) + { + + // FUNCTION INFORMATION: + // AUTHOR Jason DeGraw + // DATE WRITTEN October 10, 2017 + // MODIFIED na + // RE-ENGINEERED na + + // PURPOSE OF THIS FUNCTION: + // Compute the day of the year for non-leap years. + + // METHODOLOGY EMPLOYED: + // Lookup table. + + // REFERENCES: + // NA + + // USE STATEMENTS: + // na + + // FUNCTION LOCAL VARIABLE DECLARATIONS: + static std::array daysbefore{{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}}; + + // Could probably do some bounds checking here, but for now assume the month is in [1, 12] + return daysbefore[Month - 1] + Day; + } + + int calculateDayOfYear(int const Month, int const Day, bool const leapYear) + { + + // FUNCTION INFORMATION: + // AUTHOR Jason DeGraw + // DATE WRITTEN October 10, 2017 + // MODIFIED na + // RE-ENGINEERED na + + // PURPOSE OF THIS FUNCTION: + // Compute the day of the year for leap and non-leap years. + + // METHODOLOGY EMPLOYED: + // Lookup table. + + // REFERENCES: + // NA + + // USE STATEMENTS: + // na + + // FUNCTION LOCAL VARIABLE DECLARATIONS: + static std::array daysbefore{{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334}}; + static std::array daysbeforeleap{{0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335}}; + + // Could probably do some bounds checking here, but for now assume the month is in [1, 12] + if (leapYear) { + return daysbeforeleap[Month - 1] + Day; + } else { + return daysbefore[Month - 1] + Day; + } + } + + bool validMonthDay(int const month, int const day, int const leapYearAdd) + { + + // FUNCTION INFORMATION: + // AUTHOR Jason DeGraw + // DATE WRITTEN October 31, 2017 + // MODIFIED na + // RE-ENGINEERED na + + // PURPOSE OF THIS FUNCTION: + // Determine if a month/day+leapyear combination is valid. + + // METHODOLOGY EMPLOYED: + // Lookup table. + + // REFERENCES: + // NA + + // USE STATEMENTS: + // NA + + // FUNCTION LOCAL VARIABLE DECLARATIONS: + // NA + + switch (month) { + case 1: + case 3: + case 5: + case 7: + case 8: + case 10: + case 12: + if (day > 31) { + return false; + } + break; + case 4: + case 6: + case 9: + case 11: + if (day > 30) { + return false; + } + break; + case 2: + if (day > 28 + leapYearAdd) { + return false; + } + break; + default: + return false; + } + return true; + } + void AnnualMonthlyDryBulbWeatherData::CalcAnnualAndMonthlyDryBulbTemp() { @@ -10349,7 +10440,6 @@ namespace WeatherManager { // Opens and processes the weather or stat file only once // Using/Aliasing - using General::InvJulianDay; using OutputReportTabular::GetColumnUsingTabs; using OutputReportTabular::StrToReal; diff --git a/src/EnergyPlus/WeatherManager.hh b/src/EnergyPlus/WeatherManager.hh index b1aaaee349c..d96bf2fe4c2 100644 --- a/src/EnergyPlus/WeatherManager.hh +++ b/src/EnergyPlus/WeatherManager.hh @@ -261,8 +261,28 @@ namespace WeatherManager { // Types + enum class WeekDay + { + Sunday = 1, + Monday, + Tuesday, + Wednesday, + Thursday, + Friday, + Saturday + }; + struct EnvironmentData { + enum class Type + { + DesignDay, + RunPeriodDesign, + RunPeriodWeather, + HVACSizeDesignDay, + ksHVACSizeRunPeriodDesign, + ReadAllWeatherData + }; // Members std::string Title; // Environment name std::string cKindOfEnvrn; // kind of environment @@ -356,36 +376,38 @@ namespace WeatherManager { struct RunPeriodData { // Members - std::string Title; - std::string PeriodType; - int TotalDays; // total number of days in requested period - int StartMonth; - int StartDay; - int StartDate; // Calculated start date (Julian) for a weather file run period - int StartYear; // entered in "consecutive"/real runperiod object - int EndMonth; - int EndDay; - int EndDate; // Calculated end date (Julian) for a weather file run period - int EndYear; // entered in "consecutive"/real runperiod object - int DayOfWeek; // Day of Week that the RunPeriod will start on (User Input) - bool UseDST; // True if DaylightSavingTime is used for this RunPeriod - bool UseHolidays; // True if Holidays are used for this RunPeriod (from WeatherFile) - bool ApplyWeekendRule; // True if "Weekend Rule" is to be applied to RunPeriod - bool UseRain; // True if Rain from weather file should be used (set rain to true) - bool UseSnow; // True if Snow from weather file should be used (set Snow to true) - Array1D_int MonWeekDay; - int NumSimYears; // Total Number of years of simulation to be performed - int BeginYear; // Start year entered in regular RunPeriod object - bool IsLeapYear; // True if Begin Year is leap year. + std::string title; + std::string periodType; + int totalDays; // total number of days in requested period + int startMonth; + int startDay; + int startJulianDate; // Calculated start date (Julian or ordinal) for a weather file run period + int startYear; // entered in "consecutive"/real runperiod object + int endMonth; + int endDay; + int endJulianDate; // Calculated end date (Julian or ordinal) for a weather file run period + int endYear; // entered in "consecutive"/real runperiod object + int dayOfWeek; // Day of Week that the RunPeriod will start on (User Input) + WeekDay startWeekDay; // Day of the week that the RunPeriod will start on (User Input) + bool useDST; // True if DaylightSavingTime is used for this RunPeriod + bool useHolidays; // True if Holidays are used for this RunPeriod (from WeatherFile) + bool applyWeekendRule; // True if "Weekend Rule" is to be applied to RunPeriod + bool useRain; // True if Rain from weather file should be used (set rain to true) + bool useSnow; // True if Snow from weather file should be used (set Snow to true) + Array1D_int monWeekDay; + int numSimYears; // Total Number of years of simulation to be performed + bool isLeapYear; // True if Begin Year is leap year. bool RollDayTypeOnRepeat; // If repeating run period, increment day type on repeat. bool TreatYearsAsConsecutive; // When year rolls over, increment year and recalculate Leap Year - bool ActualWeather; // true when using actual weather data + bool actualWeather; // true when using actual weather data + //int BeginYear; // Default Constructor RunPeriodData() - : TotalDays(0), StartMonth(1), StartDay(1), StartDate(0), StartYear(0), EndMonth(12), EndDay(31), EndDate(0), EndYear(0), DayOfWeek(0), - UseDST(false), UseHolidays(false), ApplyWeekendRule(false), UseRain(true), UseSnow(true), MonWeekDay(12, 0), NumSimYears(1), - BeginYear(0), IsLeapYear(false), RollDayTypeOnRepeat(true), TreatYearsAsConsecutive(true), ActualWeather(false) + : totalDays(0), startMonth(1), startDay(1), startJulianDate(0), startYear(2017), endMonth(12), endDay(31), endJulianDate(0), endYear(0), + dayOfWeek(0), startWeekDay(WeekDay::Sunday), useDST(false), useHolidays(false), applyWeekendRule(false), useRain(true), useSnow(true), + monWeekDay(12, 0), numSimYears(1), isLeapYear(false), RollDayTypeOnRepeat(true), TreatYearsAsConsecutive(true), actualWeather(false) + //BeginYear(0) { } }; @@ -867,7 +889,9 @@ namespace WeatherManager { void SetupEnvironmentTypes(); - bool IsLeapYear(int const Year); + bool isLeapYear(int const Year); + + int computeJulianDate(int const gyyyy, int const gmm, int const gdd); void JGDate(int const jflag, // indicates direction of conversion, int &jdate, // input/output julian date, typically a 7 or 8 digit integer @@ -878,6 +902,14 @@ namespace WeatherManager { int CalculateDayOfWeek(int const JulianDate); // from JGDate calculation + WeekDay calculateDayOfWeek(int const year, int const month, int day); + + int calculateDayOfYear(int const Month, int const Day); + + int calculateDayOfYear(int const Month, int const Day, bool const leapYear); + + bool validMonthDay(int const month, int const day, int const leapYearAdd = 0); + struct AnnualMonthlyDryBulbWeatherData // derived type for processing and storing Dry-bulb weather or stat file { // Members diff --git a/src/Transition/CreateNewIDFUsingRulesV9_0_0.f90 b/src/Transition/CreateNewIDFUsingRulesV9_0_0.f90 index c040ba8df47..cf14c523a26 100644 --- a/src/Transition/CreateNewIDFUsingRulesV9_0_0.f90 +++ b/src/Transition/CreateNewIDFUsingRulesV9_0_0.f90 @@ -169,6 +169,19 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile ! end new variables for WINDOWPROPERTY:SHADINGCONTROL from 8.9 to 9.0 + ! For run period transitions + TYPE FieldFlagAndValue + LOGICAL :: wasSet + CHARACTER(len=MaxNameLength) :: originalValue + END TYPE FieldFlagAndValue + TYPE (FieldFlagAndValue) :: RunPeriodStartYear + TYPE (FieldFlagAndValue) :: RunPeriodRepeated + INTEGER :: MonthNumber, DayNumber, YearNumber, RepeatedCount + INTEGER, EXTERNAL :: GetYearFromStartDayString + LOGICAL, EXTERNAL :: IsYearNumberALeapYear + INTEGER, EXTERNAL :: GetLeapYearFromStartDayString + INTEGER, EXTERNAL :: FindYearForWeekDay + If (FirstTime) THEN ! do things that might be applicable only to this new version FirstTime=.false. EndIf @@ -687,6 +700,104 @@ SUBROUTINE CreateNewIDFUsingRules(EndOfFile,DiffOnly,InLfn,AskForInput,InputFile ! If your original object starts with P, insert the rules here ! If your original object starts with R, insert the rules here + CASE('RUNPERIOD:CUSTOMRANGE') + ! Just change the type to RunPeriod and copy all of the arguments + ObjectName = 'RunPeriod' + CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits) + OutArgs(1:CurArgs) = InArgs(1:CurArgs) + IF (SameString(TRIM(OutArgs(8)), "USEWEATHERFILE")) THEN + CALL ShowWarningError('Run period start day of week USEWEATHERFILE option has been removed, start week day is set by the input start date.',Auditf) + OutArgs(8) = Blank + END IF + CALL WriteOutIDFLines(DifLfn,ObjectName,CurArgs,OutArgs,NwFldNames,NwFldUnits) + Written=.true. + nodiff = .false. + + CASE('RUNPERIOD') + CALL GetNewObjectDefInIDD(ObjectName,NwNumArgs,NwAorN,NwReqFld,NwObjMinFlds,NwFldNames,NwFldDefaults,NwFldUnits) + ! spend some time mining out the state of the run period object + RunPeriodStartYear%wasSet = .FALSE. + IF (CurArgs >= 14) THEN + IF (TRIM(InArgs(14)) /= Blank) THEN + RunPeriodStartYear%wasSet = .TRUE. + RunPeriodStartYear%originalValue = InArgs(14) + END IF + END IF + RunPeriodRepeated%wasSet = .FALSE. + IF (CurArgs >= 12) THEN + IF (TRIM(InArgs(12)) /= Blank) THEN + RunPeriodRepeated%wasSet = .TRUE. + RunPeriodRepeated%originalValue = InArgs(12) + END IF + END IF + ! Now start writing some object data out + ! Name, BeginMonth and BeginDay are the same + OutArgs(1:3) = InArgs(1:3) + ! Start year is weird + IF (RunPeriodStartYear%wasSet) THEN + OutArgs(4) = RunPeriodStartYear%originalValue + ELSE IF (RunPeriodRepeated%wasSet) THEN + READ(OutArgs(2), *) MonthNumber + READ(OutArgs(3), *) DayNumber + IF (TRIM(InArgs(6)) /= Blank) THEN + YearNumber = FindYearForWeekDay(MonthNumber, DayNumber, InArgs(6)) + ELSE + YearNumber = FindYearForWeekDay(MonthNumber, DayNumber, "SUNDAY") + END IF + WRITE(OutArgs(4), *) YearNumber + ELSE + OutArgs(4) = Blank + END IF + ! End month and End day or month are the same, just need to shift one field + OutArgs(5:6) = InArgs(4:5) + ! End year is weird + IF (RunPeriodRepeated%wasSet) THEN + ! What if start year turns out to be blank above? + IF (TRIM(OutArgs(4)) == Blank) THEN + OutArgs(7) = Blank + ELSE + READ(RunPeriodRepeated%originalValue, *) RepeatedCount + READ(OutArgs(4), *) YearNumber + YearNumber = YearNumber + RepeatedCount + WRITE(OutArgs(7), *) YearNumber + IF (TRIM(InArgs(4))=="2".AND.TRIM(InArgs(5))=="29") THEN + ! We should have a leap year end year + IF (.NOT.IsYearNumberALeapYear(YearNumber)) THEN + ! Warning about bad end year/end date combination + OutArgs(6) = "28" + END IF + END IF + END IF + ELSE + OutArgs(7) = Blank + END IF + ! Start day of week is also weird + IF (RunPeriodStartYear%wasSet) THEN + ! Throw warning saying the start of the week has been specified by the year + OutArgs(8) = Blank ! But why is this field even staying? + ELSE + IF (SameString(TRIM(InArgs(6)), "USEWEATHERFILE")) THEN + CALL ShowWarningError('Run period start day of week USEWEATHERFILE option has been removed, start week day is set by the input start date.',Auditf) + OutArgs(8) = BLANK + ELSE + ! Copy it over unchanged? + OutArgs(8) = InArgs(6) + END IF + END IF + ! Remaining fields are mostly straightforward + OutArgs(9) = InArgs(7) ! Use Weather File Holidays + OutArgs(10) = InArgs(8) ! Use Weather File DST + OutArgs(11) = InArgs(9) ! Apply Weekend Holiday Rule + OutArgs(12) = InArgs(10) ! Use Weather File Rain + OutArgs(13) = InArgs(11) ! Use Weather File Snow + ! InArgs(12): Eliminate number of times to repeat runperiod + IF (TRIM(InArgs(13))=="YES") THEN + ! Issue warning about incrementing day of week on repeat... + END IF + ! InArgs(14): Start year moved to above + OutArgs(14) = Blank ! new Treat weather as actual field? + CurArgs = 14 + nodiff = .false. ! If your original object starts with S, insert the rules here diff --git a/src/Transition/InputRulesFiles/Rules8-9-0-to-9-0-0.md b/src/Transition/InputRulesFiles/Rules8-9-0-to-9-0-0.md index 8e3a5400ac5..499da364f1c 100644 --- a/src/Transition/InputRulesFiles/Rules8-9-0-to-9-0-0.md +++ b/src/Transition/InputRulesFiles/Rules8-9-0-to-9-0-0.md @@ -16,13 +16,33 @@ Move up all later numeric fields by one (old N4-N10 become new N3-N9). (Developer note: to avoid merge conflicts, please choose a random line in the file below (there are like 20 blank lines initially). This will reduce the effect of all the rules being written on the same line, causing conflicts.) - # Object Change: 'WindowMaterial:ComplexShade' +# Object Change: 'WindowMaterial:ComplexShade' - The only change is for field A2 (Layer Type). Logic to apply: - If field contains value Venetian then change it to VenetianHorizontal. - - - +The only change is for field A2 (Layer Type). Logic to apply: +If field contains value Venetian then change it to VenetianHorizontal. + +# Object Change: 'RunPeriod:CustomRange' + +Change the object type to 'RunPeriod'. +All fields remain the same. + +# Object Change: 'RunPeriod' +Fields F1-F3 (A1, N1-N2) remain the same +Insert new field F4 (new N3) for Begin Year + Fill with the value from old field F14 (old N6 Start Year) if non-blank + elseif old field F12 (old N5 Number of Times Runperiod to be Repeated) is non-blank fill with year corresponding to the "Day of Week for Start Day" (old F6, old A2) + elseif start day is blank, fill with a year that starts on a Sunday + else leave blank +Old fields F4-F5 become new fields F5-F6 +Insert new field F7 (new N6)for End Year + If old field F12 (old N5 Number of Times Runperiod to be Repeated) is non-blank fill with new field F4 (Begin Year) plus old F12 value + unless new field F4 (Begin Year) is blank, then new F7 is also blank + else leave blank +New field F8 (new A2 Day of Week for Start Day) + If old field F14 (old N6 Start Year) is non-blank, then fill new F8 with blank + else new F8 = old F6 (old A2 Day of Week for Start Day) +New F9=F13 = Old F7-F11 + diff --git a/src/Transition/OutputRulesFiles/OutputChanges8-9-0-to-9-0-0.md b/src/Transition/OutputRulesFiles/OutputChanges8-9-0-to-9-0-0.md index 0d2dc0726f5..37e17cd697b 100644 --- a/src/Transition/OutputRulesFiles/OutputChanges8-9-0-to-9-0-0.md +++ b/src/Transition/OutputRulesFiles/OutputChanges8-9-0-to-9-0-0.md @@ -13,3 +13,20 @@ A new column "Fan Energy Index" has been added to the Equipment Summary:Fans rep See [6812](https://github.com/NREL/EnergyPlus/pull/6812) +### Reporting of Year numbers + +Simulation progress messages, now include the simulation year in the date stamp. e.g. +``` +Updating Shadowing Calculations, Start Date=01/21/2020 +Continuing Simulation at 01/21/2020 for RUNPERIOD 1 +``` +eio output for RunPeriod Environment now includes the simulation year for Start Date and End Date +``` +! ,Environment Name,Environment Type, Start Date, End Date, Start DayOfWeek, Duration {#days}, Source:Start DayOfWeek, Use Daylight Saving, Use Holidays, Apply Weekend Holiday Rule, Use Rain Values, Use Snow Values +Environment,RUNPERIOD 1,WeatherFileRunPeriod,01/01/2019,12/31/2019,Tuesday,365,Use RunPeriod Specified Day,Yes,Yes,No,Yes,Yes +``` + + +See [6478](https://github.com/NREL/EnergyPlus/pull/6478) + + diff --git a/src/Transition/UtilityRoutines.f90 b/src/Transition/UtilityRoutines.f90 index c196972fa1f..202028b37f6 100644 --- a/src/Transition/UtilityRoutines.f90 +++ b/src/Transition/UtilityRoutines.f90 @@ -382,7 +382,7 @@ FUNCTION FindUnitNumber (FileName) RESULT (UnitNumber) Pos=INDEX(TestFileName,FileName) IF (Pos .ne. 0) THEN ! Must be the last part of the file - IF (Pos+FileNameLength-1 .eq. TestFileLength) EXIT + IF (Pos+FileNameLength-1 == TestFileLength) EXIT ENDIF END DO ENDIF @@ -864,7 +864,7 @@ SUBROUTINE ShowErrorMessage(ErrorMessage,OutUnit1,OutUnit2) SAVE StandardErrorOutput done=INDEX(ErrorMessage,'Completed Successfully') - IF (TotalErrors .eq. 0 .and. done .eq. 0) THEN + IF (TotalErrors == 0 .and. done == 0) THEN StandardErrorOutput=GetNewUnitNumber() IF (FileOK) THEN OPEN(StandardErrorOutput,File=TRIM(FileNamePath)//'.VCpErr') @@ -962,9 +962,122 @@ REAL FUNCTION CalculateMuEMPD(a, b, c, d, d_empd, density_matl) RESULT(mu_EMPD) END FUNCTION +INTEGER FUNCTION GetYearFromStartDayString(sDay) RESULT(Year) + CHARACTER(len=*), INTENT(IN) :: sDay + IF (sDay(1:2)=="SU".OR.sDay(1:2)=="Su".OR.sDay(1:2)=="sU".OR.sDay(1:2)=="su") THEN + Year = 2017 + ELSE IF (sDay(1:1)=="M".OR.sDay(1:1)=="m") THEN + Year = 2007 + ELSE IF (sDay(1:2)=="TU".OR.sDay(1:2)=="Tu".OR.sDay(1:2)=="tU".OR.sDay(1:2)=="tu") THEN + Year = 2013 + ELSE IF (sDay(1:1)=="W".OR.sDay(1:1)=="w") THEN + Year = 2014 + ELSE IF (sDay(1:2)=="TH".OR.sDay(1:2)=="Th".OR.sDay(1:2)=="tH".OR.sDay(1:2)=="th") THEN + Year = 2015 + ELSE IF (sDay(1:1)=="F".OR.sDay(1:1)=="f") THEN + Year = 2010 + ELSE IF (sDay(1:2)=="SA".OR.sDay(1:2)=="Sa".OR.sDay(1:2)=="sA".OR.sDay(1:2)=="sa") THEN + Year = 2011 + ELSE + Year = 2018 + END IF +END FUNCTION + +INTEGER FUNCTION GetLeapYearFromStartDayString(sDay) RESULT(Year) + CHARACTER(len=*), INTENT(IN) :: sDay + IF (sDay(1:2)=="SU".OR.sDay(1:2)=="Su".OR.sDay(1:2)=="sU".OR.sDay(1:2)=="su") THEN + Year = 2012 + ELSE IF (sDay(1:1)=="M".OR.sDay(1:1)=="m") THEN + Year = 1996 + ELSE IF (sDay(1:2)=="TU".OR.sDay(1:2)=="Tu".OR.sDay(1:2)=="tU".OR.sDay(1:2)=="tu") THEN + Year = 2008 + ELSE IF (sDay(1:1)=="W".OR.sDay(1:1)=="w") THEN + Year = 1992 + ELSE IF (sDay(1:2)=="TH".OR.sDay(1:2)=="Th".OR.sDay(1:2)=="tH".OR.sDay(1:2)=="th") THEN + Year = 2004 + ELSE IF (sDay(1:1)=="F".OR.sDay(1:1)=="f") THEN + Year = 2016 + ELSE IF (sDay(1:2)=="SA".OR.sDay(1:2)=="Sa".OR.sDay(1:2)=="sA".OR.sDay(1:2)=="sa") THEN + Year = 2000 + ELSE + Year = 2016 + END IF +END FUNCTION + +INTEGER FUNCTION GetWeekdayNumFromString(sDay) RESULT(weekdayNum) + CHARACTER(len=*), INTENT(IN) :: sDay + IF (sDay(1:2)=="SU".OR.sDay(1:2)=="Su".OR.sDay(1:2)=="sU".OR.sDay(1:2)=="su") THEN + weekdayNum = 1 + ELSE IF (sDay(1:1)=="M".OR.sDay(1:1)=="m") THEN + weekdayNum = 2 + ELSE IF (sDay(1:2)=="TU".OR.sDay(1:2)=="Tu".OR.sDay(1:2)=="tU".OR.sDay(1:2)=="tu") THEN + weekdayNum = 3 + ELSE IF (sDay(1:1)=="W".OR.sDay(1:1)=="w") THEN + weekdayNum = 4 + ELSE IF (sDay(1:2)=="TH".OR.sDay(1:2)=="Th".OR.sDay(1:2)=="tH".OR.sDay(1:2)=="th") THEN + weekdayNum = 5 + ELSE IF (sDay(1:1)=="F".OR.sDay(1:1)=="f") THEN + weekdayNum = 6 + ELSE IF (sDay(1:2)=="SA".OR.sDay(1:2)=="Sa".OR.sDay(1:2)=="sA".OR.sDay(1:2)=="sa") THEN + weekdayNum = 7 + END IF +END FUNCTION + +INTEGER FUNCTION CalculateDayOfYear(iMonth, iDay, LeapYear) RESULT(Day) + ! This function takes an integer month (1-12), integer date (1-31), and boolean flag + ! for leap year, then accesses a 1-based array of "days before" this month, plus the current + ! date, to return the day of the year + INTEGER, INTENT(IN) :: iMonth, iDay + LOGICAL, INTENT(IN) :: LeapYear + INTEGER :: DaysBefore(12) = (/ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 /) + INTEGER :: DaysBeforeLeap(12) = (/ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335 /); + IF (LeapYear) THEN + Day = DaysBeforeLeap(iMonth) + iDay; + ELSE + Day = DaysBefore(iMonth) + iDay; + END IF +END FUNCTION CalculateDayOfYear + +INTEGER FUNCTION FindYearForWeekDay(iMonth, iDay, cWeekday) RESULT(Year) + ! Should take in an integer month (1-12), integer date (1-31), and integer weekday (1-7) + ! and return back a year that matches this condition, whether leap year or not + INTEGER, INTENT(IN) :: iMonth, iDay + CHARACTER(len=*), INTENT(IN) :: cWeekday + INTEGER :: DefaultYear(13) = (/ 2013, 2014, 2015, 2010, 2011, 2017, 2007, 2013, 2014, 2015, 2010, 2011, 2017 /) + INTEGER :: DefaultLeapYear(13) = (/ 2008, 1992, 2004, 2016, 2000, 2012, 1996, 2008, 1992, 2004, 2016, 2000, 2012 /) + LOGICAL :: LeapYear = .FALSE. + INTEGER :: Ordinal = 0, Rem = 0, Index = 0 + INTEGER :: iWeekday = 0 + INTEGER, EXTERNAL :: CalculateDayOfYear, GetWeekdayNumFromString + IF (iMonth==2.AND.iDay==29) THEN + LeapYear = .TRUE. + END IF + iWeekday = GetWeekdayNumFromString(cWeekday) + Ordinal = CalculateDayOfYear(iMonth, iDay, LeapYear) + Rem = MOD(Ordinal, 7) + Index = iWeekday - Rem + 5 + IF (LeapYear) THEN + Year = DefaultLeapYear(iWeekday - Rem + 6) + ELSE + Year = DefaultYear(iWeekday - Rem + 6) + END IF +END FUNCTION + +LOGICAL FUNCTION IsYearNumberALeapYear(YearNumber) RESULT(LeapYear) + INTEGER, INTENT(IN) :: YearNumber + IF ((YearNumber/4.0) == INT(YearNumber/4.0)) THEN + IF ((YearNumber/1000.0) == INT(YearNumber/1000.0)) THEN + LeapYear = .TRUE. + RETURN + END IF + END IF + LeapYear = .FALSE. + RETURN +END FUNCTION + ! NOTICE ! -! Copyright 1996-2008 The Board of Trustees of the University of Illinois +! Copyright � 1996-2008 The Board of Trustees of the University of Illinois ! and The Regents of the University of California through Ernest Orlando Lawrence ! Berkeley National Laboratory, pending any required approval by the ! US Department of Energy. All rights reserved. diff --git a/testfiles/1ZoneDataCenterCRAC_wApproachTemp.idf b/testfiles/1ZoneDataCenterCRAC_wApproachTemp.idf index a7e2249992e..43efc966422 100644 --- a/testfiles/1ZoneDataCenterCRAC_wApproachTemp.idf +++ b/testfiles/1ZoneDataCenterCRAC_wApproachTemp.idf @@ -57,8 +57,10 @@ Jan, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -70,8 +72,10 @@ Jul, !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneDataCenterCRAC_wPumpedDXCoolingCoil.idf b/testfiles/1ZoneDataCenterCRAC_wPumpedDXCoolingCoil.idf index 027b3e27eca..0a0101e8066 100644 --- a/testfiles/1ZoneDataCenterCRAC_wPumpedDXCoolingCoil.idf +++ b/testfiles/1ZoneDataCenterCRAC_wPumpedDXCoolingCoil.idf @@ -57,8 +57,10 @@ Jan, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -70,8 +72,10 @@ Jul, !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneEvapCooler.idf b/testfiles/1ZoneEvapCooler.idf index 1b15573fe7d..69b62d29287 100644 --- a/testfiles/1ZoneEvapCooler.idf +++ b/testfiles/1ZoneEvapCooler.idf @@ -91,8 +91,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneParameterAspect.idf b/testfiles/1ZoneParameterAspect.idf index d5aaf6e8898..872423ddcef 100644 --- a/testfiles/1ZoneParameterAspect.idf +++ b/testfiles/1ZoneParameterAspect.idf @@ -115,8 +115,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolled.idf b/testfiles/1ZoneUncontrolled.idf index 2a14ff2fc13..f0dba8de034 100644 --- a/testfiles/1ZoneUncontrolled.idf +++ b/testfiles/1ZoneUncontrolled.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolled3SurfaceZone.idf b/testfiles/1ZoneUncontrolled3SurfaceZone.idf index 9c6a6e29f11..3d0d2126c70 100644 --- a/testfiles/1ZoneUncontrolled3SurfaceZone.idf +++ b/testfiles/1ZoneUncontrolled3SurfaceZone.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolledAnnualOutputs.idf b/testfiles/1ZoneUncontrolledAnnualOutputs.idf index 4c0ed2eaec9..c40ab5cb6fd 100644 --- a/testfiles/1ZoneUncontrolledAnnualOutputs.idf +++ b/testfiles/1ZoneUncontrolledAnnualOutputs.idf @@ -119,15 +119,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + 2018, !- Begin Year 12, !- End Month 31, !- End Day of Month - Tuesday, !- Day of Week for Start Day + 2019, !- End Year + Monday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 2; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, Denver Centennial Golden N_CO_USA Design_Conditions, !- Name diff --git a/testfiles/1ZoneUncontrolledCondFDWithVariableKat24C.idf b/testfiles/1ZoneUncontrolledCondFDWithVariableKat24C.idf index 83872dd44c2..4b503f0abf0 100644 --- a/testfiles/1ZoneUncontrolledCondFDWithVariableKat24C.idf +++ b/testfiles/1ZoneUncontrolledCondFDWithVariableKat24C.idf @@ -117,8 +117,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolledFourAlgorithms.idf b/testfiles/1ZoneUncontrolledFourAlgorithms.idf index c4529178632..55e359df303 100644 --- a/testfiles/1ZoneUncontrolledFourAlgorithms.idf +++ b/testfiles/1ZoneUncontrolledFourAlgorithms.idf @@ -116,8 +116,10 @@ jan, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 28, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolledResLayers.idf b/testfiles/1ZoneUncontrolledResLayers.idf index 409c7cb1761..74117ead618 100644 --- a/testfiles/1ZoneUncontrolledResLayers.idf +++ b/testfiles/1ZoneUncontrolledResLayers.idf @@ -120,8 +120,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolledWithHysteresisPCM.idf b/testfiles/1ZoneUncontrolledWithHysteresisPCM.idf index b8dafeddef0..8d26e7f310d 100644 --- a/testfiles/1ZoneUncontrolledWithHysteresisPCM.idf +++ b/testfiles/1ZoneUncontrolledWithHysteresisPCM.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolled_DD2009.idf b/testfiles/1ZoneUncontrolled_DD2009.idf index 4209c018cc0..7ec56a1b544 100644 --- a/testfiles/1ZoneUncontrolled_DD2009.idf +++ b/testfiles/1ZoneUncontrolled_DD2009.idf @@ -119,8 +119,10 @@ TestRun, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolled_DDChanges.idf b/testfiles/1ZoneUncontrolled_DDChanges.idf index 25a0b7567a2..9d6a397f3e6 100644 --- a/testfiles/1ZoneUncontrolled_DDChanges.idf +++ b/testfiles/1ZoneUncontrolled_DDChanges.idf @@ -122,8 +122,10 @@ TestRun, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolled_FCfactor_Slab_UGWall.idf b/testfiles/1ZoneUncontrolled_FCfactor_Slab_UGWall.idf index 50c0b9908d0..4c2238925dc 100644 --- a/testfiles/1ZoneUncontrolled_FCfactor_Slab_UGWall.idf +++ b/testfiles/1ZoneUncontrolled_FCfactor_Slab_UGWall.idf @@ -118,8 +118,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolled_OtherEquipmentWithFuel.idf b/testfiles/1ZoneUncontrolled_OtherEquipmentWithFuel.idf index a26fb4385e4..4d03e0e674a 100644 --- a/testfiles/1ZoneUncontrolled_OtherEquipmentWithFuel.idf +++ b/testfiles/1ZoneUncontrolled_OtherEquipmentWithFuel.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolled_win_1.idf b/testfiles/1ZoneUncontrolled_win_1.idf index 85a231e9e7c..1aca10839f9 100644 --- a/testfiles/1ZoneUncontrolled_win_1.idf +++ b/testfiles/1ZoneUncontrolled_win_1.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneUncontrolled_win_2.idf b/testfiles/1ZoneUncontrolled_win_2.idf index 919d05f3d6a..36440370a28 100644 --- a/testfiles/1ZoneUncontrolled_win_2.idf +++ b/testfiles/1ZoneUncontrolled_win_2.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/1ZoneWith14ControlledHeat-CoolPanels.idf b/testfiles/1ZoneWith14ControlledHeat-CoolPanels.idf index f6f17d19ff9..c36f764e421 100644 --- a/testfiles/1ZoneWith14ControlledHeat-CoolPanels.idf +++ b/testfiles/1ZoneWith14ControlledHeat-CoolPanels.idf @@ -496,15 +496,16 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Material:NoMass, R13LAYER, !- Name diff --git a/testfiles/2ZoneDataCenterHVAC_wEconomizer.idf b/testfiles/2ZoneDataCenterHVAC_wEconomizer.idf index 56a5a05932b..ccf42a10785 100644 --- a/testfiles/2ZoneDataCenterHVAC_wEconomizer.idf +++ b/testfiles/2ZoneDataCenterHVAC_wEconomizer.idf @@ -142,8 +142,10 @@ WinterSeasonDay, !- Name 1, !- Begin Month 12, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -155,8 +157,10 @@ SpringSeasonDay, !- Name 4, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 4, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -168,8 +172,10 @@ SummerSeasonDay, !- Name 7, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 7, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -181,8 +187,10 @@ AutumnSeasonDay, !- Name 10, !- Begin Month 12, !- Begin Day of Month + , !- Begin Year 10, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/4ZoneWithShading_Simple_1.idf b/testfiles/4ZoneWithShading_Simple_1.idf index 6dabe8515d2..b3e21409468 100644 --- a/testfiles/4ZoneWithShading_Simple_1.idf +++ b/testfiles/4ZoneWithShading_Simple_1.idf @@ -186,9 +186,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/4ZoneWithShading_Simple_2.idf b/testfiles/4ZoneWithShading_Simple_2.idf index fc861004fd7..54c3fe4d4d1 100644 --- a/testfiles/4ZoneWithShading_Simple_2.idf +++ b/testfiles/4ZoneWithShading_Simple_2.idf @@ -184,9 +184,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/5ZoneAirCooled.idf b/testfiles/5ZoneAirCooled.idf index 27c3424f1f9..99a5ca79690 100644 --- a/testfiles/5ZoneAirCooled.idf +++ b/testfiles/5ZoneAirCooled.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooledConvCoef.idf b/testfiles/5ZoneAirCooledConvCoef.idf index 7c6a1b7263f..6a354ad8385 100644 --- a/testfiles/5ZoneAirCooledConvCoef.idf +++ b/testfiles/5ZoneAirCooledConvCoef.idf @@ -178,8 +178,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -191,8 +193,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooledConvCoefPIU.idf b/testfiles/5ZoneAirCooledConvCoefPIU.idf index 2ffae6d89d6..308c62c5c97 100644 --- a/testfiles/5ZoneAirCooledConvCoefPIU.idf +++ b/testfiles/5ZoneAirCooledConvCoefPIU.idf @@ -176,8 +176,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -189,8 +191,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooledDemandLimiting.idf b/testfiles/5ZoneAirCooledDemandLimiting.idf index 950824f9f0f..a902a3807a4 100644 --- a/testfiles/5ZoneAirCooledDemandLimiting.idf +++ b/testfiles/5ZoneAirCooledDemandLimiting.idf @@ -165,8 +165,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -178,8 +180,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooledDemandLimiting_FixedRateVentilation.idf b/testfiles/5ZoneAirCooledDemandLimiting_FixedRateVentilation.idf index 85cf019daa4..a1e5b5c5022 100644 --- a/testfiles/5ZoneAirCooledDemandLimiting_FixedRateVentilation.idf +++ b/testfiles/5ZoneAirCooledDemandLimiting_FixedRateVentilation.idf @@ -166,8 +166,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -179,8 +181,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooledDemandLimiting_ReductionRatioVentilation.idf b/testfiles/5ZoneAirCooledDemandLimiting_ReductionRatioVentilation.idf index 876d5371539..c24a61ce2ef 100644 --- a/testfiles/5ZoneAirCooledDemandLimiting_ReductionRatioVentilation.idf +++ b/testfiles/5ZoneAirCooledDemandLimiting_ReductionRatioVentilation.idf @@ -166,8 +166,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -179,8 +181,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooledWithCoupledInGradeSlab.idf b/testfiles/5ZoneAirCooledWithCoupledInGradeSlab.idf index a8f9f30fbe5..94754c172c1 100644 --- a/testfiles/5ZoneAirCooledWithCoupledInGradeSlab.idf +++ b/testfiles/5ZoneAirCooledWithCoupledInGradeSlab.idf @@ -161,8 +161,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Wednesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooledWithDOASAirLoop.idf b/testfiles/5ZoneAirCooledWithDOASAirLoop.idf index 30aff1e9951..9904ba9a691 100644 --- a/testfiles/5ZoneAirCooledWithDOASAirLoop.idf +++ b/testfiles/5ZoneAirCooledWithDOASAirLoop.idf @@ -164,8 +164,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooledWithSlab.idf b/testfiles/5ZoneAirCooledWithSlab.idf index c00020dbbed..c32b17561e0 100644 --- a/testfiles/5ZoneAirCooledWithSlab.idf +++ b/testfiles/5ZoneAirCooledWithSlab.idf @@ -230,8 +230,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooled_UniformLoading.idf b/testfiles/5ZoneAirCooled_UniformLoading.idf index 902846a8bcc..65110ed0eaf 100644 --- a/testfiles/5ZoneAirCooled_UniformLoading.idf +++ b/testfiles/5ZoneAirCooled_UniformLoading.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooled_VRPSizing.idf b/testfiles/5ZoneAirCooled_VRPSizing.idf index 04bd25e9163..f634800b44a 100644 --- a/testfiles/5ZoneAirCooled_VRPSizing.idf +++ b/testfiles/5ZoneAirCooled_VRPSizing.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooled_VRPSizing_MaxZd.idf b/testfiles/5ZoneAirCooled_VRPSizing_MaxZd.idf index 51a0505e818..7652a7a56b2 100644 --- a/testfiles/5ZoneAirCooled_VRPSizing_MaxZd.idf +++ b/testfiles/5ZoneAirCooled_VRPSizing_MaxZd.idf @@ -166,8 +166,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooled_ZoneAirMassFlowBalance.idf b/testfiles/5ZoneAirCooled_ZoneAirMassFlowBalance.idf index af923d7accc..3f6017cc95c 100644 --- a/testfiles/5ZoneAirCooled_ZoneAirMassFlowBalance.idf +++ b/testfiles/5ZoneAirCooled_ZoneAirMassFlowBalance.idf @@ -173,8 +173,10 @@ WinterRunPeriod, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -186,8 +188,10 @@ SummerRunPeriod, !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAirCooled_ZoneAirMassFlowBalance_Pressurized.idf b/testfiles/5ZoneAirCooled_ZoneAirMassFlowBalance_Pressurized.idf index 18b9ef05516..11a5cf8d7a9 100644 --- a/testfiles/5ZoneAirCooled_ZoneAirMassFlowBalance_Pressurized.idf +++ b/testfiles/5ZoneAirCooled_ZoneAirMassFlowBalance_Pressurized.idf @@ -175,8 +175,10 @@ WinterRunPeriod, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -188,8 +190,10 @@ SummerRunPeriod, !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneAutoDXVAV.idf b/testfiles/5ZoneAutoDXVAV.idf index 038511ca111..ef3aaa3695e 100644 --- a/testfiles/5ZoneAutoDXVAV.idf +++ b/testfiles/5ZoneAutoDXVAV.idf @@ -161,8 +161,10 @@ , !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -174,8 +176,10 @@ , !- Name 6, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 6, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneBoilerOutsideAirReset.idf b/testfiles/5ZoneBoilerOutsideAirReset.idf index c7e2aa59307..780937359f9 100644 --- a/testfiles/5ZoneBoilerOutsideAirReset.idf +++ b/testfiles/5ZoneBoilerOutsideAirReset.idf @@ -161,8 +161,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -174,8 +176,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneBranchSupplyPumps.idf b/testfiles/5ZoneBranchSupplyPumps.idf index 0bbcd7c7656..524497157a9 100644 --- a/testfiles/5ZoneBranchSupplyPumps.idf +++ b/testfiles/5ZoneBranchSupplyPumps.idf @@ -164,8 +164,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -177,8 +179,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneCAV_MaxTemp.idf b/testfiles/5ZoneCAV_MaxTemp.idf index 748db7a6e36..a60ab5e9cb8 100644 --- a/testfiles/5ZoneCAV_MaxTemp.idf +++ b/testfiles/5ZoneCAV_MaxTemp.idf @@ -154,15 +154,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CHICAGO_IL_USA TMY2-94846, !- Name diff --git a/testfiles/5ZoneCAVtoVAVWarmestTempFlow.idf b/testfiles/5ZoneCAVtoVAVWarmestTempFlow.idf index e13037f98fa..54ce7da17f2 100644 --- a/testfiles/5ZoneCAVtoVAVWarmestTempFlow.idf +++ b/testfiles/5ZoneCAVtoVAVWarmestTempFlow.idf @@ -146,15 +146,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CHICAGO_IL_USA TMY2-94846, !- Name diff --git a/testfiles/5ZoneCoolBeam.idf b/testfiles/5ZoneCoolBeam.idf index db514731057..4280fcad5c6 100644 --- a/testfiles/5ZoneCoolBeam.idf +++ b/testfiles/5ZoneCoolBeam.idf @@ -164,8 +164,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -177,8 +179,10 @@ July7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneCoolingPanelBaseboard.idf b/testfiles/5ZoneCoolingPanelBaseboard.idf index 30e65b35ac2..a7e30f7e8e0 100644 --- a/testfiles/5ZoneCoolingPanelBaseboard.idf +++ b/testfiles/5ZoneCoolingPanelBaseboard.idf @@ -221,8 +221,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -234,8 +236,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneCoolingPanelBaseboardAuto.idf b/testfiles/5ZoneCoolingPanelBaseboardAuto.idf index 3ef4e667b2f..ce6ff0e2cb1 100644 --- a/testfiles/5ZoneCoolingPanelBaseboardAuto.idf +++ b/testfiles/5ZoneCoolingPanelBaseboardAuto.idf @@ -221,8 +221,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -234,8 +236,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneCoolingPanelBaseboardTotalLoad.idf b/testfiles/5ZoneCoolingPanelBaseboardTotalLoad.idf index 4d0841b955a..d8b317c658d 100644 --- a/testfiles/5ZoneCoolingPanelBaseboardTotalLoad.idf +++ b/testfiles/5ZoneCoolingPanelBaseboardTotalLoad.idf @@ -221,8 +221,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -234,8 +236,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneCoolingPanelBaseboardVarOff.idf b/testfiles/5ZoneCoolingPanelBaseboardVarOff.idf index 13bea16e8f4..09dd5c2bfd2 100644 --- a/testfiles/5ZoneCoolingPanelBaseboardVarOff.idf +++ b/testfiles/5ZoneCoolingPanelBaseboardVarOff.idf @@ -221,8 +221,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -234,8 +236,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneCostEst.idf b/testfiles/5ZoneCostEst.idf index 9be46cf35b5..b83d756db3b 100644 --- a/testfiles/5ZoneCostEst.idf +++ b/testfiles/5ZoneCostEst.idf @@ -52,8 +52,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneDDCycOnAny.idf b/testfiles/5ZoneDDCycOnAny.idf index ffdabeb57a9..b156d8ecee7 100644 --- a/testfiles/5ZoneDDCycOnAny.idf +++ b/testfiles/5ZoneDDCycOnAny.idf @@ -129,8 +129,10 @@ , !- Name 1, !- Begin Month 25, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneDDCycOnOne.idf b/testfiles/5ZoneDDCycOnOne.idf index 6118a072084..4a0a3143abc 100644 --- a/testfiles/5ZoneDDCycOnOne.idf +++ b/testfiles/5ZoneDDCycOnOne.idf @@ -129,8 +129,10 @@ , !- Name 1, !- Begin Month 25, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneDesignInputCoolingCoil.idf b/testfiles/5ZoneDesignInputCoolingCoil.idf index 24b5aca4d9b..507d1854de4 100644 --- a/testfiles/5ZoneDesignInputCoolingCoil.idf +++ b/testfiles/5ZoneDesignInputCoolingCoil.idf @@ -165,8 +165,10 @@ , !- Name 6, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 6, !- End Month 21, !- End Day of Month + , !- End Year , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneDetailedIceStorage.idf b/testfiles/5ZoneDetailedIceStorage.idf index 75dced5aaed..ff5a7a7590e 100644 --- a/testfiles/5ZoneDetailedIceStorage.idf +++ b/testfiles/5ZoneDetailedIceStorage.idf @@ -181,8 +181,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -194,8 +196,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneDetailedIceStorage2.idf b/testfiles/5ZoneDetailedIceStorage2.idf index 979c721a47a..280303da237 100644 --- a/testfiles/5ZoneDetailedIceStorage2.idf +++ b/testfiles/5ZoneDetailedIceStorage2.idf @@ -181,8 +181,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -194,8 +196,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneDetailedIceStorageCubicLinear.idf b/testfiles/5ZoneDetailedIceStorageCubicLinear.idf index 0e9f6cbfb53..cabe7f1fd4a 100644 --- a/testfiles/5ZoneDetailedIceStorageCubicLinear.idf +++ b/testfiles/5ZoneDetailedIceStorageCubicLinear.idf @@ -181,8 +181,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -194,8 +196,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneDetailedIceStorageSimpleCtrl.idf b/testfiles/5ZoneDetailedIceStorageSimpleCtrl.idf index 04f1feeba3c..5fd262666d5 100644 --- a/testfiles/5ZoneDetailedIceStorageSimpleCtrl.idf +++ b/testfiles/5ZoneDetailedIceStorageSimpleCtrl.idf @@ -181,8 +181,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -194,8 +196,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneEconomicsTariffAndLifeCycleCosts.idf b/testfiles/5ZoneEconomicsTariffAndLifeCycleCosts.idf index aa2083ff5d9..e631a1127a7 100644 --- a/testfiles/5ZoneEconomicsTariffAndLifeCycleCosts.idf +++ b/testfiles/5ZoneEconomicsTariffAndLifeCycleCosts.idf @@ -166,8 +166,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneElectricBaseboard.idf b/testfiles/5ZoneElectricBaseboard.idf index 0867f0384eb..f0c5f5bc70b 100644 --- a/testfiles/5ZoneElectricBaseboard.idf +++ b/testfiles/5ZoneElectricBaseboard.idf @@ -227,8 +227,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 15, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -240,8 +242,10 @@ , !- Name 4, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 4, !- End Month 30, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneEndUses.idf b/testfiles/5ZoneEndUses.idf index 29e5481786d..56ed2a82998 100644 --- a/testfiles/5ZoneEndUses.idf +++ b/testfiles/5ZoneEndUses.idf @@ -169,8 +169,10 @@ , !- Name 10, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 10, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneEngChill.idf b/testfiles/5ZoneEngChill.idf index 77d7889d643..ed74e5d0937 100644 --- a/testfiles/5ZoneEngChill.idf +++ b/testfiles/5ZoneEngChill.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -175,8 +177,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneFPIU.idf b/testfiles/5ZoneFPIU.idf index 25ec8767ec1..6cef593c788 100644 --- a/testfiles/5ZoneFPIU.idf +++ b/testfiles/5ZoneFPIU.idf @@ -168,8 +168,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -181,8 +183,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneFanCoilDOASCool.idf b/testfiles/5ZoneFanCoilDOASCool.idf index 6cc02405438..7c82b556c0e 100644 --- a/testfiles/5ZoneFanCoilDOASCool.idf +++ b/testfiles/5ZoneFanCoilDOASCool.idf @@ -214,8 +214,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneFanCoilDOAS_ERVOnAirLoopMainBranch.idf b/testfiles/5ZoneFanCoilDOAS_ERVOnAirLoopMainBranch.idf index 9dadca7528f..e8c8b38c225 100644 --- a/testfiles/5ZoneFanCoilDOAS_ERVOnAirLoopMainBranch.idf +++ b/testfiles/5ZoneFanCoilDOAS_ERVOnAirLoopMainBranch.idf @@ -215,8 +215,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneFanCoilDOAS_HumidifierOnOASystem.idf b/testfiles/5ZoneFanCoilDOAS_HumidifierOnOASystem.idf index 17bbda197a5..80aca0e3112 100644 --- a/testfiles/5ZoneFanCoilDOAS_HumidifierOnOASystem.idf +++ b/testfiles/5ZoneFanCoilDOAS_HumidifierOnOASystem.idf @@ -216,8 +216,10 @@ WinterTypicalDays, !- Name 1, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 1, !- End Month 27, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -229,8 +231,10 @@ SummerTypicalDays, !- Name 7, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 7, !- End Month 27, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneGeometryTransform.idf b/testfiles/5ZoneGeometryTransform.idf index f82f0731a0e..fc39b56ece7 100644 --- a/testfiles/5ZoneGeometryTransform.idf +++ b/testfiles/5ZoneGeometryTransform.idf @@ -167,8 +167,10 @@ , !- Name 10, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 10, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneIceStorage.idf b/testfiles/5ZoneIceStorage.idf index 891d2c76bf9..fe6d7730850 100644 --- a/testfiles/5ZoneIceStorage.idf +++ b/testfiles/5ZoneIceStorage.idf @@ -181,8 +181,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -194,8 +196,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneNightVent1.idf b/testfiles/5ZoneNightVent1.idf index 4b9a8b68af6..31ca0ee8511 100644 --- a/testfiles/5ZoneNightVent1.idf +++ b/testfiles/5ZoneNightVent1.idf @@ -130,8 +130,10 @@ , !- Name 8, !- Begin Month 10, !- Begin Day of Month + , !- Begin Year 8, !- End Month 18, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneNightVent2.idf b/testfiles/5ZoneNightVent2.idf index ab0df26ba30..6039e27803b 100644 --- a/testfiles/5ZoneNightVent2.idf +++ b/testfiles/5ZoneNightVent2.idf @@ -139,8 +139,10 @@ , !- Name 8, !- Begin Month 10, !- Begin Day of Month + , !- Begin Year 8, !- End Month 18, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneNightVent3.idf b/testfiles/5ZoneNightVent3.idf index 821f105f583..bd26c648c1c 100644 --- a/testfiles/5ZoneNightVent3.idf +++ b/testfiles/5ZoneNightVent3.idf @@ -142,8 +142,10 @@ Aug10-18, !- Name 8, !- Begin Month 10, !- Begin Day of Month + , !- Begin Year 8, !- End Month 18, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneReturnFan.idf b/testfiles/5ZoneReturnFan.idf index b8ba7c560ba..b25a8730e4a 100644 --- a/testfiles/5ZoneReturnFan.idf +++ b/testfiles/5ZoneReturnFan.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -143,8 +145,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneSteamBaseboard.idf b/testfiles/5ZoneSteamBaseboard.idf index f38bbcbf52f..4dc4352d75f 100644 --- a/testfiles/5ZoneSteamBaseboard.idf +++ b/testfiles/5ZoneSteamBaseboard.idf @@ -131,9 +131,11 @@ , !- Name 1, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 1, !- End Month 21, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period , !- Apply Weekend Holiday Rule @@ -144,9 +146,11 @@ , !- Name 4, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 4, !- End Month 21, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period , !- Apply Weekend Holiday Rule diff --git a/testfiles/5ZoneSupRetPlenRAB.idf b/testfiles/5ZoneSupRetPlenRAB.idf index 21ea8a4486c..69163ad416f 100644 --- a/testfiles/5ZoneSupRetPlenRAB.idf +++ b/testfiles/5ZoneSupRetPlenRAB.idf @@ -153,8 +153,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -166,8 +168,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneSupRetPlenVSATU.idf b/testfiles/5ZoneSupRetPlenVSATU.idf index f6696eab98d..f61474b5c29 100644 --- a/testfiles/5ZoneSupRetPlenVSATU.idf +++ b/testfiles/5ZoneSupRetPlenVSATU.idf @@ -154,8 +154,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -167,8 +169,10 @@ July7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneSwimmingPool.idf b/testfiles/5ZoneSwimmingPool.idf index 0fac54d1a79..b4bb71cb268 100644 --- a/testfiles/5ZoneSwimmingPool.idf +++ b/testfiles/5ZoneSwimmingPool.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneTDV.idf b/testfiles/5ZoneTDV.idf index 2df31f95f4d..cedc15d7681 100644 --- a/testfiles/5ZoneTDV.idf +++ b/testfiles/5ZoneTDV.idf @@ -164,8 +164,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed.idf b/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed.idf index 4dc6857bfb6..21467fd4759 100644 --- a/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed.idf +++ b/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed.idf @@ -86,8 +86,10 @@ annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed_DCV_MaxZd.idf b/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed_DCV_MaxZd.idf index 5d520ee44f8..e1b71bc4626 100644 --- a/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed_DCV_MaxZd.idf +++ b/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed_DCV_MaxZd.idf @@ -89,8 +89,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed_DCV_MultiPath.idf b/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed_DCV_MultiPath.idf index 7cb87cb4a2c..0f05a7c6b18 100644 --- a/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed_DCV_MultiPath.idf +++ b/testfiles/5ZoneVAV-ChilledWaterStorage-Mixed_DCV_MultiPath.idf @@ -89,8 +89,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneVAV-ChilledWaterStorage-Stratified.idf b/testfiles/5ZoneVAV-ChilledWaterStorage-Stratified.idf index 718574bd248..b0bad1e642f 100644 --- a/testfiles/5ZoneVAV-ChilledWaterStorage-Stratified.idf +++ b/testfiles/5ZoneVAV-ChilledWaterStorage-Stratified.idf @@ -86,8 +86,10 @@ , !- Name 7, !- Begin Month 11, !- Begin Day of Month + , !- Begin Year 7, !- End Month 18, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneVAV-Pri-SecLoop.idf b/testfiles/5ZoneVAV-Pri-SecLoop.idf index c7776843ade..f0ccb691ee7 100644 --- a/testfiles/5ZoneVAV-Pri-SecLoop.idf +++ b/testfiles/5ZoneVAV-Pri-SecLoop.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWLHPPlantLoopTower.idf b/testfiles/5ZoneWLHPPlantLoopTower.idf index 837f81ecf28..a0e706363e9 100644 --- a/testfiles/5ZoneWLHPPlantLoopTower.idf +++ b/testfiles/5ZoneWLHPPlantLoopTower.idf @@ -174,8 +174,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -187,8 +189,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWarmest.idf b/testfiles/5ZoneWarmest.idf index 2c72782ff9f..cd9d4d772e9 100644 --- a/testfiles/5ZoneWarmest.idf +++ b/testfiles/5ZoneWarmest.idf @@ -175,8 +175,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -188,8 +190,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWarmestMultDDSizBypass.idf b/testfiles/5ZoneWarmestMultDDSizBypass.idf index 714f8515487..c1e229d5014 100644 --- a/testfiles/5ZoneWarmestMultDDSizBypass.idf +++ b/testfiles/5ZoneWarmestMultDDSizBypass.idf @@ -175,8 +175,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -188,8 +190,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWarmestMultDDSizOnOff.idf b/testfiles/5ZoneWarmestMultDDSizOnOff.idf index d226f135508..b65fcb0c88b 100644 --- a/testfiles/5ZoneWarmestMultDDSizOnOff.idf +++ b/testfiles/5ZoneWarmestMultDDSizOnOff.idf @@ -175,8 +175,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -188,8 +190,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWarmestMultDDSizVAV.idf b/testfiles/5ZoneWarmestMultDDSizVAV.idf index 07ad7e4c582..aa547f9f603 100644 --- a/testfiles/5ZoneWarmestMultDDSizVAV.idf +++ b/testfiles/5ZoneWarmestMultDDSizVAV.idf @@ -175,8 +175,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -188,8 +190,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWarmestMultDDSizVT.idf b/testfiles/5ZoneWarmestMultDDSizVT.idf index d4030de5d6c..2500fa012c9 100644 --- a/testfiles/5ZoneWarmestMultDDSizVT.idf +++ b/testfiles/5ZoneWarmestMultDDSizVT.idf @@ -175,8 +175,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -188,8 +190,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWarmestVFD.idf b/testfiles/5ZoneWarmestVFD.idf index d2ac8e16746..f2d46b159b2 100644 --- a/testfiles/5ZoneWarmestVFD.idf +++ b/testfiles/5ZoneWarmestVFD.idf @@ -179,8 +179,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -192,8 +194,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWarmestVFD_FCMAuto.idf b/testfiles/5ZoneWarmestVFD_FCMAuto.idf index a25b4446a08..6a838579de2 100644 --- a/testfiles/5ZoneWarmestVFD_FCMAuto.idf +++ b/testfiles/5ZoneWarmestVFD_FCMAuto.idf @@ -173,8 +173,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWaterCooled_Baseboard.idf b/testfiles/5ZoneWaterCooled_Baseboard.idf index f730080f824..856b5a02294 100644 --- a/testfiles/5ZoneWaterCooled_Baseboard.idf +++ b/testfiles/5ZoneWaterCooled_Baseboard.idf @@ -220,8 +220,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -233,8 +235,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWaterCooled_BaseboardScalableSizing.idf b/testfiles/5ZoneWaterCooled_BaseboardScalableSizing.idf index 842ac9af7ff..2f1025b3459 100644 --- a/testfiles/5ZoneWaterCooled_BaseboardScalableSizing.idf +++ b/testfiles/5ZoneWaterCooled_BaseboardScalableSizing.idf @@ -222,8 +222,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -235,8 +237,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWaterCooled_GasFiredSteamHumidifier.idf b/testfiles/5ZoneWaterCooled_GasFiredSteamHumidifier.idf index dffac9c0f89..a765a02ccf7 100644 --- a/testfiles/5ZoneWaterCooled_GasFiredSteamHumidifier.idf +++ b/testfiles/5ZoneWaterCooled_GasFiredSteamHumidifier.idf @@ -179,8 +179,10 @@ , !- Name 1, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 1, !- End Month 21, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -192,8 +194,10 @@ , !- Name 7, !- Begin Month 16, !- Begin Day of Month + , !- Begin Year 7, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWaterCooled_HighRHControl.idf b/testfiles/5ZoneWaterCooled_HighRHControl.idf index 169e28b3c94..c44b790c7a5 100644 --- a/testfiles/5ZoneWaterCooled_HighRHControl.idf +++ b/testfiles/5ZoneWaterCooled_HighRHControl.idf @@ -172,8 +172,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -185,8 +187,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWaterCooled_MultizoneAverageRHControl.idf b/testfiles/5ZoneWaterCooled_MultizoneAverageRHControl.idf index adf13cd92d1..3abbabf803d 100644 --- a/testfiles/5ZoneWaterCooled_MultizoneAverageRHControl.idf +++ b/testfiles/5ZoneWaterCooled_MultizoneAverageRHControl.idf @@ -179,8 +179,10 @@ , !- Name 1, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 1, !- End Month 21, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -192,8 +194,10 @@ , !- Name 7, !- Begin Month 16, !- Begin Day of Month + , !- Begin Year 7, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWaterCooled_MultizoneMinMaxRHControl.idf b/testfiles/5ZoneWaterCooled_MultizoneMinMaxRHControl.idf index ec3b021a607..22660331dfa 100644 --- a/testfiles/5ZoneWaterCooled_MultizoneMinMaxRHControl.idf +++ b/testfiles/5ZoneWaterCooled_MultizoneMinMaxRHControl.idf @@ -179,8 +179,10 @@ , !- Name 1, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 1, !- End Month 21, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -192,8 +194,10 @@ , !- Name 7, !- Begin Month 16, !- Begin Day of Month + , !- Begin Year 7, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5ZoneWaterLoopHeatPump.idf b/testfiles/5ZoneWaterLoopHeatPump.idf index 8f226309a56..c1caa6ab812 100644 --- a/testfiles/5ZoneWaterLoopHeatPump.idf +++ b/testfiles/5ZoneWaterLoopHeatPump.idf @@ -168,8 +168,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -181,8 +183,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5Zone_IdealLoadsAirSystems_ReturnPlenum.idf b/testfiles/5Zone_IdealLoadsAirSystems_ReturnPlenum.idf index 7d7f330eed5..a36100823f5 100644 --- a/testfiles/5Zone_IdealLoadsAirSystems_ReturnPlenum.idf +++ b/testfiles/5Zone_IdealLoadsAirSystems_ReturnPlenum.idf @@ -165,8 +165,10 @@ RP1, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -178,8 +180,10 @@ RP2, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5Zone_Transformer.idf b/testfiles/5Zone_Transformer.idf index e8b0d8d0852..e4386f9b48e 100644 --- a/testfiles/5Zone_Transformer.idf +++ b/testfiles/5Zone_Transformer.idf @@ -145,8 +145,10 @@ WinterDay, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -158,8 +160,10 @@ SummerDay, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5Zone_Unitary_HXAssistedCoil.idf b/testfiles/5Zone_Unitary_HXAssistedCoil.idf index 8d88d6ca3d8..ac9489effa0 100644 --- a/testfiles/5Zone_Unitary_HXAssistedCoil.idf +++ b/testfiles/5Zone_Unitary_HXAssistedCoil.idf @@ -160,8 +160,10 @@ Feb 1 to 5, !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -173,8 +175,10 @@ June 1 to 5, !- Name 6, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 6, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5Zone_Unitary_VSDesuperheatWaterHeater.idf b/testfiles/5Zone_Unitary_VSDesuperheatWaterHeater.idf index 9e2c48f9c25..fdadf48ee69 100644 --- a/testfiles/5Zone_Unitary_VSDesuperheatWaterHeater.idf +++ b/testfiles/5Zone_Unitary_VSDesuperheatWaterHeater.idf @@ -160,8 +160,10 @@ Feb 1 to 5, !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -173,8 +175,10 @@ June 1 to 5, !- Name 6, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 6, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/5Zone_Unitary_VSDesuperheater.idf b/testfiles/5Zone_Unitary_VSDesuperheater.idf index b60c602ad03..9933cbd9cb6 100644 --- a/testfiles/5Zone_Unitary_VSDesuperheater.idf +++ b/testfiles/5Zone_Unitary_VSDesuperheater.idf @@ -160,8 +160,10 @@ Feb 1 to 5, !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -173,8 +175,10 @@ June 1 to 5, !- Name 6, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 6, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ASIHPMixedTank.idf b/testfiles/ASIHPMixedTank.idf index c5df365ec10..f8e7642c0db 100644 --- a/testfiles/ASIHPMixedTank.idf +++ b/testfiles/ASIHPMixedTank.idf @@ -1400,8 +1400,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -1413,8 +1415,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AbsorptionChiller.idf b/testfiles/AbsorptionChiller.idf index e9b37f820d5..d8f66d724c3 100644 --- a/testfiles/AbsorptionChiller.idf +++ b/testfiles/AbsorptionChiller.idf @@ -142,8 +142,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -155,8 +157,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AbsorptionChiller_Macro.imf b/testfiles/AbsorptionChiller_Macro.imf index 5d6533797e7..18111abfd9f 100644 --- a/testfiles/AbsorptionChiller_Macro.imf +++ b/testfiles/AbsorptionChiller_Macro.imf @@ -131,8 +131,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -144,8 +146,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ActiveTrombeWall.idf b/testfiles/ActiveTrombeWall.idf index 0bc8bd80aa9..60cdee68674 100644 --- a/testfiles/ActiveTrombeWall.idf +++ b/testfiles/ActiveTrombeWall.idf @@ -104,8 +104,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AdaptiveThermostatASH55_5Zone_Miami.idf b/testfiles/AdaptiveThermostatASH55_5Zone_Miami.idf index 83c78ef02d0..4b615d0c2da 100644 --- a/testfiles/AdaptiveThermostatASH55_5Zone_Miami.idf +++ b/testfiles/AdaptiveThermostatASH55_5Zone_Miami.idf @@ -167,8 +167,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AdvancedOutput/ExerciseOutput1.idf b/testfiles/AdvancedOutput/ExerciseOutput1.idf index f6e3f748e0d..0522465feff 100644 --- a/testfiles/AdvancedOutput/ExerciseOutput1.idf +++ b/testfiles/AdvancedOutput/ExerciseOutput1.idf @@ -65,8 +65,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day YES, !- Use Weather File Holidays and Special Days NO, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AdvancedOutput/ExerciseOutput1A-Solution.idf b/testfiles/AdvancedOutput/ExerciseOutput1A-Solution.idf index 766f29f3897..7ce88f9cdac 100644 --- a/testfiles/AdvancedOutput/ExerciseOutput1A-Solution.idf +++ b/testfiles/AdvancedOutput/ExerciseOutput1A-Solution.idf @@ -65,8 +65,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day YES, !- Use Weather File Holidays and Special Days NO, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirCooledElectricChiller.idf b/testfiles/AirCooledElectricChiller.idf index 4d91ba2051e..c4ebe901d04 100644 --- a/testfiles/AirCooledElectricChiller.idf +++ b/testfiles/AirCooledElectricChiller.idf @@ -127,8 +127,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -140,8 +142,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirEconomizerFaults_RefBldgLargeOfficeNew2004_Chicago.idf b/testfiles/AirEconomizerFaults_RefBldgLargeOfficeNew2004_Chicago.idf index 026c2148d93..480ff2843b7 100644 --- a/testfiles/AirEconomizerFaults_RefBldgLargeOfficeNew2004_Chicago.idf +++ b/testfiles/AirEconomizerFaults_RefBldgLargeOfficeNew2004_Chicago.idf @@ -98,15 +98,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/AirEconomizerWithMaxMinOAFractions.idf b/testfiles/AirEconomizerWithMaxMinOAFractions.idf index 8112767a0be..ff342bf4164 100644 --- a/testfiles/AirEconomizerWithMaxMinOAFractions.idf +++ b/testfiles/AirEconomizerWithMaxMinOAFractions.idf @@ -162,8 +162,10 @@ , !- Name 3, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 3, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork3zVent.idf b/testfiles/AirflowNetwork3zVent.idf index a5d3f15c2c6..50017135426 100644 --- a/testfiles/AirflowNetwork3zVent.idf +++ b/testfiles/AirflowNetwork3zVent.idf @@ -162,9 +162,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 2, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/AirflowNetwork3zVentAutoWPC.idf b/testfiles/AirflowNetwork3zVentAutoWPC.idf index fa1031b1017..6a81a20b9e1 100644 --- a/testfiles/AirflowNetwork3zVentAutoWPC.idf +++ b/testfiles/AirflowNetwork3zVentAutoWPC.idf @@ -160,9 +160,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 2, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/AirflowNetworkAdvanced_SingleSided_NV.idf b/testfiles/AirflowNetworkAdvanced_SingleSided_NV.idf index 4d27fc820b7..8c186498477 100644 --- a/testfiles/AirflowNetworkAdvanced_SingleSided_NV.idf +++ b/testfiles/AirflowNetworkAdvanced_SingleSided_NV.idf @@ -117,16 +117,16 @@ RunPeriod1, !- Name 1, !- Begin Month 1, !- Begin Day of Month + 2017, !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + 2017, !- End Year + , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1, !- Number of Times Runperiod to be Repeated - Yes; !- Increment Day of Week on repeat + Yes; !- Use Weather File Snow Indicators !- =========== ALL OBJECTS IN CLASS: RUNPERIODCONTROL:SPECIALDAYS =========== diff --git a/testfiles/AirflowNetworkOccupantVentilationControl.idf b/testfiles/AirflowNetworkOccupantVentilationControl.idf index 76f12835d40..0800331fdd5 100644 --- a/testfiles/AirflowNetworkOccupantVentilationControl.idf +++ b/testfiles/AirflowNetworkOccupantVentilationControl.idf @@ -162,9 +162,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 3, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/AirflowNetwork_Attic_Duct.idf b/testfiles/AirflowNetwork_Attic_Duct.idf index aa0eff558ce..b17f350bd28 100644 --- a/testfiles/AirflowNetwork_Attic_Duct.idf +++ b/testfiles/AirflowNetwork_Attic_Duct.idf @@ -106,8 +106,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiAirLoops.idf b/testfiles/AirflowNetwork_MultiAirLoops.idf index 958c7e02afd..a6a13100b2e 100644 --- a/testfiles/AirflowNetwork_MultiAirLoops.idf +++ b/testfiles/AirflowNetwork_MultiAirLoops.idf @@ -180,8 +180,10 @@ Winter run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -193,8 +195,10 @@ Summer run, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_House.idf b/testfiles/AirflowNetwork_MultiZone_House.idf index 164f2c5fc8e..b3cc1a88189 100644 --- a/testfiles/AirflowNetwork_MultiZone_House.idf +++ b/testfiles/AirflowNetwork_MultiZone_House.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_House_OvercoolDehumid.idf b/testfiles/AirflowNetwork_MultiZone_House_OvercoolDehumid.idf index 1f73efc3681..bcba535b9a9 100644 --- a/testfiles/AirflowNetwork_MultiZone_House_OvercoolDehumid.idf +++ b/testfiles/AirflowNetwork_MultiZone_House_OvercoolDehumid.idf @@ -151,8 +151,10 @@ , !- Name 8, !- Begin Month 16, !- Begin Day of Month + , !- Begin Year 8, !- End Month 19, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_House_TwoSpeed.idf b/testfiles/AirflowNetwork_MultiZone_House_TwoSpeed.idf index aeb38d4f541..363f64ad3f2 100644 --- a/testfiles/AirflowNetwork_MultiZone_House_TwoSpeed.idf +++ b/testfiles/AirflowNetwork_MultiZone_House_TwoSpeed.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -149,8 +151,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_LocalNode.idf b/testfiles/AirflowNetwork_MultiZone_LocalNode.idf index 8964c40d05a..89d5e68af9c 100644 --- a/testfiles/AirflowNetwork_MultiZone_LocalNode.idf +++ b/testfiles/AirflowNetwork_MultiZone_LocalNode.idf @@ -125,8 +125,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_SmallOffice.idf b/testfiles/AirflowNetwork_MultiZone_SmallOffice.idf index e81a3f0310f..7f679a3099c 100644 --- a/testfiles/AirflowNetwork_MultiZone_SmallOffice.idf +++ b/testfiles/AirflowNetwork_MultiZone_SmallOffice.idf @@ -167,8 +167,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -180,8 +182,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_SmallOffice_CoilHXAssistedDX.idf b/testfiles/AirflowNetwork_MultiZone_SmallOffice_CoilHXAssistedDX.idf index b8b6395b208..128cf1f88d0 100644 --- a/testfiles/AirflowNetwork_MultiZone_SmallOffice_CoilHXAssistedDX.idf +++ b/testfiles/AirflowNetwork_MultiZone_SmallOffice_CoilHXAssistedDX.idf @@ -185,8 +185,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -198,8 +200,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_SmallOffice_GenericContam.idf b/testfiles/AirflowNetwork_MultiZone_SmallOffice_GenericContam.idf index f719ad7b9bb..ad0ec356ba9 100644 --- a/testfiles/AirflowNetwork_MultiZone_SmallOffice_GenericContam.idf +++ b/testfiles/AirflowNetwork_MultiZone_SmallOffice_GenericContam.idf @@ -173,8 +173,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -186,8 +188,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_SmallOffice_HeatRecoveryHXSL.idf b/testfiles/AirflowNetwork_MultiZone_SmallOffice_HeatRecoveryHXSL.idf index db9a5e8d8a0..9f038cdbfa2 100644 --- a/testfiles/AirflowNetwork_MultiZone_SmallOffice_HeatRecoveryHXSL.idf +++ b/testfiles/AirflowNetwork_MultiZone_SmallOffice_HeatRecoveryHXSL.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -175,8 +177,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_MultiZone_SmallOffice_VAV.idf b/testfiles/AirflowNetwork_MultiZone_SmallOffice_VAV.idf index fb6d9fa5f1e..c3d34b1a5d0 100644 --- a/testfiles/AirflowNetwork_MultiZone_SmallOffice_VAV.idf +++ b/testfiles/AirflowNetwork_MultiZone_SmallOffice_VAV.idf @@ -174,8 +174,10 @@ Winter run, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -187,8 +189,10 @@ Summer run, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_Multizone_HorizontalOpening.idf b/testfiles/AirflowNetwork_Multizone_HorizontalOpening.idf index 9ac30510b55..a5c3a04c26c 100644 --- a/testfiles/AirflowNetwork_Multizone_HorizontalOpening.idf +++ b/testfiles/AirflowNetwork_Multizone_HorizontalOpening.idf @@ -182,9 +182,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 2, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/AirflowNetwork_PressureControl.idf b/testfiles/AirflowNetwork_PressureControl.idf index fb104482046..4bd07901cab 100644 --- a/testfiles/AirflowNetwork_PressureControl.idf +++ b/testfiles/AirflowNetwork_PressureControl.idf @@ -167,8 +167,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -180,8 +182,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_Simple_House.idf b/testfiles/AirflowNetwork_Simple_House.idf index f314a45395e..788b0d6d590 100644 --- a/testfiles/AirflowNetwork_Simple_House.idf +++ b/testfiles/AirflowNetwork_Simple_House.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -149,8 +151,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/AirflowNetwork_Simple_SmallOffice.idf b/testfiles/AirflowNetwork_Simple_SmallOffice.idf index bdd50e06884..50e9131a219 100644 --- a/testfiles/AirflowNetwork_Simple_SmallOffice.idf +++ b/testfiles/AirflowNetwork_Simple_SmallOffice.idf @@ -165,8 +165,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -178,8 +180,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/BaseBoardElectric.idf b/testfiles/BaseBoardElectric.idf index 83884bd1f84..8cf1088a00a 100644 --- a/testfiles/BaseBoardElectric.idf +++ b/testfiles/BaseBoardElectric.idf @@ -219,8 +219,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -232,8 +234,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/BasicsFiles/AdultEducationCenter.idf b/testfiles/BasicsFiles/AdultEducationCenter.idf index 60d113c7ea0..31e0ff6cc07 100644 --- a/testfiles/BasicsFiles/AdultEducationCenter.idf +++ b/testfiles/BasicsFiles/AdultEducationCenter.idf @@ -129,8 +129,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/BasicsFiles/Exercise1D-Solution.idf b/testfiles/BasicsFiles/Exercise1D-Solution.idf index a68774d9e54..384fbfbcc6f 100644 --- a/testfiles/BasicsFiles/Exercise1D-Solution.idf +++ b/testfiles/BasicsFiles/Exercise1D-Solution.idf @@ -7,15 +7,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Output:Table:SummaryReports, AnnualBuildingUtilityPerformanceSummary, !- Report 1 Name diff --git a/testfiles/BasicsFiles/Exercise2.idf b/testfiles/BasicsFiles/Exercise2.idf index 24cde098c53..0a185eed9ad 100644 --- a/testfiles/BasicsFiles/Exercise2.idf +++ b/testfiles/BasicsFiles/Exercise2.idf @@ -70,15 +70,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CHICAGO_IL_USA TMY2-94846, !- Name diff --git a/testfiles/BasicsFiles/Exercise2A-Solution.idf b/testfiles/BasicsFiles/Exercise2A-Solution.idf index ad0db07963a..081655c235a 100644 --- a/testfiles/BasicsFiles/Exercise2A-Solution.idf +++ b/testfiles/BasicsFiles/Exercise2A-Solution.idf @@ -166,15 +166,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CHICAGO_IL_USA TMY2-94846, !- Name diff --git a/testfiles/BasicsFiles/Exercise2B-Solution.idf b/testfiles/BasicsFiles/Exercise2B-Solution.idf index 6674f0e2714..779925faad8 100644 --- a/testfiles/BasicsFiles/Exercise2B-Solution.idf +++ b/testfiles/BasicsFiles/Exercise2B-Solution.idf @@ -445,15 +445,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CHICAGO_IL_USA TMY2-94846, !- Name diff --git a/testfiles/BasicsFiles/Exercise2C-Solution.idf b/testfiles/BasicsFiles/Exercise2C-Solution.idf index 3b565794ff2..30b9b163f69 100644 --- a/testfiles/BasicsFiles/Exercise2C-Solution.idf +++ b/testfiles/BasicsFiles/Exercise2C-Solution.idf @@ -465,15 +465,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, CHICAGO_IL_USA TMY2-94846, !- Name diff --git a/testfiles/CentralChillerHeaterSystem_Cooling_Heating.idf b/testfiles/CentralChillerHeaterSystem_Cooling_Heating.idf index dce68c366b3..9bbc0964cb1 100644 --- a/testfiles/CentralChillerHeaterSystem_Cooling_Heating.idf +++ b/testfiles/CentralChillerHeaterSystem_Cooling_Heating.idf @@ -270,8 +270,10 @@ , !- Name 1, !- Begin Month 5, !- Begin Day of Month + , !- Begin Year 1, !- End Month 10, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -283,8 +285,10 @@ , !- Name 7, !- Begin Month 5, !- Begin Day of Month + , !- Begin Year 7, !- End Month 10, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CentralChillerHeaterSystem_Simultaneous_Cooling_Heating.idf b/testfiles/CentralChillerHeaterSystem_Simultaneous_Cooling_Heating.idf index db529866b0b..f4221992325 100644 --- a/testfiles/CentralChillerHeaterSystem_Simultaneous_Cooling_Heating.idf +++ b/testfiles/CentralChillerHeaterSystem_Simultaneous_Cooling_Heating.idf @@ -270,8 +270,10 @@ , !- Name 5, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 5, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ChangeoverBypassVAV.idf b/testfiles/ChangeoverBypassVAV.idf index 75ccf7406ae..8464026e5ac 100644 --- a/testfiles/ChangeoverBypassVAV.idf +++ b/testfiles/ChangeoverBypassVAV.idf @@ -221,8 +221,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ChangeoverBypassVAV_AirToAir.idf b/testfiles/ChangeoverBypassVAV_AirToAir.idf index 8c621561fe6..2c71b530bde 100644 --- a/testfiles/ChangeoverBypassVAV_AirToAir.idf +++ b/testfiles/ChangeoverBypassVAV_AirToAir.idf @@ -221,8 +221,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 15, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ChangeoverBypassVAV_AirToAirHeatPump.idf b/testfiles/ChangeoverBypassVAV_AirToAirHeatPump.idf index 88f99c26581..566693facde 100644 --- a/testfiles/ChangeoverBypassVAV_AirToAirHeatPump.idf +++ b/testfiles/ChangeoverBypassVAV_AirToAirHeatPump.idf @@ -221,8 +221,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 15, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ChangeoverBypassVAV_MaxTemp.idf b/testfiles/ChangeoverBypassVAV_MaxTemp.idf index 6d7a89207d4..f344c4c60d9 100644 --- a/testfiles/ChangeoverBypassVAV_MaxTemp.idf +++ b/testfiles/ChangeoverBypassVAV_MaxTemp.idf @@ -223,8 +223,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 15, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ChillerPartLoadCurve_RefBldgLargeOfficeNew2004_Chicago.idf b/testfiles/ChillerPartLoadCurve_RefBldgLargeOfficeNew2004_Chicago.idf index 2f0a879a29c..5d8ed7d11be 100644 --- a/testfiles/ChillerPartLoadCurve_RefBldgLargeOfficeNew2004_Chicago.idf +++ b/testfiles/ChillerPartLoadCurve_RefBldgLargeOfficeNew2004_Chicago.idf @@ -97,15 +97,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/CmplxGlz_Daylighting_SouthVB45deg.idf b/testfiles/CmplxGlz_Daylighting_SouthVB45deg.idf index 84e853f3ec8..6301badb90c 100644 --- a/testfiles/CmplxGlz_Daylighting_SouthVB45deg.idf +++ b/testfiles/CmplxGlz_Daylighting_SouthVB45deg.idf @@ -139,9 +139,11 @@ datarun, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/CmplxGlz_Daylighting_SouthVerticalVB45deg.idf b/testfiles/CmplxGlz_Daylighting_SouthVerticalVB45deg.idf index 19dee88f631..8a79fd12479 100644 --- a/testfiles/CmplxGlz_Daylighting_SouthVerticalVB45deg.idf +++ b/testfiles/CmplxGlz_Daylighting_SouthVerticalVB45deg.idf @@ -139,9 +139,11 @@ datarun, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/CmplxGlz_MeasuredDeflectionAndShading.idf b/testfiles/CmplxGlz_MeasuredDeflectionAndShading.idf index 7c4b22183c3..3ec1eafca54 100644 --- a/testfiles/CmplxGlz_MeasuredDeflectionAndShading.idf +++ b/testfiles/CmplxGlz_MeasuredDeflectionAndShading.idf @@ -140,9 +140,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/CmplxGlz_SchedSurfGains.idf b/testfiles/CmplxGlz_SchedSurfGains.idf index b676db05a18..9909c33a328 100644 --- a/testfiles/CmplxGlz_SchedSurfGains.idf +++ b/testfiles/CmplxGlz_SchedSurfGains.idf @@ -137,9 +137,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/CmplxGlz_SingleZone_Deflection.idf b/testfiles/CmplxGlz_SingleZone_Deflection.idf index c5dfc233682..58b430eca71 100644 --- a/testfiles/CmplxGlz_SingleZone_Deflection.idf +++ b/testfiles/CmplxGlz_SingleZone_Deflection.idf @@ -134,9 +134,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/CmplxGlz_SingleZone_DoubleClearAir.idf b/testfiles/CmplxGlz_SingleZone_DoubleClearAir.idf index 8cae5d7d49f..b07d8706289 100644 --- a/testfiles/CmplxGlz_SingleZone_DoubleClearAir.idf +++ b/testfiles/CmplxGlz_SingleZone_DoubleClearAir.idf @@ -130,9 +130,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/CmplxGlz_SingleZone_Vacuum.idf b/testfiles/CmplxGlz_SingleZone_Vacuum.idf index 06d9df7573d..c6e9c6bfccd 100644 --- a/testfiles/CmplxGlz_SingleZone_Vacuum.idf +++ b/testfiles/CmplxGlz_SingleZone_Vacuum.idf @@ -130,9 +130,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/CmplxGlz_SmOff_IntExtShading.idf b/testfiles/CmplxGlz_SmOff_IntExtShading.idf index 87f33fdfe82..07a1d950082 100644 --- a/testfiles/CmplxGlz_SmOff_IntExtShading.idf +++ b/testfiles/CmplxGlz_SmOff_IntExtShading.idf @@ -105,8 +105,10 @@ , !- Name 10, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 9, !- End Month 30, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoilWaterDesuperheating.idf b/testfiles/CoilWaterDesuperheating.idf index 9b2ec959c71..33aef15245f 100644 --- a/testfiles/CoilWaterDesuperheating.idf +++ b/testfiles/CoilWaterDesuperheating.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -149,8 +151,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CommonPipe_Pri-Sec.idf b/testfiles/CommonPipe_Pri-Sec.idf index 5db0bc60482..8e570f74bfe 100644 --- a/testfiles/CommonPipe_Pri-Sec.idf +++ b/testfiles/CommonPipe_Pri-Sec.idf @@ -164,8 +164,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CompSetPtControl.idf b/testfiles/CompSetPtControl.idf index 102928f7820..e811e15c29e 100644 --- a/testfiles/CompSetPtControl.idf +++ b/testfiles/CompSetPtControl.idf @@ -225,8 +225,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -238,8 +240,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CondFD1ZonePurchAirAutoSizeWithPCM.idf b/testfiles/CondFD1ZonePurchAirAutoSizeWithPCM.idf index 020d6f5aacf..64a288f74d7 100644 --- a/testfiles/CondFD1ZonePurchAirAutoSizeWithPCM.idf +++ b/testfiles/CondFD1ZonePurchAirAutoSizeWithPCM.idf @@ -95,9 +95,11 @@ Jan_1-15, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 15, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -108,9 +110,11 @@ April_1-17, !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 17, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/ConstSpeedBranchPumpExercise.idf b/testfiles/ConstSpeedBranchPumpExercise.idf index 6a2e30a86c8..8e582523c49 100644 --- a/testfiles/ConstSpeedBranchPumpExercise.idf +++ b/testfiles/ConstSpeedBranchPumpExercise.idf @@ -21,15 +21,16 @@ Run Period 1, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 1, !- End Day of Month + , !- End Year Thursday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators Site:Location, USA IL-CHICAGO-OHARE, !- Name diff --git a/testfiles/Convection.idf b/testfiles/Convection.idf index 4b6ec5a223b..0437eccba82 100644 --- a/testfiles/Convection.idf +++ b/testfiles/Convection.idf @@ -111,8 +111,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ConvectionAdaptiveSmallOffice.idf b/testfiles/ConvectionAdaptiveSmallOffice.idf index 854b58a2ab0..418a6e8d496 100644 --- a/testfiles/ConvectionAdaptiveSmallOffice.idf +++ b/testfiles/ConvectionAdaptiveSmallOffice.idf @@ -132,29 +132,31 @@ Jan, !- Name 1, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, Jul, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/CoolingCoilFreezingPrevention.idf b/testfiles/CoolingCoilFreezingPrevention.idf index 19ac9334353..f4c83f180b3 100644 --- a/testfiles/CoolingCoilFreezingPrevention.idf +++ b/testfiles/CoolingCoilFreezingPrevention.idf @@ -133,8 +133,10 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower.idf b/testfiles/CoolingTower.idf index 824b333287f..26856d22a07 100644 --- a/testfiles/CoolingTower.idf +++ b/testfiles/CoolingTower.idf @@ -138,8 +138,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -151,8 +153,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTowerDryBulbRangeOp.idf b/testfiles/CoolingTowerDryBulbRangeOp.idf index f2b3e6770ee..8236977f895 100644 --- a/testfiles/CoolingTowerDryBulbRangeOp.idf +++ b/testfiles/CoolingTowerDryBulbRangeOp.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTowerNomCap.idf b/testfiles/CoolingTowerNomCap.idf index 62fd8644933..97db1ef6981 100644 --- a/testfiles/CoolingTowerNomCap.idf +++ b/testfiles/CoolingTowerNomCap.idf @@ -126,8 +126,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -139,8 +141,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTowerRHRangeOp.idf b/testfiles/CoolingTowerRHRangeOp.idf index a07e6f5fc06..bb3fe7869de 100644 --- a/testfiles/CoolingTowerRHRangeOp.idf +++ b/testfiles/CoolingTowerRHRangeOp.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTowerWetBulbRangeOp.idf b/testfiles/CoolingTowerWetBulbRangeOp.idf index 5e736f26fb6..a8452f58887 100644 --- a/testfiles/CoolingTowerWetBulbRangeOp.idf +++ b/testfiles/CoolingTowerWetBulbRangeOp.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTowerWithDBDeltaTempOp.idf b/testfiles/CoolingTowerWithDBDeltaTempOp.idf index 6f373d45828..33408537854 100644 --- a/testfiles/CoolingTowerWithDBDeltaTempOp.idf +++ b/testfiles/CoolingTowerWithDBDeltaTempOp.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTowerWithWBDeltaTempOp.idf b/testfiles/CoolingTowerWithWBDeltaTempOp.idf index af43e99e1fa..e687291ef45 100644 --- a/testfiles/CoolingTowerWithWBDeltaTempOp.idf +++ b/testfiles/CoolingTowerWithWBDeltaTempOp.idf @@ -124,8 +124,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -137,8 +139,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower_FluidBypass.idf b/testfiles/CoolingTower_FluidBypass.idf index 13bd580ece8..e7bffd13444 100644 --- a/testfiles/CoolingTower_FluidBypass.idf +++ b/testfiles/CoolingTower_FluidBypass.idf @@ -85,15 +85,16 @@ , !- Name 5, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 5, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/CoolingTower_MerkelVariableSpeed.idf b/testfiles/CoolingTower_MerkelVariableSpeed.idf index fb917496b3f..3b7dbd17f8a 100644 --- a/testfiles/CoolingTower_MerkelVariableSpeed.idf +++ b/testfiles/CoolingTower_MerkelVariableSpeed.idf @@ -57,15 +57,16 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/CoolingTower_SingleSpeed_MultiCell.idf b/testfiles/CoolingTower_SingleSpeed_MultiCell.idf index b19e04620d6..4c92c7087ab 100644 --- a/testfiles/CoolingTower_SingleSpeed_MultiCell.idf +++ b/testfiles/CoolingTower_SingleSpeed_MultiCell.idf @@ -85,15 +85,16 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 5, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/CoolingTower_TwoSpeed.idf b/testfiles/CoolingTower_TwoSpeed.idf index dbe9132f6bc..24c7c2258f9 100644 --- a/testfiles/CoolingTower_TwoSpeed.idf +++ b/testfiles/CoolingTower_TwoSpeed.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -143,8 +145,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower_TwoSpeed_CondEntTempReset.idf b/testfiles/CoolingTower_TwoSpeed_CondEntTempReset.idf index f43f7d3a145..c9e2da2c177 100644 --- a/testfiles/CoolingTower_TwoSpeed_CondEntTempReset.idf +++ b/testfiles/CoolingTower_TwoSpeed_CondEntTempReset.idf @@ -131,8 +131,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -144,8 +146,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower_TwoSpeed_MultiCell.idf b/testfiles/CoolingTower_TwoSpeed_MultiCell.idf index 62ee1ae3b65..9520be6bf97 100644 --- a/testfiles/CoolingTower_TwoSpeed_MultiCell.idf +++ b/testfiles/CoolingTower_TwoSpeed_MultiCell.idf @@ -85,15 +85,16 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 5, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/CoolingTower_VariableSpeed.idf b/testfiles/CoolingTower_VariableSpeed.idf index ffa33478514..9ecb11ca722 100644 --- a/testfiles/CoolingTower_VariableSpeed.idf +++ b/testfiles/CoolingTower_VariableSpeed.idf @@ -186,8 +186,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -199,8 +201,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower_VariableSpeed_CondEntTempReset.idf b/testfiles/CoolingTower_VariableSpeed_CondEntTempReset.idf index 2173d276d86..513e9cf9356 100644 --- a/testfiles/CoolingTower_VariableSpeed_CondEntTempReset.idf +++ b/testfiles/CoolingTower_VariableSpeed_CondEntTempReset.idf @@ -188,8 +188,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -201,8 +203,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower_VariableSpeed_CondEntTempReset_MultipleTowers.idf b/testfiles/CoolingTower_VariableSpeed_CondEntTempReset_MultipleTowers.idf index d8b2c8501ab..e5e17d643ca 100644 --- a/testfiles/CoolingTower_VariableSpeed_CondEntTempReset_MultipleTowers.idf +++ b/testfiles/CoolingTower_VariableSpeed_CondEntTempReset_MultipleTowers.idf @@ -188,8 +188,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -201,8 +203,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower_VariableSpeed_IdealCondEntTempSetpoint.idf b/testfiles/CoolingTower_VariableSpeed_IdealCondEntTempSetpoint.idf index 0c5efe0c290..71c2451b202 100644 --- a/testfiles/CoolingTower_VariableSpeed_IdealCondEntTempSetpoint.idf +++ b/testfiles/CoolingTower_VariableSpeed_IdealCondEntTempSetpoint.idf @@ -193,8 +193,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -206,8 +208,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower_VariableSpeed_IdealCondEntTempSetpoint_MultipleTowers.idf b/testfiles/CoolingTower_VariableSpeed_IdealCondEntTempSetpoint_MultipleTowers.idf index 3384639b295..4e16b621674 100644 --- a/testfiles/CoolingTower_VariableSpeed_IdealCondEntTempSetpoint_MultipleTowers.idf +++ b/testfiles/CoolingTower_VariableSpeed_IdealCondEntTempSetpoint_MultipleTowers.idf @@ -188,8 +188,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CoolingTower_VariableSpeed_MultiCell.idf b/testfiles/CoolingTower_VariableSpeed_MultiCell.idf index 0b00ed1f827..b60ed60f18c 100644 --- a/testfiles/CoolingTower_VariableSpeed_MultiCell.idf +++ b/testfiles/CoolingTower_VariableSpeed_MultiCell.idf @@ -85,15 +85,16 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 5, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/CooltowerSimpleTest.idf b/testfiles/CooltowerSimpleTest.idf index a41dba79b2e..dd9ab39646d 100644 --- a/testfiles/CooltowerSimpleTest.idf +++ b/testfiles/CooltowerSimpleTest.idf @@ -102,8 +102,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CooltowerSimpleTestwithVentilation.idf b/testfiles/CooltowerSimpleTestwithVentilation.idf index a231034f6e8..a8f79f84300 100644 --- a/testfiles/CooltowerSimpleTestwithVentilation.idf +++ b/testfiles/CooltowerSimpleTestwithVentilation.idf @@ -102,8 +102,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/CrossVent_1Zone_AirflowNetwork.idf b/testfiles/CrossVent_1Zone_AirflowNetwork.idf index febeb9d48d8..ccb8a940f0a 100644 --- a/testfiles/CrossVent_1Zone_AirflowNetwork.idf +++ b/testfiles/CrossVent_1Zone_AirflowNetwork.idf @@ -94,29 +94,31 @@ , !- Name 8, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 8, !- End Month 17, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period , !- Apply Weekend Holiday Rule , !- Use Weather File Rain Indicators - , !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + ; !- Use Weather File Snow Indicators RunPeriod, , !- Name 1, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 1, !- End Month 17, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period , !- Apply Weekend Holiday Rule , !- Use Weather File Rain Indicators - , !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + ; !- Use Weather File Snow Indicators Site:Location, SAN_FRANCISCO_CA_USA_WMO_724940, !- Name diff --git a/testfiles/CrossVent_1Zone_AirflowNetwork_with2CrossflowJets.idf b/testfiles/CrossVent_1Zone_AirflowNetwork_with2CrossflowJets.idf index b1bfda9526a..e2b6167fb51 100644 --- a/testfiles/CrossVent_1Zone_AirflowNetwork_with2CrossflowJets.idf +++ b/testfiles/CrossVent_1Zone_AirflowNetwork_with2CrossflowJets.idf @@ -94,29 +94,31 @@ , !- Name 8, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 8, !- End Month 17, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period , !- Apply Weekend Holiday Rule , !- Use Weather File Rain Indicators - , !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + ; !- Use Weather File Snow Indicators RunPeriod, , !- Name 1, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 1, !- End Month 17, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period , !- Apply Weekend Holiday Rule , !- Use Weather File Rain Indicators - , !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + ; !- Use Weather File Snow Indicators Site:Location, SAN_FRANCISCO_CA_USA_WMO_724940, !- Name diff --git a/testfiles/CustomSolarVisibleSpectrum_RefBldgSmallOfficeNew2004_Chicago.idf b/testfiles/CustomSolarVisibleSpectrum_RefBldgSmallOfficeNew2004_Chicago.idf index 83b431002ce..f9937746728 100644 --- a/testfiles/CustomSolarVisibleSpectrum_RefBldgSmallOfficeNew2004_Chicago.idf +++ b/testfiles/CustomSolarVisibleSpectrum_RefBldgSmallOfficeNew2004_Chicago.idf @@ -90,15 +90,16 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/DDAutoSize.idf b/testfiles/DDAutoSize.idf index b8a854edfde..007fb195798 100644 --- a/testfiles/DDAutoSize.idf +++ b/testfiles/DDAutoSize.idf @@ -129,8 +129,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -142,8 +144,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DElight-Detailed-Comparison.idf b/testfiles/DElight-Detailed-Comparison.idf index 435dcf49f66..891e15075fb 100644 --- a/testfiles/DElight-Detailed-Comparison.idf +++ b/testfiles/DElight-Detailed-Comparison.idf @@ -24,8 +24,10 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period diff --git a/testfiles/DElightCFSLightShelf.idf b/testfiles/DElightCFSLightShelf.idf index 1ece443b9cc..74cc63aa7ee 100644 --- a/testfiles/DElightCFSLightShelf.idf +++ b/testfiles/DElightCFSLightShelf.idf @@ -25,8 +25,10 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period diff --git a/testfiles/DElightCFSWindow.idf b/testfiles/DElightCFSWindow.idf index 66598aa172b..cf33da6fb87 100644 --- a/testfiles/DElightCFSWindow.idf +++ b/testfiles/DElightCFSWindow.idf @@ -25,8 +25,10 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period diff --git a/testfiles/DOASDXCOIL_wADPBFMethod.idf b/testfiles/DOASDXCOIL_wADPBFMethod.idf index 5ca58a6da78..81541c4e4d0 100644 --- a/testfiles/DOASDXCOIL_wADPBFMethod.idf +++ b/testfiles/DOASDXCOIL_wADPBFMethod.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -175,8 +177,10 @@ , !- Name 7, !- Begin Month 16, !- Begin Day of Month + , !- Begin Year 7, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DOASDXCOIL_wADPBFMethod_NoReturnPath.idf b/testfiles/DOASDXCOIL_wADPBFMethod_NoReturnPath.idf index 3be73c271ce..cf18a96777c 100644 --- a/testfiles/DOASDXCOIL_wADPBFMethod_NoReturnPath.idf +++ b/testfiles/DOASDXCOIL_wADPBFMethod_NoReturnPath.idf @@ -164,8 +164,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -177,8 +179,10 @@ , !- Name 7, !- Begin Month 16, !- Begin Day of Month + , !- Begin Year 7, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DOASDualDuctSchool.idf b/testfiles/DOASDualDuctSchool.idf index 9cbbc76354b..bbec0e4b235 100644 --- a/testfiles/DOASDualDuctSchool.idf +++ b/testfiles/DOASDualDuctSchool.idf @@ -90,29 +90,31 @@ Jan, !- Name 1, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 1, !- End Month 8, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, Jul, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 8, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/DOAToFanCoilInlet.idf b/testfiles/DOAToFanCoilInlet.idf index 9bdf935d734..bea6bee997b 100644 --- a/testfiles/DOAToFanCoilInlet.idf +++ b/testfiles/DOAToFanCoilInlet.idf @@ -214,8 +214,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -227,8 +229,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DOAToFanCoilSupply.idf b/testfiles/DOAToFanCoilSupply.idf index ac2f0c3abf9..fb026b46e66 100644 --- a/testfiles/DOAToFanCoilSupply.idf +++ b/testfiles/DOAToFanCoilSupply.idf @@ -214,8 +214,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -227,8 +229,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DOAToPTAC.idf b/testfiles/DOAToPTAC.idf index 4fcfb587eb6..4d741ba7c19 100644 --- a/testfiles/DOAToPTAC.idf +++ b/testfiles/DOAToPTAC.idf @@ -227,29 +227,31 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators !- =========== ALL OBJECTS IN CLASS: SITE:GROUNDTEMPERATURE:BUILDINGSURFACE =========== diff --git a/testfiles/DOAToPTHP.idf b/testfiles/DOAToPTHP.idf index 56c9a003110..029a8673278 100644 --- a/testfiles/DOAToPTHP.idf +++ b/testfiles/DOAToPTHP.idf @@ -233,29 +233,31 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators !- =========== ALL OBJECTS IN CLASS: SITE:GROUNDTEMPERATURE:BUILDINGSURFACE =========== diff --git a/testfiles/DOAToUnitVentilator.idf b/testfiles/DOAToUnitVentilator.idf index 3cf73ddc71c..277de712756 100644 --- a/testfiles/DOAToUnitVentilator.idf +++ b/testfiles/DOAToUnitVentilator.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -149,8 +151,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DOAToUnitarySystem.idf b/testfiles/DOAToUnitarySystem.idf index 13e8d43445c..9ac80834de4 100644 --- a/testfiles/DOAToUnitarySystem.idf +++ b/testfiles/DOAToUnitarySystem.idf @@ -234,29 +234,31 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators !- =========== ALL OBJECTS IN CLASS: SITE:GROUNDTEMPERATURE:BUILDINGSURFACE =========== diff --git a/testfiles/DOAToVRF.idf b/testfiles/DOAToVRF.idf index 707f6a06cea..d8dc9b23318 100644 --- a/testfiles/DOAToVRF.idf +++ b/testfiles/DOAToVRF.idf @@ -942,8 +942,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 4, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -955,8 +957,10 @@ , !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 4, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DOAToWaterToAirHPInlet.idf b/testfiles/DOAToWaterToAirHPInlet.idf index feffcddca73..791ab7219e6 100644 --- a/testfiles/DOAToWaterToAirHPInlet.idf +++ b/testfiles/DOAToWaterToAirHPInlet.idf @@ -218,29 +218,31 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators !- =========== ALL OBJECTS IN CLASS: SITE:GROUNDTEMPERATURE:BUILDINGSURFACE =========== diff --git a/testfiles/DOAToWaterToAirHPSupply.idf b/testfiles/DOAToWaterToAirHPSupply.idf index a0787e01ea3..49784e2f353 100644 --- a/testfiles/DOAToWaterToAirHPSupply.idf +++ b/testfiles/DOAToWaterToAirHPSupply.idf @@ -218,29 +218,31 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators !- =========== ALL OBJECTS IN CLASS: SITE:GROUNDTEMPERATURE:BUILDINGSURFACE =========== diff --git a/testfiles/DXCoilSystemAuto.idf b/testfiles/DXCoilSystemAuto.idf index b1f8e8c2302..8583c0c314d 100644 --- a/testfiles/DXCoilSystemAuto.idf +++ b/testfiles/DXCoilSystemAuto.idf @@ -131,8 +131,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -144,8 +146,10 @@ July7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DaylightingDeviceShelf.idf b/testfiles/DaylightingDeviceShelf.idf index d3ab1d55684..5a114ff7687 100644 --- a/testfiles/DaylightingDeviceShelf.idf +++ b/testfiles/DaylightingDeviceShelf.idf @@ -114,8 +114,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DaylightingDeviceTubular.idf b/testfiles/DaylightingDeviceTubular.idf index e386f1e69d7..cfb946915b1 100644 --- a/testfiles/DaylightingDeviceTubular.idf +++ b/testfiles/DaylightingDeviceTubular.idf @@ -115,8 +115,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DesiccantCVRh.idf b/testfiles/DesiccantCVRh.idf index 4378025a806..f1827cede32 100644 --- a/testfiles/DesiccantCVRh.idf +++ b/testfiles/DesiccantCVRh.idf @@ -129,8 +129,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -142,8 +144,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DesiccantCVRhZoneRHCtrl.idf b/testfiles/DesiccantCVRhZoneRHCtrl.idf index b356d5fe927..7bf2fa791da 100644 --- a/testfiles/DesiccantCVRhZoneRHCtrl.idf +++ b/testfiles/DesiccantCVRhZoneRHCtrl.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -150,8 +152,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DesiccantCVRhZoneRHCtrl_AddedAutosize.idf b/testfiles/DesiccantCVRhZoneRHCtrl_AddedAutosize.idf index eb64130ec66..88eaac814c8 100644 --- a/testfiles/DesiccantCVRhZoneRHCtrl_AddedAutosize.idf +++ b/testfiles/DesiccantCVRhZoneRHCtrl_AddedAutosize.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -150,8 +152,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DesiccantDehumidifierWithAirToAirCoil.idf b/testfiles/DesiccantDehumidifierWithAirToAirCoil.idf index 75a73b49835..ab82b8dc630 100644 --- a/testfiles/DesiccantDehumidifierWithAirToAirCoil.idf +++ b/testfiles/DesiccantDehumidifierWithAirToAirCoil.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DesiccantDehumidifierWithCompanionCoil.idf b/testfiles/DesiccantDehumidifierWithCompanionCoil.idf index f66ed207226..52c6f1a0f3d 100644 --- a/testfiles/DesiccantDehumidifierWithCompanionCoil.idf +++ b/testfiles/DesiccantDehumidifierWithCompanionCoil.idf @@ -135,8 +135,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 5, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DirectIndirectEvapCoolers.idf b/testfiles/DirectIndirectEvapCoolers.idf index dc9ed5bd714..41762b0ffc8 100644 --- a/testfiles/DirectIndirectEvapCoolers.idf +++ b/testfiles/DirectIndirectEvapCoolers.idf @@ -113,9 +113,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -128,9 +130,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/DirectIndirectEvapCoolersVSAS.idf b/testfiles/DirectIndirectEvapCoolersVSAS.idf index 37b56f7820c..3cb6e7e5dd6 100644 --- a/testfiles/DirectIndirectEvapCoolersVSAS.idf +++ b/testfiles/DirectIndirectEvapCoolersVSAS.idf @@ -688,9 +688,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -703,9 +705,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/DisplacementVent_1ZoneOffice.idf b/testfiles/DisplacementVent_1ZoneOffice.idf index bd79c8fc040..d6e3faf7607 100644 --- a/testfiles/DisplacementVent_1ZoneOffice.idf +++ b/testfiles/DisplacementVent_1ZoneOffice.idf @@ -111,8 +111,10 @@ annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DisplacementVent_Nat_AirflowNetwork.idf b/testfiles/DisplacementVent_Nat_AirflowNetwork.idf index 56eba0be298..75a46d0e966 100644 --- a/testfiles/DisplacementVent_Nat_AirflowNetwork.idf +++ b/testfiles/DisplacementVent_Nat_AirflowNetwork.idf @@ -107,9 +107,11 @@ , !- Name 7, !- Begin Month 28, !- Begin Day of Month + , !- Begin Year 7, !- End Month 29, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/DisplacementVent_Nat_AirflowNetwork_AdaptiveComfort.idf b/testfiles/DisplacementVent_Nat_AirflowNetwork_AdaptiveComfort.idf index e5014495798..256007078ae 100644 --- a/testfiles/DisplacementVent_Nat_AirflowNetwork_AdaptiveComfort.idf +++ b/testfiles/DisplacementVent_Nat_AirflowNetwork_AdaptiveComfort.idf @@ -109,9 +109,11 @@ , !- Name 5, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 9, !- End Month 30, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/DisplacementVent_VAV.idf b/testfiles/DisplacementVent_VAV.idf index 0035f279ed2..4d54e1a0a6c 100644 --- a/testfiles/DisplacementVent_VAV.idf +++ b/testfiles/DisplacementVent_VAV.idf @@ -100,9 +100,11 @@ , !- Name 6, !- Begin Month 29, !- Begin Day of Month + , !- Begin Year 7, !- End Month 1, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/DualDuctConstVolDamper.idf b/testfiles/DualDuctConstVolDamper.idf index fac22da63df..f4cbf43884f 100644 --- a/testfiles/DualDuctConstVolDamper.idf +++ b/testfiles/DualDuctConstVolDamper.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -149,8 +151,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DualDuctConstVolGasHC.idf b/testfiles/DualDuctConstVolGasHC.idf index 814c682bb9e..bc9d3588946 100644 --- a/testfiles/DualDuctConstVolGasHC.idf +++ b/testfiles/DualDuctConstVolGasHC.idf @@ -135,8 +135,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -148,8 +150,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DualDuctVarVolDamper.idf b/testfiles/DualDuctVarVolDamper.idf index ebfef839f90..c562cd81548 100644 --- a/testfiles/DualDuctVarVolDamper.idf +++ b/testfiles/DualDuctVarVolDamper.idf @@ -144,8 +144,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -157,8 +159,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DualDuctWaterCoils.idf b/testfiles/DualDuctWaterCoils.idf index 6c31d489f16..27f2622fbb1 100644 --- a/testfiles/DualDuctWaterCoils.idf +++ b/testfiles/DualDuctWaterCoils.idf @@ -221,8 +221,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -234,8 +236,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/DynamicClothing.idf b/testfiles/DynamicClothing.idf index 74326f028ff..0dcb5666f0a 100644 --- a/testfiles/DynamicClothing.idf +++ b/testfiles/DynamicClothing.idf @@ -220,8 +220,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EMPD5ZoneWaterCooled_HighRHControl.idf b/testfiles/EMPD5ZoneWaterCooled_HighRHControl.idf index 966729c8258..591fe2c20d6 100644 --- a/testfiles/EMPD5ZoneWaterCooled_HighRHControl.idf +++ b/testfiles/EMPD5ZoneWaterCooled_HighRHControl.idf @@ -169,8 +169,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -182,8 +184,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EMSAirflowNetworkOpeningControlByHumidity.idf b/testfiles/EMSAirflowNetworkOpeningControlByHumidity.idf index f6281e6fc04..54ec6004416 100644 --- a/testfiles/EMSAirflowNetworkOpeningControlByHumidity.idf +++ b/testfiles/EMSAirflowNetworkOpeningControlByHumidity.idf @@ -159,8 +159,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EMSConstantVolumePurchasedAir.idf b/testfiles/EMSConstantVolumePurchasedAir.idf index 0fb24edefa9..f6fee883808 100644 --- a/testfiles/EMSConstantVolumePurchasedAir.idf +++ b/testfiles/EMSConstantVolumePurchasedAir.idf @@ -135,8 +135,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EMSCurveOverride_PackagedTerminalHeatPump.idf b/testfiles/EMSCurveOverride_PackagedTerminalHeatPump.idf index b5082fc8d97..ca6cacce257 100644 --- a/testfiles/EMSCurveOverride_PackagedTerminalHeatPump.idf +++ b/testfiles/EMSCurveOverride_PackagedTerminalHeatPump.idf @@ -375,8 +375,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -388,8 +390,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EMSCustomOutputVariable.idf b/testfiles/EMSCustomOutputVariable.idf index 52ea47dfffe..fb809127518 100644 --- a/testfiles/EMSCustomOutputVariable.idf +++ b/testfiles/EMSCustomOutputVariable.idf @@ -80,15 +80,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/EMSCustomSchedule.idf b/testfiles/EMSCustomSchedule.idf index 33b4b352a59..db45f54c365 100644 --- a/testfiles/EMSCustomSchedule.idf +++ b/testfiles/EMSCustomSchedule.idf @@ -80,15 +80,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/EMSDemandManager_LargeOffice.idf b/testfiles/EMSDemandManager_LargeOffice.idf index b6b53fe6989..a34f9b61eb6 100644 --- a/testfiles/EMSDemandManager_LargeOffice.idf +++ b/testfiles/EMSDemandManager_LargeOffice.idf @@ -74,15 +74,16 @@ , !- Name 5, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 5, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/EMSDiscreteAirSystemSizes.idf b/testfiles/EMSDiscreteAirSystemSizes.idf index 8c3e825f4d2..a58ea8964a3 100644 --- a/testfiles/EMSDiscreteAirSystemSizes.idf +++ b/testfiles/EMSDiscreteAirSystemSizes.idf @@ -82,15 +82,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/EMSPlantLoopOverrideControl.idf b/testfiles/EMSPlantLoopOverrideControl.idf index 7aee97872bb..faeec6e8c87 100644 --- a/testfiles/EMSPlantLoopOverrideControl.idf +++ b/testfiles/EMSPlantLoopOverrideControl.idf @@ -96,8 +96,10 @@ first part of Feb, !- Name 2, !- Begin Month 3, !- Begin Day of Month + , !- Begin Year 2, !- End Month 17, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EMSPlantOperation_largeOff.idf b/testfiles/EMSPlantOperation_largeOff.idf index 07eeed3de2d..1980668f414 100644 --- a/testfiles/EMSPlantOperation_largeOff.idf +++ b/testfiles/EMSPlantOperation_largeOff.idf @@ -57,15 +57,16 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/EMSReplaceTraditionalManagers_LargeOffice.idf b/testfiles/EMSReplaceTraditionalManagers_LargeOffice.idf index b78083b02c7..7d655b6b375 100644 --- a/testfiles/EMSReplaceTraditionalManagers_LargeOffice.idf +++ b/testfiles/EMSReplaceTraditionalManagers_LargeOffice.idf @@ -83,15 +83,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/EMSTestMathAndKill.idf b/testfiles/EMSTestMathAndKill.idf index 376e4c1115c..b652f5953fe 100644 --- a/testfiles/EMSTestMathAndKill.idf +++ b/testfiles/EMSTestMathAndKill.idf @@ -83,15 +83,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/EMSThermochromicWindow.idf b/testfiles/EMSThermochromicWindow.idf index 6c6ea0ab3d1..2047241a4e9 100644 --- a/testfiles/EMSThermochromicWindow.idf +++ b/testfiles/EMSThermochromicWindow.idf @@ -92,15 +92,16 @@ July, !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/EMSUserDefined5ZoneAirCooled.idf b/testfiles/EMSUserDefined5ZoneAirCooled.idf index 54328db27d7..3735d95c5eb 100644 --- a/testfiles/EMSUserDefined5ZoneAirCooled.idf +++ b/testfiles/EMSUserDefined5ZoneAirCooled.idf @@ -164,8 +164,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -177,8 +179,10 @@ Jul7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EMSUserDefinedWindACAuto.idf b/testfiles/EMSUserDefinedWindACAuto.idf index a7bcfa75fb9..f9a59c20493 100644 --- a/testfiles/EMSUserDefinedWindACAuto.idf +++ b/testfiles/EMSUserDefinedWindACAuto.idf @@ -116,8 +116,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -129,8 +131,10 @@ Jul7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EMSWindowShadeControl.idf b/testfiles/EMSWindowShadeControl.idf index e8a1328cadb..88a6f5d5538 100644 --- a/testfiles/EMSWindowShadeControl.idf +++ b/testfiles/EMSWindowShadeControl.idf @@ -127,8 +127,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EarthTubeSimpleTest.idf b/testfiles/EarthTubeSimpleTest.idf index c592872184a..340d49e25ad 100644 --- a/testfiles/EarthTubeSimpleTest.idf +++ b/testfiles/EarthTubeSimpleTest.idf @@ -51,8 +51,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EcoroofOrlando.idf b/testfiles/EcoroofOrlando.idf index 41b468f90e1..14d4203a8a4 100644 --- a/testfiles/EcoroofOrlando.idf +++ b/testfiles/EcoroofOrlando.idf @@ -94,8 +94,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ElectricChiller.idf b/testfiles/ElectricChiller.idf index 935eb949df4..a440068a2a6 100644 --- a/testfiles/ElectricChiller.idf +++ b/testfiles/ElectricChiller.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -150,8 +152,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ElectricEIRChiller.idf b/testfiles/ElectricEIRChiller.idf index f8141fb402c..31f57b6739f 100644 --- a/testfiles/ElectricEIRChiller.idf +++ b/testfiles/ElectricEIRChiller.idf @@ -125,8 +125,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -138,8 +140,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ElectricEIRChillerHeatRecoveryAuto.idf b/testfiles/ElectricEIRChillerHeatRecoveryAuto.idf index e3bb6024920..f5927659743 100644 --- a/testfiles/ElectricEIRChillerHeatRecoveryAuto.idf +++ b/testfiles/ElectricEIRChillerHeatRecoveryAuto.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -143,8 +145,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EngineChiller.idf b/testfiles/EngineChiller.idf index 47e57401390..8aa2a4259f1 100644 --- a/testfiles/EngineChiller.idf +++ b/testfiles/EngineChiller.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EquivalentLayerWindow.idf b/testfiles/EquivalentLayerWindow.idf index 4416e9810ad..09321d766b9 100644 --- a/testfiles/EquivalentLayerWindow.idf +++ b/testfiles/EquivalentLayerWindow.idf @@ -123,8 +123,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EvaporativeFluidCooler.idf b/testfiles/EvaporativeFluidCooler.idf index a542407c7fd..171282e15ab 100644 --- a/testfiles/EvaporativeFluidCooler.idf +++ b/testfiles/EvaporativeFluidCooler.idf @@ -123,8 +123,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -136,8 +138,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/EvaporativeFluidCooler_TwoSpeed.idf b/testfiles/EvaporativeFluidCooler_TwoSpeed.idf index e9edfe187e9..9cefa4d6843 100644 --- a/testfiles/EvaporativeFluidCooler_TwoSpeed.idf +++ b/testfiles/EvaporativeFluidCooler_TwoSpeed.idf @@ -123,8 +123,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -136,8 +138,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ExhFiredAbsorptionChiller.idf b/testfiles/ExhFiredAbsorptionChiller.idf index 1da0b8a6e9d..570c36ced94 100644 --- a/testfiles/ExhFiredAbsorptionChiller.idf +++ b/testfiles/ExhFiredAbsorptionChiller.idf @@ -133,15 +133,16 @@ Run Period1, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! RunPeriod, ! Run Period2, !- Name diff --git a/testfiles/ExteriorLightsAndEq.idf b/testfiles/ExteriorLightsAndEq.idf index de018f2b29a..e8b9e1dc192 100644 --- a/testfiles/ExteriorLightsAndEq.idf +++ b/testfiles/ExteriorLightsAndEq.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FanCoilAutoSize.idf b/testfiles/FanCoilAutoSize.idf index 0debf3c43d3..33b3141635b 100644 --- a/testfiles/FanCoilAutoSize.idf +++ b/testfiles/FanCoilAutoSize.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -132,8 +134,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FanCoilAutoSizeScalableSizing.idf b/testfiles/FanCoilAutoSizeScalableSizing.idf index eee8be50e7b..5d72d07b31b 100644 --- a/testfiles/FanCoilAutoSizeScalableSizing.idf +++ b/testfiles/FanCoilAutoSizeScalableSizing.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -132,8 +134,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FanCoilAutoSize_MultiSpeedFan.idf b/testfiles/FanCoilAutoSize_MultiSpeedFan.idf index b4eee891b9d..c907f337912 100644 --- a/testfiles/FanCoilAutoSize_MultiSpeedFan.idf +++ b/testfiles/FanCoilAutoSize_MultiSpeedFan.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -132,8 +134,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FanCoil_HybridVent_VentSch.idf b/testfiles/FanCoil_HybridVent_VentSch.idf index bc01379ae28..35804099834 100644 --- a/testfiles/FanCoil_HybridVent_VentSch.idf +++ b/testfiles/FanCoil_HybridVent_VentSch.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -132,8 +134,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Fault_ChillerSWTSensorOffset_RefBldgLargeOfficeNew2004.idf b/testfiles/Fault_ChillerSWTSensorOffset_RefBldgLargeOfficeNew2004.idf index 7f03aa72d56..dbac67ed7c3 100644 --- a/testfiles/Fault_ChillerSWTSensorOffset_RefBldgLargeOfficeNew2004.idf +++ b/testfiles/Fault_ChillerSWTSensorOffset_RefBldgLargeOfficeNew2004.idf @@ -96,15 +96,16 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/Fault_CoilSATSensorOffset.idf b/testfiles/Fault_CoilSATSensorOffset.idf index 0bea59e0c6c..f764b06a0eb 100644 --- a/testfiles/Fault_CoilSATSensorOffset.idf +++ b/testfiles/Fault_CoilSATSensorOffset.idf @@ -169,8 +169,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -182,8 +184,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Fault_CondenserSWTSensorOffset.idf b/testfiles/Fault_CondenserSWTSensorOffset.idf index b97b7fa0fe6..2763f58a327 100644 --- a/testfiles/Fault_CondenserSWTSensorOffset.idf +++ b/testfiles/Fault_CondenserSWTSensorOffset.idf @@ -136,8 +136,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Fault_FoulingAirFilter_RefBldgMediumOfficeNew2004.idf b/testfiles/Fault_FoulingAirFilter_RefBldgMediumOfficeNew2004.idf index 34ee6f9e998..dfa69531e5b 100644 --- a/testfiles/Fault_FoulingAirFilter_RefBldgMediumOfficeNew2004.idf +++ b/testfiles/Fault_FoulingAirFilter_RefBldgMediumOfficeNew2004.idf @@ -94,15 +94,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/Fault_FoulingChillerBoiler_RefBldgLargeOfficeNew2004.idf b/testfiles/Fault_FoulingChillerBoiler_RefBldgLargeOfficeNew2004.idf index bec6d60eb7b..9049f2d83b9 100644 --- a/testfiles/Fault_FoulingChillerBoiler_RefBldgLargeOfficeNew2004.idf +++ b/testfiles/Fault_FoulingChillerBoiler_RefBldgLargeOfficeNew2004.idf @@ -96,29 +96,31 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/Fault_FoulingCoolingTower.idf b/testfiles/Fault_FoulingCoolingTower.idf index e1464dc8c20..805e43f3973 100644 --- a/testfiles/Fault_FoulingCoolingTower.idf +++ b/testfiles/Fault_FoulingCoolingTower.idf @@ -144,8 +144,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Fault_FoulingEvapCooler_StripMallZoneEvapCooler.idf b/testfiles/Fault_FoulingEvapCooler_StripMallZoneEvapCooler.idf index 4053574e320..d157e4a008c 100644 --- a/testfiles/Fault_FoulingEvapCooler_StripMallZoneEvapCooler.idf +++ b/testfiles/Fault_FoulingEvapCooler_StripMallZoneEvapCooler.idf @@ -76,15 +76,16 @@ Annual, !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Monday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/Fault_HumidistatOffset_Supermarket.idf b/testfiles/Fault_HumidistatOffset_Supermarket.idf index cdf550147cd..f5552331a0b 100644 --- a/testfiles/Fault_HumidistatOffset_Supermarket.idf +++ b/testfiles/Fault_HumidistatOffset_Supermarket.idf @@ -245,8 +245,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Fault_HumidistatOffset_ThermostatOffset_Supermarket.idf b/testfiles/Fault_HumidistatOffset_ThermostatOffset_Supermarket.idf index 37b7dea8f2f..028ab1ddc33 100644 --- a/testfiles/Fault_HumidistatOffset_ThermostatOffset_Supermarket.idf +++ b/testfiles/Fault_HumidistatOffset_ThermostatOffset_Supermarket.idf @@ -245,8 +245,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Fault_ThermostatOffset_RefBldgMediumOfficeNew2004.idf b/testfiles/Fault_ThermostatOffset_RefBldgMediumOfficeNew2004.idf index 32216aed74a..226200c0177 100644 --- a/testfiles/Fault_ThermostatOffset_RefBldgMediumOfficeNew2004.idf +++ b/testfiles/Fault_ThermostatOffset_RefBldgMediumOfficeNew2004.idf @@ -94,15 +94,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/Flr_Rf_8Sides.idf b/testfiles/Flr_Rf_8Sides.idf index 35395235dcb..485b649eddc 100644 --- a/testfiles/Flr_Rf_8Sides.idf +++ b/testfiles/Flr_Rf_8Sides.idf @@ -120,9 +120,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/FluidCooler.idf b/testfiles/FluidCooler.idf index e8a03124116..5cab989f3e4 100644 --- a/testfiles/FluidCooler.idf +++ b/testfiles/FluidCooler.idf @@ -124,8 +124,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -137,8 +139,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FluidCoolerTwoSpeed.idf b/testfiles/FluidCoolerTwoSpeed.idf index fc8ea8c433e..b5c23b4b43e 100644 --- a/testfiles/FluidCoolerTwoSpeed.idf +++ b/testfiles/FluidCoolerTwoSpeed.idf @@ -132,8 +132,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -145,8 +147,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FourPipeBeamLargeOffice.idf b/testfiles/FourPipeBeamLargeOffice.idf index 6249b42b73d..3aaf0ad6952 100644 --- a/testfiles/FourPipeBeamLargeOffice.idf +++ b/testfiles/FourPipeBeamLargeOffice.idf @@ -64,15 +64,16 @@ annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/FreeCoolingChiller.idf b/testfiles/FreeCoolingChiller.idf index 20d0237204e..402e3b8774a 100644 --- a/testfiles/FreeCoolingChiller.idf +++ b/testfiles/FreeCoolingChiller.idf @@ -147,8 +147,10 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 15, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Furnace.idf b/testfiles/Furnace.idf index b62fff4df52..690b7f1f57e 100644 --- a/testfiles/Furnace.idf +++ b/testfiles/Furnace.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FurnaceFuelOil.idf b/testfiles/FurnaceFuelOil.idf index d63d0f5b0ee..14b37eb2fb2 100644 --- a/testfiles/FurnaceFuelOil.idf +++ b/testfiles/FurnaceFuelOil.idf @@ -131,8 +131,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FurnacePLRHeatingCoil.idf b/testfiles/FurnacePLRHeatingCoil.idf index 9a90b426dc3..f62c4a67e3c 100644 --- a/testfiles/FurnacePLRHeatingCoil.idf +++ b/testfiles/FurnacePLRHeatingCoil.idf @@ -131,8 +131,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FurnaceWithDXSystem.idf b/testfiles/FurnaceWithDXSystem.idf index 18c02406a05..5396a7fed23 100644 --- a/testfiles/FurnaceWithDXSystem.idf +++ b/testfiles/FurnaceWithDXSystem.idf @@ -132,8 +132,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -145,8 +147,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FurnaceWithDXSystemComfortControl.idf b/testfiles/FurnaceWithDXSystemComfortControl.idf index f94d02105fc..f563ae2145a 100644 --- a/testfiles/FurnaceWithDXSystemComfortControl.idf +++ b/testfiles/FurnaceWithDXSystemComfortControl.idf @@ -139,8 +139,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FurnaceWithDXSystemRHcontrol.idf b/testfiles/FurnaceWithDXSystemRHcontrol.idf index 4d4bf450af8..0d788c15f56 100644 --- a/testfiles/FurnaceWithDXSystemRHcontrol.idf +++ b/testfiles/FurnaceWithDXSystemRHcontrol.idf @@ -227,8 +227,10 @@ , !- Name 1, !- Begin Month 4, !- Begin Day of Month + , !- Begin Year 1, !- End Month 4, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -240,8 +242,10 @@ , !- Name 3, !- Begin Month 22, !- Begin Day of Month + , !- Begin Year 3, !- End Month 22, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -253,8 +257,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FurnaceWithDXSystemRHcontrol_cyclingfan.idf b/testfiles/FurnaceWithDXSystemRHcontrol_cyclingfan.idf index b5f64a3f4ff..2ada45dd708 100644 --- a/testfiles/FurnaceWithDXSystemRHcontrol_cyclingfan.idf +++ b/testfiles/FurnaceWithDXSystemRHcontrol_cyclingfan.idf @@ -141,8 +141,10 @@ , !- Name 1, !- Begin Month 4, !- Begin Day of Month + , !- Begin Year 1, !- End Month 11, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -154,8 +156,10 @@ , !- Name 7, !- Begin Month 10, !- Begin Day of Month + , !- Begin Year 7, !- End Month 17, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/FurnaceWithDXSystem_CoolingHXAssisted.idf b/testfiles/FurnaceWithDXSystem_CoolingHXAssisted.idf index f606aa92e05..502306ed261 100644 --- a/testfiles/FurnaceWithDXSystem_CoolingHXAssisted.idf +++ b/testfiles/FurnaceWithDXSystem_CoolingHXAssisted.idf @@ -160,8 +160,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/GSHP-GLHE-CalcGFunctions.idf b/testfiles/GSHP-GLHE-CalcGFunctions.idf index bc3aa89b55f..9cdcce396e1 100644 --- a/testfiles/GSHP-GLHE-CalcGFunctions.idf +++ b/testfiles/GSHP-GLHE-CalcGFunctions.idf @@ -143,8 +143,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/GSHP-GLHE.idf b/testfiles/GSHP-GLHE.idf index 9fd3cad1790..11f59fe5bd3 100644 --- a/testfiles/GSHP-GLHE.idf +++ b/testfiles/GSHP-GLHE.idf @@ -128,8 +128,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -141,8 +143,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/GSHP-Slinky.idf b/testfiles/GSHP-Slinky.idf index fc97ecd708e..b728be73390 100644 --- a/testfiles/GSHP-Slinky.idf +++ b/testfiles/GSHP-Slinky.idf @@ -128,8 +128,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -141,8 +143,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/GSHPSimple-GLHE.idf b/testfiles/GSHPSimple-GLHE.idf index beaf7c1800c..7da27e23aff 100644 --- a/testfiles/GSHPSimple-GLHE.idf +++ b/testfiles/GSHPSimple-GLHE.idf @@ -126,9 +126,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 11, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -139,9 +141,11 @@ , !- Name 7, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 7, !- End Month 25, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/GasTurbChiller.idf b/testfiles/GasTurbChiller.idf index 40f692450af..96bae3b828a 100644 --- a/testfiles/GasTurbChiller.idf +++ b/testfiles/GasTurbChiller.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/GasTurbChillerHeatRecoveryAuto.idf b/testfiles/GasTurbChillerHeatRecoveryAuto.idf index 4153255e2d4..7dc74a4b80a 100644 --- a/testfiles/GasTurbChillerHeatRecoveryAuto.idf +++ b/testfiles/GasTurbChillerHeatRecoveryAuto.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -143,8 +145,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Generator_PVWatts.idf b/testfiles/Generator_PVWatts.idf index fd44f2b8b2d..4d2fd5dc633 100644 --- a/testfiles/Generator_PVWatts.idf +++ b/testfiles/Generator_PVWatts.idf @@ -23,9 +23,11 @@ All Year, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/Generators.idf b/testfiles/Generators.idf index 718b6765ce0..9f4d748117e 100644 --- a/testfiles/Generators.idf +++ b/testfiles/Generators.idf @@ -141,8 +141,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -154,8 +156,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Generators_Transformer.idf b/testfiles/Generators_Transformer.idf index 2f527df9872..69e8f5e0541 100644 --- a/testfiles/Generators_Transformer.idf +++ b/testfiles/Generators_Transformer.idf @@ -226,8 +226,10 @@ WinterDay, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -239,8 +241,10 @@ SummerDay, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/GeneratorswithPV.idf b/testfiles/GeneratorswithPV.idf index 6a5d46e9eb6..a74b32debb4 100644 --- a/testfiles/GeneratorswithPV.idf +++ b/testfiles/GeneratorswithPV.idf @@ -115,9 +115,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -128,9 +130,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/GeneratorwithWindTurbine.idf b/testfiles/GeneratorwithWindTurbine.idf index d1dee057bb2..3219efae5a5 100644 --- a/testfiles/GeneratorwithWindTurbine.idf +++ b/testfiles/GeneratorwithWindTurbine.idf @@ -116,8 +116,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -129,8 +131,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/GeometryTest.idf b/testfiles/GeometryTest.idf index 3171c515818..3d78a0e9c91 100644 --- a/testfiles/GeometryTest.idf +++ b/testfiles/GeometryTest.idf @@ -132,9 +132,11 @@ , !- Name 5, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 5, !- End Month 10, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/GroundTempOSCCompactSched.idf b/testfiles/GroundTempOSCCompactSched.idf index 48e1cee4b82..078e8a31610 100644 --- a/testfiles/GroundTempOSCCompactSched.idf +++ b/testfiles/GroundTempOSCCompactSched.idf @@ -27,8 +27,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period diff --git a/testfiles/HAMT_DailyProfileReport.idf b/testfiles/HAMT_DailyProfileReport.idf index 0b9794f0b3a..0baa3acc234 100644 --- a/testfiles/HAMT_DailyProfileReport.idf +++ b/testfiles/HAMT_DailyProfileReport.idf @@ -227,29 +227,31 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule No, !- Use Weather File Rain Indicators - No, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + No; !- Use Weather File Snow Indicators RunPeriod, , !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 28, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule No, !- Use Weather File Rain Indicators - No, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + No; !- Use Weather File Snow Indicators !- =========== ALL OBJECTS IN CLASS: SITE:GROUNDTEMPERATURE:BUILDINGSURFACE =========== diff --git a/testfiles/HAMT_HourlyProfileReport.idf b/testfiles/HAMT_HourlyProfileReport.idf index d284467b72d..feb9785ca45 100644 --- a/testfiles/HAMT_HourlyProfileReport.idf +++ b/testfiles/HAMT_HourlyProfileReport.idf @@ -227,15 +227,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule No, !- Use Weather File Rain Indicators - No, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + No; !- Use Weather File Snow Indicators !- =========== ALL OBJECTS IN CLASS: SITE:GROUNDTEMPERATURE:BUILDINGSURFACE =========== diff --git a/testfiles/HPAirToAir_wSolarCollectorHWCoil.idf b/testfiles/HPAirToAir_wSolarCollectorHWCoil.idf index 8239c90b5a8..f641920e232 100644 --- a/testfiles/HPAirToAir_wSolarCollectorHWCoil.idf +++ b/testfiles/HPAirToAir_wSolarCollectorHWCoil.idf @@ -230,8 +230,10 @@ , !- Name 1, !- Begin Month 4, !- Begin Day of Month + , !- Begin Year 1, !- End Month 4, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -243,8 +245,10 @@ , !- Name 3, !- Begin Month 22, !- Begin Day of Month + , !- Begin Year 3, !- End Month 22, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -256,8 +260,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HP_wICSSolarCollector.idf b/testfiles/HP_wICSSolarCollector.idf index 4414a1a65cf..091bc676061 100644 --- a/testfiles/HP_wICSSolarCollector.idf +++ b/testfiles/HP_wICSSolarCollector.idf @@ -236,8 +236,10 @@ , !- Name 1, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 1, !- End Month 21, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -249,8 +251,10 @@ , !- Name 7, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 7, !- End Month 21, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACStandAloneERV_Economizer.idf b/testfiles/HVACStandAloneERV_Economizer.idf index ff3c2d160c9..507c8f20e1a 100644 --- a/testfiles/HVACStandAloneERV_Economizer.idf +++ b/testfiles/HVACStandAloneERV_Economizer.idf @@ -222,8 +222,10 @@ , !- Name 1, !- Begin Month 9, !- Begin Day of Month + , !- Begin Year 1, !- End Month 9, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -235,8 +237,10 @@ , !- Name 6, !- Begin Month 25, !- Begin Day of Month + , !- Begin Year 6, !- End Month 25, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneBaseboardHeat.idf b/testfiles/HVACTemplate-5ZoneBaseboardHeat.idf index 7cf5aa2175e..fe23469daf3 100644 --- a/testfiles/HVACTemplate-5ZoneBaseboardHeat.idf +++ b/testfiles/HVACTemplate-5ZoneBaseboardHeat.idf @@ -164,8 +164,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -177,8 +179,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneConstantVolumeChillerBoiler.idf b/testfiles/HVACTemplate-5ZoneConstantVolumeChillerBoiler.idf index 7a566725c08..58e9bdb69a1 100644 --- a/testfiles/HVACTemplate-5ZoneConstantVolumeChillerBoiler.idf +++ b/testfiles/HVACTemplate-5ZoneConstantVolumeChillerBoiler.idf @@ -165,8 +165,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -178,8 +180,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneDualDuct.idf b/testfiles/HVACTemplate-5ZoneDualDuct.idf index d8f14af7b84..6f54b121a46 100644 --- a/testfiles/HVACTemplate-5ZoneDualDuct.idf +++ b/testfiles/HVACTemplate-5ZoneDualDuct.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneFanCoil-DOAS.idf b/testfiles/HVACTemplate-5ZoneFanCoil-DOAS.idf index b23e0df4f4c..6e54156d60c 100644 --- a/testfiles/HVACTemplate-5ZoneFanCoil-DOAS.idf +++ b/testfiles/HVACTemplate-5ZoneFanCoil-DOAS.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -175,8 +177,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneFanCoil.idf b/testfiles/HVACTemplate-5ZoneFanCoil.idf index 9ff37017b37..7ec73c3580a 100644 --- a/testfiles/HVACTemplate-5ZoneFanCoil.idf +++ b/testfiles/HVACTemplate-5ZoneFanCoil.idf @@ -174,8 +174,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -187,8 +189,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneFurnaceDX.idf b/testfiles/HVACTemplate-5ZoneFurnaceDX.idf index 773455a9921..02c167a2f13 100644 --- a/testfiles/HVACTemplate-5ZoneFurnaceDX.idf +++ b/testfiles/HVACTemplate-5ZoneFurnaceDX.idf @@ -126,8 +126,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -139,8 +141,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZonePTAC-DOAS.idf b/testfiles/HVACTemplate-5ZonePTAC-DOAS.idf index 09f3f32d54c..dd05ede44c6 100644 --- a/testfiles/HVACTemplate-5ZonePTAC-DOAS.idf +++ b/testfiles/HVACTemplate-5ZonePTAC-DOAS.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -175,8 +177,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZonePTAC.idf b/testfiles/HVACTemplate-5ZonePTAC.idf index da268df3926..4004f407909 100644 --- a/testfiles/HVACTemplate-5ZonePTAC.idf +++ b/testfiles/HVACTemplate-5ZonePTAC.idf @@ -173,8 +173,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -186,8 +188,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZonePTHP.idf b/testfiles/HVACTemplate-5ZonePTHP.idf index 88b3b30f219..800ce5075de 100644 --- a/testfiles/HVACTemplate-5ZonePTHP.idf +++ b/testfiles/HVACTemplate-5ZonePTHP.idf @@ -173,8 +173,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -186,8 +188,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZonePackagedVAV.idf b/testfiles/HVACTemplate-5ZonePackagedVAV.idf index 8642a1e7da1..d4758052a10 100644 --- a/testfiles/HVACTemplate-5ZonePackagedVAV.idf +++ b/testfiles/HVACTemplate-5ZonePackagedVAV.idf @@ -159,8 +159,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -172,8 +174,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZonePurchAir.idf b/testfiles/HVACTemplate-5ZonePurchAir.idf index ad0e3eb05b1..6f1eec82c01 100644 --- a/testfiles/HVACTemplate-5ZonePurchAir.idf +++ b/testfiles/HVACTemplate-5ZonePurchAir.idf @@ -160,8 +160,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -173,8 +175,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneUnitaryHeatPump.idf b/testfiles/HVACTemplate-5ZoneUnitaryHeatPump.idf index 0917e977e5c..9ddc61713ab 100644 --- a/testfiles/HVACTemplate-5ZoneUnitaryHeatPump.idf +++ b/testfiles/HVACTemplate-5ZoneUnitaryHeatPump.idf @@ -142,8 +142,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -155,8 +157,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneUnitarySystem.idf b/testfiles/HVACTemplate-5ZoneUnitarySystem.idf index 307f9793f80..5efcea370fc 100644 --- a/testfiles/HVACTemplate-5ZoneUnitarySystem.idf +++ b/testfiles/HVACTemplate-5ZoneUnitarySystem.idf @@ -164,8 +164,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -177,8 +179,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneVAVFanPowered.idf b/testfiles/HVACTemplate-5ZoneVAVFanPowered.idf index b5483918e30..86c7a8d1350 100644 --- a/testfiles/HVACTemplate-5ZoneVAVFanPowered.idf +++ b/testfiles/HVACTemplate-5ZoneVAVFanPowered.idf @@ -180,8 +180,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -193,8 +195,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneVAVWaterCooled-ObjectReference.idf b/testfiles/HVACTemplate-5ZoneVAVWaterCooled-ObjectReference.idf index 69b9bfe4097..a82c97e1b68 100644 --- a/testfiles/HVACTemplate-5ZoneVAVWaterCooled-ObjectReference.idf +++ b/testfiles/HVACTemplate-5ZoneVAVWaterCooled-ObjectReference.idf @@ -183,8 +183,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -196,8 +198,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneVAVWaterCooled.idf b/testfiles/HVACTemplate-5ZoneVAVWaterCooled.idf index 9d2ae456b88..71788a7f01c 100644 --- a/testfiles/HVACTemplate-5ZoneVAVWaterCooled.idf +++ b/testfiles/HVACTemplate-5ZoneVAVWaterCooled.idf @@ -180,8 +180,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -193,8 +195,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneVRF.idf b/testfiles/HVACTemplate-5ZoneVRF.idf index 94a9184965a..de76325b2eb 100644 --- a/testfiles/HVACTemplate-5ZoneVRF.idf +++ b/testfiles/HVACTemplate-5ZoneVRF.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HVACTemplate-5ZoneWaterToAirHeatPumpTowerBoiler.idf b/testfiles/HVACTemplate-5ZoneWaterToAirHeatPumpTowerBoiler.idf index 803441dc69e..bcf88ac3061 100644 --- a/testfiles/HVACTemplate-5ZoneWaterToAirHeatPumpTowerBoiler.idf +++ b/testfiles/HVACTemplate-5ZoneWaterToAirHeatPumpTowerBoiler.idf @@ -174,8 +174,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -187,8 +189,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeaderedPumpsConSpeed.idf b/testfiles/HeaderedPumpsConSpeed.idf index f25035e9b56..3c75bef1012 100644 --- a/testfiles/HeaderedPumpsConSpeed.idf +++ b/testfiles/HeaderedPumpsConSpeed.idf @@ -129,8 +129,10 @@ , !- Name 7, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeaderedPumpsVarSpeed.idf b/testfiles/HeaderedPumpsVarSpeed.idf index bc1015cdb44..13fa045f8e2 100644 --- a/testfiles/HeaderedPumpsVarSpeed.idf +++ b/testfiles/HeaderedPumpsVarSpeed.idf @@ -164,8 +164,10 @@ , !- Name 7, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPump.idf b/testfiles/HeatPump.idf index 7b77fc9b6d9..94fa26e0118 100644 --- a/testfiles/HeatPump.idf +++ b/testfiles/HeatPump.idf @@ -133,8 +133,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -146,8 +148,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpAirToAirWithRHcontrol.idf b/testfiles/HeatPumpAirToAirWithRHcontrol.idf index 308f55a4e6e..14848c4d8ad 100644 --- a/testfiles/HeatPumpAirToAirWithRHcontrol.idf +++ b/testfiles/HeatPumpAirToAirWithRHcontrol.idf @@ -229,8 +229,10 @@ , !- Name 1, !- Begin Month 4, !- Begin Day of Month + , !- Begin Year 1, !- End Month 4, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -242,8 +244,10 @@ , !- Name 3, !- Begin Month 22, !- Begin Day of Month + , !- Begin Year 3, !- End Month 22, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -255,8 +259,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpAuto.idf b/testfiles/HeatPumpAuto.idf index 7162ef3500e..bd2542a1da2 100644 --- a/testfiles/HeatPumpAuto.idf +++ b/testfiles/HeatPumpAuto.idf @@ -133,8 +133,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -146,8 +148,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpIAQP_DCV.idf b/testfiles/HeatPumpIAQP_DCV.idf index 53141dae5c5..b9992fa6eda 100644 --- a/testfiles/HeatPumpIAQP_DCV.idf +++ b/testfiles/HeatPumpIAQP_DCV.idf @@ -139,8 +139,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpIAQP_GenericContamControl.idf b/testfiles/HeatPumpIAQP_GenericContamControl.idf index da924eb5dde..0755232d8a8 100644 --- a/testfiles/HeatPumpIAQP_GenericContamControl.idf +++ b/testfiles/HeatPumpIAQP_GenericContamControl.idf @@ -140,8 +140,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpProportionalControl_DCV.idf b/testfiles/HeatPumpProportionalControl_DCV.idf index 7a707f4d1fe..8140e24a1dd 100644 --- a/testfiles/HeatPumpProportionalControl_DCV.idf +++ b/testfiles/HeatPumpProportionalControl_DCV.idf @@ -139,8 +139,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpProportionalControl_DCVDesignRate.idf b/testfiles/HeatPumpProportionalControl_DCVDesignRate.idf index 4d1c157fcb4..778d9a43e52 100644 --- a/testfiles/HeatPumpProportionalControl_DCVDesignRate.idf +++ b/testfiles/HeatPumpProportionalControl_DCVDesignRate.idf @@ -139,8 +139,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpSecondaryCoil.idf b/testfiles/HeatPumpSecondaryCoil.idf index 6126132a249..e2be9bdf877 100644 --- a/testfiles/HeatPumpSecondaryCoil.idf +++ b/testfiles/HeatPumpSecondaryCoil.idf @@ -138,8 +138,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -151,8 +153,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpSimpleDCV.idf b/testfiles/HeatPumpSimpleDCV.idf index cad7203c8d8..ecbe42741a1 100644 --- a/testfiles/HeatPumpSimpleDCV.idf +++ b/testfiles/HeatPumpSimpleDCV.idf @@ -144,8 +144,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -157,8 +159,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpVRP_DCV.idf b/testfiles/HeatPumpVRP_DCV.idf index e2752565568..4bde6d9b45a 100644 --- a/testfiles/HeatPumpVRP_DCV.idf +++ b/testfiles/HeatPumpVRP_DCV.idf @@ -140,8 +140,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpVSAS.idf b/testfiles/HeatPumpVSAS.idf index cd1afb3df2f..ef68ee9dcc2 100644 --- a/testfiles/HeatPumpVSAS.idf +++ b/testfiles/HeatPumpVSAS.idf @@ -408,8 +408,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -421,8 +423,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpWaterHeater.idf b/testfiles/HeatPumpWaterHeater.idf index 701d77e6f13..d0595433f25 100644 --- a/testfiles/HeatPumpWaterHeater.idf +++ b/testfiles/HeatPumpWaterHeater.idf @@ -196,8 +196,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -209,8 +211,10 @@ July7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpWaterHeaterStratified.idf b/testfiles/HeatPumpWaterHeaterStratified.idf index 6523b59bfc8..32a97a3c3ef 100644 --- a/testfiles/HeatPumpWaterHeaterStratified.idf +++ b/testfiles/HeatPumpWaterHeaterStratified.idf @@ -197,8 +197,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -210,8 +212,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpWaterToAir.idf b/testfiles/HeatPumpWaterToAir.idf index 1d4bf9bdb4b..2309f78dfb0 100644 --- a/testfiles/HeatPumpWaterToAir.idf +++ b/testfiles/HeatPumpWaterToAir.idf @@ -168,8 +168,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -181,8 +183,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpWaterToAirEquationFit.idf b/testfiles/HeatPumpWaterToAirEquationFit.idf index a4fcddc010e..b6be82ec5e9 100644 --- a/testfiles/HeatPumpWaterToAirEquationFit.idf +++ b/testfiles/HeatPumpWaterToAirEquationFit.idf @@ -164,8 +164,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -177,8 +179,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpWaterToAirWithRHControl.idf b/testfiles/HeatPumpWaterToAirWithRHControl.idf index 75e9dcadcd2..a60c8d053d3 100644 --- a/testfiles/HeatPumpWaterToAirWithRHControl.idf +++ b/testfiles/HeatPumpWaterToAirWithRHControl.idf @@ -172,8 +172,10 @@ , !- Name 1, !- Begin Month 3, !- Begin Day of Month + , !- Begin Year 1, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -185,8 +187,10 @@ , !- Name 7, !- Begin Month 3, !- Begin Day of Month + , !- Begin Year 7, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatPumpwithBiquadraticCurves.idf b/testfiles/HeatPumpwithBiquadraticCurves.idf index c3512792676..cc29184a22e 100644 --- a/testfiles/HeatPumpwithBiquadraticCurves.idf +++ b/testfiles/HeatPumpwithBiquadraticCurves.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -149,8 +151,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HeatRecoveryElectricChiller.idf b/testfiles/HeatRecoveryElectricChiller.idf index ce502b84ec3..6a329961ae9 100644 --- a/testfiles/HeatRecoveryElectricChiller.idf +++ b/testfiles/HeatRecoveryElectricChiller.idf @@ -148,9 +148,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 5, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -161,9 +163,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 8, !- End Month 15, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/HeatRecoveryPlantLoop.idf b/testfiles/HeatRecoveryPlantLoop.idf index ff3ec2e81cf..c48e3bc8468 100644 --- a/testfiles/HeatRecoveryPlantLoop.idf +++ b/testfiles/HeatRecoveryPlantLoop.idf @@ -151,9 +151,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 5, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -164,9 +166,11 @@ , !- Name 11, !- Begin Month 25, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/HeatRecoveryPlantLoopAuto.idf b/testfiles/HeatRecoveryPlantLoopAuto.idf index 681ae959162..4d6b25a85c1 100644 --- a/testfiles/HeatRecoveryPlantLoopAuto.idf +++ b/testfiles/HeatRecoveryPlantLoopAuto.idf @@ -147,9 +147,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 5, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -160,9 +162,11 @@ , !- Name 11, !- Begin Month 25, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/HeatRecoverywithStorageTank.idf b/testfiles/HeatRecoverywithStorageTank.idf index aedd7d59acd..9dd680d4189 100644 --- a/testfiles/HeatRecoverywithStorageTank.idf +++ b/testfiles/HeatRecoverywithStorageTank.idf @@ -231,9 +231,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 5, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -244,9 +246,11 @@ , !- Name 11, !- Begin Month 25, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/HospitalBaseline.idf b/testfiles/HospitalBaseline.idf index 9556b514fed..2750c1881c2 100644 --- a/testfiles/HospitalBaseline.idf +++ b/testfiles/HospitalBaseline.idf @@ -115,15 +115,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/HospitalBaselineReheatReportEMS.idf b/testfiles/HospitalBaselineReheatReportEMS.idf index 9ef72998c10..aa29be87c7e 100644 --- a/testfiles/HospitalBaselineReheatReportEMS.idf +++ b/testfiles/HospitalBaselineReheatReportEMS.idf @@ -115,15 +115,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/HospitalLowEnergy.idf b/testfiles/HospitalLowEnergy.idf index ebc2d96a492..492ba037f3e 100644 --- a/testfiles/HospitalLowEnergy.idf +++ b/testfiles/HospitalLowEnergy.idf @@ -121,15 +121,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/House-2FurnaceAC-SequentialLoad.idf b/testfiles/House-2FurnaceAC-SequentialLoad.idf index 33a0132abe0..bec4a51d371 100644 --- a/testfiles/House-2FurnaceAC-SequentialLoad.idf +++ b/testfiles/House-2FurnaceAC-SequentialLoad.idf @@ -105,8 +105,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -118,8 +120,10 @@ May14, !- Name 5, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 5, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -131,8 +135,10 @@ Jul07, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/House-2FurnaceAC-SequentialUniformPLR.idf b/testfiles/House-2FurnaceAC-SequentialUniformPLR.idf index 028729842c9..71de2ad2b22 100644 --- a/testfiles/House-2FurnaceAC-SequentialUniformPLR.idf +++ b/testfiles/House-2FurnaceAC-SequentialUniformPLR.idf @@ -105,8 +105,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -118,8 +120,10 @@ May14, !- Name 5, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 5, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -131,8 +135,10 @@ Jul07, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/House-2FurnaceAC-UniformLoad.idf b/testfiles/House-2FurnaceAC-UniformLoad.idf index bc381f7a5d0..737301853da 100644 --- a/testfiles/House-2FurnaceAC-UniformLoad.idf +++ b/testfiles/House-2FurnaceAC-UniformLoad.idf @@ -105,8 +105,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -118,8 +120,10 @@ May14, !- Name 5, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 5, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -131,8 +135,10 @@ Jul07, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/House-2FurnaceAC-UniformPLR.idf b/testfiles/House-2FurnaceAC-UniformPLR.idf index a5078ed5413..9edf7ed65dd 100644 --- a/testfiles/House-2FurnaceAC-UniformPLR.idf +++ b/testfiles/House-2FurnaceAC-UniformPLR.idf @@ -105,8 +105,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -118,8 +120,10 @@ May14, !- Name 5, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 5, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -131,8 +135,10 @@ Jul07, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HybridVentilationControl.idf b/testfiles/HybridVentilationControl.idf index 43fc686e3e8..bab44622a50 100644 --- a/testfiles/HybridVentilationControl.idf +++ b/testfiles/HybridVentilationControl.idf @@ -171,8 +171,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -184,8 +186,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HybridVentilationControlGlobalSimple.idf b/testfiles/HybridVentilationControlGlobalSimple.idf index ce35202edf9..48875972ce0 100644 --- a/testfiles/HybridVentilationControlGlobalSimple.idf +++ b/testfiles/HybridVentilationControlGlobalSimple.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 11, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/HybridZoneModel.idf b/testfiles/HybridZoneModel.idf index f0304e3bb7a..b8af7c6a31c 100644 --- a/testfiles/HybridZoneModel.idf +++ b/testfiles/HybridZoneModel.idf @@ -384,9 +384,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/IceStorage-Parallel.idf b/testfiles/IceStorage-Parallel.idf index fce071e93a2..e5cb392174a 100644 --- a/testfiles/IceStorage-Parallel.idf +++ b/testfiles/IceStorage-Parallel.idf @@ -167,8 +167,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -180,8 +182,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/IceStorage-Series-ChillerDownstream.idf b/testfiles/IceStorage-Series-ChillerDownstream.idf index 9bad89f5ffb..6fb96a1b2d5 100644 --- a/testfiles/IceStorage-Series-ChillerDownstream.idf +++ b/testfiles/IceStorage-Series-ChillerDownstream.idf @@ -165,8 +165,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -178,8 +180,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/IceStorage-Series-ChillerUpstream.idf b/testfiles/IceStorage-Series-ChillerUpstream.idf index ad4d2a916e3..e669862cb6b 100644 --- a/testfiles/IceStorage-Series-ChillerUpstream.idf +++ b/testfiles/IceStorage-Series-ChillerUpstream.idf @@ -165,8 +165,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -178,8 +180,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/IndEvapCoolerRTUoffice.idf b/testfiles/IndEvapCoolerRTUoffice.idf index 76f5c821dee..778d77eb111 100644 --- a/testfiles/IndEvapCoolerRTUoffice.idf +++ b/testfiles/IndEvapCoolerRTUoffice.idf @@ -54,8 +54,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/IndirectAbsorptionChiller.idf b/testfiles/IndirectAbsorptionChiller.idf index 53213568401..8e9450d08c5 100644 --- a/testfiles/IndirectAbsorptionChiller.idf +++ b/testfiles/IndirectAbsorptionChiller.idf @@ -222,8 +222,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -235,8 +237,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LBuilding-G000.idf b/testfiles/LBuilding-G000.idf index 9d8857fec21..6fe1f02671f 100644 --- a/testfiles/LBuilding-G000.idf +++ b/testfiles/LBuilding-G000.idf @@ -87,8 +87,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LBuilding-G090.idf b/testfiles/LBuilding-G090.idf index d21a3771f4c..a257eb5372f 100644 --- a/testfiles/LBuilding-G090.idf +++ b/testfiles/LBuilding-G090.idf @@ -87,8 +87,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LBuilding-G180.idf b/testfiles/LBuilding-G180.idf index 5030de4e2d9..39338265ff7 100644 --- a/testfiles/LBuilding-G180.idf +++ b/testfiles/LBuilding-G180.idf @@ -87,8 +87,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LBuilding-G270.idf b/testfiles/LBuilding-G270.idf index 9369d15b496..318f5889fec 100644 --- a/testfiles/LBuilding-G270.idf +++ b/testfiles/LBuilding-G270.idf @@ -87,8 +87,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LBuildingAppGRotPar.idf b/testfiles/LBuildingAppGRotPar.idf index 79261a5932d..cdb47fb1163 100644 --- a/testfiles/LBuildingAppGRotPar.idf +++ b/testfiles/LBuildingAppGRotPar.idf @@ -102,8 +102,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LgOffVAV.idf b/testfiles/LgOffVAV.idf index f87d686f1fc..23ac3cd2d5f 100644 --- a/testfiles/LgOffVAV.idf +++ b/testfiles/LgOffVAV.idf @@ -140,8 +140,10 @@ Jan, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -153,8 +155,10 @@ Jul, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LgOffVAVusingBasement.idf b/testfiles/LgOffVAVusingBasement.idf index 2a2ccdbfadb..65ce804ea6c 100644 --- a/testfiles/LgOffVAVusingBasement.idf +++ b/testfiles/LgOffVAVusingBasement.idf @@ -132,8 +132,10 @@ Jan, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -145,8 +147,10 @@ Jul, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LookupTables.idf b/testfiles/LookupTables.idf index 7ce782c9eb0..97d6c32574c 100644 --- a/testfiles/LookupTables.idf +++ b/testfiles/LookupTables.idf @@ -241,8 +241,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -254,8 +256,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/LrgOff_GridStorageDemandLeveling.idf b/testfiles/LrgOff_GridStorageDemandLeveling.idf index 9693765ae40..da8efe9be61 100644 --- a/testfiles/LrgOff_GridStorageDemandLeveling.idf +++ b/testfiles/LrgOff_GridStorageDemandLeveling.idf @@ -63,15 +63,16 @@ annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/LrgOff_GridStorageEMSSmoothing.idf b/testfiles/LrgOff_GridStorageEMSSmoothing.idf index 7502f183394..48c6f9521ec 100644 --- a/testfiles/LrgOff_GridStorageEMSSmoothing.idf +++ b/testfiles/LrgOff_GridStorageEMSSmoothing.idf @@ -63,15 +63,16 @@ annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/LrgOff_GridStorageScheduled.idf b/testfiles/LrgOff_GridStorageScheduled.idf index cfa645b025b..ac747920ed8 100644 --- a/testfiles/LrgOff_GridStorageScheduled.idf +++ b/testfiles/LrgOff_GridStorageScheduled.idf @@ -63,15 +63,16 @@ annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/MicroCogeneration.idf b/testfiles/MicroCogeneration.idf index 40fbc17b50d..8d104de5085 100644 --- a/testfiles/MicroCogeneration.idf +++ b/testfiles/MicroCogeneration.idf @@ -264,8 +264,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Minimal.idf b/testfiles/Minimal.idf index 2595711adab..7f111cd594b 100644 --- a/testfiles/Minimal.idf +++ b/testfiles/Minimal.idf @@ -107,8 +107,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MovableExtInsulationSimple.idf b/testfiles/MovableExtInsulationSimple.idf index dfff84a2e5a..8fb58700c00 100644 --- a/testfiles/MovableExtInsulationSimple.idf +++ b/testfiles/MovableExtInsulationSimple.idf @@ -43,8 +43,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MovableIntInsulationLights.idf b/testfiles/MovableIntInsulationLights.idf index dc570da87f1..d0aafd3c516 100644 --- a/testfiles/MovableIntInsulationLights.idf +++ b/testfiles/MovableIntInsulationLights.idf @@ -43,8 +43,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MovableIntInsulationLightsLowE.idf b/testfiles/MovableIntInsulationLightsLowE.idf index 3ee3661b471..6d6c31b5be1 100644 --- a/testfiles/MovableIntInsulationLightsLowE.idf +++ b/testfiles/MovableIntInsulationLightsLowE.idf @@ -43,8 +43,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MovableIntInsulationSimple.idf b/testfiles/MovableIntInsulationSimple.idf index 53b42405aae..a5f67dc919c 100644 --- a/testfiles/MovableIntInsulationSimple.idf +++ b/testfiles/MovableIntInsulationSimple.idf @@ -43,8 +43,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MultiSpeedACFurnace.idf b/testfiles/MultiSpeedACFurnace.idf index c892e944870..b801d715ccd 100644 --- a/testfiles/MultiSpeedACFurnace.idf +++ b/testfiles/MultiSpeedACFurnace.idf @@ -122,8 +122,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -135,8 +137,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MultiSpeedHP_StagedThermostat.idf b/testfiles/MultiSpeedHP_StagedThermostat.idf index a650fe62498..7ca6a89b321 100644 --- a/testfiles/MultiSpeedHP_StagedThermostat.idf +++ b/testfiles/MultiSpeedHP_StagedThermostat.idf @@ -123,8 +123,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -136,8 +138,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MultiSpeedHeatPump_MultiSolvers.idf b/testfiles/MultiSpeedHeatPump_MultiSolvers.idf index 7cabe153a0a..d966bf7db43 100644 --- a/testfiles/MultiSpeedHeatPump_MultiSolvers.idf +++ b/testfiles/MultiSpeedHeatPump_MultiSolvers.idf @@ -126,8 +126,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -139,8 +141,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MultiStory.idf b/testfiles/MultiStory.idf index 23f8dd94d27..1ae0b06d857 100644 --- a/testfiles/MultiStory.idf +++ b/testfiles/MultiStory.idf @@ -207,8 +207,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/MultispeedHeatPump.idf b/testfiles/MultispeedHeatPump.idf index ec5ae29ebd5..76241625118 100644 --- a/testfiles/MultispeedHeatPump.idf +++ b/testfiles/MultispeedHeatPump.idf @@ -122,8 +122,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -135,8 +137,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Mundt_System_Always_On.idf b/testfiles/Mundt_System_Always_On.idf index 2949d063df4..9ee61013e56 100644 --- a/testfiles/Mundt_System_Always_On.idf +++ b/testfiles/Mundt_System_Always_On.idf @@ -118,8 +118,10 @@ , !- Name 6, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 7, !- End Month 15, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Mundt_System_On_During_the_Day.idf b/testfiles/Mundt_System_On_During_the_Day.idf index dcb2498a44d..6e87217b585 100644 --- a/testfiles/Mundt_System_On_During_the_Day.idf +++ b/testfiles/Mundt_System_On_During_the_Day.idf @@ -118,8 +118,10 @@ , !- Name 6, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 7, !- End Month 15, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/OptimalStart_RefBldgLargeOfficeNew2004_Chicago.idf b/testfiles/OptimalStart_RefBldgLargeOfficeNew2004_Chicago.idf index 3d52b26c926..2c27e922400 100644 --- a/testfiles/OptimalStart_RefBldgLargeOfficeNew2004_Chicago.idf +++ b/testfiles/OptimalStart_RefBldgLargeOfficeNew2004_Chicago.idf @@ -97,29 +97,31 @@ , !- Name 1, !- Begin Month 23, !- Begin Day of Month + , !- Begin Year 2, !- End Month 6, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriod, , !- Name 6, !- Begin Month 23, !- Begin Day of Month + , !- Begin Year 7, !- End Month 6, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/OutdoorAirUnit.idf b/testfiles/OutdoorAirUnit.idf index b711337550e..812ea28afd6 100644 --- a/testfiles/OutdoorAirUnit.idf +++ b/testfiles/OutdoorAirUnit.idf @@ -2135,8 +2135,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -2148,8 +2150,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/OutdoorAirUnitwithAirloopHVAC.idf b/testfiles/OutdoorAirUnitwithAirloopHVAC.idf index ff5d2aa92d0..01cb365fd95 100644 --- a/testfiles/OutdoorAirUnitwithAirloopHVAC.idf +++ b/testfiles/OutdoorAirUnitwithAirloopHVAC.idf @@ -2026,8 +2026,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -2039,8 +2041,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PIUAuto.idf b/testfiles/PIUAuto.idf index f885a1cc307..19ebb3046df 100644 --- a/testfiles/PIUAuto.idf +++ b/testfiles/PIUAuto.idf @@ -125,8 +125,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -138,8 +140,10 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -151,8 +155,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PackagedTerminalAirConditioner.idf b/testfiles/PackagedTerminalAirConditioner.idf index 9bb1871499b..7b7061a7713 100644 --- a/testfiles/PackagedTerminalAirConditioner.idf +++ b/testfiles/PackagedTerminalAirConditioner.idf @@ -246,8 +246,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -259,8 +261,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PackagedTerminalAirConditionerVSAS.idf b/testfiles/PackagedTerminalAirConditionerVSAS.idf index b6ba479d5b2..36b6a482da8 100644 --- a/testfiles/PackagedTerminalAirConditionerVSAS.idf +++ b/testfiles/PackagedTerminalAirConditionerVSAS.idf @@ -685,8 +685,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -698,8 +700,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PackagedTerminalHeatPump.idf b/testfiles/PackagedTerminalHeatPump.idf index b43328a77a0..d8993d74e13 100644 --- a/testfiles/PackagedTerminalHeatPump.idf +++ b/testfiles/PackagedTerminalHeatPump.idf @@ -241,8 +241,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -254,8 +256,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PackagedTerminalHeatPumpVSAS.idf b/testfiles/PackagedTerminalHeatPumpVSAS.idf index 8fc463f1558..c7d9184fc54 100644 --- a/testfiles/PackagedTerminalHeatPumpVSAS.idf +++ b/testfiles/PackagedTerminalHeatPumpVSAS.idf @@ -1008,8 +1008,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -1021,8 +1023,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ParametricInsulation-5ZoneAirCooled.idf b/testfiles/ParametricInsulation-5ZoneAirCooled.idf index ce27e938a67..4d7e8ed8d71 100644 --- a/testfiles/ParametricInsulation-5ZoneAirCooled.idf +++ b/testfiles/ParametricInsulation-5ZoneAirCooled.idf @@ -160,8 +160,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PassiveTrombeWall.idf b/testfiles/PassiveTrombeWall.idf index 1c8b5d1ef88..159a3875b36 100644 --- a/testfiles/PassiveTrombeWall.idf +++ b/testfiles/PassiveTrombeWall.idf @@ -109,8 +109,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PipeHeatTransfer_Outair.idf b/testfiles/PipeHeatTransfer_Outair.idf index 37956619a78..cdc133903bd 100644 --- a/testfiles/PipeHeatTransfer_Outair.idf +++ b/testfiles/PipeHeatTransfer_Outair.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PipeHeatTransfer_Schedule.idf b/testfiles/PipeHeatTransfer_Schedule.idf index 51f900d293d..b30062d765f 100644 --- a/testfiles/PipeHeatTransfer_Schedule.idf +++ b/testfiles/PipeHeatTransfer_Schedule.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PipeHeatTransfer_Underground.idf b/testfiles/PipeHeatTransfer_Underground.idf index 893622078cc..b6ea036060a 100644 --- a/testfiles/PipeHeatTransfer_Underground.idf +++ b/testfiles/PipeHeatTransfer_Underground.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PipeHeatTransfer_Zone.idf b/testfiles/PipeHeatTransfer_Zone.idf index 8604836f88f..1e267a869c6 100644 --- a/testfiles/PipeHeatTransfer_Zone.idf +++ b/testfiles/PipeHeatTransfer_Zone.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PipingSystem_Underground_FHX.idf b/testfiles/PipingSystem_Underground_FHX.idf index 11603d56239..044c66a6cdc 100644 --- a/testfiles/PipingSystem_Underground_FHX.idf +++ b/testfiles/PipingSystem_Underground_FHX.idf @@ -76,8 +76,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PipingSystem_Underground_TwoPipe.idf b/testfiles/PipingSystem_Underground_TwoPipe.idf index 31b617a6ddd..b16f2b777c5 100644 --- a/testfiles/PipingSystem_Underground_TwoPipe.idf +++ b/testfiles/PipingSystem_Underground_TwoPipe.idf @@ -74,8 +74,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PipingSystem_Underground_TwoPipe_FD_GroundTemps.idf b/testfiles/PipingSystem_Underground_TwoPipe_FD_GroundTemps.idf index 3d848734932..8ac0552bae5 100644 --- a/testfiles/PipingSystem_Underground_TwoPipe_FD_GroundTemps.idf +++ b/testfiles/PipingSystem_Underground_TwoPipe_FD_GroundTemps.idf @@ -74,8 +74,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PipingSystem_Underground_TwoPipe_Xing_GroundTemps.idf b/testfiles/PipingSystem_Underground_TwoPipe_Xing_GroundTemps.idf index bfc27d1a44a..a04c14d2e99 100644 --- a/testfiles/PipingSystem_Underground_TwoPipe_Xing_GroundTemps.idf +++ b/testfiles/PipingSystem_Underground_TwoPipe_Xing_GroundTemps.idf @@ -74,8 +74,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantApplicationsGuide_Example1.idf b/testfiles/PlantApplicationsGuide_Example1.idf index 5abc1a4d273..62cb53f826a 100644 --- a/testfiles/PlantApplicationsGuide_Example1.idf +++ b/testfiles/PlantApplicationsGuide_Example1.idf @@ -923,8 +923,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Monday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantApplicationsGuide_Example3.idf b/testfiles/PlantApplicationsGuide_Example3.idf index 236051ebb90..8425c30b48b 100644 --- a/testfiles/PlantApplicationsGuide_Example3.idf +++ b/testfiles/PlantApplicationsGuide_Example3.idf @@ -135,8 +135,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantComponentTemperatureSource.idf b/testfiles/PlantComponentTemperatureSource.idf index ede5412b294..8dc0273696d 100644 --- a/testfiles/PlantComponentTemperatureSource.idf +++ b/testfiles/PlantComponentTemperatureSource.idf @@ -98,8 +98,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantHorizontalGroundHX.idf b/testfiles/PlantHorizontalGroundHX.idf index d9f2a535825..ebc00ef81c6 100644 --- a/testfiles/PlantHorizontalGroundHX.idf +++ b/testfiles/PlantHorizontalGroundHX.idf @@ -74,8 +74,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantLoadProfile.idf b/testfiles/PlantLoadProfile.idf index b4efc4ab76f..b961e95f639 100644 --- a/testfiles/PlantLoadProfile.idf +++ b/testfiles/PlantLoadProfile.idf @@ -100,8 +100,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantLoadProfileCoolingReturnReset.idf b/testfiles/PlantLoadProfileCoolingReturnReset.idf index 64e1798cccb..41c9681d367 100644 --- a/testfiles/PlantLoadProfileCoolingReturnReset.idf +++ b/testfiles/PlantLoadProfileCoolingReturnReset.idf @@ -102,8 +102,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantLoadProfileCoolingReturnResetLookup.idf b/testfiles/PlantLoadProfileCoolingReturnResetLookup.idf index cd1c5ea2ee5..cca0dc7c394 100644 --- a/testfiles/PlantLoadProfileCoolingReturnResetLookup.idf +++ b/testfiles/PlantLoadProfileCoolingReturnResetLookup.idf @@ -103,8 +103,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantLoadProfile_AutosizedDistrictHeating.idf b/testfiles/PlantLoadProfile_AutosizedDistrictHeating.idf index edd43e4082d..7ad96bedbad 100644 --- a/testfiles/PlantLoadProfile_AutosizedDistrictHeating.idf +++ b/testfiles/PlantLoadProfile_AutosizedDistrictHeating.idf @@ -100,8 +100,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantLoopChainCooling.idf b/testfiles/PlantLoopChainCooling.idf index 85bf4e2f695..befb7a16252 100644 --- a/testfiles/PlantLoopChainCooling.idf +++ b/testfiles/PlantLoopChainCooling.idf @@ -102,8 +102,10 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantLoopChainDeadband.idf b/testfiles/PlantLoopChainDeadband.idf index 57a4cb22857..29e6f3c84d7 100644 --- a/testfiles/PlantLoopChainDeadband.idf +++ b/testfiles/PlantLoopChainDeadband.idf @@ -103,8 +103,10 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantLoopChainDualDeadband.idf b/testfiles/PlantLoopChainDualDeadband.idf index 66d7db4d5e3..9cb9ca861a2 100644 --- a/testfiles/PlantLoopChainDualDeadband.idf +++ b/testfiles/PlantLoopChainDualDeadband.idf @@ -103,8 +103,10 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantLoopChainHeating.idf b/testfiles/PlantLoopChainHeating.idf index fd25e629aae..47427084495 100644 --- a/testfiles/PlantLoopChainHeating.idf +++ b/testfiles/PlantLoopChainHeating.idf @@ -102,8 +102,10 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantPressureDrop.idf b/testfiles/PlantPressureDrop.idf index 336b3989c13..9a905be24af 100644 --- a/testfiles/PlantPressureDrop.idf +++ b/testfiles/PlantPressureDrop.idf @@ -105,8 +105,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantPressure_PumpCurve.idf b/testfiles/PlantPressure_PumpCurve.idf index 6d4ce14c80d..438806ca072 100644 --- a/testfiles/PlantPressure_PumpCurve.idf +++ b/testfiles/PlantPressure_PumpCurve.idf @@ -112,8 +112,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlantPressure_VFD_Scheduled.idf b/testfiles/PlantPressure_VFD_Scheduled.idf index 6064726273e..04232912f9b 100644 --- a/testfiles/PlantPressure_VFD_Scheduled.idf +++ b/testfiles/PlantPressure_VFD_Scheduled.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlateHeatExchanger.idf b/testfiles/PlateHeatExchanger.idf index f03eba2dd60..3a92f18b136 100644 --- a/testfiles/PlateHeatExchanger.idf +++ b/testfiles/PlateHeatExchanger.idf @@ -215,9 +215,11 @@ Jan_11-21, !- Name 1, !- Begin Month 11, !- Begin Day of Month + , !- Begin Year 1, !- End Month 21, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -228,9 +230,11 @@ Jul_11-31, !- Name 7, !- Begin Month 11, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/Plenum.idf b/testfiles/Plenum.idf index 9ce23cb779f..42170b8765f 100644 --- a/testfiles/Plenum.idf +++ b/testfiles/Plenum.idf @@ -102,8 +102,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PlenumwithRetAirHeatGain.idf b/testfiles/PlenumwithRetAirHeatGain.idf index 9aebde2ef74..74dfe1ceec7 100644 --- a/testfiles/PlenumwithRetAirHeatGain.idf +++ b/testfiles/PlenumwithRetAirHeatGain.idf @@ -100,8 +100,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PondGroundHeatExchanger.idf b/testfiles/PondGroundHeatExchanger.idf index b988d645aee..d7ce829e44a 100644 --- a/testfiles/PondGroundHeatExchanger.idf +++ b/testfiles/PondGroundHeatExchanger.idf @@ -142,8 +142,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -155,8 +157,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PurchAirTables.idf b/testfiles/PurchAirTables.idf index f7bde7cdac7..b80eb18a93c 100644 --- a/testfiles/PurchAirTables.idf +++ b/testfiles/PurchAirTables.idf @@ -197,9 +197,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/PurchAirTables_SQL.idf b/testfiles/PurchAirTables_SQL.idf index 0ceaadc7abf..002e445fd1f 100644 --- a/testfiles/PurchAirTables_SQL.idf +++ b/testfiles/PurchAirTables_SQL.idf @@ -197,9 +197,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/PurchAirTables_wAnnual.idf b/testfiles/PurchAirTables_wAnnual.idf index e1ee75da96d..ec6670e1302 100644 --- a/testfiles/PurchAirTables_wAnnual.idf +++ b/testfiles/PurchAirTables_wAnnual.idf @@ -197,9 +197,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/PurchAirWindowBlind.idf b/testfiles/PurchAirWindowBlind.idf index fbc856a8d9f..b19420d7f4f 100644 --- a/testfiles/PurchAirWindowBlind.idf +++ b/testfiles/PurchAirWindowBlind.idf @@ -125,8 +125,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/PurchAirWindowBlind_BlockBeamSolar.idf b/testfiles/PurchAirWindowBlind_BlockBeamSolar.idf index 6db012bd769..79c1203563e 100644 --- a/testfiles/PurchAirWindowBlind_BlockBeamSolar.idf +++ b/testfiles/PurchAirWindowBlind_BlockBeamSolar.idf @@ -124,8 +124,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/QTFtest.idf b/testfiles/QTFtest.idf index 84417584f37..a2b3f8261de 100644 --- a/testfiles/QTFtest.idf +++ b/testfiles/QTFtest.idf @@ -38,8 +38,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadHiTempElecTermReheat.idf b/testfiles/RadHiTempElecTermReheat.idf index cfd7ab26a81..83a77eb42fc 100644 --- a/testfiles/RadHiTempElecTermReheat.idf +++ b/testfiles/RadHiTempElecTermReheat.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadHiTempGasCtrlOpt.idf b/testfiles/RadHiTempGasCtrlOpt.idf index 68a8d1f10ae..11a236a34cb 100644 --- a/testfiles/RadHiTempGasCtrlOpt.idf +++ b/testfiles/RadHiTempGasCtrlOpt.idf @@ -131,8 +131,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadHiTempGasTermReheat.idf b/testfiles/RadHiTempGasTermReheat.idf index 7e523550c5c..caf25d4d8c6 100644 --- a/testfiles/RadHiTempGasTermReheat.idf +++ b/testfiles/RadHiTempGasTermReheat.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoHydrHeatCoolAuto.idf b/testfiles/RadLoHydrHeatCoolAuto.idf index 17b6ea8dbf4..2e011b1c9dd 100644 --- a/testfiles/RadLoHydrHeatCoolAuto.idf +++ b/testfiles/RadLoHydrHeatCoolAuto.idf @@ -124,8 +124,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -137,8 +139,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoHydrHeatCoolAutoCondFD.idf b/testfiles/RadLoHydrHeatCoolAutoCondFD.idf index b84c4a88fa1..f88b2654e72 100644 --- a/testfiles/RadLoHydrHeatCoolAutoCondFD.idf +++ b/testfiles/RadLoHydrHeatCoolAutoCondFD.idf @@ -216,8 +216,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -229,8 +231,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempCFloHeatCool.idf b/testfiles/RadLoTempCFloHeatCool.idf index e9a60e58e87..f1dab97f5f1 100644 --- a/testfiles/RadLoTempCFloHeatCool.idf +++ b/testfiles/RadLoTempCFloHeatCool.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempCFloHeatCoolCondFD.idf b/testfiles/RadLoTempCFloHeatCoolCondFD.idf index 1fc78435204..84f101c9783 100644 --- a/testfiles/RadLoTempCFloHeatCoolCondFD.idf +++ b/testfiles/RadLoTempCFloHeatCoolCondFD.idf @@ -219,8 +219,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempCFloHeatCool_AddedAutosizing.idf b/testfiles/RadLoTempCFloHeatCool_AddedAutosizing.idf index 3aa5531fabe..00c71977666 100644 --- a/testfiles/RadLoTempCFloHeatCool_AddedAutosizing.idf +++ b/testfiles/RadLoTempCFloHeatCool_AddedAutosizing.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempCFloTermReheat.idf b/testfiles/RadLoTempCFloTermReheat.idf index 6581beeefe8..d5fe9dc55a1 100644 --- a/testfiles/RadLoTempCFloTermReheat.idf +++ b/testfiles/RadLoTempCFloTermReheat.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempElecTermReheat.idf b/testfiles/RadLoTempElecTermReheat.idf index 7529009f8dc..066ec6eb694 100644 --- a/testfiles/RadLoTempElecTermReheat.idf +++ b/testfiles/RadLoTempElecTermReheat.idf @@ -146,8 +146,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempElecTermReheatCondFD.idf b/testfiles/RadLoTempElecTermReheatCondFD.idf index a484d3d781b..238f6f55efd 100644 --- a/testfiles/RadLoTempElecTermReheatCondFD.idf +++ b/testfiles/RadLoTempElecTermReheatCondFD.idf @@ -226,8 +226,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrCoolTower.idf b/testfiles/RadLoTempHydrCoolTower.idf index c3f8e3132a3..84aa0081aef 100644 --- a/testfiles/RadLoTempHydrCoolTower.idf +++ b/testfiles/RadLoTempHydrCoolTower.idf @@ -128,8 +128,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrCoolTowerCondFD.idf b/testfiles/RadLoTempHydrCoolTowerCondFD.idf index 4251f671641..ce98288c5b6 100644 --- a/testfiles/RadLoTempHydrCoolTowerCondFD.idf +++ b/testfiles/RadLoTempHydrCoolTowerCondFD.idf @@ -217,8 +217,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrCtrlOpt.idf b/testfiles/RadLoTempHydrCtrlOpt.idf index 0ecc756374f..732cc7cc5c6 100644 --- a/testfiles/RadLoTempHydrCtrlOpt.idf +++ b/testfiles/RadLoTempHydrCtrlOpt.idf @@ -138,8 +138,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrCtrlOpt2.idf b/testfiles/RadLoTempHydrCtrlOpt2.idf index f70061637da..f6b89c891c3 100644 --- a/testfiles/RadLoTempHydrCtrlOpt2.idf +++ b/testfiles/RadLoTempHydrCtrlOpt2.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrHeatCool.idf b/testfiles/RadLoTempHydrHeatCool.idf index 0c11ae73859..5ff2a6516fc 100644 --- a/testfiles/RadLoTempHydrHeatCool.idf +++ b/testfiles/RadLoTempHydrHeatCool.idf @@ -128,8 +128,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrHeatCool2D.idf b/testfiles/RadLoTempHydrHeatCool2D.idf index 1635097675b..dcb95c76eed 100644 --- a/testfiles/RadLoTempHydrHeatCool2D.idf +++ b/testfiles/RadLoTempHydrHeatCool2D.idf @@ -128,8 +128,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrHeatCoolDry.idf b/testfiles/RadLoTempHydrHeatCoolDry.idf index d196d75df22..f1c0b66f770 100644 --- a/testfiles/RadLoTempHydrHeatCoolDry.idf +++ b/testfiles/RadLoTempHydrHeatCoolDry.idf @@ -128,8 +128,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrHeatCoolDryCondFD.idf b/testfiles/RadLoTempHydrHeatCoolDryCondFD.idf index 70d6aca28ec..3c845237f3c 100644 --- a/testfiles/RadLoTempHydrHeatCoolDryCondFD.idf +++ b/testfiles/RadLoTempHydrHeatCoolDryCondFD.idf @@ -217,8 +217,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrInterMulti.idf b/testfiles/RadLoTempHydrInterMulti.idf index 0e19d220d91..a284ca05cca 100644 --- a/testfiles/RadLoTempHydrInterMulti.idf +++ b/testfiles/RadLoTempHydrInterMulti.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrMulti10.idf b/testfiles/RadLoTempHydrMulti10.idf index fb37af04623..5eee8a76b31 100644 --- a/testfiles/RadLoTempHydrMulti10.idf +++ b/testfiles/RadLoTempHydrMulti10.idf @@ -140,8 +140,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RadLoTempHydrTermReheat.idf b/testfiles/RadLoTempHydrTermReheat.idf index 130500cb337..84f999d13a1 100644 --- a/testfiles/RadLoTempHydrTermReheat.idf +++ b/testfiles/RadLoTempHydrTermReheat.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/RefBldgFullServiceRestaurantNew2004_Chicago.idf b/testfiles/RefBldgFullServiceRestaurantNew2004_Chicago.idf index 5442ba86a3d..fc3592e6279 100644 --- a/testfiles/RefBldgFullServiceRestaurantNew2004_Chicago.idf +++ b/testfiles/RefBldgFullServiceRestaurantNew2004_Chicago.idf @@ -91,15 +91,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgHospitalNew2004_Chicago.idf b/testfiles/RefBldgHospitalNew2004_Chicago.idf index 4cdc0e36ad8..d0beaecf093 100644 --- a/testfiles/RefBldgHospitalNew2004_Chicago.idf +++ b/testfiles/RefBldgHospitalNew2004_Chicago.idf @@ -111,15 +111,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgLargeHotelNew2004_Chicago.idf b/testfiles/RefBldgLargeHotelNew2004_Chicago.idf index f19f53a6f9f..2c89fdbe963 100644 --- a/testfiles/RefBldgLargeHotelNew2004_Chicago.idf +++ b/testfiles/RefBldgLargeHotelNew2004_Chicago.idf @@ -105,15 +105,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgLargeOfficeNew2004_Chicago-ReturnReset.idf b/testfiles/RefBldgLargeOfficeNew2004_Chicago-ReturnReset.idf index 4a5b160f04b..2d2d6540bd0 100644 --- a/testfiles/RefBldgLargeOfficeNew2004_Chicago-ReturnReset.idf +++ b/testfiles/RefBldgLargeOfficeNew2004_Chicago-ReturnReset.idf @@ -99,15 +99,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgLargeOfficeNew2004_Chicago.idf b/testfiles/RefBldgLargeOfficeNew2004_Chicago.idf index 3404ddd4c9b..3c134f0880e 100644 --- a/testfiles/RefBldgLargeOfficeNew2004_Chicago.idf +++ b/testfiles/RefBldgLargeOfficeNew2004_Chicago.idf @@ -98,15 +98,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgMediumOfficeNew2004_Chicago.idf b/testfiles/RefBldgMediumOfficeNew2004_Chicago.idf index 689f012745d..519997d5b87 100644 --- a/testfiles/RefBldgMediumOfficeNew2004_Chicago.idf +++ b/testfiles/RefBldgMediumOfficeNew2004_Chicago.idf @@ -92,15 +92,16 @@ annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgMidriseApartmentNew2004_Chicago.idf b/testfiles/RefBldgMidriseApartmentNew2004_Chicago.idf index 46033313269..6a3bc538740 100644 --- a/testfiles/RefBldgMidriseApartmentNew2004_Chicago.idf +++ b/testfiles/RefBldgMidriseApartmentNew2004_Chicago.idf @@ -92,15 +92,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgOutPatientNew2004_Chicago.idf b/testfiles/RefBldgOutPatientNew2004_Chicago.idf index f7957bd656d..daba5f51d18 100644 --- a/testfiles/RefBldgOutPatientNew2004_Chicago.idf +++ b/testfiles/RefBldgOutPatientNew2004_Chicago.idf @@ -105,15 +105,16 @@ , !- Name 1, !- Begin Month 2, !- Begin Day of Month + , !- Begin Year 1, !- End Month 1, !- End Day of Month + , !- End Year Monday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgPrimarySchoolNew2004_Chicago.idf b/testfiles/RefBldgPrimarySchoolNew2004_Chicago.idf index de1a77c1b94..56b31f658b1 100644 --- a/testfiles/RefBldgPrimarySchoolNew2004_Chicago.idf +++ b/testfiles/RefBldgPrimarySchoolNew2004_Chicago.idf @@ -230,15 +230,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgQuickServiceRestaurantNew2004_Chicago.idf b/testfiles/RefBldgQuickServiceRestaurantNew2004_Chicago.idf index 1f5d4b3d8d1..ff80e737c37 100644 --- a/testfiles/RefBldgQuickServiceRestaurantNew2004_Chicago.idf +++ b/testfiles/RefBldgQuickServiceRestaurantNew2004_Chicago.idf @@ -96,15 +96,16 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgSecondarySchoolNew2004_Chicago.idf b/testfiles/RefBldgSecondarySchoolNew2004_Chicago.idf index 4dc1338722b..136d8b99e23 100644 --- a/testfiles/RefBldgSecondarySchoolNew2004_Chicago.idf +++ b/testfiles/RefBldgSecondarySchoolNew2004_Chicago.idf @@ -108,15 +108,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgSmallHotelNew2004_Chicago.idf b/testfiles/RefBldgSmallHotelNew2004_Chicago.idf index 2bca20e70a3..93b6348094a 100644 --- a/testfiles/RefBldgSmallHotelNew2004_Chicago.idf +++ b/testfiles/RefBldgSmallHotelNew2004_Chicago.idf @@ -95,15 +95,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgSmallOfficeNew2004_Chicago.idf b/testfiles/RefBldgSmallOfficeNew2004_Chicago.idf index a3d346cbfcc..19fa931c19c 100644 --- a/testfiles/RefBldgSmallOfficeNew2004_Chicago.idf +++ b/testfiles/RefBldgSmallOfficeNew2004_Chicago.idf @@ -89,15 +89,16 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgStand-aloneRetailNew2004_Chicago.idf b/testfiles/RefBldgStand-aloneRetailNew2004_Chicago.idf index 5a89436f492..a5449d665e2 100644 --- a/testfiles/RefBldgStand-aloneRetailNew2004_Chicago.idf +++ b/testfiles/RefBldgStand-aloneRetailNew2004_Chicago.idf @@ -91,15 +91,16 @@ , !- Name 1, !- Begin Month 2, !- Begin Day of Month + , !- Begin Year 1, !- End Month 1, !- End Day of Month + , !- End Year Monday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgStripMallNew2004_Chicago.idf b/testfiles/RefBldgStripMallNew2004_Chicago.idf index 57d69802d0e..0f815a9f0c2 100644 --- a/testfiles/RefBldgStripMallNew2004_Chicago.idf +++ b/testfiles/RefBldgStripMallNew2004_Chicago.idf @@ -91,15 +91,16 @@ , !- Name 1, !- Begin Month 2, !- Begin Day of Month + , !- Begin Year 1, !- End Month 1, !- End Day of Month + , !- End Year Monday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgSuperMarketNew2004_Chicago.idf b/testfiles/RefBldgSuperMarketNew2004_Chicago.idf index 46aa1d1ab85..9e627c81170 100644 --- a/testfiles/RefBldgSuperMarketNew2004_Chicago.idf +++ b/testfiles/RefBldgSuperMarketNew2004_Chicago.idf @@ -105,15 +105,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefBldgWarehouseNew2004_Chicago.idf b/testfiles/RefBldgWarehouseNew2004_Chicago.idf index acae9be0b31..2e4deb95fbb 100644 --- a/testfiles/RefBldgWarehouseNew2004_Chicago.idf +++ b/testfiles/RefBldgWarehouseNew2004_Chicago.idf @@ -90,15 +90,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefMedOffVAVAllDefVRP.idf b/testfiles/RefMedOffVAVAllDefVRP.idf index 0e2d199462f..511ce6f8da4 100644 --- a/testfiles/RefMedOffVAVAllDefVRP.idf +++ b/testfiles/RefMedOffVAVAllDefVRP.idf @@ -95,15 +95,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RefrigeratedWarehouse.idf b/testfiles/RefrigeratedWarehouse.idf index 6c2e2dcaa81..0df6e73187b 100644 --- a/testfiles/RefrigeratedWarehouse.idf +++ b/testfiles/RefrigeratedWarehouse.idf @@ -238,8 +238,10 @@ JanuaryWeek, !- Name 1, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -251,8 +253,10 @@ JulyWeek, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 14, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ReliefIndEvapCoolerRTUoffice.idf b/testfiles/ReliefIndEvapCoolerRTUoffice.idf index 60efd4f535c..ea22df278b9 100644 --- a/testfiles/ReliefIndEvapCoolerRTUoffice.idf +++ b/testfiles/ReliefIndEvapCoolerRTUoffice.idf @@ -58,8 +58,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ReportDaylightFactors.idf b/testfiles/ReportDaylightFactors.idf index cfcae364c4c..90f67ce814e 100644 --- a/testfiles/ReportDaylightFactors.idf +++ b/testfiles/ReportDaylightFactors.idf @@ -166,15 +166,16 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RetailPackagedTESCoil.idf b/testfiles/RetailPackagedTESCoil.idf index 50969cf5cde..4db06163bd6 100644 --- a/testfiles/RetailPackagedTESCoil.idf +++ b/testfiles/RetailPackagedTESCoil.idf @@ -64,15 +64,16 @@ RunPeriod 1, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Monday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/RoomAirflowNetwork.idf b/testfiles/RoomAirflowNetwork.idf index e311432fe3a..88107979f41 100644 --- a/testfiles/RoomAirflowNetwork.idf +++ b/testfiles/RoomAirflowNetwork.idf @@ -191,9 +191,11 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 2, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/SeriesActiveBranch.idf b/testfiles/SeriesActiveBranch.idf index 0a8b8aebf51..4ec7c075d5d 100644 --- a/testfiles/SeriesActiveBranch.idf +++ b/testfiles/SeriesActiveBranch.idf @@ -182,8 +182,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -195,8 +197,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ShopWithPVandBattery.idf b/testfiles/ShopWithPVandBattery.idf index 3fd47802f20..c8d07f7966a 100644 --- a/testfiles/ShopWithPVandBattery.idf +++ b/testfiles/ShopWithPVandBattery.idf @@ -69,8 +69,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 2, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ShopWithPVandStorage.idf b/testfiles/ShopWithPVandStorage.idf index 533deb558fd..ac91ff1248a 100644 --- a/testfiles/ShopWithPVandStorage.idf +++ b/testfiles/ShopWithPVandStorage.idf @@ -68,8 +68,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 1, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ShopWithSimplePVT.idf b/testfiles/ShopWithSimplePVT.idf index d16528f7c69..9bc95d058ca 100644 --- a/testfiles/ShopWithSimplePVT.idf +++ b/testfiles/ShopWithSimplePVT.idf @@ -75,8 +75,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -88,8 +90,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SingleFamilyHouse_TwoSpeed_CutoutTemperature.idf b/testfiles/SingleFamilyHouse_TwoSpeed_CutoutTemperature.idf index 32667f1a4d9..0f0161bf658 100644 --- a/testfiles/SingleFamilyHouse_TwoSpeed_CutoutTemperature.idf +++ b/testfiles/SingleFamilyHouse_TwoSpeed_CutoutTemperature.idf @@ -132,8 +132,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -145,8 +147,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf b/testfiles/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf index 1f1715aeb14..77e0d23acdf 100644 --- a/testfiles/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf +++ b/testfiles/SingleFamilyHouse_TwoSpeed_ZoneAirBalance.idf @@ -132,8 +132,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -145,8 +147,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SmOffPSZ-MultiModeDX.idf b/testfiles/SmOffPSZ-MultiModeDX.idf index 48e189a53d8..b624291bfb0 100644 --- a/testfiles/SmOffPSZ-MultiModeDX.idf +++ b/testfiles/SmOffPSZ-MultiModeDX.idf @@ -89,8 +89,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -102,8 +104,10 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -115,8 +119,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SmOffPSZ.idf b/testfiles/SmOffPSZ.idf index 7fea31dd4b2..0418369b60f 100644 --- a/testfiles/SmOffPSZ.idf +++ b/testfiles/SmOffPSZ.idf @@ -100,8 +100,10 @@ , !- Name 10, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 9, !- End Month 30, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SmOffPSZ_OnOffStagedControl.idf b/testfiles/SmOffPSZ_OnOffStagedControl.idf index c58b92c2f95..ce8b9ed985f 100644 --- a/testfiles/SmOffPSZ_OnOffStagedControl.idf +++ b/testfiles/SmOffPSZ_OnOffStagedControl.idf @@ -101,8 +101,10 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SolarCollectorFlatPlateWater.idf b/testfiles/SolarCollectorFlatPlateWater.idf index bcc39c490a3..775cc91a362 100644 --- a/testfiles/SolarCollectorFlatPlateWater.idf +++ b/testfiles/SolarCollectorFlatPlateWater.idf @@ -66,8 +66,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year TUESDAY, !- Day of Week for Start Day YES, !- Use Weather File Holidays and Special Days YES, !- Use Weather File Daylight Saving Period @@ -79,8 +81,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year TUESDAY, !- Day of Week for Start Day YES, !- Use Weather File Holidays and Special Days YES, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SolarShadingTest.idf b/testfiles/SolarShadingTest.idf index 9b2bb70543a..693e030ebc8 100644 --- a/testfiles/SolarShadingTest.idf +++ b/testfiles/SolarShadingTest.idf @@ -111,8 +111,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SolarShadingTest_DisableSelfShading.idf b/testfiles/SolarShadingTest_DisableSelfShading.idf index a497fe2cc42..189fb105620 100644 --- a/testfiles/SolarShadingTest_DisableSelfShading.idf +++ b/testfiles/SolarShadingTest_DisableSelfShading.idf @@ -111,8 +111,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SolarShadingTest_DisableSelfShadingGroup.idf b/testfiles/SolarShadingTest_DisableSelfShadingGroup.idf index 5937b3fc76b..69f0d38c878 100644 --- a/testfiles/SolarShadingTest_DisableSelfShadingGroup.idf +++ b/testfiles/SolarShadingTest_DisableSelfShadingGroup.idf @@ -111,8 +111,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SolarShadingTest_ExternalFraction.idf b/testfiles/SolarShadingTest_ExternalFraction.idf index 1bdd01b88cd..adfa3485d62 100644 --- a/testfiles/SolarShadingTest_ExternalFraction.idf +++ b/testfiles/SolarShadingTest_ExternalFraction.idf @@ -111,8 +111,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SolarShadingTest_ImportedShading.idf b/testfiles/SolarShadingTest_ImportedShading.idf index a1cb0ddb24b..204de419418 100644 --- a/testfiles/SolarShadingTest_ImportedShading.idf +++ b/testfiles/SolarShadingTest_ImportedShading.idf @@ -111,8 +111,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SolarShadingTest_SQL.idf b/testfiles/SolarShadingTest_SQL.idf index ac3acd1a81b..4a0bcf7016f 100644 --- a/testfiles/SolarShadingTest_SQL.idf +++ b/testfiles/SolarShadingTest_SQL.idf @@ -111,8 +111,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SpectralAngularOpticalProperties_TableData.idf b/testfiles/SpectralAngularOpticalProperties_TableData.idf index 9777bc4014e..d0c92ebea76 100644 --- a/testfiles/SpectralAngularOpticalProperties_TableData.idf +++ b/testfiles/SpectralAngularOpticalProperties_TableData.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/StackedZonesWithInterzoneIRTLayers.idf b/testfiles/StackedZonesWithInterzoneIRTLayers.idf index cd5987e5763..00dee5f8e4b 100644 --- a/testfiles/StackedZonesWithInterzoneIRTLayers.idf +++ b/testfiles/StackedZonesWithInterzoneIRTLayers.idf @@ -81,15 +81,16 @@ , !- Name 6, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 6, !- End Month 2, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! Latitude {deg} ! Longitude {deg} diff --git a/testfiles/SteamSystemAutoSize.idf b/testfiles/SteamSystemAutoSize.idf index f7f18669392..18b6c38fb4c 100644 --- a/testfiles/SteamSystemAutoSize.idf +++ b/testfiles/SteamSystemAutoSize.idf @@ -129,9 +129,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 12, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period , !- Apply Weekend Holiday Rule @@ -142,9 +144,11 @@ , !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 5, !- End Month 5, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period , !- Apply Weekend Holiday Rule diff --git a/testfiles/StripMallZoneEvapCooler.idf b/testfiles/StripMallZoneEvapCooler.idf index 6cba460508b..0e22b77f3da 100644 --- a/testfiles/StripMallZoneEvapCooler.idf +++ b/testfiles/StripMallZoneEvapCooler.idf @@ -72,15 +72,16 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Monday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/StripMallZoneEvapCoolerAutosized.idf b/testfiles/StripMallZoneEvapCoolerAutosized.idf index 9b38a80b87a..20e8c02f6de 100644 --- a/testfiles/StripMallZoneEvapCoolerAutosized.idf +++ b/testfiles/StripMallZoneEvapCoolerAutosized.idf @@ -72,15 +72,16 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Monday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/SuperMarketDetailed_DesuperHeatingCoil.idf b/testfiles/SuperMarketDetailed_DesuperHeatingCoil.idf index da1cf10bc13..612367ab614 100644 --- a/testfiles/SuperMarketDetailed_DesuperHeatingCoil.idf +++ b/testfiles/SuperMarketDetailed_DesuperHeatingCoil.idf @@ -245,8 +245,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -258,8 +260,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SuperMarket_DesuperHeatingCoil.idf b/testfiles/SuperMarket_DesuperHeatingCoil.idf index db36caf9ad9..fd607042b83 100644 --- a/testfiles/SuperMarket_DesuperHeatingCoil.idf +++ b/testfiles/SuperMarket_DesuperHeatingCoil.idf @@ -245,8 +245,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -258,8 +260,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SuperMarket_DetailedEvapCondenser.idf b/testfiles/SuperMarket_DetailedEvapCondenser.idf index 63d2d817bd6..400f41d9bfb 100644 --- a/testfiles/SuperMarket_DetailedEvapCondenser.idf +++ b/testfiles/SuperMarket_DetailedEvapCondenser.idf @@ -254,8 +254,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -267,8 +269,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SuperMarket_DetailedWaterCondenser.idf b/testfiles/SuperMarket_DetailedWaterCondenser.idf index 647cd50d8fc..c2403dbd227 100644 --- a/testfiles/SuperMarket_DetailedWaterCondenser.idf +++ b/testfiles/SuperMarket_DetailedWaterCondenser.idf @@ -259,8 +259,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -272,8 +274,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SuperMarket_EvapCondenser.idf b/testfiles/SuperMarket_EvapCondenser.idf index fd2b3614430..941530526b6 100644 --- a/testfiles/SuperMarket_EvapCondenser.idf +++ b/testfiles/SuperMarket_EvapCondenser.idf @@ -245,8 +245,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -258,8 +260,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SuperMarket_SharedEvapCondenser.idf b/testfiles/SuperMarket_SharedEvapCondenser.idf index 5ebeae34f3a..341a849ff96 100644 --- a/testfiles/SuperMarket_SharedEvapCondenser.idf +++ b/testfiles/SuperMarket_SharedEvapCondenser.idf @@ -254,8 +254,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -267,8 +269,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SuperMarket_WaterCondenser.idf b/testfiles/SuperMarket_WaterCondenser.idf index 98377585af7..55855b7d448 100644 --- a/testfiles/SuperMarket_WaterCondenser.idf +++ b/testfiles/SuperMarket_WaterCondenser.idf @@ -252,8 +252,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -265,8 +267,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Supermarket.idf b/testfiles/Supermarket.idf index 3f9444b1425..e42c963554d 100644 --- a/testfiles/Supermarket.idf +++ b/testfiles/Supermarket.idf @@ -245,8 +245,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -258,8 +260,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SupermarketSecondary.idf b/testfiles/SupermarketSecondary.idf index ca46742666f..56eb169234a 100644 --- a/testfiles/SupermarketSecondary.idf +++ b/testfiles/SupermarketSecondary.idf @@ -266,8 +266,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -279,8 +281,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SupermarketSubCoolersVariableSuction.idf b/testfiles/SupermarketSubCoolersVariableSuction.idf index 2357924193d..9ebb03f6875 100644 --- a/testfiles/SupermarketSubCoolersVariableSuction.idf +++ b/testfiles/SupermarketSubCoolersVariableSuction.idf @@ -254,8 +254,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -267,8 +269,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SupermarketTranscriticalCO2.idf b/testfiles/SupermarketTranscriticalCO2.idf index d9a930e9401..9f9c136cb4e 100644 --- a/testfiles/SupermarketTranscriticalCO2.idf +++ b/testfiles/SupermarketTranscriticalCO2.idf @@ -246,8 +246,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -259,8 +261,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SupermarketTwoStageFlashIntercooler.idf b/testfiles/SupermarketTwoStageFlashIntercooler.idf index 6d4b50497b4..b51271bc6f4 100644 --- a/testfiles/SupermarketTwoStageFlashIntercooler.idf +++ b/testfiles/SupermarketTwoStageFlashIntercooler.idf @@ -249,8 +249,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -262,8 +264,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SupermarketTwoStageShellCoilIntercooler.idf b/testfiles/SupermarketTwoStageShellCoilIntercooler.idf index 5b6a467101e..8696df87d4e 100644 --- a/testfiles/SupermarketTwoStageShellCoilIntercooler.idf +++ b/testfiles/SupermarketTwoStageShellCoilIntercooler.idf @@ -249,8 +249,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -262,8 +264,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Supermarket_CascadeCond.idf b/testfiles/Supermarket_CascadeCond.idf index 4a9d7878e23..54fd68a7bcc 100644 --- a/testfiles/Supermarket_CascadeCond.idf +++ b/testfiles/Supermarket_CascadeCond.idf @@ -251,8 +251,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -264,8 +266,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Supermarket_Detailed.idf b/testfiles/Supermarket_Detailed.idf index 67778b5ae1d..382a23d38f9 100644 --- a/testfiles/Supermarket_Detailed.idf +++ b/testfiles/Supermarket_Detailed.idf @@ -252,8 +252,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -265,8 +267,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/Supermarket_SharedAirCondenser.idf b/testfiles/Supermarket_SharedAirCondenser.idf index 88442af3d3a..eb7cae5b92e 100644 --- a/testfiles/Supermarket_SharedAirCondenser.idf +++ b/testfiles/Supermarket_SharedAirCondenser.idf @@ -252,8 +252,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -265,8 +267,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SupplyPlenumVAV.idf b/testfiles/SupplyPlenumVAV.idf index 10a2d9d0130..3667dad33a7 100644 --- a/testfiles/SupplyPlenumVAV.idf +++ b/testfiles/SupplyPlenumVAV.idf @@ -107,8 +107,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SurfaceGroundHeatExchanger.idf b/testfiles/SurfaceGroundHeatExchanger.idf index 7423a015a82..aca673371ff 100644 --- a/testfiles/SurfaceGroundHeatExchanger.idf +++ b/testfiles/SurfaceGroundHeatExchanger.idf @@ -135,8 +135,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -148,8 +150,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/SurfaceHeatSourceTerm_RefBldgSmallOfficeNew2004.idf b/testfiles/SurfaceHeatSourceTerm_RefBldgSmallOfficeNew2004.idf index 482d0952f2f..6320169f4e2 100644 --- a/testfiles/SurfaceHeatSourceTerm_RefBldgSmallOfficeNew2004.idf +++ b/testfiles/SurfaceHeatSourceTerm_RefBldgSmallOfficeNew2004.idf @@ -91,15 +91,16 @@ Annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/SurfacePropTest_SurfLWR.idf b/testfiles/SurfacePropTest_SurfLWR.idf index 1790111c3bf..d29d68bbdd5 100644 --- a/testfiles/SurfacePropTest_SurfLWR.idf +++ b/testfiles/SurfacePropTest_SurfLWR.idf @@ -115,9 +115,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/SurfaceTest.idf b/testfiles/SurfaceTest.idf index 70dc99ac9ee..3e6f4de2abc 100644 --- a/testfiles/SurfaceTest.idf +++ b/testfiles/SurfaceTest.idf @@ -115,9 +115,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/SurfaceZonePropTest_LocalEnv.idf b/testfiles/SurfaceZonePropTest_LocalEnv.idf index bf544f3b162..caac2cf54d5 100644 --- a/testfiles/SurfaceZonePropTest_LocalEnv.idf +++ b/testfiles/SurfaceZonePropTest_LocalEnv.idf @@ -115,9 +115,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/TRHConstFlowChillerOneBranch.idf b/testfiles/TRHConstFlowChillerOneBranch.idf index d3cf865d2db..b41626d2227 100644 --- a/testfiles/TRHConstFlowChillerOneBranch.idf +++ b/testfiles/TRHConstFlowChillerOneBranch.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TRHEvapCoolerOAStaged.idf b/testfiles/TRHEvapCoolerOAStaged.idf index a603120fd6d..8f5894ab95f 100644 --- a/testfiles/TRHEvapCoolerOAStaged.idf +++ b/testfiles/TRHEvapCoolerOAStaged.idf @@ -136,8 +136,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TRHEvapCoolerOAStagedWetCoil.idf b/testfiles/TRHEvapCoolerOAStagedWetCoil.idf index 6fbdcaab391..9f2dcb25bdf 100644 --- a/testfiles/TRHEvapCoolerOAStagedWetCoil.idf +++ b/testfiles/TRHEvapCoolerOAStagedWetCoil.idf @@ -136,8 +136,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermRHDXSystem.idf b/testfiles/TermRHDXSystem.idf index 7a5142850bc..ac6f6f50855 100644 --- a/testfiles/TermRHDXSystem.idf +++ b/testfiles/TermRHDXSystem.idf @@ -139,8 +139,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -152,8 +154,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermRHGasElecCoils.idf b/testfiles/TermRHGasElecCoils.idf index a2ed436b32b..6f360d63d6f 100644 --- a/testfiles/TermRHGasElecCoils.idf +++ b/testfiles/TermRHGasElecCoils.idf @@ -131,8 +131,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -144,8 +146,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermReheat.idf b/testfiles/TermReheat.idf index daaccf776c1..57a082b941c 100644 --- a/testfiles/TermReheat.idf +++ b/testfiles/TermReheat.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -143,8 +145,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermReheatPri-SecLoop.idf b/testfiles/TermReheatPri-SecLoop.idf index 76b10a161a2..59999d0b4a7 100644 --- a/testfiles/TermReheatPri-SecLoop.idf +++ b/testfiles/TermReheatPri-SecLoop.idf @@ -135,8 +135,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermReheatScheduledPump.idf b/testfiles/TermReheatScheduledPump.idf index 0cad973a8a6..ef61afe1081 100644 --- a/testfiles/TermReheatScheduledPump.idf +++ b/testfiles/TermReheatScheduledPump.idf @@ -141,8 +141,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -154,8 +156,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermReheatSurfTC.idf b/testfiles/TermReheatSurfTC.idf index 008e15b984f..303bddd2789 100644 --- a/testfiles/TermReheatSurfTC.idf +++ b/testfiles/TermReheatSurfTC.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermRhDualSetpointWithDB.idf b/testfiles/TermRhDualSetpointWithDB.idf index e3635edb6ef..0cbdfd0d23f 100644 --- a/testfiles/TermRhDualSetpointWithDB.idf +++ b/testfiles/TermRhDualSetpointWithDB.idf @@ -142,8 +142,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -155,8 +157,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermRhGenericOAHeatRecMinExh.idf b/testfiles/TermRhGenericOAHeatRecMinExh.idf index 30a143688e3..724756209fe 100644 --- a/testfiles/TermRhGenericOAHeatRecMinExh.idf +++ b/testfiles/TermRhGenericOAHeatRecMinExh.idf @@ -127,8 +127,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -140,8 +142,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermRhGenericOAHeatRecPreheat.idf b/testfiles/TermRhGenericOAHeatRecPreheat.idf index f21bace7df9..57c81937241 100644 --- a/testfiles/TermRhGenericOAHeatRecPreheat.idf +++ b/testfiles/TermRhGenericOAHeatRecPreheat.idf @@ -127,8 +127,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -140,8 +142,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TermRhSingleHeatCoolNoDB.idf b/testfiles/TermRhSingleHeatCoolNoDB.idf index 04b549f751a..c1ef84c1bc9 100644 --- a/testfiles/TermRhSingleHeatCoolNoDB.idf +++ b/testfiles/TermRhSingleHeatCoolNoDB.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -149,8 +151,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ThermalChimneyTest.idf b/testfiles/ThermalChimneyTest.idf index d54cc398ce6..cb5a16720ff 100644 --- a/testfiles/ThermalChimneyTest.idf +++ b/testfiles/ThermalChimneyTest.idf @@ -180,8 +180,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ThermochromicWindow.idf b/testfiles/ThermochromicWindow.idf index 15f0b3a1243..0191735ec18 100644 --- a/testfiles/ThermochromicWindow.idf +++ b/testfiles/ThermochromicWindow.idf @@ -96,15 +96,16 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators SurfaceConvectionAlgorithm:Inside,TARP; diff --git a/testfiles/TranspiredCollectors.idf b/testfiles/TranspiredCollectors.idf index 1cf6132c449..f8cab44c020 100644 --- a/testfiles/TranspiredCollectors.idf +++ b/testfiles/TranspiredCollectors.idf @@ -45,8 +45,10 @@ , !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 14, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -58,8 +60,10 @@ , !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 14, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/TwoWayCommonPipe_Pri-Sec.idf b/testfiles/TwoWayCommonPipe_Pri-Sec.idf index f7ffa078c66..7636c1f33c5 100644 --- a/testfiles/TwoWayCommonPipe_Pri-Sec.idf +++ b/testfiles/TwoWayCommonPipe_Pri-Sec.idf @@ -158,8 +158,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -171,8 +173,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitHeater.idf b/testfiles/UnitHeater.idf index 463eb7a0a16..8e67b2a4c27 100644 --- a/testfiles/UnitHeater.idf +++ b/testfiles/UnitHeater.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitHeaterAuto.idf b/testfiles/UnitHeaterAuto.idf index 930e447c00e..1af9bb11112 100644 --- a/testfiles/UnitHeaterAuto.idf +++ b/testfiles/UnitHeaterAuto.idf @@ -117,8 +117,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitHeaterGasElec.idf b/testfiles/UnitHeaterGasElec.idf index c199c397a89..46767a81151 100644 --- a/testfiles/UnitHeaterGasElec.idf +++ b/testfiles/UnitHeaterGasElec.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitVent5Zone.idf b/testfiles/UnitVent5Zone.idf index be7445e29b0..3cfadbc0113 100644 --- a/testfiles/UnitVent5Zone.idf +++ b/testfiles/UnitVent5Zone.idf @@ -129,8 +129,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitVent5ZoneAuto.idf b/testfiles/UnitVent5ZoneAuto.idf index ec95fc52b8a..99bdc9406cb 100644 --- a/testfiles/UnitVent5ZoneAuto.idf +++ b/testfiles/UnitVent5ZoneAuto.idf @@ -129,8 +129,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -142,8 +144,10 @@ July7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitVent5ZoneFixedOANoCoilOpt.idf b/testfiles/UnitVent5ZoneFixedOANoCoilOpt.idf index 0e5acd0713d..4ca6d77aed2 100644 --- a/testfiles/UnitVent5ZoneFixedOANoCoilOpt.idf +++ b/testfiles/UnitVent5ZoneFixedOANoCoilOpt.idf @@ -129,8 +129,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitaryHybridAC_DedicatedOutsideAir.idf b/testfiles/UnitaryHybridAC_DedicatedOutsideAir.idf index 258780e09ba..8b89dde8e45 100644 --- a/testfiles/UnitaryHybridAC_DedicatedOutsideAir.idf +++ b/testfiles/UnitaryHybridAC_DedicatedOutsideAir.idf @@ -152,8 +152,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitarySystem_5ZoneWaterLoopHeatPump.idf b/testfiles/UnitarySystem_5ZoneWaterLoopHeatPump.idf index 6be7cdebce8..18e82ed0d28 100644 --- a/testfiles/UnitarySystem_5ZoneWaterLoopHeatPump.idf +++ b/testfiles/UnitarySystem_5ZoneWaterLoopHeatPump.idf @@ -167,8 +167,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -180,8 +182,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitarySystem_DXCoilSystemAuto.idf b/testfiles/UnitarySystem_DXCoilSystemAuto.idf index faa0e355dd9..fbd4d8f6236 100644 --- a/testfiles/UnitarySystem_DXCoilSystemAuto.idf +++ b/testfiles/UnitarySystem_DXCoilSystemAuto.idf @@ -131,8 +131,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -144,8 +146,10 @@ July7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitarySystem_FurnaceWithDXSystemRHcontrol.idf b/testfiles/UnitarySystem_FurnaceWithDXSystemRHcontrol.idf index cf5d64b5391..342034e8876 100644 --- a/testfiles/UnitarySystem_FurnaceWithDXSystemRHcontrol.idf +++ b/testfiles/UnitarySystem_FurnaceWithDXSystemRHcontrol.idf @@ -227,8 +227,10 @@ Jan4, !- Name 1, !- Begin Month 4, !- Begin Day of Month + , !- Begin Year 1, !- End Month 4, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -240,8 +242,10 @@ Mar22, !- Name 3, !- Begin Month 22, !- Begin Day of Month + , !- Begin Year 3, !- End Month 22, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -253,8 +257,10 @@ Jul7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitarySystem_HeatPumpAuto.idf b/testfiles/UnitarySystem_HeatPumpAuto.idf index e0701b91737..26340b594e8 100644 --- a/testfiles/UnitarySystem_HeatPumpAuto.idf +++ b/testfiles/UnitarySystem_HeatPumpAuto.idf @@ -133,8 +133,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -146,8 +148,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitarySystem_MultiSpeedCoils_SingleMode.idf b/testfiles/UnitarySystem_MultiSpeedCoils_SingleMode.idf index ca68d7187dd..f18d706372e 100644 --- a/testfiles/UnitarySystem_MultiSpeedCoils_SingleMode.idf +++ b/testfiles/UnitarySystem_MultiSpeedCoils_SingleMode.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitarySystem_VSHeatPumpWaterToAirEquationFit.idf b/testfiles/UnitarySystem_VSHeatPumpWaterToAirEquationFit.idf index 71bbfb9383c..697df26d9c2 100644 --- a/testfiles/UnitarySystem_VSHeatPumpWaterToAirEquationFit.idf +++ b/testfiles/UnitarySystem_VSHeatPumpWaterToAirEquationFit.idf @@ -1925,8 +1925,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -1938,8 +1940,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UnitarySystem_WaterCoils_wMultiSpeedFan.idf b/testfiles/UnitarySystem_WaterCoils_wMultiSpeedFan.idf index 5d4af242bda..15b682a0aff 100644 --- a/testfiles/UnitarySystem_WaterCoils_wMultiSpeedFan.idf +++ b/testfiles/UnitarySystem_WaterCoils_wMultiSpeedFan.idf @@ -263,8 +263,10 @@ , !- Name 1, !- Begin Month 4, !- Begin Day of Month + , !- Begin Year 1, !- End Month 4, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -276,8 +278,10 @@ , !- Name 3, !- Begin Month 22, !- Begin Day of Month + , !- Begin Year 3, !- End Month 22, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period @@ -289,8 +293,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year , !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/UserDefinedRoomAirPatterns.idf b/testfiles/UserDefinedRoomAirPatterns.idf index d075b12ad9a..6ad12e70758 100644 --- a/testfiles/UserDefinedRoomAirPatterns.idf +++ b/testfiles/UserDefinedRoomAirPatterns.idf @@ -74,8 +74,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VAVSingleDuctConstFlowBoiler.idf b/testfiles/VAVSingleDuctConstFlowBoiler.idf index b7fe1035e77..b0ac69d2c42 100644 --- a/testfiles/VAVSingleDuctConstFlowBoiler.idf +++ b/testfiles/VAVSingleDuctConstFlowBoiler.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VAVSingleDuctReheat.idf b/testfiles/VAVSingleDuctReheat.idf index 62f73873724..f75d8dba307 100644 --- a/testfiles/VAVSingleDuctReheat.idf +++ b/testfiles/VAVSingleDuctReheat.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -150,8 +152,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VAVSingleDuctReheatBaseboard.idf b/testfiles/VAVSingleDuctReheatBaseboard.idf index 7a6e04a4827..58af919a984 100644 --- a/testfiles/VAVSingleDuctReheatBaseboard.idf +++ b/testfiles/VAVSingleDuctReheatBaseboard.idf @@ -135,8 +135,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -148,8 +150,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VAVSingleDuctReheatNoReheat.idf b/testfiles/VAVSingleDuctReheatNoReheat.idf index 12ae42258db..f662dbca9dc 100644 --- a/testfiles/VAVSingleDuctReheatNoReheat.idf +++ b/testfiles/VAVSingleDuctReheatNoReheat.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -149,8 +151,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VAVSingleDuctReheat_DualMax.idf b/testfiles/VAVSingleDuctReheat_DualMax.idf index 1bb7aff80de..cfb28f1d784 100644 --- a/testfiles/VAVSingleDuctReheat_DualMax.idf +++ b/testfiles/VAVSingleDuctReheat_DualMax.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VAVSingleDuctReheat_MaxSAT_ReverseActing.idf b/testfiles/VAVSingleDuctReheat_MaxSAT_ReverseActing.idf index 4656ff3d346..2b44d99c307 100644 --- a/testfiles/VAVSingleDuctReheat_MaxSAT_ReverseActing.idf +++ b/testfiles/VAVSingleDuctReheat_MaxSAT_ReverseActing.idf @@ -166,8 +166,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -179,8 +181,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VAVSingleDuctVarFlowBoiler.idf b/testfiles/VAVSingleDuctVarFlowBoiler.idf index c980926fd7c..f67d3552c45 100644 --- a/testfiles/VAVSingleDuctVarFlowBoiler.idf +++ b/testfiles/VAVSingleDuctVarFlowBoiler.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VSDXCoilSystemAuto.idf b/testfiles/VSDXCoilSystemAuto.idf index 03b5139231a..d3ac3269b31 100644 --- a/testfiles/VSDXCoilSystemAuto.idf +++ b/testfiles/VSDXCoilSystemAuto.idf @@ -717,8 +717,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -730,8 +732,10 @@ July7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VSHeatPumpWaterHeater.idf b/testfiles/VSHeatPumpWaterHeater.idf index c1bb71e4856..ed1cb9da264 100644 --- a/testfiles/VSHeatPumpWaterHeater.idf +++ b/testfiles/VSHeatPumpWaterHeater.idf @@ -194,8 +194,10 @@ Jan14, !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -207,8 +209,10 @@ July7, !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VSHeatPumpWaterToAirEquationFit.idf b/testfiles/VSHeatPumpWaterToAirEquationFit.idf index 19b89ee5017..1177e9c5239 100644 --- a/testfiles/VSHeatPumpWaterToAirEquationFit.idf +++ b/testfiles/VSHeatPumpWaterToAirEquationFit.idf @@ -1884,8 +1884,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -1897,8 +1899,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VSHeatPumpWaterToAirWithRHControl.idf b/testfiles/VSHeatPumpWaterToAirWithRHControl.idf index 314e4dc2231..d10fbe4339c 100644 --- a/testfiles/VSHeatPumpWaterToAirWithRHControl.idf +++ b/testfiles/VSHeatPumpWaterToAirWithRHControl.idf @@ -1897,8 +1897,10 @@ , !- Name 1, !- Begin Month 3, !- Begin Day of Month + , !- Begin Year 1, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -1910,8 +1912,10 @@ , !- Name 7, !- Begin Month 3, !- Begin Day of Month + , !- Begin Year 7, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VSWaterHeaterHeatPumpStratifiedTank.idf b/testfiles/VSWaterHeaterHeatPumpStratifiedTank.idf index 6c0c1a17fb2..1044cc47642 100644 --- a/testfiles/VSWaterHeaterHeatPumpStratifiedTank.idf +++ b/testfiles/VSWaterHeaterHeatPumpStratifiedTank.idf @@ -99,8 +99,10 @@ April, !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VariableRefrigerantFlow_5Zone.idf b/testfiles/VariableRefrigerantFlow_5Zone.idf index 2c550db16b7..2ec25909f0e 100644 --- a/testfiles/VariableRefrigerantFlow_5Zone.idf +++ b/testfiles/VariableRefrigerantFlow_5Zone.idf @@ -974,8 +974,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 4, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -987,8 +989,10 @@ , !- Name 2, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 4, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VariableRefrigerantFlow_FluidTCtrl_5Zone.idf b/testfiles/VariableRefrigerantFlow_FluidTCtrl_5Zone.idf index afa72b7d00f..5ba10413a68 100644 --- a/testfiles/VariableRefrigerantFlow_FluidTCtrl_5Zone.idf +++ b/testfiles/VariableRefrigerantFlow_FluidTCtrl_5Zone.idf @@ -2055,8 +2055,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -2068,8 +2070,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VariableRefrigerantFlow_FluidTCtrl_HR_5Zone.idf b/testfiles/VariableRefrigerantFlow_FluidTCtrl_HR_5Zone.idf index 3ced43aab49..970f1e480c9 100644 --- a/testfiles/VariableRefrigerantFlow_FluidTCtrl_HR_5Zone.idf +++ b/testfiles/VariableRefrigerantFlow_FluidTCtrl_HR_5Zone.idf @@ -2074,8 +2074,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -2087,8 +2089,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VaryingLocationAndOrientation.idf b/testfiles/VaryingLocationAndOrientation.idf index 4df0983e3eb..d15b71fd248 100644 --- a/testfiles/VaryingLocationAndOrientation.idf +++ b/testfiles/VaryingLocationAndOrientation.idf @@ -26,8 +26,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 2, !- End Month 28, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VentilatedSlab.idf b/testfiles/VentilatedSlab.idf index 527b07ddf97..17adb273efd 100644 --- a/testfiles/VentilatedSlab.idf +++ b/testfiles/VentilatedSlab.idf @@ -209,8 +209,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/VentilatedSlab_SeriesSlabs.idf b/testfiles/VentilatedSlab_SeriesSlabs.idf index e49de8b2016..bf1e2988701 100644 --- a/testfiles/VentilatedSlab_SeriesSlabs.idf +++ b/testfiles/VentilatedSlab_SeriesSlabs.idf @@ -220,9 +220,11 @@ , !- Name 7, !- Begin Month 5, !- Begin Day of Month + , !- Begin Year 7, !- End Month 12, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/VentilationSimpleTest.idf b/testfiles/VentilationSimpleTest.idf index 2b389d0544a..a63c2c529c0 100644 --- a/testfiles/VentilationSimpleTest.idf +++ b/testfiles/VentilationSimpleTest.idf @@ -53,8 +53,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WCE_Diffuse_Shade.idf b/testfiles/WCE_Diffuse_Shade.idf index 07c5c7d5496..8afe7ca2952 100644 --- a/testfiles/WCE_Diffuse_Shade.idf +++ b/testfiles/WCE_Diffuse_Shade.idf @@ -87,9 +87,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/WCE_DoubleClear_BSDF.idf b/testfiles/WCE_DoubleClear_BSDF.idf index ed6ff2fd801..95223891f22 100644 --- a/testfiles/WCE_DoubleClear_BSDF.idf +++ b/testfiles/WCE_DoubleClear_BSDF.idf @@ -84,9 +84,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/WCE_Interior_VB_-45_deg.idf b/testfiles/WCE_Interior_VB_-45_deg.idf index 3494915e17c..3ed4dc0d62f 100644 --- a/testfiles/WCE_Interior_VB_-45_deg.idf +++ b/testfiles/WCE_Interior_VB_-45_deg.idf @@ -87,9 +87,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule diff --git a/testfiles/WWHPSimpleAuto.idf b/testfiles/WWHPSimpleAuto.idf index c46e257edfb..4e75a204694 100644 --- a/testfiles/WWHPSimpleAuto.idf +++ b/testfiles/WWHPSimpleAuto.idf @@ -131,9 +131,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 11, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule @@ -144,9 +146,11 @@ , !- Name 7, !- Begin Month 15, !- Begin Day of Month + , !- Begin Year 7, !- End Month 25, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/WaterHeaterDHWPlantLoop.idf b/testfiles/WaterHeaterDHWPlantLoop.idf index 0d368db6716..08d9dc62b6b 100644 --- a/testfiles/WaterHeaterDHWPlantLoop.idf +++ b/testfiles/WaterHeaterDHWPlantLoop.idf @@ -103,8 +103,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WaterHeaterHeatPumpStratifiedTank.idf b/testfiles/WaterHeaterHeatPumpStratifiedTank.idf index 3dc7838265f..fab4c72aace 100644 --- a/testfiles/WaterHeaterHeatPumpStratifiedTank.idf +++ b/testfiles/WaterHeaterHeatPumpStratifiedTank.idf @@ -99,8 +99,10 @@ April, !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WaterHeaterHeatPumpWrappedCondenser.idf b/testfiles/WaterHeaterHeatPumpWrappedCondenser.idf index ad43d5d8c2a..c2c31473a89 100644 --- a/testfiles/WaterHeaterHeatPumpWrappedCondenser.idf +++ b/testfiles/WaterHeaterHeatPumpWrappedCondenser.idf @@ -108,8 +108,10 @@ April, !- Name 4, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 4, !- End Month 3, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WaterHeaterStandAlone.idf b/testfiles/WaterHeaterStandAlone.idf index 88150a09e1c..728e078dedf 100644 --- a/testfiles/WaterHeaterStandAlone.idf +++ b/testfiles/WaterHeaterStandAlone.idf @@ -111,8 +111,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WaterSideEconomizer_Integrated.idf b/testfiles/WaterSideEconomizer_Integrated.idf index 475011be68e..c6aed9da326 100644 --- a/testfiles/WaterSideEconomizer_Integrated.idf +++ b/testfiles/WaterSideEconomizer_Integrated.idf @@ -169,8 +169,10 @@ April, !- Name 3, !- Begin Month 31, !- Begin Day of Month + , !- Begin Year 4, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WaterSideEconomizer_NonIntegrated.idf b/testfiles/WaterSideEconomizer_NonIntegrated.idf index b7048ff7822..855a04eb1da 100644 --- a/testfiles/WaterSideEconomizer_NonIntegrated.idf +++ b/testfiles/WaterSideEconomizer_NonIntegrated.idf @@ -169,8 +169,10 @@ April, !- Name 3, !- Begin Month 31, !- Begin Day of Month + , !- Begin Year 4, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WeatherTimeBins.idf b/testfiles/WeatherTimeBins.idf index 3b1b138b5e6..5ee471cfefc 100644 --- a/testfiles/WeatherTimeBins.idf +++ b/testfiles/WeatherTimeBins.idf @@ -114,8 +114,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year , !- Day of Week for Start Day , !- Use Weather File Holidays and Special Days , !- Use Weather File Daylight Saving Period diff --git a/testfiles/WindACAirtoAir.idf b/testfiles/WindACAirtoAir.idf index 08dd89070b9..729900c6045 100644 --- a/testfiles/WindACAirtoAir.idf +++ b/testfiles/WindACAirtoAir.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -132,8 +134,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WindACAuto.idf b/testfiles/WindACAuto.idf index bf6f5b6fa0a..73a5c547022 100644 --- a/testfiles/WindACAuto.idf +++ b/testfiles/WindACAuto.idf @@ -122,8 +122,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -135,8 +137,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WindACRHControl.idf b/testfiles/WindACRHControl.idf index 73eaf9824d5..c95eb1e0001 100644 --- a/testfiles/WindACRHControl.idf +++ b/testfiles/WindACRHControl.idf @@ -132,8 +132,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -145,8 +147,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WindowTests.idf b/testfiles/WindowTests.idf index 93c70f2361d..7d092eb9959 100644 --- a/testfiles/WindowTests.idf +++ b/testfiles/WindowTests.idf @@ -151,8 +151,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -164,8 +166,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/WindowTestsSimple.idf b/testfiles/WindowTestsSimple.idf index 52dec9cc2fd..b564fc28a83 100644 --- a/testfiles/WindowTestsSimple.idf +++ b/testfiles/WindowTestsSimple.idf @@ -150,8 +150,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -163,8 +165,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneCoupledGroundHTBasement.idf b/testfiles/ZoneCoupledGroundHTBasement.idf index f40ff054ef8..c4df287ef47 100644 --- a/testfiles/ZoneCoupledGroundHTBasement.idf +++ b/testfiles/ZoneCoupledGroundHTBasement.idf @@ -167,8 +167,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneCoupledGroundHTSlabInGrade.idf b/testfiles/ZoneCoupledGroundHTSlabInGrade.idf index f9b148d60eb..9f0881f0b45 100644 --- a/testfiles/ZoneCoupledGroundHTSlabInGrade.idf +++ b/testfiles/ZoneCoupledGroundHTSlabInGrade.idf @@ -146,8 +146,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneCoupledGroundHTSlabOnGrade.idf b/testfiles/ZoneCoupledGroundHTSlabOnGrade.idf index 5b671be6626..cb6227a4d18 100644 --- a/testfiles/ZoneCoupledGroundHTSlabOnGrade.idf +++ b/testfiles/ZoneCoupledGroundHTSlabOnGrade.idf @@ -146,8 +146,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneCoupledKivaBasement.idf b/testfiles/ZoneCoupledKivaBasement.idf index c29a0145bde..221f469bf96 100644 --- a/testfiles/ZoneCoupledKivaBasement.idf +++ b/testfiles/ZoneCoupledKivaBasement.idf @@ -166,8 +166,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneCoupledKivaRefBldgMediumOffice.idf b/testfiles/ZoneCoupledKivaRefBldgMediumOffice.idf index 53e9cde7cd6..93d8a983549 100644 --- a/testfiles/ZoneCoupledKivaRefBldgMediumOffice.idf +++ b/testfiles/ZoneCoupledKivaRefBldgMediumOffice.idf @@ -92,15 +92,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1.0000; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! ***HOLIDAYS & DAYLIGHT SAVINGS*** diff --git a/testfiles/ZoneCoupledKivaSlab.idf b/testfiles/ZoneCoupledKivaSlab.idf index 5869d97b19e..dc929bf4c6c 100644 --- a/testfiles/ZoneCoupledKivaSlab.idf +++ b/testfiles/ZoneCoupledKivaSlab.idf @@ -146,8 +146,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneCoupledKivaWalkoutBasement.idf b/testfiles/ZoneCoupledKivaWalkoutBasement.idf index 5fc164d9b7d..7eb235eb483 100644 --- a/testfiles/ZoneCoupledKivaWalkoutBasement.idf +++ b/testfiles/ZoneCoupledKivaWalkoutBasement.idf @@ -166,8 +166,10 @@ Annual Run, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneSysAvailManager.idf b/testfiles/ZoneSysAvailManager.idf index 5e0871eec72..18a8c9bd567 100644 --- a/testfiles/ZoneSysAvailManager.idf +++ b/testfiles/ZoneSysAvailManager.idf @@ -116,8 +116,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneVSWSHP_wDOAS.idf b/testfiles/ZoneVSWSHP_wDOAS.idf index 7da0602590b..2c5668413a7 100644 --- a/testfiles/ZoneVSWSHP_wDOAS.idf +++ b/testfiles/ZoneVSWSHP_wDOAS.idf @@ -606,8 +606,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/ZoneWSHP_wDOAS.idf b/testfiles/ZoneWSHP_wDOAS.idf index 20471b13e34..dbbdd795c51 100644 --- a/testfiles/ZoneWSHP_wDOAS.idf +++ b/testfiles/ZoneWSHP_wDOAS.idf @@ -117,8 +117,10 @@ annual, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_1ZoneUncontrolled_Feb29.idf b/testfiles/_1ZoneUncontrolled_Feb29.idf index 2a14ff2fc13..f0dba8de034 100644 --- a/testfiles/_1ZoneUncontrolled_Feb29.idf +++ b/testfiles/_1ZoneUncontrolled_Feb29.idf @@ -119,8 +119,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_1ZoneUncontrolled_SineOSC.idf b/testfiles/_1ZoneUncontrolled_SineOSC.idf index a4ee0af5146..69723796d82 100644 --- a/testfiles/_1ZoneUncontrolled_SineOSC.idf +++ b/testfiles/_1ZoneUncontrolled_SineOSC.idf @@ -115,8 +115,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_1ZoneUncontrolled_customrange.idf b/testfiles/_1ZoneUncontrolled_customrange.idf index 1b950290d77..b7cc6c8a5f9 100644 --- a/testfiles/_1ZoneUncontrolled_customrange.idf +++ b/testfiles/_1ZoneUncontrolled_customrange.idf @@ -120,8 +120,10 @@ Windsor, !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Thursday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_1Zone_Heavy_AdiabaticX2.idf b/testfiles/_1Zone_Heavy_AdiabaticX2.idf index 4bd96c91b91..9f25af5005c 100644 --- a/testfiles/_1Zone_Heavy_AdiabaticX2.idf +++ b/testfiles/_1Zone_Heavy_AdiabaticX2.idf @@ -37,15 +37,16 @@ , !- Name 1, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 2, !- End Month 10, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! Denver Stapleton Intl Arpt CO USA Annual Heating Design Conditions Wind Speed=2.3m/s Wind Dir=180 ! Coldest Month=December diff --git a/testfiles/_1Zone_Heavy_MassX2.idf b/testfiles/_1Zone_Heavy_MassX2.idf index c173695bc51..3c4660bfc01 100644 --- a/testfiles/_1Zone_Heavy_MassX2.idf +++ b/testfiles/_1Zone_Heavy_MassX2.idf @@ -37,15 +37,16 @@ , !- Name 1, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 2, !- End Month 10, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! Denver Stapleton Intl Arpt CO USA Annual Heating Design Conditions Wind Speed=2.3m/s Wind Dir=180 ! Coldest Month=December diff --git a/testfiles/_1Zone_Heavy_SelfRef.idf b/testfiles/_1Zone_Heavy_SelfRef.idf index 78594b80656..6bbc29eb0b6 100644 --- a/testfiles/_1Zone_Heavy_SelfRef.idf +++ b/testfiles/_1Zone_Heavy_SelfRef.idf @@ -37,15 +37,16 @@ , !- Name 1, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 2, !- End Month 10, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators ! Denver Stapleton Intl Arpt CO USA Annual Heating Design Conditions Wind Speed=2.3m/s Wind Dir=180 ! Coldest Month=December diff --git a/testfiles/_5ZoneAirCooled_annual.idf b/testfiles/_5ZoneAirCooled_annual.idf index 793c9aa7231..3037a438386 100644 --- a/testfiles/_5ZoneAirCooled_annual.idf +++ b/testfiles/_5ZoneAirCooled_annual.idf @@ -163,9 +163,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + 2019, !- Begin Year 12, !- End Month 31, !- End Day of Month - Tuesday, !- Day of Week for Start Day + 2019, !- End Year + , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period No, !- Apply Weekend Holiday Rule diff --git a/testfiles/_5ZoneEvapCooled.idf b/testfiles/_5ZoneEvapCooled.idf index 555c6b9a6ca..6e0bcd17a9b 100644 --- a/testfiles/_5ZoneEvapCooled.idf +++ b/testfiles/_5ZoneEvapCooled.idf @@ -163,8 +163,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 8, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_AllOffOpScheme.idf b/testfiles/_AllOffOpScheme.idf index fa7b85e927d..9fb6989aea9 100644 --- a/testfiles/_AllOffOpScheme.idf +++ b/testfiles/_AllOffOpScheme.idf @@ -133,8 +133,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -146,8 +148,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_BranchPumpsWithCommonPipe.idf b/testfiles/_BranchPumpsWithCommonPipe.idf index f7ff78c7b09..f54f3f64630 100644 --- a/testfiles/_BranchPumpsWithCommonPipe.idf +++ b/testfiles/_BranchPumpsWithCommonPipe.idf @@ -136,8 +136,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_CTFTestsPart1.idf b/testfiles/_CTFTestsPart1.idf index 1ec8d582ba9..397805e731d 100644 --- a/testfiles/_CTFTestsPart1.idf +++ b/testfiles/_CTFTestsPart1.idf @@ -48,8 +48,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_CTFTestsPart2.idf b/testfiles/_CTFTestsPart2.idf index c4fe1cf0787..afa530bd14b 100644 --- a/testfiles/_CTFTestsPart2.idf +++ b/testfiles/_CTFTestsPart2.idf @@ -39,8 +39,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_ConvCoefftest.idf b/testfiles/_ConvCoefftest.idf index a96a1c8efc4..2ad398a554a 100644 --- a/testfiles/_ConvCoefftest.idf +++ b/testfiles/_ConvCoefftest.idf @@ -95,8 +95,10 @@ , !- Name 8, !- Begin Month 21, !- Begin Day of Month + , !- Begin Year 8, !- End Month 21, !- End Day of Month + , !- End Year , !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_CoolingTowerDewPointRangeOp.idf b/testfiles/_CoolingTowerDewPointRangeOp.idf index 7ea27f81c0e..5ba6f405c54 100644 --- a/testfiles/_CoolingTowerDewPointRangeOp.idf +++ b/testfiles/_CoolingTowerDewPointRangeOp.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_CoolingTowerWithDPDeltaTempOp.idf b/testfiles/_CoolingTowerWithDPDeltaTempOp.idf index 4e6e8f0a9eb..d9e87d60e32 100644 --- a/testfiles/_CoolingTowerWithDPDeltaTempOp.idf +++ b/testfiles/_CoolingTowerWithDPDeltaTempOp.idf @@ -163,8 +163,10 @@ , !- Name 1, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 1, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -176,8 +178,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_DOASDXCOIL_wUserSHRMethod.idf b/testfiles/_DOASDXCOIL_wUserSHRMethod.idf index ad560f619fb..71004b3c617 100644 --- a/testfiles/_DOASDXCOIL_wUserSHRMethod.idf +++ b/testfiles/_DOASDXCOIL_wUserSHRMethod.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -175,8 +177,10 @@ , !- Name 7, !- Begin Month 16, !- Begin Day of Month + , !- Begin Year 7, !- End Month 16, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_DemandVentilationFixedRateAndHighPriority.idf b/testfiles/_DemandVentilationFixedRateAndHighPriority.idf index 59f96fadb67..1039f45cbbf 100644 --- a/testfiles/_DemandVentilationFixedRateAndHighPriority.idf +++ b/testfiles/_DemandVentilationFixedRateAndHighPriority.idf @@ -166,8 +166,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -179,8 +181,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_DemandVentilationReductionRatioAndHighPriority.idf b/testfiles/_DemandVentilationReductionRatioAndHighPriority.idf index a2ee1dac9e6..ed82d09c2cb 100644 --- a/testfiles/_DemandVentilationReductionRatioAndHighPriority.idf +++ b/testfiles/_DemandVentilationReductionRatioAndHighPriority.idf @@ -166,8 +166,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -179,8 +181,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_DemandVentilationReductionRatioAndLowPriority.idf b/testfiles/_DemandVentilationReductionRatioAndLowPriority.idf index aac7a2de620..9ae2c8885a6 100644 --- a/testfiles/_DemandVentilationReductionRatioAndLowPriority.idf +++ b/testfiles/_DemandVentilationReductionRatioAndLowPriority.idf @@ -166,8 +166,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -179,8 +181,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_DualDuctConstVolDamperMultizoneAverageSetPointManager.idf b/testfiles/_DualDuctConstVolDamperMultizoneAverageSetPointManager.idf index 2a046d6c664..769b5d8a0e2 100644 --- a/testfiles/_DualDuctConstVolDamperMultizoneAverageSetPointManager.idf +++ b/testfiles/_DualDuctConstVolDamperMultizoneAverageSetPointManager.idf @@ -144,8 +144,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -157,8 +159,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_ElectricREformulatedEIRChiller.idf b/testfiles/_ElectricREformulatedEIRChiller.idf index a6e761c94e2..f25f30babbc 100644 --- a/testfiles/_ElectricREformulatedEIRChiller.idf +++ b/testfiles/_ElectricREformulatedEIRChiller.idf @@ -130,8 +130,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -143,8 +145,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_ExternalInterface-actuator.idf b/testfiles/_ExternalInterface-actuator.idf index b9e04b6e929..15254b5e42d 100644 --- a/testfiles/_ExternalInterface-actuator.idf +++ b/testfiles/_ExternalInterface-actuator.idf @@ -128,8 +128,10 @@ , !- Name 3, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 3, !- End Month 4, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_ExternalInterface-functionalmockupunit-to-actuator.idf b/testfiles/_ExternalInterface-functionalmockupunit-to-actuator.idf index 06b8d74eb0f..315ef05442f 100644 --- a/testfiles/_ExternalInterface-functionalmockupunit-to-actuator.idf +++ b/testfiles/_ExternalInterface-functionalmockupunit-to-actuator.idf @@ -136,8 +136,10 @@ , !- Name 3, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 3, !- End Month 4, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_ExternalInterface-functionalmockupunit-to-schedule.idf b/testfiles/_ExternalInterface-functionalmockupunit-to-schedule.idf index a6b79b4ac3a..ba9d67a9141 100644 --- a/testfiles/_ExternalInterface-functionalmockupunit-to-schedule.idf +++ b/testfiles/_ExternalInterface-functionalmockupunit-to-schedule.idf @@ -41,9 +41,11 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 1, !- End Month 2, !- End Day of Month - UseWeatherFile, !- Day of Week for Start Day + , !- End Year + Sunday, !- Day of Week for Start Day yes, !- Use Weather File Holidays and Special Days yes, !- Use Weather File Daylight Saving Period no, !- Apply Weekend Holiday Rule diff --git a/testfiles/_ExternalInterface-functionalmockupunit-to-variable.idf b/testfiles/_ExternalInterface-functionalmockupunit-to-variable.idf index e654677bb7f..6c41d8a533b 100644 --- a/testfiles/_ExternalInterface-functionalmockupunit-to-variable.idf +++ b/testfiles/_ExternalInterface-functionalmockupunit-to-variable.idf @@ -136,8 +136,10 @@ , !- Name 3, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 3, !- End Month 4, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_ExternalInterface-schedule.idf b/testfiles/_ExternalInterface-schedule.idf index c2e296280ea..e5e9666109a 100644 --- a/testfiles/_ExternalInterface-schedule.idf +++ b/testfiles/_ExternalInterface-schedule.idf @@ -108,8 +108,10 @@ , !- Name 6, !- Begin Month 16, !- Begin Day of Month + , !- Begin Year 6, !- End Month 19, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_ExternalInterface-variable.idf b/testfiles/_ExternalInterface-variable.idf index 2906755d852..47eff2bb52a 100644 --- a/testfiles/_ExternalInterface-variable.idf +++ b/testfiles/_ExternalInterface-variable.idf @@ -128,8 +128,10 @@ , !- Name 3, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 3, !- End Month 4, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_FanCoilHybridVentAFN.idf b/testfiles/_FanCoilHybridVentAFN.idf index ce309370161..980f6c9ae59 100644 --- a/testfiles/_FanCoilHybridVentAFN.idf +++ b/testfiles/_FanCoilHybridVentAFN.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -175,8 +177,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 11, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_FollowSysNodeTemp.idf b/testfiles/_FollowSysNodeTemp.idf index 75041ea4c7a..de21b30d853 100644 --- a/testfiles/_FollowSysNodeTemp.idf +++ b/testfiles/_FollowSysNodeTemp.idf @@ -137,8 +137,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -150,8 +152,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_FuelCellTest200.idf b/testfiles/_FuelCellTest200.idf index d1f96d031db..34347dcc1f8 100644 --- a/testfiles/_FuelCellTest200.idf +++ b/testfiles/_FuelCellTest200.idf @@ -39,15 +39,16 @@ , !- Name 1, !- Begin Month 9, !- Begin Day of Month + , !- Begin Year 1, !- End Month 9, !- End Day of Month + , !- End Year SUNDAY, !- Day of Week for Start Day NO, !- Use Weather File Holidays and Special Days NO, !- Use Weather File Daylight Saving Period NO, !- Apply Weekend Holiday Rule NO, !- Use Weather File Rain Indicators - NO, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + NO; !- Use Weather File Snow Indicators Timestep,12; diff --git a/testfiles/_HybridVentilationControlGlobalAN.idf b/testfiles/_HybridVentilationControlGlobalAN.idf index 79319e573d3..98204c68639 100644 --- a/testfiles/_HybridVentilationControlGlobalAN.idf +++ b/testfiles/_HybridVentilationControlGlobalAN.idf @@ -162,8 +162,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -175,8 +177,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 11, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_HybridVentilationControl_MinTime.idf b/testfiles/_HybridVentilationControl_MinTime.idf index 686125c0288..848d1ab2406 100644 --- a/testfiles/_HybridVentilationControl_MinTime.idf +++ b/testfiles/_HybridVentilationControl_MinTime.idf @@ -160,8 +160,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -173,8 +175,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_MaterialTest.idf b/testfiles/_MaterialTest.idf index 22f62b42e9e..dfa7ce5f1f3 100644 --- a/testfiles/_MaterialTest.idf +++ b/testfiles/_MaterialTest.idf @@ -44,8 +44,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_MicroCHPTest301.idf b/testfiles/_MicroCHPTest301.idf index d997c42838a..331fbfd34ff 100644 --- a/testfiles/_MicroCHPTest301.idf +++ b/testfiles/_MicroCHPTest301.idf @@ -36,15 +36,16 @@ , !- Name 1, !- Begin Month 9, !- Begin Day of Month + , !- Begin Year 1, !- End Month 9, !- End Day of Month + , !- End Year SUNDAY, !- Day of Week for Start Day NO, !- Use Weather File Holidays and Special Days NO, !- Use Weather File Daylight Saving Period NO, !- Apply Weekend Holiday Rule NO, !- Use Weather File Rain Indicators - NO, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + NO; !- Use Weather File Snow Indicators Timestep,6; diff --git a/testfiles/_MultiSpeedACElecFurnace.idf b/testfiles/_MultiSpeedACElecFurnace.idf index c0b45c453da..37ac8698e01 100644 --- a/testfiles/_MultiSpeedACElecFurnace.idf +++ b/testfiles/_MultiSpeedACElecFurnace.idf @@ -122,8 +122,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 14, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -135,8 +137,10 @@ , !- Name 7, !- Begin Month 7, !- Begin Day of Month + , !- Begin Year 7, !- End Month 7, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_PurchAirWindowBlind2.idf b/testfiles/_PurchAirWindowBlind2.idf index 1327f3f5aa6..60aa457a7a7 100644 --- a/testfiles/_PurchAirWindowBlind2.idf +++ b/testfiles/_PurchAirWindowBlind2.idf @@ -125,8 +125,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_PurchAirWindowBlind3.idf b/testfiles/_PurchAirWindowBlind3.idf index b46441ef11f..0416fdcc451 100644 --- a/testfiles/_PurchAirWindowBlind3.idf +++ b/testfiles/_PurchAirWindowBlind3.idf @@ -125,8 +125,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_PurchAirWindowBlind4.idf b/testfiles/_PurchAirWindowBlind4.idf index 0e218fca348..02984855d33 100644 --- a/testfiles/_PurchAirWindowBlind4.idf +++ b/testfiles/_PurchAirWindowBlind4.idf @@ -125,8 +125,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/testfiles/_SmallOffice_Dulles.idf b/testfiles/_SmallOffice_Dulles.idf index 56bba7700a9..8365dc04081 100644 --- a/testfiles/_SmallOffice_Dulles.idf +++ b/testfiles/_SmallOffice_Dulles.idf @@ -164,15 +164,16 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Wednesday, !- Day of Week for Start Day No, !- Use Weather File Holidays and Special Days No, !- Use Weather File Daylight Saving Period Yes, !- Apply Weekend Holiday Rule Yes, !- Use Weather File Rain Indicators - Yes, !- Use Weather File Snow Indicators - 1; !- Number of Times Runperiod to be Repeated + Yes; !- Use Weather File Snow Indicators RunPeriodControl:SpecialDays, New Years Day, !- Name diff --git a/testfiles/_VAVSingleDuctConstFlowBoiler_otherfuel.idf b/testfiles/_VAVSingleDuctConstFlowBoiler_otherfuel.idf index fd3c8f5e870..b46a92a0d07 100644 --- a/testfiles/_VAVSingleDuctConstFlowBoiler_otherfuel.idf +++ b/testfiles/_VAVSingleDuctConstFlowBoiler_otherfuel.idf @@ -134,8 +134,10 @@ , !- Name 1, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 1, !- End Month 20, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period @@ -147,8 +149,10 @@ , !- Name 7, !- Begin Month 14, !- Begin Day of Month + , !- Begin Year 7, !- End Month 20, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/tst/EnergyPlus/unit/AirTerminalSingleDuctPIUReheat.unit.cc b/tst/EnergyPlus/unit/AirTerminalSingleDuctPIUReheat.unit.cc index 4f559d8542c..a31d7c6efcb 100644 --- a/tst/EnergyPlus/unit/AirTerminalSingleDuctPIUReheat.unit.cc +++ b/tst/EnergyPlus/unit/AirTerminalSingleDuctPIUReheat.unit.cc @@ -433,15 +433,16 @@ TEST_F(EnergyPlusFixture, AirTerminalSingleDuctSeriesPIU_SimTest) " Run Period 1, !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 12, !- End Month", " 31, !- End Day of Month", + " , !- End Year", " Sunday, !- Day of Week for Start Day", " No, !- Use Weather File Holidays and Special Days", " No, !- Use Weather File Daylight Saving Period", " No, !- Apply Weekend Holiday Rule", " Yes, !- Use Weather File Rain Indicators", - " Yes, !- Use Weather File Snow Indicators", - " 1; !- Number of Times Runperiod to be Repeated", + " Yes; !- Use Weather File Snow Indicators", "Site:GroundTemperature:BuildingSurface,", " 21.5, !- January Ground Temperature {C}", diff --git a/tst/EnergyPlus/unit/AirflowNetworkBalanceManager.unit.cc b/tst/EnergyPlus/unit/AirflowNetworkBalanceManager.unit.cc index 6cb01c050c8..c9c129ca15b 100644 --- a/tst/EnergyPlus/unit/AirflowNetworkBalanceManager.unit.cc +++ b/tst/EnergyPlus/unit/AirflowNetworkBalanceManager.unit.cc @@ -3123,8 +3123,10 @@ TEST_F(EnergyPlusFixture, AirflowNetworkBalanceManager_AFNUserDefinedDuctViewFac " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", - " 12, !- End Month", + " , !- Begin Year", + " 12, !- End Month", " 31, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -4908,6 +4910,7 @@ TEST_F(EnergyPlusFixture, TestExternalNodes) " Surface_1, !- Building Surface Name", " , !- Outside Boundary Condition Object", " 0.5000000, !- View Factor to Ground", + " 4, !- Number of Vertices", " 0,6.096000,3.048000, !- X,Y,Z ==> Vertex 1 {m}", " 0,6.096000,0, !- X,Y,Z ==> Vertex 2 {m}", @@ -8083,16 +8086,16 @@ TEST_F(EnergyPlusFixture, BasicAdvancedSingleSided) " RunPeriod1, !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 12, !- End Month", " 31, !- End Day of Month", - " UseWeatherFile, !- Day of Week for Start Day", + " , !- End Year", + " Sunday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", " No, !- Apply Weekend Holiday Rule", " Yes, !- Use Weather File Rain Indicators", - " Yes, !- Use Weather File Snow Indicators", - " 1, !- Number of Times Runperiod to be Repeated", - " Yes; !- Increment Day of Week on repeat", + " Yes; !- Use Weather File Snow Indicators", "Material,", " F08 Metal surface, !- Name", " Smooth, !- Roughness", @@ -8550,9 +8553,11 @@ TEST_F(EnergyPlusFixture, MultiAirLoopTest) " RunPeriod,", " Spring run, !- Name", " 4, !- Begin Month", - " 1, !- Begin Day of Month", + " 1, !- Begin Day of Month", + " , !- Begin Year", " 4, !- End Month", - " 1, !- End Day of Month", + " 1, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -8564,8 +8569,10 @@ TEST_F(EnergyPlusFixture, MultiAirLoopTest) " Winter run, !- Name", " 1, !- Begin Month", " 14, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 14, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -8577,8 +8584,10 @@ TEST_F(EnergyPlusFixture, MultiAirLoopTest) " Summer run, !- Name", " 7, !- Begin Month", " 7, !- Begin Day of Month", + " , !- Begin Year", " 7, !- End Month", " 7, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -12120,16 +12129,16 @@ TEST_F(EnergyPlusFixture, BasicAdvancedSingleSidedAvoidCrashTest) " RunPeriod1, !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 12, !- End Month", " 31, !- End Day of Month", - " UseWeatherFile, !- Day of Week for Start Day", + " , !- End Year", + " Sunday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", " No, !- Apply Weekend Holiday Rule", " Yes, !- Use Weather File Rain Indicators", - " Yes, !- Use Weather File Snow Indicators", - " 1, !- Number of Times Runperiod to be Repeated", - " Yes; !- Increment Day of Week on repeat", + " Yes; !- Use Weather File Snow Indicators", "Material,", " F08 Metal surface, !- Name", " Smooth, !- Roughness", diff --git a/tst/EnergyPlus/unit/CMakeLists.txt b/tst/EnergyPlus/unit/CMakeLists.txt index 0f8c9cc2fd4..b0ee7956969 100644 --- a/tst/EnergyPlus/unit/CMakeLists.txt +++ b/tst/EnergyPlus/unit/CMakeLists.txt @@ -134,6 +134,7 @@ set( test_src ReportSizingManager.unit.cc RoomAirflowNetwork.unit.cc RoomAirModelUserTempPattern.unit.cc + RunPeriod.unit.cc RuntimeLanguageProcessor.unit.cc ScheduleManager.unit.cc SecondaryDXCoils.unit.cc diff --git a/tst/EnergyPlus/unit/ChillerAbsorption.unit.cc b/tst/EnergyPlus/unit/ChillerAbsorption.unit.cc index 5489d543da8..ed5bb1bb4a7 100644 --- a/tst/EnergyPlus/unit/ChillerAbsorption.unit.cc +++ b/tst/EnergyPlus/unit/ChillerAbsorption.unit.cc @@ -96,8 +96,10 @@ TEST_F(EnergyPlusFixture, ChillerAbsorption_Calc) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 12, !- End Month", " 31, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", diff --git a/tst/EnergyPlus/unit/DElightManager.unit.cc b/tst/EnergyPlus/unit/DElightManager.unit.cc index de77832f7c4..4aa765b01fb 100644 --- a/tst/EnergyPlus/unit/DElightManager.unit.cc +++ b/tst/EnergyPlus/unit/DElightManager.unit.cc @@ -340,7 +340,7 @@ TEST_F(EnergyPlusFixture, DElightManagerF_GetInputDElightComplexFenestration_Tes DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); InternalHeatGains::GetInternalHeatGainsInput(); InternalHeatGains::GetInternalHeatGainsInputFlag = false; diff --git a/tst/EnergyPlus/unit/DataHeatBalance.unit.cc b/tst/EnergyPlus/unit/DataHeatBalance.unit.cc index 5b9c081a098..1f78d65c81f 100644 --- a/tst/EnergyPlus/unit/DataHeatBalance.unit.cc +++ b/tst/EnergyPlus/unit/DataHeatBalance.unit.cc @@ -118,8 +118,10 @@ TEST_F(EnergyPlusFixture, DataHeatBalance_CheckConstructLayers) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 12, !- End Month", " 31, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", diff --git a/tst/EnergyPlus/unit/DaylightingManager.unit.cc b/tst/EnergyPlus/unit/DaylightingManager.unit.cc index a883d14adf0..d26214fa7e7 100644 --- a/tst/EnergyPlus/unit/DaylightingManager.unit.cc +++ b/tst/EnergyPlus/unit/DaylightingManager.unit.cc @@ -664,7 +664,7 @@ TEST_F(EnergyPlusFixture, DaylightingManager_GetDaylParamInGeoTrans_Test) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); InternalHeatGains::GetInternalHeatGainsInput(); InternalHeatGains::GetInternalHeatGainsInputFlag = false; diff --git a/tst/EnergyPlus/unit/DesiccantDehumidifiers.unit.cc b/tst/EnergyPlus/unit/DesiccantDehumidifiers.unit.cc index d0f6f60828a..8a8cf5ff9ff 100644 --- a/tst/EnergyPlus/unit/DesiccantDehumidifiers.unit.cc +++ b/tst/EnergyPlus/unit/DesiccantDehumidifiers.unit.cc @@ -134,8 +134,10 @@ TEST_F(EnergyPlusFixture, DesiccantDehum_OnOASystemTest) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 5, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -2895,8 +2897,10 @@ TEST_F(EnergyPlusFixture, DesiccantDehum_OnPrimaryAirSystemTest) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 5, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -4075,8 +4079,10 @@ TEST_F(EnergyPlusFixture, DesiccantDehum_RegenAirHeaterHWCoilSizingTest) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 5, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -5501,8 +5507,10 @@ TEST_F(EnergyPlusFixture, DesiccantDehum_VSCoolingCoilOnPrimaryAirSystemTest) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 5, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", diff --git a/tst/EnergyPlus/unit/ElectricPowerServiceManager.unit.cc b/tst/EnergyPlus/unit/ElectricPowerServiceManager.unit.cc index 1c54b9f9cc0..7fb45efad23 100644 --- a/tst/EnergyPlus/unit/ElectricPowerServiceManager.unit.cc +++ b/tst/EnergyPlus/unit/ElectricPowerServiceManager.unit.cc @@ -441,7 +441,7 @@ TEST_F(EnergyPlusFixture, ManageElectricPowerTest_UpdateLoadCenterRecords_Case3) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); createFacilityElectricPowerServiceObject(); @@ -554,7 +554,7 @@ TEST_F(EnergyPlusFixture, ManageElectricPowerTest_UpdateLoadCenterRecords_Case4) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); // Case 4 DCBussInverterDCStorage Inverter = 5000, @@ -648,7 +648,7 @@ TEST_F(EnergyPlusFixture, ManageElectricPowerTest_UpdateLoadCenterRecords_Case5) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); createFacilityElectricPowerServiceObject(); diff --git a/tst/EnergyPlus/unit/FanCoilUnits.unit.cc b/tst/EnergyPlus/unit/FanCoilUnits.unit.cc index 85d91280eb4..e03a2aedb78 100644 --- a/tst/EnergyPlus/unit/FanCoilUnits.unit.cc +++ b/tst/EnergyPlus/unit/FanCoilUnits.unit.cc @@ -104,7 +104,6 @@ using namespace EnergyPlus::WaterCoils; using DataHeatBalFanSys::TempControlType; using DataZoneEnergyDemands::CurDeadBandOrSetback; using DataZoneEnergyDemands::ZoneSysEnergyDemand; -using General::JulianDay; using General::TrimSigDigits; using MixedAir::OAMixer; @@ -401,7 +400,7 @@ TEST_F(EnergyPlusFixture, MultiStage4PipeFanCoilHeatingTest) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); UpdateScheduleValues(); CalcMultiStage4PipeFanCoil(FanCoilNum, ZoneNum, FirstHVACIteration, QZnReq, SpeedRatio, PartLoadRatio, QUnitOut); @@ -716,7 +715,7 @@ TEST_F(EnergyPlusFixture, MultiStage4PipeFanCoilCoolingTest) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); UpdateScheduleValues(); CalcMultiStage4PipeFanCoil(FanCoilNum, ZoneNum, FirstHVACIteration, QZnReq, SpeedRatio, PartLoadRatio, QUnitOut); @@ -1052,7 +1051,7 @@ TEST_F(EnergyPlusFixture, ConstantFanVariableFlowFanCoilHeatingTest) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); UpdateScheduleValues(); // Normal heating simulation for fan coil with constant fan, variable water flow @@ -1406,7 +1405,7 @@ TEST_F(EnergyPlusFixture, ElectricCoilFanCoilHeatingTest) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); UpdateScheduleValues(); // Normal heating simulation for fan coil with constant fan, electric heating @@ -1752,7 +1751,7 @@ TEST_F(EnergyPlusFixture, ConstantFanVariableFlowFanCoilCoolingTest) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); UpdateScheduleValues(); // normal cooling simulation for constant fan variable flow fan coil Sim4PipeFanCoil(FanCoilNum, ZoneNum, ControlledZoneNum, FirstHVACIteration, QUnitOut, LatOutputProvided); @@ -2087,7 +2086,7 @@ TEST_F(EnergyPlusFixture, FanCoil_ASHRAE90VariableFan) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); UpdateScheduleValues(); ZoneEqSizing.allocate(1); @@ -2794,7 +2793,7 @@ TEST_F(EnergyPlusFixture, FanCoil_CyclingFanMode) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); UpdateScheduleValues(); ZoneEqSizing.allocate(1); diff --git a/tst/EnergyPlus/unit/HVACFourPipeBeam.unit.cc b/tst/EnergyPlus/unit/HVACFourPipeBeam.unit.cc index d59a5bb4260..a3eaec0068a 100644 --- a/tst/EnergyPlus/unit/HVACFourPipeBeam.unit.cc +++ b/tst/EnergyPlus/unit/HVACFourPipeBeam.unit.cc @@ -228,15 +228,16 @@ TEST_F(EnergyPlusFixture, Beam_sizeandSimulateOneZone) " annual, !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 12, !- End Month", " 31, !- End Day of Month", + " , !- End Year", " Sunday, !- Day of Week for Start Day", " No, !- Use Weather File Holidays and Special Days", " No, !- Use Weather File Daylight Saving Period", " No, !- Apply Weekend Holiday Rule", " Yes, !- Use Weather File Rain Indicators", - " Yes, !- Use Weather File Snow Indicators", - " 1.0000; !- Number of Times Runperiod to be Repeated", + " Yes; !- Use Weather File Snow Indicators", " ScheduleTypeLimits,", " On/Off, !- Name", diff --git a/tst/EnergyPlus/unit/HeatBalanceManager.unit.cc b/tst/EnergyPlus/unit/HeatBalanceManager.unit.cc index 6c909477a86..313f6137045 100644 --- a/tst/EnergyPlus/unit/HeatBalanceManager.unit.cc +++ b/tst/EnergyPlus/unit/HeatBalanceManager.unit.cc @@ -790,8 +790,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceManager_TestZonePropertyLocalEnv) " , !- Name", " 1, !- Begin Month", " 14, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 14, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -803,8 +805,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceManager_TestZonePropertyLocalEnv) " , !- Name", " 7, !- Begin Month", " 7, !- Begin Day of Month", + " , !- Begin Year", " 7, !- End Month", " 7, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", diff --git a/tst/EnergyPlus/unit/HeatBalanceSurfaceManager.unit.cc b/tst/EnergyPlus/unit/HeatBalanceSurfaceManager.unit.cc index b34501d9044..20f2e77bbef 100644 --- a/tst/EnergyPlus/unit/HeatBalanceSurfaceManager.unit.cc +++ b/tst/EnergyPlus/unit/HeatBalanceSurfaceManager.unit.cc @@ -355,8 +355,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfTempCalcHeatBalanceI " , !- Name", " 1, !- Begin Month", " 14, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 14, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -368,8 +370,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfTempCalcHeatBalanceI " , !- Name", " 7, !- Begin Month", " 7, !- Begin Day of Month", + " , !- Begin Year", " 7, !- End Month", " 7, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -838,8 +842,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfPropertyLocalEnv) " , !- Name", " 1, !- Begin Month", " 14, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 14, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -851,8 +857,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfPropertyLocalEnv) " , !- Name", " 7, !- Begin Month", " 7, !- Begin Day of Month", + " , !- Begin Year", " 7, !- End Month", " 7, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -1376,8 +1384,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfPropertySrdSurfLWR) " , !- Name", " 1, !- Begin Month", " 14, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 14, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -1389,11 +1399,11 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfPropertySrdSurfLWR) " , !- Name", " 7, !- Begin Month", " 7, !- Begin Day of Month", + " , !- Begin Year", " 7, !- End Month", " 7, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", - " Yes, !- Use Weather File Holidays and Special Days", - " Yes, !- Use Weather File Daylight Saving Period", " No, !- Apply Weekend Holiday Rule", " Yes, !- Use Weather File Rain Indicators", " No; !- Use Weather File Snow Indicators", @@ -1991,8 +2001,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfTempCalcHeatBalanceA " , !- Name", " 1, !- Begin Month", " 14, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 14, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -2004,8 +2016,10 @@ TEST_F(EnergyPlusFixture, HeatBalanceSurfaceManager_TestSurfTempCalcHeatBalanceA " , !- Name", " 7, !- Begin Month", " 7, !- Begin Day of Month", + " , !- Begin Year", " 7, !- End Month", " 7, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", diff --git a/tst/EnergyPlus/unit/InputProcessor.unit.cc b/tst/EnergyPlus/unit/InputProcessor.unit.cc index 8d719bf44c6..1af1b302061 100644 --- a/tst/EnergyPlus/unit/InputProcessor.unit.cc +++ b/tst/EnergyPlus/unit/InputProcessor.unit.cc @@ -331,9 +331,11 @@ TEST_F(InputProcessorFixture, parse_two_RunPeriod) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 31, !- End Day of Month", - " Tuesday, !- Day of Week for Start Day", + " , !- End Year", + " Sunday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", " No, !- Apply Weekend Holiday Rule", @@ -344,9 +346,11 @@ TEST_F(InputProcessorFixture, parse_two_RunPeriod) " , !- Name", " 7, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 7, !- End Month", " 31, !- End Day of Month", - " Tuesday, !- Day of Week for Start Day", + " , !- End Year", + " Sunday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", " No, !- Apply Weekend Holiday Rule", @@ -360,7 +364,7 @@ TEST_F(InputProcessorFixture, parse_two_RunPeriod) {"apply_weekend_holiday_rule", "No"}, {"begin_day_of_month", 1}, {"begin_month", 1}, - {"day_of_week_for_start_day", "Tuesday"}, + {"day_of_week_for_start_day", "Sunday"}, {"end_day_of_month", 31}, {"end_month", 1}, {"use_weather_file_daylight_saving_period", "Yes"}, @@ -372,7 +376,7 @@ TEST_F(InputProcessorFixture, parse_two_RunPeriod) {"apply_weekend_holiday_rule", "No"}, {"begin_day_of_month", 1}, {"begin_month", 7}, - {"day_of_week_for_start_day", "Tuesday"}, + {"day_of_week_for_start_day", "Sunday"}, {"end_day_of_month", 31}, {"end_month", 7}, {"use_weather_file_daylight_saving_period", "Yes"}, diff --git a/tst/EnergyPlus/unit/OASystemHWPreheatCoil.unit.cc b/tst/EnergyPlus/unit/OASystemHWPreheatCoil.unit.cc index 7530e7e64e3..2e9fd3d236c 100644 --- a/tst/EnergyPlus/unit/OASystemHWPreheatCoil.unit.cc +++ b/tst/EnergyPlus/unit/OASystemHWPreheatCoil.unit.cc @@ -97,8 +97,10 @@ TEST_F(EnergyPlusFixture, OASystem_HotWaterPreheatCoilScheduledOffSim) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 12, !- End Month", " 31, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -1082,8 +1084,10 @@ TEST_F(EnergyPlusFixture, OASystem_HotWaterPreheatCoilScheduledOnSim) " , !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", + " , !- Begin Year", " 12, !- End Month", " 31, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", diff --git a/tst/EnergyPlus/unit/OutdoorAirUnit.unit.cc b/tst/EnergyPlus/unit/OutdoorAirUnit.unit.cc index 1dbcaa1226d..3da11019718 100644 --- a/tst/EnergyPlus/unit/OutdoorAirUnit.unit.cc +++ b/tst/EnergyPlus/unit/OutdoorAirUnit.unit.cc @@ -625,7 +625,7 @@ TEST_F(EnergyPlusFixture, OutdoorAirUnit_WaterCoolingCoilAutoSizeTest) DataEnvironment::DayOfMonth = 21; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(Month, DayOfMonth, HourOfDay); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, HourOfDay); UpdateScheduleValues(); @@ -928,7 +928,7 @@ TEST_F(EnergyPlusFixture, OutdoorAirUnit_SteamHeatingCoilAutoSizeTest) DataEnvironment::DayOfMonth = 21; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(Month, DayOfMonth, HourOfDay); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, HourOfDay); UpdateScheduleValues(); diff --git a/tst/EnergyPlus/unit/PlantHeatExchangerFluidToFluid.unit.cc b/tst/EnergyPlus/unit/PlantHeatExchangerFluidToFluid.unit.cc index 522119f5cbe..e53207dcb5e 100644 --- a/tst/EnergyPlus/unit/PlantHeatExchangerFluidToFluid.unit.cc +++ b/tst/EnergyPlus/unit/PlantHeatExchangerFluidToFluid.unit.cc @@ -135,11 +135,13 @@ TEST_F(EnergyPlusFixture, PlantHXModulatedDualDeadDefectFileHi) " 0.00; !- Sky Clearness", " RunPeriod,", - " Jan, !- Name", + " Jan, !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", - " 1, !- End Month", - " 2, !- End Day of Month", + " , !- Begin Year", + " 1, !- End Month", + " 2, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -1226,11 +1228,13 @@ TEST_F(EnergyPlusFixture, PlantHXModulatedDualDeadDefectFileLo) " 0.00; !- Sky Clearness", " RunPeriod,", - " Jan, !- Name", + " Jan, !- Name", " 1, !- Begin Month", " 1, !- Begin Day of Month", - " 1, !- End Month", - " 2, !- End Day of Month", + " , !- Begin Year", + " 1, !- End Month", + " 2, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -2278,7 +2282,7 @@ TEST_F(EnergyPlusFixture, PlantHXControlWithFirstHVACIteration) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); PlantHeatExchangerFluidToFluid::FluidHX(1).AvailSchedNum = -1; @@ -2377,7 +2381,7 @@ TEST_F(EnergyPlusFixture, PlantHXControl_CoolingSetpointOnOffWithComponentOverri DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); PlantHeatExchangerFluidToFluid::FluidHX(1).AvailSchedNum = -1; diff --git a/tst/EnergyPlus/unit/PoweredInductionUnits.unit.cc b/tst/EnergyPlus/unit/PoweredInductionUnits.unit.cc index 65f0b0546a4..9e34548f37d 100644 --- a/tst/EnergyPlus/unit/PoweredInductionUnits.unit.cc +++ b/tst/EnergyPlus/unit/PoweredInductionUnits.unit.cc @@ -172,7 +172,7 @@ TEST_F(EnergyPlusFixture, ParallelPIUTest1) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); DataEnvironment::StdRhoAir = Psychrometrics::PsyRhoAirFnPbTdbW(101325.0, 20.0, 0.0); ScheduleManager::UpdateScheduleValues(); @@ -391,7 +391,7 @@ TEST_F(EnergyPlusFixture, SeriesPIUTest1) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); DataEnvironment::StdRhoAir = Psychrometrics::PsyRhoAirFnPbTdbW(101325.0, 20.0, 0.0); ScheduleManager::UpdateScheduleValues(); diff --git a/tst/EnergyPlus/unit/RunPeriod.unit.cc b/tst/EnergyPlus/unit/RunPeriod.unit.cc new file mode 100644 index 00000000000..a83fd143f18 --- /dev/null +++ b/tst/EnergyPlus/unit/RunPeriod.unit.cc @@ -0,0 +1,252 @@ +// EnergyPlus, Copyright (c) 1996-2018, The Board of Trustees of the University of Illinois, +// The Regents of the University of California, through Lawrence Berkeley National Laboratory +// (subject to receipt of any required approvals from the U.S. Dept. of Energy), Oak Ridge +// National Laboratory, managed by UT-Battelle, Alliance for Sustainable Energy, LLC, and other +// contributors. All rights reserved. +// +// NOTICE: This Software was developed under funding from the U.S. Department of Energy and the +// U.S. Government consequently retains certain rights. As such, the U.S. Government has been +// granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, +// worldwide license in the Software to reproduce, distribute copies to the public, prepare +// derivative works, and perform publicly and display publicly, and to permit others to do so. +// +// Redistribution and use in source and binary forms, with or without modification, are permitted +// provided that the following conditions are met: +// +// (1) Redistributions of source code must retain the above copyright notice, this list of +// conditions and the following disclaimer. +// +// (2) Redistributions in binary form must reproduce the above copyright notice, this list of +// conditions and the following disclaimer in the documentation and/or other materials +// provided with the distribution. +// +// (3) Neither the name of the University of California, Lawrence Berkeley National Laboratory, +// the University of Illinois, U.S. Dept. of Energy nor the names of its contributors may be +// used to endorse or promote products derived from this software without specific prior +// written permission. +// +// (4) Use of EnergyPlus(TM) Name. If Licensee (i) distributes the software in stand-alone form +// without changes from the version obtained under this License, or (ii) Licensee makes a +// reference solely to the software portion of its product, Licensee must refer to the +// software as "EnergyPlus version X" software, where "X" is the version number Licensee +// obtained under this License and may not use a different name for the software. Except as +// specifically required in this Section (4), Licensee shall not use in a company name, a +// product name, in advertising, publicity, or other promotional activities any name, trade +// name, trademark, logo, or other designation of "EnergyPlus", "E+", "e+" or confusingly +// similar designation, without the U.S. Department of Energy's prior written consent. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR +// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR +// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. + +// EnergyPlus::RunPeriod Unit Tests + +// Google Test Headers +#include + +// ObjexxFCL Headers +#include + +// EnergyPlus Headers +#include +#include +#include +#include +#include +#include +#include + +#include "Fixtures/EnergyPlusFixture.hh" + +using namespace EnergyPlus; +using namespace EnergyPlus::WeatherManager; +using namespace EnergyPlus::ScheduleManager; + +TEST_F(EnergyPlusFixture, RunPeriod_YearTests) +{ + std::string const idf_objects = delimited_string({ + "Version,", + "8.8;", + "SimulationControl, NO, NO, NO, YES, YES;", + "Timestep,4;", + "RunPeriod,", + "RP1, !- Name", + "2, !- Begin Month", + "29, !- Begin Day of Month", + "2016, !- Begin Year", + "3, !- End Month", + "3, !- End Day of Month", + ", !- End Year", + "Monday, !- Day of Week for Start Day", + "Yes, !- Use Weather File Holidays and Special Days", + "Yes, !- Use Weather File Daylight Saving Period", + "No, !- Apply Weekend Holiday Rule", + "Yes, !- Use Weather File Rain Indicators", + "Yes; !- Use Weather File Snow Indicators", + "RunPeriod,", + "RP2, !- Name", + "2, !- Begin Month", + "29, !- Begin Day of Month", + ", !- Begin Year", + "3, !- End Month", + "3, !- End Day of Month", + ", !- End Year", + "Wednesday, !- Day of Week for Start Day", + "Yes, !- Use Weather File Holidays and Special Days", + "Yes, !- Use Weather File Daylight Saving Period", + "No, !- Apply Weekend Holiday Rule", + "Yes, !- Use Weather File Rain Indicators", + "Yes; !- Use Weather File Snow Indicators", + "RunPeriod,", + "RP3, !- Name", + "1, !- Begin Month", + "1, !- Begin Day of Month", + ", !- Begin Year", + "12, !- End Month", + "31, !- End Day of Month", + ", !- End Year", + "Thursday, !- Day of Week for Start Day", + "Yes, !- Use Weather File Holidays and Special Days", + "Yes, !- Use Weather File Daylight Saving Period", + "No, !- Apply Weekend Holiday Rule", + "Yes, !- Use Weather File Rain Indicators", + "Yes; !- Use Weather File Snow Indicators", + "RunPeriod,", + "RP4, !- Name", + "1, !- Begin Month", + "1, !- Begin Day of Month", + ", !- Begin Year", + "12, !- End Month", + "31, !- End Day of Month", + ", !- End Year", + ", !- Day of Week for Start Day", + "Yes, !- Use Weather File Holidays and Special Days", + "Yes, !- Use Weather File Daylight Saving Period", + "No, !- Apply Weekend Holiday Rule", + "Yes, !- Use Weather File Rain Indicators", + "Yes; !- Use Weather File Snow Indicators", + "RunPeriod,", + "RP5, !- Name", + "8, !- Begin Month", + "18, !- Begin Day of Month", + ", !- Begin Year", + "12, !- End Month", + "31, !- End Day of Month", + ", !- End Year", + "Wednesday, !- Day of Week for Start Day", + "Yes, !- Use Weather File Holidays and Special Days", + "Yes, !- Use Weather File Daylight Saving Period", + "No, !- Apply Weekend Holiday Rule", + "Yes, !- Use Weather File Rain Indicators", + "Yes; !- Use Weather File Snow Indicators", + "RunPeriod,", + "RP6, !- Name", + "2, !- Begin Month", + "29, !- Begin Day of Month", + ", !- Begin Year", + "12, !- End Month", + "31, !- End Day of Month", + ", !- End Year", + "Saturday, !- Day of Week for Start Day", + "Yes, !- Use Weather File Holidays and Special Days", + "Yes, !- Use Weather File Daylight Saving Period", + "No, !- Apply Weekend Holiday Rule", + "Yes, !- Use Weather File Rain Indicators", + "Yes; !- Use Weather File Snow Indicators", + "RunPeriod,", + "RP7, !- Name", + "1, !- Begin Month", + "1, !- Begin Day of Month", + "2016, !- Begin Year", + "3, !- End Month", + "31, !- End Day of Month", + "2020, !- End Year", + ", !- Day of Week for Start Day", + "Yes, !- Use Weather File Holidays and Special Days", + "Yes, !- Use Weather File Daylight Saving Period", + "No, !- Apply Weekend Holiday Rule", + "Yes, !- Use Weather File Rain Indicators", + "Yes; !- Use Weather File Snow Indicators", + "BUILDING, Simple One Zone (Wireframe DXF), 0.0, Suburbs, .04, .004, MinimalShadowing, 30, 6;", + + }); + + ASSERT_TRUE(process_idf(idf_objects)); + bool errors_in_input(false); + int totalrps(7); + WeatherManager::GetRunPeriodData(totalrps, errors_in_input); + EXPECT_FALSE(errors_in_input); + + EXPECT_EQ(WeatherManager::WeekDay::Monday, WeatherManager::RunPeriodInput[0].startWeekDay); + EXPECT_EQ(2016, WeatherManager::RunPeriodInput[0].startYear); + EXPECT_EQ(2457448, WeatherManager::RunPeriodInput[0].startJulianDate); + EXPECT_EQ(2457451, WeatherManager::RunPeriodInput[0].endJulianDate); + + EXPECT_EQ(WeatherManager::WeekDay::Wednesday, WeatherManager::RunPeriodInput[1].startWeekDay); + EXPECT_EQ(2012, WeatherManager::RunPeriodInput[1].startYear); + EXPECT_EQ(2455987, WeatherManager::RunPeriodInput[1].startJulianDate); + EXPECT_EQ(2455990, WeatherManager::RunPeriodInput[1].endJulianDate); + + EXPECT_EQ(WeatherManager::WeekDay::Thursday, WeatherManager::RunPeriodInput[2].startWeekDay); + EXPECT_EQ(2015, WeatherManager::RunPeriodInput[2].startYear); + EXPECT_EQ(2457024, WeatherManager::RunPeriodInput[2].startJulianDate); + EXPECT_EQ(2457388, WeatherManager::RunPeriodInput[2].endJulianDate); + + EXPECT_EQ(WeatherManager::WeekDay::Sunday, WeatherManager::RunPeriodInput[3].startWeekDay); + EXPECT_EQ(2017, WeatherManager::RunPeriodInput[3].startYear); + EXPECT_EQ(2457755, WeatherManager::RunPeriodInput[3].startJulianDate); + EXPECT_EQ(2458119, WeatherManager::RunPeriodInput[3].endJulianDate); + + EXPECT_EQ(WeatherManager::WeekDay::Wednesday, WeatherManager::RunPeriodInput[4].startWeekDay); + EXPECT_EQ(2010, WeatherManager::RunPeriodInput[4].startYear); + EXPECT_EQ(2455427, WeatherManager::RunPeriodInput[4].startJulianDate); + EXPECT_EQ(2455562, WeatherManager::RunPeriodInput[4].endJulianDate); + + EXPECT_EQ(WeatherManager::WeekDay::Saturday, WeatherManager::RunPeriodInput[5].startWeekDay); + EXPECT_EQ(1992, WeatherManager::RunPeriodInput[5].startYear); + EXPECT_EQ(2448682, WeatherManager::RunPeriodInput[5].startJulianDate); + EXPECT_EQ(2448988, WeatherManager::RunPeriodInput[5].endJulianDate); + + EXPECT_EQ(WeatherManager::WeekDay::Friday, WeatherManager::RunPeriodInput[6].startWeekDay); + EXPECT_EQ(2016, WeatherManager::RunPeriodInput[6].startYear); + EXPECT_EQ(2457389, WeatherManager::RunPeriodInput[6].startJulianDate); + EXPECT_EQ(2458940, WeatherManager::RunPeriodInput[6].endJulianDate); +} + +TEST_F(EnergyPlusFixture, RunPeriod_EndYearOnly) +{ + std::string const idf_objects = delimited_string({ + "Version,", + "8.8;", + "SimulationControl, NO, NO, NO, YES, YES;", + "Timestep,4;", + "RunPeriod,", + ", !- Name", + "2, !- Begin Month", + "27, !- Begin Day of Month", + ", !- Begin Year", + "3, !- End Month", + "3, !- End Day of Month", + "1997, !- End Year", + "Tuesday, !- Day of Week for Start Day", + "Yes, !- Use Weather File Holidays and Special Days", + "Yes, !- Use Weather File Daylight Saving Period", + "No, !- Apply Weekend Holiday Rule", + "Yes, !- Use Weather File Rain Indicators", + "Yes; !- Use Weather File Snow Indicators", + "BUILDING, Simple One Zone (Wireframe DXF), 0.0, Suburbs, .04, .004, MinimalShadowing, 30, 6;", + }); + + ASSERT_TRUE(process_idf(idf_objects)); + bool errors_in_input(false); + int totalrps(1); + WeatherManager::GetRunPeriodData(totalrps, errors_in_input); + + EXPECT_TRUE(errors_in_input); +} diff --git a/tst/EnergyPlus/unit/ScheduleManager.unit.cc b/tst/EnergyPlus/unit/ScheduleManager.unit.cc index 0da28634717..192b65ed46b 100644 --- a/tst/EnergyPlus/unit/ScheduleManager.unit.cc +++ b/tst/EnergyPlus/unit/ScheduleManager.unit.cc @@ -377,7 +377,7 @@ TEST_F(EnergyPlusFixture, ScheduleDayInterval_SimpLinearInterp) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); int ASchedIndex = GetScheduleIndex("SCHYR_A"); // interpolate Linear EXPECT_NEAR(0.001, LookUpScheduleValue(ASchedIndex, 7, 4), 0.000001); @@ -490,7 +490,7 @@ TEST_F(EnergyPlusFixture, ScheduleDayInterval_PartialHourLinearInterp) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); int ASchedIndex = GetScheduleIndex("SCHYR_A"); // interpolate Linear EXPECT_NEAR(0.001, LookUpScheduleValue(ASchedIndex, 7, 4), 0.000001); @@ -563,7 +563,7 @@ TEST_F(EnergyPlusFixture, ScheduleDayInterval_LinearInterpIntervalNotTimestep) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); int ASchedIndex = GetScheduleIndex("SCHYR_A"); // interpolate Linear EXPECT_NEAR(0.0, LookUpScheduleValue(ASchedIndex, 7, 4), 0.000001); diff --git a/tst/EnergyPlus/unit/SingleDuct.unit.cc b/tst/EnergyPlus/unit/SingleDuct.unit.cc index 1ceb0f5b975..21fe5978377 100644 --- a/tst/EnergyPlus/unit/SingleDuct.unit.cc +++ b/tst/EnergyPlus/unit/SingleDuct.unit.cc @@ -134,7 +134,7 @@ TEST_F(EnergyPlusFixture, VAVNoReheatTerminalUnitSchedule) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); DataEnvironment::StdRhoAir = Psychrometrics::PsyRhoAirFnPbTdbW(101325.0, 20.0, 0.0); ScheduleManager::UpdateScheduleValues(); @@ -306,7 +306,7 @@ TEST_F(EnergyPlusFixture, VAVReheatTerminalUnitSchedule) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); DataEnvironment::StdRhoAir = Psychrometrics::PsyRhoAirFnPbTdbW(101325.0, 20.0, 0.0); ScheduleManager::UpdateScheduleValues(); diff --git a/tst/EnergyPlus/unit/SolarShading.unit.cc b/tst/EnergyPlus/unit/SolarShading.unit.cc index ef6a0509145..e71a4b52d21 100644 --- a/tst/EnergyPlus/unit/SolarShading.unit.cc +++ b/tst/EnergyPlus/unit/SolarShading.unit.cc @@ -321,8 +321,10 @@ TEST_F(EnergyPlusFixture, SolarShadingTest_FigureSolarBeamAtTimestep) " , !- Name ", " 1, !- Begin Month ", " 1, !- Begin Day of Month ", + " , !- Begin Year ", " 12, !- End Month ", " 31, !- End Day of Month ", + " , !- End Year ", " , !- Day of Week for Start Day ", " , !- Use Weather File Holidays and Special Days ", " , !- Use Weather File Daylight Saving Period ", @@ -698,8 +700,10 @@ TEST_F(EnergyPlusFixture, SolarShadingTest_ExternalShadingIO) " , !- Name ", " 1, !- Begin Month ", " 1, !- Begin Day of Month ", + " , !- Begin Year ", " 12, !- End Month ", " 31, !- End Day of Month ", + " , !- End Year ", " , !- Day of Week for Start Day ", " , !- Use Weather File Holidays and Special Days ", " , !- Use Weather File Daylight Saving Period ", @@ -1103,8 +1107,10 @@ TEST_F(EnergyPlusFixture, SolarShadingTest_DisableGroupSelfShading) " , !- Name ", " 1, !- Begin Month ", " 1, !- Begin Day of Month ", + " , !- Begin Year", " 12, !- End Month ", " 31, !- End Day of Month ", + " , !- End Year", " , !- Day of Week for Start Day ", " , !- Use Weather File Holidays and Special Days ", " , !- Use Weather File Daylight Saving Period ", diff --git a/tst/EnergyPlus/unit/SystemAvailabilityManager.unit.cc b/tst/EnergyPlus/unit/SystemAvailabilityManager.unit.cc index 69a8c10cc53..62c8ec0d614 100644 --- a/tst/EnergyPlus/unit/SystemAvailabilityManager.unit.cc +++ b/tst/EnergyPlus/unit/SystemAvailabilityManager.unit.cc @@ -186,7 +186,7 @@ TEST_F(EnergyPlusFixture, SysAvailManager_OptimumStart) DataEnvironment::DayOfWeek = 1; DataEnvironment::DayOfWeekTomorrow = 2; DataEnvironment::HolidayIndex = 0; - DataEnvironment::DayOfYear_Schedule = General::JulianDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(DataEnvironment::Month, DataEnvironment::DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); DataZoneEquipment::ZoneEquipAvail.allocate(5); diff --git a/tst/EnergyPlus/unit/UnitHeater.unit.cc b/tst/EnergyPlus/unit/UnitHeater.unit.cc index b7db38bb292..f844cb384c7 100644 --- a/tst/EnergyPlus/unit/UnitHeater.unit.cc +++ b/tst/EnergyPlus/unit/UnitHeater.unit.cc @@ -149,8 +149,10 @@ TEST_F(EnergyPlusFixture, UnitHeater_HWHeatingCoilUAAutoSizingTest) " , !- Name", " 1, !- Begin Month", " 14, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 14, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", diff --git a/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc b/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc index 91ac5cebf56..3eecc8fbac7 100644 --- a/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc +++ b/tst/EnergyPlus/unit/UnitaryHybridAirConditioner.unit.cc @@ -155,9 +155,8 @@ TEST_F(EnergyPlusFixture, Test_UnitaryHybridAirConditioner_Unittest) DataEnvironment::DSTIndicator = 0; DataEnvironment::DayOfWeek = 2; DataEnvironment::HolidayIndex = 0; - using General::JulianDay; DataGlobals::WarmupFlag = false; - DataEnvironment::DayOfYear_Schedule = JulianDay(Month, DayOfMonth, 1); + DataEnvironment::DayOfYear_Schedule = General::OrdinalDay(Month, DayOfMonth, 1); ScheduleManager::UpdateScheduleValues(); // Initialize zone areas and volumes - too many other things need to be set up to do these in the normal routines DataHeatBalance::Zone(1).FloorArea = 232.26; diff --git a/tst/EnergyPlus/unit/UnitaryHybridUnitTest_DOSA.idf b/tst/EnergyPlus/unit/UnitaryHybridUnitTest_DOSA.idf index 8a0241ef09e..d878fd25671 100644 --- a/tst/EnergyPlus/unit/UnitaryHybridUnitTest_DOSA.idf +++ b/tst/EnergyPlus/unit/UnitaryHybridUnitTest_DOSA.idf @@ -152,8 +152,10 @@ , !- Name 1, !- Begin Month 1, !- Begin Day of Month + , !- Begin Year 12, !- End Month 31, !- End Day of Month + , !- End Year Tuesday, !- Day of Week for Start Day Yes, !- Use Weather File Holidays and Special Days Yes, !- Use Weather File Daylight Saving Period diff --git a/tst/EnergyPlus/unit/VentilatedSlab.unit.cc b/tst/EnergyPlus/unit/VentilatedSlab.unit.cc index 62ae30ad9ec..c090ecc65f9 100644 --- a/tst/EnergyPlus/unit/VentilatedSlab.unit.cc +++ b/tst/EnergyPlus/unit/VentilatedSlab.unit.cc @@ -241,19 +241,6 @@ TEST_F(EnergyPlusFixture, VentilatedSlab_InitVentilatedSlabTest) " , !- ASHRAE Clear Sky Optical Depth for Diffuse Irradiance (taud) {dimensionless}", " 1.0; !- Sky Clearness", - " RunPeriod,", - " , !- Name", - " 7, !- Begin Month", - " 5, !- Begin Day of Month", - " 7, !- End Month", - " 12, !- End Day of Month", - " UseWeatherFile, !- Day of Week for Start Day", - " Yes, !- Use Weather File Holidays and Special Days", - " Yes, !- Use Weather File Daylight Saving Period", - " No, !- Apply Weekend Holiday Rule", - " Yes, !- Use Weather File Rain Indicators", - " Yes; !- Use Weather File Snow Indicators", - " Site:GroundTemperature:BuildingSurface,20.03,20.03,20.13,20.30,20.43,20.52,20.62,20.77,20.78,20.55,20.44,20.20;", " ScheduleTypeLimits,", diff --git a/tst/EnergyPlus/unit/WeatherManager.unit.cc b/tst/EnergyPlus/unit/WeatherManager.unit.cc index 308451f6a1e..b4e0dd8e362 100644 --- a/tst/EnergyPlus/unit/WeatherManager.unit.cc +++ b/tst/EnergyPlus/unit/WeatherManager.unit.cc @@ -79,9 +79,11 @@ TEST_F(EnergyPlusFixture, SkyTempTest) "RunPeriod,", ", !- Name", "2, !- Begin Month", - "27, !- Begin Day of Month", - "3, !- End Month", - "3, !- End Day of Month", + "27, !- Begin Day of Month", + ", !- Begin Year", + "3, !- End Month", + "3, !- End Day of Month", + ", !- End Year", "Tuesday, !- Day of Week for Start Day", "Yes, !- Use Weather File Holidays and Special Days", "Yes, !- Use Weather File Daylight Saving Period", diff --git a/tst/EnergyPlus/unit/WindowManager.unit.cc b/tst/EnergyPlus/unit/WindowManager.unit.cc index bdc9e040431..c760b116281 100644 --- a/tst/EnergyPlus/unit/WindowManager.unit.cc +++ b/tst/EnergyPlus/unit/WindowManager.unit.cc @@ -627,8 +627,10 @@ TEST_F(EnergyPlusFixture, SpectralAngularPropertyTest) " , !- Name", " 1, !- Begin Month", " 14, !- Begin Day of Month", + " , !- Begin Year", " 1, !- End Month", " 14, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period", @@ -640,8 +642,10 @@ TEST_F(EnergyPlusFixture, SpectralAngularPropertyTest) " , !- Name", " 7, !- Begin Month", " 7, !- Begin Day of Month", + " , !- Begin Year", " 7, !- End Month", " 7, !- End Day of Month", + " , !- End Year", " Tuesday, !- Day of Week for Start Day", " Yes, !- Use Weather File Holidays and Special Days", " Yes, !- Use Weather File Daylight Saving Period",