-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implemented scenario drivers for esidential model. V2.1
- Loading branch information
eggimasv
authored and
eggimasv
committed
Mar 14, 2017
1 parent
725faf4
commit 3f65206
Showing
12 changed files
with
538 additions
and
353 deletions.
There are no files selected for viewing
16 changes: 8 additions & 8 deletions
16
data/residential_model/data_residential_by_fuel_end_uses.csv
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
fuel_id,light,cold,wet,consumer_electronics,home_computing,cooking | ||
0,0,0,0,0,0,0 | ||
1,0,0,0,0,0,0 | ||
2,1002,1037,1306,1838,549,1138 | ||
3,0,0,0,0,0,0 | ||
4,0,0,0,0,0,0 | ||
5,0,0,0,0,0,0 | ||
6,0,0,0,0,0,0 | ||
fuel_id,light,cold,wet,consumer_electronics,home_computing,cooking,heating | ||
0,0,0,0,0,0,0,100 | ||
1,0,0,0,0,0,0,100 | ||
2,1002,1037,1306,1838,549,1138,0 | ||
3,0,0,0,0,0,0,100 | ||
4,0,0,0,0,0,0,100 | ||
5,0,0,0,0,0,0,0 | ||
6,0,0,0,0,0,0,0 |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
DAYTYP_ID,day_typ | ||
0,Weekd_day | ||
1,Weekend | ||
2,Coldest | ||
3,Warmest | ||
daytype_id,day_typ | ||
0,weekd_day | ||
1,weeknd | ||
2,coldest | ||
3,warmest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
""" new load profile generator """ | ||
import numpy as np | ||
import os | ||
import csv | ||
import main_functions as mf | ||
from datetime import date | ||
import unittest | ||
import matplotlib.pyplot as plt | ||
import data_loader_functions as df | ||
|
||
def generate_data(data, run_data_collection): | ||
""" This function loads all that which does not neet to be run every time""" | ||
base_year_load_data = 2015 | ||
|
||
if run_data_collection == False: | ||
# TODO | ||
# Read in dumped csv files | ||
return data | ||
|
||
# -------------- | ||
# HES data | ||
# -------------- | ||
# Generate generic load profiles (shapes) for all electricity appliances from HES data [ % ] | ||
hes_data, hes_y_peak, _ = df.read_hes_data(data) | ||
year_raw_values_hes = df.assign_hes_data_to_year(data, hes_data, base_year_load_data) | ||
|
||
# Load shape for all end_uses | ||
for i in data['data_residential_by_fuel_end_uses']: | ||
end_use = i # End use read from avaialble fuels... | ||
data = df.get_hes_end_uses_shape(data, hes_data, year_raw_values_hes, hes_y_peak, _, end_use) | ||
|
||
# Dump created end_use_dictionaries into txt files #TODO | ||
|
||
# ---------------------------- | ||
# Residential Gas demand () | ||
# Daily shapes taken from Robert Sansom | ||
# Yearly peak from CSWV | ||
# ---------------------------- | ||
end_use = 'heating' | ||
data = df.shape_residential_heating_gas(data, end_use) | ||
|
||
return data |
Oops, something went wrong.