Generate schedules only for things that exist

HPXMLtoOpenStudio/tests/test_validation.rb

@@ -8,7 +8,6 @@
 require 'csv'
 require_relative '../resources/xmlhelper.rb'
 require_relative '../resources/xmlvalidator.rb'
-
 class HPXMLtoOpenStudioValidationTest < Minitest::Test
   def setup
     @root_path = File.absolute_path(File.join(File.dirname(__FILE__), '..', '..'))
@@ -1223,13 +1222,13 @@ def test_ruby_error_messages
       when 'battery-bad-values-max-greater-than-one'
         hpxml, hpxml_bldg = _create_hpxml('base-battery-scheduled.xml')
         csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
-        csv_data[1][0] = 1.1
+        csv_data[1][csv_data[0].index('battery')] = 1.1
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
         hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       when 'battery-bad-values-min-less-than-neg-one'
         hpxml, hpxml_bldg = _create_hpxml('base-battery-scheduled.xml')
         csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
-        csv_data[1][0] = -1.1
+        csv_data[1][csv_data[0].index('battery')] = -1.1
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
         hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       when 'cfis-with-hydronic-distribution'
@@ -1565,19 +1564,19 @@ def test_ruby_error_messages
       when 'schedule-detailed-bad-values-max-not-one'
         hpxml, hpxml_bldg = _create_hpxml('base-schedules-detailed-occupancy-stochastic.xml')
         csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
-        csv_data[1][1] = 1.1
+        csv_data[1][csv_data[0].index('lighting_interior')] = 1.1
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
         hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       when 'schedule-detailed-bad-values-negative'
         hpxml, hpxml_bldg = _create_hpxml('base-schedules-detailed-occupancy-stochastic.xml')
         csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
-        csv_data[1][1] = -0.5
+        csv_data[1][csv_data[0].index('lighting_interior')] = -0.5
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
         hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       when 'schedule-detailed-bad-values-non-numeric'
         hpxml, hpxml_bldg = _create_hpxml('base-schedules-detailed-occupancy-stochastic.xml')
         csv_data = CSV.read(File.join(File.dirname(hpxml.hpxml_path), hpxml_bldg.header.schedules_filepaths[0]))
-        csv_data[1][1] = 'NA'
+        csv_data[1][csv_data[0].index('lighting_interior')] = 'NA'
         File.write(@tmp_csv_path, csv_data.map(&:to_csv).join)
         hpxml_bldg.header.schedules_filepaths = [@tmp_csv_path]
       when 'schedule-detailed-bad-values-mode-negative'

tasks.rb

@@ -77,7 +77,7 @@ def create_hpxmls
       build_residential_hpxml['existing_hpxml_path'] = hpxml_path if i > 1
       if hpxml_path.include?('base-bldgtype-mf-whole-building.xml')
         suffix = "_#{i}" if i > 1
-        build_residential_hpxml['schedules_filepaths'] = "../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic#{suffix}.csv"
+        build_residential_hpxml['schedules_filepaths'] = "../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_mf#{suffix}.csv"
         build_residential_hpxml['geometry_foundation_type'] = (i <= 2 ? 'UnconditionedBasement' : 'AboveApartment')
         build_residential_hpxml['geometry_attic_type'] = (i >= 5 ? 'VentedAttic' : 'BelowApartment')
         build_residential_hpxml['geometry_unit_height_above_grade'] = { 1 => 0.0, 2 => 0.0, 3 => 10.0, 4 => 10.0, 5 => 20.0, 6 => 20.0 }[i]

workflow/hpxml_inputs.json

@@ -1058,6 +1058,10 @@
   "sample_files/base-vehicle-multiple.xml": {
     "parent_hpxml": "sample_files/base-vehicle-ev-charger.xml"
   },
+  "sample_files/base-vehicle-stochastic.xml": {
+    "parent_hpxml": "sample_files/base-vehicle-ev-charger.xml",
+    "schedules_filepaths": "../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic-ev-charger.csv"
+  },
   "sample_files/base-pv-battery-and-vehicle-ev.xml": {
     "parent_hpxml": "sample_files/base-pv-battery.xml",
     "vehicle_type": "BatteryElectricVehicle",

workflow/sample_files/base-bldgtype-mf-whole-building.xml

@@ -55,7 +55,7 @@
           <ConditionedBuildingVolume>9600.0</ConditionedBuildingVolume>
         </BuildingConstruction>
         <extension>
-          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic.csv</SchedulesFilePath>
+          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_mf.csv</SchedulesFilePath>
         </extension>
       </BuildingSummary>
       <ClimateandRiskZones>
@@ -559,7 +559,7 @@
           <ConditionedBuildingVolume>9600.0</ConditionedBuildingVolume>
         </BuildingConstruction>
         <extension>
-          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_2.csv</SchedulesFilePath>
+          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_mf_2.csv</SchedulesFilePath>
         </extension>
       </BuildingSummary>
       <ClimateandRiskZones>
@@ -1063,7 +1063,7 @@
           <ConditionedBuildingVolume>9600.0</ConditionedBuildingVolume>
         </BuildingConstruction>
         <extension>
-          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_3.csv</SchedulesFilePath>
+          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_mf_3.csv</SchedulesFilePath>
         </extension>
       </BuildingSummary>
       <ClimateandRiskZones>
@@ -1455,7 +1455,7 @@
           <ConditionedBuildingVolume>9600.0</ConditionedBuildingVolume>
         </BuildingConstruction>
         <extension>
-          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_4.csv</SchedulesFilePath>
+          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_mf_4.csv</SchedulesFilePath>
         </extension>
       </BuildingSummary>
       <ClimateandRiskZones>
@@ -1847,7 +1847,7 @@
           <ConditionedBuildingVolume>9600.0</ConditionedBuildingVolume>
         </BuildingConstruction>
         <extension>
-          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_5.csv</SchedulesFilePath>
+          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_mf_5.csv</SchedulesFilePath>
         </extension>
       </BuildingSummary>
       <ClimateandRiskZones>
@@ -2296,7 +2296,7 @@
           <ConditionedBuildingVolume>9600.0</ConditionedBuildingVolume>
         </BuildingConstruction>
         <extension>
-          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_6.csv</SchedulesFilePath>
+          <SchedulesFilePath>../../HPXMLtoOpenStudio/resources/schedule_files/occupancy-stochastic_mf_6.csv</SchedulesFilePath>
         </extension>
       </BuildingSummary>
       <ClimateandRiskZones>

workflow/tests/base_results/results_simulations_hvac.csv

@@ -453,6 +453,7 @@ base-vehicle-ev-charger-undercharged.xml,6.8,91.76,36000.0,24000.0,0.0,30857.0,9
 base-vehicle-ev-charger.xml,6.8,91.76,36000.0,24000.0,0.0,30857.0,9065.0,5506.0,0.0,575.0,7182.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,16145.0,3427.0,5579.0,0.0,207.0,697.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-vehicle-ev-no-charger.xml,6.8,91.76,36000.0,24000.0,0.0,30857.0,9065.0,5506.0,0.0,575.0,7182.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,16145.0,3427.0,5579.0,0.0,207.0,697.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-vehicle-multiple.xml,6.8,91.76,36000.0,24000.0,0.0,30857.0,9065.0,5506.0,0.0,575.0,7182.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,16145.0,3427.0,5579.0,0.0,207.0,697.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
+base-vehicle-stochastic.xml,6.8,91.76,36000.0,24000.0,0.0,30857.0,9065.0,5506.0,0.0,575.0,7182.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,16145.0,3427.0,5579.0,0.0,207.0,697.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0
 base-zones-spaces-multiple.xml,6.8,91.76,36000.0,24000.0,0.0,30802.0,9010.0,5506.0,0.0,575.0,7182.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,16746.0,3428.0,5579.0,0.0,207.0,697.0,0.0,0.0,0.0,2293.0,622.0,0.0,3920.0,0.0,0.0,439.0,0.0,-661.0,0.0,1100.0
 base-zones-spaces.xml,6.8,91.76,36000.0,24000.0,0.0,30857.0,9065.0,5506.0,0.0,575.0,7182.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,16757.0,3438.0,5579.0,0.0,207.0,697.0,0.0,0.0,0.0,2293.0,622.0,0.0,3920.0,0.0,0.0,439.0,0.0,-661.0,0.0,1100.0
 base.xml,6.8,91.76,36000.0,24000.0,0.0,32239.0,8709.0,7508.0,0.0,575.0,6918.0,0.0,0.0,1738.0,2171.0,4620.0,0.0,0.0,20039.0,6112.0,7037.0,0.0,207.0,448.0,0.0,0.0,0.0,2293.0,622.0,0.0,3320.0,0.0,0.0,139.0,0.0,-661.0,0.0,800.0

workflow/tests/base_results/results_simulations_misc.csv

@@ -63,7 +63,7 @@ base-bldgtype-mf-unit-shared-water-heater-recirc-scheduled.xml,0.0,0.0,0.0,1354.
 base-bldgtype-mf-unit-shared-water-heater-recirc.xml,0.0,0.0,0.0,1354.7,998.0,11171.7,3093.4,943.5,1655.2,1655.2,4.038,7.78,0.0
 base-bldgtype-mf-unit-shared-water-heater.xml,0.0,0.0,0.0,1354.7,998.0,11171.7,3093.4,906.8,1618.5,1618.5,4.038,7.78,0.0
 base-bldgtype-mf-unit.xml,0.0,0.0,0.0,1354.7,998.0,11171.6,3093.4,1600.1,2147.8,2147.8,3.848,7.747,0.0
-base-bldgtype-mf-whole-building.xml,0.0,0.0,0.0,8128.5,5988.0,67057.0,16864.7,22480.2,16302.3,22480.2,54.121,56.256,0.0
+base-bldgtype-mf-whole-building.xml,0.0,0.0,0.0,8128.5,5988.0,67066.1,16866.9,22275.5,18426.7,22275.5,54.296,56.41,0.0
 base-bldgtype-sfa-unit-2stories.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2624.7,2050.9,3164.5,3164.5,18.235,15.439,0.0
 base-bldgtype-sfa-unit-atticroof-cathedral.xml,0.0,0.0,0.0,1354.7,998.0,11171.6,2624.7,2138.1,4554.2,4554.2,36.735,28.677,0.0
 base-bldgtype-sfa-unit-infil-compartmentalization-test.xml,0.0,0.0,0.0,1354.7,998.0,11171.6,2829.7,1763.3,2575.9,2575.9,13.778,10.572,0.0
@@ -117,7 +117,7 @@ base-dhw-tank-heat-pump-uef.xml,0.0,0.0,0.0,1354.7,998.0,10680.2,2450.8,1823.3,3
 base-dhw-tank-heat-pump-with-solar-fraction.xml,0.0,0.0,0.0,474.2,349.3,3796.5,871.2,1846.4,3171.1,3171.1,25.864,18.703,0.0
 base-dhw-tank-heat-pump-with-solar.xml,0.0,0.0,0.0,1354.4,997.6,11662.9,2676.3,1860.6,3223.3,3223.3,24.008,19.19,0.0
 base-dhw-tank-heat-pump.xml,0.0,0.0,0.0,1354.7,998.0,10750.0,2466.8,1856.8,3649.6,3649.6,24.427,18.865,0.0
-base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,0.0,0.0,0.0,1354.7,998.0,10791.3,2476.3,4762.4,5444.7,5444.7,31.718,18.721,0.0
+base-dhw-tank-model-type-stratified-detailed-occupancy-stochastic.xml,0.0,0.0,0.0,1354.7,998.0,10801.4,2478.6,5979.9,6565.1,6731.4,35.109,17.714,0.0
 base-dhw-tank-model-type-stratified.xml,0.0,0.0,0.0,1354.7,998.0,10775.1,2472.6,1951.7,3512.9,3512.9,23.798,18.659,0.0
 base-dhw-tank-oil.xml,0.0,0.0,0.0,1354.7,998.0,11171.8,2563.6,1428.2,3224.1,3224.1,24.126,19.223,0.0
 base-dhw-tank-wood.xml,0.0,0.0,0.0,1354.7,998.0,11171.8,2563.6,1428.2,3224.1,3224.1,24.126,19.223,0.0
@@ -418,15 +418,15 @@ base-residents-1-misc-loads-large-uncommon.xml,0.0,0.0,0.0,821.3,625.4,3446.7,11
 base-residents-1-misc-loads-large-uncommon2.xml,0.0,0.0,0.0,821.3,625.4,3446.7,1167.8,4544.3,6153.4,6153.4,23.649,19.133,0.0
 base-residents-1.xml,0.0,0.0,0.0,821.3,625.4,3446.7,1167.8,1622.1,3242.6,3242.6,24.265,17.862,0.0
 base-residents-5-5.xml,0.0,0.0,0.0,2432.4,2087.7,23985.6,5811.5,8218.1,9033.2,9033.2,28.86,18.241,1.506
-base-schedules-detailed-all-10-mins.xml,0.333,0.833,0.0,1354.7,998.0,11252.4,2582.1,9419.9,11054.4,11054.4,37.577,21.976,0.0
-base-schedules-detailed-mixed-timesteps-power-outage.xml,1.667,0.0,0.0,1141.2,883.5,9207.2,2112.8,9366.1,10786.8,10786.8,47.12,21.538,0.0
-base-schedules-detailed-mixed-timesteps.xml,0.0,0.0,0.0,1354.7,998.0,11253.6,2582.4,9360.3,10789.9,10789.9,34.057,21.541,0.0
-base-schedules-detailed-occupancy-stochastic-10-mins.xml,0.0,0.0,0.0,1354.7,998.0,11169.8,2563.1,4797.0,5594.5,5594.5,31.634,18.819,0.0
-base-schedules-detailed-occupancy-stochastic-no-space-cooling.xml,0.0,7.0,0.0,1354.7,998.0,11168.6,2562.9,4789.6,6233.3,6233.3,31.629,22.999,0.0
-base-schedules-detailed-occupancy-stochastic-no-space-heating.xml,1.0,0.0,0.0,1354.7,998.0,11168.6,2562.9,4696.5,5577.7,5577.7,33.934,18.805,0.0
-base-schedules-detailed-occupancy-stochastic-power-outage.xml,19.0,0.0,0.0,1141.2,883.5,9132.4,2095.6,6334.9,5571.2,6334.9,42.337,18.751,0.0
-base-schedules-detailed-occupancy-stochastic-vacancy.xml,0.0,0.0,0.0,1141.2,883.5,9118.0,2092.3,4585.9,5577.6,5577.6,31.756,18.805,0.0
-base-schedules-detailed-occupancy-stochastic.xml,0.0,0.0,0.0,1354.7,998.0,11168.7,2562.9,4790.0,5577.8,5577.8,31.629,18.806,0.0
+base-schedules-detailed-all-10-mins.xml,2.667,0.0,0.0,1354.7,998.0,11075.7,2541.5,9836.5,9583.9,10406.1,37.709,22.069,0.0
+base-schedules-detailed-mixed-timesteps-power-outage.xml,2.333,0.0,0.0,1148.2,871.8,9036.3,2073.6,9757.5,9390.4,10406.2,47.12,20.405,0.0
+base-schedules-detailed-mixed-timesteps.xml,0.167,0.0,0.0,1354.7,998.0,11077.1,2541.9,9752.0,9393.9,10406.2,37.429,20.442,0.0
+base-schedules-detailed-occupancy-stochastic-10-mins.xml,0.0,0.0,0.0,1354.7,998.0,11173.0,2563.9,5846.3,6395.5,6772.3,35.035,17.798,0.0
+base-schedules-detailed-occupancy-stochastic-no-space-cooling.xml,0.0,7.0,0.0,1354.7,998.0,11175.2,2564.4,6030.4,6209.8,6796.7,35.021,22.899,0.0
+base-schedules-detailed-occupancy-stochastic-no-space-heating.xml,1.0,0.0,0.0,1354.7,998.0,11175.2,2564.4,5960.5,6423.5,6758.8,35.037,17.793,0.0
+base-schedules-detailed-occupancy-stochastic-power-outage.xml,21.0,0.0,0.0,1148.2,871.9,9093.6,2086.7,6334.9,6419.7,6756.8,42.337,17.769,0.0
+base-schedules-detailed-occupancy-stochastic-vacancy.xml,0.0,0.0,0.0,1148.2,871.9,9089.4,2085.7,5523.8,6423.4,6758.8,35.135,17.793,0.0
+base-schedules-detailed-occupancy-stochastic.xml,0.0,0.0,0.0,1354.7,998.0,11175.2,2564.4,6030.6,6423.5,6758.8,35.021,17.794,0.0
 base-schedules-detailed-setpoints-daily-schedules.xml,103.0,39.0,0.0,1354.7,998.0,11171.6,2563.5,2123.8,4015.5,4015.5,35.224,21.227,0.0
 base-schedules-detailed-setpoints-daily-setbacks.xml,0.0,12.0,0.0,1354.7,998.0,11171.5,2563.5,2090.6,3727.6,3727.6,32.297,21.204,0.0
 base-schedules-detailed-setpoints.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563.5,2025.5,3184.0,3184.0,18.068,15.967,0.0
@@ -440,8 +440,8 @@ base-simcontrol-daylight-saving-custom.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563
 base-simcontrol-daylight-saving-disabled.xml,0.0,0.0,0.0,1354.7,998.0,11171.6,2563.5,2088.3,3365.2,3365.2,23.71,18.348,0.0
 base-simcontrol-runperiod-1-month.xml,0.0,0.0,0.0,111.35,82.03,980.71,225.04,2052.26,0.0,2052.26,24.0369,0.0,0.0
 base-simcontrol-temperature-capacitance-multiplier.xml,0.0,0.0,0.0,1354.7,998.0,11171.6,2563.5,2082.5,3612.6,3612.6,23.71,18.744,0.0
-base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml,0.333,0.833,0.0,1354.7,998.0,11181.9,2565.9,8709.9,8944.0,9437.5,37.579,21.975,0.0
-base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml,0.0,0.0,0.0,1354.7,998.0,11168.7,2562.9,6299.1,7004.0,7004.0,37.037,21.361,0.0
+base-simcontrol-timestep-10-mins-occupancy-stochastic-10-mins.xml,2.667,0.0,0.0,1354.7,998.0,11187.8,2567.3,10239.8,9529.3,10409.4,37.71,22.068,0.0
+base-simcontrol-timestep-10-mins-occupancy-stochastic-60-mins.xml,0.0,0.0,0.0,1354.7,998.0,11175.3,2564.4,7413.4,8263.1,8430.7,37.244,21.566,0.0
 base-simcontrol-timestep-10-mins.xml,0.0,0.0,0.0,1354.7,998.0,11171.7,2563.6,3496.9,5184.5,5184.5,23.962,18.93,0.0
 base-simcontrol-timestep-30-mins.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563.5,2096.2,3896.5,3896.5,23.874,18.855,0.0
 base-vehicle-ev-charger-level1.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563.5,3656.3,4719.0,4719.0,19.755,12.484,0.0
@@ -453,6 +453,7 @@ base-vehicle-ev-charger-undercharged.xml,0.0,0.0,1046.0,1354.7,998.0,11171.5,256
 base-vehicle-ev-charger.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563.5,8837.6,8442.0,8837.6,19.755,12.484,0.0
 base-vehicle-ev-no-charger.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563.5,2056.4,3118.9,3118.9,19.755,12.484,0.0
 base-vehicle-multiple.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563.5,8837.6,8442.0,8837.6,19.755,12.484,0.0
+base-vehicle-stochastic.xml,0.0,0.0,0.0,1354.7,998.0,11175.2,2564.4,12717.9,10734.1,12717.9,19.492,12.295,0.0
 base-zones-spaces-multiple.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563.5,2056.6,3116.3,3116.3,19.737,12.431,0.0
 base-zones-spaces.xml,0.0,0.0,0.0,1354.7,998.0,11171.5,2563.5,2056.4,3118.9,3118.9,19.755,12.484,0.0
 base.xml,0.0,0.0,0.0,1354.7,998.0,11171.6,2563.5,2082.5,3612.6,3612.6,23.71,18.744,0.0