Skip to content

Fixes Issue #170 #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidGoldwasser merged 2 commits into from
Jun 18, 2026
Merged

Fixes Issue #170 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b47329
Fixes Issue #170
DavidGoldwasser Jun 17, 2026
559dddc
test: add zone/space name assertions to prevent Issue #170 regression
Copilot Jun 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/measures/merge_floorspace_js_with_model/measure.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ def run(model, runner, user_arguments)
space_type.spaces.each do |space|
unless space.thermalZone.is_initialized
thermal_zone = OpenStudio::Model::ThermalZone.new(model)
thermal_zone.setName(space.name.to_s)
thermal_zone.setName("zone #{space.name.to_s}")
Comment thread
DavidGoldwasser marked this conversation as resolved.
space.setThermalZone(thermal_zone)
end
end
Expand Down
6 changes: 3 additions & 3 deletions lib/measures/merge_floorspace_js_with_model/measure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<schema_version>3.1</schema_version>
<name>merge_floorspace_js_with_model</name>
<uid>16ef6369-6420-4f17-894c-a767895bcaa4</uid>
<version_id>08fb938b-1331-47e4-bcaa-07fae4abc783</version_id>
<version_modified>2025-08-01T14:58:34Z</version_modified>
<version_id>c3c232cf-cb02-4ce8-ad73-3caace5dfb60</version_id>
<version_modified>2026-06-17T22:04:59Z</version_modified>
<xml_checksum>0AD1E2E2</xml_checksum>
<class_name>MergeFloorspaceJsWithModel</class_name>
<display_name>Merge FloorspaceJs with Model</display_name>
Expand Down Expand Up @@ -80,7 +80,7 @@
<filename>measure.rb</filename>
<filetype>rb</filetype>
<usage_type>script</usage_type>
<checksum>23601781</checksum>
<checksum>410E985D</checksum>
</file>
<file>
<filename>SDDC Office template.osm</filename>
Expand Down
17 changes: 17 additions & 0 deletions lib/measures/merge_floorspace_js_with_model/tests/merge_floorspace_js_with_model_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ def test_good_argument_values
# store the number of spaces in the seed model
num_spaces_seed = model.getSpaces.size

# capture existing zone names before running the measure
existing_zone_names = model.getThermalZones.map { |z| z.name.to_s }

# get arguments
arguments = measure.arguments(model)
argument_map = OpenStudio::Measure.convertOSArgumentVectorToMap(arguments)
Expand Down Expand Up @@ -69,6 +72,20 @@ def test_good_argument_values
# check that there is now 1 space
# assert_equal(1, model.getSpaces.size - num_spaces_seed)

# verify that newly created thermal zones are prefixed with "zone "
# and that zone names do not exactly match the corresponding space name (Issue #170)
model.getSpaces.each do |space|
next unless space.thermalZone.is_initialized
zone_name = space.thermalZone.get.name.to_s
next if existing_zone_names.include?(zone_name)

space_name = space.name.to_s
assert(zone_name.start_with?('zone '),
"Expected newly created zone '#{zone_name}' to start with 'zone ' for space '#{space_name}'")
refute_equal(space_name, zone_name,
"Thermal zone name '#{zone_name}' must not equal space name '#{space_name}'")
end

# save the model to test output directory
output_file_path = "#{File.dirname(__FILE__)}//output/test_output.osm"
model.save(output_file_path, true)
Expand Down
Loading