Skip to content

Commit

Permalink
Schedule:File dst cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
mjwitte committed Feb 18, 2022
1 parent 1c50321 commit af6f344
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 7 deletions.
4 changes: 2 additions & 2 deletions idd/Energy+.idd.in
Original file line number Diff line number Diff line change
Expand Up @@ -4821,7 +4821,7 @@ Schedule:File:Shading,
\retaincase

Schedule:File,
\min-fields 5
\min-fields 10
\memo A Schedule:File points to a text computer file that has 8760-8784 hours of data.
A1 , \field Name
\required-field
Expand Down Expand Up @@ -4867,10 +4867,10 @@ Schedule:File,
\type integer
\minimum 1
\maximum 60
\default 60
A6 ; \field Adjust Schedule for Daylight Savings
\note "No" means do not include Daylight Savings Time in the schedule, instead, use the schedule directly from the Schedule:File csv (default)
\note "Yes" means include Daylight Savings Time to the schedule

\type choice
\key Yes
\key No
Expand Down
20 changes: 15 additions & 5 deletions testfiles/5ZoneTDV.idf
Original file line number Diff line number Diff line change
Expand Up @@ -3250,17 +3250,23 @@
..\datasets\TDV\TDV_2008_kBtu_CTZ06.csv, !- File Name
1, !- Column Number
4, !- Rows to Skip at Top
, !- Number of Hours of Data
, !- Column Separator
, !- Interpolate to Timestep
60; !- Minutes per Item
8760, !- Number of Hours of Data
Comma, !- Column Separator
No, !- Interpolate to Timestep
60, !- Minutes per Item
No; !- Adjust Schedule for Daylight Savings

Schedule:File,
natgasTDVfromCZ06com, !- Name
Any Number, !- Schedule Type Limits Name
..\datasets\TDV\TDV_2008_kBtu_CTZ06.csv, !- File Name
3, !- Column Number
4; !- Rows to Skip at Top
4, !- Rows to Skip at Top
8760, !- Number of Hours of Data
Comma, !- Column Separator
No, !- Interpolate to Timestep
60, !- Minutes per Item
No; !- Adjust Schedule for Daylight Savings

EnvironmentalImpactFactors,
0.3, !- District Heating Efficiency
Expand Down Expand Up @@ -3391,6 +3397,10 @@

Output:Variable,*,Pump Outlet Temperature,hourly;

Output:Variable,*,Environmental Impact NaturalGas Source Energy,hourly;

Output:Variable,*,Environmental Impact Electricity Source Energy,hourly;

Output:VariableDictionary,Regular;

Output:Meter:MeterFileOnly,Electricity:Facility,monthly;
Expand Down

4 comments on commit af6f344

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ScheduleFile_DaylightSavingsToggle (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.5: OK (3245 of 3249 tests passed, 0 test warnings)

Messages:\n

  • 1 test had: AUD diffs.
  • 4 tests had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 754
  • Failed: 4

Build Badge Test Badge

@nrel-bot-2c
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ScheduleFile_DaylightSavingsToggle (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-UnitTestsCoverage-Debug: OK (1731 of 1731 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

@nrel-bot-3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ScheduleFile_DaylightSavingsToggle (mjwitte) - x86_64-MacOS-10.15-clang-11.0.0: OK (3204 of 3208 tests passed, 0 test warnings)

Messages:\n

  • 1 test had: AUD diffs.
  • 4 tests had: Table big diffs.

Failures:\n

regression Test Summary

  • Passed: 734
  • Failed: 4

Build Badge Test Badge

@nrel-bot-2b
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ScheduleFile_DaylightSavingsToggle (mjwitte) - x86_64-Linux-Ubuntu-18.04-gcc-7.5-IntegrationCoverage-Debug: OK (742 of 742 tests passed, 0 test warnings)

Build Badge Test Badge Coverage Badge

Please sign in to comment.