openstudio-geb 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 347d9430484e0647ed589317e8c8324f250e08d4d6f95bcd17e3a66fa84237cd
-  data.tar.gz: bd0f0c3f362792e18e8bddba9dea2c4d2cf8310cf6759fa91b4f50af864d914a
+  metadata.gz: 1f5c6ce73d5eeff3672c2dded24ac1b0ee7f3444a622e8504f8fa4fd92fd257a
+  data.tar.gz: 4a67b1901225ede4ace75c4b7e1a99efb7af844582d8956cf11ebc4f9a860265
 SHA512:
-  metadata.gz: 01a593ed9e93044ee79e09dd8b98d697b7a609def6ba532cd37603e06dfef767b519730e443f946f52cffa2b357a0784dbf9ead1a47f5a00c665b5b61b6f9925
-  data.tar.gz: c2e3606e8c44287fe02e60caac0e6c57b4d0bdd82aa266d1701d47125bfeae7f869e55f89b0a8c65b88d530e634cc102118b38f6a32afe2e914d89d431d73ddb
+  metadata.gz: 907d8d052909600300259a16e78aeab672e89e17fe484ff1af3d3f1943ac24ed0a6fe5a629ab75638c06158e2da9df3682b87535741c8c82b302d60d8f9dcb42
+  data.tar.gz: 731d919ced3ef43ab5cc79bd52a6fdf2dbfe8aad71b3ef07a850ab809e96c789588f823462fc68af9031170c1954a0519d36e988ff5ce5034bbfdf6136d7993f

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)
+        sch_day.addValue(time_end, target_temp_si.value)
         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,6 +62,7 @@ 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
 
@@ -188,7 +189,9 @@ 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 selected_primary_loop_name
+    # 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?
       # get the primary cooling loop
       selected_primary_loop = model.getModelObjectByName(selected_primary_loop_name)
       if selected_primary_loop.is_initialized
@@ -533,8 +536,6 @@ class AddChilledWaterStorageTank < OpenStudio::Measure::ModelMeasure
     sizing_pri_plant.setDesignLoopExitTemperature(primary_loop_sp)
     sizing_pri_plant.setLoopDesignTemperatureDifference(primary_delta_t)
 
-
-
     # add chilled water tank to the primary loop as demand and secondary loop as supply
     chw_storage_tank = OpenStudio::Model::ThermalStorageChilledWaterStratified.new(model)
     tank_temp_sch = OpenStudio::Model::ScheduleRuleset.new(model)
@@ -543,6 +544,16 @@ class AddChilledWaterStorageTank < OpenStudio::Measure::ModelMeasure
     chw_storage_tank.setSetpointTemperatureSchedule(tank_temp_sch)
     sec_loop.addSupplyBranchForComponent(chw_storage_tank)
     selected_primary_loop.addDemandBranchForComponent(chw_storage_tank)
+
+    # create discharging and charging schedule and apply to chilled water tank and primary loop
+    discharge_sch = create_sch(model, 'Chilled water tank discharge schedule', discharge_start, discharge_end, thermal_storage_season, wknds)
+    charge_sch = create_sch(model, 'Chilled water tank charge schedule', charge_start, charge_end, thermal_storage_season, wknds)
+    chw_storage_tank.setUseSideAvailabilitySchedule(discharge_sch)
+    chw_storage_tank.setSourceSideAvailabilitySchedule(charge_sch)
+    avm_sch =  OpenStudio::Model::AvailabilityManagerScheduled.new(model)
+    avm_sch.setSchedule(charge_sch)
+    selected_primary_loop.addAvailabilityManager(avm_sch)
+
     if objective == "Partial Storage"
       sec_chiller = OpenStudio::Model::ChillerElectricEIR.new(model)  # use default curves
       sec_chiller.setName("CoolSysSecondary Chiller")
@@ -555,27 +566,29 @@ class AddChilledWaterStorageTank < OpenStudio::Measure::ModelMeasure
       end
 
       # add plant equipment operation schema if partial storage
-      clg_op_scheme = OpenStudio::Model::PlantEquipmentOperationCoolingLoad.new(model)
-      tank_supply_watt = 2.0 * (4182 * tank_vol * 1000 * secondary_delta_t / (3600 * lasting_hrs))   # double the cooling cap in case thermal storage is not used at larger cooling load.
-      # the sequence of addEquipment and addLoadRange can't be switched
-      clg_op_scheme.addEquipment(sec_chiller)
-      clg_op_scheme.addLoadRange(tank_supply_watt, [chw_storage_tank])
-      sec_loop.setPlantEquipmentOperationCoolingLoad(clg_op_scheme)
+      clg_op_scheme_tank = OpenStudio::Model::PlantEquipmentOperationCoolingLoad.new(model)
+      clg_op_scheme_tank.addEquipment(chw_storage_tank)
+      clg_op_scheme_sec_chiller = OpenStudio::Model::PlantEquipmentOperationCoolingLoad.new(model)
+      clg_op_scheme_sec_chiller.addEquipment(sec_chiller)
+      undischarge_sch = create_sch(model, 'Chilled water tank not discharge schedule', discharge_end, discharge_start, thermal_storage_season, wknds)
+      # in this way, sequence in E+ will be tank first then chiller. In fact the sequence here doesn't matter as each schema is coupled with schedule
+      sec_loop.setPlantEquipmentOperationCoolingLoad(clg_op_scheme_tank)
+      sec_loop.setPlantEquipmentOperationCoolingLoadSchedule(discharge_sch)
+      sec_loop.setPrimaryPlantEquipmentOperationScheme(clg_op_scheme_sec_chiller)
+      sec_loop.setPrimaryPlantEquipmentOperationSchemeSchedule(undischarge_sch)
+
+      # clg_op_scheme = OpenStudio::Model::PlantEquipmentOperationCoolingLoad.new(model)
+      # tank_supply_watt = 2.0 * (4182 * tank_vol * 1000 * secondary_delta_t / (3600 * lasting_hrs))   # double the cooling cap in case thermal storage is not used at larger cooling load.
+      # # the sequence of addEquipment and addLoadRange can't be switched
+      # clg_op_scheme.addEquipment(sec_chiller)
+      # clg_op_scheme.addLoadRange(tank_supply_watt, [chw_storage_tank])
+      # sec_loop.setPlantEquipmentOperationCoolingLoad(clg_op_scheme)
     end
     # add secondary loop bypass pipe
     sec_supply_bypass = OpenStudio::Model::PipeAdiabatic.new(model)
     sec_supply_bypass.setName("Chilled Water Secondary Loop Supply Bypass Pipe")
     sec_loop.addSupplyBranchForComponent(sec_supply_bypass)
 
-    # create discharging and charging schedule and apply to chilled water tank and primary loop
-    discharge_sch = create_sch(model, 'Chilled water tank discharge schedule', discharge_start, discharge_end, thermal_storage_season, wknds)
-    charge_sch = create_sch(model, 'Chilled water tank charge schedule', charge_start, charge_end, thermal_storage_season, wknds)
-    chw_storage_tank.setUseSideAvailabilitySchedule(discharge_sch)
-    chw_storage_tank.setSourceSideAvailabilitySchedule(charge_sch)
-    avm_sch =  OpenStudio::Model::AvailabilityManagerScheduled.new(model)
-    avm_sch.setSchedule(charge_sch)
-    selected_primary_loop.addAvailabilityManager(avm_sch)
-
     # move all primary loop demand components (except inlet and outlet pipes) to the secondary loop
     selected_primary_loop.demandComponents(selected_primary_loop.demandSplitter, selected_primary_loop.demandMixer).each do |demand_comp|
       if demand_comp.to_StraightComponent.is_initialized