pre-commit formatting
This commit is contained in:
parent
7c058f1ed3
commit
252f6d2c15
@ -50,7 +50,7 @@ repos:
|
||||
- id: blackdoc
|
||||
|
||||
# Formatting with "black" coding style
|
||||
- repo: https://github.com/psf/black
|
||||
- repo: https://github.com/psf/black-pre-commit-mirror
|
||||
rev: 23.12.1
|
||||
hooks:
|
||||
# Format Python files
|
||||
|
@ -47,7 +47,7 @@ def build_gem_prod_data(fn):
|
||||
|
||||
remove_country = ["Cyprus", "Türkiye"]
|
||||
remove_fuel_type = ["oil"]
|
||||
|
||||
|
||||
df = df.query(
|
||||
"Status != 'shut in' \
|
||||
& 'Fuel type' != 'oil' \
|
||||
@ -58,18 +58,25 @@ def build_gem_prod_data(fn):
|
||||
|
||||
p = pd.read_excel(fn[0], sheet_name="Gas extraction - production")
|
||||
p = p.set_index("GEM Unit ID")
|
||||
p = p[p["Fuel description"] == 'gas' ]
|
||||
p = p[p["Fuel description"] == "gas"]
|
||||
|
||||
capacities = pd.DataFrame(index=df.index)
|
||||
for key in ["production", "production design capacity", "reserves"]:
|
||||
cap = p.loc[p["Production/reserves"] == key, "Quantity (converted)"].groupby("GEM Unit ID").sum().reindex(df.index)
|
||||
cap = (
|
||||
p.loc[p["Production/reserves"] == key, "Quantity (converted)"]
|
||||
.groupby("GEM Unit ID")
|
||||
.sum()
|
||||
.reindex(df.index)
|
||||
)
|
||||
# assume capacity such that 3% of reserves can be extracted per year (25% quantile)
|
||||
annualization_factor = 0.03 if key == "reserves" else 1.
|
||||
annualization_factor = 0.03 if key == "reserves" else 1.0
|
||||
capacities[key] = cap * annualization_factor
|
||||
|
||||
df["mcm_per_year"] = capacities["production"] \
|
||||
.combine_first(capacities["production design capacity"]) \
|
||||
df["mcm_per_year"] = (
|
||||
capacities["production"]
|
||||
.combine_first(capacities["production design capacity"])
|
||||
.combine_first(capacities["reserves"])
|
||||
)
|
||||
|
||||
geometry = gpd.points_from_xy(df["Longitude"], df["Latitude"])
|
||||
return gpd.GeoDataFrame(df, geometry=geometry, crs="EPSG:4326")
|
||||
@ -88,7 +95,7 @@ def build_gas_input_locations(gem_fn, entry_fn, sto_fn, countries):
|
||||
| (entry.from_country == "NO") # malformed datapoint # entries from NO to GB
|
||||
]
|
||||
|
||||
sto = read_scigrid_gas(sto_fn)
|
||||
sto = read_scigrid_gas(sto_fn)
|
||||
remove_country = ["RU", "UA", "TR", "BY"]
|
||||
sto = sto.query("country_code != @remove_country")
|
||||
|
||||
|
@ -1214,8 +1214,16 @@ def add_storage_and_grids(n, costs):
|
||||
|
||||
# add existing gas storage capacity
|
||||
gas_i = n.stores.carrier == "gas"
|
||||
e_nom = gas_input_nodes["storage"].rename(lambda x: x + " gas Store").reindex(n.stores.index).fillna(0.) * 1e3 # MWh_LHV
|
||||
e_nom.clip(upper=e_nom.quantile(0.98), inplace=True) # limit extremely large storage
|
||||
e_nom = (
|
||||
gas_input_nodes["storage"]
|
||||
.rename(lambda x: x + " gas Store")
|
||||
.reindex(n.stores.index)
|
||||
.fillna(0.0)
|
||||
* 1e3
|
||||
) # MWh_LHV
|
||||
e_nom.clip(
|
||||
upper=e_nom.quantile(0.98), inplace=True
|
||||
) # limit extremely large storage
|
||||
n.stores.loc[gas_i, "e_nom_min"] = e_nom
|
||||
|
||||
# add candidates for new gas pipelines to achieve full connectivity
|
||||
|
Loading…
Reference in New Issue
Block a user