Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add plant_id_pudl to small generators field #1293

Merged
merged 7 commits into from
Oct 22, 2021
Merged

add plant_id_pudl to small generators field #1293

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
95ed055
add plant_id_pudl to small generators field
aesharpe Oct 15, 2021
57d8b46
add left merge indicator for all ferc tables when they add plant_id_p…
aesharpe Oct 15, 2021
0f0971c
Merge branch 'dev' into add-pudl-id-to-small-gens
zaneselvans Oct 16, 2021
2418db6
add right_on, left_on merge specifications for small gens output tabl…
aesharpe Oct 19, 2021
bcd4de8
Merge branch 'add-pudl-id-to-small-gens' of https://github.com/cataly…
aesharpe Oct 19, 2021
e50f222
Merge branch 'dev' into add-pudl-id-to-small-gens
aesharpe Oct 19, 2021
4c0cbc6
revert to plant_name_ferc1 because Zane updated names in more recent …
aesharpe Oct 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions src/pudl/output/ferc1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def plants_steam_ferc1(pudl_engine):
steam_df = (
pd.read_sql("plants_steam_ferc1", pudl_engine)
.merge(plants_utils_ferc1(pudl_engine),
on=['utility_id_ferc1', 'plant_name_ferc1'])
on=['utility_id_ferc1', 'plant_name_ferc1'], how='left')
.assign(
capacity_factor=lambda x:
x.net_generation_mwh / (8760 * x.capacity_mw),
Expand Down Expand Up @@ -148,12 +148,13 @@ def plants_small_ferc1(pudl_engine):
"""Pull a useful dataframe related to the FERC Form 1 small plants."""
plants_small_df = (
pd.read_sql_table("plants_small_ferc1", pudl_engine)
.merge(pd.read_sql_table("utilities_ferc1", pudl_engine),
on="utility_id_ferc1")
.merge(plants_utils_ferc1(pudl_engine),
on=["utility_id_ferc1", "plant_name_ferc1"], how='left')
.pipe(pudl.helpers.organize_cols, ['report_year',
'utility_id_ferc1',
'utility_id_pudl',
'utility_name_ferc1',
'plant_id_pudl',
'plant_name_ferc1',
"record_id"])
)
Expand All @@ -165,7 +166,7 @@ def plants_hydro_ferc1(pudl_engine):
plants_hydro_df = (
pd.read_sql_table("plants_hydro_ferc1", pudl_engine)
.merge(plants_utils_ferc1(pudl_engine),
on=["utility_id_ferc1", "plant_name_ferc1"])
on=["utility_id_ferc1", "plant_name_ferc1"], how='left')
.assign(capacity_factor=lambda x: (
x.net_generation_mwh / (8760 * x.capacity_mw)))
.pipe(pudl.helpers.organize_cols, ["report_year",
Expand All @@ -183,7 +184,7 @@ def plants_pumped_storage_ferc1(pudl_engine):
pumped_storage_df = (
pd.read_sql_table("plants_pumped_storage_ferc1", pudl_engine)
.merge(pudl.output.ferc1.plants_utils_ferc1(pudl_engine),
on=["utility_id_ferc1", "plant_name_ferc1"])
on=["utility_id_ferc1", "plant_name_ferc1"], how='left')
.assign(capacity_factor=lambda x:
x.net_generation_mwh / (8760 * x.capacity_mw))
.pipe(pudl.helpers.organize_cols, ["report_year",
Expand Down