openstudio-geb 0.0.3r → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95736fe58727e0f60da222a3f643c02dc5e5465dc77b5e6513012a59949d9d85
-  data.tar.gz: 55105af8ce0bf75e1005123a36f77e61268136554663d6b476091e1995396bae
+  metadata.gz: 347d9430484e0647ed589317e8c8324f250e08d4d6f95bcd17e3a66fa84237cd
+  data.tar.gz: bd0f0c3f362792e18e8bddba9dea2c4d2cf8310cf6759fa91b4f50af864d914a
 SHA512:
-  metadata.gz: 63d3ff9b2cc8415a52ba1906a61146ed28ba6a977da91393e84fa0ed7e6845240beea11c03d20483b86f92b56b4f779fff42a08f093544bc59e43dcce0453605
-  data.tar.gz: 02f4cfd1f7b5e87d3c14c142a15cf370aa19793a3f280fd772b39a972c844680d817fb40123caf7c8f914a4686c85a14de4375078de197c77196b79a619ef390
+  metadata.gz: 01a593ed9e93044ee79e09dd8b98d697b7a609def6ba532cd37603e06dfef767b519730e443f946f52cffa2b357a0784dbf9ead1a47f5a00c665b5b61b6f9925
+  data.tar.gz: c2e3606e8c44287fe02e60caac0e6c57b4d0bdd82aa266d1701d47125bfeae7f869e55f89b0a8c65b88d530e634cc102118b38f6a32afe2e914d89d431d73ddb

data/lib/measures/AdjustThermostatSetpointsByDegreesForPeakHours/measure.rb

@@ -673,7 +673,7 @@ class AdjustThermostatSetpointsByDegreesForPeakHours < OpenStudio::Measure::Mode
       elsif vec_time[i]>time_begin && vec_time[i]<=time_end && count==1
         sch_day.addValue(vec_time[i], vec_value[i])
       elsif vec_time[i]>time_end && count == 1
-        sch_day.addValue(time_end, target_temp_si.value)
+        sch_day.addValue(time_end, target_temp_si)
         sch_day.addValue(vec_time[i], vec_value[i])
         count = 2
       else

data/lib/measures/add_chilled_water_storage_tank/measure.rb

@@ -49,7 +49,7 @@ class AddChilledWaterStorageTank < OpenStudio::Measure::ModelMeasure
         loop_choices << loop.name.to_s
       end
     end
-    loop_choices << ""
+
     # Make choice argument for primary loop selection
     selected_primary_loop_name = OpenStudio::Measure::OSArgument.makeChoiceArgument('selected_primary_loop_name', loop_choices, false)
     selected_primary_loop_name.setDisplayName('Select Primary Loop:')
@@ -62,7 +62,6 @@ class AddChilledWaterStorageTank < OpenStudio::Measure::ModelMeasure
       selected_primary_loop_name.setDefaultValue(pri_loop_name)
     else
       selected_primary_loop_name.setDescription('Error: No Cooling Loop Found')
-      selected_primary_loop_name.setDefaultValue("")
     end
     args << selected_primary_loop_name
 
@@ -189,9 +188,7 @@ class AddChilledWaterStorageTank < OpenStudio::Measure::ModelMeasure
     # assign the user inputs to variables
     objective = runner.getStringArgumentValue('objective', user_arguments)
     selected_primary_loop_name = runner.getStringArgumentValue('selected_primary_loop_name', user_arguments)
-    # if user_arguments['selected_primary_loop_name'].hasValue
-    #   selected_primary_loop_name = runner.getStringArgumentValue('selected_primary_loop_name', user_arguments)
-    if !selected_primary_loop_name.empty?
+    if selected_primary_loop_name
       # get the primary cooling loop
       selected_primary_loop = model.getModelObjectByName(selected_primary_loop_name)
       if selected_primary_loop.is_initialized

data/lib/measures/reduce_epd_by_percentage_for_peak_hours/measure.rb

@@ -333,109 +333,110 @@ class ReduceEPDByPercentageForPeakHours < OpenStudio::Measure::ModelMeasure
         if equip_schedules.key?(equip_sch.get.name.to_s)
           new_equip_sch = equip_schedules[equip_sch.get.name.to_s]
         else
-          if equip_sch.get.to_ScheduleRuleset.empty?
-            runner.registerWarning("Schedule #{equip_sch.get.name} isn't a ScheduleRuleset object and won't be altered by this measure.")
-            next
-          else
-            new_equip_sch = equip_sch.get.clone(model)
-            new_equip_sch = new_equip_sch.to_Schedule.get
-            new_equip_sch.setName("#{equip_sch.get.name.to_s} adjusted #{epd_factor}")
-            # add to the hash
-            equip_schedules[equip_sch.get.name.to_s] = new_equip_sch
-          end
+          new_equip_sch = equip_sch.get.clone(model)
+          new_equip_sch = new_equip_sch.to_Schedule.get
+          new_equip_sch.setName("#{equip_sch.get.name.to_s} adjusted #{epd_factor}")
+          # add to the hash
+          equip_schedules[equip_sch.get.name.to_s] = new_equip_sch
         end
         equip.setSchedule(new_equip_sch)
-        runner.registerInfo("Schedule #{equip_sch.get.name} of electric equipment #{equip.name} will be altered by this measure.")
       end
     end
 
     equip_schedules.each do |old_name, equip_sch|
-      schedule_set = equip_sch.to_ScheduleRuleset.get
-      default_rule = schedule_set.defaultDaySchedule
-      rules = schedule_set.scheduleRules
-      days_covered = Array.new(7, false)
-      original_rule_number = rules.length
-      if original_rule_number > 0
-        runner.registerInfo("------------ schedule rule set #{old_name} has #{original_rule_number} rules.")
-        current_index = 0
-        # rules are in order of priority
-        rules.each do |rule|
-          runner.registerInfo("------------ Rule #{rule.ruleIndex}: #{rule.daySchedule.name.to_s}")
-          rule_period1 = rule.clone(model).to_ScheduleRule.get # OpenStudio::Model::ScheduleRule.new(schedule_set, rule.daySchedule)
-          rule_period1.setStartDate(os_start_date1)
-          rule_period1.setEndDate(os_end_date1)
-          checkDaysCovered(rule_period1, days_covered)
-          runner.registerInfo("--------------- current days of week coverage: #{days_covered}")
-
-          # set the order of the new cloned schedule rule, to make sure the modified rule has a higher priority than the original one
-          # and different copies keep the same priority as their original orders
-          unless schedule_set.setScheduleRuleIndex(rule_period1, current_index)
-            runner.registerError("Fail to set rule index for #{day_rule_period1.name.to_s}.")
-          end
-          current_index += 1
-
-          day_rule_period1 = rule_period1.daySchedule
-          day_time_vector1 = day_rule_period1.times
-          day_value_vector1 = day_rule_period1.values
-          runner.registerInfo("    ------------ time: #{day_time_vector1.map {|os_time| os_time.toString}}")
-          runner.registerInfo("    ------------ values: #{day_value_vector1}")
-          unless day_value_vector1.empty?
-            applicable = true
-          end
-          day_rule_period1.clearValues
-          day_rule_period1 = updateDaySchedule(day_rule_period1, day_time_vector1, day_value_vector1, shift_time1, shift_time2, epd_factor)
-          runner.registerInfo("    ------------ updated time: #{day_rule_period1.times.map {|os_time| os_time.toString}}")
-          runner.registerInfo("    ------------ updated values: #{day_rule_period1.values}")
-          runner.registerInfo("--------------- schedule updated for #{rule_period1.startDate.get} to #{rule_period1.endDate.get}")
-
-          if os_start_date2 and os_end_date2
-            rule_period2 = copy_sch_rule_for_period(model, rule_period1, rule_period1.daySchedule, os_start_date2, os_end_date2)
-            unless schedule_set.setScheduleRuleIndex(rule_period2, 0)
-              runner.registerError("Fail to set rule index for #{rule_period2.daySchedule.name.to_s}.")
+      if equip_sch.to_ScheduleRuleset.empty?
+        runner.registerWarning("Schedule #{old_name} isn't a ScheduleRuleset object and won't be altered by this measure.")
+        equip_sch.remove # remove un-used cloned schedule
+      else
+        schedule_set = equip_sch.to_ScheduleRuleset.get
+        default_rule = schedule_set.defaultDaySchedule
+        rules = schedule_set.scheduleRules
+        days_covered = Array.new(7, false)
+        original_rule_number = rules.length
+        if original_rule_number > 0
+          runner.registerInfo("------------ schedule rule set #{old_name} has #{original_rule_number} rules.")
+          current_index = 0
+          # rules are in order of priority
+          rules.each do |rule|
+            runner.registerInfo("------------ Rule #{rule.ruleIndex}: #{rule.daySchedule.name.to_s}")
+            rule_period1 = rule.clone(model).to_ScheduleRule.get # OpenStudio::Model::ScheduleRule.new(schedule_set, rule.daySchedule)
+            rule_period1.setStartDate(os_start_date1)
+            rule_period1.setEndDate(os_end_date1)
+            checkDaysCovered(rule_period1, days_covered)
+            runner.registerInfo("--------------- current days of week coverage: #{days_covered}")
+
+            # set the order of the new cloned schedule rule, to make sure the modified rule has a higher priority than the original one
+            # and different copies keep the same priority as their original orders
+            unless schedule_set.setScheduleRuleIndex(rule_period1, current_index)
+              runner.registerError("Fail to set rule index for #{day_rule_period1.name.to_s}.")
             end
             current_index += 1
-            runner.registerInfo("--------------- schedule updated for #{rule_period2.startDate.get} to #{rule_period2.endDate.get}")
-          end
 
-          if os_start_date3 and os_end_date3
-            rule_period3 = copy_sch_rule_for_period(model, rule_period1, rule_period1.daySchedule, os_start_date3, os_end_date3)
-            unless schedule_set.setScheduleRuleIndex(rule_period3, 0)
-              runner.registerError("Fail to set rule index for #{rule_period3.daySchedule.name.to_s}.")
+            day_rule_period1 = rule_period1.daySchedule
+            day_time_vector1 = day_rule_period1.times
+            day_value_vector1 = day_rule_period1.values
+            runner.registerInfo("    ------------ time: #{day_time_vector1.map {|os_time| os_time.toString}}")
+            runner.registerInfo("    ------------ values: #{day_value_vector1}")
+            unless day_value_vector1.empty?
+              applicable = true
+            end
+            day_rule_period1.clearValues
+            day_rule_period1 = updateDaySchedule(day_rule_period1, day_time_vector1, day_value_vector1, shift_time1, shift_time2, epd_factor)
+            runner.registerInfo("    ------------ updated time: #{day_rule_period1.times.map {|os_time| os_time.toString}}")
+            runner.registerInfo("    ------------ updated values: #{day_rule_period1.values}")
+            runner.registerInfo("--------------- schedule updated for #{rule_period1.startDate.get} to #{rule_period1.endDate.get}")
+
+            if os_start_date2 and os_end_date2
+              rule_period2 = copy_sch_rule_for_period(model, rule_period1, rule_period1.daySchedule, os_start_date2, os_end_date2)
+              unless schedule_set.setScheduleRuleIndex(rule_period2, 0)
+                runner.registerError("Fail to set rule index for #{rule_period2.daySchedule.name.to_s}.")
+              end
+              current_index += 1
+              runner.registerInfo("--------------- schedule updated for #{rule_period2.startDate.get} to #{rule_period2.endDate.get}")
             end
-            current_index += 1
-            runner.registerInfo("--------------- schedule updated for #{rule_period3.startDate.get} to #{rule_period3.endDate.get}")
-          end
 
-          # The original rule will be shifted to have the currently lowest priority
-          unless schedule_set.setScheduleRuleIndex(rule, original_rule_number + current_index - 1)
-            runner.registerError("Fail to set rule index for #{rule.daySchedule.name.to_s}.")
-          end
+            if os_start_date3 and os_end_date3
+              rule_period3 = copy_sch_rule_for_period(model, rule_period1, rule_period1.daySchedule, os_start_date3, os_end_date3)
+              unless schedule_set.setScheduleRuleIndex(rule_period3, 0)
+                runner.registerError("Fail to set rule index for #{rule_period3.daySchedule.name.to_s}.")
+              end
+              current_index += 1
+              runner.registerInfo("--------------- schedule updated for #{rule_period3.startDate.get} to #{rule_period3.endDate.get}")
+            end
 
+            # The original rule will be shifted to have the currently lowest priority
+            unless schedule_set.setScheduleRuleIndex(rule, original_rule_number + current_index - 1)
+              runner.registerError("Fail to set rule index for #{rule.daySchedule.name.to_s}.")
+            end
+
+          end
+        else
+          runner.registerWarning("Electric equipment schedule #{old_name} is a ScheduleRuleSet, but has no ScheduleRules associated. It won't be altered by this measure.")
         end
-      else
-        runner.registerWarning("Electric equipment schedule #{old_name} is a ScheduleRuleSet, but has no ScheduleRules associated. It won't be altered by this measure.")
-      end
-      if days_covered.include?(false)
-        new_default_rule = OpenStudio::Model::ScheduleRule.new(schedule_set)
-        new_default_rule.setStartDate(os_start_date1)
-        new_default_rule.setEndDate(os_end_date1)
-        coverMissingDays(new_default_rule, days_covered)
-        checkDaysCovered(new_default_rule, days_covered)
-
-        cloned_default_day = default_rule.clone(model)
-        cloned_default_day.setParent(new_default_rule)
-
-        new_default_day = new_default_rule.daySchedule
-        day_time_vector = new_default_day.times
-        day_value_vector = new_default_day.values
-        new_default_day.clearValues
-        new_default_day = updateDaySchedule(new_default_day, day_time_vector, day_value_vector, shift_time1, shift_time2, epd_factor)
-        if os_start_date2 and os_end_date2
-          copy_sch_rule_for_period(model, new_default_rule, new_default_day, os_start_date2, os_end_date2)
-        end
-        if os_start_date3 and os_end_date3
-          copy_sch_rule_for_period(model, new_default_rule, new_default_day, os_start_date3, os_end_date3)
+        if days_covered.include?(false)
+          new_default_rule = OpenStudio::Model::ScheduleRule.new(schedule_set)
+          new_default_rule.setStartDate(os_start_date1)
+          new_default_rule.setEndDate(os_end_date1)
+          coverMissingDays(new_default_rule, days_covered)
+          checkDaysCovered(new_default_rule, days_covered)
+
+          cloned_default_day = default_rule.clone(model)
+          cloned_default_day.setParent(new_default_rule)
+
+          new_default_day = new_default_rule.daySchedule
+          day_time_vector = new_default_day.times
+          day_value_vector = new_default_day.values
+          new_default_day.clearValues
+          new_default_day = updateDaySchedule(new_default_day, day_time_vector, day_value_vector, shift_time1, shift_time2, epd_factor)
+          if os_start_date2 and os_end_date2
+            copy_sch_rule_for_period(model, new_default_rule, new_default_day, os_start_date2, os_end_date2)
+          end
+          if os_start_date3 and os_end_date3
+            copy_sch_rule_for_period(model, new_default_rule, new_default_day, os_start_date3, os_end_date3)
+          end
+
         end
+
       end
 
     end

data/lib/openstudio/geb/version.rb

@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Geb
-    VERSION = '0.0.3r'.freeze
+    VERSION = '0.0.3'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-geb
 version: !ruby/object:Gem::Version
-  version: 0.0.3r
+  version: 0.0.3
 platform: ruby
 authors:
 - Kaiyu Sun
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-22 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -166,7 +166,6 @@ files:
 - lib/measures/add_chilled_water_storage_tank/tests/CZ06RV2.epw
 - lib/measures/add_chilled_water_storage_tank/tests/add_chilled_water_storage_tank_test.rb
 - lib/measures/add_chilled_water_storage_tank/tests/example_model.osm
-- lib/measures/add_chilled_water_storage_tank/tests/restaurant.osm
 - lib/measures/add_electrochromic_window/LICENSE.md
 - lib/measures/add_electrochromic_window/README.md
 - lib/measures/add_electrochromic_window/README.md.erb
@@ -303,9 +302,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.1.4
 signing_key: