diff --git a/Changelog.md b/Changelog.md index d84a9ad6a..a4e41c7ca 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,8 @@ +## OpenStudio-ERI v1.12.0 + +__New Features__ +- The `NominalCapacity` input for batteries is no longer used. + ## OpenStudio-ERI v1.11.1 __New Features__ diff --git a/docs/source/workflow_inputs.rst b/docs/source/workflow_inputs.rst index 5f630a8c4..4f86ed02d 100644 --- a/docs/source/workflow_inputs.rst +++ b/docs/source/workflow_inputs.rst @@ -2483,8 +2483,7 @@ A single battery can be entered as a ``/HPXML/Building/BuildingDetails/Systems/B ``IsSharedSystem`` boolean Yes Whether it serves multiple dwelling units ``Location`` string See [#]_ No See [#]_ Location ``BatteryType`` string See [#]_ Yes Battery type - ``NominalCapacity[Units="kWh"]/Value`` double kWh >= 0 Yes Nominal (total) capacity - ``UsableCapacity[Units="kWh"]/Value`` double kWh >= 0, < NominalCapacity Yes Usable capacity + ``UsableCapacity[Units="kWh"]/Value`` double kWh >= 0 Yes Usable capacity ``RatedPowerOutput`` double W >= 0 Yes Power output under non-peak conditions ``RoundTripEfficiency`` double frac > 0, <= 1 Yes Round trip efficiency ``extension/NumberofBedroomsServed`` integer > NumberofBedrooms See [#]_ Number of bedrooms served diff --git a/rulesets/resources/301ruleset.rb b/rulesets/resources/301ruleset.rb index c57c43cd1..a20b61edd 100644 --- a/rulesets/resources/301ruleset.rb +++ b/rulesets/resources/301ruleset.rb @@ -1947,7 +1947,6 @@ def self.set_systems_batteries_rated(orig_bldg, new_bldg) is_shared_system: orig_battery.is_shared_system, type: orig_battery.type, location: orig_battery.location, - nominal_capacity_kwh: orig_battery.nominal_capacity_kwh, usable_capacity_kwh: orig_battery.usable_capacity_kwh, rated_power_output: orig_battery.rated_power_output, round_trip_efficiency: orig_battery.round_trip_efficiency, diff --git a/rulesets/resources/301validator.sch b/rulesets/resources/301validator.sch index a5e3b6054..ee2a426d3 100644 --- a/rulesets/resources/301validator.sch +++ b/rulesets/resources/301validator.sch @@ -1562,9 +1562,7 @@ Expected 1 element(s) for xpath: BatteryType[text()="Li-ion"] Expected 0 or 1 element(s) for xpath: Location Expected Location to be 'conditioned space' or 'basement - conditioned' or 'basement - unconditioned' or 'crawlspace - vented' or 'crawlspace - unvented' or 'attic - vented' or 'attic - unvented' or 'garage' or 'outside' - Expected 1 element(s) for xpath: NominalCapacity[Units="kWh"]/Value Expected 1 element(s) for xpath: UsableCapacity[Units="kWh"]/Value - Expected UsableCapacity to be less than NominalCapacity Expected 1 element(s) for xpath: RatedPowerOutput Expected 1 element(s) for xpath: RoundTripEfficiency diff --git a/rulesets/tests/test_pv_batteries.rb b/rulesets/tests/test_pv_batteries.rb index 837e785aa..351ca00eb 100644 --- a/rulesets/tests/test_pv_batteries.rb +++ b/rulesets/tests/test_pv_batteries.rb @@ -57,7 +57,7 @@ def test_pv_batteries _test_ruleset(hpxml_name).each do |(_run_type, calc_type), hpxml_bldg| if [CalcType::RatedHome].include? calc_type - _check_battery(hpxml_bldg, [{ type: HPXML::BatteryTypeLithiumIon, location: HPXML::LocationOutside, nominal_capacity_kwh: 20.0, usable_capacity_kwh: 18.0, rated_power_output: 6000, round_trip_efficiency: 0.925, is_shared: false }]) + _check_battery(hpxml_bldg, [{ type: HPXML::BatteryTypeLithiumIon, location: HPXML::LocationOutside, usable_capacity_kwh: 18.0, rated_power_output: 6000, round_trip_efficiency: 0.925, is_shared: false }]) else _check_battery(hpxml_bldg) end @@ -70,7 +70,7 @@ def test_pv_batteries_shared _test_ruleset(hpxml_name).each do |(_run_type, calc_type), hpxml_bldg| if [CalcType::RatedHome].include? calc_type _check_pv(hpxml_bldg, [{ location: HPXML::LocationGround, moduletype: HPXML::PVModuleTypeStandard, tracking: HPXML::PVTrackingTypeFixed, azimuth: 225, tilt: 30, power: 30000, inv_eff: 0.96, losses: 0.14, is_shared: true, nbeds_served: 18 }]) - _check_battery(hpxml_bldg, [{ type: HPXML::BatteryTypeLithiumIon, location: HPXML::LocationOutside, nominal_capacity_kwh: 120.0, usable_capacity_kwh: 108.0, rated_power_output: 36000, round_trip_efficiency: 0.925, is_shared: true, nbeds_served: 18 }]) + _check_battery(hpxml_bldg, [{ type: HPXML::BatteryTypeLithiumIon, location: HPXML::LocationOutside, usable_capacity_kwh: 108.0, rated_power_output: 36000, round_trip_efficiency: 0.925, is_shared: true, nbeds_served: 18 }]) else _check_pv(hpxml_bldg) _check_battery(hpxml_bldg) @@ -138,7 +138,6 @@ def _check_battery(hpxml_bldg, all_expected_values = []) assert_equal(expected_values[:is_shared], battery.is_shared_system) assert_equal(expected_values[:type], battery.type) assert_equal(expected_values[:location], battery.location) - assert_equal(expected_values[:nominal_capacity_kwh], battery.nominal_capacity_kwh) assert_equal(expected_values[:usable_capacity_kwh], battery.usable_capacity_kwh) assert_equal(expected_values[:rated_power_output], battery.rated_power_output) assert_equal(expected_values[:round_trip_efficiency], battery.round_trip_efficiency) diff --git a/tasks.rb b/tasks.rb index 847c6a066..6b74dd318 100644 --- a/tasks.rb +++ b/tasks.rb @@ -2773,6 +2773,7 @@ def create_sample_hpxmls battery.is_shared_system = false if battery.is_shared_system.nil? battery.location = nil battery.round_trip_efficiency = 0.925 + battery.nominal_capacity_kwh = nil end n_htg_systems = (hpxml_bldg.heating_systems + hpxml_bldg.heat_pumps).select { |h| h.fraction_heat_load_served.to_f > 0 }.size n_clg_systems = (hpxml_bldg.cooling_systems + hpxml_bldg.heat_pumps).select { |h| h.fraction_cool_load_served.to_f > 0 }.size diff --git a/workflow/sample_files/base-battery.xml b/workflow/sample_files/base-battery.xml index 911af36c4..dcca59527 100644 --- a/workflow/sample_files/base-battery.xml +++ b/workflow/sample_files/base-battery.xml @@ -415,10 +415,6 @@ false Li-ion - - kWh - 20.0 - kWh 18.0 diff --git a/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml b/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml index e2b7efa5a..7735d0d18 100644 --- a/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml +++ b/workflow/sample_files/base-bldgtype-mf-unit-shared-pv-battery.xml @@ -335,10 +335,6 @@ true Li-ion - - kWh - 120.0 - kWh 108.0 diff --git a/workflow/sample_files/base-pv-battery.xml b/workflow/sample_files/base-pv-battery.xml index ed56aced1..e9f1a750e 100644 --- a/workflow/sample_files/base-pv-battery.xml +++ b/workflow/sample_files/base-pv-battery.xml @@ -445,10 +445,6 @@ false Li-ion - - kWh - 20.0 - kWh 18.0