Skip to content

Commit

Permalink
Update to latest measure set
Browse files Browse the repository at this point in the history 
Fold secondary heating measures into gas furnace + AC memasures, remove from package set.
  • Loading branch information
@jtlangevin
jtlangevin committed Jan 24, 2025
1 parent 83695aa commit 4ba3af0
Show file tree
Hide file tree
Showing 357 changed files with 1,372 additions and 1,261 deletions.
2 changes: 0 additions & 2 deletions batch/brk.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ ecm_prep:
"(R) Ref. Case NG Heat, No Cooling",
"(R) Ref. Case Resist. Heat, No Cooling",
"(R) Ref. Case Secondary Electric Heating",
"(R) Ref. Case Secondary Fossil Heating",
"(R) Electric FS (Secondary Fossil Heating)",
"(R) Min. Efficiency ASHP FS (Other Fossil Furnace)",
"(R) Ref. Case Elec. Boiler FS (Other Fossil Boiler)",
"(R) Min. Efficiency ASHP FS (NG Furnace)",
Expand Down
2 changes: 0 additions & 2 deletions batch/high.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ ecm_prep:
"(R) Ref. Case NG Heat, No Cooling",
"(R) Ref. Case Resist. Heat, No Cooling",
"(R) Ref. Case Secondary Electric Heating",
"(R) Ref. Case Secondary Fossil Heating",
"(R) Electric FS (Secondary Fossil Heating)",
"(R) Min. Efficiency ASHP FS (Other Fossil Furnace)",
"(R) Ref. Case Elec. Boiler FS (Other Fossil Boiler)",
"(R) Min. Efficiency ASHP FS (NG Furnace)",
Expand Down
2 changes: 0 additions & 2 deletions batch/ineff.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ ecm_prep:
"(R) Ref. Case NG Heat, No Cooling",
"(R) Ref. Case Resist. Heat, No Cooling",
"(R) Ref. Case Secondary Electric Heating",
"(R) Ref. Case Secondary Fossil Heating",
"(R) Electric FS (Secondary Fossil Heating)",
"(R) Min. Efficiency ASHP FS (Other Fossil Furnace)",
"(R) Ref. Case Elec. Boiler FS (Other Fossil Boiler)",
"(R) Min. Efficiency ASHP FS (NG Furnace)",
Expand Down
2 changes: 0 additions & 2 deletions batch/mid.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ ecm_prep:
"(R) Ref. Case NG Heat, No Cooling",
"(R) Ref. Case Resist. Heat, No Cooling",
"(R) Ref. Case Secondary Electric Heating",
"(R) Ref. Case Secondary Fossil Heating",
"(R) Electric FS (Secondary Fossil Heating)",
"(R) Min. Efficiency ASHP FS (Other Fossil Furnace)",
"(R) Ref. Case Elec. Boiler FS (Other Fossil Boiler)",
"(R) Min. Efficiency ASHP FS (NG Furnace)",
Expand Down
1 change: 0 additions & 1 deletion batch/stated.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ ecm_prep:
"(R) Ref. Case NG Heat, No Cooling",
"(R) Ref. Case Resist. Heat, No Cooling",
"(R) Ref. Case Secondary Electric Heating",
"(R) Ref. Case Secondary Fossil Heating",
"(R) Min. Efficiency ASHP FS (Other Fossil Furnace)",
"(R) Ref. Case Elec. Boiler FS (Other Fossil Boiler)",
"(R) Min. Efficiency ASHP FS (NG Furnace)",
Expand Down
2 changes: 1 addition & 1 deletion ecm_definitions/(C) 90.1 Lighting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) 90.1 Plug Loads.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) 90.1-2022 Walls & Air Sealing.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) 90.1-2022 Windows.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) BTO RDO Air Sealing (Exist).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) BTO RDO Roofs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) BTO RDO Walls.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) BTO RDO Windows.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP FS (NG Boiler).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP FS (NG Furnace & AC).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP FS (Other Fossil Boiler).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP FS (Other Fossil Furnace & AC).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP FS (RTU, NG Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP FS (RTU, Other Fossil Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP Pt. FS (NG Boiler).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP Pt. FS (NG Furnace & AC).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP Pt. FS (Other Fossil Boiler).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP Pt. FS (Other Fossil Furnace & AC).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP Pt. FS (RTU, NG Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HP Pt. FS (RTU, Other Fossil Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HPWH FS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best HPWH TS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best Lighting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best Plug Loads.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Best Refrigeration.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Brk. HP FS (NG Furnace & AC).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Brk. HP FS (Other Fossil Furnace & AC).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP FS (NG Furnace).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP FS (Other Fossil Furnace).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP FS (RTU, NG Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP FS (RTU, Other Fossil Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP Pt. FS (NG Furnace).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP Pt. FS (Other Fossil Furnace).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP Pt. FS (RTU, NG Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP Pt. FS (RTU, Other Fossil Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HP TS (Resist. Heat).json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,6 @@
"name": "Jared Langevin",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HPWH FS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) ESTAR HPWH TS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
2 changes: 1 addition & 1 deletion ecm_definitions/(C) Induction Range FS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,6 @@
"name": "Aven Satre:Meloy",
"organization": "LBNL",
"email": "[email protected]",
"timestamp": "2025-01-13 15:20:42"
"timestamp": "2025-01-21 17:41:02"
}
}
Loading

0 comments on commit 4ba3af0

Please sign in to comment.