Merge pull request #1615 from NREL/nrcan_366

Nrcan 366
NREL · Oct 5, 2023 · 7de7a4c · 7de7a4c
2 parents b3fe456 + e09e0de
commit 7de7a4c
Show file tree

Hide file tree

Showing 56 changed files with 1,948 additions and 3,402 deletions.
diff --git a/lib/openstudio-standards/standards/necb/BTAPPRE1980/data/boilers.json b/lib/openstudio-standards/standards/necb/BTAPPRE1980/data/boilers.json
@@ -99,7 +99,7 @@
           "minimum_thermal_efficiency": 0.80,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From MNECB Supplement 5.4.7.4.4"
         },
         {
 
@@ -115,7 +115,7 @@
           "minimum_thermal_efficiency": 0.80,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From MNECB Supplement 5.4.7.4.4"
         }
       ]
     }

diff --git a/lib/openstudio-standards/standards/necb/NECB2011/data/boilers.json b/lib/openstudio-standards/standards/necb/NECB2011/data/boilers.json
@@ -1,8 +1,9 @@
 {
   "tables": {
     "boilers": {
+      "data_type": "table",
       "refs": [
-        "assumption"
+        "NECB 2011 (3rd printing) Table 5.2.12.1"
       ],
       "table": [
         {
@@ -19,7 +20,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2011 (3rd printing) Table 5.2.12.1"
         },
         {
 
@@ -35,7 +36,7 @@
           "minimum_thermal_efficiency": 0.83,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2011 (3rd printing) Table 5.2.12.1"
         },
         {
 
@@ -51,7 +52,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": 0.833,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2011 (3rd printing) Table 5.2.12.1"
         },
         {
 
@@ -67,7 +68,7 @@
           "minimum_thermal_efficiency": 1.0,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2011 (3rd printing) Table 5.2.12.1"
         },
         {
 
@@ -79,11 +80,11 @@
           "maximum_capacity": 299999.0,
           "start_date": "9/9/1919",
           "end_date": "2999-09-09T00:00:00+00:00",
-          "minimum_annual_fuel_utilization_efficiency": 0.8,
+          "minimum_annual_fuel_utilization_efficiency": 0.847,
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2011 (3rd printing) Table 5.2.12.1"
         },
         {
 
@@ -99,7 +100,7 @@
           "minimum_thermal_efficiency": 0.834,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2011 (3rd printing) Table 5.2.12.1"
         },
         {
 
@@ -115,7 +116,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": 0.858,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2011 (3rd printing) Table 5.2.12.1"
         }
       ]
     }

diff --git a/lib/openstudio-standards/standards/necb/NECB2015/data/boilers.json b/lib/openstudio-standards/standards/necb/NECB2015/data/boilers.json
@@ -3,7 +3,7 @@
     "boilers": {
       "data_type": "table",
       "refs": [
-        "assumption"
+        "NECB 2015 (first printing) Table 5.2.12.1"
       ],
       "table": [
         {
@@ -20,7 +20,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2015 (first printing) Table 5.2.12.1"
         },
         {
 
@@ -36,7 +36,7 @@
           "minimum_thermal_efficiency": 0.83,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2015 (first printing) Table 5.2.12.1"
         },
         {
 
@@ -52,7 +52,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": 0.833,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2015 (first printing) Table 5.2.12.1"
         },
         {
 
@@ -68,7 +68,7 @@
           "minimum_thermal_efficiency": 1.0,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2015 (first printing) Table 5.2.12.1"
         },
         {
 
@@ -84,7 +84,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2015 (first printing) Table 5.2.12.1"
         },
         {
 
@@ -100,7 +100,7 @@
           "minimum_thermal_efficiency": 0.834,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2015 (first printing) Table 5.2.12.1"
         },
         {
 
@@ -116,7 +116,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": 0.858,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2015 (first printing) Table 5.2.12.1"
         }
       ]
     }

diff --git a/lib/openstudio-standards/standards/necb/NECB2020/data/boilers.json b/lib/openstudio-standards/standards/necb/NECB2020/data/boilers.json
@@ -3,7 +3,7 @@
     "boilers": {
       "data_type": "table",
       "refs": [
-        "assumption"
+        "NECB 2020 (first printing) Table 5.2.12.1.-N"
       ],
       "table": [
         {
@@ -19,7 +19,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2020 (first printing) Table 5.2.12.1.-N"
         },
         {
           "fluid_type": "Hot Water",
@@ -34,7 +34,7 @@
           "minimum_thermal_efficiency": 0.90,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2020 (first printing) Table 5.2.12.1.-N"
         },
         {
 
@@ -50,7 +50,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": 0.90,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2020 (first printing) Table 5.2.12.1.-N"
         },
         {
 
@@ -66,7 +66,7 @@
           "minimum_thermal_efficiency": 1.0,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2020 (first printing) Table 5.2.12.1.-N"
         },
         {
 
@@ -82,7 +82,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2020 (first printing) Table 5.2.12.1.-N"
         },
         {
 
@@ -98,7 +98,7 @@
           "minimum_thermal_efficiency": 0.87,
           "minimum_combustion_efficiency": null,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2020 (first printing) Table 5.2.12.1.-N"
         },
         {
 
@@ -114,7 +114,7 @@
           "minimum_thermal_efficiency": null,
           "minimum_combustion_efficiency": 0.88,
           "efffplr": "BOILER-EFFFPLR-NECB2011",
-          "notes": "From NECB 2011"
+          "notes": "From NECB 2020 (first printing) Table 5.2.12.1.-N"
         }
       ]
     }