Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
nllong committed Feb 27, 2024
1 parent 16c73d2 commit aa5b82c
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions lib/openstudio/analysis/formulation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -324,19 +324,18 @@ def to_hash(version = 1)
h[:analysis][:download_reports] = @download_reports
h[:analysis][:download_osw] = @download_osw
h[:analysis][:download_osm] = @download_osm
# If there are Gemfiles, then set the hash to use the :gemfile, and also store the files in the root
# of the zipfile

# If there are Gemfiles, then set the hash to use the :gemfile. The zip file method will
# add them to the root of the zip file.
if @gem_files.size.positive?
h[:analysis][:gemfile] = true
# h[:analysis][:gemfiles] = @gem_files.map { |g| "./#{File.basename(g[:file])}" }
else
h[:analysis][:gemfile] = false
end

#-BLB I dont think this does anything. server_scripts are run if they are in
#the /scripts/analysis or /scripts/data_point directories
#but nothing is ever checked in the OSA.
#
h[:analysis][:server_scripts] = {}

# This is a hack right now, but after the initial hash is created go back and add in the objective functions
Expand Down Expand Up @@ -725,7 +724,6 @@ def add_directory_to_zip_osa(zipfile, local_directory, relative_zip_directory)

puts 'Adding Gemfiles'
@gem_files.each do |f|

puts " Adding #{f[:file]}"
zf.add(File.basename(f[:file]), f[:file])
end
Expand Down

0 comments on commit aa5b82c

Please sign in to comment.