AK integration

.gitignore

@@ -16,3 +16,4 @@
 **/.ipynb_checkpoints/*
 **/data/*
 !/resources/data/dictionary/outputs.csv
+.history

project_national/housing_characteristics/ASHRAE IECC Climate Zone 2004.tsv

@@ -1,7 +1,3 @@
 Option=1A	Option=2A	Option=2B	Option=3A	Option=3B	Option=3C	Option=4A	Option=4B	Option=4C	Option=5A	Option=5B	Option=6A	Option=6B	Option=7A	Option=7AK	Option=7B	Option=8AK	source_count	source_weight	sampling_probability
-0.0179403	0.115935	0.0197434	0.13305	0.0929124	0.0234445	0.215302	0.0077307	0.0288003	0.225367	0.037893	0.0613171	0.0092306	0.00789633	0.00178684	0.00113165	0.000519458	1.10783e+07	1.34055e+08	1
-# Created by: sources\spatial\tsv_maker.py
-# Description: Climate zone according to ASHRAE 169 in 2004 and IECC in 2012 that the sample is located.
-# Source: Spatial definitions are from the U.S. Census Bureau as of July 1, 2015.
-# Source: Unit counts are from the American Community Survey 5-yr 2016.
-# Source: Climate zone data are from ASHRAE 169 2006, IECC 2012, and M.C. Baechler 2015.
+0	0	0	0	0	0	0	0	0	0	0	0	0	0	0.774765447	0	0.225234553	11078300	134055000	1
+# Source: Created manually.

project_national/housing_characteristics/HVAC Secondary Heating Efficiency.tsv

@@ -1,5 +1,5 @@
-Option=None	sampling_probability
-1	1
+Option=None	Option=30% Efficiency	Option=60% Efficiency	Option=100% Efficiency	sampling_probability
+0	0.3	0.3	0.4	1
 # Created by: manually created
 # Description: Efficiency of the secondary heating system (not used in project_national).
 # Source: n/a

project_national/housing_characteristics/HVAC Secondary Heating Fraction.tsv

@@ -0,0 +1,3 @@
+Option=None	Option=10% Served	Option=20% Served	Option=30% Served	Option=40% Served	Option=50% Served	sampling_probability
+0	0.2	0.2	0.2	0.2	0.2	1
+# Source: n/a						

project_national/housing_characteristics/HVAC Secondary Heating Fuel.tsv

@@ -0,0 +1,3 @@
+Option=None	Option=Natural Gas	Option=Electricity	Option=Wood	Option=Fuel Oil	Option=Propane	Option=Coal	Option=Other	sampling_probability
+0	0.2	0.2	0.2	0.2	0.1	0.1	0	1
+# Source: n/a

project_national/housing_characteristics/HVAC Secondary Heating Type.tsv

@@ -0,0 +1,10 @@
+Dependency=HVAC Secondary Heating Fuel	Option=None	Option=WallFurnace	Option=FloorFurnace	Option=Boiler	Option=ElectricResistance	Option=Stove	Option=PortableHeater	Option=Fireplace	sampling_probability
+None	1	0	0	0	0	0	0	0	0
+Natural Gas	0	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.2
+Electricity	0	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.2
+Wood	0	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.2
+Fuel Oil	0	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.2
+Propane	0	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.2
+Coal	0	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.2
+Other	0	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.142857143	0.2
+# Source: Manually created.									

project_national/national_baseline.yml

@@ -10,7 +10,7 @@ weather_files_url: https://data.nrel.gov/system/files/156/BuildStock_TMY3_FIPS.z
 sampler:
   type: residential_quota
   args:
-    n_datapoints: 250
+    n_datapoints: 10
 
 workflow_generator:
   type: residential_hpxml
@@ -32,7 +32,7 @@ workflow_generator:
       - scenario_name: Bills
 
     simulation_output_report:
-      timeseries_frequency: hourly
+      timeseries_frequency: 15min
       include_timeseries_total_consumptions: true
       include_timeseries_fuel_consumptions: true
       include_timeseries_end_use_consumptions: true