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.

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

Latest OS-HPXML #762

Draft
wants to merge 18 commits into
base: master
Choose a base branch
from
Draft

Latest OS-HPXML #762

wants to merge 18 commits into from

Conversation

shorowit
Copy link
Collaborator

@shorowit shorowit commented Jan 8, 2025

Pull Request Description

[description here]

Checklist

Not all may apply:

  • OS-HPXML git subtree has been pulled
  • 301validator.xml has been updated (reference EPvalidator.xml)
  • Sample files have been added/updated (openstudio tasks.rb update_hpxmls)
  • Tests have been added/updated (e.g., rulesets\tests and/or workflow/tests/*_test.rb)
  • Documentation has been updated
  • Changelog has been updated
  • openstudio tasks.rb update_measures has been run
  • No unexpected changes to simulation results on CI

0887d804d4 Update README.md
2efcd6b5b8 Merge pull request #1905 from NREL/airflow_rb_doc
749cd8a92c Update comment [ci skip]
7ad276049f Latest results.
2e4ed568e2 Revert to original approach for garage height.
5b425ef970 Bugfix.
8807d19a33 Minor cleanup.
7be36df4ea Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into airflow_rb_doc
07293380df Fix CI failure, finish code documentation.
f8d5ccb0b3 Merge pull request #1906 from NREL/pv_new_year
97c771059c Latest results.
869be44c63 Generate updated PV results for the new year.
6f8b8cad52 Merge branch 'airflow_rb_doc' of https://github.com/NREL/OpenStudio-HPXML into airflow_rb_doc
b3ab043a78 Remove Airflow::Duct class and some refactoring.
160b18bfec Latest results.
892657a7d3 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into airflow_rb_doc
91e0d7d338 Update PV test so we don't have to change the expected value every year.
2490ba1dca Address regression.
ae6bf1d1b5 Merge branch 'airflow_rb_doc' of https://github.com/NREL/OpenStudio-HPXML into airflow_rb_doc
ad7675e12b Latest results.
55fb654225 Fix comment
9f13cdab52 Use a constant.
99fdd889f7 Cleanup.
f0d1a57624 First pass on documenting airflow.rb; more to do.
34fce414bf Merge pull request #1901 from NREL/update_measure
d53251ab91 Merge pull request #1899 from NREL/whole-mf-bldg-zero-occupants
0d18829ab6 Use an md5hash instead to prevent confusion of having two version.rb files.
627e9dcfa0 Ensure BuildResidentialHPXML measure.xml and README.md are updated when the OS-HPXML version is bumped.
a6fbda7fa5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into whole-mf-bldg-zero-occupants
c38762eb90 Clarify CFIS definition [ci skip]
1ef1104323 Merge pull request #1896 from NREL/schedule_file_interpolation
934ddf42a9 Fix test.
4616266ebf Exclude pool/spa and include ceiling fan to match previous implementation.
e3547344d9 Merge branch 'whole-mf-bldg-zero-occupants' of https://github.com/NREL/OpenStudio-HPXML into whole-mf-bldg-zero-occupants
2ca07befda Bugfixes and more tests.
01b93fb883 Latest results.
b17f24ee76 Fix ASHRAE 140 runs.
bc1e205023 Fixes zero occupants specified for one unit in a whole MF building from being treated like zero occupants for every unit.
2444574cec Merge pull request #1898 from NREL/hers_outputs
794e01b33b Latest results.
2f1718ddbc Updates HERS test outputs (units, order of files) to match latest RESNET accreditation forms.
88c827785e Update changelog and measure.xml [ci skip]
2f42aaba48 Latest results.
cca5c80a00 Bugfix for when a detailed schedule is used with higher resolution (e.g., 10-min data) than the simulation timestep (e.g., 60-min).
2d8bf015b6 Remove some unused code I noticed in tasks.rb [ci skip]
3b7dabd640 Merge pull request #1895 from NREL/docs_water_heater
8068f153d2 Add Model.add_plant_loop() method.
2b64d9f800 Bugfix.
f7e65bee01 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into docs_water_heater
926c3dedc7 Added ruby documentation to waterheater.rb.
b5d8972e74 Bump version back to 1.10.0.
94d6687c2d Merge pull request #1891 from NREL/manual_j_more_improvements
59d9cdbac6 Update measure
172416f362 Switch version to 1.9.1 for release. Update docs/readme/changelog.
f206771b04 Latest results.
5e6784b5d5 Merge branch 'manual_j_more_improvements' of https://github.com/NREL/OpenStudio-HPXML into manual_j_more_improvements
72c55f7e73 fix bug while cleaningup
024d5007bf Latest results.
ee5e87e82a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into manual_j_more_improvements
0d1232c016 Merge branch 'manual_j_more_improvements' of https://github.com/NREL/OpenStudio-HPXML into manual_j_more_improvements
ac134c96f3 3-23 crawlspace wall height change
09fb00ce9e Merge pull request #1892 from NREL/buildreshpxml_docs_version
d968043c48 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into buildreshpxml_docs_version
1066943a60 Merge pull request #1894 from NREL/misc_refactor_cleanup
d250e33867 Latest results.
3dc5f7e3dd Missed one more.
dc4ecf707e Latest results.
13984347ef Merge branch 'misc_refactor_cleanup' of https://github.com/NREL/OpenStudio-HPXML into misc_refactor_cleanup
0d3207df51 Bugfix.
d08d7b6311 Latest results.
3c7fcabee2 Revert change.
c8573ecfc8 Bugfix.
37732581d2 Misc refactor/cleanup and minor bugfixes. Updates HPXML::has_fuels() to traverse the HPXML object for performance reasons (particularly important when running whole SFA/MF buildings).
db788d3286 Adds a test to ensure BuildResidentialHPXML measure docs links are updated when the OS-HPXML version is bumped.
08673f55c6 Latest results.
65d756929a fix typo
c5831f52e6 minor improvements
271b4a14b3 Shrink docs image [ci skip]
e6a3ccf2b7 Minor docs cleanup [ci skip]
a2d97ef06e Fix formatting in docs [ci skip]
3d7eadebea Merge pull request #1888 from NREL/bump_version
4c2886fb6a Update to version 1.10.0
5bad046428 Merge pull request #1887 from NREL/mj_fwall_bugfix
858e244de1 Latest results.

git-subtree-dir: hpxml-measures
git-subtree-split: 0887d804d404c2ca1890ee045d1a564279df618e
@shorowit shorowit self-assigned this Jan 8, 2025
@shorowit shorowit changed the base branch from master to ventfan_floating_point January 9, 2025 01:12
Base automatically changed from ventfan_floating_point to master January 9, 2025 18:28
shorowit and others added 12 commits January 22, 2025 14:06
dbb0606f64 Merge pull request #1919 from NREL/hpxml_class_multiple_versions
4959249a75 Merge pull request #1918 from NREL/output_meters
deb66cc881 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into output_meters
0186fb4cae Disallow commas in timeseries output requests, add test.
c77a9fd74d Bugfix.
96621f2618 Merge pull request #1920 from NREL/zone_design_load_docs
3aab71bdc1 Fixes missing ZoneID references in HVAC Zone Design Loads documentation. [ci skip]
6211ab7911 Allow multiple ERI, etc., program versions in the HPXML class for OS-ERI.
0137c05896 Typo [ci skip]
a68b5ec2f6 Allows requesting timeseries EnergyPlus output meters (e.g., `"--hourly MainsWater:Facility"`), similar to requesting EnergyPlus output variables.
459eeb3ed8 Merge pull request #1912 from NREL/hvac_sizing_bugfix
e0b65442b7 Latest results.
c09becbe5f remove gshp debug statement
2efb0f48a0 Add Clarity [ci skip]
ac6feef222 Merge pull request #1911 from NREL/update_measure2
f290788884 Just use the version string instead of the version.rb file, to prevent unnecessary updates (due to e.g. different line endings).
6a09622136 Merge pull request #1909 from NREL/bugfix_max_power_program
9d09aafefd Latest results.
7ca90210a5 Update changelog
f3a862a603 fix max power program
0111ed5aa5 Merge pull request #1908 from NREL/meta_measure_update
6980852c20 Small tweak to description, and apply to all methods that use this parameter [ci skip]
a36ad15619 Allow array of measures_dir in apply_measures function
d2983b6d5e Merge pull request #1907 from NREL/stoch_sched_csv_error_checking
65d145bb36 Address PR comment
7855187b22 Update HPXMLtoOpenStudio/resources/schedule_files/README.md
0d0a37ca72 Add schedules README [ci skip]
cb7da1122d Adds error-checking to the update_hpxmls task to ensure that when multiple HPXML sample files reference the same stochastic schedule CSV filename, the schedule each HPXML file would generate is identical.

git-subtree-dir: hpxml-measures
git-subtree-split: dbb0606f644e64fc54d8335b9569558f8cb54db1
…latest-os-hpml

# Conflicts:
#	Changelog.md
#	workflow/tests/base_results/EPA_Tests.csv
#	workflow/tests/base_results/real_homes.csv
#	workflow/tests/base_results/sample_files.csv
d9e1aff055 Merge pull request #1935 from NREL/neep_ashp_sample_files2
d2fde3254d Latest results.
245ce30576 Update HPXMLs.
9d59ea2226 Update sample files to use NEEP products that pass data quality checks.
663f682c22 Merge pull request #1930 from NREL/peak_electricity
4375a85e64 Update changelog [ci skip]
140dfe3443 Replace error-check with unit tests. Allow PV w/ MaxPowerOutput=0 to run successfully.
cac762051e Add total vs net error checking.
fabdb1a838 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into peak_electricity
1527bcde40 Merge pull request #1933 from NREL/schedules_performance
1ccdbe91d5 Latest results.
486ffc3276 Apply HPXML defaults for the entire building rather than calling individual defaulting methods. Should help prevent future bugs like vehicle.hours_per_week.
e1e98cd1df Merge branch 'peak_electricity' of https://github.com/NREL/OpenStudio-HPXML into peak_electricity
cf13591667 Revert this, it was needed.
cc5a9f20c8 Latest results.
8df6436ac5 Changes based on review comments. And a little cleanup.
5436664e9a A little more cleanup.
ce6c4e3b21 First pass on improving the runtime performance of generating stochastic schedules.
603a1ad5d2 Code simplification. This no longer needs to be an array.
f571428e4d Clean up changelog. [ci skip]
24f728e2df Update changelog [ci skip]
85d0402104 Latest results.
83071279c2 Merge branch 'peak_electricity' of https://github.com/NREL/OpenStudio-HPXML into peak_electricity
47362761af Add net peak electricity outputs.
9885ad83ac Latest results.
3cab4aaed5 Simplify outputs/meters.
46b801fe85 Latest results.
c57810266a Bugfix.
53924f95fc Bugfix.
3de1e19913 Revert debug
20714172b8 Bugfixes.
f11c534258 Bugfix.
692477bc80 Simplify ReportUtilityBills too.
dd1d6bdd6f Use custom meters for total electricity and net electricity, simplify code.
a784be6aa4 Merge pull request #1757 from NREL/ev_schedules
3e45c34722 Latest results.
1a72648ab5 Update changelog, docs, sample file name.
90948d52dc Some cleanup and formatting.
d84d5e86d6 Latest results.
26c6b0d832 Latest results.
a0cd8eb338 Merge pull request #1915 from NREL/schedules_v2
93fe562377 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_schedules
ed9269ef9a Merge pull request #1533 from NREL/ev_batteries
3f8d13ec90 Latest results.
e7f9caec1a Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
5c1f30d819 Merge pull request #1927 from NREL/bugfix_glass_block
1a3d1d9eac Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into bugfix_glass_block
97e8de070c Fix possible glass block error.
5673cc7726 Merge pull request #1925 from NREL/neep_ashp_sample_files
a234d81cf8 Latest results.
4a1e6ffef6 Update sample files to correspond with current NEEP ccASHP listings.
04d6d8a64f Add default value references, fix table footnotes. [ci skip]
b2a89e881e Merge pull request #1922 from NREL/fix-tcm-str-not-dbl
2b4dce026a Merge branch 'master' into fix-tcm-str-not-dbl
fe64eb4e62 Merge pull request #1921 from NREL/fix-2-day-partial-unavailable-period
e033ebd840 Add XeroHome [ci skip]
a563110bf6 Change tcm from string to double argument.
68ffb9f736 Update the changelog. [ci skip]
c1b2ca202a Refactor method and improve docs.
63afe4d590 Add unit tests demonstrating fix.
32593b30f0 Support 2 schedule rules for unavailable period less than 24 hours.
2b84101c75 Merge branch 'ev_schedules' into schedules_v2
8aba2a12c4 Merge branch 'ev_batteries' into ev_schedules
a1f48d8b73 Latest results.
6e2add64c6 Update reporting measure
2f6be2f52f Documentation updates. Removed some attributes that shouldn't be in the HPXML::Vehicle class. Renamed "Unmet Hours: Driving" to "Unmet Hours: EV Driving".
c5733d77b1 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
bf5776dcf4 Incorporate unavailability periods.
de91252a8f Latest results.
4d479fb4a6 Combine EV charging and discharging together
41d4f35f28 Add stochastic ev schededule to sample files
72878f9683 Latest results.
667630720b Allow optional ChargingLevel input for EV chargers. Latest HPXML schema.
84d557cc00 Latest results.
ad001b6ff0 Allow more fuel economy units for EVs. Fix documentation for EV plug load default kWh/year. Remove separate charging/discharging schedules. Some misc cleanup.
70edbf2cdb Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
5d06aca861 Latest results.
f7f00d9953 Merge branch 'ev_schedules' into schedules_v2
49adc61564 Typo fix and column name fix
dd268492b0 Update xml file name
8c3d3307e4 Merge branch 'ev_schedules' into schedules_v2
80e4d97b62 Merge branch 'ev_batteries' into ev_schedules
e9b3076a8b Latest results.
9a3f6350b8 Fix unit test
f717b9b4af Remove unused file
2e0e03c3a7 Update default assumptions for detailed EVs and EV plug loads.
6fd4f4fce8 Update hpxml and schedule for mf building
776d85574f Merge branch 'ev_schedules' into schedules_v2
916d87d1a6 Merge branch 'ev_batteries' into ev_schedules
60bc114b17 Fix schematron error
4eb1ca1f16 Merge branch 'ev_schedules' into schedules_v2
18b9afcfc8 Fixes for unit tests
543db3801d Latest results.
d8db876042 Remove byebug and fix tests
564f1f6a01 Relate the default miles/year and hours/week vehicle inputs.
960bf9287d Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
82224e3f92 Update descriptions of EV scheduules in docs
f8acc1eef3 Latest results.
50b15b909d Update some inline docs and argument descriptions; code cleanup.
6848a8615d Merge pull request #1916 from NREL/ev_batteries_reporting
4864b8b420 Latest results.
95960afc8a Clean up some comments [ci skip]
7e954de619 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries_reporting
0147a17fa4 Latest results.
4357d93d90 Bugfixes.
a8983fac50 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries_reporting
1c0cbcc1a4 Cleans up reporting measure code related to EVs. Adds EV energy use to utility bill calculations.
6fd196899d Ceiling fan bug fix
d1f2cfd733 Revert EV schedules attribute can_be_stochastic
9281736746 Fix BuildResidentialScheduleFile/tests
b6f4d12e47 Merge branch 'ev_batteries' into ev_schedules
45fca622e5 more test fixes
685101192a Update docs for latest EV schedules approach; fix outdated attribute
885c8ba5ef Merge branch 'ev_batteries' into ev_schedules
564bfb768e Update tests
495940d59f Revert back to combined EV charging and discharging schedules for 24-hour fractions, optional combined or split for schedule files.
b03246453b Update documentation related to Vehicles
ba4c8db594 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
f3f25e5174 Change EV schedule column names, update a sample file
522c4a0c3b Latest results.
3b85a53730 Custom meter to include EV charging with electricity meter and peak power calculation; more specific handling of storage variables added and removed from electricity fuel output.
3c76f69351 Remove hardcoded index from test
d488e4cfad Create occupancy schedule upfront
b360063bad remove bybug and update schedules
c448160ab9 Conditionally generate plug load and garage lighting schedule
9a02a07c64 Commit schedule file changes
57613bfcc0 Generate schedules only for things that exist
04ca92e07e Latest results.
7f466bf8bf Latest results.
e545ef1516 Add the FractionChargedLocation element to the sample files.
adfdd1f58f Oops, lost this `return` too. And update CI test.
cd38331234 Oops, last the `return`.
c1721d09cf Fixed error if a non-BEV vehicle is in an HPXML file (added base-vehicle-multiple.xml). Moved warnings from ruby to Schematron. Fixed documentation/schematron schedule element names and other misc cleanup.
ca177ef4d6 Latest results.
bf378b8574 Update tests to account for new EV fraction charged at home default.
23c4f1c22e Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
75e75ed5c9 Prevent empty Battery fields in HPXML for Vehicles; better EV charging fraction default.
c9b078d9d4 Latest results.
6cd64a04cc Merge remote-tracking branch 'origin/master' into ev_batteries
885197e29f Use normalized schedules for EV charging and discharging.
0a1b6aa8b9 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
0dcda091b2 Restrict number of BEVs in schematron.
a3283a67fa Latest results.
7be4e1034b Update vehicles sample file names.
0c4e705d34 Require charging and discharging schedules for EVs, but a single schedule for home batteries; add back EV plug load default schedules that differ from EV default schedules.
8c6e275384 Docs and warnings cleanup for EVs; new check for unexpected vehicle type.
ed998a7865 Set up Vehicles HPXML method to allow for other vehicle types.
9337c3b81b Update documentation related to Vehicles.
17cf3de71c Update shematron for Vehicle fields.
0ce500f9ba Refactor method to generate battery columns in schedule files.
1bf1a41b29 Fix typos
9457cfa18d Merge remote-tracking branch 'origin/master' into ev_batteries
55d09f02db More updates stemming from EV BuildResidentialHPXML argument changes.
2349294677 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
deb1c22c7c Update BuildResidentialHPXML measure args.
0414143094 Latest results.
9b24b18cc2 Minor unrelated improvement to make sure all HPXMLs with garages get assigned garage doors.
1970d68117 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_schedules
42be41782c Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
c6bd4677a3 Only generate EV related schedule columns if EV is present
5769f964a7 Fix git diff command
c592ec74a4 --stat overrides --exit-code, so need to use two separate calls
48a5fd4499 Final cleanup/revert.
112553b93e Add checks for schedule CSVs
ec7b7902bc sigh
addc070a67 Updated the wrong one
06b6e44ee4 Oops.
f18ec530f1 Debug CI failure
45d14051a9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_schedules
b81f29d34b Rever allowing duplicate columns
6e963ae58f Fix schedule test
7b37014102 update measures
d4bcffa95f Merge branch 'ev_batteries' into ev_schedules
7b192742f6 Final cleanup and verified restoration of functionality
2f1f76d131 Rename and reorder
bea57ba859 Rename and reorder
30ff4a7c50 Refactor schedule generator
307dad078a Latest results.
f49ce9ace5 Address more warnings for workflow tests.
5070b3d231 Catch unmet driving hours warning in workflow tests.
5ed14951cc Fix warning check in workflow tests.
0bff0a9979 Clean up measure and test code for EVs and chargers
39492f37df Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
c6db1aceb2 Allow EV charger without an EV battery.
d8605a906c Latest results.
d9ffc48fc7 Fix schematron check for EV charging location.
0ff6acbe05 Update Changelog.
4892769672 Merge remote-tracking branch 'origin/master' into ev_batteries
35104b21b8 Remove unused sample xml.
792f79ea28 Update schematron for BEVs and chargers.
5e5e107c4f Test for multiple battery types, EV and home.
e444f74b08 New unit tests for EV and charger default values.
127e47cf90 Update warning message
40ad8e8916 Merge branch 'ev_batteries' into ev_schedules
d44ac9962b Fix incorrect if statement in resilience reporting.
2292c06fd4 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
4776c31c92 Update docs and inline comments for EVs and chargers; remove roundtrip EV efficiency argument; update some constants.
9af936f2dd Latest results.
922cdea3e1 Ensure only one EV ruleset charging or discharging schedule is generated.
83d9148fb7 Refactor calculation of effective and rated EV discharge power. Update default EV schedules.
b8c6ab50cc Clarify argument descriptions for EV battery and EV plug load.
2c84e016d0 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
23edb3036e Move logic to request EV discharge energy output; throw warning for unmet driving hours.
c27fde0509 Latest results.
f0976f0371 Merge remote-tracking branch 'origin/master' into ev_batteries
8c2772e0fd Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
d16f0d11db Drop vehicle type output and move unmet driving hours to UHT; add test for EV with unmet hours.
30da3d89f4 Allow override when duplicate column names exist.
1150640698 Fill in function signatures
71cdc88d73 Latest results.
22344b0e81 Set EV rated power output during model generation using  miles, hours, and efficiency.
859d4f5128 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
4cdcad3b0d Add schematron rules for EVs; drop discharge power input for EVs.
313b6d6187 Add unavailable periods entry for new columns
bcd352f078 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_schedules
e0b8da9bee Latest results.
0c5982fbaa Fixed CI failure? And some code cleanup.
dae014e1e9 A little cleanup.
e461f260d0 Fixed CI failures?
81fa92849e Accommodate new output.
1c202296c8 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
57e820f750 Update measures, fix CI error.
5d3eeae554 Always load EV discharge energy variable to adjust electricity meter.
d0bbdd47ae Add check to avoid always trying to report unmet driving hours
8b29eabca5 New EMS variable to track unmet driving hours, report with Vehicle Type outputs.
8c2182566f Merge remote-tracking branch 'origin/ev_batteries' into ev_schedules
caf81147f9 Merge remote-tracking branch 'origin/master' into ev_batteries
41ec1dbc1e No EV bug fix and formatting
2204599f2b Use floating division to prevent rounding to zero
3026165dee Merge branch 'ev_batteries' into ev_schedules
bffc05be12 Schedule aggregation bug fix
ff1791692a Account for vehicles specified as EV batteries and as plug loads
532abc2369 Pull in latest HPXML schema changes to vehicles
67401df427 Merge remote-tracking branch 'origin/master' into ev_batteries
7452d70602 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
5101e71d9a Default schedules for EV batteries and EV plug loads
bb2036facf Merge branch 'ev_batteries' into ev_schedules
d7e8f282f7 Merge branch 'master' into ev_batteries
5d21764326 Merge remote-tracking branch 'origin/master' into ev_batteries
962797a7aa simplify access to vehicle objects when applying to model; some cleanup
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
59d55948ad discard EMS for offsetting EV discharge energy and handle it directly in the reporting measure
cbc7fa118f Bugfix.
9c373dfc46 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
86144f9da7 Merge branch 'ev_batteries' into ev_schedules
d15baa1866 Output EV occupant occupancy
b102371faf Handle hours per week
3c867be6e4 Remove epw arguments
1198abdd6e pull in latest HPXML schema
5230cc0ad3 fix bug from merge conflict
d78b0aed6c Merge remote-tracking branch 'origin/ev_batteries' into ev_schedules
8cc6c937db Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
50a8c47d63 prevent EVs modeled with a plug load and a battery at the same time
1e89f06000 Latest results.
357509ed95 fixes for timeseries tests of EVs
ed8cc5b1c9 Merge remote-tracking branch 'origin/master' into ev_batteries
14f026ec7b address unit test failures for EV batteries
aaecf51607 update in-line documentation for vehicles and batteries
52d07ddf3f Fix unit tests for EV batteries
d591cad767 Merge remote-tracking branch 'origin/master' into ev_batteries
a5a3fc7fa9 Fix merge conflict
7d04943785 Pull in latest HPXML schema for EVs
ea3d06f2f6 Merge remote-tracking branch 'origin/master' into ev_batteries
25d24d5a84 Merge branch 'ev_batteries' into ev_schedules
fd0dd492de Binary occupancy
d0a554f749 Apply rubocop
b2d226a606 Fix bug iniitalizing DBT sensor
d08ba63913 Merge branch 'ev_batteries' into ev_schedules
d44e1bcfea Handle schedule conflict
2bfc0f7b23 Fix for EV discharge offset object when EV location is garage
ce9ff761e0 Merge branch 'ev_batteries' into ev_schedules
3291f9c659 Write EV fraction charged at home to HPXML
891f6095af Introduce miles/yr and hours/wk arguments for EVs, calculate the effective discharge power
d377d3c678 Merge branch 'ev_batteries' into ev_schedules
0c8861cf6e Pull in latest Vehicles changes in HPXML schema, update HPXML classes as needed; expose fuel economy and vehicle miles traveled args
9c31908f12 Merge remote-tracking branch 'origin/master' into ev_batteries
d5db465f20 Fix test and read from HPXML
be21d3c021 Merge branch 'ev_batteries' into ev_schedules
19740a71b2 Generate EV schedules
2432bfb168 EMS program to adjust effective EV discharge power and offset that discharge power for reporting
a4135347c8 Update reporting measure to output EV energy
b1ef026fc6 Generate an ELCD object for each EV battery
5d21e32342 Update EV arguments for latest approach to argument handling
3228c7ae14 Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
b86a506dbe Merge remote-tracking branch 'origin/master' into ev_batteries
e279ea4426 Latest results.
cefa4e2873 Merge remote-tracking branch 'origin/master' into ev_batteries
35e8be48fd fix failing tests for ev batteries
bd3fbfe6f4 Merge remote-tracking branch 'origin/master' into ev_batteries
6fbd4f57cc update unit tests for EVs and chargers; apply rubocop
1effbc8297 Merge remote-tracking branch 'origin/master' into ev_batteries
f6b88a304f Refine inputs for EV battery and charger, update tests
0056e2c66d Merge branch 'ev_batteries' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
22f00b2e2f Merge remote-tracking branch 'origin/master' into ev_batteries
61d39b6736 Seperate EVs from batteries and leverage existing EV charger fields
dd4d5cfffa Merge remote-tracking branch 'origin/master' into ev_batteries
2a9b7bb670 Latest results.
374aae8500 fix test for battery log message
357ba18dec Merge remote-tracking branch 'origin/master' into ev_batteries
da8dc17703 update log message tests for batteries
9db3aebb31 add missing ev battery schedule for tests
52bc3ab47b Merge remote-tracking branch 'origin/master' into ev_batteries
8f33e3d055 initial tests for ev batteries
01437d08f7 always require schedule when modeling ev batteries
5c36fcb148 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into ev_batteries
210c463549 make ev_battery_preset argument optional
4f1a37e0f8 update how battery ids are assigned in xml
744ad6638c stub out defaults for EV batteries
3f94374153 allow one EV and one non-EV battery in schema
08c8c5a2b6 fix ev battery schedule generation, generalize for ev and non-ev battery schedules
36492fbf17 custom schedule columns for EV batteries
7b651b0136 new arguments and method to write EV battery to xml

git-subtree-dir: hpxml-measures
git-subtree-split: d9e1aff05595d7c79f41b9b39865c043c65a0678
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant