Electric Vehicles #1299
Open
Electric Vehicles #1299
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
…60006 1e89f060006 Latest results. 357509ed95c fixes for timeseries tests of EVs ed8cc5b1c92 Merge remote-tracking branch 'origin/master' into ev_batteries 14f026ec7b2 address unit test failures for EV batteries aaecf51607c update in-line documentation for vehicles and batteries 52d07ddf3fa Fix unit tests for EV batteries d591cad7673 Merge remote-tracking branch 'origin/master' into ev_batteries a5a3fc7fa95 Fix merge conflict 7d04943785b Pull in latest HPXML schema for EVs ea3d06f2f61 Merge remote-tracking branch 'origin/master' into ev_batteries d0a554f749d Apply rubocop b2d226a606e Fix bug iniitalizing DBT sensor 2bfc0f7b238 Fix for EV discharge offset object when EV location is garage 3291f9c659a Write EV fraction charged at home to HPXML 891f6095af3 Introduce miles/yr and hours/wk arguments for EVs, calculate the effective discharge power 0c8861cf6e2 Pull in latest Vehicles changes in HPXML schema, update HPXML classes as needed; expose fuel economy and vehicle miles traveled args 9c31908f129 Merge remote-tracking branch 'origin/master' into ev_batteries 2432bfb168d EMS program to adjust effective EV discharge power and offset that discharge power for reporting a4135347c87 Update reporting measure to output EV energy b1ef026fc63 Generate an ELCD object for each EV battery 5d21e323428 Update EV arguments for latest approach to argument handling 3228c7ae14c Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries b86a506dbef Merge remote-tracking branch 'origin/master' into ev_batteries e279ea4426b Latest results. cefa4e28739 Merge remote-tracking branch 'origin/master' into ev_batteries 35e8be48fd7 fix failing tests for ev batteries bd3fbfe6f4e Merge remote-tracking branch 'origin/master' into ev_batteries 6fbd4f57cc1 update unit tests for EVs and chargers; apply rubocop 1effbc82974 Merge remote-tracking branch 'origin/master' into ev_batteries f6b88a304f9 Refine inputs for EV battery and charger, update tests 0056e2c66d9 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 22f00b2e2fe Merge remote-tracking branch 'origin/master' into ev_batteries 61d39b67361 Seperate EVs from batteries and leverage existing EV charger fields dd4d5cfffa7 Merge remote-tracking branch 'origin/master' into ev_batteries 2a9b7bb6708 Latest results. 374aae8500f fix test for battery log message 357ba18deca Merge remote-tracking branch 'origin/master' into ev_batteries da8dc17703f update log message tests for batteries 9db3aebb317 add missing ev battery schedule for tests 52bc3ab47b4 Merge remote-tracking branch 'origin/master' into ev_batteries 8f33e3d0556 initial tests for ev batteries 01437d08f71 always require schedule when modeling ev batteries 5c36fcb1483 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 210c463549c make ev_battery_preset argument optional 4f1a37e0f81 update how battery ids are assigned in xml 744ad6638cf stub out defaults for EV batteries 3f943741530 allow one EV and one non-EV battery in schema 08c8c5a2b69 fix ev battery schedule generation, generalize for ev and non-ev battery schedules 36492fbf179 custom schedule columns for EV batteries 7b651b01367 new arguments and method to write EV battery to xml git-subtree-dir: resources/hpxml-measures git-subtree-split: 1e89f0600061f49f1f4e0be26942858e5d90a7c5
aspeake
force-pushed
the
electric_vehicles
branch
from
be3b260
to
dddbc62
Compare
…ed6cc d78b0aed6cc Merge remote-tracking branch 'origin/ev_batteries' into ev_schedules 8cc6c937dbd Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 50a8c47d638 prevent EVs modeled with a plug load and a battery at the same time 25d24d5a84f Merge branch 'ev_batteries' into ev_schedules fd0dd492dee Binary occupancy d08ba63913f Merge branch 'ev_batteries' into ev_schedules d44e1bcfea4 Handle schedule conflict ce9ff761e00 Merge branch 'ev_batteries' into ev_schedules d377d3c6789 Merge branch 'ev_batteries' into ev_schedules d5db465f20a Fix test and read from HPXML be21d3c0211 Merge branch 'ev_batteries' into ev_schedules 19740a71b27 Generate EV schedules git-subtree-dir: resources/hpxml-measures git-subtree-split: d78b0aed6cce2e67bae77126c5783241a8f1e415
…0ad39 5230cc0ad39 fix bug from merge conflict git-subtree-dir: resources/hpxml-measures git-subtree-split: 5230cc0ad39df0e4794a1c1a55ae1ea7ccc988cd
3c867be6e4 Remove epw arguments git-subtree-dir: resources/hpxml-measures git-subtree-split: 3c867be6e4a3fbc671a8dabf85e01189c014dc1f
b102371faf Handle hours per week git-subtree-dir: resources/hpxml-measures git-subtree-split: b102371faf29325d2967920f46c36dba8496c20e
d15baa1866 Output EV occupant occupancy git-subtree-dir: resources/hpxml-measures git-subtree-split: d15baa1866321e9a58fa38b483040e602a785863
86144f9da7 Merge branch 'ev_batteries' into ev_schedules 1198abdd6e pull in latest HPXML schema git-subtree-dir: resources/hpxml-measures git-subtree-split: 86144f9da7b77c444e1040212cc832e61567382f
997fbeec56 Merge branch 'ev_batteries' into ev_schedules 8131ce2f33 Remove byebug line e032b3e5f7 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 14718f5bcd refrain from using object id to check if a battery is for a vehicle 9e03d1d0f3 Merge branch 'ev_batteries' into ev_schedules b077dcc504 Bug fixes and enhancement 18bf8fcd27 Latest results. d17000ee98 Include reporting measure arguments to trigger vehicle outputs 28e1849bdd fix bug for vehicles in the reporting measures 32e567b1ff apply RuboCop 486f01fe7a Merge remote-tracking branch 'origin/master' into ev_batteries 385c67b6e3 new reporting measure class to output vehicle-specific variables that are not end-uses; move discharging energy from end-uses to this class 27dd8ead49 Merge pull request #1861 from NREL/utility_bills_update 59d55948ad discard EMS for offsetting EV discharge energy and handle it directly in the reporting measure 24409402f4 Bugfixes: 1. Don't overwrite max usage units in the tariffs we produce. 2. Only throw an error if the max usage unit is not kWh AND a max usage value is provided. The units apply to the max value usage only, the rate value is always $/kWh; see the OpenEI URDB website for confirmation. 2de51a2a82 Merge pull request #1857 from NREL/hpwh_capacities 5c3fc8163f Update Changelog.md 35ba1cbeea Updates utility bill calculations to allow daily fixed charges. Improves warning messages. A little code cleanup. 67301d72bd Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into hpwh_capacities 301ae67c05 Pin ubuntu-22.04 while GitHub works on fixing ubuntu-latest. bd4bde15d4 Require a water heater's HeatingCapacity to be > 0. 2dd566f7e6 Merge pull request #1816 from NREL/cfis_continued cbc7fa118f Bugfix. 9c373dfc46 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 09c7cd1860 Fix CI 616154a2ae Latest results. 906db6c7e4 A little cleanup. 578929efb9 Merge branch 'cfis_continued' of https://github.com/NREL/OpenStudio-HPXML into hpwh_capacities bb8d8b0256 Fix CI 68a9e3fef5 Latest results. a2f595de28 Fixes CI? 77467c7a92 A little docs cleanup. 40d7e93844 Allows optional `HeatingCapacity` and `BackupHeatingCapacity` inputs for HPWHs. Defaults same as before. ca3bdf5955 Merge branch 'cfis_continued' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued da7f967873 Clean up docs [ci skip] 7b79e72296 Latest results. 1ae00d2c40 Implement CFIS fan power defaulting. 86f4b722e2 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued 9bb1ac4ba6 Merge pull request #1856 from NREL/fix_combi_error fb92a6977d Latest results. e77f37a8c8 Fix tests. 5ffadbabf8 Merge branch 'fix_combi_error' of https://github.com/NREL/OpenStudio-HPXML into fix_combi_error 6fad297cb0 Update Changelog.md [ci skip] d8097bd749 Latest results. e5d73ba4c6 Allow GSHP w/ separate backup heating system. 8438d1b91a Update a couple HPXMLs. 905eaa823e Fix possible error when there's a combi water heater. Add more error-checking to schematron. 5e5b1fbde3 Merge pull request #1855 from NREL/more_ruby_doc 0dbfaa0a30 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into more_ruby_doc cb7e6b5abf Some more ruby documentation and some light code cleanup. d65c8a35f5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued 5b28c4363b Brings the `skip_simulation` arg back; forgot that BEopt uses it. 73460f97b2 Merge pull request #1854 from NREL/fix_delete 1556a63b43 Small docs clarification. [ci skip] 53638b5031 Fixes the HeatingPerformanceDataPoint.delete method, spotted by @joseph-robertson. afdd3884ed Merge pull request #1851 from NREL/schedule_methods 0f2e6b7f71 Latest results. 6e9bbfa553 Merge branch 'schedule_methods' of https://github.com/NREL/OpenStudio-HPXML into schedule_methods 72dab1d090 Bugfix for season schedule. Misc code cleanup. b41ae3de17 Latest results. 100534ab8f Bugfix. 1043fbf38e Bugfix, simplify. 7e241ad34e Bugfix. f6017611e8 Bugfix. ee45a26d37 Bugfix. 858350a9ce Bugfixes. edf3d2df70 update_measures 553dce9236 Add the rest of the schedule object methods to model.rb. 745026fd0e Merge pull request #1849 from NREL/stratified_tank_bugfix 5dc674f355 Latest results. 80b8e17316 Set source side inlet/outlet heights too. 6e6a59bb75 Fixes the height of the lower element in the stratified tank model. e770f42307 Merge pull request #1846 from NREL/misc_things 0e2efc8396 Update measure.xml b8b051b2c5 Require both FracSensible and FracLatent to be provided/omitted to fix a possible error if only one is provided and the other is defaulted. 4875c6bd42 Add Resources section to the docs. 54ca3ac6b5 Merge pull request #1840 from NREL/ruby-docs f0f502e249 Bugfix. f8a569bed4 Bugfix. 5db17e71f4 Missed one. 9983541d34 Allow tank volume to be defaulted for any water heater type. Replaces HPXMLDefaults_get_default_foo with Defaults.get_foo. Renames hpxml_defaults.rb to defaults.rb. 68b468c955 Need a different approach for OS-ERI a0fc0ad26c Need this for OS-ERI c002e94607 Rename method 8b6614ef65 Found more defaulting methods to move. a65b979bb6 Update refs 1e8e3c66a7 Move a few more defaulting methods. 7baddc9a89 Move more methods to hpxml_defaults.rb b0b826c64b Latest results. c79f63f159 Fix DHW loop pump f30506b0f9 Revert name change. 4ebb8b8e2b Bugfix. 88d0a4ac3b Fix edge case. 5d2e33338f Add error-checking code b97a728e04 Update hvac tests, combine lights methods. 061cb373ed Add a few more objects to model.rb, reformat. ce0515c8d8 Bugfix. 7b54a990c2 Move a few more objects to model.rb. a4c37cf1d8 Consolidate Curve and Material object creation. fbc6a6b225 Bugfix. 298dc1f3ee Completed documentation of output.rb. Moved constants to constants.rb. [ci skip] e9f8ec251f Completed documentation for hotwater_appliances.rb [ci skip] a6e432659c Bugfix. f032001923 Bugfix. 421311b6c4 Use EMS-friendly names in more places 9ef0b36b7a Added EMS methods to model.rb. Introduced a method that creates EMS-friendly names. Added code to prevent duplicate sensors. e82a6745a3 Bugfix. 40d31b45bc Fix tests. Use kwargs in new model.rb methods. 59986a8390 Bugfix. Prototype generic add_foo methods in model.rb. 31e7d52abd Bugfix. 71dc6b2cd3 A couple small things 0e0f9415fa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 01e6dc7b08 Moved a bunch of HotWaterAndAppliances/WaterHeater/Airflow defaulting methods into HPXMLDefaults and added documentation. 69b9cb7924 Merge pull request #1844 from NREL/avoid_csv_library 7f06505e8c Update comment for consistency [ci skip] e6ab5eabfc Might as well do it here too for consistency. fba96d4069 Speeds up reading/writing/processing detailed schedule files and writing CSV timeseries output by avoiding the CSV library. c9f71f3b69 Merge pull request #1843 from NREL/mj_num_occ_double 69f1aca265 Latest results. e77151ef09 Update test ba479b5ed4 Update HPXMLs daa67c6d09 Adds a test case with a non-integer number of residents. Converts Manual J Num Occupants inputs from integer to double to fix a possible error. 990df159de Merge pull request #1842 from NREL/mj_default_num_occupants cb81e54ff8 Latest results. 7f691f6b73 Fixes #1841. 36f1dccd62 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 4d80de2835 Some documentation for geometry.rb 845b6ab238 Merge pull request #1826 from NREL/exterior_shading_type 1188edd421 Final cleanup. e8e3a7c2c5 Latest results. 7abe0eeb0e Docs bugfix c570c031b7 Bugfix. 5fe0bbb9d8 Simplify things. ca62509039 Latest results. e63fddf68d Allow interior shading type=none. Allow exterior shading coverage fractions. de7b116ff9 Latest results. 74dee378c3 Add warnings and tests. 6da575f8e4 Latest results. 57546ff677 Update expected test values. 51e898be96 Merge branch 'exterior_shading_type' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type 1c4b872f4e Allow more decimal places to reduce diffs. b45a5f56f4 Revert measures hash not supporting lists of arguments. 50dc076c2f Merge branch 'master' into ruby-docs 0484abbd14 Latest results. 94f1959a91 Fix test c3903e4866 Update ACCA test files. 522b711cfb Merge branch 'exterior_shading_type' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type a1c7142156 Add new BuildResHPXML measure arguments. Update defaults for blinds. Expand sample files. cc68cc78d1 Latest results. c845338cf6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type 4143ec9d9a Merge pull request #1707 from NREL/adp_bf_method_design_shr 57c3c6776e Update tasks after hash change. 8a18e3b85f Remove list of args hashes in measures hash. 16a4b844f2 Latest results. d315784200 Cleanup comments. 5efcc61504 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 52b5a11060 Bugfix, cleanup. e8e0deac95 Progress in geometry and meta_measure. 76192028fa Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type 3ad40c9405 First big pass on interior shading inputs. 6485ac2cfd Merge branch 'master' into ruby-docs fe2e4d2db6 More TODOs in geometry resource file. 623f63c39e Merge pull request #1825 from NREL/fix_advanced_defrost_small_capacity 58bb02bbcd Update HPXMLtoOpenStudio/resources/hvac.rb 5baaee81eb update_measures 7243322727 Merge branch 'fix_advanced_defrost_small_capacity' of https://github.com/NREL/OpenStudio-HPXML into fix_advanced_defrost_small_capacity aab9cdb48e address comments 29218311e3 Update HPXMLtoOpenStudio/resources/hvac.rb 5cdc6b0642 Starting filling TODOs in meta_measure resource file. 8d3eb04884 rerun update measures 9fef7e18f4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_advanced_defrost_small_capacity 88e256c9f0 Merge pull request #1838 from NREL/update_openei_rates 27c68d0269 Cleanup. [ci skip] a85a4be98b Update Changelog.md 54a064d57d Pulls the latest residential URDB rates. 7a073c9259 Merge pull request #1837 from NREL/airflow_cleanup c19643c0c6 Some additional cleanup of hpxml_defaults.rb. 89db6c2867 Airflow.rb cleanup: remove globals, simplify passed arguments, etc. 56a871350a Latest results. 50c9c7d181 Unrelated code cleanup c6435fab6e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 0d8be0fe07 Merge pull request #1836 from NREL/fix_partial_outputs 3f8efb3bea Bugfix. 260f10fdcb Bugfix. d4bd5e0047 Reorganizes code so that output files are written last in the HPXMLtoOpenStudio measure. 11bb6ec169 Merge pull request #1829 from NREL/no-hvac-season 5614d3aeba Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into no-hvac-season 12dbaf5e0f Bugfix 12fee34156 measure.xml updated after running RuboCop. no offenses detected, measure.xml gets overwritten by CI anyway 66e2c72c3a update measures bdfa6edec4 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_advanced_defrost_small_capacity 4779ada0bd changed variable name from hvac_cooling_shr to hvac_cooling_shr_rated in apply_hvac_equipment_adjustments; cosmetic change only 340ddfe2ba add unit test 26e99e6f12 Make code consistent with recent refactored code. 640cc1009a Merge pull request #1834 from NREL/lixi_docs e7196628f6 Merge branch 'master' into no-hvac-season 70b071968a Make natvent availability argument optional. 75220943c4 Merge pull request #1817 from NREL/ruby-docs 9896e0e2f4 Latest results. 27ebe4e8d7 Minor updates. c837fdfcf3 Move setpoints code back to the beginning. 488e01ba03 Merge branch 'master' into no-hvac-season 7f02231840 Bugfix for CI regression. cf8138c38a Merge branch 'ruby-docs' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 6db81ef461 Final pass. Reorganized measure.rb into additional methods and some misc cleanup. d4e0b79987 Latest results. 07813e6a4e Bugfix. 0741681d8d Final pass for now (hot water and airflow). 5a5a1ca109 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 579ff80f2f Merge branch 'ruby-docs' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs cb20947186 Huge pass on moving code out of measure.rb, cleanup. a71a1165d6 accepting incoming master to get adp branch up to date 59b6bd2b7f Merge pull request #1827 from NREL/Bob_Ross_del_4_5 06af1c933c Latest results. 15997847e5 Update 3-19 per ACCA bdfc826393 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into Bob_Ross_del_4_5 d779bddf28 Merge branch 'master' into no-hvac-season f1c9f1d2df Merge branch 'master' into ruby-docs 232ddcdb84 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ruby-docs 9e3f9e9829 Merge pull request #1833 from NREL/zipcode_tmy3 9a3749e3c1 A little more error-checking and cleanup. 187e174229 Stopped trying to be too clever by half. 96858af017 Bugfix. 45c0ddc730 Latest results. c4091863db Simplify code 489c0a5c66 Bugfix and cleanup. 553cae2bd7 Fix 7/8 CZs c721b7a024 Refactor: Combine all the weather station lookups into a single file. 39fe5a9e70 A little more cleanup. 8174151783 Bugfix and made it even faster. 1e599dc4b7 Latest results. 5e74300cce Update the changelog. [ci skip] 78eb642079 Revert previous approach and update sample files. 963f14b2f8 A bit more explanation [ci skip] 2016d15b0d Clarify some docs based on comments from @lixilui. f889608b41 Update docs/changelog. Minor cleanup. 787d32df36 Fix tests. c259099da4 Clean up 38d28915b3 Add a couple tests. 8f7c53d69e Allow zipcode to be provided instead of epw file/path, in which case we default to the nearest TMY3 EPW. adff70b2ab Update measures and sample files. 443e7cf6e5 Change unavailable period arguments. e924f92f9f Latest results. 9d6fb6fa15 Latest results. 0916e18529 Update tests. cdcb1b0424 Update new sample file and workflow test. 3067f718ce Add inputs for insect screen shading coefficients. Tweaks some defaults to be more conservative. 531843bff9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type d77027c5ad Add a sample file that demonstrates the change. dfe659637f Update get_daily_season calendar resource method. 67bd7a8da7 Update build measure season argument descriptions. 1b01ddb02e Merge branch 'master' into ruby-docs fc3ed5feea Latest results. 7c4d471674 Merge pull request #1823 from NREL/more_bob_ross_cases 7cf294647a Fix docs. c656f967e6 Update new HPXMLs a476ce591e Merge branch 'Bob_Ross_del_4_5' of https://github.com/NREL/OpenStudio-HPXML into exterior_shading_type 2141d55abb Fix error, clean up docs. 5152fb6ac3 First pass on allowing Window/InsectScreen. b0b91e4df7 Latest results. 0bb2248724 Update file names. 6d8db39c20 Latest results. 371218136c Latest results. 0ca21dc522 Merge branch 'more_bob_ross_cases' of https://github.com/NREL/OpenStudio-HPXML into Bob_Ross_del_4_5 bbeb5b05b3 added del4&5 test files f6915b02fd Use ref in docs. a263002e3c First pass on allowing Window/ExteriorShading/Type. d74db37a1e Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into more_bob_ross_cases 2c92a20750 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued 4c15e99609 Hotfix to address warning [ci skip] 2473921122 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into fix_advanced_defrost_small_capacity ef3a5bd985 update measures 81b24a01b7 update source code docs related to advanced defrost 1c61091eaf propose a solution to avoid negative p_dot when cooling capacity is too small a90c9ab5e1 Merge pull request #1824 from NREL/refactor_default_wh_location 672bf87b89 Update docs 4b905c0513 Minor refactor of Waterheater.get_default_location method to simplify the arguments. 80b39ec2b1 Merge pull request #1822 from NREL/reduce-advanced-feature-simulations 1c2e9bb48a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reduce-advanced-feature-simulations 4362479261 Latest HPXML schema. de2a7767b1 Latest results. 78c464b7e6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reduce-advanced-feature-simulations 0370ffb18e fix unit test e06607e739 Update methods to be backwards-compatible. 8bb6e6cafe update measures 40bd2abf84 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into reduce-advanced-feature-simulations ad00017bff Added 2 speed system test file back, changed var speed system test file to be hourly a2e73a11f3 Latest results. eacd3b5902 Added more Bob Ross test cases. 55d707496f Fix typos. 5dde4bb4eb Latest results. 7202d1bbe0 Reduce number of sample files with 1-minute timesteps to speed up CI jobs. dbc5c95ea9 Merge pull request #1690 from NREL/nbr_vs_nocc_new_regressions 6f24420443 More method name updates. 1dc7c5e86e Merge branch 'nbr_vs_nocc_new_regressions' of https://github.com/NREL/OpenStudio-HPXML into nbr_vs_nocc_new_regressions c068f61f0c Fix tests, 10% tolerance is too high 6fb35e54d7 Merge branch 'master' into ruby-docs b71eb65858 Latest results. bf017c970c Update link ecae1cfff5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into nbr_vs_nocc_new_regressions 84564d85a2 Merge pull request #1775 from NREL/plug_loads_operational_calc 5db44d46d5 Latest results. 30dc01a201 Move translator methods to new internal_gains and model resource files. 5b529c03b8 Update Changelog.md [ci skip] cd5ef8f3e8 Fix/update docs. 7c4729b2f5 Merge branch 'master' into ruby-docs f7858574b5 Relocate airflow related create_ducts method. 38763d5d32 Continue to relocate constructions and geometry related methods. e50348fb38 Must have add_setpoints before enclosure. db640d4f08 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into plug_loads_operational_calc 07fc18724e Merge pull request #1685 from NREL/floor_height_above_grade 08f8c95ff9 Clean up and refactor methods called from create_unit_model. bf87d6caa6 Handle possibility of negative values. d17b4470d6 Latest results. 58371b285a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into floor_height_above_grade 74264da49d Progress. f640608de8 Merge branch 'master' into ruby-docs 07e436e140 Start relocating translator methods to resource files. e4fbc89a97 Update expected simulation results b26f7748d4 A few more fixes. ba1239ddf0 Address CI failures 28f8c4047a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_continued f98754ece3 Clean up docs/schematron related to CFIS FanPower and VentilationOnlyModeAirflowFraction inputs. 1c418dc882 succesfully ran Rubocop 5df10ebe08 pulling in master after addressing adp_bf review comments 9c683e7fd8 running Rubocop 40f3831b3a adding comments re a_o_rated to address Jon Winkler review comment 2 cb5e1d1f0e adding informative messages to design airflow calculation for central cooling equipment 0692d10ae5 concluded merge from diverging local and origin adp_bf_branches 178f5da6b6 addressing first Jon W. comment re adp_bf review 18cf4138d8 Latest results. 49372e7ac8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 0a7b1f3a41 fixes to get_hvac_size_limits to ensure adp_bf_branch runs without error 18f106b82c descriptive comments on get_hvac_size_limits ce0994b905 / \ line extension + divisor in hvac_sizing.rb 50bb97246a Latest results. a7d7e4158f Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 8b94164910 successful? merge of latest master into adp_bf_method_design_shr to update changes re. negative elevation fix. looking thru modified files shows no merge conflict indicators (<<<, >>>). 237309723f updating comments on HVACSizingValues attributes to match master. No attributes added, only changes were in the comments next to each attribute 1d3a43a518 changing comments on get_nominal_speed method to match remote master 547cf7f838 removing :Design_SHR property from HVACSizingValues class definition, since it is no longer used c07cb17356 refactor to rename hvac_sizings.Design_SHR object property to local variable design_shr d373f6eb0c Latest results. 776661a963 manually resolved merge conflicts in results.csv 599ec246d4 resolved merge conflicts in measure.xml ba79c8ab1b adp_bf_method branch up to date w/ master, merge conflicts resolved manually, final commit before submitting PR for review 2de64ea1d7 last explanatory comment before marking adp_bf_method PR for review 14f36ebf42 removing puts statements before PR review 1edc822502 Latest results. 49fd105224 Re-enable test, remove files. e09009152c Latest results. 0b0cc26ee9 Merge branch 'master' into adp_bf_method_design_shr f598241990 correct hvac_sizing and removing duplicated HPXMLtoOpenStudio directory that was incorrectly copied to docs folder b78e17e5c5 First pass. 83d3094c38 hvac_sizing.rb, measure.xml, and docs updates after running RuboCop 4d5cecab82 remove unit test for Psychrometrics.CalculateSHR(), since test_error.xml is now running without error f660286106 test_error.xml running without failure. haven't inspected annual or timeseries results yet. change was to calculated A_o at rated conditions (using class variables in hvac.rb for IDB, IWB, and using psychrometrics.rb helper function for rated indoor clg humidity ratio at sea level barometric pressure (not sure pressure is correct, confirm w/ Jon?), and pass this into CoilAoFactor. CoilAoFactor should stay constant throughout the iteration for design airflow. 38cb97108a added files after git restore HPXMLtoOpenStudio to recover HPXMLtoOpenStudio folder lost on local 487c702b85 defined test_calculate_SHR() in hvac_sizing_test.rb 315916fa70 Latest results. 400a43f629 Temporarily disable test to get CI results. a887009ac1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 8478660e71 Latest results. c24117a415 Update name. ed3059d3b1 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into floor_height_above_grade 8f4b83daa6 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 308c1f7544 Fix error and minor refactoring. 3f8f26d77a confident in ADP/BF 1ca7c4a356 finished writing code for ADP/BF implementation. ADP/BF method is a better approach to calculating the design SHR and design airflow through the cooling coil for the following OS-HPXML equipment types: Central AC, A2A HP used for cooling, Mini-Split AC, and ducted MSHP used for cooling b177cb9866 more work on iteration for design airflow f0d925c051 more comments c721a0185b iteration for ADP/BF 26a55b36c6 fixed unit conversion on cool_cap_rated so that Psychrometrics.rb doesn't numerically fail. hvac_cooling_ap.rated_shr and hvac_cooling_shr showing 0.05 discrepancy. ask team if this is a problem? d37f8c146a using pre-existing coil ao factor stored in cooling additional properties to calculate design SHR. Cool Cap Design throwing undefined variable error in Psychrometrics.CalculateSHR 85b2e27f70 work on implementing ADP/BF. coil a_o factor already calculated in hvac.rb? 0391906f9b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into adp_bf_method_design_shr 74bb5facff removing pesky return 1.0 that shouldn't be there, preventing it from screwing things up when running OS CLI f9ed1b8a5f fixed typo in descriptive comments of psychrometrics.rb 79053154fe fixed typo in comments of CoilAoFactor method in psychrometrics.rb 1e3ef9a3b1 refactor add_cooling_system function variable input order convention to match add_heating_system function variable input order convention 2cdde89a4b renamed A_o from A_o rated because A_o is not a function of design vs. rated conditions c1a78271fd calculating A_o_rated with correct unit conversions and methods in psychometrics.rb af58345529 Translating E+ coil bypass factor method to recalculate cool_cap_design 6861e467a6 Merge branch 'master' into adp_bf_method_design_shr 2aca92f616 Committing comments for ADP/BF 0be1bc0f0a Latest results. 1c250ade59 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into nbr_vs_nocc_new_regressions 22ef795fa1 Reverting back to previous NBr/N_occ relations. 58b712adfd Latest results. 408c4b6f3a Test failures addressed. 0d7ce5cf9f New regression equations added from RECS 2020 for N_Bedrooms Vs N_Occupants - also segregating building types to higher granularity 7bc5dd7d36 Latest results. 2c4ac5e7c9 Merge branch 'floor_height_above_grade' of https://github.com/NREL/OpenStudio-HPXML into floor_height_above_grade 89c213c649 Small bugfix. c831575637 Latest results. 922d4aef56 Fix 10x tests when there are negative numbers. 70b6539925 Fix sample file, update Changelog.md. 8f0bae834a First pass on implementing floor height above grade as an input that can be used in the infiltration model for e.g. apartment units on upper levels. 49e998de65 hvac_sizing.rb af484e8b5a adding explanatory comments 82e23b660b Merge remote-tracking branch 'origin/master' into acca_manual_s 1ac11a24d6 adding comment on apply_equipment_adjustments 698aaf46a3 Committing pseudo_code_heat_pump_sizing.txt to branch OS_ACCA_Man_S_update git-subtree-dir: resources/hpxml-measures git-subtree-split: 997fbeec56b4a783606899a54575791c9c0a4137
bb2036facf Merge branch 'ev_batteries' into ev_schedules d7e8f282f7 Merge branch 'master' into ev_batteries 1d56ca3cac Merge pull request #1872 from NREL/fix_dl_detailed_results 4d4fc47066 Add test. 94ddd8329a Bugfix. 36350b91e0 Fixes possibility of missing surfaces in the results_design_load_details.csv output file. Bug introduced in #1836. 5d21764326 Merge remote-tracking branch 'origin/master' into ev_batteries 962797a7aa simplify access to vehicle objects when applying to model; some cleanup 76951e1802 Merge pull request #1868 from NREL/cfis_refactor 3d7ff588cf Latest results. 724ca3769a Update tests, final cleanup. fd0b299af2 Update changelog [ci skip] 99e0201a4f update measure.xml 58ef08bb15 Indent. d32fcfa621 Bugfix when no outdoor air control. be95d7ddd9 Bugfix for SupplementalFanRunsWithAirHandlerFan=true. Rename variables for clarity. d86c05086a Introduce ZoneTimestep into calculations. 8893f6b5b3 Bugfix. 1f5a98e1b4 Initial pass. Still need to resolve one diff and test further w/ shorter timesteps. 9e0f85fbcc Merge pull request #1866 from NREL/cfis_control_type b7efd03d1f Increase docs width [ci skip] c342b13d3e Latest results. 46be375a88 Update tests 55918cd068 Update changelog 24b5081d17 First pass on adding CFIS ControlType input. 6980e23d12 Merge pull request #1865 from NREL/cfis_suppl_fan_sync f604868918 Latest results. 83861d2afe Bugfix, cleanup. 3ad779428d Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into cfis_suppl_fan_sync 9112f440b9 Merge pull request #1862 from NREL/detailed_performance_autosizing_bugfix e3f4774a3c Latest results. 24ca6e442a Update Changelog [ci skip] 1e4ecf43c1 Latest results. ffc33cb2f4 Revert temp change. 1b5424919f First pass on new SupplementalFanRunsWithAirHandlerFan input for CFIS systems. 7ee7fb6fdb Latest results. 217d373546 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into detailed_performance_autosizing_bugfix 9332bad71e Merge pull request #1863 from NREL/cfis_oa_control 1d527a1143 added unit test, update Changelog.md 219d264362 Clarify emittance and solar absorptance inputs. [ci skip] c79ef9a131 Merge branch 'cfis_oa_control' of https://github.com/NREL/OpenStudio-HPXML into cfis_oa_control 06c45accbf Bugfix. a38d474e51 Latest results. 674ea6907c Latest results. 60e80ec157 When a CFIS system has no outdoor air control, include outdoor air during all heating/cooling runtime. ad3465f9ec Merge branch 'cfis_oa_control' of https://github.com/NREL/OpenStudio-HPXML into cfis_oa_control 2c9a13eefb Some code refactor/cleanup. e4fe01f5aa revert retention calculation. fd1414164b Latest results. 1556c50cf0 Update tests 47e4923e93 Bugfix. b2a64fc3f6 Merge branch 'cfis_oa_control' of https://github.com/NREL/OpenStudio-HPXML into cfis_oa_control 161f870902 Some initial code cleanup; no diffs expected. f3243c405f Latest results. 70a5f49fe5 Update test. deb2824e85 Initial scaffolding. Still need to use it in the energy model. bd7bb390a0 one more d7de7b8f00 update measures, and update retention as well 594ca339eb bugfix for autosizing detailed performance data with fractions git-subtree-dir: resources/hpxml-measures git-subtree-split: bb2036facf85e0d6cc3ecb6869fbe47268949fd7
…5dee5 3026165dee5 Merge branch 'ev_batteries' into ev_schedules bffc05be127 Schedule aggregation bug fix ff1791692aa Account for vehicles specified as EV batteries and as plug loads 532abc23698 Pull in latest HPXML schema changes to vehicles 67401df427d Merge remote-tracking branch 'origin/master' into ev_batteries 7452d706024 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries 5101e71d9ac Default schedules for EV batteries and EV plug loads 2f7c47554c5 Merge pull request #1876 from NREL/pthp_cfis bc1edd7f18a Add unit test. [ci skip] 6c1b7408fc8 Latest results. d8ae938c2d9 A little more [ci skip] 4e8dfbaea2d More clarification in docs [ci skip] c8be1968424 Fix docs. b0816f8737c Allow CFIS systems to be attached to, e.g., PTHPs and PTACs. ce0b009982e Merge pull request #1815 from NREL/os390 b21b555350c Update CI 25d02cff9e0 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os390 57d1cf7b068 Merge pull request #1699 from NREL/window_component_loads 3e275044be3 Latest results. 20a4d18eba7 Merge branch 'os390' of https://github.com/NREL/OpenStudio-HPXML into window_component_loads 6a2d473483e Merge pull request #1830 from NREL/os390_keep_site 8843d6cd809 Latest results. ce5a5e21408 Merge branch 'os390' of https://github.com/NREL/OpenStudio-HPXML into os390_keep_site 6372cb05db6 Latest results. fcc71e3e63a Try again 11f1c971370 Try manual OS docker build w/ E+ 24.2 3be703b42df Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os390 7b5ec04f785 Shouldn't need this anymore [ci skip] 9f2a57e9848 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os390 c4b533bde7c Clarify variable [ci skip] 0170f0a6764 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into os390 d3460f0cb6d Set keep site location information. [ci skip] 11be4d22596 update measure [ci skip] 1ee8c03d3fb Merge branch 'os390' of https://github.com/NREL/OpenStudio-HPXML into window_component_loads 544bd907d45 Update expected simulation message. [ci skip] 2a707115edf Update docs [ci skip] 5f075ca252a Update Changelog [ci skip] b4aa2b439d2 Update to OS 3.9.0 [ci skip] 5382bf116cf Improves window component load calculation, uses EnergyPlus improvements in NREL/EnergyPlus#10444. git-subtree-dir: resources/hpxml-measures git-subtree-split: 3026165dee5a97142e223297859c7a34e6ddf169
2204599f2b Use floating division to prevent rounding to zero git-subtree-dir: resources/hpxml-measures git-subtree-split: 2204599f2bc745b5cf5d04ea4b5f8fcc63690e0d
41ec1dbc1e No EV bug fix and formatting git-subtree-dir: resources/hpxml-measures git-subtree-split: 41ec1dbc1ed7852dc14f6e937294f9331c7c2475
…566f6 8c2182566f6 Merge remote-tracking branch 'origin/ev_batteries' into ev_schedules caf81147f92 Merge remote-tracking branch 'origin/master' into ev_batteries 271b4a14b32 Shrink docs image [ci skip] e6a3ccf2b78 Minor docs cleanup [ci skip] a2d97ef06e8 Fix formatting in docs [ci skip] 3d7eadebea5 Merge pull request #1888 from NREL/bump_version 4c2886fb6a7 Update to version 1.10.0 5bad046428e Merge pull request #1887 from NREL/mj_fwall_bugfix 858e244de10 Latest results. ec73fd620c8 Bugfix for foundation walls with non-integer values for depths/distances. 914d27c9f1f Update path for docs font removal when making zip package. [ci skip] fb6983a126e Merge pull request #1886 from NREL/gshp-pump-power 853aec0aed8 Latest results. 7f0c2c49b1a Settled on 80 W/ton for now based on internal discussion. May be further improved in the future. 0b8efb96268 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into gshp-pump-power cba77dd7c02 Merge pull request #1877 from NREL/afontani-gshp-fan-unit-bug de784031238 Latest results. fa811d483c0 Latest results. 4fbe983e805 Merge branch 'afontani-gshp-fan-unit-bug' of https://github.com/NREL/OpenStudio-HPXML into gshp-pump-power 855115bdb13 Add a bit of clarification [ci skip] 5910cd1639d First pass. 8588fcf012e Update geothermal loop sizing values too. 4bc989f2713 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into afontani-gshp-fan-unit-bug 284b6d2dc91 Update tests and changelog. ed85efc703e Reduce fan power for impact of the ductwork eb7ca22d2ab Merge pull request #1883 from NREL/os390final 9c413bcd8b3 Update changelog. 02a34e1f727 Final OS 3.9.0. Bump OS-HPXML version. 1f28857a136 Minor code refactor. 1cf80b30766 Move to title [ci skip] 55425593b74 Add copyright/trademark symbols [ci skip] 37eef9f9f46 Link to a few more products/companies [ci skip] c3af54f9476 Merge pull request #1882 from NREL/os390rc3 9ebac893022 Bump CI to rc3 d38fa18c857 Merge pull request #1881 from NREL/collapse_with_zones 19f81523d78 Update Changelog.md [ci skip] f8b2d81708e Latest results. 7bf3854ae8a Ensure that surfaces are still collapsed when HPXML Zones/Spaces are provided. This speeds up the simulations. 43be5d3dfa3 Merge pull request #1880 from NREL/furnace_eae 1ab5fe8244e Merge pull request #1873 from NREL/manualj_duct_tables e14ceec0c60 Removes a few straggling ElectricityAuxiliaryEnergy fields for furnace HPXMLs. 9a3fd1a98b8 Latest results. 35da9d7f14c change duct table number, configure it based on base case. f501f6d8fa0 Typo 0e9c02e44fa Factor out cooling conversions 86355d64672 Fix EIR units df056aab0e1 Remove kW conversion b60ebf184b8 Latest results. 0ed32733677 Update test outputs. d3bf2d4fdfd Bugfix. c51d6efeeab Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into manualj_duct_tables 8cebdb3fc9d Latest results. b0a5a35473d Fix docs. e4f29bd71ef Fix HPXML class bd9f7a494b8 Fix new HPXML. 43824d00872 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into manualj_duct_tables 832a817e032 First pass on optionally allowing Manual J default duct table factors to be used. Add remaining Bob Ross test files. git-subtree-dir: resources/hpxml-measures git-subtree-split: 8c2182566f6657340ace38e74f449b924633f575
aspeake
force-pushed
the
electric_vehicles
branch
from
f86ccca
to
3e3746f
Compare
aspeake
force-pushed
the
electric_vehicles
branch
from
3e3746f
to
5949046
Compare
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 Description
Introduce EVs, including vehicle and charging stock characterization, EV battery modeling updates, and charging schedule generation.
Companion PRs:
Checklist
Not all may apply:
openstudio tasks.rb update_measureshas been run