Skip to content

Commit

Permalink
Rename vceregen to vcerare
Browse files Browse the repository at this point in the history
  • Loading branch information
aesharpe committed Oct 16, 2024
1 parent 93e4487 commit 7e3c926
Show file tree
Hide file tree
Showing 8 changed files with 28 additions and 25 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ def data_sources_metadata_to_rst(app):
"epacems",
"phmsagas",
"gridpathratoolkit",
"vceregen",
"vcerare",
]
package = PUDL_PACKAGE
extra_etl_groups = {"eia860": ["entity_eia"], "ferc1": ["glue"]}
Expand Down
2 changes: 1 addition & 1 deletion docs/data_sources/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The following data sources serve as the foundation for our data pipeline.
ferc714
phmsagas
gridpathratoolkit
vceregen
vcerare
other_data

.. toctree::
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{% extends "data_source_parent.rst.jinja" %}
{% block background %}
The data in this table were produced by Vibrant Clean Energy based on outputs from the
NOA HRRR model and are licensed to the public under the Creative Commons Attribution
4.0 International license (CC-BY-4.0).
The data in the Resource Adequacy Renewble Energy (RARE) Power Dataset was produced by
Vibrant Clean Energy based on outputs from the NOA HRRR model and are licensed
to the public under the Creative Commons Attribution 4.0 International license
(CC-BY-4.0).

See the Zenodo archive README for more detailed information.

Expand Down Expand Up @@ -44,10 +45,12 @@ the cities but kept the lakes in the data. Note that lakes bordering multiple st
will appear more than once in the data. VCE used a nearest neighbor technique to assign
the state waters to the counties (this pertains to coastal areas as well).

Abnormally large capacity factors
---------------------------------
There are also a couple of capacity factor values for the solar pv data that exceed
the maximum value of 1 for capacity factor. This is due to cooler panel temperatures.
Capacity factors > 1
--------------------
There are a couple of capacity factor values for the solar pv data that exceed
the maximum value of 1 for capacity factor. This is due to power production performance
being correlated with panel temperatures. During cold sunny periods, some solar capacity
factor values are greater than 1 (but less that 1.1).

8760-hour years
---------------
Expand Down
2 changes: 1 addition & 1 deletion src/pudl/etl/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"core_ferc714": [pudl.transform.ferc714],
"core_gridpathratoolkit": [pudl.transform.gridpathratoolkit],
"core_nrelatb": [pudl.transform.nrelatb],
"core_vceregen": [pudl.transform.vceregen],
"core_vcerare": [pudl.transform.vcerare],
}

out_module_groups = {
Expand Down
4 changes: 2 additions & 2 deletions src/pudl/metadata/classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -1284,7 +1284,7 @@ class Resource(PudlMeta):
"ppe",
"pudl",
"nrelatb",
"vceregen",
"vcerare",
]
| None
) = None
Expand Down Expand Up @@ -1312,7 +1312,7 @@ class Resource(PudlMeta):
"static_pudl",
"service_territories",
"nrelatb",
"vceregen",
"vcerare",
]
| None
) = None
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from typing import Any

RESOURCE_METADATA: dict[str, dict[str, Any]] = {
"out_vceregen__hourly_available_capacity_factor": {
"out_vcerare__hourly_available_capacity_factor": {
"description": (
"The data in this table were produced by Vibrant Clean Energy, and are "
"licensed to the public under the Creative Commons Attribution 4.0 International "
Expand Down Expand Up @@ -54,9 +54,9 @@
],
"primary_key": ["datetime_utc", "state", "county_or_lake_name"],
},
"sources": ["vceregen"],
"field_namespace": "vceregen",
"etl_group": "vceregen",
"sources": ["vcerare"],
"field_namespace": "vcerare",
"etl_group": "vcerare",
"create_database_schema": False,
},
}
2 changes: 1 addition & 1 deletion src/pudl/transform/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@
gridpathratoolkit,
nrelatb,
params,
vceregen,
vcerare,
)
16 changes: 8 additions & 8 deletions src/pudl/transform/vceregen.py → src/pudl/transform/vcerare.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,11 @@ def _combine_city_county_records(df: pd.DataFrame) -> pd.DataFrame:
compute_kind="pandas",
op_tags={"memory-use": "high"},
)
def out_vceregen__hourly_available_capacity_factor(
def out_vcerare__hourly_available_capacity_factor(
raw_vcegen__lat_lon_fips: pd.DataFrame,
raw_vceregen__fixed_solar_pv_lat_upv: pd.DataFrame,
raw_vceregen__offshore_wind_power_140m: pd.DataFrame,
raw_vceregen__onshore_wind_power_100m: pd.DataFrame,
raw_vcerare__fixed_solar_pv_lat_upv: pd.DataFrame,
raw_vcerare__offshore_wind_power_140m: pd.DataFrame,
raw_vcerare__onshore_wind_power_100m: pd.DataFrame,
) -> pd.DataFrame:
"""Transform raw Vibrant Clean Energy renewable generation profiles.
Expand All @@ -253,9 +253,9 @@ def out_vceregen__hourly_available_capacity_factor(
# than doing it to a concatinated table but less memory intensive because
# it doesn't need to process the ginormous table all at once.
raw_dict = {
"solar_pv": raw_vceregen__fixed_solar_pv_lat_upv,
"offshore_wind": raw_vceregen__offshore_wind_power_140m,
"onshore_wind": raw_vceregen__onshore_wind_power_100m,
"solar_pv": raw_vcerare__fixed_solar_pv_lat_upv,
"offshore_wind": raw_vcerare__offshore_wind_power_140m,
"onshore_wind": raw_vcerare__onshore_wind_power_100m,
}
clean_dict = {
df_name: _check_for_valid_counties(df, fips_df, df_name)
Expand All @@ -273,7 +273,7 @@ def out_vceregen__hourly_available_capacity_factor(


@asset_check(
asset=out_vceregen__hourly_available_capacity_factor,
asset=out_vcerare__hourly_available_capacity_factor,
blocking=True,
description="Check that output table is as expected.",
)
Expand Down

0 comments on commit 7e3c926

Please sign in to comment.