openstudio-load-flexibility-measures 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34389d51f3a0e19bedbb600916df148ef929b1c8a1cf8eff8291f56724ea1011
-  data.tar.gz: 1964e592d6849974bda5e7605b7143a7ea5aaab7a5c1f24b7774a03bfc9220db
+  metadata.gz: 3067d071796cf31183292010668e79ad8f434cc5affc3cdb991d9fa79afb5a07
+  data.tar.gz: 445adcf8663134e60fe14eb8d50104920eab3703e11ebd73e6f12782f716748b
 SHA512:
-  metadata.gz: 16599341e89e6a5db13f8093c5086d435f4ac3c8bb8716ed9e9237c584a4442864ca3c70fc987458a2d268b68edd3d0d37b5e918a7e107d6368e210da463bafa
-  data.tar.gz: 4eab8b7a18b262ed03ae7eeaa22156580ed629df1a4b40fdc91046d1eaab5af49e8a87b3e5b41ee4ff8fe4f0ef9969ed199e3d3759df256cac7b6131836edfd0
+  metadata.gz: 9c62fbf8957c40e177a11148e344c4bb357bc2ab84256842166596bfb6676208500f5d58ca0be8267f70fdd0866a5694b1ee5a8576a8d4dc6d0fbe053900717a
+  data.tar.gz: 99bccbd7f9c5400c53ee041394f921fd9a10bae81f9ca8bd6caadcd91fa44009b958dcabb556cda9ed149d481272c84539b883674687fca62d9dee6028542767

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # OpenStudio Load Flexibility Measures Gem
 
+## Version 0.1.2
+
+* Bug Fixes:
+  * ![Fixed:][fixed] [#4](https://github.com/NREL/openstudio-load-flexibility-measures-gem/issues/4), use unix paths in 'add_distributed_ice_storage_to_air_loop_for_load_flexibility'
+  * ![Fixed:][fixed] [#6](https://github.com/NREL/openstudio-load-flexibility-measures-gem/issues/6), code error in add_distributed measure
+  * ![Fixed:][fixed] [#8](https://github.com/NREL/openstudio-load-flexibility-measures-gem/issues/8), EMS output variables cause measure failure
+* Remove .DS_Store and exclude from future releases
+* Code cleanup
+
 ## Version 0.1.1
 
 * Initial release

data/Gemfile

@@ -1,3 +1,7 @@
 source 'http://rubygems.org'
 
 gemspec
+
+if File.exist?('../openstudio-standards')
+  gem 'openstudio-standards', path: '../openstudio-standards'
+end

data/lib/measures/add_central_hpwh_for_load_flexibility/LICENSE.md

@@ -1 +1,27 @@
-Insert your license here
+OpenStudio(R), Copyright (c) 2008-2020, 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:
+
+(1) Redistributions of source code must retain the above copyright notice, this list of conditions 
+and the following disclaimer.
+
+(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse 
+or promote products derived from this software without specific prior written permission from the 
+respective party.
+
+(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other 
+derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar 
+designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT, 
+OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/measures/add_central_hpwh_for_load_flexibility/README.md

@@ -21,7 +21,7 @@ ModelMeasure
 ## Arguments
 
 
-### Remove existing water heater on selected loop?
+### Remove existing water heater on selected loop
 
 **Name:** remove_wh,
 **Type:** Boolean,
@@ -70,7 +70,7 @@ This is where the water heater tank will be placed
 **Model Dependent:** false
 
 ### Set heat pump rated COP (heating)
-[-]
+
 **Name:** cop,
 **Type:** Double,
 **Units:** ,

data/lib/measures/add_central_hpwh_for_load_flexibility/measure.rb

@@ -43,7 +43,7 @@
 # EnergyPlus Engineering Reference, Sections:
 
 # start the measure
-class AddCentralHPWHForLoadFlexibility < OpenStudio::Measure::ModelMeasure
+class AddCentralHpwhForLoadFlexibility < OpenStudio::Measure::ModelMeasure
   require 'openstudio-standards'
 
   # human readable name
@@ -87,7 +87,7 @@ class AddCentralHPWHForLoadFlexibility < OpenStudio::Measure::ModelMeasure
 
     # create argument for removal of existing water heater tanks on selected loop
     remove_wh = OpenStudio::Measure::OSArgument.makeBoolArgument('remove_wh', true)
-    remove_wh.setDisplayName('Remove existing water heater on selected loop?')
+    remove_wh.setDisplayName('Remove existing water heater on selected loop')
     remove_wh.setDescription('')
     remove_wh.setDefaultValue(true)
     args << remove_wh
@@ -176,7 +176,6 @@ class AddCentralHPWHForLoadFlexibility < OpenStudio::Measure::ModelMeasure
     # create argument for heat pump rated cop
     cop = OpenStudio::Measure::OSArgument.makeDoubleArgument('cop', true)
     cop.setDisplayName('Set heat pump rated COP (heating)')
-    cop.setDescription('[-]')
     cop.setDefaultValue(2.8)
     args << cop
 
@@ -645,4 +644,4 @@ class AddCentralHPWHForLoadFlexibility < OpenStudio::Measure::ModelMeasure
 end
 
 # register the measure to be used by the application
-AddCentralHPWHForLoadFlexibility.new.registerWithApplication
+AddCentralHpwhForLoadFlexibility.new.registerWithApplication

data/lib/measures/add_central_hpwh_for_load_flexibility/measure.xml

@@ -3,10 +3,10 @@
   <schema_version>3.0</schema_version>
   <name>add_central_hpwh_for_load_flexibility</name>
   <uid>518cde6f-1806-4b9a-bee9-ccaac49c7a53</uid>
-  <version_id>13943fd8-e7ff-41ea-8e90-3c767bcfa466</version_id>
-  <version_modified>20200727T193248Z</version_modified>
+  <version_id>5be8272a-251e-4e96-8e32-cded6decab33</version_id>
+  <version_modified>20200806T183852Z</version_modified>
   <xml_checksum>A374667A</xml_checksum>
-  <class_name>AddCentralHPWHForLoadFlexibility</class_name>
+  <class_name>AddCentralHpwhForLoadFlexibility</class_name>
   <display_name>flexible_domestic_hot_water</display_name>
   <description>This measure adds or replaces existing domestic hot water heater with air source heat pump system and allows for the addition of multiple daily flexible control time windows. The heater/tank system may charge at maximum capacity up to an elevated temperature, or float without any heat addition for a specified timeframe down to a minimum tank temperature.</description>
   <modeler_description>This measure allows selection between three heat pump water heater modeling approaches in EnergyPlus.The user may select between the pumped-condenser or wrapped-condenser objects. They may also elect to use a simplified calculation which does not use the heat pump objects, but instead used an electric resistance heater and approximates the equivalent electrical input that would be required from a heat pump. This expedites simulation at the expense of accuracy. 
@@ -15,7 +15,7 @@ The flexibility of the system is based on user-defined temperatures and times, w
   <arguments>
     <argument>
       <name>remove_wh</name>
-      <display_name>Remove existing water heater on selected loop?</display_name>
+      <display_name>Remove existing water heater on selected loop</display_name>
       <description></description>
       <type>Boolean</type>
       <required>true</required>
@@ -106,7 +106,6 @@ The flexibility of the system is based on user-defined temperatures and times, w
     <argument>
       <name>cop</name>
       <display_name>Set heat pump rated COP (heating)</display_name>
-      <description>[-]</description>
       <type>Double</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -347,12 +346,6 @@ The flexibility of the system is based on user-defined temperatures and times, w
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>CD7F5672</checksum>
-    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
@@ -372,27 +365,33 @@ The flexibility of the system is based on user-defined temperatures and times, w
       <checksum>E8326C12</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
+      <filename>LICENSE.md</filename>
       <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>E4E50206</checksum>
+      <usage_type>license</usage_type>
+      <checksum>E0468DD6</checksum>
+    </file>
+    <file>
+      <filename>add_central_hpwh_for_load_flexibility.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>349A48C2</checksum>
     </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
-        <identifier>2.8.0</identifier>
+        <identifier>3.0.0</identifier>
         <min_compatible>2.8.0</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>97C8CF92</checksum>
+      <checksum>3E6F88C9</checksum>
     </file>
     <file>
-      <filename>add_central_hpwh_for_load_flexibility.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>test</usage_type>
-      <checksum>28D79679</checksum>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>48EE62B0</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/add_central_hpwh_for_load_flexibility/tests/add_central_hpwh_for_load_flexibility.rb

@@ -41,7 +41,7 @@ require 'minitest/autorun'
 require_relative '../measure.rb'
 require 'fileutils'
 
-class AddCentralHPWHForLoadFlexibilityTest < Minitest::Test
+class AddCentralHpwhForLoadFlexibilityTest < Minitest::Test
   # def setup
   # end
 
@@ -50,7 +50,7 @@ class AddCentralHPWHForLoadFlexibilityTest < Minitest::Test
 
   def test_good_argument_values
     # create an instance of the measure
-    measure = AddCentralHPWHForLoadFlexibility.new
+    measure = AddCentralHpwhForLoadFlexibility.new
 
     # create runner with empty OSW
     osw = OpenStudio::WorkflowJSON.new
@@ -85,12 +85,12 @@ class AddCentralHPWHForLoadFlexibilityTest < Minitest::Test
     measure.run(model, runner, argument_map)
     result = runner.result
 
-    # show the output
-    show_output(result)
-
     # assert that it ran correctly
     assert_equal('Success', result.value.valueName)
 
+    # show the output
+    show_output(result)
+
     # save the model to test output directory
     output_file_path = "#{File.dirname(__FILE__)}//output/test_output.osm"
     model.save(output_file_path, true)

data/lib/measures/add_distributed_ice_storage_to_air_loop_for_load_flexibility/LICENSE.md

@@ -1,13 +1,27 @@
 OpenStudio(R), Copyright (c) 2008-2020, 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:
+Redistribution and use in source and binary forms, with or without modification, are permitted 
+provided that the following conditions are met:
 
-(1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+(1) Redistributions of source code must retain the above copyright notice, this list of conditions 
+and the following disclaimer.
 
-(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission from the respective party.
+(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse 
+or promote products derived from this software without specific prior written permission from the 
+respective party.
 
-(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
+(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other 
+derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar 
+designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT, 
+OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/measures/add_distributed_ice_storage_to_air_loop_for_load_flexibility/measure.rb

@@ -79,7 +79,7 @@ class AddDistributedIceStorageToAirLoopForLoadFlexibility < OpenStudio::Measure:
 
     # make boolean argument for selecting cooling coils to replace
     coilhash.each do |k, v|
-      coil_selection = OpenStudio::Measure::OSArgument.makeBoolArgument(c, true)
+      coil_selection = OpenStudio::Measure::OSArgument.makeBoolArgument(k, true)
       coil_selection.setDisplayName(k)
       coil_selection.setDefaultValue(v)
       args << coil_selection
@@ -92,7 +92,7 @@ class AddDistributedIceStorageToAirLoopForLoadFlexibility < OpenStudio::Measure:
     args << ice_cap
 
     size_mult = OpenStudio::Measure::OSArgument.makeStringArgument('size_mult', false)
-    size_mult.setDisplayName('Enter a sizing multiplier to manually adjust the autosize results for ice tank capacities.')
+    size_mult.setDisplayName('Enter a sizing multiplier to manually adjust the autosize results for ice tank capacities')
     size_mult.setDefaultValue('1.0')
     args << size_mult
 
@@ -103,7 +103,7 @@ class AddDistributedIceStorageToAirLoopForLoadFlexibility < OpenStudio::Measure:
     args << ctl
 
     # obtain default schedule names in TESCurves.idf. This allows users to manually add schedules to the idf and be able to access them in OS or PAT
-    source_idf = OpenStudio::IdfFile.load(OpenStudio::Path.new(File.dirname(__FILE__) + '\resources\TESCurves.idf')).get
+    source_idf = OpenStudio::IdfFile.load(OpenStudio::Path.new(File.dirname(__FILE__) + '/resources/TESCurves.idf')).get
     schedules = source_idf.getObjectsByType('Schedule:Compact'.to_IddObjectType)
     schedule_names = OpenStudio::StringVector.new
 
@@ -120,14 +120,14 @@ class AddDistributedIceStorageToAirLoopForLoadFlexibility < OpenStudio::Measure:
 
     # make arguement for weekend TES operation
     wknd = OpenStudio::Measure::OSArgument.makeBoolArgument('wknd', false)
-    wknd.setDisplayName('Run TES on the weekends?')
-    wknd.setDescription('Select if building is occupied on weekends.')
+    wknd.setDisplayName('Run TES on the weekends')
+    wknd.setDescription('Select if building is occupied on weekends')
     wknd.setDefaultValue(true)
     args << wknd
 
     # make arguments for operating season
     season = OpenStudio::Measure::OSArgument.makeStringArgument('season', false)
-    season.setDisplayName('Select season during which the ice cooling may be used:')
+    season.setDisplayName('Select season during which the ice cooling may be used')
     season.setDescription('Use MM/DD-MM/DD format')
     season.setDefaultValue('01/01-12/31')
     args << season
@@ -172,7 +172,8 @@ class AddDistributedIceStorageToAirLoopForLoadFlexibility < OpenStudio::Measure:
     end
 
     # load required TESCurves.idf. This contains all the TES performance curves and default schedules
-    source_idf = OpenStudio::IdfFile.load(OpenStudio::Path.new(File.dirname(__FILE__) + '\resources\TESCurves.idf')).get
+    source_idf = OpenStudio::IdfFile.load(OpenStudio::Path.new(File.dirname(__FILE__) + '/resources/TESCurves.idf')).get
+
     # workspace.addObjects(idf_obj_vector) does not work here. Add each obj individually.
     source_idf.objects.each do |o|
       workspace.addObject(o)

data/lib/measures/add_distributed_ice_storage_to_air_loop_for_load_flexibility/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>add_distributed_ice_storage_to_air_loop_for_load_flexibility</name>
   <uid>2aa8c128-53b9-49fd-9aaf-9253a1f05936</uid>
-  <version_id>58142df5-609b-4ec5-9312-35d9a76a94ea</version_id>
-  <version_modified>20200727T193248Z</version_modified>
+  <version_id>8b55d314-a611-495a-bbc3-47cdd3ed9e86</version_id>
+  <version_modified>20200806T183852Z</version_modified>
   <xml_checksum>2617824F</xml_checksum>
   <class_name>AddDistributedIceStorageToAirLoopForLoadFlexibility</class_name>
   <display_name>Add Distributed Ice Storage to Air Loop for Load Flexibility</display_name>
@@ -34,7 +34,7 @@
     </argument>
     <argument>
       <name>size_mult</name>
-      <display_name>Enter a sizing multiplier to manually adjust the autosize results for ice tank capacities.</display_name>
+      <display_name>Enter a sizing multiplier to manually adjust the autosize results for ice tank capacities</display_name>
       <type>String</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -91,8 +91,8 @@
     </argument>
     <argument>
       <name>wknd</name>
-      <display_name>Run TES on the weekends?</display_name>
-      <description>Select if building is occupied on weekends.</description>
+      <display_name>Run TES on the weekends</display_name>
+      <description>Select if building is occupied on weekends</description>
       <type>Boolean</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -110,7 +110,7 @@
     </argument>
     <argument>
       <name>season</name>
-      <display_name>Select season during which the ice cooling may be used:</display_name>
+      <display_name>Select season during which the ice cooling may be used</display_name>
       <description>Use MM/DD-MM/DD format</description>
       <type>String</type>
       <required>false</required>
@@ -208,12 +208,6 @@ If 'AutoSize' is selected for ice capacity, these inputs set an ice capacity siz
     </attribute>
   </attributes>
   <files>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>59B484B4</checksum>
-    </file>
     <file>
       <filename>TESCurves.idf</filename>
       <filetype>idf</filetype>
@@ -232,11 +226,17 @@ If 'AutoSize' is selected for ice capacity, these inputs set an ice capacity siz
       <usage_type>readme</usage_type>
       <checksum>B27484F2</checksum>
     </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>E0468DD6</checksum>
+    </file>
     <file>
       <filename>add_distributed_ice_storage_to_air_loop_for_load_flexibility_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>FE5F5343</checksum>
+      <checksum>FC11EAC7</checksum>
     </file>
     <file>
       <version>
@@ -247,7 +247,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>65E65993</checksum>
+      <checksum>AFBDDEF7</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/add_ice_storage_to_plant_loop_for_load_flexibility/LICENSE.md

@@ -1,13 +1,27 @@
 OpenStudio(R), Copyright (c) 2008-2020, 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:
+Redistribution and use in source and binary forms, with or without modification, are permitted 
+provided that the following conditions are met:
 
-(1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+(1) Redistributions of source code must retain the above copyright notice, this list of conditions 
+and the following disclaimer.
 
-(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions
+and the following disclaimer in the documentation and/or other materials provided with the distribution.
 
-(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products derived from this software without specific prior written permission from the respective party.
+(3) Neither the name of the copyright holder nor the names of any contributors may be used to endorse 
+or promote products derived from this software without specific prior written permission from the 
+respective party.
 
-(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
+(4) Other than as required in clauses (1) and (2), distributions in any form of modifications or other 
+derivative works may not use the "OpenStudio" trademark, "OS", "os", or any other confusingly similar 
+designation without specific prior written permission from Alliance for Sustainable Energy, LLC.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT, OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED 
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER, THE UNITED STATES GOVERNMENT, 
+OR ANY CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, 
+OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/measures/add_ice_storage_to_plant_loop_for_load_flexibility/README.md

@@ -83,7 +83,7 @@ Enter as a fraction of chiller capacity (0.0 - 1.0).
 **Required:** false,
 **Model Dependent:** false
 
-### Use Existing (Pre-Defined) Temperature Control Schedules?
+### Use Existing (Pre-Defined) Temperature Control Schedules
 Use drop-down selections below.
 **Name:** old,
 **Type:** Boolean,
@@ -115,7 +115,7 @@ Use drop-down selections below.
 **Required:** false,
 **Model Dependent:** false
 
-### Create New (Simple) Temperature Control Schedules?
+### Create New (Simple) Temperature Control Schedules
 Use entry fields below. If Pre-Defined is also selected, these new schedules will be created but not applied.
 **Name:** new,
 **Type:** Boolean,
@@ -195,7 +195,7 @@ Use 24 hour format (HR:MM)
 **Required:** true,
 **Model Dependent:** false
 
-### Allow Ice Discharge on Weekends?
+### Allow Ice Discharge on Weekends
 
 **Name:** wknds,
 **Type:** Boolean,
@@ -211,7 +211,7 @@ This will not change reporting frequency for existing output variables in the mo
 **Required:** false,
 **Model Dependent:** false
 
-### Test Demand Reponse Event?
+### Test Demand Reponse Event
 
 **Name:** dr,
 **Type:** Boolean,
@@ -251,7 +251,7 @@ Use 24 hour format (HR:MM)
 **Required:** false,
 **Model Dependent:** false
 
-### Allow chiller to back-up ice during DR event?
+### Allow chiller to back-up ice during DR event
 Unselection may result in unmet cooling hours
 **Name:** dr_chill,
 **Type:** Boolean,

data/lib/measures/add_ice_storage_to_plant_loop_for_load_flexibility/measure.rb

@@ -143,19 +143,19 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
     # Make double argument for ice chiller resizing factor - relative to selected chiller capacity
     chiller_resize_factor = OpenStudio::Measure::OSArgument.makeDoubleArgument('chiller_resize_factor', false)
     chiller_resize_factor.setDisplayName('Enter Chiller Sizing Factor:')
-    chiller_resize_factor.setDefaultValue('0.7')
+    chiller_resize_factor.setDefaultValue(0.75)
     args << chiller_resize_factor
 
     # Make double argument for chiller max capacity limit during ice discharge
     chiller_limit = OpenStudio::Measure::OSArgument.makeDoubleArgument('chiller_limit', false)
     chiller_limit.setDisplayName('Enter Chiller Max Capacity Limit During Ice Discharge:')
     chiller_limit.setDescription('Enter as a fraction of chiller capacity (0.0 - 1.0).')
-    chiller_limit.setDefaultValue('0.75')
+    chiller_limit.setDefaultValue(1.0)
     args << chiller_limit
 
     # Make choice argument for schedule options
     old = OpenStudio::Measure::OSArgument.makeBoolArgument('old', false)
-    old.setDisplayName('Use Existing (Pre-Defined) Temperature Control Schedules?')
+    old.setDisplayName('Use Existing (Pre-Defined) Temperature Control Schedules')
     old.setDescription('Use drop-down selections below.')
     old.setDefaultValue(false)
     args << old
@@ -207,7 +207,7 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
 
     # Make bool argument for creating new schedules
     new = OpenStudio::Measure::OSArgument.makeBoolArgument('new', false)
-    new.setDisplayName('Create New (Simple) Temperature Control Schedules?')
+    new.setDisplayName('Create New (Simple) Temperature Control Schedules')
     new.setDescription('Use entry fields below. If Pre-Defined is also selected, these new schedules will be created' \
                        ' but not applied.')
     new.setDefaultValue(true)
@@ -231,7 +231,7 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
     # Make double argument for loop temperature for ice charging
     chg_sp = OpenStudio::Measure::OSArgument.makeDoubleArgument('chg_sp', true)
     chg_sp.setDisplayName('Ice Charging Setpoint Temperature F:')
-    chg_sp.setDefaultValue('25')
+    chg_sp.setDefaultValue(25)
     args << chg_sp
 
     # Make double argument for loop design delta T
@@ -276,7 +276,7 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
 
     # Make boolean arguments for ctes dischage days
     wknds = OpenStudio::Measure::OSArgument.makeBoolArgument('wknds', true)
-    wknds.setDisplayName('Allow Ice Discharge on Weekends?')
+    wknds.setDisplayName('Allow Ice Discharge on Weekends')
     wknds.setDefaultValue(false)
     args << wknds
 
@@ -291,15 +291,13 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
     ## DR TESTER INPUTS -----------------------------------------
     # Make boolean argument for use of demand response event test
     dr = OpenStudio::Measure::OSArgument.makeBoolArgument('dr', false)
-    dr.setDisplayName('Test Demand Reponse Event?')
-    dr.setDescription('')
+    dr.setDisplayName('Test Demand Reponse Event')
     dr.setDefaultValue(false)
     args << dr
 
     # Make choice argument for type of demand response event (add or shed)
     dr_add_shed = OpenStudio::Measure::OSArgument.makeChoiceArgument('dr_add_shed', ['Add', 'Shed'], false)
     dr_add_shed.setDisplayName('Select if a Load Add or Load Shed Event')
-    dr_add_shed.setDescription('')
     dr_add_shed.setDefaultValue('Shed')
     args << dr_add_shed
 
@@ -320,13 +318,12 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
     # Make double argument for DR event duration
     dr_dur = OpenStudio::Measure::OSArgument.makeDoubleArgument('dr_dur', false)
     dr_dur.setDisplayName('Enter duration of demand response event [hr]:')
-    dr_dur.setDescription('')
-    dr_dur.setDefaultValue('3')
+    dr_dur.setDefaultValue(3)
     args << dr_dur
 
     # Make boolean argument for allowing chiller to back-up ice
     dr_chill = OpenStudio::Measure::OSArgument.makeBoolArgument('dr_chill', false)
-    dr_chill.setDisplayName('Allow chiller to back-up ice during DR event?')
+    dr_chill.setDisplayName('Allow chiller to back-up ice during DR event')
     dr_chill.setDescription('Unselection may result in unmet cooling hours')
     dr_chill.setDefaultValue('false')
     args << dr_chill
@@ -858,6 +855,29 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
    		                  "   * #{demand_sp_mgr.name}")
     end
 
+    ## Create General EMS Variables for Chiller and TES Capacities------------------------------------------------------
+
+    # Chiller Nominal Capacity Internal Variable
+    evar_chiller_cap = OpenStudio::Model::EnergyManagementSystemInternalVariable.new(model, 'Chiller Nominal Capacity')
+    evar_chiller_cap.setInternalDataIndexKeyName(ctes_chiller.name.to_s)
+    evar_chiller_cap.setName('CTES_Chiller_Capacity')
+
+    # Ice Tank thermal storage capacity - Empty Global Variable
+    evar_tes_cap = OpenStudio::Model::EnergyManagementSystemGlobalVariable.new(model, 'TES_Cap')
+
+    # Set TES Capacity from User Inputs
+    set_tes_cap = OpenStudio::Model::EnergyManagementSystemProgram.new(model)
+    set_tes_cap.setName('Set_TES_Cap')
+    body = <<-EMS
+      SET TES_Cap = #{storage_capacity}
+    EMS
+    set_tes_cap.setBody(body)
+
+    set_tes_cap_pcm = OpenStudio::Model::EnergyManagementSystemProgramCallingManager.new(model)
+    set_tes_cap_pcm.setName('Set_TES_Cap_CallMgr')
+    set_tes_cap_pcm.setCallingPoint('BeginNewEnvironment')
+    set_tes_cap_pcm.addProgram(set_tes_cap)
+
     ## Create EMS Components to Control Load on Upstream (Priority) Device----------------------------------------------
 
     # Flag value indicating that a chiller limiter is required or DR Test is Activated
@@ -874,10 +894,6 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
   		                  'outlet setpoint. ')
 
       # Internal and Global Variable(s)
-      # Chiller Nominal Capacity
-      evar_chiller_cap = OpenStudio::Model::EnergyManagementSystemInternalVariable.new(model, 'Chiller Nominal Capacity')
-      evar_chiller_cap.setInternalDataIndexKeyName(ctes_chiller.name.to_s)
-      evar_chiller_cap.setName('CTES_Chiller_Capacity')
 
       # Chiller Limited Capacity for Ice Discharge Period - Empty Global Variable
       evar_chiller_limit = OpenStudio::Model::EnergyManagementSystemGlobalVariable.new(model, 'Chiller_Limited_Capacity')
@@ -885,9 +901,6 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
       # Instances of Chiller Limit Application - Empty Global Variable
       evar_limit_counter = OpenStudio::Model::EnergyManagementSystemGlobalVariable.new(model, 'Limit_Counter')
 
-      # Ice Tank thermal storage capacity - Empty Global Variable
-      evar_tes_cap = OpenStudio::Model::EnergyManagementSystemGlobalVariable.new(model, 'TES_Cap')
-
       # Max Delta-T for Chiller De-Rate - Empty Global Variable
       dt_ems = OpenStudio::Model::EnergyManagementSystemGlobalVariable.new(model, 'DT_Max')
 
@@ -964,7 +977,6 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
   			SET Limit_Counter = 0
   			SET DR_Flag = 0
         SET DT_Max = #{dt_max}
-        SET TES_Cap = #{storage_capacity}
       EMS
       chiller_limit_calculation.setBody(body)
 
@@ -979,18 +991,13 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
       chiller_limit_calc_pcm.setCallingPoint('BeginNewEnvironment')
       chiller_limit_calc_pcm.addProgram(chiller_limit_calculation)
 
-      # EMS Output Variable(s)
-      eout_chiller_cap = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, evar_chiller_cap)
-      eout_chiller_cap.setName('Chiller Nominal Capacity')
-
+      # EMS Output Variable(s) - Chiller Limiter Dependent
       eout_chiller_limit = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, evar_chiller_limit)
       eout_chiller_limit.setName('Chiller Limited Capacity')
 
       eout_limit_counter = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, evar_limit_counter)
       eout_limit_counter.setName('Chiller Limit Counter')
 
-      eout_tes_cap = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, evar_tes_cap)
-      eout_tes_cap.setName('Ice Thermal Storage Capacity')
     end
 
     ## DR EVENT TESTER EMS --------------------------
@@ -1075,6 +1082,13 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
 
     ## Add Output Variables and Meters----------------------------------------------------------------------------------
 
+    # EMS Output Variable(s) - Chiller Limit Independent
+    eout_chiller_cap = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, evar_chiller_cap)
+    eout_chiller_cap.setName('Chiller Nominal Capacity')
+
+    eout_tes_cap = OpenStudio::Model::EnergyManagementSystemOutputVariable.new(model, evar_tes_cap)
+    eout_tes_cap.setName('Ice Thermal Storage Capacity')
+
     # Identify existing output variables
     vars = model.getOutputVariables
     var_names = []
@@ -1234,12 +1248,6 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
 
     if chiller_limit != 1.0 # flag for EMS use, following EMS vars only exist if previous script ran
 
-      # Create output variable for chiller nominal capacity (from EMS Output Variable)
-      v = OpenStudio::Model::OutputVariable.new(eout_chiller_cap.name.to_s, model)
-      v.setName("#{ctes_chiller.name} Nominal Capacity [W]")
-      v.setVariableName('Chiller Nominal Capacity')
-      ovars << v
-
       # Create output variable for chiller limited capacity (from EMS Output Variable)
       v = OpenStudio::Model::OutputVariable.new(eout_chiller_limit.name.to_s, model)
       v.setName("#{ctes_chiller.name} Limited Capacity")
@@ -1270,6 +1278,12 @@ class AddIceStorageToPlantLoopForLoadFlexibility < OpenStudio::Measure::ModelMea
     v.setVariableName('Ice Thermal Storage Capacity')
     ovars << v
 
+    # Create output variable for chiller nominal capacity (from EMS Output Variable)
+    v = OpenStudio::Model::OutputVariable.new(eout_chiller_cap.name.to_s, model)
+    v.setName("#{ctes_chiller.name} Nominal Capacity [W]")
+    v.setVariableName('Chiller Nominal Capacity')
+    ovars << v
+
     # Set variable reporting frequency for newly created output variables
     ovars.each do |var|
       var.setReportingFrequency(report_freq)

data/lib/measures/add_ice_storage_to_plant_loop_for_load_flexibility/measure.xml

@@ -3,8 +3,8 @@
   <schema_version>3.0</schema_version>
   <name>add_ice_storage_to_plant_loop_for_load_flexibility</name>
   <uid>48f37812-0cb6-4770-b695-beb8d8a5660d</uid>
-  <version_id>ec8fce33-0983-427d-baf9-624b66c9bdb6</version_id>
-  <version_modified>20200729T185358Z</version_modified>
+  <version_id>7c7e99fa-5fa6-403b-98d2-d08a19e2dba2</version_id>
+  <version_modified>20200806T183852Z</version_modified>
   <xml_checksum>6394841D</xml_checksum>
   <class_name>AddIceStorageToPlantLoopForLoadFlexibility</class_name>
   <display_name>Add Ice Storage Tank</display_name>
@@ -97,7 +97,7 @@
       <type>Double</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
-      <default_value>0.7</default_value>
+      <default_value>0.75</default_value>
     </argument>
     <argument>
       <name>chiller_limit</name>
@@ -106,11 +106,11 @@
       <type>Double</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
-      <default_value>0.75</default_value>
+      <default_value>1</default_value>
     </argument>
     <argument>
       <name>old</name>
-      <display_name>Use Existing (Pre-Defined) Temperature Control Schedules?</display_name>
+      <display_name>Use Existing (Pre-Defined) Temperature Control Schedules</display_name>
       <description>Use drop-down selections below.</description>
       <type>Boolean</type>
       <required>false</required>
@@ -171,7 +171,7 @@
     </argument>
     <argument>
       <name>new</name>
-      <display_name>Create New (Simple) Temperature Control Schedules?</display_name>
+      <display_name>Create New (Simple) Temperature Control Schedules</display_name>
       <description>Use entry fields below. If Pre-Defined is also selected, these new schedules will be created but not applied.</description>
       <type>Boolean</type>
       <required>false</required>
@@ -270,7 +270,7 @@
     </argument>
     <argument>
       <name>wknds</name>
-      <display_name>Allow Ice Discharge on Weekends?</display_name>
+      <display_name>Allow Ice Discharge on Weekends</display_name>
       <type>Boolean</type>
       <required>true</required>
       <model_dependent>false</model_dependent>
@@ -323,8 +323,7 @@
     </argument>
     <argument>
       <name>dr</name>
-      <display_name>Test Demand Reponse Event?</display_name>
-      <description></description>
+      <display_name>Test Demand Reponse Event</display_name>
       <type>Boolean</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -343,7 +342,6 @@
     <argument>
       <name>dr_add_shed</name>
       <display_name>Select if a Load Add or Load Shed Event</display_name>
-      <description></description>
       <type>Choice</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -380,7 +378,6 @@
     <argument>
       <name>dr_dur</name>
       <display_name>Enter duration of demand response event [hr]:</display_name>
-      <description></description>
       <type>Double</type>
       <required>false</required>
       <model_dependent>false</model_dependent>
@@ -388,7 +385,7 @@
     </argument>
     <argument>
       <name>dr_chill</name>
-      <display_name>Allow chiller to back-up ice during DR event?</display_name>
+      <display_name>Allow chiller to back-up ice during DR event</display_name>
       <description>Unselection may result in unmet cooling hours</description>
       <type>Boolean</type>
       <required>false</required>
@@ -461,46 +458,46 @@
       <usage_type>test</usage_type>
       <checksum>A3FC1180</checksum>
     </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>59B484B4</checksum>
-    </file>
     <file>
       <filename>Ice Measure Implementation Guide.pdf</filename>
       <filetype>pdf</filetype>
       <usage_type>doc</usage_type>
       <checksum>090841B0</checksum>
     </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>F360189C</checksum>
-    </file>
     <file>
       <filename>OsLib_Schedules.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
       <checksum>2F6D3DE2</checksum>
     </file>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>E0468DD6</checksum>
+    </file>
     <file>
       <filename>add_ice_storage_to_plant_loop_for_load_flexibility_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>7C4811E5</checksum>
+      <checksum>4CDCF2D8</checksum>
     </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
-        <identifier>2.7.1</identifier>
+        <identifier>3.0.0</identifier>
         <min_compatible>2.7.1</min_compatible>
       </version>
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>E05DCD4F</checksum>
+      <checksum>32CD91EE</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>69EDB2DB</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/add_ice_storage_to_plant_loop_for_load_flexibility/tests/add_ice_storage_to_plant_loop_for_load_flexibility_test.rb

@@ -160,6 +160,7 @@ class AddIceStorageToPlantLoopForLoadFlexibilityTest < Minitest::Test
     args_hash['storage_capacity'] = 550
     args_hash['melt_indicator'] = 'InsideMelt'
     args_hash['chiller_resize_factor'] = 0.75
+    args_hash['chiller_limit'] = 0.7
     args_hash['chg_sp'] = 26
     args_hash['loop_sp'] = 42
     args_hash['delta_t'] = '16'

data/lib/openstudio/load_flexibility_measures/version.rb

@@ -35,6 +35,6 @@
 
 module OpenStudio
   module LoadFlexibilityMeasures
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-load-flexibility-measures
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Karl Heine
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-03 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".rubocop.yml"
 - CHANGELOG.md
@@ -115,7 +114,6 @@ files:
 - doc_templates/copyright_erb.txt
 - doc_templates/copyright_js.txt
 - doc_templates/copyright_ruby.txt
-- lib/.DS_Store
 - lib/measures/add_central_hpwh_for_load_flexibility/LICENSE.md
 - lib/measures/add_central_hpwh_for_load_flexibility/README.md
 - lib/measures/add_central_hpwh_for_load_flexibility/README.md.erb