Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

OS v3.2.1 (E+ v9.5) #604

Merged
merged 40 commits into from
Jul 26, 2021
Merged

OS v3.2.1 (E+ v9.5) #604

merged 40 commits into from
Jul 26, 2021

Conversation

shorowit
Copy link
Contributor

@shorowit shorowit commented Jun 3, 2021

Pull Request Description

Updates to OpenStudio v3.2.1 (EnergyPlus v9.5). See below for results.

Checklist

Not all may apply:

  • Unit tests have been added or updated
  • All rake tasks have been run, and pass
  • Documentation has been modified appropriately
  • Any new options are added to project_testing
  • project_testing runs without any failures
  • No unexpected regression test changes
  • All tests are passing
  • The changelog has been updated appropriately
  • This branch is up-to-date with develop

For more information on how to perform these checklist items, see the documentation's Advanced Tutorial.

@shorowit shorowit self-assigned this Jun 3, 2021
@shorowit

This comment has been minimized.

shorowit and others added 7 commits June 16, 2021 11:30
# Conflicts:
#	resources/buildstock.rb
#	test/osm_files/MF_1story_UB_Furnace_AC1_FuelTankWH.osm
#	test/osm_files/MF_1story_UB_Furnace_AC1_FuelTankWH_MiddleUnit.osm
#	test/osm_files/MF_24units_2story_UB_3Beds_1pt5Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_2story_UB_ASHP2_HPWH.osm
#	test/osm_files/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osm
#	test/osm_files/MF_2story_UB_Furnace_AC1_FuelTankWH.osm
#	test/osm_files/MF_2story_UB_Furnace_AC1_FuelTankWH_TopLevel.osm
#	test/osm_files/MF_HVACSizing_Load_8units_1story_UB.osm
#	test/osm_files/MF_Successful_EnergyPlus_Run_TMY_Appl_PV.osm
#	test/osm_files/SFA_10units_2story_SL_3Beds_1pt5Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_2story_UB_ASHP2_HPWH.osm
#	test/osm_files/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_Boiler_Baseboards_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_Fan_Coil_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_PTAC_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Load_4units_1story_FB_UA.osm
#	test/osm_files/SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osm
#	test/osm_files/SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osm
#	test/osm_files/SFD_1story_UB_UA_ASHP2_HPWH.osm
#	test/osm_files/SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osm
#	test/osm_files/SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osm
#	test/osm_files/SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osm
#	test/osm_files/SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osm
#	test/osm_files/SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_AutosizeForMaxLoad_MinTemp.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Autosize_MinTemp.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP2_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP2_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHPV_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHPV_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_BB_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_BB_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_Dehumidifier_Auto_Miami.osm
#	test/osm_files/SFD_HVACSizing_Equip_Dehumidifier_Fixed_Miami.osm
#	test/osm_files/SFD_HVACSizing_Equip_EF_AC2_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_EF_AC2_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ElecBoiler_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ElecBoiler_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_AC1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_AC1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_ACV_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_ACV_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_RAC_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_RAC_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GSHP_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GSHP_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GasBoiler_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GasBoiler_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHPDucted_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_AutosizeForMaxLoad.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_BB_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_BB_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_AC1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_AC1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Fixed_wFan.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented_ASHP_DuctsInPB.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented_ASHP_DuctsInUA.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_InsRoof.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_ERV.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_HRV.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_NoMechVent.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_SupplyMechVent.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Vented.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Vented_ExtFinDark.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInCS.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInGRG.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInLiv.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_Skylights.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FlatRoof_Skylights.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_FB_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_FB_GRG_FA_ASHP_DuctsInFB.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_S_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_UB_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_UB_GRG_FA_ASHP_DuctsInUB.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_AMY_PV.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_AMY_PV_TwoDays.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Appl_PV.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_February.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Outages.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Outages_PV.osm
#	test/test_samples_osw/base_results/results.csv
@shorowit shorowit changed the title OS v3.2 (E+ v9.5) OS v3.2.1 (E+ v9.5) Jul 13, 2021
# Conflicts:
#	measures/ApplyUpgrade/measure.xml
#	measures/PowerOutage/measure.xml
#	measures/QOIReport/measure.xml
#	measures/ResidentialSimulationControls/measure.xml
#	measures/ResilienceMetricsReport/measure.xml
#	measures/SimulationOutputReport/measure.xml
#	measures/TimeseriesCSVExport/measure.xml
#	resources/measures/ResidentialGeometryCreateFromFloorspaceJS/measure.xml
#	test/osm_files/Denver.osm
#	test/osm_files/MF_1story_UB_Furnace_AC1_FuelTankWH.osm
#	test/osm_files/MF_1story_UB_Furnace_AC1_FuelTankWH_MiddleUnit.osm
#	test/osm_files/MF_24units_2story_UB_3Beds_1pt5Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_2story_UB_ASHP2_HPWH.osm
#	test/osm_files/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osm
#	test/osm_files/MF_2story_UB_Furnace_AC1_FuelTankWH.osm
#	test/osm_files/MF_2story_UB_Furnace_AC1_FuelTankWH_TopLevel.osm
#	test/osm_files/MF_40units_4story_CS_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_40units_4story_SL_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_40units_4story_SL_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_40units_4story_UB_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_8units_1story_CS_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_8units_1story_CS_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_CentralAC_NoSetpoints.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_Furnace_NoSetpoints.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank_HWFixtures.osm
#	test/osm_files/MF_8units_1story_SL_Denver.osm
#	test/osm_files/MF_8units_1story_SL_Denver_ExteriorCorridor.osm
#	test/osm_files/MF_8units_1story_SL_Denver_Windows_Doors.osm
#	test/osm_files/MF_8units_1story_SL_Inset.osm
#	test/osm_files/MF_8units_1story_UB_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_8units_1story_UB_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_HVACSizing_Load_8units_1story_UB.osm
#	test/osm_files/MF_Successful_EnergyPlus_Run_TMY_Appl_PV.osm
#	test/osm_files/SFA_10units_2story_CS_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_10units_2story_FB_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_10units_2story_FB_UA_3Beds_2Baths_Denver_HasRearUnits.osm
#	test/osm_files/SFA_10units_2story_SL_3Beds_1pt5Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFA_10units_2story_SL_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_10units_2story_SL_UA_3Beds_2Baths_Denver_HasRearUnits.osm
#	test/osm_files/SFA_10units_2story_UB_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_2story_UB_ASHP2_HPWH.osm
#	test/osm_files/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_4units_1story_CS_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_4units_1story_FB_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_4units_1story_FB_UA_3Beds_2Baths_Denver_WHTank.osm
#	test/osm_files/SFA_4units_1story_FB_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm
#	test/osm_files/SFA_4units_1story_FB_UA_3Beds_2Baths_Denver_WHTank_HWFixtures.osm
#	test/osm_files/SFA_4units_1story_FB_UA_Denver.osm
#	test/osm_files/SFA_4units_1story_SL_FA.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_ASHP.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Boiler.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_CentralAC.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_CentralAC_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Boiler_Baseboards.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Boiler_Baseboards_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Fan_Coil.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Fan_Coil_Cooling_Only.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Fan_Coil_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_PTAC.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_PTAC_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_ElectricBaseboard.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Furnace.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Furnace_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_GSHPVertBore.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_MSHP.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_RoomAC.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_UnitHeater.osm
#	test/osm_files/SFA_4units_1story_SL_UA_Denver_Windows_Doors.osm
#	test/osm_files/SFA_4units_1story_SL_UA_Offset.osm
#	test/osm_files/SFA_4units_1story_UB_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_4units_1story_UB_UA_3Beds_2Baths_Denver_WHTank.osm
#	test/osm_files/SFA_4units_1story_UB_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm
#	test/osm_files/SFA_8units_2story_SL_UA.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_Boiler_Baseboards_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_Fan_Coil_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_PTAC_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Load_4units_1story_FB_UA.osm
#	test/osm_files/SFD_1000sqft_1story_FB_GRG_UA_DoorArea.osm
#	test/osm_files/SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osm
#	test/osm_files/SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osm
#	test/osm_files/SFD_1story_UB_UA_ASHP2_HPWH.osm
#	test/osm_files/SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osm
#	test/osm_files/SFD_2000sqft_2story_CS_GRG_UA.osm
#	test/osm_files/SFD_2000sqft_2story_CS_UA.osm
#	test/osm_files/SFD_2000sqft_2story_CS_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_East_GasWHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_HPWH.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_HPWH_SHW.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_OilWHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_South_GasWHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher_ElecClothesDryer.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher_GasClothesDryer.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher_PropaneClothesDryer.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_HWFixtures.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_HWFixtures_RecircDist.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_SHW.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTankless.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTankless_SHW.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_West_GasWHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_Southwest.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_3Beds_2Baths_Denver_Furnace_CentralAC_VarTstat.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ASHP.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ASHP2.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Boiler.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Boiler_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Boiler_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_CentralAC2.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ElectricBaseboard.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ElectricBaseboard_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ElectricBaseboard_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Furnace.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Furnace_CentralAC2.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Furnace_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_GSHPVertBore.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_MSHP.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_UnitHeater.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_UnitHeater_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_UnitHeater_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_PB_UA.osm
#	test/osm_files/SFD_2000sqft_2story_PB_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA_Denver_Windows_Skylights.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA_FlatRoof.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA_HipRoof.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA_LeftRight.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_FR_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_UA.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_UA_Doors_OneConstruction.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_UA_Windows_Doors.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_ASHP_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Boiler_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_CentralAC_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_ElectricBaseboard.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_ElectricBaseboard_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC_ElecWHTank_ClothesWasher_ClothesDryer.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC_Neighbors.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC_NoClgSetpoint.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC_NoHtgSetpoint.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_GSHPVertBore_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_MSHP.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_MSHPDucted.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_MSHP_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_RoomAC_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_UnitHeater_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_CeilingIns.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_East.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_North.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_West.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_Windows.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_Windows_OneConstruction.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Windows.osm
#	test/osm_files/SFD_2000sqft_2story_UB_GRG_UA.osm
#	test/osm_files/SFD_2000sqft_2story_UB_UA.osm
#	test/osm_files/SFD_2000sqft_2story_UB_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osm
#	test/osm_files/SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osm
#	test/osm_files/SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osm
#	test/osm_files/SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osm
#	test/osm_files/SFD_70heat_68cool_12mo_seasons.osm
#	test/osm_files/SFD_70heat_68cool_auto_seasons.osm
#	test/osm_files/SFD_70heat_75cool_12mo_seasons.osm
#	test/osm_files/SFD_70heat_75cool_12mo_seasons_FB.osm
#	test/osm_files/SFD_70heat_75cool_2wkdy_offset_12mo_seasons.osm
#	test/osm_files/SFD_70heat_75cool_auto_seasons.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_AutosizeForMaxLoad_MinTemp.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Autosize_MinTemp.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP2_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP2_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHPV_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHPV_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_BB_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_BB_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_Dehumidifier_Auto_Miami.osm
#	test/osm_files/SFD_HVACSizing_Equip_Dehumidifier_Fixed_Miami.osm
#	test/osm_files/SFD_HVACSizing_Equip_EF_AC2_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_EF_AC2_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ElecBoiler_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ElecBoiler_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_AC1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_AC1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_ACV_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_ACV_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_RAC_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_RAC_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GSHP_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GSHP_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GasBoiler_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GasBoiler_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHPDucted_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_AutosizeForMaxLoad.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_BB_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_BB_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_AC1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_AC1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Fixed_wFan.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented_ASHP_DuctsInPB.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented_ASHP_DuctsInUA.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_InsRoof.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_ERV.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_HRV.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_NoMechVent.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_SupplyMechVent.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Vented.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Vented_ExtFinDark.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInCS.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInGRG.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInLiv.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_Skylights.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FlatRoof_Skylights.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_FB_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_FB_GRG_FA_ASHP_DuctsInFB.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_S_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_UB_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_UB_GRG_FA_ASHP_DuctsInUB.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_AMY_PV.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_AMY_PV_TwoDays.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Appl_PV.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_February.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Outages.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Outages_PV.osm
#	test/test_samples_osw/base/results_output.csv
GitHub Action and others added 2 commits July 14, 2021 19:33
… into osv320

# Conflicts:
#	measures/BuildExistingModel/measure.rb
@shorowit
Copy link
Contributor Author

CI results for ~250 project_national homes:

Result Value
Max Total Site Energy Change (MBtu) 3.50
Min Total Site Energy Change (MBtu) -3.10
Avg Total Site Energy Change (MBtu) -0.06

If I force there to be no windows in the runs, the results are instead:

Result Value
Max Total Site Energy Change (MBtu) 0.10
Min Total Site Energy Change (MBtu) 0.00
Avg Total Site Energy Change (MBtu) 0.01

So it appears that the EnergyPlus simple window model bugfix explains nearly all of the difference.

Breakout of changes by fuel use:

Fuel Use Change (%)
Electricity, total 0.7%
Natural gas, total -0.6%

Breakout of changes by end use:

End Use Change (%)
Electricity, cooling 2.6%
Electricity, cooling fans 2.1%
Electricity, heating fans 1.8%
Electricity, ceiling fan 1.0%
Electricity, heating -2.3%
Natural gas, heating -1.7%

@shorowit
Copy link
Contributor Author

I believe that this is ready to go. @ejhw, @afontani what additional testing, if any, would you like?

@shorowit shorowit marked this pull request as ready for review July 16, 2021 15:45
@ejhw ejhw self-requested a review July 19, 2021 14:35
Copy link
Contributor

@ejhw ejhw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @shorowit ! The changes look sufficiently explained to me. It's up to @afontani whether we do a EULP run or wait and bundle with other changes.

shorowit and others added 5 commits July 20, 2021 09:01
# Conflicts:
#	measures/PowerOutage/measure.xml
#	measures/QOIReport/measure.xml
#	measures/ResidentialSimulationControls/measure.xml
#	measures/ResilienceMetricsReport/measure.xml
#	measures/SimulationOutputReport/measure.xml
#	measures/TimeseriesCSVExport/measure.xml
#	resources/measures/HPXMLtoOpenStudio/measure.rb
#	resources/measures/HPXMLtoOpenStudio/resources/util.rb
#	resources/measures/ResidentialGeometryCreateFromFloorspaceJS/measure.rb
#	resources/measures/ResidentialGeometryCreateFromFloorspaceJS/measure.xml
#	test/osm_files/Denver.osm
#	test/osm_files/MF_1story_UB_Furnace_AC1_FuelTankWH.osm
#	test/osm_files/MF_1story_UB_Furnace_AC1_FuelTankWH_MiddleUnit.osm
#	test/osm_files/MF_24units_2story_UB_3Beds_1pt5Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_2story_UB_ASHP2_HPWH.osm
#	test/osm_files/MF_2story_UB_FuelBoiler_AC1_FuelTankWH.osm
#	test/osm_files/MF_2story_UB_Furnace_AC1_FuelTankWH.osm
#	test/osm_files/MF_2story_UB_Furnace_AC1_FuelTankWH_TopLevel.osm
#	test/osm_files/MF_40units_4story_CS_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_40units_4story_SL_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_40units_4story_SL_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_40units_4story_UB_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_8units_1story_CS_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_8units_1story_CS_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_CentralAC_NoSetpoints.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_Furnace_NoSetpoints.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm
#	test/osm_files/MF_8units_1story_SL_3Beds_2Baths_Denver_WHTank_HWFixtures.osm
#	test/osm_files/MF_8units_1story_SL_Denver.osm
#	test/osm_files/MF_8units_1story_SL_Denver_ExteriorCorridor.osm
#	test/osm_files/MF_8units_1story_SL_Denver_Windows_Doors.osm
#	test/osm_files/MF_8units_1story_SL_Inset.osm
#	test/osm_files/MF_8units_1story_UB_3Beds_2Baths_Denver.osm
#	test/osm_files/MF_8units_1story_UB_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/MF_HVACSizing_Load_8units_1story_UB.osm
#	test/osm_files/MF_Successful_EnergyPlus_Run_TMY_Appl_PV.osm
#	test/osm_files/SFA_10units_2story_CS_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_10units_2story_FB_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_10units_2story_FB_UA_3Beds_2Baths_Denver_HasRearUnits.osm
#	test/osm_files/SFA_10units_2story_SL_3Beds_1pt5Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFA_10units_2story_SL_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_10units_2story_SL_UA_3Beds_2Baths_Denver_HasRearUnits.osm
#	test/osm_files/SFA_10units_2story_UB_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_2story_FB_FuelBoiler_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_2story_UB_ASHP2_HPWH.osm
#	test/osm_files/SFA_2story_UB_FuelBoiler_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_2story_UB_Furnace_RoomAC_FuelTankWH.osm
#	test/osm_files/SFA_4units_1story_CS_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_4units_1story_FB_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_4units_1story_FB_UA_3Beds_2Baths_Denver_WHTank.osm
#	test/osm_files/SFA_4units_1story_FB_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm
#	test/osm_files/SFA_4units_1story_FB_UA_3Beds_2Baths_Denver_WHTank_HWFixtures.osm
#	test/osm_files/SFA_4units_1story_FB_UA_Denver.osm
#	test/osm_files/SFA_4units_1story_SL_FA.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_ASHP.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Boiler.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_CentralAC.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_CentralAC_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Boiler_Baseboards.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Boiler_Baseboards_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Fan_Coil.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Fan_Coil_Cooling_Only.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_Fan_Coil_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_PTAC.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Central_System_PTAC_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_ElectricBaseboard.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Furnace.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_Furnace_NoSetpoints.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_GSHPVertBore.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_MSHP.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_RoomAC.osm
#	test/osm_files/SFA_4units_1story_SL_UA_3Beds_2Baths_Denver_UnitHeater.osm
#	test/osm_files/SFA_4units_1story_SL_UA_Denver_Windows_Doors.osm
#	test/osm_files/SFA_4units_1story_SL_UA_Offset.osm
#	test/osm_files/SFA_4units_1story_UB_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFA_4units_1story_UB_UA_3Beds_2Baths_Denver_WHTank.osm
#	test/osm_files/SFA_4units_1story_UB_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm
#	test/osm_files/SFA_8units_2story_SL_UA.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_Boiler_Baseboards_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_Fan_Coil_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Equip_Central_System_PTAC_Autosize.osm
#	test/osm_files/SFA_HVACSizing_Load_4units_1story_FB_UA.osm
#	test/osm_files/SFD_1000sqft_1story_FB_GRG_UA_DoorArea.osm
#	test/osm_files/SFD_1story_FB_UA_GRG_MSHP_FuelTanklessWH.osm
#	test/osm_files/SFD_1story_FB_UA_GRG_RoomAC_ElecBoiler_FuelTanklessWH.osm
#	test/osm_files/SFD_1story_UB_UA_ASHP2_HPWH.osm
#	test/osm_files/SFD_1story_UB_UA_GRG_ACV_FuelFurnace_HPWH.osm
#	test/osm_files/SFD_2000sqft_2story_CS_GRG_UA.osm
#	test/osm_files/SFD_2000sqft_2story_CS_UA.osm
#	test/osm_files/SFD_2000sqft_2story_CS_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_East_GasWHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_HPWH.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_HPWH_SHW.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_OilWHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_South_GasWHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher_ElecClothesDryer.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher_GasClothesDryer.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_ClothesWasher_PropaneClothesDryer.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_HWFixtures.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_HWFixtures_RecircDist.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTank_SHW.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTankless.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_WHTankless_SHW.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_3Beds_2Baths_Denver_West_GasWHTank.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_FB_GRG_UA_Southwest.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_3Beds_2Baths_Denver_Furnace_CentralAC_VarTstat.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ASHP.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ASHP2.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Boiler.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Boiler_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Boiler_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_CentralAC2.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ElectricBaseboard.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ElectricBaseboard_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_ElectricBaseboard_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Furnace.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Furnace_CentralAC2.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_Furnace_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_GSHPVertBore.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_MSHP.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_UnitHeater.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_UnitHeater_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_FB_UA_Denver_UnitHeater_RoomAC.osm
#	test/osm_files/SFD_2000sqft_2story_PB_UA.osm
#	test/osm_files/SFD_2000sqft_2story_PB_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA_Denver_Windows_Skylights.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA_FlatRoof.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA_HipRoof.osm
#	test/osm_files/SFD_2000sqft_2story_SL_FA_LeftRight.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_FR_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_UA.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_UA_Doors_OneConstruction.osm
#	test/osm_files/SFD_2000sqft_2story_SL_GRG_UA_Windows_Doors.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_ASHP_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Boiler_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_CentralAC_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_ElectricBaseboard.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_ElectricBaseboard_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC_ElecWHTank_ClothesWasher_ClothesDryer.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC_Neighbors.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC_NoClgSetpoint.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_CentralAC_NoHtgSetpoint.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_Furnace_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_GSHPVertBore_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_MSHP.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_MSHPDucted.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_MSHP_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_RoomAC_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_3Beds_2Baths_Denver_UnitHeater_NoSetpoints.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_CeilingIns.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_East.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_North.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_West.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_Windows.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Denver_Windows_OneConstruction.osm
#	test/osm_files/SFD_2000sqft_2story_SL_UA_Windows.osm
#	test/osm_files/SFD_2000sqft_2story_UB_GRG_UA.osm
#	test/osm_files/SFD_2000sqft_2story_UB_UA.osm
#	test/osm_files/SFD_2000sqft_2story_UB_UA_3Beds_2Baths_Denver_Furnace_CentralAC.osm
#	test/osm_files/SFD_2story_CS_UA_AC2_FuelBoiler_FuelTankWH.osm
#	test/osm_files/SFD_2story_CS_UA_GRG_ASHPV_FuelTanklessWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_AC1_ElecBaseboard_FuelTankWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_AC1_UnitHeater_FuelTankWH.osm
#	test/osm_files/SFD_2story_FB_UA_GRG_GSHP_ElecTanklessWH.osm
#	test/osm_files/SFD_2story_PB_UA_ElecFurnace_ElecTankWH.osm
#	test/osm_files/SFD_2story_S_UA_GRG_ASHP1_FuelTanklessWH.osm
#	test/osm_files/SFD_70heat_68cool_12mo_seasons.osm
#	test/osm_files/SFD_70heat_68cool_auto_seasons.osm
#	test/osm_files/SFD_70heat_75cool_12mo_seasons.osm
#	test/osm_files/SFD_70heat_75cool_12mo_seasons_FB.osm
#	test/osm_files/SFD_70heat_75cool_2wkdy_offset_12mo_seasons.osm
#	test/osm_files/SFD_70heat_75cool_auto_seasons.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_AutosizeForMaxLoad_MinTemp.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Autosize_MinTemp.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP2_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHP2_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHPV_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ASHPV_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_BB_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_BB_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_Dehumidifier_Auto_Miami.osm
#	test/osm_files/SFD_HVACSizing_Equip_Dehumidifier_Fixed_Miami.osm
#	test/osm_files/SFD_HVACSizing_Equip_EF_AC2_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_EF_AC2_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_ElecBoiler_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_ElecBoiler_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_AC1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_AC1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_ACV_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_ACV_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_RAC_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GF_RAC_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GSHP_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GSHP_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_GasBoiler_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_GasBoiler_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHPDucted_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_AutosizeForMaxLoad.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_BB_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_BB_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_MSHP_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_AC1_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_AC1_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Autosize.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Fixed.osm
#	test/osm_files/SFD_HVACSizing_Equip_UnitHeater_Fixed_wFan.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented_ASHP_DuctsInPB.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_PB_UA_Vented_ASHP_DuctsInUA.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_InsRoof.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_ERV.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_HRV.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_NoMechVent.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Unvented_NoOverhangs_NoIntShading_SupplyMechVent.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Vented.osm
#	test/osm_files/SFD_HVACSizing_Load_1story_S_UA_Vented_ExtFinDark.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInCS.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInGRG.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_ASHP_DuctsInLiv.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FA_Skylights.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_CS_GRG_FlatRoof_Skylights.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_FB_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_FB_GRG_FA_ASHP_DuctsInFB.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_S_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_UB_GRG_FA.osm
#	test/osm_files/SFD_HVACSizing_Load_2story_UB_GRG_FA_ASHP_DuctsInUB.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_AMY_PV.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_AMY_PV_TwoDays.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Appl_PV.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_February.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Outages.osm
#	test/osm_files/SFD_Successful_EnergyPlus_Run_TMY_Outages_PV.osm
#	test/test_samples_osw/base/results_output.csv
# Conflicts:
#	test/compare.rb
#	test/test_samples_osw/base/results_output.csv
# Conflicts:
#	test/test_samples_osw/base/results_output.csv
@shorowit shorowit mentioned this pull request Jul 22, 2021
9 tasks
@joseph-robertson
Copy link
Contributor

We decided not to do a EULP run.

shorowit and others added 2 commits July 26, 2021 07:59
# Conflicts:
#	Gemfile
#	Rakefile
#	test/test_samples_osw/base/results_output.csv
#	workflows/example_multifamily_AMY2012.osw
#	workflows/example_multifamily_AMY2014.osw
#	workflows/example_multifamily_TMY.osw
#	workflows/example_single_family_attached_AMY2012.osw
#	workflows/example_single_family_attached_AMY2014.osw
#	workflows/example_single_family_attached_TMY.osw
#	workflows/example_single_family_detached_AMY2012.osw
#	workflows/example_single_family_detached_AMY2014.osw
#	workflows/example_single_family_detached_TMY.osw
#	workflows/tests/workflows_test.rb
@shorowit shorowit merged commit d10a649 into develop Jul 26, 2021
@shorowit shorowit deleted the osv320 branch July 26, 2021 20:35
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants