[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
This commit is contained in:
parent
3d4af04d88
commit
3c099095dc
@ -223,7 +223,7 @@ def attach_load(n, regions, load, nuts3_shapes, ua_md_gdp, countries, scaling=1.
|
|||||||
regions = gpd.read_file(regions).set_index("name").reindex(substation_lv_i)
|
regions = gpd.read_file(regions).set_index("name").reindex(substation_lv_i)
|
||||||
opsd_load = pd.read_csv(load, index_col=0, parse_dates=True).filter(items=countries)
|
opsd_load = pd.read_csv(load, index_col=0, parse_dates=True).filter(items=countries)
|
||||||
|
|
||||||
ua_md_gdp = pd.read_csv(ua_md_gdp, dtype={'name': 'str'}).set_index('name')
|
ua_md_gdp = pd.read_csv(ua_md_gdp, dtype={"name": "str"}).set_index("name")
|
||||||
|
|
||||||
logger.info(f"Load data scaled with scalling factor {scaling}.")
|
logger.info(f"Load data scaled with scalling factor {scaling}.")
|
||||||
opsd_load *= scaling
|
opsd_load *= scaling
|
||||||
@ -250,7 +250,7 @@ def attach_load(n, regions, load, nuts3_shapes, ua_md_gdp, countries, scaling=1.
|
|||||||
# relative factors 0.6 and 0.4 have been determined from a linear
|
# relative factors 0.6 and 0.4 have been determined from a linear
|
||||||
# regression on the country to continent load data
|
# regression on the country to continent load data
|
||||||
factors = normed(0.6 * normed(gdp_n) + 0.4 * normed(pop_n))
|
factors = normed(0.6 * normed(gdp_n) + 0.4 * normed(pop_n))
|
||||||
if cntry in ['UA', 'MD']:
|
if cntry in ["UA", "MD"]:
|
||||||
# overwrite factor because nuts3 provides no data for UA+MD
|
# overwrite factor because nuts3 provides no data for UA+MD
|
||||||
factors = normed(ua_md_gdp.loc[group.index, "GDP_PPP"].squeeze())
|
factors = normed(ua_md_gdp.loc[group.index, "GDP_PPP"].squeeze())
|
||||||
|
|
||||||
|
@ -73,7 +73,9 @@ cc = coco.CountryConverter()
|
|||||||
|
|
||||||
def get_eia_annual_hydro_generation(fn, countries):
|
def get_eia_annual_hydro_generation(fn, countries):
|
||||||
# in billion kWh/a = TWh/a
|
# in billion kWh/a = TWh/a
|
||||||
df = pd.read_csv(fn, skiprows=2, index_col=1, na_values=[" ", "--"], decimal=",").iloc[1:, 1:]
|
df = pd.read_csv(
|
||||||
|
fn, skiprows=2, index_col=1, na_values=[" ", "--"], decimal=","
|
||||||
|
).iloc[1:, 1:]
|
||||||
df.index = df.index.str.strip()
|
df.index = df.index.str.strip()
|
||||||
|
|
||||||
former_countries = {
|
former_countries = {
|
||||||
|
Loading…
Reference in New Issue
Block a user