Skip to content

Commit

Permalink
Merge pull request #48 from NREL/prep0.5.1
Browse files Browse the repository at this point in the history 
prep 0.5.1 - update licenses, bump version, update measures
  • Loading branch information
@DavidGoldwasser
DavidGoldwasser authored Oct 13, 2022
2 parents 6d0bbdf + 0ee2cda commit c0bcb26
Show file tree
Hide file tree
Showing 28 changed files with 66 additions and 61 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ runner.conf

# DS_Store
lib/.DS_Store
*.DS_Store
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# OpenStudio Load Flexibility Measures Gem

## Version 0.5.1
- Added the ShiftScheduleByType measure - [#47](https://github.com/NREL/openstudio-load-flexibility-measures-gem/issues/47)
- Updating licenses and measure versions / checksums for 2022

## Version 0.5.0
* Updated OS Standards dependency to 0.2.16
* Fixed [#41](https://github.com/NREL/openstudio-load-flexibility-measures-gem/issues/41), Error in applying add_hpwh measure with "non-simplified" options to MF prototype building in OS 3.3
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion doc_templates/LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion doc_templates/copyright_erb.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion doc_templates/copyright_js.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* @preserve
* OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
* OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.
* Use of this source code is governed by a BSD-style license that can be found at openstudio.net/license.
*/
2 changes: 1 addition & 1 deletion doc_templates/copyright_ruby.txt
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/ShiftScheduleByType/LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC. All rights reserved.
OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/ShiftScheduleByType/measure.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
44 changes: 22 additions & 22 deletions lib/measures/ShiftScheduleByType/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.0</schema_version>
<name>shift_schedule_by_type</name>
<uid>1c642348-f074-4ad1-98ee-2208ddc89ac7</uid>
<version_id>aa67fef9-7f57-42f4-bfc7-154fb6ab3f93</version_id>
<version_modified>20220902T145613Z</version_modified>
<version_id>e3c027e9-320b-4513-9f8e-965671745d86</version_id>
<version_modified>20221011T225327Z</version_modified>
<xml_checksum>B6CD1F98</xml_checksum>
<class_name>ShiftScheduleByType</class_name>
<display_name>ShiftScheduleByType</display_name>
Expand Down Expand Up @@ -76,11 +76,29 @@
<usage_type>readmeerb</usage_type>
<checksum>703C9964</checksum>
</file>
<file>
<filename>3Story2Space.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>B4AB814E</checksum>
</file>
<file>
<filename>README.md</filename>
<filetype>md</filetype>
<usage_type>readme</usage_type>
<checksum>74D43592</checksum>
</file>
<file>
<filename>ShiftScheduleByType_Test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>5C9B5A02</checksum>
</file>
<file>
<filename>LICENSE.md</filename>
<filetype>md</filetype>
<usage_type>license</usage_type>
<checksum>A21A3ED2</checksum>
<checksum>64FFEBDE</checksum>
</file>
<file>
<version>
Expand All @@ -91,25 +109,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>36BFA4B6</checksum>
</file>
<file>
<filename>3Story2Space.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>B4AB814E</checksum>
</file>
<file>
<filename>ShiftScheduleByType_Test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>5CB6CF38</checksum>
</file>
<file>
<filename>README.md</filename>
<filetype>md</filetype>
<usage_type>readme</usage_type>
<checksum>74D43592</checksum>
<checksum>80E0D89D</checksum>
</file>
</files>
</measure>
2 changes: 1 addition & 1 deletion lib/measures/ShiftScheduleByType/tests/ShiftScheduleByType_Test.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/add_central_ice_storage/LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/add_central_ice_storage/measure.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
12 changes: 6 additions & 6 deletions lib/measures/add_central_ice_storage/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.0</schema_version>
<name>add_central_ice_storage</name>
<uid>48f37812-0cb6-4770-b695-beb8d8a5660d</uid>
<version_id>f8f68f4a-4f32-4051-8f1f-0ec842998763</version_id>
<version_modified>20220505T192248Z</version_modified>
<version_id>25303cd9-74a2-451a-bf78-b4e03d2bd1a7</version_id>
<version_modified>20221011T225330Z</version_modified>
<xml_checksum>6394841D</xml_checksum>
<class_name>AddCentralIceStorage</class_name>
<display_name>Add Central Ice Storage</display_name>
Expand Down Expand Up @@ -474,19 +474,19 @@
<filename>LICENSE.md</filename>
<filetype>md</filetype>
<usage_type>license</usage_type>
<checksum>E0468DD6</checksum>
<checksum>64FFEBDE</checksum>
</file>
<file>
<filename>OsLib_Schedules.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>64AFEC72</checksum>
<checksum>0582294E</checksum>
</file>
<file>
<filename>add_central_ice_storage_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>10164E33</checksum>
<checksum>B4007921</checksum>
</file>
<file>
<version>
Expand All @@ -497,7 +497,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>C16EDFB8</checksum>
<checksum>554632ED</checksum>
</file>
</files>
</measure>
2 changes: 1 addition & 1 deletion lib/measures/add_central_ice_storage/resources/OsLib_Schedules.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/add_central_ice_storage/tests/add_central_ice_storage_test.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/add_hpwh/LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/add_hpwh/measure.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
10 changes: 5 additions & 5 deletions lib/measures/add_hpwh/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.0</schema_version>
<name>add_hpwh</name>
<uid>518cde6f-1806-4b9a-bee9-ccaac49c7a53</uid>
<version_id>67268596-50cb-4f0e-8fc2-9c6b5690ceb3</version_id>
<version_modified>20220505T192247Z</version_modified>
<version_id>5f32552c-4726-4ed6-b89a-a991afaecd60</version_id>
<version_modified>20221011T225330Z</version_modified>
<xml_checksum>A374667A</xml_checksum>
<class_name>AddHpwh</class_name>
<display_name>Add HPWH for Domestic Hot Water</display_name>
Expand Down Expand Up @@ -379,7 +379,7 @@ The flexibility of the system is based on user-defined temperatures and times, w
<filename>LICENSE.md</filename>
<filetype>md</filetype>
<usage_type>license</usage_type>
<checksum>E0468DD6</checksum>
<checksum>64FFEBDE</checksum>
</file>
<file>
<version>
Expand All @@ -390,13 +390,13 @@ The flexibility of the system is based on user-defined temperatures and times, w
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>B3DC865B</checksum>
<checksum>BDB9B944</checksum>
</file>
<file>
<filename>add_hpwh_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>DB9A9CE2</checksum>
<checksum>85B7D1A6</checksum>
</file>
</files>
</measure>
2 changes: 1 addition & 1 deletion lib/measures/add_hpwh/tests/add_hpwh_test.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/add_packaged_ice_storage/LICENSE.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted
provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/measures/add_packaged_ice_storage/measure.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
10 changes: 5 additions & 5 deletions lib/measures/add_packaged_ice_storage/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.0</schema_version>
<name>add_packaged_ice_storage</name>
<uid>2aa8c128-53b9-49fd-9aaf-9253a1f05936</uid>
<version_id>0169e58e-3682-493d-a4a3-60e58eca98d8</version_id>
<version_modified>20220505T192248Z</version_modified>
<version_id>12ace3fc-b9d5-4236-9087-9c2fb61ec8c2</version_id>
<version_modified>20221011T225330Z</version_modified>
<xml_checksum>2617824F</xml_checksum>
<class_name>AddPackagedIceStorage</class_name>
<display_name>Add Packaged Ice Storage</display_name>
Expand Down Expand Up @@ -222,13 +222,13 @@ If 'AutoSize' is selected for ice capacity, these inputs set an ice capacity siz
<filename>LICENSE.md</filename>
<filetype>md</filetype>
<usage_type>license</usage_type>
<checksum>E0468DD6</checksum>
<checksum>64FFEBDE</checksum>
</file>
<file>
<filename>add_packaged_ice_storage_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>B73245BC</checksum>
<checksum>F32CF657</checksum>
</file>
<file>
<version>
Expand All @@ -239,7 +239,7 @@ If 'AutoSize' is selected for ice capacity, these inputs set an ice capacity siz
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>4AE2C2E6</checksum>
<checksum>85F2A9C5</checksum>
</file>
</files>
</measure>
2 changes: 1 addition & 1 deletion lib/measures/add_packaged_ice_storage/tests/add_packaged_ice_storage_test.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion lib/openstudio/load_flexibility_measures.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
4 changes: 2 additions & 2 deletions lib/openstudio/load_flexibility_measures/version.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down Expand Up @@ -35,6 +35,6 @@

module OpenStudio
module LoadFlexibilityMeasures
VERSION = '0.5.0'.freeze
VERSION = '0.5.1'.freeze
end
end
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion spec/tests/load_flexibility_measures_spec.rb
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************************************
# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
# OpenStudio(R), Copyright (c) 2008-2022, Alliance for Sustainable Energy, LLC.
# All rights reserved.
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
Expand Down

0 comments on commit c0bcb26

Please sign in to comment.