openstudio-model-articulation 0.2.0 → 0.2.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (77) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +21 -0
  3. data/Rakefile +20 -1
  4. data/lib/measures/AssignConstructionSetToBuilding/measure.rb +2 -0
  5. data/lib/measures/AssignSpaceTypeBySpaceName/measure.rb +2 -0
  6. data/lib/measures/AssignSpaceTypeToBuilding/measure.rb +2 -0
  7. data/lib/measures/AssignSpacesToStories/measure.rb +2 -0
  8. data/lib/measures/BarAspectRatioSlicedBySpaceType/measure.rb +2 -0
  9. data/lib/measures/BarAspectRatioSlicedBySpaceType/measure.xml +0 -6
  10. data/lib/measures/BarAspectRatioSlicedBySpaceType/resources/os_lib_cofee.rb +2 -0
  11. data/lib/measures/BarAspectRatioStudy/measure.rb +2 -0
  12. data/lib/measures/CleanupSpaceOrigins/measure.rb +2 -0
  13. data/lib/measures/FindAndReplaceObjectNames/measure.rb +2 -0
  14. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.rb +2 -0
  15. data/lib/measures/InjectOsmGeometryIntoAnExternalIdf/measure.xml +9 -9
  16. data/lib/measures/RemoveHardAssignedConstructions/measure.rb +2 -0
  17. data/lib/measures/RenameSpaceSurfacesBasedonParentSpaceandOrientation/measure.rb +2 -0
  18. data/lib/measures/RotateBuilding/measure.rb +2 -0
  19. data/lib/measures/SetExtWallToGroundBoundaryConditionByStory/measure.rb +2 -0
  20. data/lib/measures/SetInteriorWallsAndFloorsToAdiabatic/measure.rb +2 -0
  21. data/lib/measures/SetInteriorWallsToSelectedConstruction/measure.rb +2 -0
  22. data/lib/measures/SetWindowToWallRatioByFacade/measure.rb +21 -31
  23. data/lib/measures/SetWindowToWallRatioByFacade/measure.xml +4 -4
  24. data/lib/measures/SimplifyGeometryToSlicedBar/measure.rb +2 -0
  25. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_cofee.rb +2 -0
  26. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_geometry.rb +2 -0
  27. data/lib/measures/SimplifyGeometryToSlicedBar/resources/os_lib_helper_methods.rb +3 -1
  28. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.rb +2 -0
  29. data/lib/measures/SpaceTypeAndConstructionSetWizard/measure.xml +1 -1
  30. data/lib/measures/SurfaceMatching/measure.rb +2 -0
  31. data/lib/measures/blended_space_type_from_floor_area_ratios/measure.rb +2 -0
  32. data/lib/measures/blended_space_type_from_model/measure.rb +2 -0
  33. data/lib/measures/blended_space_type_from_model/resources/os_lib_model_simplification.rb +2 -0
  34. data/lib/measures/clone_building_from_external_model/measure.rb +2 -0
  35. data/lib/measures/clone_building_from_external_model/measure.xml +4 -4
  36. data/lib/measures/create_DOE_prototype_building/measure.rb +8 -1
  37. data/lib/measures/create_DOE_prototype_building/measure.xml +2 -2
  38. data/lib/measures/create_and_assign_thermal_zones_for_unassigned_spaces/measure.rb +2 -0
  39. data/lib/measures/create_bar_from_building_type_ratios/measure.rb +3 -1
  40. data/lib/measures/create_bar_from_deer_building_type_ratios/measure.rb +2 -0
  41. data/lib/measures/create_bar_from_doe_building_type_ratios/measure.rb +2 -0
  42. data/lib/measures/create_bar_from_model/measure.rb +2 -0
  43. data/lib/measures/create_baseline_building/measure.rb +3 -1
  44. data/lib/measures/create_baseline_building/measure.xml +2 -2
  45. data/lib/measures/create_deer_prototype_building/measure.rb +2 -0
  46. data/lib/measures/create_deer_prototype_building/measure.xml +2 -2
  47. data/lib/measures/create_deer_prototype_building/resources/deer_building_types.rb +2 -0
  48. data/lib/measures/create_parametric_schedules/measure.rb +2 -0
  49. data/lib/measures/create_typical_building_from_model/measure.rb +2 -0
  50. data/lib/measures/create_typical_building_from_model/measure.xml +11 -11
  51. data/lib/measures/create_typical_building_from_model/resources/Model.hvac.rb +3 -1
  52. data/lib/measures/create_typical_deer_building_from_model/measure.rb +2 -0
  53. data/lib/measures/create_typical_deer_building_from_model/measure.xml +11 -11
  54. data/lib/measures/create_typical_deer_building_from_model/resources/Model.hvac.rb +3 -1
  55. data/lib/measures/create_typical_doe_building_from_model/measure.rb +2 -0
  56. data/lib/measures/create_typical_doe_building_from_model/measure.xml +19 -19
  57. data/lib/measures/create_typical_doe_building_from_model/resources/Model.hvac.rb +3 -1
  58. data/lib/measures/deer_space_type_and_construction_set_wizard/measure.rb +2 -0
  59. data/lib/measures/find_and_replace_in_all_thermal_zone_names/measure.rb +2 -0
  60. data/lib/measures/make_shading_surfaces_based_on_zone_multipliers/measure.rb +2 -0
  61. data/lib/measures/merge_floorspace_js_with_model/measure.rb +2 -0
  62. data/lib/measures/merge_floorspace_js_with_model/measure.xml +9 -15
  63. data/lib/measures/merge_spaces_from_external_file/measure.rb +2 -0
  64. data/lib/measures/merge_spaces_from_external_file/measure.xml +4 -4
  65. data/lib/measures/merge_spaces_from_external_file/resources/ScheduleTranslator.rb +6 -4
  66. data/lib/measures/radiance_measure/measure.rb +2 -0
  67. data/lib/measures/radiance_measure/measure.xml +9 -9
  68. data/lib/measures/radiant_slab_with_doas/LICENSE.md +27 -0
  69. data/lib/measures/radiant_slab_with_doas/README.md +156 -0
  70. data/lib/measures/radiant_slab_with_doas/README.md.erb +42 -0
  71. data/lib/measures/radiant_slab_with_doas/measure.rb +406 -0
  72. data/lib/measures/radiant_slab_with_doas/measure.xml +346 -0
  73. data/lib/measures/replace_geometry_by_story/measure.rb +2 -0
  74. data/lib/measures/scale_geometry/measure.rb +2 -0
  75. data/lib/openstudio/model_articulation/version.rb +1 -1
  76. metadata +12 -8
  77. data/lib/measures/merge_floorspace_js_with_model/docs/.gitkeep +0 -0
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -227,7 +229,7 @@ module OsLib_HelperMethods
227
229
  def self.log_msgs
228
230
  @msg_log.logMessages.each do |msg|
229
231
  # DLM: you can filter on log channel here for now
230
- if /openstudio.*/.match(msg.logChannel) # /openstudio\.model\..*/
232
+ if /openstudio.*/.match?(msg.logChannel) # /openstudio\.model\..*/
231
233
  # Skip certain messages that are irrelevant/misleading
232
234
  next if msg.logMessage.include?('Skipping layer') || # Annoying/bogus "Skipping layer" warnings
233
235
  msg.logChannel.include?('runmanager') || # RunManager messages
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -326,7 +326,7 @@
326
326
  <version>
327
327
  <software_program>OpenStudio</software_program>
328
328
  <identifier>2.0.0</identifier>
329
- <min_compatible>2.8.0</min_compatible>
329
+ <min_compatible>3.0.0</min_compatible>
330
330
  </version>
331
331
  <filename>measure.rb</filename>
332
332
  <filetype>rb</filetype>
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>clone_building_from_external_model</name>
5
5
  <uid>09711168-01a7-4abc-b710-b49d59d927d8</uid>
6
- <version_id>abdf7679-c737-44f5-8cea-a78453643a14</version_id>
7
- <version_modified>20200509T155938Z</version_modified>
6
+ <version_id>af2dd889-f383-410d-8ed2-8ff7a01aa086</version_id>
7
+ <version_modified>20200624T003819Z</version_modified>
8
8
  <xml_checksum>AFECFDDF</xml_checksum>
9
9
  <class_name>CloneBuildingFromExternalModel</class_name>
10
10
  <display_name>Clone Building From External Model</display_name>
@@ -76,7 +76,7 @@
76
76
  <checksum>84A5375F</checksum>
77
77
  </file>
78
78
  <file>
79
- <filename>test.osw</filename>
79
+ <filename>measure_test.osw</filename>
80
80
  <filetype>osw</filetype>
81
81
  <usage_type>test</usage_type>
82
82
  <checksum>F5FABCCF</checksum>
@@ -114,7 +114,7 @@
114
114
  <filename>clone_building_from_external_model_test.rb</filename>
115
115
  <filetype>rb</filetype>
116
116
  <usage_type>test</usage_type>
117
- <checksum>414896DB</checksum>
117
+ <checksum>C1BA8CCE</checksum>
118
118
  </file>
119
119
  </files>
120
120
  </measure>
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -74,6 +76,11 @@ class CreateDOEPrototypeBuilding < OpenStudio::Measure::ModelMeasure
74
76
  building_type_chs << 'HighriseApartment'
75
77
  building_type_chs << 'Hospital'
76
78
  building_type_chs << 'Outpatient'
79
+ building_type_chs << 'Laboratory'
80
+ building_type_chs << 'LargeDataCenterHighITE'
81
+ building_type_chs << 'LargeDataCenterLowITE'
82
+ building_type_chs << 'SmallDataCenterHighITE'
83
+ building_type_chs << 'SmallDataCenterLowITE'
77
84
  building_type = OpenStudio::Measure::OSArgument.makeChoiceArgument('building_type', building_type_chs, true)
78
85
  building_type.setDisplayName('Building Type.')
79
86
  building_type.setDefaultValue('SmallOffice')
@@ -205,7 +212,7 @@ class CreateDOEPrototypeBuilding < OpenStudio::Measure::ModelMeasure
205
212
  def log_msgs
206
213
  @msg_log.logMessages.each do |msg|
207
214
  # DLM: you can filter on log channel here for now
208
- if /openstudio.*/.match(msg.logChannel) # /openstudio\.model\..*/
215
+ if /openstudio.*/.match?(msg.logChannel) # /openstudio\.model\..*/
209
216
  # Skip certain messages that are irrelevant/misleading
210
217
  next if msg.logMessage.include?('Skipping layer') || # Annoying/bogus "Skipping layer" warnings
211
218
  msg.logChannel.include?('runmanager') || # RunManager messages
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_doe_prototype_building</name>
5
5
  <uid>be90fd0b-a651-467a-bc8d-29d310b0f937</uid>
6
- <version_id>9f4d9c24-2ae4-4598-90eb-0165066d0733</version_id>
7
- <version_modified>20200512T025556Z</version_modified>
6
+ <version_id>cd977924-f8f2-4519-8756-9ba34ba49714</version_id>
7
+ <version_modified>20200624T003818Z</version_modified>
8
8
  <xml_checksum>057E8D9D</xml_checksum>
9
9
  <class_name>CreateDOEPrototypeBuilding</class_name>
10
10
  <display_name>Create DOE Prototype Building</display_name>
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -366,7 +368,7 @@ class CreateBarFromBuildingTypeRatios < OpenStudio::Measure::ModelMeasure
366
368
  # can be removed after fixes to core OS geometry methods are made. # aka, force argument false
367
369
  orig_val = user_arguments['make_mid_story_surfaces_adiabatic']
368
370
  if orig_val.hasValue
369
- runner.registerInfo("To assure stability of the measure altering the value of make_mid_story_surfaces_adiabatic argument to be true. This will avoid using surface intersection and will result in adiabatic vs surface matched floor/ceiling connections.")
371
+ runner.registerInfo('To assure stability of the measure altering the value of make_mid_story_surfaces_adiabatic argument to be true. This will avoid using surface intersection and will result in adiabatic vs surface matched floor/ceiling connections.')
370
372
  end
371
373
  user_arguments['make_mid_story_surfaces_adiabatic'].setValue(true)
372
374
 
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -243,7 +245,7 @@ class CreateBaselineBuilding < OpenStudio::Measure::ModelMeasure
243
245
  @runner.registerFinalCondition("Messages below saved to <a href='file:///#{log_file_path}'>#{log_name}</a>.")
244
246
  @msg_log.logMessages.each do |msg|
245
247
  # DLM: you can filter on log channel here for now
246
- if /openstudio.*/.match(msg.logChannel) # /openstudio\.model\..*/
248
+ if /openstudio.*/.match?(msg.logChannel) # /openstudio\.model\..*/
247
249
  # Skip certain messages that are irrelevant/misleading
248
250
  next if msg.logMessage.include?('Skipping layer') || # Annoying/bogus "Skipping layer" warnings
249
251
  msg.logChannel.include?('runmanager') || # RunManager messages
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_baseline_building</name>
5
5
  <uid>4de56e21-b6cd-45d9-8466-862507d228b2</uid>
6
- <version_id>faa2647b-3193-426c-8b25-1470e0bfb1a2</version_id>
7
- <version_modified>20200512T025555Z</version_modified>
6
+ <version_id>aa1e11a0-3fb8-4aff-a93b-38a94736f3c6</version_id>
7
+ <version_modified>20200624T003805Z</version_modified>
8
8
  <xml_checksum>A514F332</xml_checksum>
9
9
  <class_name>CreateBaselineBuilding</class_name>
10
10
  <display_name>Create Baseline Building</display_name>
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_deer_prototype_building</name>
5
5
  <uid>752055bd-10d9-4ede-8a35-18487fedf579</uid>
6
- <version_id>72174604-9ced-4545-80f1-50a58f852f3a</version_id>
7
- <version_modified>20200512T025555Z</version_modified>
6
+ <version_id>3aef0d72-786e-47a0-b144-dfd6cb6c90ff</version_id>
7
+ <version_modified>20200624T003806Z</version_modified>
8
8
  <xml_checksum>A514F332</xml_checksum>
9
9
  <class_name>CreateDEERPrototypeBuilding</class_name>
10
10
  <display_name>Create DEER Prototype Building ALPHA Version</display_name>
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_typical_building_from_model</name>
5
5
  <uid>339a2e3a-273c-4494-bb50-bfe586a0647c</uid>
6
- <version_id>c1192b2d-7cab-4477-a756-42652cf57b39</version_id>
7
- <version_modified>20200509T155937Z</version_modified>
6
+ <version_id>cf4a5895-bc2f-4b83-925c-7eaaeb3d0913</version_id>
7
+ <version_modified>20200911T195900Z</version_modified>
8
8
  <xml_checksum>EE13F09F</xml_checksum>
9
9
  <class_name>CreateTypicalBuildingFromModel</class_name>
10
10
  <display_name>Create Typical Building from Model</display_name>
@@ -1321,7 +1321,7 @@
1321
1321
  </attributes>
1322
1322
  <files>
1323
1323
  <file>
1324
- <filename>test.osw</filename>
1324
+ <filename>measure_test.osw</filename>
1325
1325
  <filetype>osw</filetype>
1326
1326
  <usage_type>test</usage_type>
1327
1327
  <checksum>6DB338FC</checksum>
@@ -1524,12 +1524,6 @@
1524
1524
  <usage_type>license</usage_type>
1525
1525
  <checksum>E0468DD6</checksum>
1526
1526
  </file>
1527
- <file>
1528
- <filename>Model.hvac.rb</filename>
1529
- <filetype>rb</filetype>
1530
- <usage_type>resource</usage_type>
1531
- <checksum>007BDD2B</checksum>
1532
- </file>
1533
1527
  <file>
1534
1528
  <version>
1535
1529
  <software_program>OpenStudio</software_program>
@@ -1542,7 +1536,7 @@
1542
1536
  <checksum>6E6F78F0</checksum>
1543
1537
  </file>
1544
1538
  <file>
1545
- <filename>test_hvac.rb</filename>
1539
+ <filename>measure_test_hvac.rb</filename>
1546
1540
  <filetype>rb</filetype>
1547
1541
  <usage_type>test</usage_type>
1548
1542
  <checksum>371B841C</checksum>
@@ -1551,7 +1545,13 @@
1551
1545
  <filename>create_typical_building_from_model_test.rb</filename>
1552
1546
  <filetype>rb</filetype>
1553
1547
  <usage_type>test</usage_type>
1554
- <checksum>7E049671</checksum>
1548
+ <checksum>CFEF1007</checksum>
1549
+ </file>
1550
+ <file>
1551
+ <filename>Model.hvac.rb</filename>
1552
+ <filetype>rb</filetype>
1553
+ <usage_type>resource</usage_type>
1554
+ <checksum>D8BF0815</checksum>
1555
1555
  </file>
1556
1556
  </files>
1557
1557
  </measure>
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -60,7 +62,7 @@ class OpenStudio::Model::Model
60
62
  standard.model_add_hvac_system(self, 'Baseboards', ht = 'NaturalGas', znht = nil, cl = nil, heated_zones)
61
63
 
62
64
  when 'Baseboard central air source heat pump'
63
- standard.model_add_hvac_system(self, 'Baseboards', ht = 'AirSourceHeatPump', znht = nil, cl = nil, heated_only_zones)
65
+ standard.model_add_hvac_system(self, 'Baseboards', ht = 'AirSourceHeatPump', znht = nil, cl = nil, heated_zones)
64
66
 
65
67
  when 'Baseboard district hot water'
66
68
  standard.model_add_hvac_system(self, 'Baseboards', ht = 'DistrictHeating', znht = nil, cl = nil, heated_zones)
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_typical_deer_building_from_model</name>
5
5
  <uid>09cc23db-5e9b-4b11-b167-1852a15ed339</uid>
6
- <version_id>566684f7-5338-4c18-a682-4559ba11a0e1</version_id>
7
- <version_modified>20200509T155941Z</version_modified>
6
+ <version_id>8429e1aa-3ac6-4cdf-8d58-b998699579a9</version_id>
7
+ <version_modified>20200911T195820Z</version_modified>
8
8
  <xml_checksum>AABAC479</xml_checksum>
9
9
  <class_name>CreateTypicalDEERBuildingFromModel</class_name>
10
10
  <display_name>Create Typical DEER Building from Model</display_name>
@@ -1190,7 +1190,7 @@
1190
1190
  </attributes>
1191
1191
  <files>
1192
1192
  <file>
1193
- <filename>test.osw</filename>
1193
+ <filename>measure_test.osw</filename>
1194
1194
  <filetype>osw</filetype>
1195
1195
  <usage_type>test</usage_type>
1196
1196
  <checksum>6DB338FC</checksum>
@@ -1393,12 +1393,6 @@
1393
1393
  <usage_type>license</usage_type>
1394
1394
  <checksum>E0468DD6</checksum>
1395
1395
  </file>
1396
- <file>
1397
- <filename>Model.hvac.rb</filename>
1398
- <filetype>rb</filetype>
1399
- <usage_type>resource</usage_type>
1400
- <checksum>007BDD2B</checksum>
1401
- </file>
1402
1396
  <file>
1403
1397
  <version>
1404
1398
  <software_program>OpenStudio</software_program>
@@ -1411,7 +1405,7 @@
1411
1405
  <checksum>B6303750</checksum>
1412
1406
  </file>
1413
1407
  <file>
1414
- <filename>test_hvac.rb</filename>
1408
+ <filename>measure_test_hvac.rb</filename>
1415
1409
  <filetype>rb</filetype>
1416
1410
  <usage_type>test</usage_type>
1417
1411
  <checksum>9185BFA7</checksum>
@@ -1420,7 +1414,13 @@
1420
1414
  <filename>create_typical_deer_building_from_model_test.rb</filename>
1421
1415
  <filetype>rb</filetype>
1422
1416
  <usage_type>test</usage_type>
1423
- <checksum>37770E86</checksum>
1417
+ <checksum>6B02F7C5</checksum>
1418
+ </file>
1419
+ <file>
1420
+ <filename>Model.hvac.rb</filename>
1421
+ <filetype>rb</filetype>
1422
+ <usage_type>resource</usage_type>
1423
+ <checksum>D8BF0815</checksum>
1424
1424
  </file>
1425
1425
  </files>
1426
1426
  </measure>
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -60,7 +62,7 @@ class OpenStudio::Model::Model
60
62
  standard.model_add_hvac_system(self, 'Baseboards', ht = 'NaturalGas', znht = nil, cl = nil, heated_zones)
61
63
 
62
64
  when 'Baseboard central air source heat pump'
63
- standard.model_add_hvac_system(self, 'Baseboards', ht = 'AirSourceHeatPump', znht = nil, cl = nil, heated_only_zones)
65
+ standard.model_add_hvac_system(self, 'Baseboards', ht = 'AirSourceHeatPump', znht = nil, cl = nil, heated_zones)
64
66
 
65
67
  when 'Baseboard district hot water'
66
68
  standard.model_add_hvac_system(self, 'Baseboards', ht = 'DistrictHeating', znht = nil, cl = nil, heated_zones)
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  # *******************************************************************************
2
4
  # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
3
5
  # All rights reserved.
@@ -3,8 +3,8 @@
3
3
  <schema_version>3.0</schema_version>
4
4
  <name>create_typical_doe_building_from_model</name>
5
5
  <uid>b2c80210-33b3-4dfd-8267-535efd81f552</uid>
6
- <version_id>a4f92e3f-7b90-4113-b88c-96adef4a626f</version_id>
7
- <version_modified>20200509T155940Z</version_modified>
6
+ <version_id>a3906836-06ea-4bda-b13c-53c08cb23e95</version_id>
7
+ <version_modified>20200911T195753Z</version_modified>
8
8
  <xml_checksum>99E7000D</xml_checksum>
9
9
  <class_name>CreateTypicalDOEBuildingFromModel</class_name>
10
10
  <display_name>Create Typical DOE Building from Model</display_name>
@@ -1155,7 +1155,7 @@
1155
1155
  </attributes>
1156
1156
  <files>
1157
1157
  <file>
1158
- <filename>test.osw</filename>
1158
+ <filename>measure_test.osw</filename>
1159
1159
  <filetype>osw</filetype>
1160
1160
  <usage_type>test</usage_type>
1161
1161
  <checksum>6DB338FC</checksum>
@@ -1346,24 +1346,12 @@
1346
1346
  <usage_type>readmeerb</usage_type>
1347
1347
  <checksum>46CFB534</checksum>
1348
1348
  </file>
1349
- <file>
1350
- <filename>README.md</filename>
1351
- <filetype>md</filetype>
1352
- <usage_type>readme</usage_type>
1353
- <checksum>1B1C70D8</checksum>
1354
- </file>
1355
1349
  <file>
1356
1350
  <filename>LICENSE.md</filename>
1357
1351
  <filetype>md</filetype>
1358
1352
  <usage_type>license</usage_type>
1359
1353
  <checksum>E0468DD6</checksum>
1360
1354
  </file>
1361
- <file>
1362
- <filename>Model.hvac.rb</filename>
1363
- <filetype>rb</filetype>
1364
- <usage_type>resource</usage_type>
1365
- <checksum>007BDD2B</checksum>
1366
- </file>
1367
1355
  <file>
1368
1356
  <version>
1369
1357
  <software_program>OpenStudio</software_program>
@@ -1376,16 +1364,28 @@
1376
1364
  <checksum>57D960DB</checksum>
1377
1365
  </file>
1378
1366
  <file>
1379
- <filename>test_hvac.rb</filename>
1367
+ <filename>create_typical_doe_building_from_model_test.rb</filename>
1380
1368
  <filetype>rb</filetype>
1381
1369
  <usage_type>test</usage_type>
1382
- <checksum>2785485F</checksum>
1370
+ <checksum>8AC3CE71</checksum>
1383
1371
  </file>
1384
1372
  <file>
1385
- <filename>create_typical_doe_building_from_model_test.rb</filename>
1373
+ <filename>measure_test_hvac.rb</filename>
1386
1374
  <filetype>rb</filetype>
1387
1375
  <usage_type>test</usage_type>
1388
- <checksum>2724D460</checksum>
1376
+ <checksum>2785485F</checksum>
1377
+ </file>
1378
+ <file>
1379
+ <filename>Model.hvac.rb</filename>
1380
+ <filetype>rb</filetype>
1381
+ <usage_type>resource</usage_type>
1382
+ <checksum>D8BF0815</checksum>
1383
+ </file>
1384
+ <file>
1385
+ <filename>README.md</filename>
1386
+ <filetype>md</filetype>
1387
+ <usage_type>readme</usage_type>
1388
+ <checksum>1B1C70D8</checksum>
1389
1389
  </file>
1390
1390
  </files>
1391
1391
  </measure>