Merge branch 'master' into feature/update_foundation_type

measures/BuildExistingModel/measure.xml

@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>build_existing_model</name>
   <uid>dedf59bb-3b88-4f16-8755-2c1ff5519cbf</uid>
-  <version_id>b0abf044-37ee-4ac0-95a6-061bd32ce300</version_id>
-  <version_modified>20200430T194531Z</version_modified>
+  <version_id>d844b57f-2ddf-4849-8044-b69e2cf2411b</version_id>
+  <version_modified>20201105T190355Z</version_modified>
   <xml_checksum>2C38F48B</xml_checksum>
   <class_name>BuildExistingModel</class_name>
   <display_name>Build Existing Model</display_name>
@@ -81,7 +81,7 @@
       <filename>measure.rb</filename>
       <filetype>rb</filetype>
       <usage_type>script</usage_type>
-      <checksum>AED85374</checksum>
+      <checksum>30622105</checksum>
     </file>
   </files>
 </measure>

project_national/util/dependency_wheel/dep_wheel.html

@@ -24,7 +24,7 @@
   <div class="container">
     <h1>An Interactive Visualization of the Housing Characteristic Dependencies in ResStock</h1>
 
-    <p class="lead">ResStock is built upon the conditional probabilites of the housing characteristics.  Each housing characteristic has a set of dependencies and dependants. In this dependency wheel, each chord in the disc represents a dependency.  The thin part of the cord represents a dependency to the thicker part of the cord. Try hovering on packages to mask other dependencies. The Dependency Wheel is a graph produced from the <a href="https://github.com/fzaninotto/DependencyWheel">fzaninotto/DependencyWheel</a> repository. Built with <a href="https://github.com/mbostock/d3">d3.js.</a> The thin part of the cord represents a dependency to the thicker part of the cord. Try hovering on packages to mask other dependencies.</p>
+    <p class="lead">ResStock is built upon the conditional probabilites of the housing characteristics.  Each housing characteristic has a set of dependencies and dependents. In this dependency wheel, each chord in the disc represents a dependency.  The thin part of the chord represents a dependency to the thicker part of the chord. Try hovering on packages to mask other dependencies. The Dependency Wheel is a graph produced from the <a href="https://github.com/fzaninotto/DependencyWheel">fzaninotto/DependencyWheel</a> repository. Built with <a href="https://github.com/mbostock/d3">d3.js.</a> The thin part of the chord represents a dependency to the thicker part of the chord. Try hovering on packages to mask other dependencies.</p>
 
     <div id="chart_backward"></div>
 

resources/measures/HPXMLtoOpenStudio/measure.xml

@@ -2,8 +2,8 @@
   <schema_version>3.0</schema_version>
   <name>hpxml_translator</name>
   <uid>b1543b30-9465-45ff-ba04-1d1f85e763bc</uid>
-  <version_id>d5bc8985-4817-4f8c-b279-995bd2232104</version_id>
-  <version_modified>20201007T225125Z</version_modified>
+  <version_id>fd1ca572-9e83-4300-8ad1-fa0f29841038</version_id>
+  <version_modified>20201105T190358Z</version_modified>
   <xml_checksum>D8922A73</xml_checksum>
   <class_name>HPXMLTranslator</class_name>
   <display_name>HPXML Translator</display_name>
@@ -237,12 +237,6 @@
       <usage_type>resource</usage_type>
       <checksum>378ED94C</checksum>
     </file>
-    <file>
-      <filename>hvac_sizing.rb</filename>
-      <filetype>rb</filetype>
-      <usage_type>resource</usage_type>
-      <checksum>BBE602FD</checksum>
-    </file>
     <file>
       <filename>hvac.rb</filename>
       <filetype>rb</filetype>
@@ -297,5 +291,11 @@
       <usage_type>resource</usage_type>
       <checksum>D306D9F5</checksum>
     </file>
+    <file>
+      <filename>hvac_sizing.rb</filename>
+      <filetype>rb</filetype>
+      <usage_type>resource</usage_type>
+      <checksum>93E61734</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>ceaac37d-e169-4e62-9445-8f09d54cd42f</version_id>
-  <version_modified>20200514T161443Z</version_modified>
+  <version_id>a6d7e12f-5ff2-4415-954a-8bc75d4a9e4b</version_id>
+  <version_modified>20201105T190401Z</version_modified>
   <xml_checksum>19EEDBBB</xml_checksum>
   <class_name>ResidentialAirflow</class_name>
   <display_name>Set Residential Airflow</display_name>
@@ -599,7 +599,7 @@
       <filename>residential_airflow_test.rb</filename>
       <filetype>rb</filetype>
       <usage_type>test</usage_type>
-      <checksum>CE2F6823</checksum>
+      <checksum>1C10D144</checksum>
     </file>
   </files>
 </measure>

test/osw_files/MF_8units_1story_CS_3Beds_2Baths_Denver_Furnace_CentralAC.osw

@@ -0,0 +1,112 @@
+{
+  "measure_paths": [
+    "../../resources/measures"
+  ],
+  "steps": [
+    {
+      "arguments": {
+        "begin_day_of_month": "1",
+        "begin_month": "1",
+        "calendar_year": "2007",
+        "end_day_of_month": "31",
+        "end_month": "12",
+        "timesteps_per_hr": "6"
+      },
+      "measure_dir_name": "ResidentialSimulationControls"
+    },
+    {
+      "arguments": {
+        "dst_end_date": "October 26",
+        "dst_start_date": "April 7",
+        "weather_directory": "../HPXMLtoOpenStudio/weather",
+        "weather_file_name": "USA_CO_Denver.Intl.AP.725650_TMY3.epw"
+      },
+      "measure_dir_name": "ResidentialLocation"
+    },
+    {
+      "measure_dir_name": "ResidentialGeometryCreateMultifamily",
+      "arguments": {
+        "balcony_depth": "0",
+        "corridor_position": "Double-Loaded Interior",
+        "corridor_width": "10",
+        "eaves_depth": "0",
+        "foundation_height": "3",
+        "foundation_type": "crawlspace",
+        "inset_depth": "0",
+        "inset_position": "Right",
+        "inset_width": "0",
+        "minimal_collapsed": "false",
+        "neighbor_back_offset": "0",
+        "neighbor_front_offset": "0",
+        "neighbor_left_offset": "0",
+        "neighbor_right_offset": "0",
+        "num_bathrooms": "2",
+        "num_bedrooms": "3",
+        "num_floors": "1",
+        "num_units": "8",
+        "orientation": "0",
+        "unit_aspect_ratio": "2",
+        "unit_ffa": "900",
+        "wall_height": "8"
+      }
+    },
+    {
+      "arguments": {
+        "afue": "0.78",
+        "capacity": "autosize",
+        "dse": "NA",
+        "fan_power_installed": "0.5",
+        "fuel_type": "gas",
+        "has_hvac_flue": "true"
+      },
+      "measure_dir_name": "ResidentialHVACFurnace"
+    },
+    {
+      "arguments": {
+        "capacity": "autosize",
+        "crankcase_capacity": "0",
+        "crankcase_temp": "55",
+        "dse": "NA",
+        "eer": "11.1",
+        "eer_capacity_derate_1ton": "1",
+        "eer_capacity_derate_2ton": "1",
+        "eer_capacity_derate_3ton": "1",
+        "eer_capacity_derate_4ton": "1",
+        "eer_capacity_derate_5ton": "1",
+        "fan_power_installed": "0.5",
+        "fan_power_rated": "0.365",
+        "seer": "13",
+        "shr": "0.73"
+      },
+      "measure_dir_name": "ResidentialHVACCentralAirConditionerSingleSpeed"
+    },
+    {
+      "arguments": {
+        "season_end_month": "Dec",
+        "season_start_month": "Jan",
+        "use_auto_season": "false",
+        "weekday_offset_magnitude": "0",
+        "weekday_offset_schedule": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+        "weekday_setpoint": "71.0",
+        "weekend_offset_magnitude": "0",
+        "weekend_offset_schedule": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+        "weekend_setpoint": "71.0"
+      },
+      "measure_dir_name": "ResidentialHVACHeatingSetpoints"
+    },
+    {
+      "arguments": {
+        "season_end_month": "Dec",
+        "season_start_month": "Jan",
+        "use_auto_season": "false",
+        "weekday_offset_magnitude": "0",
+        "weekday_offset_schedule": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+        "weekday_setpoint": "76.0",
+        "weekend_offset_magnitude": "0",
+        "weekend_offset_schedule": "0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0",
+        "weekend_setpoint": "76.0"
+      },
+      "measure_dir_name": "ResidentialHVACCoolingSetpoints"
+    }
+  ]
+}