Merge branch 'develop'

kflemin · kflemin · commit f5ac8baf7c98 · 2026-01-23T16:28:04.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # URBANopt Scenario Gem
 
+## Version 1.2.0
+
+* Name changes and update license dates
+* Update from github.com/NREL to github.com/NatLabRockies
+* Update URBANopt dependencies
+
 ## Version 1.1.0
 
 * Upgrade to OpenStudio 3.10 by @vtnate in <https://github.com/urbanopt/urbanopt-scenario-gem/pull/278>
diff --git a/CONTRIBUTING.md b/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-scenario-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.
diff --git a/Gemfile b/Gemfile
@@ -17,7 +17,7 @@ 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
 
 # if allow_local && File.exist?('../urbanopt-core-gem')
@@ -29,7 +29,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # if allow_local && File.exist?('../openstudio-common-measures-gem')
 #  	gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
 # elsif allow_local
-#   gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
+#   gem 'openstudio-common-measures', github: 'NatLabRockies/openstudio-common-measures-gem', branch: 'develop'
 # else
 # 	gem 'openstudio-common-measures', '~> 0.12.3'
 # end
@@ -43,15 +43,15 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # if allow_local && File.exist?('../openstudio-standards-gem')
 #   gem 'openstudio-standards', path: '../openstudio-standards-gem'
 # elsif allow_local
-# 	gem 'openstudio-standards', github: 'NREL/openstudio-standards-gem', branch: 'develop'
+# 	gem 'openstudio-standards', github: 'NatLabRockies/openstudio-standards-gem', branch: 'develop'
 # else
 # 	gem 'openstudio-standards', '~> 0.8.2'
 # end
 
 # if allow_local && File.exist?('../openstudio-model-articulation-gem')
 #   gem 'openstudio-model-articulation', path: '../openstudio-model-articulation-gem'
 # elsif allow_local
-# 	gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
+# 	gem 'openstudio-model-articulation', github: 'NatLabRockies/openstudio-model-articulation-gem', branch: 'develop'
 # else
 # 	gem 'openstudio-model-articulation', '~> 0.12.2'
 # end
@@ -65,7 +65,7 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 # if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
 #   gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem'
 # elseif allow_local
-# 	gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'develop'
+# 	gem 'openstudio-load-flexibility-measures', github: 'NatLabRockies/openstudio-load-flexibility-measures-gem', branch: 'develop'
 # else
 # 	gem 'openstudio-load-flexibility-measures', '~> 0.11.1'
 # end
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2025, 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,
diff --git a/Rakefile b/Rakefile
@@ -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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/doc_templates/LICENSE.md b/doc_templates/LICENSE.md
@@ -1,4 +1,4 @@
-URBANopt (tm), Copyright (c) 2019-2025, 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,
diff --git a/doc_templates/copyright_erb.txt b/doc_templates/copyright_erb.txt
@@ -1,6 +1,6 @@
 <%
   # *********************************************************************************
-  # URBANopt (tm), Copyright (c) 2019-2025, 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,
diff --git a/doc_templates/copyright_js.txt b/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-scenario-gem/blob/develop/LICENSE.md
 */
diff --git a/doc_templates/copyright_ruby.txt b/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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
diff --git a/docs/package.json b/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",
diff --git a/lib/urbanopt-scenario.rb b/lib/urbanopt-scenario.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario.rb b/lib/urbanopt/scenario.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/default_reports.rb b/lib/urbanopt/scenario/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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/extension.rb b/lib/urbanopt/scenario/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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/logger.rb b/lib/urbanopt/scenario/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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_base.rb b/lib/urbanopt/scenario/scenario_base.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_csv.rb b/lib/urbanopt/scenario/scenario_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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_datapoint_base.rb b/lib/urbanopt/scenario/scenario_datapoint_base.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_post_processor_base.rb b/lib/urbanopt/scenario/scenario_post_processor_base.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_post_processor_default.rb b/lib/urbanopt/scenario/scenario_post_processor_default.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_post_processor_disco.rb b/lib/urbanopt/scenario/scenario_post_processor_disco.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_post_processor_opendss.rb b/lib/urbanopt/scenario/scenario_post_processor_opendss.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_runner_base.rb b/lib/urbanopt/scenario/scenario_runner_base.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_runner_osw.rb b/lib/urbanopt/scenario/scenario_runner_osw.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/scenario_visualization.rb b/lib/urbanopt/scenario/scenario_visualization.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/simulation_dir_base.rb b/lib/urbanopt/scenario/simulation_dir_base.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/simulation_dir_osw.rb b/lib/urbanopt/scenario/simulation_dir_osw.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/simulation_mapper_base.rb b/lib/urbanopt/scenario/simulation_mapper_base.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/lib/urbanopt/scenario/version.rb b/lib/urbanopt/scenario/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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
 module URBANopt
   module Scenario
-    VERSION = '1.1.0'.freeze
+    VERSION = '1.2.0'.freeze
   end
 end
diff --git a/spec/files/Gemfile b/spec/files/Gemfile
@@ -16,7 +16,7 @@ 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
 
 # if allow_local && File.exist?('../urbanopt-core-gem')
@@ -29,39 +29,39 @@ allow_local = ENV['FAVOR_LOCAL_GEMS']
 if allow_local && File.exist?('../openstudio-common-measures-gem')
   gem 'openstudio-common-measures', path: '../openstudio-common-measures-gem'
 elsif allow_local
-  gem 'openstudio-common-measures', github: 'NREL/openstudio-common-measures-gem', branch: 'develop'
+  gem 'openstudio-common-measures', github: 'NatLabRockies/openstudio-common-measures-gem', branch: 'develop'
 else
   gem 'openstudio-common-measures', '~> 0.11.0'
 end
 
 if allow_local && File.exist?('../openstudio-model-articulation-gem')
   gem 'openstudio-model-articulation', path: '../openstudio-model-articulation-gem'
 elsif allow_local
-  gem 'openstudio-model-articulation', github: 'NREL/openstudio-model-articulation-gem', branch: 'develop'
+  gem 'openstudio-model-articulation', github: 'NatLabRockies/openstudio-model-articulation-gem', branch: 'develop'
 else
   gem 'openstudio-model-articulation', '~> 0.11.0'
 end
 
 if allow_local && File.exist?('../openstudio-load-flexibility-measures-gem')
   gem 'openstudio-load-flexibility-measures', path: '../openstudio-load-flexibility-measures-gem'
 elsif allow_local
-  gem 'openstudio-load-flexibility-measures', github: 'NREL/openstudio-load-flexibility-measures-gem', branch: 'develop'
+  gem 'openstudio-load-flexibility-measures', github: 'NatLabRockies/openstudio-load-flexibility-measures-gem', branch: 'develop'
 else
   gem 'openstudio-load-flexibility-measures', '~> 0.10.0'
 end
 
 if allow_local && File.exist?('../openstudio-ee-gem')
   gem 'openstudio-ee', path: '../openstudio-ee-gem'
 elsif allow_local
-  gem 'openstudio-ee', github: 'NREL/openstudio-ee-gem', branch: 'develop'
+  gem 'openstudio-ee', github: 'NatLabRockies/openstudio-ee-gem', branch: 'develop'
 else
   gem 'openstudio-ee', '~> 0.11.0'
 end
 
 if allow_local && File.exist?('../openstudio-calibration-gem')
   gem 'openstudio-calibration', path: '../openstudio-calibration-gem'
 elsif allow_local
-  gem 'openstudio-calibration', github: 'NREL/openstudio-calibration-gem', branch: 'develop'
+  gem 'openstudio-calibration', github: 'NatLabRockies/openstudio-calibration-gem', branch: 'develop'
 else
   gem 'openstudio-calibration', '~> 0.11.0'
 end
diff --git a/spec/files/example_feature_file.rb b/spec/files/example_feature_file.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-scenario-gem/blob/develop/LICENSE.md
 # *********************************************************************************
 
diff --git a/spec/files/mappers/TestMapper1.rb b/spec/files/mappers/TestMapper1.rb
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
diff --git a/spec/urbanopt/urbanopt_scenario_reports_spec.rb b/spec/urbanopt/urbanopt_scenario_reports_spec.rb
diff --git a/spec/urbanopt/urbanopt_scenario_spec.rb b/spec/urbanopt/urbanopt_scenario_spec.rb
diff --git a/urbanopt-scenario-gem.gemspec b/urbanopt-scenario-gem.gemspec

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-URBANopt (tm), Copyright (c) 2019-2025, Alliance for Sustainable Energy, LLC, and other`
	`1`	`+URBANopt (tm), Copyright (c) 2019-2026, Alliance for Energy Innovation, LLC, and other`
`2`	`2`	`contributors. All rights reserved.`
`3`	`3`
`4`	`4`	`Redistribution and use in source and binary forms, with or without modification,`