Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Working directory #86

Merged
merged 2 commits into from
Aug 2, 2018
Merged

Working directory #86

merged 2 commits into from
Aug 2, 2018

Conversation

shorowit
Copy link
Collaborator

@shorowit shorowit commented Aug 2, 2018

Fixes #83.

@shorowit shorowit merged commit bf79fd3 into master Aug 2, 2018
@shorowit shorowit deleted the run_anywhere branch August 2, 2018 20:52
shorowit added a commit that referenced this pull request Nov 12, 2018
@shorowit
Squashed 'measures/HPXMLTranslator/' changes from 1df5c94f3..0318e56d6
9eb1f07 
0318e56d6 Fix HPXML.
7a91523d8 Update HPXMLs.
bf1855b5a Merge commit 'e99c8c434a300261533f807c47d1335faab7a0d8' into subtree
f2fc9bedf Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into subtree
5e1a8d767 Merge commit '80618d85cf1f92f0fadb34539a278ad78b39fb86' into subtree
7761eff2e Bugfix.
39b38b912 Add NASEO HPXML files. Add handling for conditioned basements without a ceiling defined.
95d922790 Merge pull request #117 from NREL/ceiling_fans
1a98933bc Merge commit 'ef46fec3eb95a5eb7c2c1cfb74dd464d03cc6807' into subtree
78ff163a8 Minor updates to ceiling fan electric equip object.
970e103f4 Merge commit '2eba10488ce131fecdf072a6ca6e55e6d2e3909e' as 'measures/HPXMLTranslator'
e9345e510 Remove HPXMLTranslator measure.
4766614a5 Revert xmls, take 2.
7a80c7292 Revert xmls, take 2.
fad920769 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI
bec3776e9 Revert.
5c17130f6 Update measure XMLs.
a7f813cfa Update measure XMLs.
d092312bb Update 301 implementation for consistency with other appliances, etc.
b19455e51 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into ceiling_fans
425b8d889 Merge pull request #122 from NREL/reference_home
b3b31a266 Stubbing method for eri ceiling fans.
e476f71c8 Bugfix.
36561bae4 Bugfix.
c88ef7590 Pulling resources over and implementing cooling setpoint offset.
b863939bb Update sample outputs.
1e9975ba5 Plug loads.
66cbe2738 Plug loads.
500f5d3cc Update unit tests.
e8768f8cf Update unit tests.
720a4c83b Update XMLs.
53591926a Domestic hot water.
6e8386f99 Domestic hot water.
180edf1a8 Bugfix.
c263b3d29 Bugfix.
7fb0238d5 Bugfix.
dd11f794c Make interior shading optional. Remove door height. Simplify natural ventilation.
81d73090e Make interior shading optional. Remove door height. Simplify natural ventilation.
e7868bd39 Minimize HPXML fields.
7d0ed5a4d Minimize HPXML fields.
fffbda5a7 Bugfix.
de69558ff More refactoring.
1ee9a421e More refactoring.
ab0b53d2b Bugfixes.
ae5a06464 Bugfixes.
f80565799 Some refactoring.
2f251eba2 Some refactoring.
479fdf26e Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into reference_home
1dd81c067 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into reference_home
a5d9e7f7c Occupants.
9a63b8c6c Occupants.
681740331 Lighting.
8c87c76ed Lighting.
aa54e57cf Clothes washer/dryer.
0d6b0688a Clothes washer/dryer.
2b6f30459 Fix schema validation.
acc537deb Fix pre-Addendum A hot water.
3bde5c432 Fix pre-Addendum A hot water.
cbdf0b3da Dishwasher.
37ac8bae6 Dishwasher.
74b81e291 Some refactoring.
6f0d4585e Some refactoring.
39e80b1fe Refrigerator.
f02aa3a63 Refrigerator.
fe13b91f8 Cooking range/oven.
a66e4de94 Cooking range/oven.
7ab808957 Merge pull request #121 from NREL/remove_hers
f2fcaacb5 Replace HERS with ERI.
084840140 Replace HERS with ERI.
421f72e30 Minor.
4e18ee8a0 Incorporate cooling setpoint adjustment during cooling setpoint definition instead.
2f0df06ce Merge pull request #120 from NREL/ep_path
c8455d29f Fix for OS returning wrong EnergyPlusDirectory for some users.
d9b061837 Remove debug statements.
15831431e More refactoring.
4bcd26a69 Some refactoring.
70d34bce8 Initial implementation of 301 ruleset and HPXML inputs for ceiling fans.
8cca01c01 Fix typo.
661a326d2 Merge branch 'naseo_12' of https://github.com/NREL/OpenStudio-ERI
a92581e83 Merge pull request #115 from NREL/lighting_inputs
80d4746e0 NASEO technical exercise #12 HPXMLs.
af12c4b71 Remove FractionQualifyingFixturesFoo inputs in lieu of FFractionQualifyingTierIFixturesFoo and FractionQualifyingTierIFixturesFoo inputs.
d7f477491 Fix comment in 301 validator.
62baa225d Fix NASEO files.
2c4357fa8 Merge pull request #114 from NREL/os_270
89ac5bec2 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into os_270
414f845a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into os_270
f24109eb0 Merge pull request #113 from NREL/pv_inputs
d1552a758 Update README.
44f4065b3 Updated resources.
1e235499d Updated resources.
df8fc50ed Various bugfixes.
32b35c907 Various bugfixes.
562032c23 Bump version.
c46cacf25 Test OS 2.7.0.
a98f05513 Skip thin film due to E+ bug.
186eb0062 Allow additional PV inputs.
d37891826 Allow additional PV inputs.
f12b08774 Merge pull request #111 from NREL/naseo_hpxmls
cac0593ff Remove TODOs.
42d19d5a2 Revert most of hydronic distribution validator change.
68b71ae1e Revert most of hydronic distribution validator change.
85fd9e5d3 Add HPXML files for NASEO technical exercises.
d88bdb38c Add HPXML files for NASEO technical exercises.
3311695c0 Merge pull request #109 from NREL/resources
a8a9f48ca A couple bugfixes.
b8c6f5498 A couple bugfixes.
4fc878d15 Updated resources.
c9a7a6338 Updated resources.
0998bc5fe Merge pull request #108 from NREL/building_loads
8e3b3b7bb Improved code that requests building loads. Added error checks for building loads being returned if there is energy consumption.
aeac8b90c Improved code that requests building loads. Added error checks for building loads being returned if there is energy consumption.
0dab0589b Merge pull request #107 from NREL/ep_validator_dwhr
3435dd336 Merge pull request #107 from NREL/ep_validator_dwhr
2711ac3ec Merge pull request #106 from NREL/resources
248d2f10c Replace various DWHR fields from EP HPXML. Instead, use generic MixedWaterDailyFractions and WaterHeaterDailyInletTemperatures fields. This also allows us to move ERI hot water calculations to the 301 ruleset instead of living in the HPXML translator.
e3e98fb0e Replace various DWHR fields from EP HPXML. Instead, use generic MixedWaterDailyFractions and WaterHeaterDailyInletTemperatures fields. This also allows us to move ERI hot water calculations to the 301 ruleset instead of living in the HPXML translator.
2289ce4f6 Latest resources.
58b82f080 Latest resources.
58b875cdc Merge pull request #105 from NREL/iad_dse
0490574df Fix DSE for IAD.
80c977c6a Merge pull request #55 from NREL/skylights
c8f55aa28 Latest resources.
115a0acea Latest resources.
76cfbe350 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into skylights
03b752414 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into skylights
243a23b68 Merge pull request #104 from NREL/programmable_tstat
982cf5d76 Implement programmable thermostat.
719fcba0d Implement programmable thermostat.
d0c1cfbd4 Merge pull request #101 from NREL/301_unit_tests
e7529e84d Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into 301_unit_tests
97402d651 Merge pull request #103 from NREL/appliances
b4743c74c Allow clothes washer IMEF and clothes dryer CEF as inputs. Update dryer EF terminology.
8dad0259d Progress on mech vent tests. Bugfix.
8ba4796fc Add plug load unit tests.
c194bca7d Add water heating unit tests and some additional example files. Bugfix for HPXML files without water heating systems.
e0d5e6987 Add water heating unit tests and some additional example files. Bugfix for HPXML files without water heating systems.
63714a655 Add IAD/IADReference tests for appliances & lighting.
4cfdfc20e Add IAD/IADReference tests for appliances & lighting.
94991913b Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into 301_unit_tests
30cb982a4 Merge pull request #102 from NREL/iad_reference
ce6e54199 IAD needs its own reference home simulation.
57d039e45 IAD needs its own reference home simulation.
5ecb9d7f6 Add lighting tests.
a89247cf2 Merge pull request #100 from NREL/electrix_aux_energy
e13d95dc0 Add 301 unit tests for appliances. A couple bugfixes and removed some deprecated code.
135dd9284 Need to cast object.
e6e2c230f Need to cast object.
2f8f02355 Latest resources.
98fdd4057 Latest resources.
32c8c822c Updated hvac.rb.
1e292013f Updated hvac.rb.
29be2ec00 Implement electric auxiliary energy for fuel heating equipment.
e9953d3fa Implement electric auxiliary energy for fuel heating equipment.
536a0fd0f Merge pull request #99 from NREL/skip_validation
99bac3d12 Merge pull request #99 from NREL/skip_validation
fcfd074ba Oops, should only be CoolingCapacity.
11b725c98 Fix missing elements for HeatPump.
b6f2e2aa4 Add --skip-validation (or -s) flag.
7e20dfdd7 Add --skip-validation (or -s) flag.
1252c9e21 Merge pull request #97 from NREL/rim_joists
494c96d48 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into rim_joists
2a4ecdd2c Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into rim_joists
b4a9a7d32 Merge pull request #98 from NREL/overhangs
231581940 Update HPXML files.
2d51c7408 Add overhangs.
7d9330dcc Add overhangs.
53cf1bbf9 Add rim joists.
3701495ff Add rim joists.
852c62e7f Bugfix for reporting errors.
daa542671 Merge pull request #95 from NREL/split_measures
e4ae2fc42 Update screenshot.
a62d06561 Update sample results.
ce0ce615b Defer HPXML schema and use case validation to improve runtime. Addresses #47.
d31f0bdf3 Defer HPXML schema and use case validation to improve runtime. Addresses #47.
62607a4fa Update xmls.
7dd26d31c First stab at ep_validator.rb (raw EnergyPlus simulation HPXML use case). Allows us to simplify 301validator.rb.
0dd80b3c2 First stab at ep_validator.rb (raw EnergyPlus simulation HPXML use case). Allows us to simplify 301validator.rb.
ff733866a Merge pull request #96 from NREL/circleci20
448792ec0 Fix paths.
2206d6713 Attempt to fix tests by sorting files returned from Dir[].
68729a670 First attempt to split apart HPXML translation from 301 ruleset measure.
7c15d02e5 First attempt to split apart HPXML translation from 301 ruleset measure.
81702a687 Update to CircleCI 2.0.
fa58f2155 Merge pull request #93 from NREL/hvac_capacities
944dc3644 Wrong spot.
3c8c6e755 Require HeatingCapacity/CoolingCapacity for HVAC systems.
5cb8364f9 Merge pull request #92 from NREL/hpxml_23
0afc3cbfe Update to latest HPXML schema.
c1a89e2bc Merge pull request #88 from NREL/args_fix
85d65c5bc Switch to run/in.osm.
1f49024cf Revert version.
b49037154 Merge pull request #91 from NREL/validator_ducts
3252fddbf Update comment.
e1406aec5 Allow multiple supply/return ducts to be specified in HPXML, to accommodate multiple supply/return duct locations. Remove unnecessary FractionDuctArea input.
bf8841613 Removing bundler from rakefile.
7caf4acdc Update ci yml file.
45a8b333d Update readme for os version.
10b435eb0 Fix debug option for energy_rating_index.
ad749073d Merge pull request #87 from NREL/hvac_control
583911f0c Allow at most one HVACControl for the building. Required if there's a HeatingSystem, CoolingSystem, or HeatPump.
bf79fd354 Merge pull request #86 from NREL/run_anywhere
fc688a758 Update tests to remove cd.
a16f36c97 First attempt to allow running from outside the workflow directory.
e6f355237 Update README.md
83babf04e Update README.md
ad71818ad Merge pull request #85 from NREL/hvac
61e30c4e4 Update to latest HPXML ERI schema.
6744709d5 Update HVAC inputs. Add heating stove and wall furnace.
3817531a1 Merge pull request #80 from NREL/os_260
e9ae3a460 Update resources.
c20ad8a93 Update HPXML file.
2c27d6e5a Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into os_260
0c75d26f7 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into skylights
95d156264 Merge pull request #84 from NREL/azimuth
dc5b49e0c Minor cleanup of some HPXML files.
66fb6aab4 Oops.
bbc0f46a4 Bugfixes for SystemIdentifiers.
06a592357 Distribute reference home window/door area proportionally to all exterior walls. Fixes possibility of negative net wall area.
3d0870419 Bugfix for azimuths that are not 0/90/180/270.
e73133d45 Updated resources.
8873b1338 Pre-process weather data for speed improvement.
2b5dffc6e Some code cleanup. Retain parallelized output processing on Unix machines.
388da8ef5 Use spawned processes on windows.
846ae847c Retain previous paths/filenames. Update sample results.
8d2e62016 Clean up old methods.
cae60f77b Parallelize reading/processing outputs.
8999bd0d2 Hide EnergyPlus stderr.
424b8b8d3 Use forked ruby child processes on Linux/Mac for significantly increased speed. Replace use of child CLIs with more direct calls.
42cf6a80a Merge pull request #81 from NREL/remove_siding
dcc1ce359 Removed siding requirement. Refactored code that generates wood stud constructions.
e0f5aa949 OS 2.6.0 test. Removes custom os-workflow-gem and takes advantage of new openstudio workflow arguments/options to improve speed.
68f652c2b Merge pull request #79 from NREL/simplify_version
50967296a Add HPXML required fields to ERI validator.
8fefc79d3 Typo.
a56e01a50 CI badge should point to master branch.
8056b0d34 Simplifies specification of version/addenda.
87ace6668 Merge pull request #78 from NREL/eri_version_and_addenda
1301e579b Add sample HPXML file that exercises water heater location.
efc67b9af Allow specification of ERI version and addenda to be used in the calculation. Implemented Addendum G solid state lighting. Added pre-Addendum A hot water tests. Removed --iaf flag.
88d1d45ba Merge pull request #76 from NREL/eri_use_case
db7379aed Remove NumberSpeeds input.
e7b9c7d18 Make ERI calculation more robust. Updated additional test/sample files.
357191950 Revamp ERI use case. Remove insulation layers.
eefbcc079 Merge pull request #75 from NREL/allow_tests_with_cli
bf339a5d1 Add unit test to ensure that we can run tests from the CLI.
a1856682d Allows tests to be run via the CLI on Windows (though causes a warning to be displayed), see https://github.com/NREL/OpenStudio/issues/1345. Need to test on Mac/Linux.
e6fe99427 Merge pull request #73 from OneGeek/validation-util
d5d69fccc Update README.md
5558df340 Prevent backtrace when using -h.
03a8a9c6f Add utility for just validating an HPXML file.
b3a1873a3 Merge pull request #72 from NREL/hw_ec_adj
6eaa9a78b Simplify use of hot water energy consumption adjustment (for distribution system). Now fed into the model rather than being used during post-processing.
61c3696a6 Merge pull request #71 from NREL/iaf
d500e3ccc Add IAD Home, IAF calculation, and new method tests.
4bb51f2d3 Merge pull request #70 from NREL/parallelize_output
3787dc60b Parallelize writing design csv files.
caa40bdfa Parallelize more output processing.
e84a2ad21 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into skylights
6db3f8fa3 Merge pull request #69 from NREL/remove_building_volume
77690ad98 Remove BuildingVolume requirement.
ab859b243 Fix merge issues.
75b1f8348 Merge branch 'master' into skylights
c5bc3cc0c Using only affine transformations for skylights.
00e4e160a Merge pull request #68 from NREL/wmo
1a1e4d814 Fix tests.
10a8da337 Update README setup instructions.
b2c300c89 Switch from WeatherStation/extension/EPWFileName to WeatherStation/WMO. Add a --download-weather argument to download all weather files.
26575a62d Merge pull request #65 from NREL/remove_azimuth
82832ab43 Merge pull request #64 from NREL/num_bathrooms
9a50d1eac More explicit about FuelTypesAvailable.
8fc2a1c13 Remove AzimuthOfFrontOfHome
dc0866daa Oops.
2f930ca7c Remove NumberofBathrooms and require WaterHeatingSystem/HeatingCapacity. Misc bug fixes. Switch to assembly R-values for Std 140 buildings.
f1f5fbe20 Add more debug info when requested.
d0c9767d0 Merge pull request #61 from NREL/remove_output_vars
8b388da8c Remove unnecessary OutputVariables, which had a ~1.5 second impact on runtime speed.
a08cb5cd7 Merge pull request #60 from NREL/envelope
7112a1625 Use Slab/Thickness=0 for, e.g., crawls with a dirt floor.
48e883a8e Updates envelope constructions. Adds code to double-check reference assembly R-values.
7e1a6f8fe Merge pull request #59 from NREL/uef
9f079a60d Allow water heater UEF. Bump HPXML to v3.0.
9723d6a5f Implementing add_roof_polygon method.
a51e6534a Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into skylights
3ecb59485 Merge pull request #58 from NREL/method_tests_proposed
c8ead6f8d Add HPWH test files.
01d369dab Updates for mech vent. Split out television energy.
f3a9f27d5 Fix for ACH50 inputs.
e55846a8c Fix paths.
d7b43a750 Updated sample results.
57fb29f57 Added proposed method tests. Simplified inputs for some HERS tests by allowing fields not to be provided when the rated home is to be specified with some reference home values. Added sample files for the variety of mechanical ventilation systems.
f8d762682 Update README.md
a42c080d0 Merge pull request #57 from NREL/pvwatts
119de9531 Fix HPXML.
9da1b06eb Update README and sample results.
e0be4a254 Add PV. Update to OS 2.5.1.
19129b5e9 Update explode_surfaces.
044202e68 Merge pull request #56 from NREL/latest_resources
3d22ab103 Latest resources.
ad8ecd48f Initial skylight commit.
baf35fdce Merge pull request #54 from NREL/update-models
20e54b6b0 Update models.
24edced97 Update README.md
052825398 Update README.md
fe7c47c97 Update README.md
c47d0b311 Merge pull request #53 from NREL/remove_seed
b0c6bdc04 Remove seed osm, set via model instead.
61a796001 Update README.md
b218180cf Relax.
621e963e1 Add HERS method test. A couple bugfixes.
4094be886 Merge pull request #52 from NREL/remove_measures
71dcd68b5 Minor updates.
b04f78476 Update screenshot.
a214e93ca Zone volumes.
d3405b81b Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into remove_measures
6e50c3876 Merge pull request #51 from NREL/os-2.5.0
0dbca9492 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into os-2.5.0
021d06655 OpenStudio 2.5.0 test.
4916dcbfb Update README.md
65a350c86 PV stub.
fa539a5a9 Typo.
c0e4d7505 Add thermal mass. Fix boiler.
2e231a307 Bugfix.
77c3ce7ea Progress on ceiling fan.
aaf570493 Fix HVAC capacities. Fix missing subsurfaces.
acd6f011d Progress on lighting.
e5dedc384 Progress on foundations. Switched to custom unit conversions.
7ba062373 Progress on hot water and appliances.
f8d941292 Progress on water heaters.
88a450569 Progress on setpoints, dehumidifier, and HVAC sizing.
21070305f Some bugfixes. Updated boilers & GSHPs.
bf19d8f68 Progress on HVAC.
a9451f1ab Progress on constructions.
99c0e1e60 Merge pull request #46 from NREL/os-2.4.3
7a53452af Add/update EMS exp checks.
2372c2be0 Update screenshot.
c12814f46 Fix rake task.
952376425 Bump Circle.
733d98c43 Update to OpenStudio 2.4.3/EnergyPlus 8.9.
d26a4fc20 Merge pull request #45 from NREL/invalid-test
9c2574d2d Fix.
77910a450 Give error if the wrong OS version was used. Closes #44.
6800bb277 Add invalid.xml unit test.
d0c3e60cb Latest measures.
d2e823bed Update README.md
d67553a50 Merge pull request #40 from NREL/latest-measures
4a9aa87a6 Latest measures.
c7b1d31ab Merge pull request #39 from NREL/latest-measures
e5a9c1315 Latest measures.
a24a9dcf5 Bump CI.
c597ca795 Merge pull request #38 from NREL/os-2.3.1
423fa6b51 OpenStudio 2.3.1
d4b5f4ce1 Merge pull request #37 from NREL/dse
e53b866ff Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into dse
a37ede461 Merge pull request #36 from NREL/hpwh-ref
a9c7ad5e1 Bugfix.
c7d7748f4 Different DSE approach. Latest measures.
661c8fde1 Fix reference water heater when rated home has a HPWH.
969c3795f Bugfixes for tankless WHs.
94b3033ca Update hot water modeling. Add RESNET hot water tests.
96853a8c5 Merge pull request #35 from NREL/resnet-ref-home-tests
8656d81e3 Add general water use internal gains. Enable lighting.
4db31f92c Switch to absolute xpaths for speed. Consolidate validator checks.
8c7c6da4d Bugfix.
f56b660ec Bugfix.
fcad9730d Finished attic bugfix w/ latest measures.
a4a3f686a Progress.
144b97613 Progress.
07dc4a736 First pass on RESNET Reference Home tests. A few loose ends remain.
cb17fa30d A little faster.
eaa0bcd1e Merge pull request #34 from NREL/summary-results
cdc7c3092 Add summary annual results (by fuel use and end use).
6793c51e4 Update sample results.
b5898ff8b Merge pull request #33 from NREL/hpxml-update
65bff8961 Incorporate new HPXML schema elements. Significantly revamp/clean up 301 validator.
403c6c95b Merge pull request #32 from NREL/consolidate-tests
319480625 Update README.md
8b240145e Update README.md
bf467a0bf Consolidate tests.
3488ccd2b Merge pull request #31 from NREL/gemfile
0fcd59ca2 Update Gemfile.
c20c3bcac Merge pull request #30 from NREL/epw-in-hpxml
1ca8888d4 Fix test argument.
c341ec972 WeatherStation/SystemIdentifiersInfo not WeatherStation/SystemInfo.
28ede94cd Embed EPW path in HPXML file.
98953a86b Merge pull request #29 from NREL/dhw-addendum
4cc4bbbf1 Latest measures.
bc9da08b6 Move recirc pump energy into hot water end use.
fce6e575f Connect DWHR. Add sample files for recirc and DWHR.
7ca05dc45 Bugfixes.
31083cde0 Update HPXML fields. Fix hot water schedules.
b0e2910b1 Progress on implementing DHW addendum.
c932d7e7e Merge pull request #28 from NREL/sample-files-cleanup
8a8de9600 Clean up sample files. Closes #13.
ca2bdedbf Update README.md
6a4ccaf8a Update README.md
a376b5b69 Merge pull request #26 from NREL/speed
8ae8d2ab3 Update code coverage.
c24335fe8 Path issue?
37f6b4970 Test modified version of OpenStudio-workflow gem. Don't create sql indexes when reading output file. Reduces runtime by over 20 seconds.
55250cb55 Merge pull request #25 from NREL/latest-measures
eca96f291 Latest measures.
52192eb7d Merge pull request #24 from NREL/fix-tests
456f676ef Fix tests.
ba7342725 Add simulations to CI tests.
c7abc5968 Merge pull request #23 from NREL/epw-caching
566a56958 EPW caching.
93a465498 Update README.md
e0bfcf3b4 Merge pull request #22 from NREL/ducts-dse
db1650b5a Fix test. Remove OSMtoHPXML measure.
eeb8bc9db More testing.
87cefcc63 Combine tests.
dac24f311 Comment out some tests for now.
d406bcda5 Merge branch 'master' of https://github.com/NREL/OpenStudio-ERI into ducts-dse
318716f10 Ignore large files.
28c407b28 Incorporate DSE for reference home. Additional progress on ducts.
bd75d89a1 Merge pull request #21 from NREL/unit-tests-cooling
96e317ff7 Add unit tests for cooling systems.
648cef94b Add unit tests for heating systems.
d9e723558 Merge pull request #20 from NREL/meta-measure-bugfix
c83ac7083 Fix creation of workflow json.
a7fc249d3 Merge pull request #19 from NREL/rakefile_updates
6d43ed41b Using net http instead of curl to get latest measures.
387f5a342 Updating measure args for latest measures.
4cf3da283 Rakefile updates. Latest measures.
804c868e9 Temporarily reverting to OS 2.2.1.
a26b3dafc Merge pull request #17 from NREL/helper-methods-reorg
9a5c68b0f helper methods reorg. updated measures.
cdf863ece Update to use new dhw distribution elements.
e7e6dacce Update to use new appliance elements.
677dac267 Merge pull request #16 from NREL/fuel-types-available
7fa639374 Updating export measure for fuel types change.
d9b5acaf3 Update to new FuelTypesAvailable fields.
947d31efa Merge pull request #15 from NREL/attic_changes
9c074c292 Updating osm export measure to new attic_changes schema.
72608e28e Updating export and 301 measures so unit tests pass with new attic schema, but still need to update 301 measure.rb arguments.
833f5e9d1 Some refactoring.
0792c13a0 Update README.md
96f046cd5 Moved HPXML schema files up to a top-level dir. Removed sample HPXML files from 301 measure; now only resides in the workflow/sample_files.
7b2a963c8 First pass. Updates to 301.rb and 301validator.rb. Still need to update measures.
ef8bc30a2 Orientation measure was missing a require.
0c71856ea Add sample results.
60c643c19 Update README.md
50983b41b Minor formatting changes.
de9e85552 Update README.md.
4bcaece34 Latest measures. Some reorganization.
539e01fb3 Some updates/fixes. Added/removed files as needed. Latest measures.
bebdf90a8 Getting closer to passing circleci.
619ac0e06 Updating the readme.
a1a068036 Adding this project to circle ci.
3098e26ed Making the repo more buildstock-like by removing residential measures from the measures folder and having rake task import them to the resources directory.
3065a3b29 Copy sample HPXML files to workflow as part of rake task.
ce8ca7300 Forgot to update export measure test osw files after having updated the window constructions measure.
d0e5e2cc2 Seeing if a typo in 301 resource file fixes the failing unit test.
2e4e13aa1 Addresses #159, adding sub surface argument to window construction measure.
5e92f19e2 Removing the FloorAdjacentTo extension element from cathedral ceiling attics.
5a1d87d50 Addresses #157, #159, and #161.
2b3c50e52 Bug fixes for #161.
34b7ca143 Adding debug info for failing test.
a39fbe6f4 Addresses #161. Also adding surface argument to uninsulated surfaces measure.
63d7f3d06 Addresses #153, updating export measure to handle new xpath requires. Also addresses #159, adding sub surface argument to overhangs measure.
87e5c0844 301: Updated required HPXML elements for zones/surfaces/constructions.
a670e0f4d 301: Fix for foundations. Addresses #159.
56e0ec106 Addresses #159, surface argument for some floor and ceiling construction measures.
1715f0806 Addresses #159, surface argument for wall exterior generic, exterior finish, and sheathing construction measures.
004b258f9 Increasing code coverage for unfinished attic, interzonal floor, pier and beam, interzonal wall measures.
5f226291d Addresses #159, surface arguments for interzonal floors and walls measures.
4cf67fda1 Updating export measure to handle recent xpath changes. Also commenting out some 301 unit tests, until code is updated.
85668f3fc Addresses #159, surface argument for more construction measures. Also unit tests for radiant barrier, pier and beam construction measures.
c4be10401 301: Restrict the choices for AtticType. Other small stuff.
030fe44be Cleaning up surface argument construction measure stuff.
3acfbcb2e Addresses #159, starting to add surface argument to construction measures. Also adding unit tests for door, unfinished attic construction measures.
b4c1d86be 301: Require uninsulated basement slab. Some misc fixes/cleanup.
9ab511da0 Now it's commented out.
529c39541 Adding commented code for exporting shw to hpxml.
2a22071af Temporary handling of buildings with nonpositive volume.
d8d8858d6 Add some error handling/reporting to energy_rating_index.rb.
d2e6f4d84 Addresses #153 and #157.
4c8ae3494 HVAC bugfixes. Added unit tests.
0f90657ed Updates to windows/doors. Automatically convert arg hash values to string.
e69048caf Initial implementation of building loads for ERI calculation.
32a81ad79 Bugfix.
10f3e5cab Addresses #157, creating foundation spaces and zones based on the Enclosure rather than the BuildingSummary.
6cc8c96ee Merge branch '301_ERI_ruleset' of https://github.com/NREL/OpenStudio-BEopt into 301_ERI_ruleset
173d9be2f Adding sample HPXML files.
1d4244e33 Including parallel in gemfile.
8d59f9da8 Addresses #153, updating export measure to validate against 301 use case.
09c0efc2a Additional HPXML test cases. Bugfixes.
2a38c1110 Merge branch 'master' of https://github.com/NREL/OpenStudio-BEopt into 301_ERI_ruleset
5f1a96caa Bugfix.
f7cf942a7 Bugfix.
18883413c Progress on foundations/floors. Bugfixes.
5b7e805f6 Skip schema validation because nokogiri.
c466c7332 Added simple unit tests for ERI workflow.
99d1a5274 Merge branch 'master' of https://github.com/NREL/OpenStudio-BEopt into 301_ERI_ruleset
15f4a0f38 Exception handling for nokogiri. Progress on envelope constructions.
38e0b035b Addresses #153, updating export measure to validate against 301 use case.
3b0fdd342 Progress on wood stud walls, HVAC, etc.
65f222e10 Added 301 HPXML use case validation to OSWtoHPXMLExport measure. Currently commented out.
48d4a6ae1 Progress on 301 measure: infiltration, mechanical ventilation, and PV.
a7c784db0 Addresses NREL/OpenStudio-BuildStock#46, utility bill calculations for each eia id in the epw region.
4786df557 Updated measure XMLs.
142e18ff1 301 progress on windows/doors. Allow facade-specific U/SHGC values in windows measure.
5f4139cf7 Ensure we get errors when an XML element is nil (e.g., use Float(foo) instead of foo.to_f).
2e5b25f3b Need new openstudio build for plant loop availabiity manager to work.
2e7d3f4a8 Merge pull request #155 from NREL/shw_availability_manager
423ab20a3 Changing an argument variable name in the heat pump wh measure for consistency.
f3cf4a2b3 Progress on #153.
13104e141 Progress on 301 measure. Some new arguments for various measures.
81380e8c0 Switch to an optional argument.
c50b41625 First pass at energy_rating_index.rb. Successfully creates ref/rated workflows, runs simulations, and calculates ERI for our test HPXML file. Lots still to do.
659a5395f Progress on #153.
bf70d0702 Some updates to helper_methods.rb.
c7065f70f Missed a file.
94d7ad704 Progress on 301 measure.
29526f232 adding availability manager to plant loop
a9f18bd21 Addresses #153, starting to map non-geometry osw argument values directly into hpxml.
dea66d25f Addresses #153, exporting to hpxml (non-geometry) from the osw instead of the osm.
09241c6ef Bugfix for HVAC.remove_hot_water_loop including solar hot water loops.
444b9267f Addresses #152, completing first pass for hvac, appliances, and misc loads.
b35d0b8d8 Progress on 301 ruleset. Replaced tabs in lots of measures.
d38faa0bc Updates to foundations and hvac for #152.
95f1c362a Progress on 301 ruleset.
b3972d588 Adding some HPXML ERI xpath validation. Cleaned up some requires.
eb3ca2b61 Fixing hpxml out path in export measure.
ded1663a6 Updating weather file path in test osm for hpxml export measure.
073a5f939 Moving the xml helper methods to its own resource file.
f995d5cf8 Progress toward #152.
221e904c4 Addresses #152, getting hpxml exported from create-model-example osm to validate against schema.
3569477d3 Revert clothes washer example, no longer going that approach.
cae96ae4c Reference Home updates.
b49e70458 Some refactoring to better deal with HPXML sequences and make the code more robust.
8b30dab43 Addresses #138.
d81883a0c Switch to nokogiri for local validation.
533aa9247 Updates to successfully generate Reference/Rated home models.
181e3dabe Progress toward #152.
05ca644fd Start adding reference home logic. Glue together with HPXML import code.
a65dae768 Addresses #152.
1a70e68a0 Updating hpxml build model dependencies.
28fd3e458 Will work on HPXML in 301_ERI_ruleset branch.
51b0a29d3 Addresses #137.
1cd7a7802 Fix EPW path.
2802efd0a Added more unit tests for error checking. Addresses #8.
f8ea65e78 Cleanup.
7cb8f86e3 Remove debug code.
34d5276f1 Ceiling fan bugfix. The cooling setpoint offset could be applied twice for weekends.
62c4f0f93 Moving 301 ERI work over to a branch.
42219411d No need to run rake task on CircleCI anymore.
7bb1ef743 Calling openei api using net/http instead of rest-client for the utility bill measure.
cbc503041 Fix hpxml resources.
454db93cd Update unit tests OSMs. Add EMS unit test checks in more measures.
a343e3bd5 Merge branch 'master' of https://github.com/NREL/OpenStudio-BEopt
c096b0bea Addresses #137, creating validation resource file which assembles the measures hash independent of openstudio.
07c770dc5 Addresses #137, creating validation resource file which assembles the measures hash independent of openstudio.
b812e79de Some HPWH cleanup and bugfixes. ERV airflow sizing bugfix. Removed clothes washer inputs from dryer measure.
d382567e8 Bugfix.
1b03cb6a8 Add measure resource files. Fix unit tests.
a65fadcf4 Initial commit of 301 ERI measure.
4e151801b Addresses #137, determining workflow measure order based on measure-info.json.
6278ae560 Revert accidental commit of this file.
c26ed82aa Merge branch 'master' of https://github.com/NREL/OpenStudio-BEopt
0f6e4d8ee HPWH bugfixes.
0b4477dd8 Addresses #137, calling measures in categories other than just geometry.
5d5aed2eb Addresses #138, inferring finished floor area and setting zone volume based on space volume so that the airflow measure runs successfully.
874ecaded Update README.md
d51fb0af5 Minor image fix
81214f412 Minor changes to README. Fix unit tests due to rake task name change.
7287ddce2 Update script to generate example osw. Add automatic generation of table in README. Lots of README updates. Replaced update_resources rake task with update_measures.
997d2fd37 Merge pull request #144 from jmarrec/master
b98d42c58 Changing the control point back to node 3 instead of node 2 for the 50 gallon HPWH. This will lead to some discrepancy until we're comparing 12 node tanks in both cases
a54feea2e Changing the control point for the 50 gallon tank to be node 2 for a 6 node tank, fixing a bug with 50 gallon tank using 80 gal element setpoints and vice versa
294f9967e Addresses #138.
cd9914f01 Update test OSWs to use double-quotes for all arguments.
a13842758 Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
a05dcf016 Fixing a bug where the wrong inlet air temperature was used for HPWHs. Affects cases with ducting and ambient air temperature depression. Also allowing ambient air temperature depression to be modeled in any zone, not just conditioned ones.
d58d7bae0 Increase flexibility for HVAC capacity arguments.
4271e91e6 Fixing an issue with the initialization of some EMS variables for HPWH cases with ambient air temperature depression
f6ef017a2 Fixing a typo in the airflow measure causing problems with infiltration and mechanical ventilation.
0b203f881 Revert https://github.com/NREL/OpenStudio-BEopt/commit/ec2a9601fe9665303efa0634d3bb2a105b2f09bb for the time being, the E+ schedule being created is not correct. Addresses #88.
8863e5181 Updating the get_abs_azimuth method in the geometry resource file.
ec2a9601f Use ScheduleVariableInterval instead of ScheduleFixedInterval for hot water schedules. Reduces fully defined OSM file sizes by ~2/3. Addresses #88.
c3cc9bd85 Fixing a typo in in ducting EMS. Joe's going to take a look at whether any of the EMS names using a unit number of 0 has anything to do with his change this morning
0f076dd29 Oops, comments in ruby are #, not !
9a567fdd0 Fixing EMS bugs for HPWHs with ambient air temperature depression due to initial conditions and long (>6 hour) HPWH runtimes
149d9495b Fixes the pv discrepancy issue.
047f36eb3 Closes #149.
a6bbe54fa Ignoring schedule rulesets and constants in the unit tests, commenting out replace unit tests temporarily until the replace WH measures are fixed (after the release)
6937d24d2 Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
1546c91e5 Commenting out removing existing EMS and HPWH objects for the release.
36944f514 Address some FIXMEs.
e707f8ea6 Moved setup to the wiki.
6db885eab Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
2b3ffc064 bugfixes to the HPWH measure and initial commit of unit tests. Still need to fix some commented out unit tests and add more
260577cf4 Implemented GSHP sizing. Addresses #66 and #8.
ae14351fd Progress toward #69.
ce484a62c Closes #146.
ec4399a02 Fixing the bath objects to correctly reference the bath schedule (rather than sinks)
2f5b325a8 Fix for photovoltaics measure.
33616e9af HVAC sizing measures: Implemented AC/ASHP capacity derates and updated garage design temperature.
4efd71447 Updating airflow measure unit tests to catch ems variable name typos.
be8d11e34 Wall bugfixes.
b49cd55d7 Update README.md
1ad089035 Starting #69, solar dhw. Also fixes bug in airflow measure related to large discrepancies between beopt and openstudio results.
54a37ed82 Geometry bugfix.
248760afc Switch argument to boolean.
6f3c76cb8 fee
40ab131fb Fix unit tests.
2cf505f45 Bugfixes.
e1d00358c Fixing unit tests that replace a boiler now that the boiler uses a variable speed pump
18a1b6f11 Updating the boiler measure to allow for the burner modulation to be specified. Updating to a variable speed pump so that we don't need an EMS workaround to calculate the pump energy consumption. Closes #36
dd4eaa789 Updates to HVAC sizing measure.
5b509cb77 Replacing tabs with spaces
131ee8916 Getting temperatures consistent with BEopt for the setpoint manager and sizing for water heating measures
29ccf1481 Allowing HPWH measure to replace existing HPWH, fixing a few bugs
3fcd8fbad Closes #145.
9f5cfcb78 Update README.md
f4fe7abf3 A couple bugfixes.
7e052b7ef Bugfixes for boilers.
a6aec5523 Addresses #138, moving wall surfaces out from origin to prevent self-shading.
44c8b00b7 Addresses #138, refactoring the geometry portion of the hpxml measure and including exposed perimeter arguments.
723b06ef6 Commiting the `FullJSON.osw` file so that we have something to talk about (we can decide later if we gitignore it or not)
509ed614e Added a new Rakefile task (`generate_full_osw`) that will leverage the measure-order.json file to create an OSW with ALL measures in the correct order. For each workflow `Step`, the description and modeler description is also included for clarity. Each measure argument is included explicitly, if it has a default value it is used, otherwise there’s a placeholder "#{REQUIRED/OPTIONAL} - #{argument description} ». Caveat: this OSW file WILL NOT run as is, because it has placeholders (also all measures are included, when you wouldn’t for example both call the three geometry measures for SFA, SFD and MF). Please check the @Todo inside the rakefile
364ae38cd Added `measure-order.json` which is a JSON file that I created by scraping the README.md table. It has several groups (‘Location’, ‘Geometry’, etc) and each has a Number of steps, each step has one or more measures. The idea is to organize the measures, and to ultimately define properly the order in which measures are to be run.
c622b585a Reverting the revert, should be back to where things originally were. Sorry for the confusion!
14c3051fe Revert "Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt"
fb88ef231 Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
489d3d5b3 Fixing whitespace issues in the HPWH measure
250d9d626 Bugfix for window AC sizing.
039137559 Addresses #140, updating hvac measure unit tests.
6a99bcd38 Updating unit tests for NREL/OpenStudio-ResStock#46.
3b2583b6d Addresses #139, using appropriate HVAC priority.
ff8772851 Bugfixes for https://github.com/NREL/OpenStudio-BEopt/commit/7b6002be7ec2d92d6630e1839f1470f9514c66ae.
a2277f3ae Bugfix for running simulations with certain HVAC systems.
7b6002be7 Initial commit of the HPWH measure. Still need to add ability to replace existing HPWH, updated warning/error messages, and do more direct testing comparing results to BEopt.
41dcf9ebc Fixing single-family detached geometry measure code for removing triangular wall in attic.
bf3f8123c Adding ENERGYPLUS_EXE_PATH to bash_profile for mac users
57fcffd82 Improving unit tests for airflow and utility bill calculations measures.
11031deb1 HVAC sizing bugfix. Added unit tests.
c71785d56 Fix for setting AirLoopHVACUnitarySystem airflows.
aa9164806 Bugfix.
b1fc87ef9 Updating gemfile to include rest-client.
7c4990ea6 Addresses NREL/OpenStudio-ResStock#46, calling openei's api for sam utilityrate inputs.
0717e6818 Added foundation exposed perimeter arguments. Closes #142.
e3e430cfb Adding ability to install for macOS
a65a9df86 Addresses #138, unit tests for hpxml files that checks number of surfaces in model.
749a0cf82 Reduced SAM SDK file size.
d2401defe Fix unit test.
66f99ef64 Temporarily reverting to OS 2.0.5.
42851cb83 Some kind of merge conflict with the hpxml measure unit tests.
637651efd Addresses #138.
d444de009 Some bugfixes. Removed furnace supply temperature arguments.
0178f5686 #8: Progress on HVAC sizing measure. Refactored HVAC measures.
e9b4a47dd #8: Progress on HVAC sizing measure. Updates for boilers.
c725048eb Addresses #140, airflow measure unit tests within 1% of BEopt.
1d1ad75bf #8: Progress on HVAC sizing measure. Closes #119.
156379bb3 Fix unit tests.
b01bfb5fa Updates to wall sheathing and uninsulated surface measures for previous commit.
c7014dc7e Allow exterior wall insulation to apply to attic walls if the attic roof is insulated.
5e7dcb8fd #8: Progress on HVAC sizing measure.
54629e04d Separating the timeseries export csv and utility bill calculations measures into two.
5786f85aa Addresses #140.
01968f19e Changing pv sam measure unit tests class name.
5a46cb948 Addresses #61, BEopt vs SAM within 6% in Denver for pv measure.
efafbde50 Addresses #113.
ba909a986 Update README.md
70d81305a Successful calls to the annualoutput and utilityrate2 modules.
edeb7f97f Update rakefile and readme.
be6320991 Needed to have reporting measure html template in resource to measure mapping for utility bill calculations measure.
958c0dacc Setting the absolute weather file path in the osw, instead of using the relative path in the osm, for the utility bill calculations measure unit tests.
f0c651489 Going one level up to look for weather file for utility bill calculations measure unit tests.
79ccc30f8 Adding the weather files to the tests folder instead of the resources folder for the utility bill calculations measure.
cbf9534dc Adding weather files to utility bill calculations measure.
431b24e0c Fixing the test osw for the utiliy bill calculations measure.
5d3f77aa8 Addresses NREL/OpenStudio-ResStock#46.
1f64bd706 #8: Progress on HVAC sizing measure.
918f6913e #8: Progress on HVAC sizing measure. Added ability to autosize based on max load for ASHP/MSHP measures.
79a345986 #8: Progress on HVAC sizing measure.
90302d9c9 Addresses #137, search for nearest epw if user does not specify one.
61a34f6e4 Addresses #137, assigning epw for simulation.
86b06bcfd Addresses #61, zero out the fuel to produce the electricity.
6eb850d74 Addresses #40.
c579580bf Closes #134.
5ef8fe4d1 Reverting accidental change to resources/helper_methods.rb.
8b0060132 Update everything to OS 2.0. Uncomment unit tests for Airflow and HVAC Sizing measures. Closes #111 and #105.
25eb12260 Retry OS 2.0 on CircleCI.
e4a14fbc9 Improvements to window construction measure and unit tests. Progress on HVAC sizing measure.
38add669d #8: Progress on HVAC sizing measure. Bugfix for calculating volume in an attic.
7f2dfe1e9 Addresses #137.
57a2853a2 Delete measures.zip
ba206f329 For the hpxml measure, forcing the pat user to enter path to residential measures whereas it's always up one for unit tests.
04a02bbb2 Replacing the measures.zip with a path to measures arg for hpxml measure.
f72fae55a Fixing path in location measure unit test.
7525307a7 Rake tasks moves residential measures zip to the repo resources directory instead of the hpxml measure resources directory.
bf422113b Force OS 1.14.0 on CircleCI until OS 2.0 works.
928ef4a77 Moving the rakefile openstudio require to within the rake task so as to avoid circleci problems.
a75e3a729 Stub measure for translating hpxml files. Also addresses #132.
7e2b480c5 Able to produce correct pv power using track schedule and the micro turbine generator. However, need to set it up so it uses no fuel to make the electricity.
de3605ef6 Simplified process of creating unit test osm's in the rake task.
4d215d78a Commenting out all HVAC sizing unit tests.
3b660af8f Bugfix for calculating slab exterior perimeter on a model with split wall surfaces (e.g., due to door/window measures being applied). Added unit test.
dbec19fed Forgot to commit.
4fdb9c304 Resort to ffi gem.
6674a6aec Reverting OS version. Removed ffi from Gemfile.
4e919762b Attempt to run OS 2.0 on CircleCI.
603fee48d Fixed unit tests for SFA buildings with a finished basement. Removed unused unit test osm's.
79eb748ca Updated rakefile's test:regenerate_osms to automatically figure out which osm's/osw's are associated with each measure. Removed obsolete test/osw_to_measure_mapping.csv. Updated unit test osm's.
36490ddbd Simplifying error checking in the ssc_ffi resource file.
68bfa8932 Trim zip files for PV measure.
be250315a Third attempt for pv sam measure unit tests.
d4bc19c6e Trying again to get unit tests for pv sam measure to run.
d3ada5076 Changing class name in pv sam measure.
006187750 Including zips of sam and ffi, and unit tests for pv sam measure.
f7f7dfb6e Using track schedule in the electric load center distribution object to model pv. Also moving the ffi lib into the resources directory.
8e5d58050 #8: Progress on HVAC sizing measure.
e2e1dae86 Switch to CEF for clothes dryers and IMEF for clothes washers. Closes #129.
6be7a6893 #8: Remove rated airflow rate inputs from AC/HP measures.
c4dc6ea08 Addresses #61, attempt at injecting PV production into OSM via actuated other equipment object.
f673e16be Removing unit tests from photovoltaics sam measure.
4f7a4f9a4 Separating photovoltaics sam measure from original, so as to pass unit tests. Getting hourly output from sam model.
800dea430 Got the sam api working with help from scripts already developed by Rob Eger.
34cb4054a Fixing some paths in the sam api.
cfba868d2 Need to figure out paths when using ruby ffi for sam model.
e95d004bf Wrapper for ruby for using SAM SDK. Almost works. Tested call in photovoltaics measure.
522cd07cf Progress on HVAC sizing measure. For information not available in the model, it is stored as BuildingUnit features.
2c19b411f Commenting out airflow measure unit tests on account of circleci machine not yet updated to 2.0.2.
9b9570248 Addresses #40.
d96f92c9a Fixing the object name method for eaves and neighbors.
2692eaa9a Progress on HVAC sizing measure. Updates to internal gains and infiltration.
f7105a946 Missing an eave for one story single family attached flat roof with garage.
0d298761e Progress on HVAC sizing measure. Updates to window overhangs, exterior finish, foundation walls/floors, and occupant internal gains.
aba8cbd2a Removing some interior eaves in one story flat roof single family detached with garage geometries.
62efe0502 Forgot to change the rakefile back.
f8b372a9a Updating eaves measure to accommodate one story single family detached with garage, and corridors in multifamily buildings.
626d3ec9a Progress on HVAC sizing measure.
595d64803 Fixed some has_foo methods in hvac.rb that weren't correctly returning true. Fixed default efficiency for electric boiler measure.
9ac6281ed Bugfix for MSHP without supplemental heating. Added unit test.
11729467b Progress on HVAC sizing measure.
d1b73faee Moved hvac.rb performance curves into individual measures. Added solar design conditions into weather.rb.
9c49a3316 Closes #71.
4f143e2f7 Fixing finished floor area issues in the geometry measures, and updating unit tests.
7aefa02e0 weather.rb: Prefer ASHRAE design conditions from DDY if available. Addresses #8.
532124e75 Better fix for SFD geometry measure for finished attics. Added FFA unit test checks for all geometry measures.
35b1b0146 Updating eaves measure to handle multifamily buildings with unit insets.
bb00e3256 Closes #122.
be1e1f041 Closes #121.
56f2e2e8d Removed "Copy all surfaces" argument from neighbors measure; closes #91. Updated window/door area measures to exclude non-vertical walls.
a64693cd2 Progress on HVAC sizing measure.
2c3a45e05 Updating eaves measure to handle single family detached homes with garage and flat roof. Also fixing single family attached measure to handle hip roofs with any unit aspect ratio.
fc00b5095 Addresses #119, finished basements get a dehumidifier.
c24b67dcb Fixed Geometry SFD measure for finished attics.
16c7099ee Removing extra always on and off schedules, and cleaning up some object names.
6dbd2c7dc Improvements to hvac.rb.
d00254668 Addresses #66, including testing for valid bore field configurations.
e672c95a1 Progress on HVAC sizing measure.
72317a5b2 Too many decimals in some calculated infiltration values, and updating deprecated minitest method.
f2753d37d Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
35614c58c Remove units from HVAC capacity measure arguments.
715ed92f8 The return air duct ceiling in the original airflow measure had the tilt of a wall and not a ceiling.
0627c0457 Updating object names in boiler measures.
614724827 Updating object names in original airflow measure, and in furnace and central ac measures.
1530a60c0 Updating the original airflow measure to work with the new hvac air loop names.
cbe7e6b2d Adding unit tests for eaves applied to single family attached and multifamily buildings.
4f90504c3 Simplify GSHP arg names.
84a146d9d Update Gemfile.
08e59c705 Progress on Manual J sizing measure. Lots still to do.
10b5f1bc9 Addresses #119, dehumidifier. Also fixing multispeed central ac and ashp unit tests, as well as updating object names for all hvac measures.
0d0f81ce5 Update README.md
9d4fa63ec Addresses #105, finished updating unit tests for single family attached and multifamily.
a68db899b Addresses #66, correcting the number of G function pairs on the ground heat exchanger vertical object.
f63d58d90 Adding single family attached and multifamily unit tests for some of the geometry measures.
41fdf05ca Adding unit tests for overhangs measure.
b1f7f6504 Updating single family attached and multifamily unit tests for the hot water measures.
dc030c04c Updating single family attached and multifamily unit tests for the misc measures.
b0922a46e Updating single family attached and multifamily unit tests for lighting, occupants, door area, and window area measures.
cb780339e Updating single family attached and multifamily unit tests for the appliances measures.
25555ef58 Including unit tests related to single family attached and multifamily geometries for heating and cooling setpoints measures.
3f30e7566 Creating osw files for creating osm files for unit tests related to single family attached and multifamily geometries.
d42155e7e Revert accidental 2.0 class name change.
cb131a103 Create unit test osm's from osw's. Addresses #105.
6e22c6e7c Updated Gemfile and Gemfile.lock, take 2.
d68aded48 Updated Gemfile and Gemfile.lock.
11b3407ab Addresses #66, including argument descriptions and additional unit tests.
144a1316f Updating unit tests for all HVAC measures due to new ground source heat pump measure.
6e0e11381 Ground source heat pump vertical bore measure runs successfully, addressing #66. Still need to update unit tests.
4993d4684 Stubbing out the ground source heat pump vertical bore measure. Addresses #66.
6fc4771ff Updating the zone_is_finished method in the geometry resource file.
d2b810977 Updating object names in airflow measure, and reorganizing code a bit.
e3235eb2b Addresses #97, removing duplicate schedule objects when using the setpoint measures. Also improving their unit tests.
a058d528f Addresses #98, #40, #118, #61. Fixing some object names and duplication in mshp, airflow, ceiling fan, and photovoltaics measures. Airflow measure now detects all clothes dryer object types. Photovoltaics measure can now replace existing panels. Updating all unit tests.
b57bd513b Adding unique prefix to shared (with airflow measure) object names in ceiling fan measure.
9e9490408 Updating #118, ceiling fan measure.
cf884af13 Addresses #118, ceiling fan measure.
bc9b701e7 Updating unit tests for neighbors measure. Fixing bug that was producing orphaned shading surface group objects.
7bd5dedfe Updating unit tests for eaves measure. Fixing bug that was producing orphaned shading surface group objects.
b4d1e63b9 Moving shared geometry-related methods from eaves and photovoltaics measures into the geometry resource file.
872b7c650 Addresses #40, living zones have return plenums even when no ducts present.
45eb2147c Addresses #113, adding code to airflow measure for handling DSE specification and normalized leakage.
a43ba97b5 Addresses #106, splitting up furnace/boiler measures by 'Electric' vs 'Fuel'.
ae2e8a445 Splitting up boiler measures by electric vs fuel.
648826604 Addresses #106, splitting up furnace measures by electric vs fuel.
e74baa1a6 Added/updated measures for pier & beam foundation type. Closes #51.
450ada476 Bugfix for airflow measure.
38aede6a9 Replaced Age of Home input in airflow measures. Addresses #85.
580c639b6 Renamed some measures.
219699b9d Addresses #106, splitting up ASHP measures by number of speeds.
87558a7e4 Fixed water heater skin loss frac to be consistent with BEopt.
e4c9ec314 Added unit tests for 2 thermal mass measures. Bugfixes.
14cc45962 Addresses #106, splitting up AC measures by number of speeds.
58f1773b0 Separate out flue/chimney input into separate HVAC flue, WH flue, and fireplace chimney inputs. Allows better handling for ResStock.
bd5ac272e Finished basement measure unit tests.
116c4f2eb Unfinished basement measure unit tests.
6f066c235 Fixed pan heater in MSHP measure.
b9b210f59 Fixed Airflow measure num of duct returns. Added unit tests.
5faa210a5 Fixed ASHRAE 62.2 2013 in ResidentialAirflowOriginalModel.
1b8375be3 Small improvements to airflow measure.
525cf1cd3 Added flue input to the original airflow measure.
8f9839fc8 Update airflow flue code. Addresses #85.
fc844ab14 Fixing flue flag in the airflow measure.
f53badb94 First cut at addressing #61.
a7fdbc576 First pass at creating unit test osm's from osw files. Addresses #105.
7a4182c0e Fixed attic/foundation space names in geometry SFD measure.
cf94a279a Update var name.
f39e8eb7a Reverting door change. Makes OpenStudio unhappy.
d18b2cad8 Small fixes.
a826c1a53 Addressing #40, fixing schedule name bug that was producing 'Attempt to write a disconnected...' warning.
87900eb5d Addressing #98, apportioning VRF capacity to living and finished basement zones based on zone floor area.
25f571ec3 Addresses #112, adding airflow measure when no thermostat present.
4854dcda6 Cleaned up airflow measure arg variable names for ResStock.
507a9dc0a Oops. Forgot to add the vent fan actuator overrides. Addresses #40.
547feefb8 Removing old MSHP measure.
d9f06a857 Updating mshp measure with capacity retention inputs.
3c496bb65 Consolidated gas/propane/oil water heater measures.
6f00d4a61 Updated xmls.
8394055e1 Consolidated gas/propane measures.
938af0852 Allow oil/propane fuel type for furnace measure. Closes #64.
ce858cc05 Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
29325eb3c Added propane cooking range measure. Closes #52.
8c28b1dd6 Addresses #98. Removing min hp temp input and only fixed SHR when fixed capacity.
b2e6a91b0 Added propane clothes dryer measure. Addresses #52.
1e7d5c486 Bump min version required for AirFlow and MSHP measures.
2520b3ad3 Updating and including unit tests for the airflow and mini-split heat pump measures.
d15aaf368 Accounting for finished attic story in single-family attached geometry measure.
230b8c863 Was calculating RA duct zone volume based on building finished floor area instead of unit finished floor area; only affects multifamily.
7dd7145d0 Did not have the building level infiltration outside the unit loop. Oops.
f9bfa14db Removing orphaned day schedules.
a01dc84be A couple more.
2649bb7e1 Update various variable names. Closes #104.
6aa9ff173 Updating some hvac equipment names.
7142450b5 Updated lots of unit tests. Some bug fixes.
716bd06e8 Forgot to do surface matching before making all unfinished attic spaces into one unfinished attic space.
6af6e34a5 Addresses #101, unfinished and finished attics for single-family attached geometries.
dbe40dcf0 Add unit tests for crawlspace constructions.
492c88057 Updated a couple unit tests.
5a24e0cb5 Commenting out MSHP unit tests until EMS branch is merged.
e4900c059 Adding pan heater to mini-split heat pump and updating curves.
e79baf735 Added a number of end use subcategories.
d0b2be125 Adding error check for number of above grade stories in airflow measure.
6dcbce7d4 Adding get_building_stories back in so that old airflow measure will work.
9161a7d6f Addresses #101, using standardsNumberOfAboveGroundStories in place of get_building_stories method.
18493cce6 Updating the single-family attached geometry measure to correctly handle only one unit.
12171becd Updating the airflow measure to accommodate the new ems build.
bb6cb8ab9 Addresses #98, adding mini-split heat pumps to finished basements.
040a48e0b Addresses #101, allowing floor multipliers for multifamily geometry measure.
1fb903599 Removing an info statement from hvac measures and updating unit tests.
42a1b923d Bugfix for perimeter foundation calculation. Added slab unit tests.
a712fcc40 The airflow measure xml turned back into an energyplus measure somehow.
20321cfe5 Better bugfix.
405ce80fc Added wall construction unit tests.
5d3ee0a94 Bugfix for airflow EnergyPlus measure. Bug introduced in https://github.com/NREL/OpenStudio-BEopt/commit/29ffcb27557ecf44791985cc19bcd0018eebf03a.
29ffcb275 Update measures to use new BuildingUnit object. Addresses #101 and #29.
8dbfa00cb Addresses #101, allowing zone multipliers for multifamily geometry measure. Also addresses #100, updating unit tests for single-family attached and multifamily geometry measures.
64191ce0d Update some unit test osm's.
acd6f1c8a More unit tests.
0a46fcdd4 Wasn't setting the airflow rate on the heating coil for single stage air source heat pumps.
ad9406fec Fixing the method that identifies air source heat pumps (without also identifying central air conditioners).
257860fd2 Commenting out new airflow measure unit tests for now.
bbaa8103b Airflow measure is now an OpenStudio measure, not an EnergyPlus measure. Addresses #40.
6da9a0db5 Added unit test for CMU walls. Fixed bug in calculation of effective layer R-values for constructions that have multiple parallel layers.
ff606a60c Fix unit tests.
a591f5fa9 Updated to 99%/1% design day conditions. Addresses #8.
bf02c0fba Removing OS 2.0 helper methods for unit tests; no longer needed.
c402990f9 More unit tests.
d4f923bf3 Last last last attempt.
e237c7bc5 Last last attempt.
d614b713f Last attempt.
8c1f4f1a2 Attempt to fix bundle error on CircleCI. Running up against this issue? https://github.com/bundler/bundler/issues/4467
7a41be175 Update Gemfile.lock.
7614918d7 Added several construction measure unit tests. A few bug fixes.
77cffa1fd Remove ruby-prof.
058c4816a Added first construction unit tests for finished roof. Fixed unused install grade.
9c472242b Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
64ee37418 Added occupants unit tests. Updated some appliance unit tests.
202ddfdb4 Fixing a mini-split heat pump curve.
8462d7ba4 Fixed a couple failing unit tests in OS 2.0.
eaf649b93 Update measure unit tests to run with either OS 1.13 or OS 2.0.
d79067402 Updating unit tests for single-family detached geometry measure.
35bfa26dd Fixing unit tests for beds and baths measure.
989545b0d Updating unit tests for beds and baths measure.
b2066607d Fixing the epw path in a few files. So annoying.
7d3aeb36b Updating unit tests for heating and cooling setpoint measures.
422ff5cab Updating unit tests for ashp, mshp, boiler, electric baseboard, and room ac.
5be1acadd Update heating/cooling setpoint measures due to the https://github.com/NREL/OpenStudio-BEopt/commit/0794731dcefd40d856b81e8ac334c13a3a30fe0c commit. Closes #102.
3f51f1b13 Accommodate zone multipliers in geometry helper methods. Addresses lighting measure discrepancy with zone multipliers, #101. Also updated natural ventilation program's window area to be unit-specific.
afbea0550 Updating unit tests for location measure.
3089b8086 Fix SFA geometry measure with rear units and zone multipliers.
ee43763fe Moved unit test helper methods into a common file. Addresses #100.
e0908e448 Measures that use water mains temperatures no longer require weather file parsing. Closes #103.
6d2520af3 Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
a005c0a80 Update HW distribution measure for MF buildings. Added unit tests. Addresses #101.
82b7ae669 Updating zone multipliers to work with multi-story units, and building with rear units / odd number of units.
5ce95345b SFA geometry measure now accommodates rear units with Zone Multipliers, addresses #101. Also, per Craig, setting adjacent surface of interior unit with 2+ Zone Multiplier to surface of rightmost end unit.
a92b8a9f4 Updating some descriptions related to multifamily inputs, and fixing num units in osm when using zone multipliers.
25ff60cb7 Removing orphaned multi speed data object for single speed central air conditioners, and updating unit tests.
0794731dc Schedule class: Only create separate weekday/weekend schedule rules if they differ.
ab4bb8843 Updating central air conditioner unit tests. Addresses #100.
3a5780a82 Updating the mini-split heat pump measure a bit.
6a866e095 Updated furnace unit tests to more generically look for new/deleted objects. Switched from vectors to hashes for better readability. Addresses #100.
3d8603318 Updating furnace unit tests to look for objects instead of info statements; to be reviewed by Scott. Also adding None corridor option to multifamily geometry measure.
14ea6291a Update README.md
a63565b6a Remove unused cold climate arg from ASHP measure.
08e8ef9b6 Clean up foundation type and attic type arguments in geometry measures.
b68deb401 ...and updated xml.
cd0371fec Fix door area measure for MF buildings with insets.
65102140b Fix EPW path.
cf7d50b97 Updated all hot water measures to use multiple draw profiles for MF buildings for diversity. Added hot water draw profiles.
3e1ef515c Addresses #77, using zone multipliers in single-family attached geometry measure.
fea1fa547 Testing the vrf mini-split heat pump measure and comparing against the original mini-split heat pump measure.
23bd4a834 Changing the DHW distribution measure to allow for removing an existing distribution system and replacing it with a new one
745de0a2c Retain original MSHP measure for testing/comparisons.
69dd231fa Update README.md
1ab2169ff Remove setSchedule/setWaterSchedule helper methods in the Schedule class. No longer needed and could cause bugs due to OS automatically assigning the Always On Discrete schedule to some objects (ExteriorLights) but not others. Addresses bug in #98.
17b65afec Addressing #97. Still unable to remove curves from the fanonoff object.
efc2dc4d2 Updating airflow measure unit tests to handle new vrf mshp object.
f1d0c7e3e Adding unit tests for vrf mini-split heat pump measure.
af48ab59f Addressing #98, using variable refrigerant flow to model mini-split heat pump. Needs unit tests.
0402ed6c8 Added some error checking in Airflow measure. Fixed a couple typos.
9561e0afc Update airflow EnergyPlus measure for E+ 8.6.
c247b2ad4 Merge branch 'master' of https://github.com/NREL/OpenStudio-Beopt
e7c2c172a Updated hot water fixtures measure for MF buildings. Added unit tests.
60328a294 Removing the zone mixer object when ducts are specified in the airflow measure.
0abf9e3ca Splitting the multifamily geometry measure into separate single-family attached and multifamily geometry measures. Closes #93.
0f5f167c0 More Airflow EMS bugfixes.
57369fe96 Airflow EMS bugfixes.
10a7bbaa9 Closes #94.
227be171b Continuing to update airflow measure for multifamily buildings. Also making non finished basement foundations into whole footprint spaces and not attached to units.
cf0a7c7ed Add Humidity Capacity Multiplier to empty seed model.
62da4680b Prevent creating duplicate schedules under some circumstances.
14028b53d Updated dishwasher and clothes washer measures for MF buildings.
2739bea16 Adding foundations to multifamily geometry measure.
a69784fe0 Updated xmls.
56f3988cf Completed update of water heater measures for MF buildings. Added unit tests for all water heater measures.
d9c3c3568 Lots of unit tests updates/improvements.
a60f8ff93 Added unit tests for electric tank water heater measure. Some bugfixes/improvements.
dad64e02f Inset shades are now balconies, with depth as user input.
728b3e730 Updated water heater measures for MF buildings.
e8257f04a MF geometry measure: Only use 1 zone for corridor spaces. Improve corridor space names.
9285041f3 Various cleanup of HVAC measures, including removal of some internal classes and code related to ideal ACs.
22333e402 Bugfix for previous commits.
bba82d689 Forgot a file.
2356802d7 Created hvac.rb resource file. Moved methods from util.rb (and one from geometry.rb).
ea3d5c552 Commenting out code that creates shading surfaces within insets (these may become balconies).
dd648ad35 Setting corridor width to zero when specified as nonzero with no corridor position.
9896f3c70 Setting all surfaces adjacent to corridor as adiabatic. Also removing the mirrored inset on back multifamily units.
faf370cc0 Removing townhouse and apartment geometry measures.
21edd37cb Update README.md
33cad4925 Addressing #91.
07b2404c4 Updated lighting measure for MF buildings.
03e747fe2 Bugfix to prevent the possibility of the garage attic space being associated with the living zone.
47d501d6a Revisiting #91, and closing.
5076d0cb5 Bugfix for uninsulated roof construction.
b4bb72b00 Closes #87.
7105d62d2 Closes #91.
f367d28b6 Closes #89.
cdb9bfd0c Bugfix for foundation exterior perimeter calculation.
f77e05580 Bugfix for foundation exterior perimeter calculation.
4d9c12498 Remove condenser type argument from ASHP measure.
e07f4361e Remove condenser type argument from central AC measure.
559b93a06 Fix overhangs vs. window areas order.
643760f41 Bugfix for living space infiltration for multi-story buildings. Bugfix for garage/attic infiltration.
f01cd4097 Places doors on the back of MF units as appropriate (e.g., fourplexes with no corridor between units).
dd68cb748 Renamed measure dirs for better consistency. Closed #86.
efde6ab2a Added/enhanced unit tests for window area and door area measures.
40567f57d Updating the WH plant loop to use a variable speed pump
c3e674f79 Forgot these files.
398e6f8c7 Updated plug loads measure for MF. Removed extraneous variables from many measures.
4dffddb22 Some code simplification for reporting info messages and final conditions.
a422a413c Consolidating multif…
shorowit added a commit that referenced this pull request May 31, 2019
@shorowit
Squashed 'measures/HPXMLtoOpenStudio/' changes from ffbf3e0..9842257
28d8b84 
9842257 Merge pull request #86 from NREL/hw_discrete_events
b31ad23 Revert change for now. Will evaluate further down the road.
4954ddd Remove unneeded argument.
e82f5d6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hw_discrete_events
1a28e6e Merge pull request #52 from NREL/ducts_sizing_etc
7e28229 Updating total SSB volumes
3183c24 Fixing 4 bedroom SSB schedule
7d740dc Merge branch 'hw_discrete_events' of https://github.com/NREL/OpenStudio-HPXML into hw_discrete_events
6e2e82d Updating the 4br combined DHW draw profile
d5db675 Remove excess lines.
5e2e5e2 Merge branch 'hw_discrete_events' of https://github.com/NREL/OpenStudio-HPXML into hw_discrete_events
ebfb37e Fixing issues in the combined draw profile for 2, 4, and 5 bedroom homes
bf0d49d Add code to support combined SSB schedules. (Currently disabled.)
3e52edb Adding a combined sink, shower, and bath draw profile for each # of bedrooms
6b5fdbd Hard-size water heater burner capacity to ensure no unmet water heating load.
10afb17 Some cleanup.
0124b3c Improvements to pre-Addendum A hot water approach and other minor changes.
dcb483f Oops.
5ca0ddf Second pass.
181df22 Initial pass on implementing discrete hot water draw profiles.

git-subtree-dir: measures/HPXMLtoOpenStudio
git-subtree-split: 9842257
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@shorowit