Skip to content

Commit

Permalink
Changes needed to execute release tests
Browse files Browse the repository at this point in the history
Control measure costs were updated to reflect deprecation of $/occupant units. Commercial daylighting and integrated NGHP measures also required cost unit updates to $/ft^2 floor to work with updated baseline cost units in $/kBtu/h service demand.

The flag for cost unit translation in ecm_prep.py was amended to address a bug uncovered when running commercial controls measures that span multiple end uses (heating, cooling, ventilation, lighting).

Finally, the commit revises a part of run.py that links all stock turnover calculations for measures spanning multiple end use technologies that include heating and//or cooling to a single heating or (if unavailable) cooling technology in the measure definition. This part of the code was not properly handling non-heating/cooling technologies in the measure definition (for example, lighting and ventilation technologies in a controls measure definition that spans heating, cooling, ventilation and lighting end uses).
  • Loading branch information
jtlangevin authored and trynthink committed Jan 31, 2022
1 parent f23c783 commit 05b6288
Show file tree
Hide file tree
Showing 18 changed files with 155 additions and 157 deletions.
14 changes: 7 additions & 7 deletions ecm_definitions/Prospective AFDD + Submetering 2030.json
Expand Up @@ -53,15 +53,15 @@
"URL": "http://fire.nist.gov/bfrlpubs/build07/PDF/b07023.pdf"}]},
"installed_cost": 0.1466,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source": {
"notes": "BTO Prioritization Tool analysis assuming 20% HVAC energy savings and 1 year payback threshold",
"installed_cost_source":{
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 15,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down
16 changes: 8 additions & 8 deletions ecm_definitions/Prospective Com. Comfort Ctl. 2030.json
Expand Up @@ -44,17 +44,17 @@
"pages": [536, 548],
"URL": "https://www.researchgate.net/publication/269576957_A_knowledge_based_approach_for_selecting_energy-aware_and_comfort-driven_HVAC_temperature_set_points"}
]},
"installed_cost": 49,
"cost_units": "2017$/occupant",
"installed_cost": 0.245,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source":{
"notes": "BTO Prioritization Tool analysis assuming 35% HVAC savings, 45% lighting energy savings, 80% PCs savings, and 1 year payback threshold",
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback; converted to $/ft^2 floor via `occupant-centered sensing and controls` large office factor in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 10,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down
16 changes: 8 additions & 8 deletions ecm_definitions/Prospective Com. Occupancy Ctl. 2030.json
Expand Up @@ -43,17 +43,17 @@
"pages": null,
"URL": "https://www.researchgate.net/publication/259933762_Reducing_Energy_Waste_for_Computers_by_Human-in-the-Loop_Control"}
]},
"installed_cost": 36,
"cost_units": "2017$/occupant",
"installed_cost": 0.18,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source":{
"notes": "BTO Prioritization Tool analysis assuming 35% HVAC savings, 45% lighting energy savings, 80% PCs savings, and 1 year payback threshold",
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback; converted to $/ft^2 floor via `occupant-centered sensing and controls` large office factor in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 10,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down
9 changes: 6 additions & 3 deletions ecm_definitions/Prospective Commercial AVCT HVAC (FS).json
Expand Up @@ -20,11 +20,14 @@
},
"market_exit_year": null,
"market_exit_year_source": null,
"energy_efficiency": 6.02,
"energy_efficiency": {
"cooling": 6.05,
"heating": 3.03
},
"energy_efficiency_units": "BTU out/BTU in",
"energy_efficiency_source": {
"notes": "From Table 3, convert from primary COP target of 2.01 to COP by multiplying by 3.01, COP = BTU out/BTU in",
"source_data": {
"notes": "Convert from primary COP (from Table 3 in BTO MYPP) to COP, multiply by 3.01; heating COP approximated as half of the cooling COP",
"source data": {
"title": "Building Technologies Office Multi-Year Program Plan",
"author": null,
"organization": "U.S. Department of Energy",
Expand Down
16 changes: 8 additions & 8 deletions ecm_definitions/Prospective Commercial Comfort Ctl..json
Expand Up @@ -44,17 +44,17 @@
"pages": [536, 548],
"URL": "https://www.researchgate.net/publication/269576957_A_knowledge_based_approach_for_selecting_energy-aware_and_comfort-driven_HVAC_temperature_set_points"}
]},
"installed_cost": 49,
"cost_units": "2017$/occupant",
"installed_cost": 0.245,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source":{
"notes": "BTO Prioritization Tool analysis assuming 35% HVAC savings, 45% lighting energy savings, 80% PCs savings, and 1 year payback threshold",
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback; converted to $/ft^2 floor via `occupant-centered sensing and controls` large office factor in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 10,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down
6 changes: 3 additions & 3 deletions ecm_definitions/Prospective Commercial Daylighting.json
Expand Up @@ -19,10 +19,10 @@
"notes": "Target performance based on expert judgment regarding the opportunity for potential improvement relative to current state-of-the-art",
"source_data": null
},
"installed_cost": 13.98,
"cost_units": "2016$/ft^2 glazing",
"installed_cost": 1.38,
"cost_units": "2016$/ft^2 floor",
"installed_cost_source": {
"notes": "Target cost based on 5 year payback period objective",
"notes": "Target cost based on 5 year payback period objective; convert from original units of $/ft^2 glazing to $/ft^2 floor using large office factors (glazing->wall->floor) in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": null
},
"product_lifetime": 20,
Expand Down
16 changes: 4 additions & 12 deletions ecm_definitions/Prospective Commercial Integrated NGHP.json
Expand Up @@ -33,25 +33,17 @@
"URL": "https://energy.gov/sites/prod/files/2016/02/f29/BTO_MYPP_2016.pdf"
}
},
"installed_cost": 60.38,
"cost_units": "2017$/kBtu/h heating",
"installed_cost": 1.91,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source": {
"notes": "$1.1/ft^2 floor cost premium * 1 ft^2 floor/0.020 kBtu/h heating (see Scout 'ecm_cost_convert.json' file) + baseline cost of $5.38/kBtu/h ($2150 for 2020 'typical' commercial gas-fired furnace / 400 kBtu/h typical input capacity, from EIA data)",
"notes": "$1.1/ft^2 floor cost premium + baseline cost of $0.8112/ft^2 floor ($40.56/kBtu/h heating ($32450 for 2020 'typical' commercial gas-fired boiler / 800 kBtu/h typical input capacity, from EIA data), multiplied by 0.020 kBtu/h heating/ft^2 floor (see Scout directory, ./supporting_data/convert_data/ecm_cost_convert.json)",
"source_data": [{
"title": "Building Technologies Office Multi-Year Program Plan",
"author": null,
"organization": "U.S. Department of Energy",
"year": 2016,
"pages": 75,
"pages": 98,
"URL": "https://energy.gov/sites/prod/files/2016/02/f29/BTO_MYPP_2016.pdf"
},
{
"title": "Updated Buildings Sector Appliance and Equipment Costs and Efficiencies",
"author": null,
"organization": "U.S. Energy Information Administration",
"year": 2018,
"pages": 90,
"URL": "https://www.eia.gov/analysis/studies/buildings/equipcosts/pdf/full.pdf"
}]
},
"product_lifetime": 23,
Expand Down
7 changes: 5 additions & 2 deletions ecm_definitions/Prospective Commercial NVC HVAC (FS).json
Expand Up @@ -20,10 +20,13 @@
},
"market_exit_year": null,
"market_exit_year_source": null,
"energy_efficiency": 6.86,
"energy_efficiency": {
"cooling": 6.86,
"heating": 3.43
},
"energy_efficiency_units": "BTU out/BTU in",
"energy_efficiency_source": {
"notes": "Convert from primary COP of 2.28 (Table 3) to COP by multiplying by 3.01, COP=BTU out/BTU in",
"notes": "Convert from primary COP of 2.28 (from Table 3 in BTO MYPP) to COP, multiply by 3.01; heating COP approximated as half of the cooling COP",
"source_data":{
"title": "Building Technologies Office Multi-Year Program Plan",
"author": null,
Expand Down
16 changes: 8 additions & 8 deletions ecm_definitions/Prospective Commercial Occupancy Ctl..json
Expand Up @@ -43,17 +43,17 @@
"pages": null,
"URL": "https://www.researchgate.net/publication/259933762_Reducing_Energy_Waste_for_Computers_by_Human-in-the-Loop_Control"}
]},
"installed_cost": 36,
"cost_units": "2017$/occupant",
"installed_cost": 0.18,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source":{
"notes": "BTO Prioritization Tool analysis assuming 35% HVAC savings, 45% lighting energy savings, 80% PCs savings, and 1 year payback threshold",
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback; converted to $/ft^2 floor via `occupant-centered sensing and controls` large office factor in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 10,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down
16 changes: 8 additions & 8 deletions ecm_definitions/Prospective Res. Comfort Ctl. 2030.json
Expand Up @@ -43,17 +43,17 @@
"pages": [536, 548],
"URL": "https://www.researchgate.net/publication/269576957_A_knowledge_based_approach_for_selecting_energy-aware_and_comfort-driven_HVAC_temperature_set_points"}
]},
"installed_cost": 91,
"cost_units": "2017$/occupant",
"installed_cost": 0.095,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source":{
"notes": "BTO Prioritization Tool analysis assuming 35% HVAC savings, 45% lighting energy savings, 80% PCs savings, and 1 year payback threshold",
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback; converted to $/ft^2 floor via `occupant-centered sensing and controls` SFH home factor in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 10,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down
16 changes: 8 additions & 8 deletions ecm_definitions/Prospective Res. Occupancy Ctl. 2030.json
Expand Up @@ -41,17 +41,17 @@
"year": 2013,
"pages": null,
"URL": "https://www.researchgate.net/publication/259933762_Reducing_Energy_Waste_for_Computers_by_Human-in-the-Loop_Control"}]},
"installed_cost": 70,
"cost_units": "2017$/occupant",
"installed_cost": 0.07,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source":{
"notes": "BTO Prioritization Tool analysis assuming 35% HVAC savings, 45% lighting energy savings, 80% PCs savings, and 1 year payback threshold",
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback; converted to $/ft^2 floor via `occupant-centered sensing and controls` SFH home factor in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 10,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down
4 changes: 2 additions & 2 deletions ecm_definitions/Prospective Residential AVCT HVAC (FS).json
Expand Up @@ -22,8 +22,8 @@
"market_exit_year": null,
"market_exit_year_source": null,
"energy_efficiency": {
"cooling": 6.02,
"heating": 3.01
"cooling": 6.05,
"heating": 3.03
},
"energy_efficiency_units": "COP",
"energy_efficiency_source": {
Expand Down
16 changes: 8 additions & 8 deletions ecm_definitions/Prospective Residential Comfort Ctl..json
Expand Up @@ -43,17 +43,17 @@
"pages": [536, 548],
"URL": "https://www.researchgate.net/publication/269576957_A_knowledge_based_approach_for_selecting_energy-aware_and_comfort-driven_HVAC_temperature_set_points"}
]},
"installed_cost": 91,
"cost_units": "2017$/occupant",
"installed_cost": 0.095,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source":{
"notes": "BTO Prioritization Tool analysis assuming 35% HVAC savings, 45% lighting energy savings, 80% PCs savings, and 1 year payback threshold",
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback; converted to $/ft^2 floor via `occupant-centered sensing and controls` SFH home factor in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 10,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down
16 changes: 8 additions & 8 deletions ecm_definitions/Prospective Residential Occupancy Ctl..json
Expand Up @@ -41,17 +41,17 @@
"year": 2013,
"pages": null,
"URL": "https://www.researchgate.net/publication/259933762_Reducing_Energy_Waste_for_Computers_by_Human-in-the-Loop_Control"}]},
"installed_cost": 70,
"cost_units": "2017$/occupant",
"installed_cost": 0.07,
"cost_units": "2017$/ft^2 floor",
"installed_cost_source":{
"notes": "BTO Prioritization Tool analysis assuming 35% HVAC savings, 45% lighting energy savings, 80% PCs savings, and 1 year payback threshold",
"notes": "Cost analysis for BTO Sensors and Controls proggram; 1 year payback; converted to $/ft^2 floor via `occupant-centered sensing and controls` SFH home factor in Scout directory ./supporting_data/convert_data/ecm_cost_convert.json",
"source_data": {
"title": "A Tool to Prioritize Energy Efficiency Investments",
"author": "Farese et al.",
"organization": "National Renewable Energy Laboratory",
"year": 2012,
"title": "Laying Down the Foundation: An R&D Roadmap for Energy Savings through Advancements in Smart Building Technologies",
"author": "Sofos et al.",
"organization": "U.S. Department of Energy Building Technologies Office (BTO)",
"year": 2018,
"pages": null,
"URL": "http://www.nrel.gov/docs/fy12osti/54799.pdf"}},
"URL": "https://www.researchgate.net/publication/332152674_Laying_Down_the_Foundation_An_RD_Roadmap_for_Energy_Savings_through_Advancements_in_Smart_Building_Technologies"}},
"product_lifetime": 10,
"product_lifetime_units": "years",
"product_lifetime_source": {
Expand Down

0 comments on commit 05b6288

Please sign in to comment.