Fix issues around ScheduleFixedInterval #4740
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
joseph-robertson
added
severity - Minor Bug
component - Model
Pull Request - Ready for CI
jmarrec
reviewed
Dec 9, 2022
Comment on lines
164
to
168
| // JJR: interval lengths of at least one day shouldn't shift the start of the loop, right? why would we ever start with the second element of the values vector? | ||
| if (modelObject.intervalLength() == 1440) { // do this for the one day interval; for interval more than one day, sorry you're on your own | ||
| start = 0; | ||
| lastDate -= dayDelta; | ||
| } |
There was a problem hiding this comment.
@joseph-robertson can you provide a short explanation here to faciliate my review? This is typically the kind of minute details where I'd need like 30 minutes to wrap my head around what's going on to see if it makes sense. A couple sentences from you would probably lower the burden significantly
There was a problem hiding this comment.
This is my "fix" to ensure that the first day timestep translated is actually the first from the model (and not the second). I.e., when the interval is exactly one day, don't start in the array's second position (but rather the first) and start with one day before the firstReportDateTime.date().
There was a problem hiding this comment.
Appears that two comments from this method are relevant here:
(1) New version assumes that the interval is less than one day.
(2) It was translated from the day version, so there could be issues associated with that.
So my interpretation is that this method was refactored from an earlier "day" version. It's possible that the new refactored method doesn't properly handle when the timestep is exactly one day.
There was a problem hiding this comment.
ScheduleFixedInterval::setTimeSeries (with is called from ScheduleInterval::fromTimeseries for eg) enforces that the interval must be 1 day or below:
OpenStudio/src/model/ScheduleFixedInterval.cpp
Lines 121 to 124 in 26ce82c
Unfortunately, neither ScheduleFixedInterval::setIntervalLength nor the IDD for 'Interval Length' enforce it. The following test works fine:
// Force an interval of 2 days though... Set the timeseries first with one day, but then call `ScheduleFixedInterval::setIntervalLength` with 2 days
Model model;
Date start_date(MonthOfYear::Jan, 1, 2007);
Time timestep_2day(1, 0);
Vector daily_wh_inlet_temperatures_c(5);
daily_wh_inlet_temperatures_c[0] = 10.0422222222222;
daily_wh_inlet_temperatures_c[1] = 9.98111111111111;
daily_wh_inlet_temperatures_c[2] = 9.92111111111111;
daily_wh_inlet_temperatures_c[3] = 9.86222222222222;
daily_wh_inlet_temperatures_c[4] = 9.80444444444445;
TimeSeries time_series_tmains(start_date, timestep_2day, daily_wh_inlet_temperatures_c, "C");
boost::optional<ScheduleInterval> scheduleInterval = ScheduleInterval::fromTimeSeries(time_series_tmains, model);
ASSERT_TRUE(scheduleInterval);
EXPECT_TRUE(scheduleInterval->optionalCast<ScheduleFixedInterval>());
ScheduleFixedInterval scheduleFixedInterval = scheduleInterval->cast<ScheduleFixedInterval>();
EXPECT_EQ(1440, scheduleFixedInterval.intervalLength()); // one day in minutes
EXPECT_TRUE(scheduleFixedInterval.setIntervalLength(2880));
EXPECT_EQ(2880, scheduleFixedInterval.intervalLength()); // one day in minutes
EXPECT_EQ(1, scheduleFixedInterval.startMonth());
EXPECT_EQ(2, scheduleFixedInterval.startDay()); // unrelated to this test, but this should be fixed to be 1I'm not sure why the setTimeseries disallows it, but I think we want to allow more than one day? I could see it a way to provide a 52 weekly (constant during the week) values for eg.
As a result, I think we should extend your fix to include more than one days.
There was a problem hiding this comment.
Apparently the FT code assumes it's less than one day, and according to git blame that change is from you @joseph-robertson :
Commit: 57350a7
Do you recall why?
Edit: apparently it was done well before (you didn't do that, it's probably just an indenting diff than I saw), in the initial PR: #670
jmarrec
reviewed
Dec 9, 2022
| objects[0].getString(2, false).get()); // this aligns with start day, but start day should be 1 (so this should be 01/01) | ||
| EXPECT_EQ("For: AllDays", objects[0].getString(3, false).get()); | ||
| EXPECT_EQ("Until: 24:00", objects[0].getString(4, false).get()); | ||
| EXPECT_EQ("10.0422222222222", objects[0].getString(5, false).get()); |
There was a problem hiding this comment.
This first "days" test ensures the first timestep translated is the first from model (and not the second timestep).
| TimeSeries time_series_tmains(start_date, timestep_2day, daily_wh_inlet_temperatures_c, "C"); | ||
|
|
||
| boost::optional<ScheduleInterval> scheduleInterval = ScheduleInterval::fromTimeSeries(time_series_tmains, model); | ||
| ASSERT_FALSE(scheduleInterval); |
There was a problem hiding this comment.
Setting timestep to 2 days isn't allowed. I think that's probably ok.
| EXPECT_EQ("Through: 01/01", objects[0].getString(2, false).get()); | ||
| EXPECT_EQ("For: AllDays", objects[0].getString(3, false).get()); | ||
| EXPECT_EQ("Until: 01:00", objects[0].getString(4, false).get()); | ||
| EXPECT_EQ("10.0422222222222", objects[0].getString(5, false).get()); |
There was a problem hiding this comment.
I think this was already working for hourly timestep, but adding a test just to make sure.
Comment on lines
164
to
168
| // JJR: interval lengths of at least one day shouldn't shift the start of the loop, right? why would we ever start with the second element of the values vector? | ||
| if (modelObject.intervalLength() == 1440) { // do this for the one day interval; for interval more than one day, sorry you're on your own | ||
| start = 0; | ||
| lastDate -= dayDelta; | ||
| } |
There was a problem hiding this comment.
This is my "fix" to ensure that the first day timestep translated is actually the first from the model (and not the second). I.e., when the interval is exactly one day, don't start in the array's second position (but rather the first) and start with one day before the firstReportDateTime.date().
Comment on lines
164
to
168
| // JJR: interval lengths of at least one day shouldn't shift the start of the loop, right? why would we ever start with the second element of the values vector? | ||
| if (modelObject.intervalLength() == 1440) { // do this for the one day interval; for interval more than one day, sorry you're on your own | ||
| start = 0; | ||
| lastDate -= dayDelta; | ||
| } |
There was a problem hiding this comment.
Appears that two comments from this method are relevant here:
(1) New version assumes that the interval is less than one day.
(2) It was translated from the day version, so there could be issues associated with that.
So my interpretation is that this method was refactored from an earlier "day" version. It's possible that the new refactored method doesn't properly handle when the timestep is exactly one day.
jmarrec
reviewed
Dec 16, 2022
Comment on lines
164
to
168
| // JJR: interval lengths of at least one day shouldn't shift the start of the loop, right? why would we ever start with the second element of the values vector? | ||
| if (modelObject.intervalLength() == 1440) { // do this for the one day interval; for interval more than one day, sorry you're on your own | ||
| start = 0; | ||
| lastDate -= dayDelta; | ||
| } |
There was a problem hiding this comment.
ScheduleFixedInterval::setTimeSeries (with is called from ScheduleInterval::fromTimeseries for eg) enforces that the interval must be 1 day or below:
OpenStudio/src/model/ScheduleFixedInterval.cpp
Lines 121 to 124 in 26ce82c
Unfortunately, neither ScheduleFixedInterval::setIntervalLength nor the IDD for 'Interval Length' enforce it. The following test works fine:
// Force an interval of 2 days though... Set the timeseries first with one day, but then call `ScheduleFixedInterval::setIntervalLength` with 2 days
Model model;
Date start_date(MonthOfYear::Jan, 1, 2007);
Time timestep_2day(1, 0);
Vector daily_wh_inlet_temperatures_c(5);
daily_wh_inlet_temperatures_c[0] = 10.0422222222222;
daily_wh_inlet_temperatures_c[1] = 9.98111111111111;
daily_wh_inlet_temperatures_c[2] = 9.92111111111111;
daily_wh_inlet_temperatures_c[3] = 9.86222222222222;
daily_wh_inlet_temperatures_c[4] = 9.80444444444445;
TimeSeries time_series_tmains(start_date, timestep_2day, daily_wh_inlet_temperatures_c, "C");
boost::optional<ScheduleInterval> scheduleInterval = ScheduleInterval::fromTimeSeries(time_series_tmains, model);
ASSERT_TRUE(scheduleInterval);
EXPECT_TRUE(scheduleInterval->optionalCast<ScheduleFixedInterval>());
ScheduleFixedInterval scheduleFixedInterval = scheduleInterval->cast<ScheduleFixedInterval>();
EXPECT_EQ(1440, scheduleFixedInterval.intervalLength()); // one day in minutes
EXPECT_TRUE(scheduleFixedInterval.setIntervalLength(2880));
EXPECT_EQ(2880, scheduleFixedInterval.intervalLength()); // one day in minutes
EXPECT_EQ(1, scheduleFixedInterval.startMonth());
EXPECT_EQ(2, scheduleFixedInterval.startDay()); // unrelated to this test, but this should be fixed to be 1I'm not sure why the setTimeseries disallows it, but I think we want to allow more than one day? I could see it a way to provide a 52 weekly (constant during the week) values for eg.
As a result, I think we should extend your fix to include more than one days.
Comment on lines
164
to
168
| // JJR: interval lengths of at least one day shouldn't shift the start of the loop, right? why would we ever start with the second element of the values vector? | ||
| if (modelObject.intervalLength() == 1440) { // do this for the one day interval; for interval more than one day, sorry you're on your own | ||
| start = 0; | ||
| lastDate -= dayDelta; | ||
| } |
There was a problem hiding this comment.
Apparently the FT code assumes it's less than one day, and according to git blame that change is from you @joseph-robertson :
Commit: 57350a7
Do you recall why?
Edit: apparently it was done well before (you didn't do that, it's probably just an indenting diff than I saw), in the initial PR: #670
Comment on lines
164
to
168
| // JJR: interval lengths of at least one day shouldn't shift the start of the loop, right? why would we ever start with the second element of the values vector? | ||
| if (modelObject.intervalLength() == 1440) { // do this for the one day interval; for interval more than one day, sorry you're on your own | ||
| start = 0; | ||
| lastDate -= dayDelta; | ||
| } |
There was a problem hiding this comment.
If we want to support multiple days, I suggest something like this:
#include <cmath> // For std::modf
Suggested change
| // JJR: interval lengths of at least one day shouldn't shift the start of the loop, right? why would we ever start with the second element of the values vector? | |
| if (modelObject.intervalLength() == 1440) { // do this for the one day interval; for interval more than one day, sorry you're on your own | |
| start = 0; | |
| lastDate -= dayDelta; | |
| } | |
| // JJR: interval lengths of at least one day shouldn't shift the start of the loop, right? | |
| // Why would we ever start with the second element of the values vector? | |
| const double intervalLength = modelObject.intervalLength(); | |
| double integralPart = 0.0; | |
| if (std::modf(intervalLength, &integralPart) == 0.0) { | |
| // The intervalLength is actually an int, not a double | |
| const int intervalLengthAsInt = static_cast<int>(integralPart); | |
| // If this is an interval representing one or more days | |
| if (intervalLengthAsInt % 1440 == 0) { | |
| start = 0; | |
| const int nDays = intervalLengthAsInt / 1440; | |
| lastDate -= dayDelta * nDays; | |
| } |
Otherwise, I think we should do an IDD change to enforce a maximum:
OS:Schedule:FixedInterval,
[...]
N1, \field Interval Length
\type integer
\required-field
\units minutes
\minimum 1
+ \maximum 1440There was a problem hiding this comment.
I'll try that first part for supporting multiple days (e.g., weekly interval).
There was a problem hiding this comment.
According to the new ft test for weekly interval, we'll need more changes/updates than just this.
There was a problem hiding this comment.
So, I think here the ScheduleFixedInterval.hpp is dumb.
The IDD
N1, \field Interval Length
+ \type integer
\required-field
\units minutes
\minimum 1Why is it a double here?
There was a problem hiding this comment.
I'd vote for an API break here, changing the return type to be the correct one: int. So we can get rid of that std::modf (that I suggested in the first place, I know)
People using the bindings (ruby) won't even notice it.
And people using C++ that do not have -Wconversion enabled won't see it either
There was a problem hiding this comment.
What about setIntervalLength? Change it to accept only int (instead of double)?
There was a problem hiding this comment.
Looks like you got it covered. Note to add entry in release notes about the API breaking changes.
joseph-robertson
changed the title
joseph-robertson
changed the title
…t like the IDD says instead of a double
jmarrec
force-pushed
the
fixed-interval-first-day
branch
from
cbd80c6 to
6d50826
Compare
|
CI Results for 6d50826:
|
|
Ah shoot I didn't realize windows was failing. |
jmarrec
added a commit
that referenced
this pull request
Feb 16, 2023
jmarrec
added a commit
that referenced
this pull request
Feb 16, 2023
Hotfix a conversion error in #4740
shorowit
added a commit
to NREL/OpenStudio-HPXML
that referenced
this pull request
Mar 8, 2023
shorowit
added a commit
to NREL/OpenStudio-ERI
that referenced
this pull request
Apr 17, 2023
2bf14137e7 Merge pull request #1309 from NREL/os360 410ba47aef Display the building ID when running an HPXML with multiple Building elements. [ci skip] fc71251c6f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 093ad33391 Merge pull request #1358 from NREL/multifamily_infiltration2 d6be0f038c Bugfixes. 2e81db7d16 Bugfix. dc8674e948 Use new HPXML schema proposal. 9164bb0ee6 Some more simplification. b636e303eb Latest results. 8db8ffec2c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 0a4599ece1 Latest results. ba690441fc Merge branch 'os360' of https://github.com/NREL/OpenStudio-HPXML into os360 3c279d570a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 d67531d0e2 Workaround for NREL/EnergyPlus#9934 d58219b1c9 Latest results. b3e5ab4d21 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 af7fd8234e Latest results. 98a63301e2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 c48cd34932 Latest results. 956aa689bd Missed one. 638e5a7604 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 3cdc199f0a Avoid new OS EMS warnings. ae64569816 Latest results. 84e6aed624 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 97ad985703 Latest results. 42221f62bd Need to create 366-day tmains schedule if leap year after the bugfix in NREL/OpenStudio#4740. [ci skip] 3723bde71a Try out OS 3.6.0. git-subtree-dir: hpxml-measures git-subtree-split: 2bf14137e773bb427cc0ca3f5399b9a3cada6fa7
joseph-robertson
added a commit
to NREL/resstock
that referenced
this pull request
May 9, 2023
…86060 006ac286060 Merge pull request #1381 from NREL/os360final 739422c3c43 Bump to final OS 3.6.0 4e5996a2318 Revert "First pass. Renames inputs; incorporates water heater location. Still need to incorporate HVAC location." 2d8071af2a6 First pass. Renames inputs; incorporates water heater location. Still need to incorporate HVAC location. b3a44abeec0 Merge pull request #1378 from NREL/hpxml_inputs_json 0cdcec80a1c Fix copy/paste from HEScore. c583336b526 Ensure stochastic schedules are kept up to date. 6a015ea06bc A bunch of additional cleanup. [ci skip] f3045d61043 Replaces hpxml_inputs.tsv with hpxml_inputs.json. ec02c257249 Merge pull request #1377 from NREL/simplify_asset_v_operational_2 f254df2d3ca For asset calculations, don't default number of occupants in hpxml_defaults.rb. That would be misleading/confusing, and if you run the simulation after the defaults are applied, it would now give operational calculation results, which is not what we want. 1625568a5d0 Merge pull request #1374 from NREL/remove-outputs-method f790affa476 Merge branch 'master' into remove-outputs-method c2da8e68195 Merge pull request #1373 from NREL/simplify_asset_v_operational 2c173c0e090 Merge branch 'simplify_asset_v_operational' of https://github.com/NREL/OpenStudio-HPXML into simplify_asset_v_operational a4daf0a5c21 Update changelog [ci skip] 64f231d8819 Remove outputs method in simulation output reporting measure. b299e558cd8 Latest results. 6d89ebe91a2 Fix ASHRAE 140 results. bd429ae9d98 Latest results. 86e46869746 Update OSW f23f2be8116 First pass. 9e3e36b8a88 Minor improvements to docs formatting 818723bca1c Merge pull request #1372 from NREL/autosized_hp_backup 72a5d1e8100 Merge branch 'autosized_hp_backup' of https://github.com/NREL/OpenStudio-HPXML into autosized_hp_backup 0bb18e26d47 Remove obsolete test. [ci skip] 95d7ba390fd Latest results. 4b6dff026d1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into autosized_hp_backup 15070c686d7 `BackupHeatingCapacity` can now be defaulted (autosized) even when the heat pump capacities are provided (hard-sized). abbb4aaa512 Merge pull request #1371 from NREL/xmlvalidator ba8c7197eeb rc3 docker container not yet available 1eb2848a1a0 Pass in XMLValidator instead of path, so that a XMLValidator can be reused in unit tests for performance reasons. 85b3d0c5280 Merge pull request #1370 from NREL/airflow_defect_ductless c4c71c439a1 Unrelated changes. e0c9e78009b Soften language. b7937b841f2 Ensure that ductless HVAC systems do not have a non-zero airflow defect ratio specified. 5577f6ad06f Merge pull request #1367 from NREL/schedule_file_path_ctor 7cdbbb8d144 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedule_file_path_ctor 190849d679d Merge pull request #1368 from NREL/hvac_sizing_cleanup dd122afb216 Merge pull request #1369 from NREL/hvac_sizing_bugfix 03c996e56f9 Latest results. bdfc5ea08b2 Bugfix. f0159ddcefc Bump to rc2 38d2587eb47 Latest results. 92a2d2ed42e Merge branch 'hvac_sizing_bugfix' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_cleanup 40e182539ab Latest results. 8e147c4fa03 Bugfix. 1e08dfce49d Merge branch 'hvac_sizing_bugfix' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfix ef23f6b51c7 Another bugfix. 6e68c1bc953 Latest results. 55b8bb42a74 Fixes possibility of double-counting cooling design loads for ducts. c035df824bf Merge branch 'schedule_file_path_ctor' of https://github.com/NREL/OpenStudio-HPXML into schedule_file_path_ctor 1f06d726205 Simplify argument. 836ea602428 Latest results. b4d943909c9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedule_file_path_ctor e4a7f801ed5 Test using OS develop 2c33c04c76e Latest results. 579130b23d6 Bugfix. a8bfe8cf74a Remove unused code. 7c29324879a Latest results. a2823b6b92e Consolidate duct calculations/methods. b7dbded00e4 Bugfix. 89377fda804 More cleanup and bugfixes. 7b4fb36bee6 Some more cleanup and bugfixes. a4b134fc8de First pass on removing HVACInfo and DuctInfo classes. 3ae89271d48 Improve warning message. c43d365ecf8 Avoid use of ExternalFile for ScheduleFile objects. [ci skip] eac98c4742b Merge pull request #1363 from NREL/update_dfhp_sample_file 2a4cc3a5e19 Latest results. ead8725ea74 Update base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml so that it has a different compressor lockout temperature versus base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml. f6befc1602f Update README.md 6fa72d4f534 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML cf5b00a26c5 Cleanup changelog/docs [ci skip] 2bf14137e77 Merge pull request #1309 from NREL/os360 410ba47aef6 Display the building ID when running an HPXML with multiple Building elements. [ci skip] fc71251c6fb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 b636e303eb7 Latest results. 8db8ffec2cc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 0a4599ece1c Latest results. ba690441fc6 Merge branch 'os360' of https://github.com/NREL/OpenStudio-HPXML into os360 3c279d570a0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 d67531d0e27 Workaround for NREL/EnergyPlus#9934 d58219b1c97 Latest results. b3e5ab4d213 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 af7fd8234ea Latest results. 98a63301e2b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 c48cd349326 Latest results. 956aa689bdf Missed one. 638e5a76044 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 3cdc199f0af Avoid new OS EMS warnings. ae645698169 Latest results. 84e6aed6249 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360 97ad9857030 Latest results. 42221f62bd8 Need to create 366-day tmains schedule if leap year after the bugfix in NREL/OpenStudio#4740. [ci skip] 3723bde71af Try out OS 3.6.0. git-subtree-dir: resources/hpxml-measures git-subtree-split: 006ac286060bfd7c9fc0b22790c79d68d9bc80a9
vtnate
added a commit
to urbanopt/urbanopt-example-geojson-project
that referenced
this pull request
Jul 13, 2023
…2b3271..e2f00fa6f
e2f00fa6f Merge pull request #1399 from NREL/os361
68791d89b Final 3.6.1
76a4286a8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os361
ecb6eac70 Bump to openstudio:dev-3.6.1
6755a0bc0 Merge pull request #1402 from NREL/generator_hpxmls
5debc2f39 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into generator_hpxmls
3df768d7b Merge pull request #1400 from NREL/psychrometric_warnings
ca596c38c Latest results.
82f42f659 Latest results.
916538d1b Update tests.
338fcf156 Unrelated: Use more realistic electricity production in generator files.
6dce9beca Use win from E+ in more SHR calcs; remove RH warning.
dd997070b Allow new warning.
f880a7b94 Fix test.
8a6b85f6d Use runner for Psychrometrics warnings rather than printing to stdout.
bd3052b54 Merge pull request #1394 from NREL/second-ducted-htg-sys
f39bfdc69 Latest results.
537c1fb42 Minor changes.
0f10bcfbf Latest results.
48b442451 Update the ducted vs ductless heat pump logic.
6cd506ded Merge branch 'master' into second-ducted-htg-sys
72a73c479 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os361
7c43a1d60 Fix workflow output docs. [ci skip]
5e2ee74fc Merge pull request #1244 from NREL/mshp_ashp
2bfad9ae1 Latest results.
940aa5e4a Update changelog, minor changes. [ci skip]
32f4dbef6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
53f21b954 Merge pull request #1390 from NREL/no-partial-hvac-loads
dd8fd948a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into no-partial-hvac-loads
b03293d36 Merge pull request #1398 from NREL/power-outage-warnings
2f990a97d Latest results.
802ccd0a9 Update other files.
ba692271d Test OS 3.6.1
3f8371a13 Merge pull request #1397 from NREL/hp-autosized-with-backup-hardsized
e61300d4f Latest results.
44074b9eb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
ee4623031 Narrow warnings so they only occur when HVAC/DHW are disabled (e.g., power outages, not vacancies).
66993d96e remove warning
7e8f34ca4 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
8f03bafe7 hardcode humidity ratio
3a105e9d8 Add test file to demonstrate capability; clarify in changelog.
3777b9871 Merge pull request #1395 from NREL/fix-invalid-actuated-control-type
308b56fba Latest results.
d8966dbea Fixes E+ error if there is a heat pump with separate backup heating and hvac seasons. Added test file.
35c9aa63c Latest results.
f1c8459a3 Merge branch 'second-ducted-htg-sys' of github.com:NREL/OpenStudio-HPXML into second-ducted-htg-sys
349929e04 Fix new error catch, and add comments.
e7ddfef10 Add note for zone temperatures. [ci skip]
b3020b876 Catch unexpected severe (or even fatal) messages in CI tests too. Remove duplicate hard-coded cfm/ton values; fixes MSHP severe messages.
73a0aa12f Latest results.
c352ee056 Add build error test for ducted mshp with backup furnace.
9b7e4e5b7 Add sample file for ductless mshp with backup furnace.
a263ba2d4 Allow second furnace and fixed heater if primary is ductless.
c614594f2 unit test for crankcase heater watts
c6f7b5aee Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
09925dd29 one more rename
1997c7352 Latest results.
d9aaa1f75 rename
ffe1981b9 Latest results.
0bce926e9 Merge branch 'no-partial-hvac-loads' of https://github.com/NREL/OpenStudio-HPXML into no-partial-hvac-loads
afd9d6883 Fix ASHRAE 140 tests.
d285c0b75 Latest results.
c69e5957c Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
ed8b1a27a Fix merge.
354fb4b76 Latest results.
dc6593e15 Update Changelog.md
c5d9fac65 Scale reported loads (including peak loads and component loads) by the total fractions of load served by the HVAC system(s).
16afc98f7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
119ca175a Merge pull request #1383 from NREL/hp-capacity-retention
23240f3ea Merge branch 'hp-capacity-retention' of https://github.com/NREL/OpenStudio-HPXML into hp-capacity-retention
87bbb59a5 Fix description. [ci skip]
e500daf74 Latest results.
e464591e6 Add HeatingCapacity17F files.
04f454f1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hp-capacity-retention
d7270930d Merge pull request #1385 from jmarrec/1384_WWR_Fallback_add_windows
38094d23a Apply suggestions from code review
9528831dd Merge pull request #1388 from NREL/fix-geometry-fin-attic
28d2a7ee8 Minor docs clarification.
5f4df8263 Merge pull request #1389 from NREL/fix-neighbor-building-azimuth-error
b47fa99d8 Latest results.
80507d7c1 Generalize test logic a bit.
9b7e1b07d Typo [ci skip]
e47c2f076 Proposed fix.
9ffb4b654 Add test file demonstrating the error.
f904dffb9 Ability to debug geometry in build measure tests.
9782db891 Same attic over garage rules for conditioned attic.
34161df56 Latest results.
712b0f09f Update Changelog.md [ci skip]
d17722c9d Add retention fractions to PTHP and RoomHP sample HPXMLs.
2ec535873 Latest results.
3cd4f96ab Cleanup.
ef7882d2a Updated default values for increased consistency. Added new inputs to docs.
58b057c35 Bugfixes.
614b6dcc7 Update schematron. Code refactor/consolidation. Update some tests.
2b668ce1c Fix RTD?
b7c370827 #1384 - Fallback to a WWR calculation when window placement fails
08f4543ee Latest results.
f7e9148f8 Latest results.
7b44e51b6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hp-capacity-retention
5a8e7428b Merge branch 'hp-capacity-retention' of https://github.com/NREL/OpenStudio-HPXML into hp-capacity-retention
5733cf353 Update tests.
3c9e13282 Latest results.
087d34b11 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
7bf708632 Merge pull request #1379 from NREL/infiltration_flue
36e1df504 First pass.
3cdb7fc1c Add a little explanation [ci skip]
9ee86a060 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into infiltration_flue
3d258ad9d Merge pull request #1361 from NREL/buried_ducts
d01479edf A little more.
62ae17c92 Minor docs update. [ci skip]
cca74ede5 Latest results.
9f7677481 Some docs cleanup [ci skip]
274515194 Assume 14-inch diameter for return ducts; use apparent R-values from paper instead. Update docs.
b5744b858 Merge branch 'buried_ducts' of https://github.com/NREL/OpenStudio-HPXML into buried_ducts
8079a6272 Minor update [ci skip]
db0c3a26e Latest results.
f95d2a2fd Bugfix.
337ce71db Allow both R-value inputs.
3118ea2c1 Allow DuctEffectiveRValue input; show defaulted value in in.xml.
006ac2860 Merge pull request #1381 from NREL/os360final
739422c3c Bump to final OS 3.6.0
68a0ea7cb Latest results.
31b22b0bf Bugfixes; update real homes.
7e629bc09 Merge branch 'infiltration_flue' of https://github.com/NREL/OpenStudio-HPXML into infiltration_flue
b517a113f Incorporate HVAC location.
d5fe88eab Latest results.
6099148e9 Fix/cleanup docs.
1864a73c2 First pass. Renames inputs; incorporates water heater location. Still need to incorporate HVAC location.
4e5996a23 Revert "First pass. Renames inputs; incorporates water heater location. Still need to incorporate HVAC location."
2d8071af2 First pass. Renames inputs; incorporates water heater location. Still need to incorporate HVAC location.
8477529b9 parse all error lines for warning
aa730956e Latest results.
a593a3234 Latest results.
19b3dbdfd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
82bae6c88 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into buried_ducts
b3a44abee Merge pull request #1378 from NREL/hpxml_inputs_json
0cdcec80a Fix copy/paste from HEScore.
c583336b5 Ensure stochastic schedules are kept up to date.
6a015ea06 A bunch of additional cleanup. [ci skip]
f3045d610 Replaces hpxml_inputs.tsv with hpxml_inputs.json.
ec02c2572 Merge pull request #1377 from NREL/simplify_asset_v_operational_2
f254df2d3 For asset calculations, don't default number of occupants in hpxml_defaults.rb. That would be misleading/confusing, and if you run the simulation after the defaults are applied, it would now give operational calculation results, which is not what we want.
1625568a5 Merge pull request #1374 from NREL/remove-outputs-method
f790affa4 Merge branch 'master' into remove-outputs-method
c2da8e681 Merge pull request #1373 from NREL/simplify_asset_v_operational
2c173c0e0 Merge branch 'simplify_asset_v_operational' of https://github.com/NREL/OpenStudio-HPXML into simplify_asset_v_operational
a4daf0a5c Update changelog [ci skip]
64f231d88 Remove outputs method in simulation output reporting measure.
b299e558c Latest results.
6d89ebe91 Fix ASHRAE 140 results.
bd429ae9d Latest results.
da082aadc Latest results.
86e468697 Update OSW
3284eea54 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
acf98a6da Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
5503c8591 typo
f23f2be81 First pass.
9e3e36b8a Minor improvements to docs formatting
818723bca Merge pull request #1372 from NREL/autosized_hp_backup
72a5d1e81 Merge branch 'autosized_hp_backup' of https://github.com/NREL/OpenStudio-HPXML into autosized_hp_backup
0bb18e26d Remove obsolete test. [ci skip]
95d7ba390 Latest results.
4b6dff026 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into autosized_hp_backup
15070c686 `BackupHeatingCapacity` can now be defaulted (autosized) even when the heat pump capacities are provided (hard-sized).
abbb4aaa5 Merge pull request #1371 from NREL/xmlvalidator
ba8c7197e rc3 docker container not yet available
1eb2848a1 Pass in XMLValidator instead of path, so that a XMLValidator can be reused in unit tests for performance reasons.
a32488991 Latest results.
0693022cc test negative crankcase watts
84f3110e3 address comments, round 1
a78528f59 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
7c6b1771a Update BuildResidentialHPXML/measure.rb
e1cf8d026 Update BuildResidentialHPXML/measure.rb
85b3d0c52 Merge pull request #1370 from NREL/airflow_defect_ductless
c4c71c439 Unrelated changes.
e0c9e7800 Soften language.
b7937b841 Ensure that ductless HVAC systems do not have a non-zero airflow defect ratio specified.
ab0c7c69e Latest results.
24bf1a918 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
5577f6ad0 Merge pull request #1367 from NREL/schedule_file_path_ctor
7cdbbb8d1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedule_file_path_ctor
190849d67 Merge pull request #1368 from NREL/hvac_sizing_cleanup
dd122afb2 Merge pull request #1369 from NREL/hvac_sizing_bugfix
03c996e56 Latest results.
bdfc5ea08 Bugfix.
f0159ddce Bump to rc2
38d2587eb Latest results.
92a2d2ed4 Merge branch 'hvac_sizing_bugfix' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_cleanup
40e182539 Latest results.
8e147c4fa Bugfix.
1e08dfce4 Merge branch 'hvac_sizing_bugfix' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing_bugfix
ef23f6b51 Another bugfix.
6e68c1bc9 Latest results.
55b8bb42a Fixes possibility of double-counting cooling design loads for ducts.
c035df824 Merge branch 'schedule_file_path_ctor' of https://github.com/NREL/OpenStudio-HPXML into schedule_file_path_ctor
1f06d7262 Simplify argument.
d04a5a2f0 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
da793d4c6 update measures
287dc9094 Latest results.
26c7d28b2 minor cleanup and doc for crankcase watts
dc89a0fbf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
207bf5d4f Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
836ea6024 Latest results.
b4d943909 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into schedule_file_path_ctor
e4a7f801e Test using OS develop
2c33c04c7 Latest results.
579130b23 Bugfix.
a8bfe8cf7 Remove unused code.
7c2932487 Latest results.
a2823b6b9 Consolidate duct calculations/methods.
b7dbded00 Bugfix.
89377fda8 More cleanup and bugfixes.
7b4fb36be Some more cleanup and bugfixes.
a4b134fc8 First pass on removing HVACInfo and DuctInfo classes.
3ae89271d Improve warning message.
c43d365ec Avoid use of ExternalFile for ScheduleFile objects. [ci skip]
eac98c474 Merge pull request #1363 from NREL/update_dfhp_sample_file
2a4cc3a5e Latest results.
ead8725ea Update base-hvac-dual-fuel-air-to-air-heat-pump-1-speed-lockout-temperatures.xml so that it has a different compressor lockout temperature versus base-hvac-dual-fuel-air-to-air-heat-pump-1-speed.xml.
f6befc160 Update README.md
6fa72d4f5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML
cf5b00a26 Cleanup changelog/docs [ci skip]
2bf14137e Merge pull request #1309 from NREL/os360
410ba47ae Display the building ID when running an HPXML with multiple Building elements. [ci skip]
fc71251c6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360
a0d6492a9 update_measures
7e30230cc Merge branch 'buried_ducts' of https://github.com/NREL/OpenStudio-HPXML into buried_ducts
10705e873 Add unit test. Fix typo in docs.
4a1427487 Latest results.
b9d6272d4 Bugfixes.
0923db016 First pass.
093ad3339 Merge pull request #1358 from NREL/multifamily_infiltration2
d6be0f038 Bugfixes.
2e81db7d1 Bugfix.
dc8674e94 Use new HPXML schema proposal.
9164bb0ee Some more simplification.
1286f3c62 Latest results.
b636e303e Latest results.
bbcb863a7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
8db8ffec2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360
a7a86bc09 Merge pull request #1357 from NREL/hpxml_inputs_tsv
850fae2e7 Latest results.
ede660343 Merge branch 'hpxml_inputs_tsv' of https://github.com/NREL/OpenStudio-HPXML into hpxml_inputs_tsv
187d94b9e Bugfix.
8f0d1b4c8 Latest results.
645709c0f Cleanup, bugfixes.
0ced38fe7 First pass on replacing ruby code in tasks.rb with a hpxml_inputs.tsv file.
07e44f258 Suppress OS EpwFile warnings
82f49d1e8 Merge pull request #1354 from NREL/weather_unit_tests
aec28c38c Fix test.
b72dc274b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into weather_unit_tests
4cdd1d23b A little more cleanup.
780e7a0d4 Add weather unit tests. Update `foo.select{ ... }[0]` to `foo.find{ ... }`.
5e4cf7036 Merge pull request #1282 from NREL/hvac_sizing
6c2438306 Minor code cleanup.
9230aa3eb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
76347d2a4 Merge pull request #1339 from NREL/remove_weather_cache
77c493fbf Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into remove_weather_cache
1af631001 Latest results.
882cdb79d Oops, missed one merge conflict.
e2966b741 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
4df8bff5b Merge pull request #1351 from NREL/system_uses_with_fuel_type
8bc782ba4 Latest results.
e603294a0 Bugfix.
640472d4a Exclude System Use and Emissions outputs from the CI results csv.
b2c02d82b Latest results.
9affb6fbe Include fuel type into system use outputs.
54eb142a3 Merge pull request #1349 from NREL/hp_vs_backup_fan_disaggregation
6645d4295 Latest results.
ecf50b354 Update comment.
64bda69a2 First pass to improve primary vs backup fan/pump disaggregation to handle hours where both HP and backup are operating.
dc3ae4bc1 Merge pull request #1348 from NREL/attached-surfaces-warning
5846ebf6e Changes the attached surfaces check from an error to a warning (to accommodate e.g. the ERI IAD home).
ba9222f1c Small hotfix.
bbce45a3a Merge pull request #1346 from NREL/deterministic_system_uses
427e98894 Latest results.
e73408847 Cleanup.
cfd7f0d9f Make System Use outputs deterministic (and ordered like the HPXML file).
026ba231f Merge pull request #1345 from NREL/ci_test
531315099 CI test
ecc9a2882 Merge pull request #1342 from NREL/disable_annual_outputs
fbb6c8d0c Address review comment
a298bd1cf Latest results.
80a24325b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into disable_annual_outputs
f52373d1b Merge pull request #1344 from NREL/attached_surfaces_error_checking
80cb23f2f Ensure system use outputs are ordered (deterministic).
6b77a20ba Latest results.
872a3ad1d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into attached_surfaces_error_checking
a460dcd8a Fix tests.
0a4599ece Latest results.
ba690441f Merge branch 'os360' of https://github.com/NREL/OpenStudio-HPXML into os360
3c279d570 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360
d67531d0e Workaround for https://github.com/NREL/EnergyPlus/issues/9934
41bb2f262 Merge pull request #1343 from NREL/unavailable_periods
cd9e2d13e Adds error-checking to ensure that SFA/MF dwelling units have at least one attached wall/ceiling/floor surface. This is particularly important for infiltration adjustment (Aext) calculations.
19a3413bd Add test.
5d1988657 Fix a couple tests.
10678c67d First pass on combining vacancies & power outages into a single feature, with the possibility of users creating their own unavailable period type.
ffbd155d7 Latest results.
d58219b1c Latest results.
18983d0dd Add sample file.
72d5492b7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
b3e5ab4d2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360
06221242f Merge branch 'disable_annual_outputs' of https://github.com/NREL/OpenStudio-HPXML into disable_annual_outputs
92233a4d6 Update tests.
91f25613e Latest results.
edc4a359e Small fix.
f96722dc6 Add net emission outputs; total now excludes generation. The three emission output types (total, by fuel, by end use) are now separated in the csv file.
f34ba5284 ReportSimulationOutput measure: Allows disabling individual annual output sections.
bfaebab3d Update Changelog.md [ci skip]
5530b4277 Oops, still need this.
044d6b282 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into remove_weather_cache
6e97b8129 Bugfix.
36d2f6e24 Updated weather processing so that it only takes 0.2 seconds. That's fast enough that we can just do the weather processing on the fly, remove the use of weather cache files, and simplify our code.
e2ee07a0f Merge pull request #1333 from NREL/system_use_outputs2
8b19cab0f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
a0db8d531 Fix test.
674ea3c81 Merge branch 'system_use_outputs2' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
b7e835b61 All annual load outputs are now provided as timeseries outputs; previously only "Delivered" loads were available.
b2c3fa799 Latest results.
5dd066a2a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
4f39a733f Merge pull request #1337 from NREL/shading_controls
d64ec239c Merge branch 'shading_controls' of https://github.com/NREL/OpenStudio-HPXML into shading_controls
dff2a2879 Fix docs.
1f7167ce9 Latest results.
cbc139c7d Fix tests.
7f2fdd541 Allows summer vs winter shading seasons to be specified for windows and skylights. Revert to monthly average temperature-based defaults.
9a80f39f7 Try to initiate CI run again
3c063803c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
86c058c32 Clarify docs [ci skip]
def5a22d7 User our own names instead of OS-autogenerated names, to avoid lots of diffs between files just because the autogenerated names were different.
368a98f30 Merge pull request #1336 from NREL/multiple_buildings_speed
a3833b97c Don't need these tests anymore, validation of all sample files is performed as part of workflow/tests/hpxml_translator_test.rb
327bf1904 Update Changelog.md
792db7047 Speed up schematron validation when running a simulation for an HPXML file that has multiple Building elements; now we only do schematron validation on the single Building element of interest. This also means we now get warnings specific to the single Building of interest too.
f806aa07e Latest results.
3da0b90a1 Fix for shared GSHP w/o backup.
87c95b8ab Clarify hydronic distribution type documentation for boilers.
03bd059ba Latest results.
2de122443 update test files
b2f4b8e0c ignore warning
479004e35 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
c0dd84e5c Latest results.
42a5c5405 Update docs for, e.g., heat pump w/ boiler backup scenario
6d627664c Merge branch 'system_use_outputs2' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
1820830c5 Handle additional heat pump backup situations.
1b0f6dc87 Revert fan/pump changes; just add heat pump backup fan/pump end use instead.
3b1a21278 Latest results.
5fe7f2146 Fix tests
2c6000f3f Cleanup Changelog.md [ci skip]
7a06e92d7 Typo [ci skip]
e2edc1405 Update Changelog.md [ci skip]
027bb0209 Major cleanup: - Remove individual fan/pump end use outputs; now aggregated with other parent end uses (e.g., cooling) - Adds "Load: Heating: Heating: Heat Pump Backup" - Remove ERI argument and outputs; everything can now be calculated downstream in OS-ERI - Remove special handling for dual-fuel heat pumps; no longer needed
227cb13c3 Latest results.
5fea7968f Merge branch 'system_use_outputs2' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs2
2c6f526ef Oops, missed one.
3e452edcf Latest results.
94decf9d3 Fix tests.
533df42ac Order by system instead of end use.
ea05664d9 For ERI, separate out heating vs cooling for heat pumps and other cleanup/fixes.
24c3cb718 Merge pull request #1332 from NREL/system_use_outputs
65793a420 Latest results.
eeae3e16f Clean up docs a bit [ci skip]
16ba01765 Prevent dehumidifiers and mech vent preheat/precool systems from showing up.
eea880e5f Latest results.
d28e76075 Replace hardcoded rounding digits for some outputs.
48735e2cd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into system_use_outputs
59b0df0f0 ReportSimulationOutput measure: Add annual energy outputs per HVAC and water heating system; allow requesting timeseries output.
af7fd8234 Latest results.
98a63301e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360
307a84108 Merge pull request #1314 from NREL/stochastic-schedules-followup
a61869f99 Bugfix, issue spotted by @joseph-robertson
958ddf563 Merge branch 'master' into stochastic-schedules-followup
8aafb1957 Create a non stochastic schedule file we can use for testing detailed schedules.
a577fbb83 Merge pull request #1321 from NREL/multifamily_infiltration
99179135e Remove unused occupancy-stochastic-all schedule file.
4c1771be7 Merge branch 'master' into stochastic-schedules-followup
7e9afaeab Update Changelog, add tests.
6024a3ec8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multifamily_infiltration
c6dd2a8e5 Merge pull request #1330 from NREL/schedules-affected-improvements
96f5cb971 Skip on the right battery columns.
dcecc7530 Hot water dw and cw follows power dw and cw.
707809700 Missed a few updates in translator measure.
84033f13f Update schedules_affected for unused hot_water, additional vent types.
a040ff224 Update hvac, schedules, and water heater resources accordingly.
0c54cca64 Update schedules_affected column names to be more user friendly.
409fff53e Pass off_periods to hvac, water heating, and dehumidifiers.
0d18685e2 Remove json require and fix reference.
c48cd3493 Latest results.
956aa689b Missed one.
638e5a760 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360
3cdc199f0 Avoid new OS EMS warnings.
8d0965128 Merge branch 'master' into stochastic-schedules-followup
67d7f03b7 Clarify docs [ci skip]
7c68b5e57 Update docs [ci skip]
1ade392aa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into multifamily_infiltration
21584d9d4 Merge pull request #1319 from NREL/clarify_docs
637fc41be Fix docs
818e5b2ec Fix CI test
847919962 Merge branch 'multifamily_infiltration' of https://github.com/NREL/OpenStudio-HPXML into multifamily_infiltration
c3f7a0360 Bugfix.
a04a15055 Latest results.
4a93fb059 Rename
5683fe465 Connect to model, update docs. Allow Aext to be optionally entered.
bd6f84bf1 Latest results.
cae843f13 Bugfixes.
6dd704356 Add arg to BuildResidentialHPXML measure, update/add sample files.
5ca1f00e6 Start to stub out code.
2c34d2e41 Minor tweak [ci skip]
c288490eb Add more detail around HVAC autosizing defaults (particularly for heat pumps).
8957b3f77 Add GSHP to fans/pumps description
da17467a5 Document mechanical ventilation flow rate equation.
3f4a26dee Add description for PVWatts SystemLossesFraction 14% default.
c2d8e78c2 Merge pull request #1320 from NREL/lighting_group_flexibility
251419941 Merge branch 'lighting_group_flexibility' of https://github.com/NREL/OpenStudio-HPXML into lighting_group_flexibility
ff40a22ad Brings back lighting_present arg so that the change is non-breaking.
91009fdb8 Latest results.
b57b82d03 Bugfix.
9e2f39b91 Bugfix.
cfc040384 Bugfixes.
8e52cd244 Allow interior lighting to be optional too. Simplify code, update docs.
4ddcaac1a Allow more flexibility for lighting. LightingGroups for exterior and garage are no longer required; if not provided, these lighting uses will not be modeled.
cf43fce74 Typo
d2343fe34 No idea how this happened.
84a8ef61d Clarifies a few misc things in the docs.
1c476fae0 Merge pull request #1318 from NREL/natvent_and_units_cleanup
1fd3278b0 Latest results.
2604bb0e2 Merge branch 'natvent_and_units_cleanup' of https://github.com/NREL/OpenStudio-HPXML into natvent_and_units_cleanup
830c49a34 Bugfix.
4635fe433 Latest results.
50da3f1a6 Code cleanup related to natural ventilation and unit conversions.
003e67ff5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
9e4f7de25 Merge pull request #1316 from NREL/avoid_os_tmp_path_collision
00defb99a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into avoid_os_tmp_path_collision
5360fe769 Update tests.
e6064b44a Latest results.
970ff6929 Merge branch 'master' into stochastic-schedules-followup
2e59af0b6 Merge pull request #1266 from NREL/power-outage2
0865613a1 Merge branch 'power-outage2' of github.com:NREL/OpenStudio-HPXML into power-outage2
8cd2fc5cd Update some tests after removing sample files.
293959bbe Latest results.
2b1339951 Update hvac resource file.
df38e30d2 Remove vacancy and outage sample files with defaulted schedules.
de3a740b4 Clean up some more.
81e009994 Method consolidation.
4b7bba2f8 Latest results.
b3c567d34 Random cleanup.
e7d9e764a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into power-outage2
29702029b Provide our own temporary dir to OS for XSLT generation when performing Schematron validation.
ae6456981 Latest results.
cdc64669c Merge pull request #1315 from NREL/heating_pilot_light
e8296b2ba Minor cleanup. [ci skip]
84e6aed62 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os360
97ad98570 Latest results.
3b3678700 Latest results.
bcccd7ad4 Update the changelog. [ci skip]
90eef696b Add EMS program for boiler pilot light.
944a9ed35 Create new constants file and phase out json file.
118d27f22 Move validate_values since it is shared.
2ad531f19 Fix CI test.
d7450930c Merge branch 'heating_pilot_light' of https://github.com/NREL/OpenStudio-HPXML into heating_pilot_light
3b8adfd93 Cleanup.
28138630b Latest results.
ae101271c Allows modeling a pilot light for non-electric heating systems (furnaces, stoves, and fireplaces). E+ doesn't have an input for boilers. No point modeling a pilot for water heaters, has negligible effect since most of the pilot heat goes to the water, just adds complexity.
04c867719 Latest results.
245601e1a Stochastic tv plug loads follow other plug loads.
32f8cba29 Stochastic garage lighting follows interior.
5ee0fd799 Remove some lighting schedules from generator.
416421814 bugfix
5bb22af10 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
dec5334b1 ashp shr changed to be the same as mshp
e727c0a7c Merge pull request #1313 from NREL/write_all_outputs
0c83947e8 Update test.
283f69a3f Latest results.
578dddd6d Write all outputs for annual emissions and utility bills, even when values are zero.
42221f62b Need to create 366-day tmains schedule if leap year after the bugfix in https://github.com/NREL/OpenStudio/pull/4740. [ci skip]
3723bde71 Try out OS 3.6.0.
c84eeccce Merge pull request #1302 from NREL/peak_eletricity_outputs
8041fb907 Latest results.
d314d9282 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into peak_eletricity_outputs
2d504702b Merge pull request #1305 from NREL/window_shading_schedule
8ea9a5f36 Latest results.
e63c6c7c1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into window_shading_schedule
d12eaa38b Merge branch 'master' into power-outage2
135b69f29 Merge pull request #1307 from NREL/collapse_enclosure
4aba947dc Latest results.
372c07bf8 Fixes CI tests?
c9ff0dd94 Merge branch 'collapse_enclosure' of https://github.com/NREL/OpenStudio-HPXML into collapse_enclosure
b2ffed7fa Final cleanup
f766dfcbd Latest results.
fd41e53eb Merge branch 'collapse_enclosure' of https://github.com/NREL/OpenStudio-HPXML into collapse_enclosure
625d9ea3b Bugfix for foundation walls.
2bfaee6c7 Latest results.
a8f00dd72 Merge branch 'collapse_enclosure' of https://github.com/NREL/OpenStudio-HPXML into collapse_enclosure
b48dfb006 Since there is still a significant penalty to additional surfaces, keep the collapse method for modeling, just move it out of the HPXML constructor.
cc11a6a79 Latest results.
908a80d30 More updates needed
36764ecd5 Update tests
a967ffda8 No longer default to collapsing enclosure elements when calling HPXML.new(); callers that want this can explicitly call the collapse_enclosure_surfaces() method.
b9aa6e869 Add comments that explain ignoring humidity constraints. [ci skip]
e308c5190 Latest results.
eab78264a Window shading seasons now based on calendar dates (e.g., summer: May 1-Sep 30 in northern hemisphere) instead of monthly outdoor temperatures.
c68a689d2 Typo.
bc1dc1bd2 Change outage sensor variable name.
d25f645eb Update schedule test after changing to Jul.
d09b3caca Latest results.
de8e01596 Add new natvent reporting test.
cf8c2a1c7 Include outage sensor in natvent program.
cc267bbb2 Update natvent sample files to have Jul outage.
c18aa0d38 Latest results.
f93e9e268 Bugfix.
0a59180fc Improve summer/winter peak electricity outputs so that they are not tied to HVAC operation (and zero if, e.g., there's no cooling system).
e0a08c6c7 Merge branch 'master' into power-outage2
96861dedc Fix typos in translator test file.
acba9d0e7 Merge pull request #1298 from NREL/apply-validation-defaults
dbd95e7e6 Clean up target temperature warning in translator test file.
60aa36c59 Merge branch 'master' into power-outage2
d1338ad09 Add test for zero ceiling assembly r-value.
df9a23c16 Rearrange validate methods a bit.
591c329c9 Move validate_hpxml method inside HPXMLFile class.
ed39a3007 Change order of validation and defaulting.
79880c8d7 Merge branch 'master' into apply-validation-defaults
5d240c598 Merge pull request #1297 from NREL/utility_bill_fixed_charge_bugfix
dabbe0780 Apply validation when applying defaults.
8d333ff6b Bugfix.
8976d8d62 Update unit test to demonstrate error.
089d05aa7 Update README.md [ci skip]
cf1e85080 Latest results.
202d18480 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
e42ffbc8a refactor for cfm/ton and fan speed ratios
48061cf62 Pass in hours for zero occupancy.
86722b3b7 Update defaulting, validator, and tests.
9ca9f107f Update the docs.
145283e6d Add default tests.
5ad98bd19 Update argument descriptions.
b4bb1b2f5 Merge branch 'master' into power-outage2
505278bfe Add knee wall attic type constant. [ci skip]
2bb2f530c Latest results.
ad863a1c1 Update schedule tests.
3e025a085 Avoid discrete schedule types for fractional schedules.
040b59803 Merge branch 'master' into power-outage2
d35a81fc5 Merge pull request #1289 from NREL/hpwh_operating_mode
4a37a0f3e Fix schedule type issue with hpwh.
f02397627 Fix typo in docs.
3eebbf6f8 Replaces `WaterHeatingSystem/extension/OperatingMode` with `WaterHeatingSystem/HPWHOperatingMode` for heat pump water heaters.
a5f7b6778 Fix a few issues.
e39b2868a Fix create new heater method.
335139eff Merge pull request #1288 from NREL/hpxml_merged_xsd
a569df1f9 Restructure how nat vent is handled.
75159eb19 Update build measure for natvent name change.
28c505116 Address a bunch of review comments.
a7cf0800e Switch to using the HPXMLMerged.xsd (renamed to HPXML.xsd so we and other software tools don't have to update code).
d417a4c9e Latest results.
5413990f0 Merge branch 'hvac_sizing' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
2b3bd2eb4 Add EPWs.
0ee72b8ef Latest results.
0355a62b1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
1f0698068 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
b29126250 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
b9615137d change rated airflow to be 400
a47f969b9 Add a off period schedules test for leap year.
7f193d3ef Merge branch 'master' into power-outage2
a33064381 Remove year round outage schedule tests.
3dce461c6 Latest results.
b094d2502 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML
bbf7f8eb2 Reduce AFUE/efficiency warnings from 60% to 50%. (See https://www.homedepot.com/p/Williams-45-000-BTU-Natural-Gas-Floor-Heater-4505622A/311802910 for example.)
460f330b5 Catch new nonzero warnings from translator test.
9060f79d4 First cut at throwing warnings for nonzero values from reporting measure.
9775c8c77 Remove year round outage files and error check.
f4b62fa51 Latest results.
5fe62ddea Remove some new sample test files.
e670290b6 Finish tests for all schedule rule combos.
8c7fc0925 Create a method for checking day schedule values.
e4fe08db9 Latest results.
b41c13409 Fix affected by methods.
c395ef6b2 Update water heater resource.
a3b60f288 Start to stub all unique combinations of periods.
0e17882a5 Fix double-counting an hour in the solar design load calcs.
9d9b84bd5 Update method name in hvac resource.
bbd248f29 Consolidate vacancy and outage period methods for detailed schedules.
fa9de7820 Reference the new schedules affected data file from the docs.
2ef71762c Move affected by info into data file.
6ca4ce08f Consolidate parse_date_range methods into one.
e233bda87 Update epvalidator for vacancy hours.
4ad134ec9 Consolidate vacancy and outage periods into a single off periods argument.
023d696a8 Support hours for vacancy period in build measure.
d4d32327a Windows: DAL bugfix. Conditioned basement slab: Improve consistency w/ Manual J, add insulated slab handling. More test updates.
f92bce33f Latest results.
dfceb8fca Add sample test files for more cases.
9f4c2b0cd Avoid overwriting variables in schedule resource.
5c9c3ee8c Add new simulation output test.
b1c1dba78 Merge branch 'master' into power-outage2
5ce006bd2 Progress on ACCA residences for testing.
21d338c4a Merge pull request #1287 from NREL/infil_refactor
7d1f27063 Update xml
eba00b58a Small infiltration refactor.
7cf7f1923 NumberofUnits->Count
036d6ef19 Merge conflict.
a7e161951 Merge branch 'master' into power-outage2
a06208140 Latest results.
547f18103 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
6920410bb heating equations
12b0b0a05 Latest results.
ee88886b2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
b9fb3669d Merge pull request #1285 from NREL/addtl_infil_inputs
5e31f42e6 Minor cleanup [ci skip]
87143ea64 Expand docs [ci skip]
3c08cf985 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into addtl_infil_inputs
3507a29f3 Merge branch 'addtl_infil_inputs' of https://github.com/NREL/OpenStudio-HPXML into addtl_infil_inputs
949ad05ef A little more cleanup.
5118b32fa Latest results.
49cbd045b Merge pull request #1284 from NREL/remove_sqlite
32c840855 Allow air leakage to be specified using CFMnatural or EffectiveLeakageArea. Some code refactoring/cleanup.
12325b1df Remove E+ sqlite output file by default.
cd5351e7e Update measure.xml
a8c0e1a72 Merge branch 'hvac_sizing' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
5ee6521e8 Add indoor RH input. If there's a dehumidifier with RH setpoint lower than 50%, use that by default.
2dea9460f Latest results.
881455c52 Latest results.
9950f0d18 Convert pwsat to an equation based on temperature. Update indoor RH assumption from 55% to 50%.
5b6ca4457 Merge branch 'master' into power-outage2
f1c775c09 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
d8aee41a4 Merge pull request #1283 from NREL/tiny_surfaces
9d11adc04 Latest results.
5b704bbc0 Remove split-surfaces HPXML sample files; convert into a test.
f50ca71da Latest results.
0507bb3a6 Revert.
ed1f56e86 Latest results.
217caca0a Fixes CI?
8fc016769 No longer need to delete tiny surfaces now that CarrollMRT.
5a500b6d5 Add unit tests. Remove design temperatures from HVACPlant.
714ec3eda Latest results.
0cf513ef5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
6fd9928a0 Merge pull request #1273 from NREL/heat_pump_temperatures
4cf6def09 Latest results.
0aebfdf8e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_temperatures
2e2cb2aea Allow separate sensible/latent inputs for internal loads. Rename ACCASizingInputs to ManualJInputs. Update default internal gains if extra refrigerator or freezer.
a62af9ced Oops.
5c79ecf08 Merge branch 'hvac_sizing' of https://github.com/NREL/OpenStudio-HPXML into hvac_sizing
a372e4ff1 Fix tests.
a7ff0c328 Latest results.
48726da3d Missed one.
0fd502497 First pass on additional inputs.
a6fb68761 Merge pull request #1281 from NREL/ervs
5dc7b9faf Update real homes.
925270520 Add ERV warnings for relationship between ATRE and ASRE (or TRE and SRE).
e5cd85f13 Latest results.
69c0d32be Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_temperatures
bf6cfc514 Latest results.
eeccf1056 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
4c142082e Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
05ff6e8b2 implement the same cfm per ton for mshp cooling
fe7b5c637 Merge pull request #1274 from NREL/comp_load_expand
72afd27be Latest results.
ecbfeaa74 Revert internal mass component load.
7b3f33de5 Latest results.
77c3e4753 Merge remote-tracking branch 'origin/master' into comp_load_expand
11b927f80 Merge pull request #1277 from NREL/fix_compload_asserts
4010ba7d7 Merge branch 'fix_compload_asserts' of https://github.com/NREL/OpenStudio-HPXML into comp_load_expand
3fc35fbbc Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_compload_asserts
ba95ce65e Update assert criteria.
ae08b8751 Merge pull request #1269 from NREL/msgpack_sans_rounding
1210e57bb Update pull_request_template.md [ci skip]
32dbf6ce9 Add test.
88085b2c5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into msgpack_sans_rounding
7f7606934 Handle sample files with zero heating/cooling load
23f4a48fc Does this help?
1c740cd74 Fix the asserts and add debug code to check what the max values are.
74d25da0e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_temperatures
b12faf987 Merge branch 'heat_pump_temperatures' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_temperatures
5f22424b8 Minor cleanup. [ci skip]
7cef7119d Merge pull request #1276 from NREL/update_sample_files
4c72a75e7 Latest results.
99728010f Bugfix.
976670558 remove residual component load
733aec76b Merge branch 'update_sample_files' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_temperatures
a9710a065 Latest results.
d852ffaae Bugfix.
d7ef06ba2 Merge branch 'comp_load_expand' of https://github.com/NREL/OpenStudio-HPXML into comp_load_expand
678b2e6db update docs
85350a4d5 Update Changelog.md
85d875b81 Update sample files to minimize simulation result diffs in heat_pump_temperatures branch.
a1172ec70 Latest results.
950afa8dd Clean up BuildResHPXML measure arg descriptions. [ci skip]
abd55b056 Update docs and changelog. Other minor changes.
147ff9f76 Latest results.
f6d6879ec Move HVAC sizing tests.
e2991d2d9 Incorporate compressor lockout temp in set_fan_power_ems_program.
1781b5c62 Use EMS program to set maximum temperature for HP *separate* backup systems.
69a100067 Add error if switchover temp & electric backup. More progress on tests.
c25eff3b1 update_measures
8818c9eae Merge branch 'comp_load_expand' of https://github.com/NREL/OpenStudio-HPXML into comp_load_expand
310c2a571 update changelog
46f78f7b5 minor revert
df6ed6210 Latest results.
3fcb098a4 Merge branch 'master' into power-outage2
05061f331 update how residual component load is calculated
db56d05ad update reporting test for new component loads
88325fa2f Merge remote-tracking branch 'origin/master' into comp_load_expand
351fe6e8c Bugfix.
541bafdaf Clean up EPvalidator.xml.
f666555df Bugfix.
899c90645 Handle HPs w/ separate backup similarly to HPs w/ integrated backup.
42af578b8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_temperatures
c2c8a494d Merge branch 'comp_load_expand' of https://github.com/NREL/OpenStudio-HPXML into comp_load_expand
e034d780b remove internal mass from component loads
622d960f5 calculate load component residuals
dbb65611e Merge pull request #1272 from NREL/lighting_load
917dd392d Latest results.
5385a8d03 break out lighting from internal gains component loads
575435efd break out window component loads into conduction and solar
8f5b5c7ba Latest results.
f4be438f6 Latest results.
bc2866231 Merge branch 'master' into power-outage2
c04b4ee7f Throw fail if cfis with power outage.
9950da5b3 Bugfix for no lighting.
340873b6a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into lighting_load
c8ccb946a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into heat_pump_temperatures
bd069c015 Apply vacancy and outage periods to dryer exhaust.
133713f85 First pass.
978b74f49 Add unit tests.
14d17a535 Add schematron tests.
c3cbdbb68 First pass on allowing kWh/year lighting values instead of fractions of different lighting types.
db7f1897f Merge pull request #1243 from NREL/latest_hpxml_xsd2
9029c0a44 Minor docs update [ci skip]
29de1ee98 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into latest_hpxml_xsd2
37a471707 Msgpack outputs are no longer rounded (since there is no file size penalty to storing full precision).
b61c2a9b0 Avoid writing empty total energy when year round power outage.
b2d35e5bb Merge branch 'power-outage2' of github.com:NREL/OpenStudio-HPXML into power-outage2
19d239dbb Return year round true or false for each outage period.
049fa0112 Latest results.
96bff534a Fixes around outages involving specified hours.
004e1df7c Latest results.
923e060a5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
7e1099c05 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
4132b6c58 change the cfm/ton to be the same at max speed, keeping mshp approach
e36fadecd Merge branch 'power-outage2' of github.com:NREL/OpenStudio-HPXML into power-outage2
a4e3ac6cf Update water heater tests for new setpoint schedule type.
1525260d5 Latest results.
dda9d41a6 Add err file skip for target water temperature.
184ba96d6 Update schedules test file for wh setpoint schedule type.
489b4c01b Actuate schedule:year now that we use rulesets for constant schedules.
1e7d5c75f Merge branch 'power-outage2' of github.com:NREL/OpenStudio-HPXML into power-outage2
067de8afd Pass outage periods to waterheater for setpoint adjustment.
f2c300e14 Update airflow and hvac resources for new schedule class name.
585ab10b0 Update new schedule class to take any constant value.
1fe323802 Latest results.
75304158f Add tests for outages with stochastic schedules.
da3fe5e95 Continue to clean up new schedules resource methods.
856925b96 Latest results.
233c63d94 Start adding new outage tests to schedules test file.
a647e53fa Update some sample files.
ea1eba008 Finish outage rules in schedules resource.
aa5b8b494 Merge branch 'power-outage2' of github.com:NREL/OpenStudio-HPXML into power-outage2
467cd1ef7 Regenerate hpxmls.
453073c16 Update epvalidator.
02ff0bf46 Add begin and end hours to docs.
50440e782 Latest results.
7cc45b960 Update sample files for testing specified outage hours.
db584d428 Update translator resources for specified outage hours.
20e3bab82 Update build measure to handle specified outage hours.
d999787cf Merge pull request #1267 from NREL/address-ci-warnings
93ea0e2f1 Bump to v3 of GitHub actions.
9fa63f1a3 Latest results.
ad6017a08 Add two new sample files for natvent availability.
cd5898c42 Update schedules and airflow resources for natvent availability.
68a32eea0 Update hpxml resource for new natvent availability element.
56e11ffa8 Add build arg for natvent availability during outage.
438360cfc Update the docs.
4e2559b60 Ability to apply outage periods to house fan.
f3fec00c3 Ability to apply outage periods to whole house fan.
4d85c5872 Ability to apply outage periods to dehumidifier.
d561ddf0f New class for always on schedule ruleset.
44b8f4679 Update changelog and docs.
073c60e3c Latest results.
e32fca46b Update tests in workflow translator test file.
699347d8e Optionally create outage sensor and use in unmet hrs program.
24af2c18b Add more outage sample files.
a132bd923 Update add_ideal_system method with seasons.
5c669af94 Update sample files for new power outage scenarios.
dc2357299 Start to update translator resource files for outage periods.
81863d9f0 Update schedules resource to set outage schedule rule.
e82578478 Pass power outage periods across translator measure.
471ffcd23 Add power outage argument to build measure.
d952c23b8 Merge pull request #1264 from NREL/args-cleanup
860c073ae Remove the now unused vacancy period arg from schedule file measure.
c51a68e7a Merge pull request #1263 from NREL/validator-tmp-dir-fix
c85405657 Update measure xml files.
02f4539f2 Wrap tmp path remove in begin rescue.
cf920af91 Merge pull request #1238 from NREL/fix-zero-occupants3
b8ba46958 Latest results.
13d976dcd Hello CI?
43973a51a Set vacancy period identical to simulation period.
16013e018 Add sample file for 0 occs during 1 month.
17ac89d12 Remove sample file.
2b88a8545 Merge branch 'master' into fix-zero-occupants3
c8b77ed2c Latest results.
afd409c66 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
e8b7604d6 Merge branch 'mshp_ashp' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
5d24ccca8 allow crankcase watts to be user input
30e43d1ee Merge pull request #1261 from NREL/windows_update_measures
8ef9abba4 Merge branch 'windows_update_measures' of https://github.com/NREL/OpenStudio-HPXML into windows_update_measures
4c7e7e4d8 Update PV test for new year.
0938f6937 Latest results.
3a1f8c44a Workaround for broken update_measures task on Windows.
c5c84bb63 Merge branch 'fix-zero-occupants3' of github.com:NREL/OpenStudio-HPXML into fix-zero-occupants3
435f2a52d Update pv test after year change. Workaround in tasks.rb.
fe208dd26 Latest results.
85cae4611 Clean up and address more comments.
6223a2689 Merge branch 'master' into fix-zero-occupants3
3b2123d23 Merge pull request #1251 from NREL/os351
669a77914 Bump to final 3.5.1
79625deb5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os351
e2df33980 Merge pull request #1260 from NREL/timeseries_precision
ad9cb7d26 ReportSimulationOutput measure: Allows specifying the number of decimal places for timeseries output.
ba0d93005 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os351
d2c82c9f3 Bump to rc3
9112f5941 Merge pull request #1258 from NREL/weather_refactor
bf04c13a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into weather_refactor
f5478e545 Small WeatherProcess refactor. No longer need to pass in an OS model.
c3e6b34ad Merge pull request #1257 from NREL/check_hpxmls_on_ci
226a56a91 Re-enable all CI tests.
a22f57478 Check that CI catches a HPXML diff.
7b99101de Only check HPXMLs for diffs.
f083ac14d Test
f047f763a Test
2a2718a38 Test
eea02ea5f Add CI check to ensure HPXML files were updated.
1bcb1e47f Update the docs by separating vacancy from detailed schedules.
93c34ebff Pass vacancy periods to local ventilation.
a31e855c7 Fix minor bug in misc_loads resource.
6327b21e4 Update the docs for stochastic schedules when zero occupants. [ci skip]
2e324f294 Fix comment per @jonwinkler.
f2084e823 Merge branch 'fix-zero-occupants3' of github.com:NREL/OpenStudio-HPXML into fix-zero-occupants3
4763abe3b Exit schedule measure when occupants set to zero.
87dac3226 Latest results.
217da7e07 Try adding zero design level return back in.
59c729801 Simplify methods in hotwater_appliances.
04ef491d3 Move vacancy workaround outside of defaulting file.
d66d7b20d Update changelog and docs.
7c7ba61f9 Add zero occupants test to defaults test file.
180580670 Merge branch 'master' into fix-zero-occupants3
e4e0a96be Merge pull request #1199 from NREL/vacancy_refactor
4ed2fbd37 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into vacancy_refactor
499142e94 Minor cleanup. Update changelog.
a81208287 Sort by name [ci skip]
20e636fe6 BEopt connection is no longer pending. [ci skip]
a047c53f7 Test OS 3.5.1-rc1.
258b3a891 Merge pull request #1249 from NREL/utility_bill_bugfix
80e62da1c Fixes error if calculating utility bills for an all-electric home with a detailed JSON utility rate.
d872f630d Merge branch 'vacancy_refactor' into fix-zero-occupants3
9db64b44d Merge branch 'master' into vacancy_refactor
9d05d4126 Merge pull request #1247 from NREL/os-external-file
2952ae718 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os-external-file
ff6ca222d Merge pull request #1248 from NREL/hpxml_rb_for_beopt
d3e9aa1e6 Fixes tests?
9ecdb1bc8 Expand HPXML class for BEopt.
236f4ca7c update_measures
3ce32e6d5 Fixes possible OS "Failed to copy file" error when using schedule files.
35b403351 Merge pull request #1246 from NREL/xmlvalidator_tmp_dir
317c7bdb6 Clean up xmlvalidator tmp dir left behind by OS. Can eat up lots of disk space.
6d2006883 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into mshp_ashp
0ee78a767 Merge branch 'master' into vacancy_refactor
ba66b1b24 Stub out 1.6.0 in changelog [ci skip]
f9c3c3c17 Latest results.
b21e1af02 crankcase assumption and heat_c_d
0055f1664 First pass.
34666fccf Latest results.
b4f345efe Remove debug.
c10cfcdd3 Update resource files when zero residents.
524c72127 Only generate non occupant stochastic schedules when non zero occupants.
f7348ae32 Set year round vacancy when zero residents.
cc910a385 Create new zero residents sample files.
aabe9355a Add output reporting test for checking timeseries.
2e61a7a29 Add schedule generation column to table in docs.
b5dd08489 More docs updates.
45546e44e Check flh of non generated columns for stochastic tests.
56417e0e1 Latest results.
d1f9f3d65 Stub changes to the docs. [ci skip]
ffd97c866 Tests for year round and multiple vacancy periods.
5ee2c209e Add tests to schedules test file.
08321b49a Update tasks and sample files.
6c6ae62f1 Add vacancy period argument to build measure.
f9d59165e Update new OSW.
071eb94a6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into vacancy_refactor
fbb30ac5e Minor fix in README.md [ci skip]
f012c707f Rename run_simulation.rb arg, update docs.
30d465a30 Latest results.
70bb26cea Bugfix.
2f7eeacc7 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into vacancy_refactor
ac48d11a5 Latest results.
7928328da Are these checks needed?
b8db53f8c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into vacancy_refactor
4f7f23eb8 Latest results.
611a7f2e8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into vacancy_refactor
8095192dd Handle vacancies for simple schedules.
6d072f092 Merge branch 'vacancy_refactor' of https://github.com/NREL/OpenStudio-HPXML into vacancy_refactor
1af208467 Fix CI tests. Small code refactor.
f2c8fdca5 Latest results.
757c5b59a Fix invalid XML.
52d45bcdf Step 2: Allow vacancy period inputs in the HPXML; use for detailed schedules.
5fa5c76b6 Step 1: remove ability to use smooth 8760 schedules.
git-subtree-dir: example_project/resources/hpxml-measures
git-subtree-split: e2f00fa6fdd5bf8f06d47d52c24a3ba419edb60e
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request overview
Pull Request Author
src/model/test)src/energyplus/Test)src/osversion/VersionTranslator.cpp)Labels:
IDDChangeAPIChangePull Request - Ready for CIso that CI builds your PRReview Checklist
This will not be exhaustively relevant to every PR.