Merge branch 'master' of https://github.com/NREL/OpenStudio-BuildStock

Rakefile

@@ -31,6 +31,9 @@ task :copy_beopt_files do
 
   http.request request do |response|
     total = response.header["Content-Length"].to_i
+    if total == 0
+      fail "Did not successfully download zip file."
+    end
     size = 0
     progress = 0
     open "#{branch}.zip", 'wb' do |io|
@@ -132,6 +135,7 @@ task :copy_beopt_files do
   end
 
   FileUtils.rm_rf(File.join(File.dirname(__FILE__), branch))
+  FileUtils.rm(File.join(File.dirname(__FILE__), "#{branch}.zip"))
 
 end
 

measures/TimeseriesCSVExport/measure.rb

@@ -204,6 +204,7 @@ def to_JSTime(os_time, year_description)
       js_time = js_time.gsub('Dec','12')
 
       # manually shift timestamps for leap years
+      offset = 0
       if year_description.isLeapYear
         date, time = js_time.split(" ")
         year, month, day = date.split("/")
@@ -224,7 +225,7 @@ def to_JSTime(os_time, year_description)
             elsif month == 3
               day = 31
             elsif month == 4
-              day = 28
+              day = 30
             elsif month == 5
               day = 31
             elsif month == 6
@@ -243,7 +244,6 @@ def to_JSTime(os_time, year_description)
           end
         end
         js_time = "#{year.to_i}/#{month.to_i.to_s.rjust(2, "0")}/#{day.to_i.to_s.rjust(2, "0")} #{time}"
-        offset = 0
         if month == 1 and year == 2010
           offset = 1
         end

measures/TimeseriesCSVExport/measure.xml

@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>timeseries_csv_export</name>
   <uid>2a3442c1-944d-4e91-9e11-11e0cf368c64</uid>
-  <version_id>355a2c4a-d48d-41f6-a460-cea2ca376548</version_id>
-  <version_modified>20170928T011836Z</version_modified>
+  <version_id>9762ea72-6ce4-4b9f-91e3-0b199fcb8115</version_id>
+  <version_modified>20171004T222547Z</version_modified>
   <xml_checksum>15BF4E57</xml_checksum>
   <class_name>TimeseriesCSVExport</class_name>
   <display_name>Timeseries CSV Export</display_name>
@@ -76,6 +76,36 @@
     </attribute>
   </attributes>
   <files>
+    <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>
+    <file>
+      <filename>DuPage_17043_725300_880860.epw</filename>
+      <filetype>epw</filetype>
+      <usage_type>test</usage_type>
+      <checksum>335AE046</checksum>
+    </file>
+    <file>
+      <filename>timeseries_csv_export_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>5BB39755</checksum>
+    </file>
     <file>
       <version>
         <software_program>OpenStudio</software_program>

measures/UtilityBillCalculations/measure.xml

@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>utility_bill_calculations</name>
   <uid>872cd20c-55df-459e-9ac9-f42c93ab665c</uid>
-  <version_id>9d6fd0d6-bc49-4f3a-a1d0-b0806c557276</version_id>
-  <version_modified>20170928T001553Z</version_modified>
+  <version_id>5f67dd1a-7fab-4b81-babe-0d987c40f6c3</version_id>
+  <version_modified>20171005T141219Z</version_modified>
   <xml_checksum>6159342E</xml_checksum>
   <class_name>UtilityBillCalculations</class_name>
   <display_name>Utility Bill Calculations</display_name>
@@ -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>
@@ -119,22 +137,22 @@
       <checksum>3ADEAEFE</checksum>
     </file>
     <file>
-      <filename>Natural gas.csv</filename>
-      <filetype>csv</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>43EDF817</checksum>
+      <filename>SFD_2000sqft_2story_SL_UA_Denver.osm</filename>
+      <filetype>osm</filetype>
+      <usage_type>test</usage_type>
+      <checksum>15DB60CF</checksum>
     </file>
     <file>
-      <filename>Oil.csv</filename>
+      <filename>enduse_timeseries.csv</filename>
       <filetype>csv</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>FBAE07C0</checksum>
+      <usage_type>test</usage_type>
+      <checksum>86775404</checksum>
     </file>
     <file>
-      <filename>Propane.csv</filename>
-      <filetype>csv</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>D205D809</checksum>
+      <filename>utility_bill_calculations_test.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>test</usage_type>
+      <checksum>DFC32020</checksum>
     </file>
     <file>
       <version>
@@ -148,10 +166,22 @@
       <checksum>07180FC4</checksum>
     </file>
     <file>
-      <filename>sam-sdk-2017-1-17-r1.zip</filename>
-      <filetype>zip</filetype>
+      <filename>Natural gas.csv</filename>
+      <filetype>csv</filetype>
       <usage_type>resource</usage_type>
-      <checksum>9E486EA4</checksum>
+      <checksum>43EDF817</checksum>
+    </file>
+    <file>
+      <filename>Oil.csv</filename>
+      <filetype>csv</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>FBAE07C0</checksum>
+    </file>
+    <file>
+      <filename>Propane.csv</filename>
+      <filetype>csv</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>D205D809</checksum>
     </file>
   </files>
 </measure>

resources/measures/ResidentialAirflow/measure.xml

@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>residential_airflow</name>
   <uid>7d2adf5c-9995-49be-b662-a23d2452bb36</uid>
-  <version_id>9d6cb0e0-d49c-47d0-a9bc-bf18e6b37614</version_id>
-  <version_modified>20170914T174000Z</version_modified>
+  <version_id>fd70a0f7-d70b-4998-bbb8-09ffc3fbdc56</version_id>
+  <version_modified>20171005T141441Z</version_modified>
   <xml_checksum>19EEDBBB</xml_checksum>
   <class_name>ResidentialAirflow</class_name>
   <display_name>Set Residential Airflow</display_name>
@@ -671,12 +671,6 @@
       <usage_type>resource</usage_type>
       <checksum>6BA22437</checksum>
     </file>
-    <file>
-      <filename>geometry.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>20190C86</checksum>
-    </file>
     <file>
       <filename>util.rb</filename>
       <filetype>rb</filetype>
@@ -808,5 +802,17 @@
       <usage_type>script</usage_type>
       <checksum>F9977BB0</checksum>
     </file>
+    <file>
+      <filename>geometry.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>6A82C5DA</checksum>
+    </file>
+    <file>
+      <filename>schedules.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>7576B4B2</checksum>
+    </file>
   </files>
 </measure>

resources/measures/ResidentialAirflow/resources/schedules.rb

@@ -451,7 +451,6 @@ def getOntimeFraction
 
         def loadMinuteDrawProfileFromFile(timestep_minutes, unit_index, days_shift, measure_dir)
             data = []
-
             if @file_prefix.nil?
                 return data
             end
@@ -464,13 +463,12 @@ def loadMinuteDrawProfileFromFile(timestep_minutes, unit_index, days_shift, meas
             end
 
             #For MF homes, shift each unit by an additional week
-            days_shift = days_shift + 7 * (unit_index - 1)
-
-            minutes_in_year = 8760*60
+            days_shift = (days_shift + 7 * (unit_index + 1)) % 365
+            minutes_in_year = 8760 * 60
 
             # Read data into minute array
             skippedheader = false
-            min_shift = 24*60*days_shift
+            min_shift = 24 * 60 * days_shift
             items = [0]*minutes_in_year
             File.open(minute_draw_profile).each do |line|
                 linedata = line.strip.split(',')

resources/measures/ResidentialApplianceClothesDryerElectric/measure.xml

@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>residential_clothes_dryer</name>
   <uid>0b112141-4e2e-4dad-b2fd-2d1f629391f0</uid>
-  <version_id>a1d00865-867f-4cef-96f1-5d299d91aec6</version_id>
-  <version_modified>20170922T152407Z</version_modified>
+  <version_id>d1673462-fecf-4cf7-bf88-19d3306d6bef</version_id>
+  <version_modified>20171005T141441Z</version_modified>
   <xml_checksum>126F1C43</xml_checksum>
   <class_name>ResidentialClothesDryer</class_name>
   <display_name>Set Residential Electric Clothes Dryer</display_name>
@@ -165,7 +165,7 @@
       <filename>schedules.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>7BFE5DD7</checksum>
+      <checksum>7576B4B2</checksum>
     </file>
   </files>
 </measure>

resources/measures/ResidentialApplianceClothesDryerElectric/resources/schedules.rb

@@ -451,7 +451,6 @@ def getOntimeFraction
 
         def loadMinuteDrawProfileFromFile(timestep_minutes, unit_index, days_shift, measure_dir)
             data = []
-
             if @file_prefix.nil?
                 return data
             end
@@ -464,13 +463,12 @@ def loadMinuteDrawProfileFromFile(timestep_minutes, unit_index, days_shift, meas
             end
 
             #For MF homes, shift each unit by an additional week
-            days_shift = days_shift + 7 * (unit_index - 1)
-
-            minutes_in_year = 8760*60
+            days_shift = (days_shift + 7 * (unit_index + 1)) % 365
+            minutes_in_year = 8760 * 60
 
             # Read data into minute array
             skippedheader = false
-            min_shift = 24*60*days_shift
+            min_shift = 24 * 60 * days_shift
             items = [0]*minutes_in_year
             File.open(minute_draw_profile).each do |line|
                 linedata = line.strip.split(',')

resources/measures/ResidentialApplianceClothesDryerFuel/measure.xml

@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>residential_clothes_dryer_fuel</name>
   <uid>0ed6fb35-c3e0-4a33-a397-ce4cec92d96e</uid>
-  <version_id>a179bc0d-233b-4e26-9625-dff73ca9c31d</version_id>
-  <version_modified>20170922T152408Z</version_modified>
+  <version_id>0d57e8ad-e7db-45c1-8d80-81f31af82557</version_id>
+  <version_modified>20171005T141441Z</version_modified>
   <xml_checksum>25A40D75</xml_checksum>
   <class_name>ResidentialClothesDryerFuel</class_name>
   <display_name>Set Residential Fuel Clothes Dryer</display_name>
@@ -200,7 +200,7 @@
       <filename>schedules.rb</filename>
       <filetype>rb</filetype>
       <usage_type>resource</usage_type>
-      <checksum>7BFE5DD7</checksum>
+      <checksum>7576B4B2</checksum>
     </file>
   </files>
 </measure>

resources/measures/ResidentialApplianceClothesDryerFuel/resources/schedules.rb

@@ -451,7 +451,6 @@ def getOntimeFraction
 
         def loadMinuteDrawProfileFromFile(timestep_minutes, unit_index, days_shift, measure_dir)
             data = []
-
             if @file_prefix.nil?
                 return data
             end
@@ -464,13 +463,12 @@ def loadMinuteDrawProfileFromFile(timestep_minutes, unit_index, days_shift, meas
             end
 
             #For MF homes, shift each unit by an additional week
-            days_shift = days_shift + 7 * (unit_index - 1)
-
-            minutes_in_year = 8760*60
+            days_shift = (days_shift + 7 * (unit_index + 1)) % 365
+            minutes_in_year = 8760 * 60
 
             # Read data into minute array
             skippedheader = false
-            min_shift = 24*60*days_shift
+            min_shift = 24 * 60 * days_shift
             items = [0]*minutes_in_year
             File.open(minute_draw_profile).each do |line|
                 linedata = line.strip.split(',')