Skip to content

Commit

Permalink
Merge pull request #94 from NREL/rakefile_updates
Browse files Browse the repository at this point in the history 
Remove non-linux binaries from sam sdk in photovoltaics measure.
  • Loading branch information
@joseph-robertson
joseph-robertson committed Sep 23, 2017
2 parents fb96303 + 5c05c77 commit 7716b44
Show file tree
Hide file tree
Showing 4 changed files with 88 additions and 17 deletions.
29 changes: 20 additions & 9 deletions Rakefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ task :copy_beopt_files do
FileUtils.rm_rf("#{buildstock_resource_measures_subdir}/.", secure: true)
end
end
if beopt_measure == "ResidentialPhotovoltaics"
["resources"].each do |subdir|
beopt_measure_subdir = File.join(buildstock_resource_measures_dir, beopt_measure, subdir)
remove_items_from_zip_file(beopt_measure_subdir, "sam-sdk-2017-1-17-r1.zip", ["osx64", "win32", "win64"])
end
end
end

# Copy other measures to measure/ dir
Expand All @@ -82,20 +88,24 @@ task :copy_beopt_files do
if other_measure == "UtilityBillCalculations"
["resources"].each do |subdir|
buildstock_measure_subdir = File.join(buildstock_measures_dir, other_measure, subdir)
unzip_file = OpenStudio::UnzipFile.new(File.join(buildstock_measure_subdir, "sam-sdk-2017-1-17-r1.zip"))
unzip_file.extractAllFiles(OpenStudio::toPath(File.join(buildstock_measure_subdir, "sam-sdk-2017-1-17-r1")))
["osx64", "win32", "win64"].each do |platform|
FileUtils.rm_rf(File.join(buildstock_measure_subdir, "sam-sdk-2017-1-17-r1", platform))
end
sam_sdk_zip = OpenStudio::toPath(File.join(buildstock_measure_subdir, "sam-sdk-2017-1-17-r1.zip"))
zip_file = OpenStudio::ZipFile.new(sam_sdk_zip, false)
zip_file.addDirectory(File.join(buildstock_measure_subdir, "sam-sdk-2017-1-17-r1"), OpenStudio::toPath("/"))
FileUtils.rm_rf(File.join(buildstock_measure_subdir, "sam-sdk-2017-1-17-r1"))
remove_items_from_zip_file(buildstock_measure_subdir, "sam-sdk-2017-1-17-r1.zip", ["osx64", "win32", "win64"])
end
end
end
end

def remove_items_from_zip_file(dir, zip_file_name, items)
unzip_file = OpenStudio::UnzipFile.new(File.join(dir, zip_file_name))
unzip_file.extractAllFiles(OpenStudio::toPath(File.join(dir, zip_file_name.gsub(".zip", ""))))
items.each do |item|
FileUtils.rm_rf(File.join(dir, zip_file_name.gsub(".zip", ""), item))
end
sam_sdk_zip = OpenStudio::toPath(File.join(dir, zip_file_name))
zip_file = OpenStudio::ZipFile.new(sam_sdk_zip, false)
zip_file.addDirectory(File.join(dir, zip_file_name.gsub(".zip", "")), OpenStudio::toPath("/"))
FileUtils.rm_rf(File.join(dir, zip_file_name.gsub(".zip", "")))
end

namespace :test do

desc 'Run unit tests for all measures'
Expand Down Expand Up @@ -313,6 +323,7 @@ def get_all_project_dir_names()
Dir.entries(File.dirname(__FILE__)).each do |entry|
next if not Dir.exist?(entry)
next if not entry.start_with?("project_")
next if entry.end_with?("efs")
project_dir_names << entry
end
return project_dir_names
Expand Down
34 changes: 32 additions & 2 deletions measures/TimeseriesCSVExport/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>timeseries_csv_export</name>
<uid>2a3442c1-944d-4e91-9e11-11e0cf368c64</uid>
<version_id>b2ae0c6a-3017-4f64-974b-dc3c652ca03c</version_id>
<version_modified>20170923T005904Z</version_modified>
<version_id>7b0a0c3f-bbb9-4123-a75a-eea8d6ed6247</version_id>
<version_modified>20170923T120627Z</version_modified>
<xml_checksum>15BF4E57</xml_checksum>
<class_name>TimeseriesCSVExport</class_name>
<display_name>Timeseries CSV Export</display_name>
Expand Down Expand Up @@ -87,5 +87,35 @@
<usage_type>script</usage_type>
<checksum>DA21C8B9</checksum>
</file>
<file>
<filename>timeseries_csv_export_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>91DAD6DD</checksum>
</file>
<file>
<filename>DuPage_17043_725300_880860.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>AD5BB8D6</checksum>
</file>
<file>
<filename>SFD_Successful_EnergyPlus_Run_AMY.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>9D71F795</checksum>
</file>
<file>
<filename>SFD_Successful_EnergyPlus_Run_TMY.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>D9A8217C</checksum>
</file>
<file>
<filename>USA_CO_Denver_Intl_AP_725650_TMY3.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>E23378AA</checksum>
</file>
</files>
</measure>
42 changes: 36 additions & 6 deletions measures/UtilityBillCalculations/measure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<schema_version>3.0</schema_version>
<name>utility_bill_calculations</name>
<uid>872cd20c-55df-459e-9ac9-f42c93ab665c</uid>
<version_id>d54b3d8a-3048-4133-85cb-ecb354591cad</version_id>
<version_modified>20170923T005905Z</version_modified>
<version_id>89e6cf16-b9e9-4de1-b731-302923ef7583</version_id>
<version_modified>20170923T120627Z</version_modified>
<xml_checksum>6159342E</xml_checksum>
<class_name>UtilityBillCalculations</class_name>
<display_name>Utility Bill Calculations</display_name>
Expand Down Expand Up @@ -100,12 +100,30 @@
<usage_type>resource</usage_type>
<checksum>C9F510A2</checksum>
</file>
<file>
<filename>USA_CO_Denver_Intl_AP_725650_TMY3.epw</filename>
<filetype>epw</filetype>
<usage_type>test</usage_type>
<checksum>E23378AA</checksum>
</file>
<file>
<filename>sam-sdk-2017-1-17-r1.zip</filename>
<filetype>zip</filetype>
<usage_type>resource</usage_type>
<checksum>14339B8F</checksum>
</file>
<file>
<filename>utilities.csv</filename>
<filetype>csv</filetype>
<usage_type>resource</usage_type>
<checksum>49E7C310</checksum>
</file>
<file>
<filename>result.json</filename>
<filetype>json</filetype>
<usage_type>test</usage_type>
<checksum>EF682B2D</checksum>
</file>
<file>
<filename>by_nsrdb.csv</filename>
<filetype>csv</filetype>
Expand All @@ -118,6 +136,12 @@
<usage_type>resource</usage_type>
<checksum>3ADEAEFE</checksum>
</file>
<file>
<filename>SFD_2000sqft_2story_SL_UA_Denver.osm</filename>
<filetype>osm</filetype>
<usage_type>test</usage_type>
<checksum>15DB60CF</checksum>
</file>
<file>
<filename>Natural gas.csv</filename>
<filetype>csv</filetype>
Expand All @@ -137,10 +161,16 @@
<checksum>D205D809</checksum>
</file>
<file>
<filename>sam-sdk-2017-1-17-r1.zip</filename>
<filetype>zip</filetype>
<usage_type>resource</usage_type>
<checksum>9E486EA4</checksum>
<filename>enduse_timeseries.csv</filename>
<filetype>csv</filetype>
<usage_type>test</usage_type>
<checksum>86775404</checksum>
</file>
<file>
<filename>utility_bill_calculations_test.rb</filename>
<filetype>rb</filetype>
<usage_type>test</usage_type>
<checksum>DFC32020</checksum>
</file>
<file>
<version>
Expand Down
Binary file modified resources/measures/ResidentialPhotovoltaics/resources/sam-sdk-2017-1-17-r1.zip
View file
Binary file not shown.

0 comments on commit 7716b44

Please sign in to comment.