openstudio-standards 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1389773e8a46296d8bf63ae123c53db6d3a0fbb
-  data.tar.gz: 81a9723e106c905ed12e69ab3842f249ba88a2a2
+  metadata.gz: 8c6cefd2e8e6692ea225fa16386b620b4898c017
+  data.tar.gz: 8156a0585a1632a6e74246b5055ce6c8fbc61aba
 SHA512:
-  metadata.gz: 6e8bccd7d2891335270cd8c469fe54f7c8be764d7d02745e4677750d854d930a977072e5e11997b7cb77ca9194fba56ed48c09d4998f0adf2e54970535ecedab
-  data.tar.gz: d46b6c58bb7d1caf1b0f43c9f1f15168847a701859e04863a36c171fb7e8e789e5ab485b32e9c9f562af9c42e7a2184763ccd05904d197a5f66f351355b5339d
+  metadata.gz: 68033809696c245be2c7213f3263ac168080be527ee110f6d235b84e3ae0acb0ff65f8ae47ec218988a4ce21f76c7dbbf4c7d6e2e1fa29376f184d4f9133e5ba
+  data.tar.gz: 97bce63f202c6b6588d9202466548a2928f66a4d997159abd7b210d85f5444363400536f88f07c99f85cca373ce275dab45bd2e4b64500c5c8c049dff8d5e3a4

data/data/standards/OpenStudio_Standards_space_types.json

@@ -13343,27 +13343,27 @@
     {
       "template": "90.1-2004",
       "building_type": "PrimarySchool",
-      "space_type": "Apartment_topfloor_NS",
-      "rgb": "120_230_199",
+      "space_type": "Cafeteria",
+      "rgb": "31_169_34",
       "lighting_standard": "ASHRAE 90.1-2004",
-      "lighting_primary_space_type": "Classroom/Lecture/Training",
+      "lighting_primary_space_type": "Dining Area",
       "lighting_secondary_space_type": "General",
-      "lighting_per_area": 1.4,
+      "lighting_per_area": 0.9,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
       "lighting_fraction_to_return_air": 0.0,
       "lighting_fraction_radiant": 0.37,
       "lighting_fraction_visible": 0.2,
-      "lighting_schedule": "SchoolPrimary BLDG_LIGHT_CLASSROOM_SCH",
+      "lighting_schedule": "SchoolPrimary BLDG_LIGHT_SCH",
       "ventilation_standard": "ASHRAE 62.1-1999",
-      "ventilation_primary_space_type": "Education",
-      "ventilation_secondary_space_type": "Classroom",
+      "ventilation_primary_space_type": "Food and Beverage Service",
+      "ventilation_secondary_space_type": "Cafeteria, fast food",
       "ventilation_per_area": 0,
-      "ventilation_per_person": 16.95,
+      "ventilation_per_person": 20,
       "ventilation_air_changes": "",
       "minimum_total_air_changes": null,
-      "occupancy_per_area": 25.0,
-      "occupancy_schedule": "SchoolPrimary BLDG_OCC_SCH",
+      "occupancy_per_area": 100.0,
+      "occupancy_schedule": "SchoolPrimary BLDG_OCC_SCH_Cafeteria",
       "occupancy_activity_schedule": "SchoolPrimary ACTIVITY_SCH",
       "infiltration_per_exterior_area": 0.0595,
       "infiltration_per_exterior_wall_area": null,
@@ -13374,7 +13374,7 @@
       "gas_equipment_fraction_radiant": null,
       "gas_equipment_fraction_lost": null,
       "gas_equipment_schedule": null,
-      "electric_equipment_per_area": 1.39,
+      "electric_equipment_per_area": 2.36,
       "electric_equipment_fraction_latent": 0.0,
       "electric_equipment_fraction_radiant": 0.5,
       "electric_equipment_fraction_lost": 0.0,
@@ -13401,27 +13401,27 @@
     {
       "template": "90.1-2004",
       "building_type": "PrimarySchool",
-      "space_type": "Cafeteria",
-      "rgb": "31_169_34",
+      "space_type": "Classroom",
+      "rgb": "120_230_199",
       "lighting_standard": "ASHRAE 90.1-2004",
-      "lighting_primary_space_type": "Dining Area",
+      "lighting_primary_space_type": "Classroom/Lecture/Training",
       "lighting_secondary_space_type": "General",
-      "lighting_per_area": 0.9,
+      "lighting_per_area": 1.4,
       "lighting_per_person": null,
       "additional_lighting_per_area": null,
       "lighting_fraction_to_return_air": 0.0,
       "lighting_fraction_radiant": 0.37,
       "lighting_fraction_visible": 0.2,
-      "lighting_schedule": "SchoolPrimary BLDG_LIGHT_SCH",
+      "lighting_schedule": "SchoolPrimary BLDG_LIGHT_CLASSROOM_SCH",
       "ventilation_standard": "ASHRAE 62.1-1999",
-      "ventilation_primary_space_type": "Food and Beverage Service",
-      "ventilation_secondary_space_type": "Cafeteria, fast food",
+      "ventilation_primary_space_type": "Education",
+      "ventilation_secondary_space_type": "Classroom",
       "ventilation_per_area": 0,
-      "ventilation_per_person": 20,
+      "ventilation_per_person": 16.95,
       "ventilation_air_changes": "",
       "minimum_total_air_changes": null,
-      "occupancy_per_area": 100.0,
-      "occupancy_schedule": "SchoolPrimary BLDG_OCC_SCH_Cafeteria",
+      "occupancy_per_area": 25.0,
+      "occupancy_schedule": "SchoolPrimary BLDG_OCC_SCH",
       "occupancy_activity_schedule": "SchoolPrimary ACTIVITY_SCH",
       "infiltration_per_exterior_area": 0.0595,
       "infiltration_per_exterior_wall_area": null,
@@ -13432,7 +13432,7 @@
       "gas_equipment_fraction_radiant": null,
       "gas_equipment_fraction_lost": null,
       "gas_equipment_schedule": null,
-      "electric_equipment_per_area": 2.36,
+      "electric_equipment_per_area": 1.39,
       "electric_equipment_fraction_latent": 0.0,
       "electric_equipment_fraction_radiant": 0.5,
       "electric_equipment_fraction_lost": 0.0,

data/lib/openstudio-standards/prototypes/Prototype.Model.rb

@@ -813,9 +813,6 @@ class OpenStudio::Model::Model
       else
         thermostat_clone = thermostat.get.clone(self).to_ThermostatSetpointDualSetpoint.get
         zone.setThermostatSetpointDualSetpoint(thermostat_clone)
-        # Set Ideal loads to thermal zone for sizing.
-        ideal_loads = OpenStudio::Model::ZoneHVACIdealLoadsAirSystem.new(self)
-        ideal_loads.addToThermalZone(zone)
       end
     end
 

data/lib/openstudio-standards/standards/Standards.Model.rb

@@ -1407,9 +1407,6 @@ class OpenStudio::Model::Model
   # Looks through the model and creates an hash of what the baseline
   # system type should be for each zone.
   #
-  # @note This method modifies the model by removing the existing
-  # HVAC and adding ideal loads in order to perform a sizing
-  # run to determine primary vs. secondary zones.
   # @return [Hash] keys are zones, values are system type strings
   # PTHP, PTAC, PSZ_AC, PSZ_HP, PVAV_Reheat, PVAV_PFP_Boxes,
   # VAV_Reheat, VAV_PFP_Boxes, Gas_Furnace, Electric_Furnace
@@ -1425,21 +1422,6 @@ class OpenStudio::Model::Model
     # Remove all HVAC from model
     BTAP::Resources::HVAC.clear_all_hvac_from_model(self)
 
-    # Add ideal loads to every zone and run
-    # a sizing run to determine heating/cooling loads,
-    # which will impact which zones go onto secondary
-    # HVAC systems.
-    getThermalZones.each do |zone|
-      ideal_loads = OpenStudio::Model::ZoneHVACIdealLoadsAirSystem.new(self)
-      ideal_loads.addToThermalZone(zone)
-    end
-    # Run sizing run
-    if runSizingRun("#{Dir.pwd}/SizingRunIdeal") == false
-      return false
-    end
-    # Remove ideal loads
-    getZoneHVACIdealLoadsAirSystems.each(&:remove)
-
     # Assign building stories to spaces in the building
     # where stories are not yet assigned.
     assign_spaces_to_stories

data/lib/openstudio-standards/version.rb

@@ -1,3 +1,3 @@
 module OpenstudioStandards
-  VERSION = '0.1.5'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-standards
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Andrew Parker
@@ -21,7 +21,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler