diff --git a/BuildResidentialHPXML/measure.xml b/BuildResidentialHPXML/measure.xml
index 7ca4ef9098..458ce9eef5 100644
--- a/BuildResidentialHPXML/measure.xml
+++ b/BuildResidentialHPXML/measure.xml
@@ -3,8 +3,8 @@
3.1
build_residential_hpxml
a13a8983-2b01-4930-8af2-42030b6e4233
- 8dfdc271-772e-46a3-a611-71ca703a96c2
- 2024-10-14T23:23:50Z
+ 8c76d707-3a76-4e27-a6d6-d550938a8e4a
+ 2024-10-17T23:34:54Z
2C38F48B
BuildResidentialHPXML
HPXML Builder
@@ -5510,6 +5510,133 @@
false
false
+
+ ev_battery_present
+ Electric Vehicle: Present
+ Whether there is an electric vehicle battery present. Cannot be included if an electric vehicle is modeled as a plug load as specified by the `misc_plug_loads_vehicle_present` argument.
+ Boolean
+ false
+ false
+ false
+
+
+ true
+ true
+
+
+ false
+ false
+
+
+
+
+ ev_battery_discharge_power
+ Electric Vehicle: Rated Battery Power Output
+ The rated power output of the EV battery. If not provided, the OS-HPXML default is used.
+ Double
+ W
+ false
+ false
+
+
+ ev_battery_capacity
+ Electric Vehicle: Nominal Battery Capacity
+ The nominal capacity of the EV battery. If not provided, the OS-HPXML default is used.
+ Double
+ kWh
+ false
+ false
+
+
+ ev_battery_usable_capacity
+ Electric Vehicle: Usable Battery Capacity
+ The usable capacity of the EV battery. If not provided, the OS-HPXML default is used.
+ Double
+ kWh
+ false
+ false
+
+
+ ev_energy_efficiency
+ Electric Vehicle: Energy Efficiency
+ The efficiency of the EV. If not provided, the OS-HPXML default is used.
+ Double
+ kWh/mile
+ false
+ false
+
+
+ ev_miles_per_year
+ Electric Vehicle: Miles Traveled
+ The annual miles traveled by the EV.
+ Double
+ miles
+ false
+ false
+
+
+ ev_hours_per_week
+ Electric Vehicle: Hours Driven per Week
+ The weekly hours traveled by the EV.
+ Double
+ hours
+ false
+ false
+
+
+ ev_fraction_charged_home
+ Electric Vehicle: Fraction Charged at Home
+ The fraction charging energy provided by the at-home charger.
+ Double
+ false
+ false
+
+
+ ev_charger_present
+ Electric Vehicle Charger: Present
+ Whether there is an electric vehicle charger present.
+ Boolean
+ false
+ false
+ false
+
+
+ true
+ true
+
+
+ false
+ false
+
+
+
+
+ ev_charger_power
+ Electric Vehicle Charger: Rated Charger Power Output
+ The rated power output of the EV charger. If not provided, the OS-HPXML default is used.
+ Double
+ W
+ false
+ false
+
+
+ ev_charger_location
+ Electric Vehicle Charger: Location
+ The space type for the EV charger. If not provided, the OS-HPXML default is used.
+ Choice
+ false
+ false
+
+
+ garage
+ garage
+
+
+ outside
+ outside
+
+
+
battery_num_bedrooms_served
Battery: Number of Bedrooms Served
@@ -6734,7 +6861,7 @@
misc_plug_loads_vehicle_present
Misc Plug Loads: Vehicle Present
- Whether there is an electric vehicle.
+ Whether there is an electric vehicle. Cannot be included if an electric vehicle is modeled as a battery as specified by the `ev_battery_present` argument.
Boolean
true
false
@@ -7527,7 +7654,7 @@
README.md
md
readme
- 25110074
+ 129D508F
README.md.erb
@@ -7544,7 +7671,7 @@
measure.rb
rb
script
- F2C64E58
+ 120CB23B
constants.rb
@@ -7558,11 +7685,2033 @@
resource
E50F00EB
+
+ extra_files/base-mf.osm
+ osm
+ test
+ DC2324C6
+
+
+ extra_files/base-mf.xml
+ xml
+ test
+ 2D9C55D7
+
+
+ extra_files/base-mf2.osm
+ osm
+ test
+ 9DF30DA0
+
+
+ extra_files/base-mf2.xml
+ xml
+ test
+ 81F437B6
+
+
+ extra_files/base-mf3.osm
+ osm
+ test
+ 422A1ADB
+
+
+ extra_files/base-mf3.xml
+ xml
+ test
+ DB1162E3
+
+
+ extra_files/base-mf4.osm
+ osm
+ test
+ 9A89566E
+
+
+ extra_files/base-mf4.xml
+ xml
+ test
+ B0FEBD16
+
+
+ extra_files/base-sfa.osm
+ osm
+ test
+ 2AD7CD1F
+
+
+ extra_files/base-sfa.xml
+ xml
+ test
+ D7191682
+
+
+ extra_files/base-sfa2.osm
+ osm
+ test
+ 09C8D52B
+
+
+ extra_files/base-sfa2.xml
+ xml
+ test
+ 0795D835
+
+
+ extra_files/base-sfa3.osm
+ osm
+ test
+ 0D6FCC50
+
+
+ extra_files/base-sfa3.xml
+ xml
+ test
+ 45D874D3
+
+
+ extra_files/base-sfd-header-no-duplicates.osm
+ osm
+ test
+ 497C86EC
+
+
+ extra_files/base-sfd-header-no-duplicates.xml
+ xml
+ test
+ 6C485ADC
+
+
+ extra_files/base-sfd-header.osm
+ osm
+ test
+ 04CAF594
+
+
+ extra_files/base-sfd-header.xml
+ xml
+ test
+ 71957B88
+
+
+ extra_files/base-sfd.osm
+ osm
+ test
+ 97E587F2
+
+
+ extra_files/base-sfd.xml
+ xml
+ test
+ E0E67F89
+
+
+ extra_files/base-sfd2.osm
+ osm
+ test
+ CC96AA45
+
+
+ extra_files/base-sfd2.xml
+ xml
+ test
+ 62CD104A
+
+
+ extra_files/error-ambient-with-garage.osm
+ osm
+ test
+ 278C4891
+
+
+ extra_files/error-bills-args-not-all-same-size.osm
+ osm
+ test
+ 18E42ED4
+
+
+ extra_files/error-conditioned-attic-with-one-floor-above-grade.osm
+ osm
+ test
+ C0D144BA
+
+
+ extra_files/error-cooling-perf-data-not-all-same-size.osm
+ osm
+ test
+ 639EF65F
+
+
+ extra_files/error-cooling-perf-data-not-all-specified.osm
+ osm
+ test
+ 84B47C66
+
+
+ extra_files/error-cooling-system-and-heat-pump.osm
+ osm
+ test
+ 77604CC9
+
+
+ extra_files/error-dhw-indirect-without-boiler.osm
+ osm
+ test
+ 81289A87
+
+
+ extra_files/error-different-simulation-control.osm
+ osm
+ test
+ 5484F749
+
+
+ extra_files/error-different-software-program.osm
+ osm
+ test
+ 1AB67CE2
+
+
+ extra_files/error-emissions-args-not-all-same-size.osm
+ osm
+ test
+ 689DE100
+
+
+ extra_files/error-emissions-args-not-all-specified.osm
+ osm
+ test
+ DACBE97D
+
+
+ extra_files/error-emissions-natural-gas-args-not-all-specified.osm
+ osm
+ test
+ 7A9FFBA0
+
+
+ extra_files/error-garage-too-deep.osm
+ osm
+ test
+ 72E06D18
+
+
+ extra_files/error-garage-too-wide.osm
+ osm
+ test
+ D55490BC
+
+
+ extra_files/error-heating-perf-data-not-all-same-size.osm
+ osm
+ test
+ C6505674
+
+
+ extra_files/error-heating-perf-data-not-all-specified.osm
+ osm
+ test
+ B74F9F0D
+
+
+ extra_files/error-heating-system-and-heat-pump.osm
+ osm
+ test
+ 5F53F62D
+
+
+ extra_files/error-hip-roof-and-protruding-garage.osm
+ osm
+ test
+ FA969035
+
+
+ extra_files/error-invalid-aspect-ratio.osm
+ osm
+ test
+ E8EE64CD
+
+
+ extra_files/error-invalid-door-area.osm
+ osm
+ test
+ 87D737A3
+
+
+ extra_files/error-invalid-garage-protrusion.osm
+ osm
+ test
+ 012228F0
+
+
+ extra_files/error-invalid-window-aspect-ratio.osm
+ osm
+ test
+ 0E78BA81
+
+
+ extra_files/error-mf-all-adiabatic-walls.osm
+ osm
+ test
+ 8C7EA560
+
+
+ extra_files/error-mf-bottom-crawlspace-zero-foundation-height.osm
+ osm
+ test
+ B1751699
+
+
+ extra_files/error-mf-conditioned-attic.osm
+ osm
+ test
+ A2B22742
+
+
+ extra_files/error-mf-no-building-num-units.osm
+ osm
+ test
+ A7FEBCD8
+
+
+ extra_files/error-mf-two-stories.osm
+ osm
+ test
+ 673B9AF2
+
+
+ extra_files/error-negative-foundation-height.osm
+ osm
+ test
+ 42E6DF16
+
+
+ extra_files/error-power-outage-args-not-all-same-size.osm
+ osm
+ test
+ 8331C67B
+
+
+ extra_files/error-power-outage-window-natvent-invalid.osm
+ osm
+ test
+ 206A8BE7
+
+
+ extra_files/error-protruding-garage-under-gable-roof.osm
+ osm
+ test
+ 2B85260B
+
+
+ extra_files/error-rim-joist-assembly-r-but-no-height.osm
+ osm
+ test
+ 0F1349A6
+
+
+ extra_files/error-rim-joist-height-but-no-assembly-r.osm
+ osm
+ test
+ F470BE47
+
+
+ extra_files/error-same-emissions-scenario-name.osm
+ osm
+ test
+ C2032CE0
+
+
+ extra_files/error-same-utility-bill-scenario-name.osm
+ osm
+ test
+ 1F09F29D
+
+
+ extra_files/error-second-heating-system-but-no-primary-heating.osm
+ osm
+ test
+ 4673B2FF
+
+
+ extra_files/error-second-heating-system-ducted-with-ducted-primary-heating.osm
+ osm
+ test
+ 295C68BC
+
+
+ extra_files/error-sfa-above-apartment.osm
+ osm
+ test
+ 4B57F086
+
+
+ extra_files/error-sfa-all-adiabatic-walls.osm
+ osm
+ test
+ 183E2B16
+
+
+ extra_files/error-sfa-below-apartment.osm
+ osm
+ test
+ 33434CED
+
+
+ extra_files/error-sfa-no-building-num-units.osm
+ osm
+ test
+ 86CC6459
+
+
+ extra_files/error-sfa-no-non-adiabatic-walls.osm
+ osm
+ test
+ B8E94C17
+
+
+ extra_files/error-sfd-adiabatic-walls.osm
+ osm
+ test
+ 04639620
+
+
+ extra_files/error-sfd-conditioned-basement-zero-foundation-height.osm
+ osm
+ test
+ E658C7AB
+
+
+ extra_files/error-sfd-with-shared-system.osm
+ osm
+ test
+ FCA895AD
+
+
+ extra_files/error-too-many-floors.osm
+ osm
+ test
+ C5895AC1
+
+
+ extra_files/error-vented-attic-with-zero-floor-insulation.osm
+ osm
+ test
+ AB024019
+
+
+ extra_files/error-vented-attic-with-zero-floor-insulation.xml
+ xml
+ test
+ 2C6F49CB
+
+
+ extra_files/error-zero-number-of-bedrooms.osm
+ osm
+ test
+ 1DA9DBAD
+
+
+ extra_files/extra-auto-duct-locations.osm
+ osm
+ test
+ F5DF7394
+
+
+ extra_files/extra-auto-duct-locations.xml
+ xml
+ test
+ A268BF73
+
+
+ extra_files/extra-auto.osm
+ osm
+ test
+ 3B81A9CA
+
+
+ extra_files/extra-auto.xml
+ xml
+ test
+ 0D2FBFEE
+
+
+ extra_files/extra-battery-attic.osm
+ osm
+ test
+ 6A1AC944
+
+
+ extra_files/extra-battery-attic.xml
+ xml
+ test
+ 36C31F84
+
+
+ extra_files/extra-battery-crawlspace.osm
+ osm
+ test
+ 02B1C140
+
+
+ extra_files/extra-battery-crawlspace.xml
+ xml
+ test
+ 038DF357
+
+
+ extra_files/extra-bills-fossil-fuel-rates.osm
+ osm
+ test
+ 75D81BA9
+
+
+ extra_files/extra-bills-fossil-fuel-rates.xml
+ xml
+ test
+ B58ACD80
+
+
+ extra_files/extra-detailed-performance-autosize.osm
+ osm
+ test
+ 27AB6264
+
+
+ extra_files/extra-detailed-performance-autosize.xml
+ xml
+ test
+ 9677A4BA
+
+
+ extra_files/extra-dhw-solar-latitude.osm
+ osm
+ test
+ E6B3971B
+
+
+ extra_files/extra-dhw-solar-latitude.xml
+ xml
+ test
+ FF4781A2
+
+
+ extra_files/extra-ducts-attic.osm
+ osm
+ test
+ 12DF7373
+
+
+ extra_files/extra-ducts-attic.xml
+ xml
+ test
+ E0E67F89
+
+
+ extra_files/extra-ducts-crawlspace.osm
+ osm
+ test
+ 03A65FCD
+
+
+ extra_files/extra-ducts-crawlspace.xml
+ xml
+ test
+ 83FB6851
+
+
+ extra_files/extra-emissions-fossil-fuel-factors.osm
+ osm
+ test
+ 77533693
+
+
+ extra_files/extra-emissions-fossil-fuel-factors.xml
+ xml
+ test
+ 0E0445DD
+
+
+ extra_files/extra-enclosure-atticroof-conditioned-eaves-gable.osm
+ osm
+ test
+ 0A24351E
+
+
+ extra_files/extra-enclosure-atticroof-conditioned-eaves-gable.xml
+ xml
+ test
+ DD86F5FC
+
+
+ extra_files/extra-enclosure-atticroof-conditioned-eaves-hip.osm
+ osm
+ test
+ C7E6043E
+
+
+ extra_files/extra-enclosure-atticroof-conditioned-eaves-hip.xml
+ xml
+ test
+ AFA02798
+
+
+ extra_files/extra-enclosure-garage-atticroof-conditioned.osm
+ osm
+ test
+ 7CEE9FC6
+
+
+ extra_files/extra-enclosure-garage-atticroof-conditioned.xml
+ xml
+ test
+ E97474C8
+
+
+ extra_files/extra-enclosure-garage-partially-protruded.osm
+ osm
+ test
+ A8F3C48B
+
+
+ extra_files/extra-enclosure-garage-partially-protruded.xml
+ xml
+ test
+ 19E23FEB
+
+
+ extra_files/extra-enclosure-windows-shading.osm
+ osm
+ test
+ D39704FE
+
+
+ extra_files/extra-enclosure-windows-shading.xml
+ xml
+ test
+ 4D7F0068
+
+
+ extra_files/extra-ev-battery.osm
+ osm
+ test
+ AD2E9915
+
+
+ extra_files/extra-ev-battery.xml
+ xml
+ test
+ 303F7957
+
+
+ extra_files/extra-gas-hot-tub-heater-with-zero-kwh.osm
+ osm
+ test
+ 23B4227A
+
+
+ extra_files/extra-gas-hot-tub-heater-with-zero-kwh.xml
+ xml
+ test
+ C17C1AF6
+
+
+ extra_files/extra-gas-pool-heater-with-zero-kwh.osm
+ osm
+ test
+ 814EB590
+
+
+ extra_files/extra-gas-pool-heater-with-zero-kwh.xml
+ xml
+ test
+ 4EBAF8C6
+
+
+ extra_files/extra-iecc-zone-different-than-epw.osm
+ osm
+ test
+ FFA4E9A0
+
+
+ extra_files/extra-iecc-zone-different-than-epw.xml
+ xml
+ test
+ AEDD78B8
+
+
+ extra_files/extra-mf-ambient.osm
+ osm
+ test
+ DF96360C
+
+
+ extra_files/extra-mf-ambient.xml
+ xml
+ test
+ F47262CE
+
+
+ extra_files/extra-mf-atticroof-flat.osm
+ osm
+ test
+ 7B04B26E
+
+
+ extra_files/extra-mf-atticroof-flat.xml
+ xml
+ test
+ C2BA2C16
+
+
+ extra_files/extra-mf-atticroof-vented.osm
+ osm
+ test
+ 3B22FCCF
+
+
+ extra_files/extra-mf-atticroof-vented.xml
+ xml
+ test
+ ABB84E86
+
+
+ extra_files/extra-mf-eaves.osm
+ osm
+ test
+ 523CBE29
+
+
+ extra_files/extra-mf-eaves.xml
+ xml
+ test
+ 8066D42C
+
+
+ extra_files/extra-mf-exterior-corridor.osm
+ osm
+ test
+ E6E8A97B
+
+
+ extra_files/extra-mf-exterior-corridor.xml
+ xml
+ test
+ E28D25AB
+
+
+ extra_files/extra-mf-rear-units.osm
+ osm
+ test
+ AA2BC1D3
+
+
+ extra_files/extra-mf-rear-units.xml
+ xml
+ test
+ E28D25AB
+
+
+ extra_files/extra-mf-slab-left-bottom-rear-units.osm
+ osm
+ test
+ A1F41DBF
+
+
+ extra_files/extra-mf-slab-left-bottom-rear-units.xml
+ xml
+ test
+ A86DC242
+
+
+ extra_files/extra-mf-slab-left-bottom.osm
+ osm
+ test
+ 742726E7
+
+
+ extra_files/extra-mf-slab-left-bottom.xml
+ xml
+ test
+ C2070599
+
+
+ extra_files/extra-mf-slab-left-middle-rear-units.osm
+ osm
+ test
+ 2165DD0B
+
+
+ extra_files/extra-mf-slab-left-middle-rear-units.xml
+ xml
+ test
+ 34AF50AC
+
+
+ extra_files/extra-mf-slab-left-middle.osm
+ osm
+ test
+ 88D22A80
+
+
+ extra_files/extra-mf-slab-left-middle.xml
+ xml
+ test
+ E28D25AB
+
+
+ extra_files/extra-mf-slab-left-top-rear-units.osm
+ osm
+ test
+ 2AB1DD41
+
+
+ extra_files/extra-mf-slab-left-top-rear-units.xml
+ xml
+ test
+ 34AF50AC
+
+
+ extra_files/extra-mf-slab-left-top.osm
+ osm
+ test
+ CC03742E
+
+
+ extra_files/extra-mf-slab-left-top.xml
+ xml
+ test
+ E28D25AB
+
+
+ extra_files/extra-mf-slab-middle-bottom-rear-units.osm
+ osm
+ test
+ 088EDD41
+
+
+ extra_files/extra-mf-slab-middle-bottom-rear-units.xml
+ xml
+ test
+ D9E4F562
+
+
+ extra_files/extra-mf-slab-middle-bottom.osm
+ osm
+ test
+ 6FC38207
+
+
+ extra_files/extra-mf-slab-middle-bottom.xml
+ xml
+ test
+ 366564D1
+
+
+ extra_files/extra-mf-slab-middle-middle-rear-units.osm
+ osm
+ test
+ 11EE26A0
+
+
+ extra_files/extra-mf-slab-middle-middle-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-slab-middle-middle.osm
+ osm
+ test
+ 9CFFECA8
+
+
+ extra_files/extra-mf-slab-middle-middle.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-slab-middle-top-rear-units.osm
+ osm
+ test
+ 530C1EFE
+
+
+ extra_files/extra-mf-slab-middle-top-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-slab-middle-top.osm
+ osm
+ test
+ 90484D2A
+
+
+ extra_files/extra-mf-slab-middle-top.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-slab-rear-units.osm
+ osm
+ test
+ 9927F9B5
+
+
+ extra_files/extra-mf-slab-rear-units.xml
+ xml
+ test
+ A86DC242
+
+
+ extra_files/extra-mf-slab-right-bottom-rear-units.osm
+ osm
+ test
+ 1D2B5CA3
+
+
+ extra_files/extra-mf-slab-right-bottom-rear-units.xml
+ xml
+ test
+ D9E4F562
+
+
+ extra_files/extra-mf-slab-right-bottom.osm
+ osm
+ test
+ 92E463CD
+
+
+ extra_files/extra-mf-slab-right-bottom.xml
+ xml
+ test
+ 366564D1
+
+
+ extra_files/extra-mf-slab-right-middle-rear-units.osm
+ osm
+ test
+ E05FF56C
+
+
+ extra_files/extra-mf-slab-right-middle-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-slab-right-middle.osm
+ osm
+ test
+ D40AEC53
+
+
+ extra_files/extra-mf-slab-right-middle.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-slab-right-top-rear-units.osm
+ osm
+ test
+ 4F6C5416
+
+
+ extra_files/extra-mf-slab-right-top-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-slab-right-top.osm
+ osm
+ test
+ B2669E2F
+
+
+ extra_files/extra-mf-slab-right-top.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-slab.osm
+ osm
+ test
+ E8F2C29D
+
+
+ extra_files/extra-mf-slab.xml
+ xml
+ test
+ C2070599
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-bottom-rear-units.osm
+ osm
+ test
+ 9F0FB9FE
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-bottom-rear-units.xml
+ xml
+ test
+ 002D15F5
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-bottom.osm
+ osm
+ test
+ E8E92E88
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-bottom.xml
+ xml
+ test
+ E7135719
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-middle-rear-units.osm
+ osm
+ test
+ 5375BD0B
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-middle-rear-units.xml
+ xml
+ test
+ 34AF50AC
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-middle.osm
+ osm
+ test
+ E488629E
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-middle.xml
+ xml
+ test
+ E28D25AB
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-top-rear-units.osm
+ osm
+ test
+ BBEDB018
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-top-rear-units.xml
+ xml
+ test
+ 34AF50AC
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-top.osm
+ osm
+ test
+ F3429FB4
+
+
+ extra_files/extra-mf-unvented-crawlspace-left-top.xml
+ xml
+ test
+ E28D25AB
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-bottom-rear-units.osm
+ osm
+ test
+ 0444844F
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-bottom-rear-units.xml
+ xml
+ test
+ 6D5425CC
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-bottom.osm
+ osm
+ test
+ 5F1F78E7
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-bottom.xml
+ xml
+ test
+ 072576B7
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-middle-rear-units.osm
+ osm
+ test
+ B1640BA1
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-middle-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-middle.osm
+ osm
+ test
+ D87EB9D5
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-middle.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-top-rear-units.osm
+ osm
+ test
+ DC2D4D62
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-top-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-top.osm
+ osm
+ test
+ 6C6F32B9
+
+
+ extra_files/extra-mf-unvented-crawlspace-middle-top.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-unvented-crawlspace-rear-units.osm
+ osm
+ test
+ AB4A3F69
+
+
+ extra_files/extra-mf-unvented-crawlspace-rear-units.xml
+ xml
+ test
+ 002D15F5
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-bottom-rear-units.osm
+ osm
+ test
+ C16DF08C
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-bottom-rear-units.xml
+ xml
+ test
+ 6D5425CC
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-bottom.osm
+ osm
+ test
+ 06B2DF5F
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-bottom.xml
+ xml
+ test
+ 072576B7
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-middle-rear-units.osm
+ osm
+ test
+ D6CC34AC
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-middle-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-middle.osm
+ osm
+ test
+ 111CD236
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-middle.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-top-rear-units.osm
+ osm
+ test
+ 0DAB18F2
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-top-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-top.osm
+ osm
+ test
+ F7A40267
+
+
+ extra_files/extra-mf-unvented-crawlspace-right-top.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-unvented-crawlspace.osm
+ osm
+ test
+ 56ECF71B
+
+
+ extra_files/extra-mf-unvented-crawlspace.xml
+ xml
+ test
+ E7135719
+
+
+ extra_files/extra-mf-vented-crawlspace-left-bottom-rear-units.osm
+ osm
+ test
+ 7B62C1D0
+
+
+ extra_files/extra-mf-vented-crawlspace-left-bottom-rear-units.xml
+ xml
+ test
+ 4B56196F
+
+
+ extra_files/extra-mf-vented-crawlspace-left-bottom.osm
+ osm
+ test
+ 85BCA0C7
+
+
+ extra_files/extra-mf-vented-crawlspace-left-bottom.xml
+ xml
+ test
+ B202979E
+
+
+ extra_files/extra-mf-vented-crawlspace-left-middle-rear-units.osm
+ osm
+ test
+ A2FC4682
+
+
+ extra_files/extra-mf-vented-crawlspace-left-middle-rear-units.xml
+ xml
+ test
+ 34AF50AC
+
+
+ extra_files/extra-mf-vented-crawlspace-left-middle.osm
+ osm
+ test
+ 918F3468
+
+
+ extra_files/extra-mf-vented-crawlspace-left-middle.xml
+ xml
+ test
+ E28D25AB
+
+
+ extra_files/extra-mf-vented-crawlspace-left-top-rear-units.osm
+ osm
+ test
+ 0FA7AC9B
+
+
+ extra_files/extra-mf-vented-crawlspace-left-top-rear-units.xml
+ xml
+ test
+ 34AF50AC
+
+
+ extra_files/extra-mf-vented-crawlspace-left-top.osm
+ osm
+ test
+ 6E677462
+
+
+ extra_files/extra-mf-vented-crawlspace-left-top.xml
+ xml
+ test
+ E28D25AB
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-bottom-rear-units.osm
+ osm
+ test
+ E1DE4186
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-bottom-rear-units.xml
+ xml
+ test
+ B34770D3
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-bottom.osm
+ osm
+ test
+ A361FC12
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-bottom.xml
+ xml
+ test
+ D34C8757
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-middle-rear-units.osm
+ osm
+ test
+ D7581D97
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-middle-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-middle.osm
+ osm
+ test
+ 1D51A47C
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-middle.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-top-rear-units.osm
+ osm
+ test
+ 287F2C99
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-top-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-top.osm
+ osm
+ test
+ 549AAFC2
+
+
+ extra_files/extra-mf-vented-crawlspace-middle-top.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-vented-crawlspace-rear-units.osm
+ osm
+ test
+ F33C08D5
+
+
+ extra_files/extra-mf-vented-crawlspace-rear-units.xml
+ xml
+ test
+ 4B56196F
+
+
+ extra_files/extra-mf-vented-crawlspace-right-bottom-rear-units.osm
+ osm
+ test
+ F2DF4E8B
+
+
+ extra_files/extra-mf-vented-crawlspace-right-bottom-rear-units.xml
+ xml
+ test
+ B34770D3
+
+
+ extra_files/extra-mf-vented-crawlspace-right-bottom.osm
+ osm
+ test
+ B37717E2
+
+
+ extra_files/extra-mf-vented-crawlspace-right-bottom.xml
+ xml
+ test
+ D34C8757
+
+
+ extra_files/extra-mf-vented-crawlspace-right-middle-rear-units.osm
+ osm
+ test
+ 88DBC275
+
+
+ extra_files/extra-mf-vented-crawlspace-right-middle-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-vented-crawlspace-right-middle.osm
+ osm
+ test
+ AC0E4F4F
+
+
+ extra_files/extra-mf-vented-crawlspace-right-middle.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-vented-crawlspace-right-top-rear-units.osm
+ osm
+ test
+ EAD31448
+
+
+ extra_files/extra-mf-vented-crawlspace-right-top-rear-units.xml
+ xml
+ test
+ 5389CBB4
+
+
+ extra_files/extra-mf-vented-crawlspace-right-top.osm
+ osm
+ test
+ 5C8E814D
+
+
+ extra_files/extra-mf-vented-crawlspace-right-top.xml
+ xml
+ test
+ 80ABE496
+
+
+ extra_files/extra-mf-vented-crawlspace.osm
+ osm
+ test
+ B8C85A54
+
+
+ extra_files/extra-mf-vented-crawlspace.xml
+ xml
+ test
+ B202979E
+
+
+ extra_files/extra-no-rim-joists.osm
+ osm
+ test
+ D6943274
+
+
+ extra_files/extra-no-rim-joists.xml
+ xml
+ test
+ 2A6DB7E6
+
+
+ extra_files/extra-power-outage-periods.osm
+ osm
+ test
+ 60588B8A
+
+
+ extra_files/extra-power-outage-periods.xml
+ xml
+ test
+ EE7A2B26
+
+
+ extra_files/extra-pv-roofpitch.osm
+ osm
+ test
+ 384C243A
+
+
+ extra_files/extra-pv-roofpitch.xml
+ xml
+ test
+ E0E67F89
+
+
+ extra_files/extra-seasons-building-america.osm
+ osm
+ test
+ E68FF805
+
+
+ extra_files/extra-seasons-building-america.xml
+ xml
+ test
+ 8A0F755A
+
+
+ extra_files/extra-second-heating-system-boiler-to-heat-pump.osm
+ osm
+ test
+ 44CC29B8
+
+
+ extra_files/extra-second-heating-system-boiler-to-heat-pump.xml
+ xml
+ test
+ C5136398
+
+
+ extra_files/extra-second-heating-system-boiler-to-heating-system.osm
+ osm
+ test
+ 802A4C6A
+
+
+ extra_files/extra-second-heating-system-boiler-to-heating-system.xml
+ xml
+ test
+ DE0AAE90
+
+
+ extra_files/extra-second-heating-system-fireplace-to-heat-pump.osm
+ osm
+ test
+ DF5D7640
+
+
+ extra_files/extra-second-heating-system-fireplace-to-heat-pump.xml
+ xml
+ test
+ E8B3F1DD
+
+
+ extra_files/extra-second-heating-system-fireplace-to-heating-system.osm
+ osm
+ test
+ 0C639B3C
+
+
+ extra_files/extra-second-heating-system-fireplace-to-heating-system.xml
+ xml
+ test
+ 4CAAF1EE
+
+
+ extra_files/extra-second-heating-system-portable-heater-to-heat-pump.osm
+ osm
+ test
+ 9939AD31
+
+
+ extra_files/extra-second-heating-system-portable-heater-to-heat-pump.xml
+ xml
+ test
+ AD083386
+
+
+ extra_files/extra-second-heating-system-portable-heater-to-heating-system.osm
+ osm
+ test
+ 9176AA0E
+
+
+ extra_files/extra-second-heating-system-portable-heater-to-heating-system.xml
+ xml
+ test
+ C86946EF
+
+
+ extra_files/extra-second-refrigerator.osm
+ osm
+ test
+ EDA829EC
+
+
+ extra_files/extra-second-refrigerator.xml
+ xml
+ test
+ E0E67F89
+
+
+ extra_files/extra-sfa-ambient.osm
+ osm
+ test
+ B8123B43
+
+
+ extra_files/extra-sfa-ambient.xml
+ xml
+ test
+ 0AB0DDA0
+
+
+ extra_files/extra-sfa-atticroof-conditioned-eaves-gable.osm
+ osm
+ test
+ 161BEC8C
+
+
+ extra_files/extra-sfa-atticroof-conditioned-eaves-gable.xml
+ xml
+ test
+ 60BEB8CC
+
+
+ extra_files/extra-sfa-atticroof-conditioned-eaves-hip.osm
+ osm
+ test
+ 695382B2
+
+
+ extra_files/extra-sfa-atticroof-conditioned-eaves-hip.xml
+ xml
+ test
+ 6CC491DE
+
+
+ extra_files/extra-sfa-atticroof-flat.osm
+ osm
+ test
+ 023B1E8A
+
+
+ extra_files/extra-sfa-atticroof-flat.xml
+ xml
+ test
+ 00A49B5F
+
+
+ extra_files/extra-sfa-conditioned-crawlspace.osm
+ osm
+ test
+ 254FA130
+
+
+ extra_files/extra-sfa-conditioned-crawlspace.xml
+ xml
+ test
+ 9BE5672F
+
+
+ extra_files/extra-sfa-exterior-corridor.osm
+ osm
+ test
+ 3A8E3FA3
+
+
+ extra_files/extra-sfa-exterior-corridor.xml
+ xml
+ test
+ 420901F2
+
+
+ extra_files/extra-sfa-rear-units.osm
+ osm
+ test
+ 3E459303
+
+
+ extra_files/extra-sfa-rear-units.xml
+ xml
+ test
+ 420901F2
+
+
+ extra_files/extra-sfa-slab-middle.osm
+ osm
+ test
+ A27D4414
+
+
+ extra_files/extra-sfa-slab-middle.xml
+ xml
+ test
+ 2635FF86
+
+
+ extra_files/extra-sfa-slab-right.osm
+ osm
+ test
+ C69EF0C8
+
+
+ extra_files/extra-sfa-slab-right.xml
+ xml
+ test
+ 2635FF86
+
+
+ extra_files/extra-sfa-slab.osm
+ osm
+ test
+ 9A359B2A
+
+
+ extra_files/extra-sfa-slab.xml
+ xml
+ test
+ 813D062B
+
+
+ extra_files/extra-sfa-unconditioned-basement-middle.osm
+ osm
+ test
+ CFA7C9B4
+
+
+ extra_files/extra-sfa-unconditioned-basement-middle.xml
+ xml
+ test
+ 1E83B37D
+
+
+ extra_files/extra-sfa-unconditioned-basement-right.osm
+ osm
+ test
+ 4D24D046
+
+
+ extra_files/extra-sfa-unconditioned-basement-right.xml
+ xml
+ test
+ 1E83B37D
+
+
+ extra_files/extra-sfa-unconditioned-basement.osm
+ osm
+ test
+ 9A24CFBD
+
+
+ extra_files/extra-sfa-unconditioned-basement.xml
+ xml
+ test
+ B575FA3C
+
+
+ extra_files/extra-sfa-unvented-crawlspace-middle.osm
+ osm
+ test
+ 79FFCC5C
+
+
+ extra_files/extra-sfa-unvented-crawlspace-middle.xml
+ xml
+ test
+ 868B7275
+
+
+ extra_files/extra-sfa-unvented-crawlspace-right.osm
+ osm
+ test
+ C991E079
+
+
+ extra_files/extra-sfa-unvented-crawlspace-right.xml
+ xml
+ test
+ 868B7275
+
+
+ extra_files/extra-sfa-unvented-crawlspace.osm
+ osm
+ test
+ 36B8B7B3
+
+
+ extra_files/extra-sfa-unvented-crawlspace.xml
+ xml
+ test
+ B49F37B2
+
+
+ extra_files/extra-sfa-vented-crawlspace-middle.osm
+ osm
+ test
+ ACC4DD9C
+
+
+ extra_files/extra-sfa-vented-crawlspace-middle.xml
+ xml
+ test
+ 32058F0B
+
+
+ extra_files/extra-sfa-vented-crawlspace-right.osm
+ osm
+ test
+ 2F55CFCE
+
+
+ extra_files/extra-sfa-vented-crawlspace-right.xml
+ xml
+ test
+ 32058F0B
+
+
+ extra_files/extra-sfa-vented-crawlspace.osm
+ osm
+ test
+ 6958CA6E
+
+
+ extra_files/extra-sfa-vented-crawlspace.xml
+ xml
+ test
+ BD392B5F
+
+
+ extra_files/extra-state-code-different-than-epw.osm
+ osm
+ test
+ 22FE2C1D
+
+
+ extra_files/extra-state-code-different-than-epw.xml
+ xml
+ test
+ A0E3537B
+
+
+ extra_files/extra-time-zone-different-than-epw.osm
+ osm
+ test
+ FF8C150C
+
+
+ extra_files/extra-time-zone-different-than-epw.xml
+ xml
+ test
+ EEA0A01A
+
+
+ extra_files/extra-two-batteries.osm
+ osm
+ test
+ 0E15590C
+
+
+ extra_files/extra-two-batteries.xml
+ xml
+ test
+ 4FCC8796
+
+
+ extra_files/extra-water-heater-attic.osm
+ osm
+ test
+ 1D95B535
+
+
+ extra_files/extra-water-heater-attic.xml
+ xml
+ test
+ E23FBBC3
+
+
+ extra_files/extra-water-heater-crawlspace.osm
+ osm
+ test
+ 4946D65A
+
+
+ extra_files/extra-water-heater-crawlspace.xml
+ xml
+ test
+ 31A0807A
+
+
+ extra_files/warning-base-battery-ev-no-charger.osm
+ osm
+ test
+ 3F369F7D
+
+
+ extra_files/warning-base-battery-ev-no-charger.xml
+ xml
+ test
+ 0ABC5239
+
+
+ extra_files/warning-conditioned-attic-with-floor-insulation.osm
+ osm
+ test
+ 9C7FFE51
+
+
+ extra_files/warning-conditioned-attic-with-floor-insulation.xml
+ xml
+ test
+ 6B98D2DB
+
+
+ extra_files/warning-conditioned-basement-with-ceiling-insulation.osm
+ osm
+ test
+ BE96971C
+
+
+ extra_files/warning-conditioned-basement-with-ceiling-insulation.xml
+ xml
+ test
+ E0E67F89
+
+
+ extra_files/warning-geothermal-loop-but-no-gshp.osm
+ osm
+ test
+ C953E549
+
+
+ extra_files/warning-geothermal-loop-but-no-gshp.xml
+ xml
+ test
+ E0E67F89
+
+
+ extra_files/warning-mf-bottom-slab-non-zero-foundation-height.osm
+ osm
+ test
+ FD1DEA7B
+
+
+ extra_files/warning-mf-bottom-slab-non-zero-foundation-height.xml
+ xml
+ test
+ 2C1F8BFD
+
+
+ extra_files/warning-non-electric-heat-pump-water-heater.osm
+ osm
+ test
+ 2F179682
+
+
+ extra_files/warning-non-electric-heat-pump-water-heater.xml
+ xml
+ test
+ 0107ABDF
+
+
+ extra_files/warning-sfd-slab-non-zero-foundation-height.osm
+ osm
+ test
+ 4BAFD537
+
+
+ extra_files/warning-sfd-slab-non-zero-foundation-height.xml
+ xml
+ test
+ ED81F907
+
+
+ extra_files/warning-slab-non-zero-foundation-height-above-grade.osm
+ osm
+ test
+ 91E571B9
+
+
+ extra_files/warning-slab-non-zero-foundation-height-above-grade.xml
+ xml
+ test
+ ED81F907
+
+
+ extra_files/warning-unconditioned-basement-with-wall-and-ceiling-insulation.osm
+ osm
+ test
+ 0D51A544
+
+
+ extra_files/warning-unconditioned-basement-with-wall-and-ceiling-insulation.xml
+ xml
+ test
+ 8F46BC92
+
+
+ extra_files/warning-unvented-attic-with-floor-and-roof-insulation.osm
+ osm
+ test
+ 012836EA
+
+
+ extra_files/warning-unvented-attic-with-floor-and-roof-insulation.xml
+ xml
+ test
+ 4CC4B0BC
+
+
+ extra_files/warning-unvented-crawlspace-with-wall-and-ceiling-insulation.osm
+ osm
+ test
+ D36899EC
+
+
+ extra_files/warning-unvented-crawlspace-with-wall-and-ceiling-insulation.xml
+ xml
+ test
+ 327B9364
+
+
+ extra_files/warning-vented-attic-with-floor-and-roof-insulation.osm
+ osm
+ test
+ 89DB04D8
+
+
+ extra_files/warning-vented-attic-with-floor-and-roof-insulation.xml
+ xml
+ test
+ 6A0CF210
+
+
+ extra_files/warning-vented-crawlspace-with-wall-and-ceiling-insulation.osm
+ osm
+ test
+ B1B5B0DA
+
+
+ extra_files/warning-vented-crawlspace-with-wall-and-ceiling-insulation.xml
+ xml
+ test
+ 587ABD7E
+
test_build_residential_hpxml.rb
rb
test
- 04146810
+ 2F576548
diff --git a/HPXMLtoOpenStudio/measure.xml b/HPXMLtoOpenStudio/measure.xml
index 1bae06f8cc..2921fbd070 100644
--- a/HPXMLtoOpenStudio/measure.xml
+++ b/HPXMLtoOpenStudio/measure.xml
@@ -3,8 +3,8 @@
3.1
hpxm_lto_openstudio
b1543b30-9465-45ff-ba04-1d1f85e763bc
- 5c60d469-73ac-415f-b37f-8b8401c8d5f3
- 2024-10-16T17:32:33Z
+ 319e295c-0876-4df7-9be0-a91c007313b2
+ 2024-10-17T23:34:58Z
D8922A73
HPXMLtoOpenStudio
HPXML to OpenStudio Translator
@@ -183,7 +183,7 @@
measure.rb
rb
script
- E1E63AE7
+ C8305640
airflow.rb
@@ -195,7 +195,7 @@
battery.rb
rb
resource
- 3062E4E6
+ 5121660D
calendar.rb
@@ -207,7 +207,7 @@
constants.rb
rb
resource
- 8660B5E9
+ 967C50D1
constructions.rb
@@ -315,7 +315,7 @@
data/unavailable_periods.csv
csv
resource
- EC394126
+ B7BED6D1
data/zipcode_weather_stations.csv
@@ -327,7 +327,7 @@
defaults.rb
rb
resource
- 1B4820ED
+ 87964053
energyplus.rb
@@ -357,13 +357,13 @@
hpxml.rb
rb
resource
- F866C769
+ D52C7C21
hpxml_schema/HPXML.xsd
xsd
resource
- CB97DDA1
+ 063C0B6E
hpxml_schema/README.md
@@ -375,7 +375,7 @@
hpxml_schematron/EPvalidator.xml
xml
resource
- BD9733AC
+ 4C64EB6E
hpxml_schematron/iso-schematron.xsd
@@ -467,6 +467,12 @@
resource
58457C1A
+
+ schedule_files/battery-ev.csv
+ csv
+ resource
+ 7086E8A0
+
schedule_files/battery.csv
csv
@@ -591,7 +597,7 @@
schedules.rb
rb
resource
- 29DAE0EC
+ 826719F0
simcontrols.rb
@@ -617,6 +623,12 @@
resource
17195DD4
+
+ vehicle.rb
+ rb
+ resource
+ 08832679
+
version.rb
rb
@@ -647,6 +659,18 @@
resource
93120E27
+
+ in.schedules.csv
+ csv
+ test
+ E7A72B40
+
+
+ in.xml
+ xml
+ test
+ E74A2F82
+
test_airflow.rb
rb
@@ -657,7 +681,7 @@
test_battery.rb
rb
test
- 3DF46EDF
+ 4199DD7B
test_defaults.rb
@@ -737,6 +761,12 @@
test
7CB39E62
+
+ test_vehicle.rb
+ rb
+ test
+ 648B6BE9
+
test_water_heater.rb
rb
diff --git a/ReportSimulationOutput/README.md b/ReportSimulationOutput/README.md
index 594b8dbac9..1c150bb804 100644
--- a/ReportSimulationOutput/README.md
+++ b/ReportSimulationOutput/README.md
@@ -524,8 +524,6 @@ All possible measure outputs are listed below. Actual outputs depend on measure
- ``end_use_electricity_plug_loads_m_btu``
-- ``end_use_electricity_electric_vehicle_charging_m_btu``
-
- ``end_use_electricity_well_pump_m_btu``
- ``end_use_electricity_pool_heater_m_btu``
@@ -542,6 +540,8 @@ All possible measure outputs are listed below. Actual outputs depend on measure
- ``end_use_electricity_battery_m_btu``
+- ``end_use_electricity_electric_vehicle_charging_m_btu``
+
- ``end_use_natural_gas_heating_m_btu``
- ``end_use_natural_gas_heating_heat_pump_backup_m_btu``
@@ -784,4 +784,6 @@ All possible measure outputs are listed below. Actual outputs depend on measure
- ``resilience_battery_hr``
+- ``vehicle_electric_vehicle_discharging_mbtu``
+
diff --git a/ReportSimulationOutput/measure.rb b/ReportSimulationOutput/measure.rb
index 950c81021e..1483204725 100644
--- a/ReportSimulationOutput/measure.rb
+++ b/ReportSimulationOutput/measure.rb
@@ -765,7 +765,8 @@ def get_outputs(runner, args)
# Remove EV battery discharging
@model.getElectricLoadCenterStorageLiIonNMCBatterys.each do |elcs|
next unless elcs.additionalProperties.getFeatureAsString('is_ev')
- fuel.annual_output += get_report_variable_data_annual([elcs.name.to_s.upcase], ['Electric Storage Discharge Energy']) if fuel_type == FT::Elec
+
+ fuel.annual_output += get_report_variable_data_annual([elcs.name.to_s.upcase], ['Electric Storage Discharge Energy']) if fuel_type == FT::Elec
end
next unless args[:include_timeseries_fuel_consumptions]
@@ -3016,7 +3017,7 @@ def get_object_outputs_by_key(model, object, class_name)
elsif object.to_ElectricLoadCenterStorageLiIonNMCBattery.is_initialized
if object.name.to_s.include? 'ElectricVehicle'
- return { [FT::Elec, EUT::Vehicle] => ['Electric Storage Production Decrement Energy']}
+ return { [FT::Elec, EUT::Vehicle] => ['Electric Storage Production Decrement Energy'] }
else
return { [FT::Elec, EUT::Battery] => ['Electric Storage Production Decrement Energy', 'Electric Storage Discharge Energy'] }
end
@@ -3187,7 +3188,7 @@ def get_object_outputs_by_key(model, object, class_name)
if object.to_ElectricLoadCenterStorageLiIonNMCBattery.is_initialized
if object.name.to_s.include? 'ElectricVehicle'
- return { VT::VehicleDischarging => ['Electric Storage Discharge Energy']}
+ return { VT::VehicleDischarging => ['Electric Storage Discharge Energy'] }
end
end
diff --git a/ReportSimulationOutput/measure.xml b/ReportSimulationOutput/measure.xml
index 6b6232394f..7349c8a337 100644
--- a/ReportSimulationOutput/measure.xml
+++ b/ReportSimulationOutput/measure.xml
@@ -3,8 +3,8 @@
3.1
report_simulation_output
df9d170c-c21a-4130-866d-0d46b06073fd
- 5159cf91-466e-4115-a0f9-e0f8d0bbfb9c
- 2024-10-15T22:08:51Z
+ 231cadf6-e649-4e59-99bd-f3ff073a700f
+ 2024-10-17T23:35:00Z
9BF1E6AC
ReportSimulationOutput
HPXML Simulation Output Report
@@ -975,13 +975,6 @@
Double
false
-
+
+
@@ -1912,7 +1919,7 @@
README.md
md
readme
- CDB2D617
+ 2A081F48
README.md.erb
@@ -1929,7 +1936,7 @@
measure.rb
rb
script
- E54A8870
+ F20C9ED3
test_report_sim_output.rb