Merge branch 'develop' into latest-os-hpxml

NREL · Dec 4, 2024 · 369e1fc · 369e1fc
2 parents 5844bec + 4b7fcd7
commit 369e1fc
Show file tree

Hide file tree

Showing 12 changed files with 17,909 additions and 17,875 deletions.
diff --git a/docs/read_the_docs/source/changelog/changelog_dev.rst b/docs/read_the_docs/source/changelog/changelog_dev.rst
@@ -1,7 +1,22 @@
 =====================
 Development Changelog
 =====================
-
 .. changelog::
     :version: v3.5.0
     :released: pending
+
+    .. change::
+        :tags: characteristics, pool heater
+        :pullreq: 1324
+
+        **Date**: 2024-12-3
+
+        Title:
+        Add heat pump pool heaters
+
+        Description:
+        Add heat pump pool heaters to baseline.
+
+        resstock-estimation: `pull request 436 <https://github.com/NREL/resstock-estimation/pull/436>`_
+
+        Assignees: Janet Reyna
diff --git a/docs/read_the_docs/source/workflow_inputs/characteristics.rst b/docs/read_the_docs/source/workflow_inputs/characteristics.rst
@@ -35182,7 +35182,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - None
-     - 24%
+     - 23%
      - Percent
      - 0
      - 0
@@ -35342,7 +35342,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - None
-     - 24%
+     - 23%
      - conditioned space
      - auto
      - auto
@@ -38352,10 +38352,10 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - ``hvac_blower_fan_watts_per_cfm``
 
    * - No
-     - 24%
+     - 23%
      - auto
    * - Yes
-     - 76%
+     - 77%
      - auto
    * - Void
      - 0%
@@ -39253,7 +39253,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - Fuel Boiler, 76% AFUE
-     - 0.89%
+     - 0.83%
      - Boiler
      - 0.76
      - auto
@@ -39298,7 +39298,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - Fuel Boiler, 80% AFUE
-     - 3.3%
+     - 3.2%
      - Boiler
      - 0.8
      - auto
@@ -39343,7 +39343,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - Fuel Boiler, 90% AFUE
-     - 0.49%
+     - 0.48%
      - Boiler
      - 0.9
      - auto
@@ -39613,7 +39613,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - Fuel Wall/Floor Furnace, 68% AFUE
-     - 2.8%
+     - 2.9%
      - WallFurnace
      - 0.68
      - auto
@@ -39703,7 +39703,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - MSHP, SEER 29.3, 14 HSPF
-     - 0.015%
+     - 0.014%
      - none
      - 0
      - auto
@@ -39993,7 +39993,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
    * - Fuel Oil Fuel Furnace
      - 2.8%
    * - Fuel Oil Fuel Wall/Floor Furnace
-     - 0.29%
+     - 0.3%
    * - Fuel Oil Shared Heating
      - 0.51%
    * - Natural Gas Fuel Boiler
@@ -40007,7 +40007,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
    * - None
      - 1.1%
    * - Other Fuel Fuel Boiler
-     - 0.46%
+     - 0.45%
    * - Other Fuel Fuel Furnace
      - 0.24%
    * - Other Fuel Fuel Wall/Floor Furnace
@@ -40023,7 +40023,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
    * - Propane Shared Heating
      - 0.16%
    * - Void
-     - 0.00039%
+     - 0%
 
 .. _hvac_secondary_heating_efficiency:
 
@@ -42236,7 +42236,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - 1.1%
      - 3
    * - 3 months
-     - 0.36%
+     - 0.35%
      - 90
    * - Never
      - 96%
@@ -47482,6 +47482,14 @@ Source
 
 - \U.S. EIA 2020 Residential Energy Consumption Survey (RECS) microdata.
 
+- \the California Energy Commision 2019 Residential Appliance Saturation Study (RASS) microdata.
+
+
+Assumption
+**********
+
+- \Within electric pool heaters, proportion of heat pump electric pool heating vs. non-heat pump electric pool heating was derived from RASS 2019.
+
 
 Arguments
 *********
@@ -47538,8 +47546,14 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - ``pool_heater_annual_therm``
      - ``pool_heater_usage_multiplier``
 
+   * - Electric Heat Pump
+     - 0.13%
+     - heat pump
+     - auto
+     - 0
+     - 1.0
    * - Electricity
-     - 0.7%
+     - 0.57%
      - electric resistance
      - auto
      - 0
@@ -62987,7 +63001,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - FIXME Fuel Oil Indirect
-     - 0.69%
+     - 0.68%
      - storage water heater
      - fuel oil
      - auto
@@ -63025,7 +63039,7 @@ From ``project_national`` the list of options, option stock sturation, and optio
      - auto
      - auto
    * - Fuel Oil Standard
-     - 1.4%
+     - 1.3%
      - storage water heater
      - fuel oil
      - auto

diff --git a/project_national/housing_characteristics/Misc Pool Heater.tsv b/project_national/housing_characteristics/Misc Pool Heater.tsv
@@ -1,18 +1,21 @@
-Dependency=Heating Fuel	Dependency=Misc Pool	Option=Electricity	Option=Natural Gas	Option=None	Option=Other Fuel	source_count	source_weight	sampling_probability
-Electricity	Has Pool	0.158141	0.0703046	0.671207	0.100347	411	3.08643e+06	0.0290182
-Fuel Oil	Has Pool	0.0777736	0	0.749028	0.173199	105	431588	0.0040479
-Natural Gas	Has Pool	0.0552047	0.262356	0.634394	0.0480448	619	4.04905e+06	0.0316922
-None	Has Pool	0.183201	0.0990135	0.60331	0.114475	53	390468	0.000543151
-Other Fuel	Has Pool	0	0	0	1	1	6953.18	0.000551967
-Propane	Has Pool	0.0739288	0	0.739533	0.186538	66	409140	0.00376982
-Wood	Has Pool	0	0	0.941845	0.0581551	25	147130	0.00163127
-Electricity	None	0	0	1	0	5288	3.94876e+07	0.36502
-Fuel Oil	None	0	0	1	0	992	4.50335e+06	0.0445443
-Natural Gas	None	0	0	1	0	8976	5.86644e+07	0.436976
-None	None	0	0	1	0	698	5.39976e+06	0.010796
-Other Fuel	None	0	0	1	0	7	47557.2	0.00688887
-Propane	None	0	0	1	0	862	4.80248e+06	0.0465161
-Wood	None	0	0	1	0	393	2.10314e+06	0.0180041
+Dependency=Heating Fuel	Dependency=Misc Pool	Option=Electric Heat Pump	Option=Electricity	Option=Natural Gas	Option=None	Option=Other Fuel	source_count	source_weight	sampling_probability
+Electricity	Has Pool	0.0184454	0.139695	0.0703046	0.671207	0.100347	411	3.08643e+06	0.0290193
+Fuel Oil	Has Pool	0.0246983	0.0530754	0	0.749028	0.173199	105	431588	0.0040479
+Natural Gas	Has Pool	0.0175311	0.0376736	0.262356	0.634394	0.0480448	619	4.04905e+06	0.0316923
+None	Has Pool	0.0581784	0.125023	0.0990135	0.60331	0.114475	53	390468	0.000546069
+Other Fuel	Has Pool	0	0	0	0	1	1	6953.18	0.000552064
+Propane	Has Pool	0.0234773	0.0504515	0	0.739533	0.186538	66	409140	0.00376988
+Wood	Has Pool	0	0	0	0.941845	0.0581551	25	147130	0.00163129
+Electricity	None	0	0	0	1	0	5288	3.94876e+07	0.365019
+Fuel Oil	None	0	0	0	1	0	992	4.50335e+06	0.0445443
+Natural Gas	None	0	0	0	1	0	8976	5.86644e+07	0.436976
+None	None	0	0	0	1	0	698	5.39976e+06	0.010793
+Other Fuel	None	0	0	0	1	0	7	47557.2	0.00688877
+Propane	None	0	0	0	1	0	862	4.80248e+06	0.046516
+Wood	None	0	0	0	1	0	393	2.10314e+06	0.0180041
 # Created by: sources\recs\recs2020\tsv_maker.py
 # Description: The heating fuel of the pool heater if there is a pool.
-# Source: Constructed using U.S. EIA 2020 Residential Energy Consumption Survey (RECS) microdata.
+# Source: Constructed using U.S. EIA 2020 Residential Energy Consumption Survey (RECS) microdata.
+# Source: Constructed using the California Energy Commision 2019 Residential Appliance Saturation Study (RASS) microdata.
+# Assumption: Within electric pool heaters, proportion of heat pump electric pool heating vs. non-heat
+# Assumption: pump electric pool heating was derived from RASS