urbanopt-reporting 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5257c2dff6587116ac76b99b71a41ab96e3166a207832311156dd528e0fa5ffa
-  data.tar.gz: b1192e1e13941f89614c222897290763f97b14799f94b8e9422c39fc9c63ba8c
+  metadata.gz: aa7b49f39bc2a2498641f9ced12a7e56a27427a1b092977aad78233e9cf03b01
+  data.tar.gz: 203cd4d39d0cd44caad0111d6a82fc1c758f558559cf9311ce9083bca6084a44
 SHA512:
-  metadata.gz: 2d320925b74222854cdbb9985580ededc332782b87e87aeb9f81df00cec088eccda2e3da954695c617256751e98a1da05766dd87c36341e9d7c9f5b1c3e2e49c
-  data.tar.gz: 3839055fbd5ac8788d5f03c4290f6f59b97f2d0b7a0c60341701a41949e26781237720d884d39c80a250c965577f044a23f029343b7bde1792cb3586c5321556
+  metadata.gz: b7deaa287639975c21f7b58e05b42eea23bc0d686f61b5f356047acc08ce55d4cb8399463e056562c3d97b67c22aae8bcb1c3294ddfa802f577b95b750191ad3
+  data.tar.gz: ea954942db30ecd7967b128a86bc3703734285fc598918980d71d3ae4233a7913a8d3302fdefc3e03ce137d4b5ac8289e853bea76349cd86932623ed7a149cfa

data/.github/workflows/nightly_ci_build.yml

@@ -19,7 +19,7 @@ jobs:
   weeknight-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.9.0
+      image: docker://nrel/openstudio:3.10.0
     steps:
       - uses: actions/checkout@v4
       - name: set git config options

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # URBANopt Reporting Gem
 
+## Version 1.2.0
+
+* Update copyrights, handle change from github.com/NREL to github.com/NatLabRockies
+* Add lifecycle cost fields to scenario report for REopt cost analysis
+
+## Version 1.1.0
+
+* Upgrade to OpenStudio 3.10
+
 ## Version 1.0.0
 
 * Upgrade to OpenStudio 3.9 and Ruby 3.2.2 by @vtnate in https://github.com/urbanopt/urbanopt-reporting-gem/pull/155

data/CONTRIBUTING.md

@@ -10,7 +10,7 @@ The contribution process for URBANopt is composed of three steps:
 
 In order for us to distribute your code as part of URBANopt under the URBANopt SDK [license](https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md), we’ll need your consent. An email acknowledging your understanding of these terms and agreeing to them is all that will be asked of any contributor. Send an email to the URBANopt project manager ([see below](#documentation) for the address) including the following text and a list of co-contributors (if any):
 
-*I agree to contribute to the URBANopt SDK. I agree to the following terms and conditions for my contributions: First, I agree that I am licensing the copyright to my contributions under the terms of the current URBANopt SDK license. Second, I hereby grant to Alliance for Sustainable Energy, LLC, to any successor manager and distributor of URBANopt SDK appointed by the U.S. Department of Energy, and to all recipients of a version of URBANopt SDK that includes my contributions, a non-exclusive, worldwide, royalty-free, irrevocable patent license under any patent claims owned by me, or owned by my employer and known to me, that are or will be,necessarily infringed upon by my contributions alone, or by combination of my contributions with the version of URBANopt SDK to which they are contributed, to make, have made, use, offer to sell, sell, import, and otherwise transfer any version of URBANopt SDK that includes my contributions, in source code and object code form. Third, I represent and warrant that I am authorized to make the contributions and grant the foregoing license(s). Additionally, if, to my knowledge, my employer has rights to intellectual property that covers my contributions, I represent and warrant that I have received permission to make these contributions and grant the foregoing license(s) on behalf of my employer.*
+*I agree to contribute to the URBANopt SDK. I agree to the following terms and conditions for my contributions: First, I agree that I am licensing the copyright to my contributions under the terms of the current URBANopt SDK license. Second, I hereby grant to Alliance for Energy Innovation, LLC, to any successor manager and distributor of URBANopt SDK appointed by the U.S. Department of Energy, and to all recipients of a version of URBANopt SDK that includes my contributions, a non-exclusive, worldwide, royalty-free, irrevocable patent license under any patent claims owned by me, or owned by my employer and known to me, that are or will be,necessarily infringed upon by my contributions alone, or by combination of my contributions with the version of URBANopt SDK to which they are contributed, to make, have made, use, offer to sell, sell, import, and otherwise transfer any version of URBANopt SDK that includes my contributions, in source code and object code form. Third, I represent and warrant that I am authorized to make the contributions and grant the foregoing license(s). Additionally, if, to my knowledge, my employer has rights to intellectual property that covers my contributions, I represent and warrant that I have received permission to make these contributions and grant the foregoing license(s) on behalf of my employer.*
 
 Once we have your consent on file, you’ll only need to redo it if conditions change (e.g. a change of employer).
 
@@ -53,6 +53,6 @@ URBANopt Project Management\
 ben.polly@nrel.gov\
 (303) 384-7429
 
-URBANopt is funded by the U.S. Department of Energy (DOE) and managed by the National Renewable Energy Laboratory (NREL).
+URBANopt is funded by the U.S. Department of Energy (DOE) and managed by the National Laboratory of the Rockies (NLR).
 
-URBANopt is developed in collaboration with NREL, LBNL, and private firms.
+URBANopt is developed in collaboration with NLR, LBNL, and private firms.

data/Gemfile

@@ -14,6 +14,5 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # if allow_local && File.exist?('../openstudio-extension-gem')
 #   gem 'openstudio-extension', path: '../openstudio-extension-gem'
 # elsif allow_local
-#   gem 'openstudio-extension', github: 'NREL/openstudio-extension-gem', branch: 'bundler-hack'
-# gem 'openstudio-extension', '~> 0.8.1'
+  # gem 'openstudio-extension', github: 'NatLabRockies/openstudio-extension-gem', branch: 'develop'
 # end

data/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2026, Alliance for Energy Innovation, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/Rakefile

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt™, Copyright © Alliance for Sustainable Energy, LLC.
+# URBANopt™, Copyright © Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/doc_templates/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2026, Alliance for Energy Innovation, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/doc_templates/copyright_erb.txt

@@ -1,6 +1,6 @@
 <%
   # *********************************************************************************
-  # URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
+  # URBANopt (tm), Copyright (c) 2019-2026, Alliance for Energy Innovation, LLC, and other
   # contributors. All rights reserved.
 
   # Redistribution and use in source and binary forms, with or without modification,

data/doc_templates/copyright_js.txt

@@ -1,4 +1,4 @@
 /* @preserve
- * URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+ * URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
  * See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 */

data/doc_templates/copyright_ruby.txt

@@ -1,4 +1,4 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************

data/docs/package.json

@@ -8,7 +8,7 @@
     "build": "vuepress build",
     "deploy": "gh-pages -d .vuepress/dist"
   },
-  "author": "NREL",
+  "author": "NLR",
   "dependencies": {
     "highlight.js": "^10.4.1",
     "json-schema-ref-parser": "^9.0.6",

data/lib/measures/default_feature_reports/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2026, Alliance for Energy Innovation, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/measures/default_feature_reports/measure.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
@@ -80,7 +80,8 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       'FuelOilNo2' => 'Fuel Oil #2',
       'Propane' => 'Propane',
       'DistrictCooling' => 'District Cooling',
-      'DistrictHeating' => 'District Heating',
+      'DistrictHeatingSteam' => 'District Heating Steam',
+      'DistrictHeatingWater' => 'District Heating Water',
       'Water' => 'Water'
     }
 
@@ -179,7 +180,8 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,ElectricityProduced:Facility,#{reporting_frequency};").get
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,NaturalGas:Facility,#{reporting_frequency};").get
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,DistrictCooling:Facility,#{reporting_frequency};").get
-    result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,DistrictHeating:Facility,#{reporting_frequency};").get
+    result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,DistrictHeatingSteam:Facility,#{reporting_frequency};").get
+    result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,DistrictHeatingWater:Facility,#{reporting_frequency};").get
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Propane:Facility,#{reporting_frequency};").get
     result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,FuelOilNo2:Facility,#{reporting_frequency};").get
 
@@ -191,7 +193,9 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
     # result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Fans:Electricity,#{reporting_frequency};").get
     # result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Pumps:Electricity,#{reporting_frequency};").get
     # result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,WaterSystems:Electricity,#{reporting_frequency};").get
-    # result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Heating:NaturalGas,#{reporting_frequency};").get
+    result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Heating:NaturalGas,#{reporting_frequency};").get
+    result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,Cooling:NaturalGas,#{reporting_frequency};").get
+    
     # result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,WaterSystems:NaturalGas,#{reporting_frequency};").get
     # result << OpenStudio::IdfObject.load("Output:Meter:MeterFileOnly,InteriorEquipment:NaturalGas,#{reporting_frequency};").get
     result << OpenStudio::IdfObject.load('Output:Variable,*,Heating Coil Heating Rate,hourly; !- HVAC Average [W];').get
@@ -769,13 +773,20 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       feature_report.reporting_periods[0].district_cooling_kwh = 0.0
     end
 
-    # district_heating
-    district_heating = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='District Heating'")
-    feature_report.reporting_periods[0].district_heating_kwh = convert_units(district_heating, 'GJ', 'kWh')
+    # district_heating_steam
+    district_heating_steam = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='District Heating'")
+    feature_report.reporting_periods[0].district_heating_steam_kwh = convert_units(district_heating_steam, 'GJ', 'kWh')
     if building.standardsBuildingType.is_initialized && ['Residential'].include?(building.standardsBuildingType.get)
-      feature_report.reporting_periods[0].district_heating_kwh = 0.0
+      feature_report.reporting_periods[0].district_heating_steam_kwh = 0.0
     end
 
+    # district_heating_water
+    district_heating_water = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='District Heating'")
+    feature_report.reporting_periods[0].district_heating_water_kwh = convert_units(district_heating_water, 'GJ', 'kWh')
+    if building.standardsBuildingType.is_initialized && ['Residential'].include?(building.standardsBuildingType.get)
+      feature_report.reporting_periods[0].district_heating_water_kwh = 0.0
+    end    
+
     # water
     water = sql_query(runner, sql_file, 'AnnualBuildingUtilityPerformanceSummary', "TableName='End Uses' AND RowName='Total End Uses' AND ColumnName='Water'")
     feature_report.reporting_periods[0].water_qbft = water
@@ -800,7 +811,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
 
         # report each query in its corresponding feature report object
         x = ft.tr(' ', '_').downcase
-        if x.include? 'water'
+        if x.include?('water') && x != 'district_heating_water'
           x_u = "#{x}_qbft"
         else
           x = x.gsub('_#2', '')
@@ -965,6 +976,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       'HeatRejection:Electricity',
       'HeatRejection:NaturalGas',
       'Heating:NaturalGas',
+      'Cooling:NaturalGas',
       'WaterSystems:NaturalGas',
       'InteriorEquipment:NaturalGas',
       'HeatRejection:Propane',
@@ -980,7 +992,8 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
       'WaterSystems:OtherFuels',
       'InteriorEquipment:OtherFuels',
       'DistrictCooling:Facility',
-      'DistrictHeating:Facility',
+      'DistrictHeatingSteam:Facility',
+      'DistrictHeatingWater:Facility',
       'District Cooling Chilled Water Rate',
       'District Cooling Mass Flow Rate',
       'District Cooling Inlet Temperature',
@@ -1135,7 +1148,7 @@ class DefaultFeatureReports < OpenStudio::Measure::ReportingMeasure
         end
 
         # residential considerations
-        if building.standardsBuildingType.is_initialized && (['DistrictCooling:Facility', 'DistrictHeating:Facility'].include?(timeseries_name) && ['Residential'].include?(building.standardsBuildingType.get))
+        if building.standardsBuildingType.is_initialized && (['DistrictCooling:Facility', 'DistrictHeatingSteam:Facility', 'DistrictHeatingWater:Facility'].include?(timeseries_name) && ['Residential'].include?(building.standardsBuildingType.get))
           values[key_cnt] = Array.new(n, 0)
         end
 

data/lib/measures/default_feature_reports/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.1</schema_version>
   <name>default_feature_reports</name>
   <uid>9ee3135a-8070-4408-bfa1-b75fecf9dd4f</uid>
-  <version_id>7864fba6-0915-4a17-ad41-3d2912856425</version_id>
-  <version_modified>2025-01-22T21:31:39Z</version_modified>
+  <version_id>5405e272-fbd5-4967-9398-2a16acb72ea3</version_id>
+  <version_modified>2025-08-08T21:47:22Z</version_modified>
   <xml_checksum>FB304155</xml_checksum>
   <class_name>DefaultFeatureReports</class_name>
   <display_name>DefaultFeatureReports</display_name>
@@ -128,7 +128,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>EA7A7994</checksum>
+      <checksum>BE00699F</checksum>
     </file>
     <file>
       <filename>USA_CO_Golden-NREL.724666_TMY3.epw</filename>
@@ -140,7 +140,13 @@
       <filename>default_feature_reports_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>8AD78A1A</checksum>
+      <checksum>C0A93893</checksum>
+    </file>
+    <file>
+      <filename>example_district.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>45DD7725</checksum>
     </file>
     <file>
       <filename>example_model.osm</filename>

data/lib/measures/export_modelica_loads/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2026, Alliance for Energy Innovation, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/measures/export_modelica_loads/measure.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/measures/export_time_series_modelica/LICENSE.md

@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2024, Alliance for Sustainable Energy, LLC, and other
+URBANopt (tm), Copyright (c) 2019-2026, Alliance for Energy Innovation, LLC, and other
 contributors. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

data/lib/measures/export_time_series_modelica/measure.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/measures/export_time_series_modelica/resources/os_lib_helper_methods.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/construction_cost.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/date.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/distributed_generation.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
@@ -82,6 +82,31 @@ module URBANopt
         #
         attr_accessor :lifecycle_energy_cost_after_tax_bau
 
+        ##
+        # _Float_ -  Up-front capital costs for all technologies, in present value, excluding replacement costs and incentives.
+        #
+        attr_accessor :initial_capital_costs
+
+        ##
+        # _Float_ -  Up-front capital costs for all technologies, in present value, excluding replacement costs, including incentives.
+        #
+        attr_accessor :initial_capital_costs_after_incentives
+
+        ##
+        # _Float_ -  Net capital costs for all technologies, in present value, including replacement costs and incentives.
+        #
+        attr_accessor :lifecycle_capital_costs
+
+        ##
+        # _Float_ -  Component of lifecycle costs (LCC). This value is the present value of all fuel costs over the analysis period, after tax.
+        #
+        attr_accessor :lifecycle_fuel_costs_after_tax
+
+        ##
+        # _Float_ -  Component of lifecycle costs (LCC). This value is the present value of all electric utility charges, after tax.
+        #
+        attr_accessor :lifecycle_elecbill_after_tax
+
         ##
         # _Array_ - List of _SolarPV_ systems
         #
@@ -171,7 +196,9 @@ module URBANopt
         #
         # * Technologies include +:solar_pv+, +:wind+, +:generator+, and +:storage+.
         # * Financial metrics include +:lcc+, +:npv+, +:year_one_energy_cost_before_tax+, +:year_one_demand_cost_before_tax+,
-        # +:year_one_bill_before_tax+, and +:lifecycle_energy_cost_after_tax+
+        # +:year_one_bill_before_tax+, +:lifecycle_energy_cost_after_tax+, +:initial_capital_costs+,
+        # +:initial_capital_costs_after_incentives+, +:lifecycle_capital_costs+,
+        # +:lifecycle_elecbill_after_tax+, and +:lifecycle_fuel_costs_after_tax+
         ##
         # [parameters:]
         #
@@ -194,6 +221,11 @@ module URBANopt
           @lifecycle_energy_cost_after_tax_bau = hash[:lifecycle_energy_cost_after_tax_bau]
           @lifecycle_demand_cost_after_tax = hash[:lifecycle_demand_cost_after_tax]
           @lifecycle_demand_cost_after_tax_bau = hash[:lifecycle_demand_cost_after_tax_bau]
+          @initial_capital_costs = hash[:initial_capital_costs]
+          @initial_capital_costs_after_incentives = hash[:initial_capital_costs_after_incentives]
+          @lifecycle_capital_costs = hash[:lifecycle_capital_costs]
+          @lifecycle_fuel_costs_after_tax = hash[:lifecycle_fuel_costs_after_tax]
+          @lifecycle_elecbill_after_tax = hash[:lifecycle_elecbill_after_tax]
 
           @resilience_hours_min = hash[:resilience_hours_min]
           @resilience_hours_max = hash[:resilience_hours_max]
@@ -362,6 +394,12 @@ module URBANopt
           result[:lifecycle_energy_cost_after_tax_bau] = @lifecycle_energy_cost_after_tax_bau if @lifecycle_energy_cost_after_tax_bau
           result[:lifecycle_demand_cost_after_tax_bau] = @lifecycle_demand_cost_after_tax_bau if @lifecycle_demand_cost_after_tax_bau
 
+          result[:initial_capital_costs] = @initial_capital_costs if @initial_capital_costs
+          result[:initial_capital_costs_after_incentives] = @initial_capital_costs_after_incentives if @initial_capital_costs_after_incentives
+          result[:lifecycle_capital_costs] = @lifecycle_capital_costs if @lifecycle_capital_costs
+          result[:lifecycle_fuel_costs_after_tax] = @lifecycle_fuel_costs_after_tax if @lifecycle_fuel_costs_after_tax
+          result[:lifecycle_elecbill_after_tax] = @lifecycle_elecbill_after_tax if @lifecycle_elecbill_after_tax
+
           result[:total_solar_pv_kw] = @total_solar_pv_kw if @total_solar_pv_kw
           result[:total_wind_kw] = @total_wind_kw if @total_wind_kw
           result[:total_generator_kw] = @total_generator_kw if @total_generator_kw
@@ -432,6 +470,12 @@ module URBANopt
           existing_dgen.lifecycle_energy_cost_after_tax_bau = add_values(existing_dgen.lifecycle_energy_cost_after_tax_bau, new_dgen.lifecycle_energy_cost_after_tax_bau)
           existing_dgen.lifecycle_demand_cost_after_tax_bau = add_values(existing_dgen.lifecycle_demand_cost_after_tax_bau, new_dgen.lifecycle_demand_cost_after_tax_bau)
 
+          existing_dgen.initial_capital_costs = add_values(existing_dgen.initial_capital_costs, new_dgen.initial_capital_costs)
+          existing_dgen.initial_capital_costs_after_incentives = add_values(existing_dgen.initial_capital_costs_after_incentives, new_dgen.initial_capital_costs_after_incentives)
+          existing_dgen.lifecycle_capital_costs = add_values(existing_dgen.lifecycle_capital_costs, new_dgen.lifecycle_capital_costs)
+          existing_dgen.lifecycle_fuel_costs_after_tax = add_values(existing_dgen.lifecycle_fuel_costs_after_tax, new_dgen.lifecycle_fuel_costs_after_tax)
+          existing_dgen.lifecycle_elecbill_after_tax = add_values(existing_dgen.lifecycle_elecbill_after_tax, new_dgen.lifecycle_elecbill_after_tax)
+
           existing_dgen.resilience_hours_min = add_values(existing_dgen.resilience_hours_min, new_dgen.resilience_hours_min)
           existing_dgen.resilience_hours_max = add_values(existing_dgen.resilience_hours_max, new_dgen.resilience_hours_max)
           existing_dgen.resilience_hours_avg = add_values(existing_dgen.resilience_hours_avg, new_dgen.resilience_hours_avg)

data/lib/urbanopt/reporting/default_reports/end_use.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/end_uses.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
@@ -14,7 +14,7 @@ module URBANopt
       # Enduses class include results for each fuel type.
       ##
       class EndUses
-        attr_accessor :electricity_kwh, :natural_gas_kwh, :propane_kwh, :fuel_oil_kwh, :other_fuels_kwh, :district_cooling_kwh, :district_heating_kwh, :water_qbft # :nodoc:
+        attr_accessor :electricity_kwh, :natural_gas_kwh, :propane_kwh, :fuel_oil_kwh, :other_fuels_kwh, :district_cooling_kwh, :district_heating_water_kwh, :district_heating_steam_kwh, :water_qbft # :nodoc:
 
         ##
         # EndUses class initialize end_uses(fuel type) attributes: +:electricity_kwh+ , +:natural_gas_kwh+ , +:propane_kwh+ , +:fuel_oil_kwh+ , +:other_fuels_kwh+ ,
@@ -33,7 +33,8 @@ module URBANopt
           @fuel_oil_kwh = EndUse.new(hash[:fuel_oil_kwh])
           @other_fuels_kwh = EndUse.new(hash[:other_fuels_kwh])
           @district_cooling_kwh = EndUse.new(hash[:district_cooling_kwh])
-          @district_heating_kwh = EndUse.new(hash[:district_heating_kwh])
+          @district_heating_water_kwh = EndUse.new(hash[:district_heating_water_kwh])
+          @district_heating_steam_kwh = EndUse.new(hash[:district_heating_steam_kwh])
           @water_qbft = EndUse.new(hash[:water_qbft])
 
           # initialize class variables @@validator and @@schema
@@ -74,9 +75,13 @@ module URBANopt
           district_cooling_kwh_hash.delete_if { |k, v| v.nil? }
           result[:district_cooling_kwh] = district_cooling_kwh_hash if @district_cooling_kwh
 
-          district_heating_kwh_hash = @district_heating_kwh.to_hash if @district_heating_kwh
-          district_heating_kwh_hash.delete_if { |k, v| v.nil? }
-          result[:district_heating_kwh] = district_heating_kwh_hash if @district_heating_kwh
+          district_heating_water_kwh_hash = @district_heating_water_kwh.to_hash if @district_heating_water_kwh
+          district_heating_water_kwh_hash.delete_if { |k, v| v.nil? }
+          result[:district_heating_water_kwh] = district_heating_water_kwh_hash if @district_heating_water_kwh
+          
+          district_heating_steam_kwh_hash = @district_heating_steam_kwh.to_hash if @district_heating_steam_kwh
+          district_heating_steam_kwh_hash.delete_if { |k, v| v.nil? }
+          result[:district_heating_steam_kwh] = district_heating_steam_kwh_hash if @district_heating_steam_kwh
 
           water_qbft_hash = @water_qbft.to_hash if @water_qbft
           water_qbft_hash.delete_if { |k, v| v.nil? }
@@ -101,7 +106,8 @@ module URBANopt
           hash[:fuel_oil_kwh] = EndUse.new.to_hash
           hash[:other_fuels_kwh] = EndUse.new.to_hash
           hash[:district_cooling_kwh] = EndUse.new.to_hash
-          hash[:district_heating_kwh] = EndUse.new.to_hash
+          hash[:district_heating_steam_kwh] = EndUse.new.to_hash
+          hash[:district_heating_water_kwh] = EndUse.new.to_hash
           hash[:water_qbft] = EndUse.new.to_hash
 
           return hash
@@ -121,7 +127,8 @@ module URBANopt
           @fuel_oil_kwh.merge_end_use!(new_end_uses.fuel_oil_kwh)
           @other_fuels_kwh.merge_end_use!(new_end_uses.other_fuels_kwh)
           @district_cooling_kwh.merge_end_use!(new_end_uses.district_cooling_kwh)
-          @district_heating_kwh.merge_end_use!(new_end_uses.district_heating_kwh)
+          @district_heating_water_kwh.merge_end_use!(new_end_uses.district_heating_water_kwh)
+          @district_heating_steam_kwh.merge_end_use!(new_end_uses.district_heating_steam_kwh)
           return self
         end
       end

data/lib/urbanopt/reporting/default_reports/extension.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/feature_report.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/generator.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/location.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/logger.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/power_distribution.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/program.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/qaqc_flags.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/reporting_period.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
@@ -20,7 +20,7 @@ module URBANopt
       class ReportingPeriod
         attr_accessor :id, :name, :multiplier, :start_date, :end_date, :month, :day_of_month, :year, :total_site_energy_kwh, :total_source_energy_kwh, :site_EUI_kwh_per_m2, :site_EUI_kbtu_per_ft2, :source_EUI_kwh_per_m2, :source_EUI_kbtu_per_ft2,
                       :net_site_energy_kwh, :net_source_energy_kwh, :total_utility_cost_dollar, :net_utility_cost_dollar, :utility_costs_dollar, :electricity_kwh, :natural_gas_kwh, :propane_kwh, :fuel_oil_kwh, :other_fuels_kwh, :district_cooling_kwh,
-                      :district_heating_kwh, :water_qbft, :electricity_produced_kwh, :end_uses, :energy_production_kwh, :photovoltaic,
+                      :district_heating_water_kwh, :district_heating_steam_kwh, :water_qbft, :electricity_produced_kwh, :end_uses, :energy_production_kwh, :photovoltaic,
                       :fuel_type, :total_cost_dollar, :usage_cost_dollar, :demand_cost_dollar, :comfort_result, :time_setpoint_not_met_during_occupied_cooling,
                       :time_setpoint_not_met_during_occupied_heating, :time_setpoint_not_met_during_occupied_hours, :hours_out_of_comfort_bounds_PMV, :hours_out_of_comfort_bounds_PPD,
                       :emissions, :future_annual_electricity_emissions_mt, :future_hourly_electricity_emissions_mt, :historical_annual_electricity_emissions_mt, :historical_hourly_electricity_emissions_mt,
@@ -68,7 +68,8 @@ module URBANopt
           @fuel_oil_kwh = hash[:fuel_oil_kwh]
           @other_fuels_kwh = hash[:other_fuels_kwh]
           @district_cooling_kwh = hash[:district_cooling_kwh]
-          @district_heating_kwh = hash[:district_heating_kwh]
+          @district_heating_water_kwh = hash[:district_heating_water_kwh]
+          @district_heating_steam_kwh = hash[:district_heating_steam_kwh]
           @water_qbft = hash[:water_qbft]
           @electricity_produced_kwh = hash[:electricity_produced_kwh]
           @end_uses = EndUses.new(hash[:end_uses])
@@ -114,7 +115,8 @@ module URBANopt
           hash[:fuel_oil_kwh] = nil
           hash[:other_fuels_kwh] = nil
           hash[:district_cooling_kwh] = nil
-          hash[:district_heating_kwh] = nil
+          hash[:district_heating_water_kwh] = nil
+          hash[:district_heating_steam_kwh] = nil
 
           hash[:electricity_produced_kwh] = nil
           hash[:end_uses] = EndUses.new.to_hash
@@ -162,7 +164,8 @@ module URBANopt
           result[:fuel_oil_kwh] = @fuel_oil_kwh if @fuel_oil_kwh
           result[:other_fuels_kwh] = @other_fuels_kwh if @other_fuels_kwh
           result[:district_cooling_kwh] = @district_cooling_kwh if @district_cooling_kwh
-          result[:district_heating_kwh] = @district_heating_kwh if @district_heating_kwh
+          result[:district_heating_steam_kwh] = @district_heating_steam_kwh if @district_heating_steam_kwh
+          result[:district_heating_water_kwh] = @district_heating_water_kwh if @district_heating_water_kwh
           result[:water_qbft] = @water_qbft if @water_qbft
           result[:electricity_produced_kwh] = @electricity_produced_kwh if @electricity_produced_kwh
           result[:end_uses] = @end_uses.to_hash if @end_uses
@@ -236,7 +239,8 @@ module URBANopt
           existing_period.fuel_oil_kwh = add_values(existing_period.fuel_oil_kwh, new_period.fuel_oil_kwh)
           existing_period.other_fuels_kwh = add_values(existing_period.other_fuels_kwh, new_period.other_fuels_kwh)
           existing_period.district_cooling_kwh = add_values(existing_period.district_cooling_kwh, new_period.district_cooling_kwh)
-          existing_period.district_heating_kwh = add_values(existing_period.district_heating_kwh, new_period.district_heating_kwh)
+          existing_period.district_heating_steam_kwh = add_values(existing_period.district_heating_steam_kwh, new_period.district_heating_steam_kwh)
+          existing_period.district_heating_water_kwh = add_values(existing_period.district_heating_water_kwh, new_period.district_heating_water_kwh)
           existing_period.water_qbft = add_values(existing_period.water_qbft, new_period.water_qbft)
           existing_period.electricity_produced_kwh = add_values(existing_period.electricity_produced_kwh, new_period.electricity_produced_kwh)
 

data/lib/urbanopt/reporting/default_reports/scenario_power_distribution.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/scenario_power_distribution_cost.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/scenario_report.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/schema/README.md

@@ -22,7 +22,8 @@ The URBANopt <sup>&trade;</sup> Scenario Gem includes functionality for defining
 | ElectricityProduced:Facility             | kWh     |
 | Gas:Facility                             | kBtu    |
 | DistrictCooling:Facility                 | kWh     |
-| DistrictHeating:Facility                 | kWh     |
+| DistrictHeatingSteam:Facility            | kWh     |
+| DistrictHeatingWater:Facility            | kWh     |
 | District Cooling Chilled Water Rate      | GPM     |
 | District Cooling Mass Flow Rate          | kg/s    |
 | District Cooling Inlet Temperature       | &deg;C  |

data/lib/urbanopt/reporting/default_reports/schema/scenario_csv_columns.txt

@@ -32,7 +32,8 @@ Heating:OtherFuels
 WaterSystems:OtherFuels
 InteriorEquipment:OtherFuels
 DistrictCooling:Facility
-DistrictHeating:Facility
+DistrictHeatingSteam:Facility
+DistrictHeatingWater:Facility
 District Cooling Chilled Water Rate
 District Cooling Mass Flow Rate
 District Cooling Inlet Temperature

data/lib/urbanopt/reporting/default_reports/schema/scenario_schema.json

@@ -481,6 +481,31 @@
           "units": "dollars",
           "type": "number"
         },
+        "initial_capital_costs": {
+          "description": "Up-front capital costs for all technologies, in present value, excluding replacement costs and incentives.",
+          "units": "dollars",
+          "type": "number"
+        },
+        "initial_capital_costs_after_incentives": {
+          "description": "Up-front capital costs for all technologies, in present value, excluding replacement costs, including incentives.",
+          "units": "dollars",
+          "type": "number"
+        },
+        "lifecycle_capital_costs": {
+          "description": "Net capital costs for all technologies, in present value, including replacement costs and incentives.",
+          "units": "dollars",
+          "type": "number"
+        },
+        "lifecycle_fuel_costs_after_tax": {
+          "description": "Component of lifecycle costs (LCC). This value is the present value of all fuel costs over the analysis period, after tax.",
+          "units": "dollars",
+          "type": "number"
+        },
+        "lifecycle_elecbill_after_tax": {
+          "description": "Component of lifecycle costs (LCC). This value is the present value of all electric utility charges, after tax.",
+          "units": "dollars",
+          "type": "number"
+        },
         "SolarPV": {
           "$ref": "#/definitions/SolarPV"
         },
@@ -946,8 +971,12 @@
           "description": "Sum of all distric cooling end uses consumption (kWh)",
           "type": "number"
         },
-        "district_heating_kwh": {
-          "description": "Sum of all distric heating end uses consumption (kWh)",
+        "district_heating_steam_kwh": {
+          "description": "Sum of all distric heating steam end uses consumption (kWh)",
+          "type": "number"
+        },
+        "district_heating_water_kwh": {
+          "description": "Sum of all distric heating water end uses consumption (kWh)",
           "type": "number"
         },
         "water_qbft": {
@@ -1081,7 +1110,10 @@
         "district_cooling_kwh": {
           "$ref": "#/definitions/EndUse"
         },
-        "district_heating_kwh": {
+        "district_heating_water_kwh": {
+          "$ref": "#/definitions/EndUse"
+        },
+        "district_heating_steam_kwh": {
           "$ref": "#/definitions/EndUse"
         },
         "water_qbft": {

data/lib/urbanopt/reporting/default_reports/solar_pv.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/storage.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/thermal_storage.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/timeseries_csv.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
@@ -186,21 +186,26 @@ module URBANopt
             path = @path
           end
 
-          File.open(path, 'w') do |f|
-            f.puts @column_names.join(',')
-            n = @data[@column_names[0]].size - 1
-
-            (0..n).each do |i|
-              line = []
-              @column_names.each do |column_name|
-                line << @data[column_name][i]
+          # what if data is nil? warn user and don't attempt to write to file or it errors out
+          if @data.nil?
+            @@logger.warn('No data to save to TimeseriesCSV to write to file during feature report update.')
+            puts
+          else
+            File.open(path, 'w') do |f|
+              f.puts @column_names.join(',')
+              n = @data[@column_names[0]].size - 1
+              (0..n).each do |i|
+                line = []
+                @column_names.each do |column_name|
+                  line << @data[column_name][i]
+                end
+                f.puts line.join(',')
+              end
+              begin
+                f.fsync
+              rescue StandardError
+                f.flush
               end
-              f.puts line.join(',')
-            end
-            begin
-              f.fsync
-            rescue StandardError
-              f.flush
             end
           end
         end

data/lib/urbanopt/reporting/default_reports/validator.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports/wind.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/default_reports.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/derived_extension.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/lib/urbanopt/reporting/version.rb

@@ -1,10 +1,10 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
 module URBANopt
   module Reporting
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end

data/lib/urbanopt/reporting.rb

@@ -1,5 +1,5 @@
 # *********************************************************************************
-# URBANopt (tm), Copyright (c) Alliance for Sustainable Energy, LLC.
+# URBANopt (tm), Copyright (c) Alliance for Energy Innovation, LLC.
 # See also https://github.com/urbanopt/urbanopt-reporting-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 

data/urbanopt-reporting-gem.gemspec

@@ -25,11 +25,14 @@ Gem::Specification.new do |spec|
   # It would be nice to be able to use newer patches of Ruby 3.2, which would require os-extension to relax its dependency on bundler.
   spec.required_ruby_version = '3.2.2'
 
-  spec.add_development_dependency 'rspec', '~> 3.13'
-  spec.add_development_dependency 'simplecov', '0.22.0'
-  spec.add_development_dependency 'simplecov-lcov', '0.8.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.9'
+  spec.add_development_dependency 'rubocop', '~> 1.50'
+  spec.add_development_dependency 'rubocop-performance', '~> 1.20'
+  spec.add_development_dependency 'simplecov', '~> 0.22.0'
+  spec.add_development_dependency 'simplecov-lcov', '~> 0.8.0'
 
   spec.add_runtime_dependency 'json_pure', '~> 2.7'
   spec.add_runtime_dependency 'json-schema', '~> 4.3.1'
-  spec.add_dependency 'openstudio-extension', '~> 0.8.3'
+  spec.add_dependency 'openstudio-extension', '~> 0.9.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-reporting
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Rawad El Kontar
@@ -9,48 +9,90 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-23 00:00:00.000000000 Z
+date: 2026-01-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.50'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.20'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
@@ -87,14 +129,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.4
 description: Library include scenario default reporting measure and scenario defaults
   reports schema and classes
 email: