openstudio-common-measures 0.11.1 → 0.12.3

data/lib/measures/ZoneReport/measure.rb

@@ -9,6 +9,9 @@ require 'erb'
 
 # start the measure
 class ZoneReport < OpenStudio::Measure::ReportingMeasure
+  attr_reader :component_loads
+  attr_reader :zone_collection
+
   # define the name that a user will see, this method may be deprecated as
   # the display name in PAT comes from the name field in measure.xml
   def name
@@ -213,6 +216,18 @@ class ZoneReport < OpenStudio::Measure::ReportingMeasure
     end
     model = model.get
 
+    # check if the Component Load Summary reports have been produced by EnergyPlus,
+    # which are needed for the Peak Heating Load and Peak Cooling Load tables
+    @component_loads = {}
+    if model.getOutputTableSummaryReports.summaryReports.any? { |r| r.include?('SizingPeriod') }
+      @component_loads[:report] = true
+    else
+      @component_loads[:report] = false
+      message = 'WARNING: The Component Load Summary reports were not produced by EnergyPlus, which are required by the Peak Heating Load and Peak Cooling Load tables.'
+      @component_loads[:message] = message
+      runner.registerWarning(message)
+    end
+
     @sqlFile = runner.lastEnergyPlusSqlFile
     if @sqlFile.empty?
       runner.registerError('Cannot find last sql file.')
@@ -306,8 +321,10 @@ class ZoneReport < OpenStudio::Measure::ReportingMeasure
 
       vals = {}
 
-      vals[:va] = getDetailsData('LightingSummary', 'Entire Facility', 'Interior Lighting', "#{zoneMetrics[:name]}%", 'Lighting Power Density', 'W/m2', 'W/ft^2').round(2)
-      vals[:vb] = getDetailsData('LightingSummary', 'Entire Facility', 'Interior Lighting', "#{zoneMetrics[:name]}%", 'Full Load Hours/Week', 'hr', 'hr').round(2)
+      #vals[:va] = getDetailsData('Input Verification and Results Summary', 'Entire Facility', 'Zone Summary', "#{zoneMetrics[:name].upcase}", 'Lighting[W/m2]', 'W/m2', 'W/ft^2').round(2)
+      #vals[:va] = getDetailsData('Initialization Summary', 'Entire Facility', 'Zone Internal Gains Nominal', "#{zoneMetrics[:name].upcase}", 'Interior Lighting', 'W/m2', 'W/ft^2').round(2)
+      # vals[:va] = getDetailsData('LightingSummary', 'Entire Facility', 'Interior Lighting', "#{zoneMetrics[:name]}%", 'Lighting Power Density', 'W/m2', 'W/ft^2').round(2)
+      # vals[:vb] = getDetailsData('LightingSummary', 'Entire Facility', 'Interior Lighting', "#{zoneMetrics[:name]}%", 'Full Load Hours/Week', 'hr', 'hr').round(2)
 
       vals[:vc] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Electricity', "InteriorLights:Electricity:Zone:#{zoneMetrics[:name]}", 'Electricity Annual Value', 'GJ', 'kWh').round(2)
 
@@ -318,47 +335,56 @@ class ZoneReport < OpenStudio::Measure::ReportingMeasure
       vals[:vf] = getDetailsData('InputVerificationandResultsSummary', 'Entire Facility', 'Zone Summary', zoneMetrics[:name], 'Conditioned (Y/N)', '', 's')
       if vals[:vf] == '' then vals[:vf] = 'No' end
 
-      vals[:vg] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Heating', zoneMetrics[:name], 'User Design Load', 'W', 'kBtu/hr').round(2)
-      vals[:vh] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Heating', zoneMetrics[:name], 'User Design Air Flow', 'm3/s', 'ft^3/s').round(2)
-      vals[:vi] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Cooling', zoneMetrics[:name], 'User Design Load', 'W', 'kBtu/hr').round(2)
-      vals[:vj] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Cooling', zoneMetrics[:name], 'User Design Air Flow', 'm3/s', 'ft^3/s').round(2)
+      vals[:vg] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Sensible Heating', zoneMetrics[:name], 'User Design Load', 'W', 'kBtu/hr').round(2)
+      vals[:vh] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Sensible Heating', zoneMetrics[:name], 'User Design Air Flow', 'm3/s', 'ft^3/s').round(2)
+      vals[:vi] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Sensible Cooling', zoneMetrics[:name], 'User Design Load', 'W', 'kBtu/hr').round(2)
+      vals[:vj] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Sensible Cooling', zoneMetrics[:name], 'User Design Air Flow', 'm3/s', 'ft^3/s').round(2)
 
       vals[:vk] = getDetailsData('OutdoorAirSummary', 'Entire Facility', 'Average Outdoor Air During Occupied Hours', zoneMetrics[:name], 'Mechanical Ventilation', 'ach', 'ach').round(2)
       vals[:vl] = getDetailsData('OutdoorAirSummary', 'Entire Facility', 'Average Outdoor Air During Occupied Hours', zoneMetrics[:name], 'Infiltration', 'ach', 'ach').round(2)
 
       vals[:vm] = getDetailsData('InputVerificationandResultsSummary', 'Entire Facility', 'Zone Summary', zoneMetrics[:name], 'People', 'm2 per person', 'ft^2/person').round(2)
 
-      vals[:vn] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Cooling', zoneMetrics[:name], 'Date/Time Of Peak', '', 's')
-      vals[:vo] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Heating', zoneMetrics[:name], 'Date/Time Of Peak', '', 's')
+      vals[:vn] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Sensible Cooling', zoneMetrics[:name], 'Date/Time Of Peak {TIMESTAMP}', '', 's')
+      vals[:vo] = getDetailsData('HVACSizingSummary', 'Entire Facility', 'Zone Sensible Heating', zoneMetrics[:name], 'Date/Time Of Peak {TIMESTAMP}', '', 's')
 
       vals[:vp] = getDetailsData('SystemSummary', 'Entire Facility', 'Time Setpoint Not Met', zoneMetrics[:name], 'During Heating', 'hr', 'hr')
       vals[:vq] = getDetailsData('SystemSummary', 'Entire Facility', 'Time Setpoint Not Met', zoneMetrics[:name], 'During Cooling', 'hr', 'hr')
 
-      vals[:vr] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Gas', "InteriorEquipment:Gas:Zone:#{zoneMetrics[:name]}", 'Electricity Annual Value', 'GJ', 'Therm').round(2)
+      vals[:vr] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Natural Gas', "InteriorEquipment:NaturalGas:Zone:#{zoneMetrics[:name]}", 'Natural Gas Annual Value', 'GJ', 'Therm').round(2)
       vals[:vs] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Electricity', "InteriorEquipment:Electricity:Zone:#{zoneMetrics[:name]}", 'Electricity Annual Value', 'GJ', 'kWh').round(2)
 
-      vals[:vt] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Gas', "InteriorEquipment:Gas:Zone:#{zoneMetrics[:name]}", 'Gas Maximum  Value', 'W', 'kBtu/hr').round(2)
-      vals[:vu] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Gas', "InteriorEquipment:Gas:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum', '', 's')
+      vals[:vt] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Natural Gas', "InteriorEquipment:NaturalGas:Zone:#{zoneMetrics[:name]}", 'Natural Gas Maximum Value', 'W', 'kBtu/hr').round(2)
+      vals[:vu] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Natural Gas', "InteriorEquipment:NaturalGas:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum {TIMESTAMP}', '', 's')
 
       vals[:vv] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Electricity', "InteriorLights:Electricity:Zone:#{zoneMetrics[:name]}", 'Electricity Maximum Value', 'W', 'kW').round(2)
-      vals[:vw] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Electricity', "InteriorLights:Electricity:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum', '', 's')
+      vals[:vw] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Electricity', "InteriorLights:Electricity:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum {TIMESTAMP}', '', 's')
+
+      # calculate lighting values based on EnergyMeters, which has data by zone
+      # instead of Lighting Summary, which has data by space
+
+      # W/ft2
+      vals[:va] = (vals[:vv] * 1000 / zoneMetrics[:area]).round(2)
+
+      # kWh / kW = full load hours
+      vals[:vb] = (vals[:vc] / vals[:vv]).round(2)
 
       # X unused
 
       vals[:vy] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Electricity', "InteriorEquipment:Electricity:Zone:#{zoneMetrics[:name]}", 'Electricity Maximum Value', 'W', 'kW').round(2)
-      vals[:vz] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Electricity', "InteriorEquipment:Electricity:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum', '', 's')
+      vals[:vz] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Electricity', "InteriorEquipment:Electricity:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum {TIMESTAMP}', '', 's')
 
-      vals[:vaa] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "InteriorEquipment:DistrictHeating:Zone:#{zoneMetrics[:name]}", 'Annual Value', 'GJ', 'kBtu').round(2)
-      vals[:vab] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "InteriorEquipment:DistrictHeating:Zone:#{zoneMetrics[:name]}", 'Maximum Value', 'W', 'kBtu/hr').round(2)
-      vals[:vac] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "InteriorEquipment:DistrictHeating:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum', '', 's')
+      # vals[:vaa] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "InteriorEquipment:DistrictHeatingWater:Zone:#{zoneMetrics[:name]}", 'Annual Value', 'GJ', 'kBtu').round(2)
+      # vals[:vab] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "InteriorEquipment:DistrictHeatingWater:Zone:#{zoneMetrics[:name]}", 'Maximum Value', 'W', 'kBtu/hr').round(2)
+      # vals[:vac] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "InteriorEquipment:DistrictHeatingWater:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum {TIMESTAMP}', '', 's')
 
-      vals[:vad] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Heating:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Annual Value', 'GJ', 'kBtu').round(2)
-      vals[:vae] = (getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Heating:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Maximum Value', 'W', 'kBtu/hr') / zoneMetrics[:area]).round(2)
-      vals[:vaf] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Heating:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum', '', 's')
+      # vals[:vad] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Heating:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Annual Value', 'GJ', 'kBtu').round(2)
+      # vals[:vae] = (getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Heating:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Maximum Value', 'W', 'kBtu/hr') / zoneMetrics[:area]).round(2)
+      # vals[:vaf] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Heating:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum {TIMESTAMP}', '', 's')
 
-      vals[:vag] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Cooling:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Annual Value', 'GJ', 'kBtu').round(2)
-      vals[:vah] = (getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Cooling:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Maximum Value', 'W', 'kBtu/hr') / zoneMetrics[:area]).round(2)
-      vals[:vai] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Cooling:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum', '', 's')
+      # vals[:vag] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Cooling:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Annual Value', 'GJ', 'kBtu').round(2)
+      # vals[:vah] = (getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Cooling:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Maximum Value', 'W', 'kBtu/hr') / zoneMetrics[:area]).round(2)
+      # vals[:vai] = getDetailsData('EnergyMeters', 'Entire Facility', 'Annual and Peak Values - Other', "Cooling:EnergyTransfer:Zone:#{zoneMetrics[:name]}", 'Timestamp of Maximum {TIMESTAMP}', '', 's')
 
       vals[:vaj] = zoneHeatComponentCalc('People', zoneMetrics)
       vals[:vak] = zoneHeatComponentCalc('Lights', zoneMetrics)
@@ -385,7 +411,7 @@ class ZoneReport < OpenStudio::Measure::ReportingMeasure
       vals[:vbf] = zoneHeatComponentCalc('Fenestration Conduction', zoneMetrics)
       vals[:vbg] = zoneHeatComponentCalc('Fenestration Solar', zoneMetrics)
 
-      vals[:vbh] = getDetailsData('ZoneComponentLoadSummary', (zoneMetrics[:name]).to_s, 'Heating Peak Conditions', 'Time of Peak Load', 'Value', '', 's')
+      vals[:vbh] = getDetailsData('Zone Component Load Summary', (zoneMetrics[:name]).to_s, 'Heating Peak Conditions', 'Time of Peak Load', 'Value', '', 's')
 
       vals[:vbi] = zoneCoolComponentCalc('People', zoneMetrics)
       vals[:vbj] = zoneCoolComponentCalc('Lights', zoneMetrics)
@@ -412,7 +438,7 @@ class ZoneReport < OpenStudio::Measure::ReportingMeasure
       vals[:vce] = zoneCoolComponentCalc('Fenestration Conduction', zoneMetrics)
       vals[:vcf] = zoneCoolComponentCalc('Fenestration Solar', zoneMetrics)
 
-      vals[:vcg] = getDetailsData('ZoneComponentLoadSummary', (zoneMetrics[:name]).to_s, 'Cooling Peak Conditions', 'Time of Peak Load', 'Value', '', 's')
+      vals[:vcg] = getDetailsData('Zone Component Load Summary', (zoneMetrics[:name]).to_s, 'Cooling Peak Conditions', 'Time of Peak Load', 'Value', '', 's')
 
       # vals = loadTestVals( vals )
 
@@ -480,11 +506,11 @@ class ZoneReport < OpenStudio::Measure::ReportingMeasure
   end
 
   def zoneHeatComponentCalc(component, zoneMetrics)
-    (getDetailsData('ZoneComponentLoadSummary', (zoneMetrics[:name]).to_s, 'Estimated Heating Peak Load Components', component, 'Total', 'W', 'Btu/hr') / zoneMetrics[:area]).round(2)
+    (getDetailsData('Zone Component Load Summary', (zoneMetrics[:name]).to_s, 'Estimated Heating Peak Load Components', component, 'Total', 'W', 'Btu/hr') / zoneMetrics[:area]).round(2)
   end
 
   def zoneCoolComponentCalc(component, zoneMetrics)
-    (getDetailsData('ZoneComponentLoadSummary', (zoneMetrics[:name]).to_s, 'Estimated Cooling Peak Load Components', component, 'Total', 'W', 'Btu/hr') / zoneMetrics[:area]).round(2)
+    (getDetailsData('Zone Component Load Summary', (zoneMetrics[:name]).to_s, 'Estimated Cooling Peak Load Components', component, 'Total', 'W', 'Btu/hr') / zoneMetrics[:area]).round(2)
   end
 
   def stacked_bars(zoneMetrics)
@@ -579,7 +605,7 @@ class ZoneReport < OpenStudio::Measure::ReportingMeasure
     graph['data'] = stacked_vals
 
     @graph_data << graph
-end
+  end
 
   def getPctLoad(val, total)
     if val != '' && total != 0
@@ -621,7 +647,7 @@ end
   # and final_units should be open studio style (m^2, m^3, ...)
   # If the data is not found or cannot be converted a warning is registered and "" or 0.0 is returned.
   def getDetailsData(report, forstring, table, row, column, units, final_units)
-    if report == 'ZoneComponentLoadSummary'
+    if report == 'Zone Component Load Summary'
       forstring.upcase!
     end
 
@@ -637,12 +663,13 @@ end
 
     if query_results.empty?
 
-      @runner.registerWarning("Could not get data for #{report} #{forstring} #{table} #{row} #{column}.")
+      # todo - is there any valid reason data might not be found? If not then make error isntead of warning
+      @runner.registerWarning("Could not get data for report:#{report} For:#{forstring} table:#{table} row:#{row} column:#{column}.")
       return final_units == 's' ? '' : 0.0
 
     else
       r = query_results.get
-      if report == 'ZoneComponentLoadSummary'
+      if report == 'Zone Component Load Summary'
         @testData["#{@currentZoneName}_#{table}_#{row}"] = r
       end
 
@@ -652,7 +679,7 @@ end
         converted = OpenStudio.convert(r.to_f, eplus_to_openstudio(units), final_units)
         if converted.empty?
           @runner.registerError("Could not convert #{r} from #{units} to #{final_units}")
-          return 0.0
+          return false
         else
           return converted.get.round(2)
         end
@@ -671,14 +698,12 @@ end
 
     if query_results.empty?
       @runner.registerError("Could not get data for requested Column #{colName}.")
-      return []
+      return false
     else
       return query_results
     end
   end
 
-  # Accessor to support unit tests
-  attr_reader :zone_collection
 end
 
 # this allows the measure to be use by the application

data/lib/measures/ZoneReport/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>zone_report</name>
   <uid>81ac119f-4841-434c-9e11-824310fe1cb7</uid>
-  <version_id>783f69cf-8d41-4389-b98b-d3f9b73f8891</version_id>
-  <version_modified>2024-11-16T23:54:13Z</version_modified>
+  <version_id>a5a25c05-02b3-4b8d-bf91-59fac3fddaa4</version_id>
+  <version_modified>2025-08-01T14:35:26Z</version_modified>
   <xml_checksum>2C8A3EEF</xml_checksum>
   <class_name>ZoneReport</class_name>
   <display_name>Zone Report</display_name>
@@ -33,7 +33,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -50,19 +50,19 @@
     <file>
       <version>
         <software_program>OpenStudio</software_program>
-        <identifier>2.0.0</identifier>
-        <min_compatible>2.0.0</min_compatible>
+        <identifier>3.9.0</identifier>
+        <min_compatible>3.9.0</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>C6695B06</checksum>
+      <checksum>DE6FAD49</checksum>
     </file>
     <file>
       <filename>report.html.in</filename>
       <filetype>in</filetype>
       <usage_type>resource</usage_type>
-      <checksum>9863EEC5</checksum>
+      <checksum>4D3102CA</checksum>
     </file>
     <file>
       <filename>USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw</filename>
@@ -74,13 +74,13 @@
       <filename>ZoneReport_Test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>5CDE28AB</checksum>
+      <checksum>28CD8E93</checksum>
     </file>
     <file>
       <filename>gas_electric_mark_load.osm</filename>
       <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>1F5C6B63</checksum>
+      <checksum>1FAF2250</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/ZoneReport/resources/report.html.in

@@ -216,7 +216,7 @@ var graph_data = <%= @graph_data %>;
       <ul class="nav nav-pills nav-stacked" role="navigation">
         <% counter = 0 %>
         <% zone_collection.each do |z| %>
-        
+
           <li>
             <a href="#zone_<%= counter %>"><%= z[:name] %></a>
           </li>
@@ -224,18 +224,22 @@ var graph_data = <%= @graph_data %>;
         <% end %>
       </ul>
     </div>
-  </div>  
+  </div>
 
   <div class="col-md-9" style="padding-top:25px;" role="main">
-    
+
       <h1>Zone Equipment Report</h1>
 
+      <% if component_loads[:report] == false %>
+        <i><%= component_loads[:message] %></i>
+      <% end %>
+
       <% counter = 0 %>
       <% zone_collection.each do |z| %>
       <h3 id="zone_<%= counter %>"><%= z[:name] %></h3>
-        
+
       <h4>Zone Equipment Summary</h4>
-      
+
       <table class="table table-striped table-bordered table-condensed zoneGrid">
           <% report_sort_order = {"Heating" => 0, "Backup Heating" => 1, "Cooling" => 2, "Fans" => 3} %>
           <% z[:equipment].sort_by{|k,v| report_sort_order[k]}.each do |reporting_type, equipments| %>
@@ -260,9 +264,9 @@ var graph_data = <%= @graph_data %>;
               <% end %>
           <% end %>
       </table>
-        
+
       <h4>Zone Sizing and Load Summary</h4>
-      
+
       <table class="table table-striped table-bordered table-condensed zoneGrid">
           <tr>
               <td>Zone Name</td><td><%=z[:name]%></td><td>Zone Size (ft2)</td><td><%=z[:area]%></td>

data/lib/measures/add_ems_emissions_reporting/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/add_ems_emissions_reporting/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>add_ems_emissions_reporting</name>
   <uid>e8fe9153-5e70-4769-afa0-6da0045aa529</uid>
-  <version_id>5d43cac2-efd0-4a24-92af-afdbcca53db7</version_id>
-  <version_modified>2024-11-16T23:54:14Z</version_modified>
+  <version_id>186ed140-c7da-411f-bf36-87d862ecb885</version_id>
+  <version_modified>2025-08-01T14:35:28Z</version_modified>
   <xml_checksum>976EB6EB</xml_checksum>
   <class_name>AddEMSEmissionsReporting</class_name>
   <display_name>Add EMS to Report Emissions</display_name>
@@ -450,7 +450,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/measures/add_ems_to_control_ev_charging/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/add_ems_to_control_ev_charging/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>add_ems_to_control_ev_charging</name>
   <uid>df97997f-d02a-4e35-af7a-5aed16cb5772</uid>
-  <version_id>a6a93a92-7693-4cf3-81a1-59a618e75322</version_id>
-  <version_modified>2024-11-16T23:54:15Z</version_modified>
+  <version_id>57045cd7-f87b-4f65-b493-2f420a8df85c</version_id>
+  <version_modified>2025-08-01T14:35:28Z</version_modified>
   <xml_checksum>976EB6EB</xml_checksum>
   <class_name>AddEMSToControlEVCharging</class_name>
   <display_name>Add EMS to Control EV Charging</display_name>
@@ -53,7 +53,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/measures/add_ev_load/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/add_ev_load/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>add_ev_load</name>
   <uid>a23e0493-7357-48ca-b089-4d902efd6b50</uid>
-  <version_id>12fb9a15-3439-41f4-981b-832f5c219cd0</version_id>
-  <version_modified>2024-11-16T23:54:14Z</version_modified>
+  <version_id>2d6e7c7b-d342-478c-b85a-262b092eccd8</version_id>
+  <version_modified>2025-08-01T14:35:27Z</version_modified>
   <xml_checksum>9A202986</xml_checksum>
   <class_name>AddEVLoad</class_name>
   <display_name>Add_EV_Load</display_name>
@@ -139,7 +139,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/measures/add_rooftop_pv/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/add_rooftop_pv/measure.rb

@@ -84,12 +84,19 @@ class AddRooftopPV < OpenStudio::Measure::ModelMeasure
 
     # create the inverter
     inverter = OpenStudio::Model::ElectricLoadCenterInverterSimple.new(model)
-    inverter.setInverterEfficiency(args['inverter_efficiency'])
+    inverter.setName("Rooftop PV Inverter")
+    inverter.setInverterEfficiency(args["inverter_efficiency"])
+    inverter.setAvailabilitySchedule(model.alwaysOnDiscreteSchedule)
     runner.registerInfo("Created inverter with efficiency of #{inverter.inverterEfficiency}")
 
     # create the distribution system
     elcd = OpenStudio::Model::ElectricLoadCenterDistribution.new(model)
+    elcd.setName("Rooftop PV ELCD")
     elcd.setInverter(inverter)
+    # This is the default, but much better to do it explicitly since it's
+    # critical
+    elcd.setGeneratorOperationSchemeType("Baseload")
+    elcd.setElectricalBussType("DirectCurrentWithInverter")
 
     # create shared shading transmittance schedule
     target_transmittance = 1.0 - args['fraction_of_surface'].to_f
@@ -102,6 +109,10 @@ class AddRooftopPV < OpenStudio::Measure::ModelMeasure
     pv_shading_transmittance_schedule = OpenstudioStandards::Schedules.create_simple_schedule(model, inputs)
     runner.registerInfo("Created transmittance schedule for PV shading surfaces with constant value of #{target_transmittance}")
 
+    # Efficiency is rated at a solar irradiance intensity of 1000 W/m^2
+    # So if cell_efficiency is 0.18, that means 180 W/m^2
+    rated_solar_irradiance_w_per_m2 = 1000.0
+
     model.getSurfaces.each do |surface|
       next if !surface.space.is_initialized
       if (surface.surfaceType == 'RoofCeiling') && (surface.outsideBoundaryCondition == 'Outdoors')
@@ -125,9 +136,18 @@ class AddRooftopPV < OpenStudio::Measure::ModelMeasure
         # create the panel
         panel = OpenStudio::Model::GeneratorPhotovoltaic.simple(model)
         panel.setSurface(shading_surface)
+        panel.setName("Rooftop PV - #{surface.nameString}")
         performance = panel.photovoltaicPerformance.to_PhotovoltaicPerformanceSimple.get
         performance.setFractionOfSurfaceAreaWithActiveSolarCells(args['fraction_of_surface'])
         performance.setFixedEfficiency(args['cell_efficiency'])
+        performance.setName("Rooftop PV - #{surface.nameString} - Performance Simple")
+
+        rated_electric_power_output_w = args["cell_efficiency"] * rated_solar_irradiance_w_per_m2 * args["fraction_of_surface"] * shading_surface.grossArea
+
+        # Set it on the panel, so it's written to the ElectricLoadCenter:Generators
+        # object that the OS ForwardTranslator creates, and reported in the
+        # eplustbl.html (otherwise it shows rated power = 0.0W in L-1. Renewable Energy Source Summary)
+        panel.setRatedElectricPowerOutput(rated_electric_power_output_w)
 
         # connect panel to electric load center distribution
         elcd.addGenerator(panel)

data/lib/measures/add_rooftop_pv/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>add_rooftop_pv</name>
   <uid>34550614-0c87-44db-9252-0ca0915b1e64</uid>
-  <version_id>0d2f5512-be0c-4af5-a651-139c86a3adf0</version_id>
-  <version_modified>2024-11-16T23:54:15Z</version_modified>
+  <version_id>782e0e4a-7795-4904-b3f7-3e7dffe12469</version_id>
+  <version_modified>2025-08-01T14:35:28Z</version_modified>
   <xml_checksum>178163B6</xml_checksum>
   <class_name>AddRooftopPV</class_name>
   <display_name>Add Rooftop PV</display_name>
@@ -91,7 +91,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -114,7 +114,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>9AA2D6EE</checksum>
+      <checksum>47313383</checksum>
     </file>
     <file>
       <filename>add_rooftop_pv_test.rb</filename>

data/lib/measures/add_zone_mixing_object/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/add_zone_mixing_object/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>add_zone_mixing_object</name>
   <uid>6ed65817-1d97-43da-a4c2-1d738eafcde5</uid>
-  <version_id>59de5d20-ca60-4d50-abf2-d0e87034d58f</version_id>
-  <version_modified>2024-11-16T23:54:15Z</version_modified>
+  <version_id>7a54e78b-517d-4b0e-80bb-d56bc8e5b8b4</version_id>
+  <version_modified>2025-08-01T14:35:28Z</version_modified>
   <xml_checksum>61000E02</xml_checksum>
   <class_name>AddZoneMixingObject</class_name>
   <display_name>Add Zone Mixing Object</display_name>
@@ -73,7 +73,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/measures/add_zone_ventilation_design_flow_rate_object/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/add_zone_ventilation_design_flow_rate_object/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>add_zone_ventilation_design_flow_rate_object</name>
   <uid>c31e2212-720d-413f-bdb9-f38e198dcfa3</uid>
-  <version_id>f35f5097-94e0-4df8-9ac5-5e807af8339e</version_id>
-  <version_modified>2024-11-16T23:54:10Z</version_modified>
+  <version_id>a8948f1e-81b8-4947-99ff-3b53b584c6d6</version_id>
+  <version_modified>2025-08-01T14:35:24Z</version_modified>
   <xml_checksum>3B6B95A6</xml_checksum>
   <class_name>AddZoneVentilationDesignFlowRateObject</class_name>
   <display_name>Add Zone Ventilation Design Flow Rate Object</display_name>
@@ -108,7 +108,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/measures/air_wall_zone_mixing/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/air_wall_zone_mixing/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>air_wall_zone_mixing</name>
   <uid>fd04f73e-a530-4144-9e1e-c1878b1394bc</uid>
-  <version_id>115db804-9cb0-4857-963f-f9dd6404a996</version_id>
-  <version_modified>2024-11-16T23:54:13Z</version_modified>
+  <version_id>27c88398-8d73-47e2-80d4-47297cb98024</version_id>
+  <version_modified>2025-08-01T14:35:27Z</version_modified>
   <xml_checksum>772B7164</xml_checksum>
   <class_name>AirWallZoneMixing</class_name>
   <display_name>Air Wall Zone Mixing</display_name>
@@ -73,7 +73,7 @@ Zone mixing will only be added where there is an air wall and where the matched
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/measures/create_csv_output/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 

data/lib/measures/create_csv_output/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>create_csv_output</name>
   <uid>99d3a7e5-4bd5-407f-b5eb-7c59660ca980</uid>
-  <version_id>61088c82-955f-4e8d-af9f-bef34f7a3b98</version_id>
-  <version_modified>2024-11-16T23:54:15Z</version_modified>
+  <version_id>746b6aa2-67d3-4f0d-8f32-dcdf17f54bca</version_id>
+  <version_modified>2025-08-01T14:35:28Z</version_modified>
   <xml_checksum>9BF1E6AC</xml_checksum>
   <class_name>CreateCSVOutput</class_name>
   <display_name>CreateCSVOutput</display_name>
@@ -65,7 +65,7 @@
       <filename>LICENSE.md</filename>
       <filetype>md</filetype>
       <usage_type>license</usage_type>
-      <checksum>8696A072</checksum>
+      <checksum>CBFF29F5</checksum>
     </file>
     <file>
       <filename>README.md</filename>

data/lib/measures/envelope_and_internal_load_breakdown/LICENSE.md

@@ -1,4 +1,4 @@
-OpenStudio(R), Copyright (c) 2008, 2024 Alliance for Sustainable Energy, LLC.
+OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: