fixes for timeseries tests of EVs

NREL · Aug 30, 2024 · a669595 · a669595
1 parent ed8cc5b
commit a669595
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 2 deletions.
diff --git a/ReportSimulationOutput/measure.rb b/ReportSimulationOutput/measure.rb
@@ -1035,6 +1035,7 @@ def get_outputs(runner, args)
       batteries = []
       @hpxml_bldgs.each do |hpxml_bldg|
         hpxml_bldg.batteries.each do |battery|
+          next if battery.id.to_s.include? 'ElectricVehicle'
           batteries << battery
         end
       end

diff --git a/ReportSimulationOutput/tests/test_report_sim_output.rb b/ReportSimulationOutput/tests/test_report_sim_output.rb
@@ -583,7 +583,8 @@ def emission_end_uses_timeseries_cols
 
   def pv_battery_timeseries_cols
     return ["End Use: #{FT::Elec}: #{EUT::PV}",
-            "End Use: #{FT::Elec}: #{EUT::Battery}"]
+            "End Use: #{FT::Elec}: #{EUT::Battery}",
+            "End Use: #{FT::Elec}: #{EUT::EVBattery}"]
   end
 
   def test_annual_only

diff --git a/workflow/hpxml_inputs.json b/workflow/hpxml_inputs.json
@@ -1001,6 +1001,20 @@
     "parent_hpxml": "sample_files/base-battery.xml",
     "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/battery.csv"
   },
+  "sample_files/base-pv-battery-and-ev.xml": {
+    "parent_hpxml": "sample_files/base-pv-battery.xml",
+    "ev_present": true,
+    "ev_battery_capacity": 100,
+    "ev_battery_usable_capacity": 80,
+    "ev_battery_discharge_power": 6000,
+    "ev_miles_per_year": 10000,
+    "ev_hours_per_week": 14,
+    "ev_energy_efficiency": 0.32,
+    "ev_charger_present": true,
+    "ev_charger_power": 7200,
+    "ev_charger_location": "outside",
+    "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/battery-ev.csv"
+  },
   "sample_files/base-battery-ev-no-charger.xml": {
     "parent_hpxml": "sample_files/base-enclosure-garage.xml",
     "ev_present": true,
@@ -3381,7 +3395,7 @@
     "misc_plug_loads_other_frac_latent": null
   },
   "sample_files/base-misc-emissions.xml": {
-    "parent_hpxml": "sample_files/base-pv-battery.xml",
+    "parent_hpxml": "sample_files/base-pv-battery-and-ev.xml",
     "emissions_scenario_names": "Cambium Hourly MidCase LRMER RMPA, Cambium Hourly LowRECosts LRMER RMPA, Cambium Annual MidCase AER National, eGRID RMPA, eGRID RMPA",
     "emissions_types": "CO2e, CO2e, CO2e, SO2, NOx",
     "emissions_electricity_units": "kg/MWh, kg/MWh, kg/MWh, lb/MWh, lb/MWh",

diff --git a/workflow/sample_files/base-misc-emissions.xml b/workflow/sample_files/base-misc-emissions.xml
@@ -105,6 +105,9 @@
           <ConditionedFloorArea>2700.0</ConditionedFloorArea>
           <ConditionedBuildingVolume>21600.0</ConditionedBuildingVolume>
         </BuildingConstruction>
+        <extension>
+          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/battery-ev.csv</SchedulesFilePath>
+        </extension>
       </BuildingSummary>
       <ClimateandRiskZones>
         <ClimateZoneIECC>
@@ -525,6 +528,43 @@
             <RatedPowerOutput>6000.0</RatedPowerOutput>
           </Battery>
         </Batteries>
+        <Vehicles>
+          <Vehicle>
+            <SystemIdentifier id='ElectricVehicle1'/>
+            <VehicleType>
+              <BEV>
+                <Battery>
+                  <NominalCapacity>
+                    <Units>kWh</Units>
+                    <Value>100.0</Value>
+                  </NominalCapacity>
+                  <UsableCapacity>
+                    <Units>kWh</Units>
+                    <Value>80.0</Value>
+                  </UsableCapacity>
+                  <RatedPowerOutput>6000.0</RatedPowerOutput>
+                </Battery>
+                <FractionChargedLocation>
+                  <Location>Home</Location>
+                </FractionChargedLocation>
+                <ConnectedCharger idref='EVCharger1'/>
+              </BEV>
+            </VehicleType>
+            <MilesDrivenPerYear>10000.0</MilesDrivenPerYear>
+            <HoursDrivenPerWeek>14.0</HoursDrivenPerWeek>
+            <FuelEconomyCombined>
+              <Units>kWh/mile</Units>
+              <Value>0.32</Value>
+            </FuelEconomyCombined>
+          </Vehicle>
+        </Vehicles>
+        <ElectricVehicleChargers>
+          <ElectricVehicleCharger>
+            <SystemIdentifier id='EVCharger1'/>
+            <Location>outside</Location>
+            <ChargingPower>7200.0</ChargingPower>
+          </ElectricVehicleCharger>
+        </ElectricVehicleChargers>
       </Systems>
       <Appliances>
         <ClothesWasher>