NREL · joseph-robertson · Feb 5, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 5, 2025
diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -166,7 +166,7 @@ jobs:
 
       - name: Run buildstockbatch
         run: |
-          pip install git+https://github.com/NREL/buildstockbatch.git@develop
+          pip install git+https://github.com/NREL/buildstockbatch.git@output-meters
 
           buildstock_local project_national/national_baseline.yml
           buildstock_local project_testing/testing_baseline.yml

diff --git a/docs/technical_development_guide/source/workflow_outputs/csv_tables/other_outputs.csv b/docs/technical_development_guide/source/workflow_outputs/csv_tables/other_outputs.csv
@@ -92,7 +92,8 @@ report_simulation_output.timeseries_timestamp_convention,Determines whether time
 report_simulation_output.timeseries_num_decimal_places,"Allows overriding the default number of decimal places for timeseries output. Does not apply if output format is msgpack, where no rounding is performed because there is no file size penalty to storing full precision."
 report_simulation_output.add_timeseries_dst_column,"Optionally add, in addition to the default local standard Time column, a local clock TimeDST column. Requires that daylight saving time is enabled."
 report_simulation_output.add_timeseries_utc_column,"Optionally add, in addition to the default local standard Time column, a local clock TimeUTC column. If the time zone UTC offset is not provided in the HPXML file, the time zone in the EPW header will be used."
-report_simulation_output.user_output_variables,"Optionally generates timeseries EnergyPlus output variables. If multiple output variables are desired, use a comma-separated list. Do not include key values; by default all key values will be requested. Example: ""Zone People Occupant Count, Zone People Total Heating Energy"""
+report_simulation_output.user_output_variables,"Optionally generates timeseries EnergyPlus output variables. If multiple output variables are desired, use a comma-separated list. Do not include key values; by default all key values will be requested. Example: 'Zone People Occupant Count, Zone People Total Heating Energy'"
+report_simulation_output.user_output_meters,"Optionally generates timeseries EnergyPlus output meters. If multiple output meters are desired, use a comma-separated list. Example: 'Electricity:Facility, HeatingCoils:EnergyTransfer'"
 report_utility_bills.applicable,The measure was applied to the workflow.
 report_utility_bills.output_format,"The file format of the annual (and timeseries, if requested) outputs."
 report_utility_bills.include_annual_bills,Generates output file containing annual utility bills.

diff --git a/docs/technical_development_guide/source/workflow_outputs/csv_tables/other_timeseries.csv b/docs/technical_development_guide/source/workflow_outputs/csv_tables/other_timeseries.csv
@@ -21,7 +21,8 @@ Weather: Relative Humidity,weather__relative_humidity__%,%,"Weather file data in
 Weather: Wind Speed,weather__wind_speed__mph,mph,"Weather file data including outdoor temperatures, relative humidity, wind speed, and solar."
 Weather: Diffuse Solar Radiation,weather__diffuse_solar_radiation__btu/(hr*ft^2),Btu/(hr*ft^2),"Weather file data including outdoor temperatures, relative humidity, wind speed, and solar."
 Weather: Direct Solar Radiation,weather__direct_solar_radiation__btu/(hr*ft^2),Btu/(hr*ft^2),"Weather file data including outdoor temperatures, relative humidity, wind speed, and solar."
-Zone People Occupant Count: Conditioned Space,zone_people_occupant_count__conditioned_space,,User-requested EnergyPlus output variable.
+Zone People Occupant Count: Conditioned Space,zone_people_occupant_count__conditioned_space,,"Any user-specified EnergyPlus output variables/meters (e.g., 'Zone People Occupant Count', 'MainsWater:Facility')."
+Electricity:Facility,electricity_facility__j,J,"Any user-specified EnergyPlus output variables/meters (e.g., 'Zone People Occupant Count', 'MainsWater:Facility')."
 ,schedules_ceiling_fan,frac,Ceiling fan energy use schedule.
 ,schedules_clothes_dryer,frac,Clothes dryer energy use schedule.
 ,schedules_clothes_washer,frac,Clothes washer energy use schedule.

diff --git a/docs/technical_development_guide/source/workflow_outputs/csv_tables/simulation_outputs.csv b/docs/technical_development_guide/source/workflow_outputs/csv_tables/simulation_outputs.csv
@@ -163,3 +163,4 @@ report_simulation_output.peak_load_heating_delivered_k_btu_hr,kBtu/hr,,,,Include
 report_simulation_output.resilience_battery_hr,hr,Resilience: Battery,resilience__battery__hr,hr,Average length of time the battery state of charge can meet the electric load
 report_simulation_output.unmet_hours_cooling_hr,hr,Unmet Hours: Cooling,unmet_hours__cooling__hr,hr,Number of hours where the cooling setpoint is not maintained.
 report_simulation_output.unmet_hours_heating_hr,hr,Unmet Hours: Heating,unmet_hours__heating__hr,hr,Number of hours where the heating setpoint is not maintained.
+report_simulation_output.unmet_hours_ev_driving_hr,hr,Unmet Hours: EV Driving,unmet_hours__ev_driving__hr,hr,Number of hours where the EV driving demand is not met.
diff --git a/measures/ResStockArguments/measure.xml b/measures/ResStockArguments/measure.xml
@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>res_stock_arguments</name>
   <uid>c984bb9e-4ac4-4930-a399-9d23f8f6936a</uid>
-  <version_id>d4503561-5947-467e-a470-7e3a3244d991</version_id>
-  <version_modified>2025-02-04T20:54:44Z</version_modified>
+  <version_id>c09018f1-362a-4973-b32b-49f7b5577c18</version_id>
+  <version_modified>2025-02-12T16:22:04Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>ResStockArguments</class_name>
   <display_name>ResStock Arguments</display_name>
@@ -7707,13 +7707,13 @@
       <filename>constants.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>67C6AB5F</checksum>
+      <checksum>1E2198A5</checksum>
     </file>
     <file>
       <filename>measure.txt</filename>
       <filetype>txt</filetype>
       <usage_type>resource</usage_type>
-      <checksum>5505BBDE</checksum>
+      <checksum>232F0A3A</checksum>
     </file>
     <file>
       <filename>resstock_arguments_test.rb</filename>

diff --git a/measures/ResStockArguments/resources/constants.rb b/measures/ResStockArguments/resources/constants.rb
@@ -44,6 +44,18 @@ module Constants
                                    'hvac_control_cooling_weekend_setpoint',
                                    'pv_system_num_bedrooms_served',
                                    'battery_num_bedrooms_served',
+                                   'vehicle_type',
+                                   'vehicle_battery_capacity',
+                                   'vehicle_battery_usable_capacity',
+                                   'vehicle_fuel_economy_units',
+                                   'vehicle_fuel_economy_combined',
+                                   'vehicle_miles_driven_per_year',
+                                   'vehicle_hours_driven_per_week',
+                                   'vehicle_fraction_charged_home',
+                                   'ev_charger_present',
+                                   'ev_charger_level',
+                                   'ev_charger_power',
+                                   'ev_charger_location',
                                    'emissions_scenario_names',
                                    'emissions_types',
                                    'emissions_electricity_units',

diff --git a/measures/ResStockArguments/resources/measure.txt b/measures/ResStockArguments/resources/measure.txt
@@ -1 +1 @@
-357944431a5a88e46e2b12c30da3f703
+8f7f3f65a5351d4e49cbcb52e306b220
diff --git a/project_national/national_baseline.yml b/project_national/national_baseline.yml
@@ -54,7 +54,7 @@ sampler:
 workflow_generator:
   # ResStock HPXML workflow generator
   type: residential_hpxml
-  version: 2025.01.29
+  version: 2025.02.05
   args:
     # Annual simulation and timestep
     build_existing_model:

diff --git a/project_national/sdr_upgrades_tmy3.yml b/project_national/sdr_upgrades_tmy3.yml
@@ -55,7 +55,7 @@ postprocessing:
 workflow_generator:
   # ResStock HPXML workflow generator
   type: residential_hpxml
-  version: 2025.01.29
+  version: 2025.02.05
 
   args:
     # Annual simulation and timestep

diff --git a/project_testing/testing_baseline.yml b/project_testing/testing_baseline.yml
@@ -54,7 +54,7 @@ sampler:
 workflow_generator:
   # ResStock HPXML workflow generator
   type: residential_hpxml
-  version: 2025.01.29
+  version: 2025.02.05
   args:
     # Annual simulation and timestep  
     build_existing_model:
@@ -122,6 +122,8 @@ workflow_generator:
       timeseries_num_decimal_places: 4
       output_variables:
         - name: Zone People Occupant Count
+      output_meters:
+        - name: Electricity:Facility
       include_monthly_bills: true
 
     # Other reporting measures to run

diff --git a/resources/buildstock.rb b/resources/buildstock.rb
@@ -7,7 +7,7 @@
 module Version
   ResStock_Version = '3.4.0' # Version of ResStock
   BuildStockBatch_Version = '2023.10.0' # Minimum required version of BuildStockBatch
-  WorkflowGenerator_Version = '2025.01.29' # Version of buildstockbatch workflow generator
+  WorkflowGenerator_Version = '2025.02.05' # Version of buildstockbatch workflow generator
 
   def self.check_buildstockbatch_version
     if ENV.keys.include?('BUILDSTOCKBATCH_VERSION') # buildstockbatch is installed

diff --git a/resources/data/dictionary/inputs.csv b/resources/data/dictionary/inputs.csv
@@ -249,7 +249,8 @@ report_simulation_output.timeseries_timestamp_convention,Determines whether time
 report_simulation_output.timeseries_num_decimal_places,"Allows overriding the default number of decimal places for timeseries output. Does not apply if output format is msgpack, where no rounding is performed because there is no file size penalty to storing full precision."
 report_simulation_output.add_timeseries_dst_column,"Optionally add, in addition to the default local standard Time column, a local clock TimeDST column. Requires that daylight saving time is enabled."
 report_simulation_output.add_timeseries_utc_column,"Optionally add, in addition to the default local standard Time column, a local clock TimeUTC column. If the time zone UTC offset is not provided in the HPXML file, the time zone in the EPW header will be used."
-report_simulation_output.user_output_variables,"Optionally generates timeseries EnergyPlus output variables. If multiple output variables are desired, use a comma-separated list. Do not include key values; by default all key values will be requested. Example: ""Zone People Occupant Count, Zone People Total Heating Energy"""
+report_simulation_output.user_output_variables,"Optionally generates timeseries EnergyPlus output variables. If multiple output variables are desired, use a comma-separated list. Do not include key values; by default all key values will be requested. Example: 'Zone People Occupant Count, Zone People Total Heating Energy'"
+report_simulation_output.user_output_meters,"Optionally generates timeseries EnergyPlus output meters. If multiple output meters are desired, use a comma-separated list. Example: 'Electricity:Facility, HeatingCoils:EnergyTransfer'"
 report_utility_bills.applicable,The measure was applied to the workflow.
 report_utility_bills.output_format,"The file format of the annual (and timeseries, if requested) outputs."
 report_utility_bills.include_annual_bills,Generates output file containing annual utility bills.
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		357944431a5a88e46e2b12c30da3f703
		8f7f3f65a5351d4e49cbcb52e306b220