Simplify integration of unsustainable solid biomass (#1275)

* remove extra bus and link; remove redundant addition of oil carrier_bus

* remove redundant addition of oil carrier buses

* changed PyPSA requirement in envs/environment.yaml
This commit is contained in:
cpschau 2024-09-11 17:20:00 +02:00 committed by GitHub
parent e6d4dd67dc
commit 65054ae903
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 22 deletions

View File

@ -11,7 +11,7 @@ dependencies:
- pip
- atlite>=0.2.9
- pypsa>=0.29
- pypsa>=0.30.2
- linopy
- dask

View File

@ -2812,7 +2812,6 @@ def add_biomass(n, costs):
)
if biomass_potentials.filter(like="unsustainable").sum().sum() > 0:
add_carrier_buses(n, "oil")
# Create timeseries to force usage of unsustainable potentials
e_max_pu = pd.DataFrame(1, index=n.snapshots, columns=spatial.gas.biogas)
e_max_pu.iloc[-1] = 0
@ -2830,14 +2829,6 @@ def add_biomass(n, costs):
e_max_pu=e_max_pu,
)
n.madd(
"Bus",
spatial.biomass.nodes_unsustainable,
location=spatial.biomass.locations,
carrier="unsustainable solid biomass",
unit="MWh_LHV",
)
e_max_pu = pd.DataFrame(
1, index=n.snapshots, columns=spatial.biomass.nodes_unsustainable
)
@ -2846,7 +2837,7 @@ def add_biomass(n, costs):
n.madd(
"Store",
spatial.biomass.nodes_unsustainable,
bus=spatial.biomass.nodes_unsustainable,
bus=spatial.biomass.nodes,
carrier="unsustainable solid biomass",
e_nom=unsustainable_solid_biomass_potentials_spatial,
marginal_cost=costs.at["fuelwood", "fuel"],
@ -2855,16 +2846,6 @@ def add_biomass(n, costs):
e_max_pu=e_max_pu,
)
n.madd(
"Link",
spatial.biomass.nodes_unsustainable,
bus0=spatial.biomass.nodes_unsustainable,
bus1=spatial.biomass.nodes,
carrier="unsustainable solid biomass",
efficiency=1,
p_nom=unsustainable_solid_biomass_potentials_spatial,
)
n.madd(
"Bus",
spatial.biomass.bioliquids,
@ -3024,7 +3005,7 @@ def add_biomass(n, costs):
n.madd(
"Generator",
spatial.biomass.nodes_unsustainable,
bus=spatial.biomass.nodes_unsustainable,
bus=spatial.biomass.nodes,
carrier="unsustainable solid biomass",
p_nom=10000,
marginal_cost=costs.at["fuelwood", "fuel"]