openstudio-load-flexibility-measures 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa671099e5cc0ad39a3cd1aaf233fc91b2e503f49099ade5f7d2e127ab9d11c
-  data.tar.gz: ac66a94b34e42e72ab90fa98ae9ecdc90e0b04aee0617070ba5406a7a525b79a
+  metadata.gz: 9c0879ffce6e9b9b8af2b5a71eab587558682bf7651a80e1056f875367ad4ecc
+  data.tar.gz: 6b06abc933705ace9b88f21986c71b56b2008a07dc32037300169beb73cacdea
 SHA512:
-  metadata.gz: 58d07c597583a56f4cc5dfeace3e859e315e502cccafa56db70d89fde9d7b7336cfa506f460a7f30b6319c589e14e58d227fac1f6f8e948747568ce81631d073
-  data.tar.gz: d01ffdf2a44723494064a599ab24d0801108a9aab2d31defc4e6b4781f8215d550c15e32f5fee387c6112c37de592f6e9c4164be2cbf49873d4a83b517ee2b7a
+  metadata.gz: ef54321ecfa4e04581fb0405da39bec57b25bd5d954ed55d7e21fb1d178c3e2225a2776f462c63a05aab6437df3b46cb339851757adcb9d761a114be16ea9b31
+  data.tar.gz: f35192aa75650fe75f07fec325ca784dfa25d1bdce87be385a77135db633dc87405cff3541ef118adfd67202ac5852c547170d3973e2a8d9155b1cace73eeaf3

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # OpenStudio Load Flexibility Measures Gem
 
+## Version 0.9.0
+- Updating dependencies and licenses for OpenStudio 3.8 (upgrade to standards gem 0.6.0)
+
+## Version 0.8.0
+- Updating dependencies and licenses for OpenStudio 3.7 (upgrade to standards gem 0.5.0, extension gem 0.7.0)
+- Fix field indexes for CoilCoolingDXTwoSpeed in add_packaged_ice_storage
+
 ## Version 0.7.0
 - Updating dependencies and licenses for OpenStudio 3.6 (upgrade to standards gem 0.4.0, extension gem 0.6.1)
 

data/Gemfile

@@ -1,5 +1,6 @@
 source 'http://rubygems.org'
 
+# Specify your gem's dependencies in openstudio-model-articulation.gemspec
 gemspec
 
 # Local gems are useful when developing and integrating the various dependencies.
@@ -10,29 +11,9 @@ gemspec
 # checkout the latest version (develop) from github.
 allow_local = ENV['FAVOR_LOCAL_GEMS']
 
-
-# Delete when these branchesa are merged and released
-#gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'v0.6.0-rc1'
-#gem 'openstudio-standards', '= 0.2.17.rc1', :github => 'NREL/openstudio-standards', :ref => '3.5.0_changes'
-
-
-
-# uncomment when you want CI to use develop branch of extension gem
-# gem 'openstudio-extension', github: 'NREL/OpenStudio-extension-gem', branch: 'develop'
-
-# uncomment when you want CI to use develop branch of openstudio-standards gem
-# gem 'openstudio-standards', github: 'NREL/OpenStudio-standards', branch: 'master'
-
 # Only uncomment if you need to test a different version of the extension gem
 # 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'
 # end
-
-# Only uncomment if you need to test a different version of OpenStudio-standards
-# if allow_local && File.exist?('../openstudio-standards')
-#   gem 'openstudio-standards', path: '../openstudio-standards'
-# elsif allow_local
-#   gem 'openstudio-standards', github: 'NREL/OpenStudio-standards', branch: 'develop'
-# end

data/Jenkinsfile

@@ -1,6 +1,6 @@
-//Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs
+//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs
  
-@Library('cbci_shared_libs') _
+@Library('cbci_shared_libs@developExtension') _
 
 // Build for PR to develop branch only. 
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
@@ -8,4 +8,3 @@ if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
   openstudio_extension_gems()
     
 }
-

data/README.md

@@ -31,6 +31,8 @@ Detailed instructions for usage are included in each measure's respective README
 
 |OpenStudio Load Flexibility Measures Gem|OpenStudio|Ruby|
 |:--------------:|:----------:|:--------:|
+| 0.9.0| 3.8      | 3.2.2  |
+| 0.8.0| 3.7      | 2.7    |
 | 0.7.0| 3.6      | 2.7    |
 | 0.6 - 0.6.1 | 3.5      | 2.7    |
 | 0.5  | 3.4      | 2.7    |

data/lib/measures/add_central_ice_storage/measure.rb

@@ -15,8 +15,8 @@
 # => ASHRAE Design Guide for Cool Thermal Storage, 2nd Edition, January 2019
 # => Manufacturer marketing materials, available online
 
-# load OpenStudio measure libraries
-require "#{File.dirname(__FILE__)}/resources/OsLib_Schedules"
+# load openstudio-standards gem
+require 'openstudio-standards'
 
 # start the measure
 class AddCentralIceStorage < OpenStudio::Measure::ModelMeasure
@@ -698,7 +698,7 @@ class AddCentralIceStorage < OpenStudio::Measure::ModelMeasure
                        'summer_design_day' => summer_design_day,
                        'default_day' => default_day,
                        'rules' => rules }
-      ctes_av_new = OsLib_Schedules.createComplexSchedule(model, options_ctes)
+      ctes_av_new = OpenstudioStandards::Schedules.create_complex_schedule(model, options_ctes)
       ctes_av_new.setScheduleTypeLimits(sched_limits_onoff)
 
       # Create ctes setpoint temperature schedule
@@ -714,7 +714,7 @@ class AddCentralIceStorage < OpenStudio::Measure::ModelMeasure
                             'summer_design_day' => summer_design_day,
                             'default_day' => default_day,
                             'rules' => rules }
-      ctes_sch_new = OsLib_Schedules.createComplexSchedule(model, options_ctes_ctes)
+      ctes_sch_new = OpenstudioStandards::Schedules.create_complex_schedule(model, options_ctes_ctes)
       ctes_sch_new.setScheduleTypeLimits(sched_limits_temp)
 
       # Create chiller setpoint temperature schedule
@@ -730,7 +730,7 @@ class AddCentralIceStorage < OpenStudio::Measure::ModelMeasure
                                'summer_design_day' => summer_design_day,
                                'default_day' => default_day,
                                'rules' => rules }
-      chill_sch_new = OsLib_Schedules.createComplexSchedule(model, options_ctes_chiller)
+      chill_sch_new = OpenstudioStandards::Schedules.create_complex_schedule(model, options_ctes_chiller)
       chill_sch_new.setScheduleTypeLimits(sched_limits_temp)
 
       # Create loop setpoint temperature schedule - if new = true
@@ -740,7 +740,7 @@ class AddCentralIceStorage < OpenStudio::Measure::ModelMeasure
                               'winterTimeValuePairs' => [[24, loop_sp]],
                               'summerTimeValuePairs' => [[24, loop_sp]],
                               'defaultTimeValuePairs' => [[24, loop_sp]] }
-        loop_sch_new = OsLib_Schedules.createSimpleSchedule(model, options_ctes_loop)
+        loop_sch_new = OpenstudioStandards::Schedules.create_simple_schedule(model, options_ctes_loop)
         loop_sch_new.setScheduleTypeLimits(sched_limits_temp)
       end
 

data/lib/measures/add_central_ice_storage/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>add_central_ice_storage</name>
   <uid>48f37812-0cb6-4770-b695-beb8d8a5660d</uid>
-  <version_id>c0947fd7-82e6-47f2-82a0-f5ebfd0205a8</version_id>
-  <version_modified>20230602T162403Z</version_modified>
+  <version_id>f094a339-b1ff-4de7-8122-8e6c1e7b26b5</version_id>
+  <version_modified>2024-06-10T22:33:01Z</version_modified>
   <xml_checksum>6394841D</xml_checksum>
   <class_name>AddCentralIceStorage</class_name>
   <display_name>Add Central Ice Storage</display_name>
@@ -446,18 +446,24 @@
     </attribute>
   </attributes>
   <files>
+    <file>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>962B1D2E</checksum>
+    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
-    <file>
-      <filename>ice_test_model.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>A3FC1180</checksum>
-    </file>
     <file>
       <filename>Ice Measure Implementation Guide.pdf</filename>
       <filetype>pdf</filetype>
@@ -465,16 +471,15 @@
       <checksum>090841B0</checksum>
     </file>
     <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>962B1D2E</checksum>
-    </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>3.0.0</identifier>
+        <min_compatible>3.8.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>0521FD2A</checksum>
     </file>
     <file>
       <filename>OsLib_Schedules.rb</filename>
@@ -486,18 +491,13 @@
       <filename>add_central_ice_storage_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>3A924340</checksum>
+      <checksum>408B3296</checksum>
     </file>
     <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <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>C8E8B60E</checksum>
+      <filename>ice_test_model.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>A3FC1180</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/add_central_ice_storage/tests/add_central_ice_storage_test.rb

@@ -3,8 +3,6 @@
 # See also https://openstudio.net/license
 # *******************************************************************************
 
-# insert your copyright here
-
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
 require 'minitest/autorun'

data/lib/measures/add_hpwh/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>add_hpwh</name>
   <uid>518cde6f-1806-4b9a-bee9-ccaac49c7a53</uid>
-  <version_id>712dc813-0130-48e9-869d-90da303271bf</version_id>
-  <version_modified>20230602T162402Z</version_modified>
+  <version_id>9e1d4f20-4538-4681-bc41-951d02a81121</version_id>
+  <version_modified>2024-06-10T22:33:01Z</version_modified>
   <xml_checksum>A374667A</xml_checksum>
   <class_name>AddHpwh</class_name>
   <display_name>Add HPWH for Domestic Hot Water</display_name>
@@ -351,36 +351,30 @@ 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>BFFB1AA6</checksum>
+    </file>
+    <file>
+      <filename>README.md</filename>
+      <filetype>md</filetype>
+      <usage_type>readme</usage_type>
+      <checksum>5E6E20CF</checksum>
+    </file>
     <file>
       <filename>README.md.erb</filename>
       <filetype>erb</filetype>
       <usage_type>readmeerb</usage_type>
       <checksum>703C9964</checksum>
     </file>
-    <file>
-      <filename>SmallHotel-2A.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>EB637B7E</checksum>
-    </file>
     <file>
       <filename>Flexible Domestic Hot Water Implementation Guide.pdf</filename>
       <filetype>pdf</filetype>
       <usage_type>doc</usage_type>
       <checksum>F610A0B3</checksum>
     </file>
-    <file>
-      <filename>README.md</filename>
-      <filetype>md</filetype>
-      <usage_type>readme</usage_type>
-      <checksum>5E6E20CF</checksum>
-    </file>
-    <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
-    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>
@@ -392,11 +386,17 @@ The flexibility of the system is based on user-defined temperatures and times, w
       <usage_type>script</usage_type>
       <checksum>A460A43B</checksum>
     </file>
+    <file>
+      <filename>SmallHotel-2A.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>EB637B7E</checksum>
+    </file>
     <file>
       <filename>add_hpwh_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>27FF0801</checksum>
+      <checksum>78D321AB</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/add_hpwh/tests/add_hpwh_test.rb

@@ -3,8 +3,6 @@
 # See also https://openstudio.net/license
 # *******************************************************************************
 
-# insert your copyright here
-
 require 'openstudio'
 require 'openstudio/measure/ShowRunnerOutput'
 require 'minitest/autorun'

data/lib/measures/add_packaged_ice_storage/measure.rb

@@ -534,22 +534,22 @@ class AddPackagedIceStorage < OpenStudio::Measure::EnergyPlusMeasure
       case sel_coil.iddObject.name
       when 'Coil:Cooling:DX:SingleSpeed'
         runner.registerInfo("Grabing inputs for #{utss.getString(0)} from #{sel_coil.iddObject.name} object named #{sel_coil.getString(0)}")
-        utss.setString(16, sel_coil.getString(2).get)
-        utss.setString(18, sel_coil.getString(4).get)
-        utss.setString(19, sel_coil.getString(10).get)
-        utss.setString(20, sel_coil.getString(11).get)
-        utss.setString(21, sel_coil.getString(12).get)
-        utss.setString(22, sel_coil.getString(13).get)
-        utss.setString(23, sel_coil.getString(14).get)
+        utss.setString(16, sel_coil.getString(2).get) # Gross Rated Total Cooling Capacity
+        utss.setString(18, sel_coil.getString(4).get) # Gross Rated Cooling COP
+        utss.setString(19, sel_coil.getString(10).get) # Total Cooling Capacity Function of Temperature Curve Name
+        utss.setString(20, sel_coil.getString(11).get) # Total Cooling Capacity Function of Flow Fraction Curve Name
+        utss.setString(21, sel_coil.getString(12).get) # Energy Input Ratio Function of Temperature Curve Name
+        utss.setString(22, sel_coil.getString(13).get) # Energy Input Ratio Function of Flow Fraction Curve Name
+        utss.setString(23, sel_coil.getString(14).get) # Part Load Fraction Correlation Curve Name
       when 'Coil:Cooling:DX:TwoSpeed'
         runner.registerInfo("Grabing inputs for #{utss.getString(0)} from #{sel_coil.iddObject.name} object named #{sel_coil.getString(0)}")
-        utss.setString(16, sel_coil.getString(14).get)
-        utss.setString(18, sel_coil.getString(16).get)
-        utss.setString(19, sel_coil.getString(18).get)
-        utss.setString(20, sel_coil.getString(10).get)
-        utss.setString(21, sel_coil.getString(19).get)
-        utss.setString(22, sel_coil.getString(12).get)
-        utss.setString(23, sel_coil.getString(13).get)
+        utss.setString(16, sel_coil.getString(16).get) # Low Speed Gross Rated Total Cooling Capacity
+        utss.setString(18, sel_coil.getString(18).get) # Low Speed Gross Rated Cooling COP
+        utss.setString(19, sel_coil.getString(22).get) # Low Speed Total Cooling Capacity Function of Temperature Curve Name
+        utss.setString(20, sel_coil.getString(12).get) # Total Cooling Capacity Function of Flow Fraction Curve Name
+        utss.setString(21, sel_coil.getString(23).get) # Low Speed Energy Input Ratio Function of Temperature Curve Name
+        utss.setString(22, sel_coil.getString(14).get) # Energy Input Ratio Function of Flow Fraction Curve Name
+        utss.setString(23, sel_coil.getString(15).get) # Part Load Fraction Correlation Curve Name
       end
 
       # identify container object in which the coil is used

data/lib/measures/add_packaged_ice_storage/measure.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <measure>
-  <schema_version>3.0</schema_version>
+  <schema_version>3.1</schema_version>
   <name>add_packaged_ice_storage</name>
   <uid>2aa8c128-53b9-49fd-9aaf-9253a1f05936</uid>
-  <version_id>cd809cee-aa3a-43bb-8a41-cd27c936267d</version_id>
-  <version_modified>20230602T162403Z</version_modified>
+  <version_id>21dee291-3e59-413a-9353-efb85b3e8d7b</version_id>
+  <version_modified>2023-12-12T07:23:13Z</version_modified>
   <xml_checksum>2617824F</xml_checksum>
   <class_name>AddPackagedIceStorage</class_name>
   <display_name>Add Packaged Ice Storage</display_name>
@@ -201,16 +201,10 @@ If 'AutoSize' is selected for ice capacity, these inputs set an ice capacity siz
   </attributes>
   <files>
     <file>
-      <filename>TESCurves.idf</filename>
-      <filetype>idf</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>E919566C</checksum>
-    </file>
-    <file>
-      <filename>MeasureTest.osm</filename>
-      <filetype>osm</filetype>
-      <usage_type>test</usage_type>
-      <checksum>DC0DCC4B</checksum>
+      <filename>LICENSE.md</filename>
+      <filetype>md</filetype>
+      <usage_type>license</usage_type>
+      <checksum>BFFB1AA6</checksum>
     </file>
     <file>
       <filename>README.md</filename>
@@ -219,10 +213,27 @@ If 'AutoSize' is selected for ice capacity, these inputs set an ice capacity siz
       <checksum>E6FBC489</checksum>
     </file>
     <file>
-      <filename>single_speed_dx_350.osm</filename>
+      <version>
+        <software_program>OpenStudio</software_program>
+        <identifier>3.0.0</identifier>
+        <min_compatible>3.5.0</min_compatible>
+      </version>
+      <filename>measure.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>script</usage_type>
+      <checksum>30BE5060</checksum>
+    </file>
+    <file>
+      <filename>TESCurves.idf</filename>
+      <filetype>idf</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>E919566C</checksum>
+    </file>
+    <file>
+      <filename>MeasureTest.osm</filename>
       <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>D9B82B85</checksum>
+      <checksum>DC0DCC4B</checksum>
     </file>
     <file>
       <filename>USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw</filename>
@@ -231,27 +242,16 @@ If 'AutoSize' is selected for ice capacity, these inputs set an ice capacity siz
       <checksum>C254B53F</checksum>
     </file>
     <file>
-      <filename>LICENSE.md</filename>
-      <filetype>md</filetype>
-      <usage_type>license</usage_type>
-      <checksum>BFFB1AA6</checksum>
-    </file>
-    <file>
-      <version>
-        <software_program>OpenStudio</software_program>
-        <identifier>3.0.0</identifier>
-        <min_compatible>3.5.0</min_compatible>
-      </version>
-      <filename>measure.rb</filename>
+      <filename>add_packaged_ice_storage_test.rb</filename>
       <filetype>rb</filetype>
-      <usage_type>script</usage_type>
-      <checksum>74476013</checksum>
+      <usage_type>test</usage_type>
+      <checksum>2D36B76B</checksum>
     </file>
     <file>
-      <filename>add_packaged_ice_storage_test.rb</filename>
-      <filetype>rb</filetype>
+      <filename>single_speed_dx_350.osm</filename>
+      <filetype>osm</filetype>
       <usage_type>test</usage_type>
-      <checksum>C70CEB86</checksum>
+      <checksum>D9B82B85</checksum>
     </file>
   </files>
 </measure>

data/lib/measures/add_packaged_ice_storage/tests/add_packaged_ice_storage_test.rb

@@ -24,7 +24,7 @@ class AddPackagedIceStorageTest < MiniTest::Test
   # @param IDF OpenStudio workspace IDF object
   # @param run_dir [String] file path location for the annual run, defaults to 'Run' in the current directory
   # @return [Bool] returns true if successful, false if not
-  def model_run_simulation_and_log_errors(workspace, run_dir = "#{Dir.pwd}/Run")
+  def model_run_simulation_and_log_errors(model, workspace, run_dir = "#{Dir.pwd}/Run")
     # Make the directory if it doesn't exist
     unless Dir.exist?(run_dir)
       FileUtils.mkdir_p(run_dir)
@@ -70,7 +70,7 @@ class AddPackagedIceStorageTest < MiniTest::Test
     else
       # If the sql file does not exist, it is likely that EnergyPlus crashed,
       # in which case the useful errors are inside the eplusout.err file.
-      err_file_path_string = "#{run_dir}/run/eplusout.err"
+      err_file_path_string = "#{run_dir}/eplusout.err"
       err_file_path = OpenStudio::Path.new(err_file_path_string)
       if OpenStudio.exists(err_file_path)
         if __dir__[0] == ':' # Running from OpenStudio CLI
@@ -86,33 +86,32 @@ class AddPackagedIceStorageTest < MiniTest::Test
       end
     end
 
-    # todo - figure out how to get code below to work so method returns false when simulation fails
-
-    # # Report severe or fatal errors in the run
-    # error_query = "SELECT ErrorMessage
-    #     FROM Errors
-    #     WHERE ErrorType in(1,2)"
-    # errs = model.sqlFile.get.execAndReturnVectorOfString(error_query)
-    # if errs.is_initialized
-    #   errs = errs.get
-    # end
-
-    # # Check that the run completed successfully
-    # end_file_stringpath = "#{run_dir}/run/eplusout.end"
-    # end_file_path = OpenStudio::Path.new(end_file_stringpath)
-    # if OpenStudio.exists(end_file_path)
-    #   endstring = File.read(end_file_stringpath)
-    # end
-
-    # if !endstring.include?('EnergyPlus Completed Successfully')
-    #   OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "The run did not finish and had following errors: #{errs.join('\n')}")
-    #   return false
-    # end
-
-    # # Log any severe errors that did not cause simulation to fail
-    # unless errs.empty?
-    #   OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Model', "The run completed but had the following severe errors: #{errs.join('\n')}")
-    # end
+    # Report severe or fatal errors in the run
+    error_query = "SELECT ErrorMessage
+        FROM Errors
+        WHERE ErrorType in(1,2)"
+    model.setSqlFile(sql)
+    errs = model.sqlFile.get.execAndReturnVectorOfString(error_query)
+    if errs.is_initialized
+      errs = errs.get
+    end
+
+    # Check that the run completed successfully
+    end_file_stringpath = "#{run_dir}/eplusout.end"
+    end_file_path = OpenStudio::Path.new(end_file_stringpath)
+    if OpenStudio.exists(end_file_path)
+      endstring = File.read(end_file_stringpath)
+    end
+
+    if !endstring.include?('EnergyPlus Completed Successfully')
+      OpenStudio.logFree(OpenStudio::Error, 'openstudio.model.Model', "The run did not finish and had following errors: #{errs.join('\n')}")
+      return false
+    end
+
+    # Log any severe errors that did not cause simulation to fail
+    unless errs.empty?
+      OpenStudio.logFree(OpenStudio::Warn, 'openstudio.model.Model', "The run completed but had the following severe errors: #{errs.join('\n')}")
+    end
 
     return true
   end  
@@ -155,10 +154,10 @@ class AddPackagedIceStorageTest < MiniTest::Test
     measure.run(workspace, runner, argument_map)
 
     # run the annual simulation
-    output_file_path = "#{File.dirname(__FILE__)}/output/test_good_argument_values/Run"
-    #sim_results = self.model_run_simulation_and_log_errors(workspace, output_file_path)
+    # commented out for now E+ run in test doesn't function on CI yet
+    #output_file_path = "#{File.dirname(__FILE__)}/output/test_good_argument_values"
+    #sim_results = self.model_run_simulation_and_log_errors(model, workspace, output_file_path)
     #assert(sim_results)
-    # todo - need to add code so test fails if simulation fails
 
     result = runner.result
     assert_equal('Success', result.value.valueName)
@@ -206,10 +205,10 @@ class AddPackagedIceStorageTest < MiniTest::Test
     measure.run(workspace, runner, argument_map)
 
     # run the annual simulation
-    output_file_path = "#{File.dirname(__FILE__)}/output/single_speed_dx/Run"
-    #sim_results = self.model_run_simulation_and_log_errors(workspace, output_file_path)
+    # commented out for now E+ run in test doesn't function on CI yet
+    #output_file_path = "#{File.dirname(__FILE__)}/output/single_speed_dx"
+    #sim_results = self.model_run_simulation_and_log_errors(model, workspace, output_file_path)
     #assert(sim_results)
-    # todo - need to add code so test fails if simulation fails
 
     result = runner.result
     assert_equal('Success', result.value.valueName)

data/lib/openstudio/load_flexibility_measures/version.rb

@@ -5,6 +5,6 @@
 
 module OpenStudio
   module LoadFlexibilityMeasures
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end

data/openstudio-load-flexibility-measures.gemspec

@@ -17,18 +17,24 @@ Gem::Specification.new do |spec|
   spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.7.0'
+  spec.required_ruby_version = '~> 3.2.2'
 
-  spec.add_dependency 'bundler', '~> 2.1'
-
-  spec.add_dependency 'openstudio-extension', '~> 0.6.1'
-  spec.add_dependency 'openstudio-standards', '~> 0.4.0'
+  spec.add_dependency 'bundler', '~> 2.4.10'
+  spec.add_dependency 'openstudio-extension', '~> 0.8.0'
+  spec.add_dependency 'openstudio-standards', '0.6.1'
+  spec.add_dependency 'openstudio_measure_tester', '~> 0.4.0'
+  spec.add_dependency 'openstudio-workflow', '~> 2.4.0'
+  spec.add_dependency 'bcl', '~> 0.8.0'
+  spec.add_dependency 'octokit', '4.18.0' # for change logs
+  spec.add_dependency 'multipart-post', '2.4.0'
+  spec.add_dependency 'parallel', '1.19.1'
+  spec.add_dependency 'regexp_parser', '2.9.0'
+  spec.add_dependency 'addressable', '2.8.1'
 
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.11.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-load-flexibility-measures
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Karl Heine
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2024-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,30 +17,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.4.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.4.10
 - !ruby/object:Gem::Dependency
   name: openstudio-extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: openstudio-standards
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
+  name: openstudio_measure_tester
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -54,47 +68,131 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: openstudio-workflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
+        version: 2.4.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: bcl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.18.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.18.0
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.19.1
+- !ruby/object:Gem::Dependency
+  name: regexp_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.3
+        version: '3.9'
 description: library and measures for OpenStudio for load flexibility applications.
 email:
 - karl.heine@nrel.gov
@@ -165,14 +263,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: library and measures for OpenStudio for load flexibility applications.