Skip to content

Commit

Permalink
Merge pull request #1719 from NREL/AppendixG_Dev
Browse files Browse the repository at this point in the history
Latest Appendix G changes
  • Loading branch information
mdahlhausen authored Apr 5, 2024
2 parents 67f99df + 29ca836 commit ca73ab2
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def convert_userdata_csv_to_json(user_data_path, project_path)
# Read all valid files in user_data_folder and load into json array
unless user_data_path == ''
user_data_validation_outcome = true
Dir.glob("#{user_data_path}/*.csv").each do |csv_full_name|
Dir.glob("#{user_data_path.gsub('\\', '/')}/*.csv").each do |csv_full_name|
csv_file_name = File.basename(csv_full_name, File.extname(csv_full_name))
if json_objs.key?(csv_file_name)
# Load csv file into array of hashes
Expand Down
1 change: 1 addition & 0 deletions test/90_1_prm/prm_test_decorators.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
class AppendixGPRMTests < Minitest::Test

# Add exhaust fan object to each lab zone in model
# @param model
def add_exhaust_fan_per_lab_zone(model)
Expand Down

0 comments on commit ca73ab2

Please sign in to comment.