urbanopt-reporting 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 166b735ce69f284a1940be9b0b0f6465859398858710c3066a3e4b1483a3cee1
-  data.tar.gz: 8f92f0d3051e56b74ad38f4751cb3191388a990a645f5f1189a2d82a969816e3
+  metadata.gz: ffc392cf19483625a5f2cad39ede228156e8b964c49735acbb0ff91cec909336
+  data.tar.gz: 34eea3ba8b847a307bf3b7224868ddf3fbeadcaf3590a458c8d676f258b4745e
 SHA512:
-  metadata.gz: 1d360fa05a79294c4ad9b6cd0024bd0bb743d7f147d16efdb6a09064f27bf09f875bc21a5346e84770b440673d49874af90e15748a2d83f1548aa7b6422e5683
-  data.tar.gz: c3a5fa01b0638693edc0c27bb62cb3e980e3f693c56179155a15351667e421827a7ab4c4d73a66ab71968cb33d21d03f1fea72324f325aade0f9b3093a047647
+  metadata.gz: 1d2c147824efc929af070ebfaf96d0345d12a584bc5ebf7aa1e03c8672255a6138986a7c26b42339a947e5f5f1ce87b832bfd0bf05d715269dbc7bfb1f7784cf
+  data.tar.gz: 6497200141d8fb7a2fa06e756e6a6a09fce402d2958f91f3e05102e9f59287f9e1d881611eb61cdf774d03923564d186b9c319f89589ee752a2779c7007d6416

data/.github/workflows/nightly_ci_build.yml

@@ -1,12 +1,12 @@
 name: Reporting-gem CI
 
 on:
+  pull_request:
   push:
-  workflow_dispatch:
-  schedule:
-    # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
-    # 5 am UTC (11pm MDT the day before) every weekday night in MDT
-    - cron: '22 5 * * 2-6'
+    branches:
+      - "develop"
+    tags:
+      - '*'
 
 env:
   # This env var should enforce develop branch of all dependencies
@@ -14,12 +14,13 @@ env:
   GEM_DEVELOPER_KEY: ${{ secrets.GEM_DEVELOPER_KEY }}
   # Enforce language so openstudio doesn't get confused
   LANG: "C.UTF-8"
+  LC_ALL: C.UTF-8
 
 jobs:
   weeknight-tests:
     runs-on: ubuntu-latest
     container:
-      image: docker://nrel/openstudio:3.10.0
+      image: docker://nrel/openstudio:3.11.0
     steps:
       - uses: actions/checkout@v4
       - name: set git config options
@@ -29,13 +30,8 @@ jobs:
         run: |
           ruby --version
           bundle install
-          bundle update
       - name: List OpenStudio measures
         run: bundle exec rake openstudio:list_measures
-      - name: Update OpenStudio measures
-        run: |
-          bundle install
-          bundle exec rake openstudio:update_measures
       - name: Test OpenStudio measures
         run: bundle exec rake openstudio:test_with_openstudio
       - name: Run Rspec

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # URBANopt Reporting Gem
 
+## Version 1.3.0
+
+* Updated dependencies for OpenStudio 3.11
+
+## 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

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).
 
@@ -50,9 +50,9 @@ For further questions or information:
 
 - Ben Polly\
 URBANopt Project Management\
-ben.polly@nrel.gov\
+ben.polly@nlr.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,5 +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: 'develop'
+  # 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
 # *********************************************************************************
 

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
 # *********************************************************************************
 

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
 # *********************************************************************************
 

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/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"
         },

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.1.0'.freeze
+    VERSION = '1.3.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

@@ -5,8 +5,8 @@ require 'urbanopt/reporting/version'
 Gem::Specification.new do |spec|
   spec.name          = 'urbanopt-reporting'
   spec.version       = URBANopt::Reporting::VERSION
-  spec.authors       = ['Rawad El Kontar', 'Dan Macumber']
-  spec.email         = ['rawad.elkontar@nrel.gov']
+  spec.authors       = ['Rawad El Kontar', 'Katherine Fleming', 'Dan Macumber']
+  spec.email         = ['rawad.elkontar@nlr.gov', 'katherine.fleming@nlr.gov']
 
   spec.summary       = 'Library to report URBANopt results'
   spec.description   = 'Library include scenario default reporting measure and scenario defaults reports schema and classes'
@@ -34,5 +34,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'json_pure', '~> 2.7'
   spec.add_runtime_dependency 'json-schema', '~> 4.3.1'
-  spec.add_dependency 'openstudio-extension', '~> 0.9.4'
+  spec.add_dependency 'openstudio-extension', '~> 0.9.7'
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: urbanopt-reporting
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Rawad El Kontar
+- Katherine Fleming
 - Dan Macumber
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-06 00:00:00.000000000 Z
+date: 2026-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -129,18 +130,19 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 0.9.7
 description: Library include scenario default reporting measure and scenario defaults
   reports schema and classes
 email:
-- rawad.elkontar@nrel.gov
+- rawad.elkontar@nlr.gov
+- katherine.fleming@nlr.gov
 executables: []
 extensions: []
 extra_rdoc_files: []