Skip to content
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

Schedule:File relative paths #1380

Merged
merged 13 commits into from
Nov 27, 2023
Merged

Schedule:File relative paths #1380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e15c4ad
Change output_dir to relative path.
joseph-robertson May 9, 2023
77ceaf8
Move abs to rel path conv to schedules resource file.
joseph-robertson May 9, 2023
a2732cc
This works with the os changes, but we are changing cwd.
joseph-robertson May 9, 2023
e658bde
Merge branch 'master' into schedule-file-rel-path
joseph-robertson Oct 26, 2023
355d8ed
Add run folder to workflow json file paths so external file can find it.
joseph-robertson Oct 26, 2023
b7c93e4
Confirm new schedulefile setter does what we want.
joseph-robertson Oct 27, 2023
346a99b
Merge branch 'master' into schedule-file-rel-path
joseph-robertson Nov 2, 2023
c861f37
Update schedule file relative path setter name.
joseph-robertson Nov 2, 2023
8c8c6e4
Merge branch 'master' into schedule-file-rel-path
joseph-robertson Nov 8, 2023
516ab90
Get config ready to point to develop.
joseph-robertson Nov 8, 2023
162ef4a
Merge branch 'master' into schedule-file-rel-path
joseph-robertson Nov 20, 2023
2e37282
Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML int…
shorowit Nov 27, 2023
e36131b
Update xml
shorowit Nov 27, 2023
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
6 changes: 3 additions & 3 deletions HPXMLtoOpenStudio/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>hpxm_lto_openstudio</name>
<uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
<version_id>ff727cab-96e5-480f-a9a7-78c64755662f</version_id>
<version_modified>2023-11-15T00:52:51Z</version_modified>
<version_id>6d2dc12a-bac9-4979-a4db-a4172c12a591</version_id>
<version_modified>2023-11-27T16:49:25Z</version_modified>
<xml_checksum>D8922A73</xml_checksum>
<class_name>HPXMLtoOpenStudio</class_name>
<display_name>HPXML to OpenStudio Translator</display_name>
Expand Down Expand Up @@ -472,7 +472,7 @@
<filename>schedules.rb</filename>
<filetype>rb</filetype>
<usage_type>resource</usage_type>
<checksum>D4095878</checksum>
<checksum>62152E07</checksum>
</file>
<file>
<filename>simcontrols.rb</filename>
Expand Down
8 changes: 7 additions & 1 deletion HPXMLtoOpenStudio/resources/schedules.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1485,12 +1485,18 @@ def create_schedule_file(model, col_name:, rows_to_skip: 1,
schedule_length = @schedules[col_name].length
min_per_item = 60.0 / (schedule_length / num_hrs_in_year)

schedule_file = OpenStudio::Model::ScheduleFile.new(model, @output_schedules_path)
file_path = File.dirname(@output_schedules_path)
workflow_json = model.workflowJSON
file_paths = workflow_json.filePaths.map(&:to_s)
workflow_json.addFilePath(file_path) unless file_paths.include?(file_path)

schedule_file = OpenStudio::Model::ScheduleFile.new(model, File.basename(@output_schedules_path))
schedule_file.setName(col_name)
schedule_file.setColumnNumber(col_index + 1)
schedule_file.setRowstoSkipatTop(rows_to_skip)
schedule_file.setNumberofHoursofData(num_hrs_in_year.to_i)
schedule_file.setMinutesperItem(min_per_item.to_i)
schedule_file.setTranslateFileWithRelativePath(true)

Schedule.set_schedule_type_limits(model, schedule_file, schedule_type_limits_name)

Expand Down