reinsert co2 price
This commit is contained in:
parent
5a3cfe4825
commit
9913522e09
@ -584,7 +584,7 @@ costs:
|
|||||||
battery: 0.
|
battery: 0.
|
||||||
battery inverter: 0.
|
battery inverter: 0.
|
||||||
emission_prices: # in currency per tonne emission, only used with the option Ep
|
emission_prices: # in currency per tonne emission, only used with the option Ep
|
||||||
co2: 0.
|
co2: 25
|
||||||
|
|
||||||
clustering:
|
clustering:
|
||||||
simplify_network:
|
simplify_network:
|
||||||
|
@ -38,7 +38,6 @@ from _helpers import (
|
|||||||
override_component_attrs,
|
override_component_attrs,
|
||||||
update_config_with_sector_opts,
|
update_config_with_sector_opts,
|
||||||
)
|
)
|
||||||
from vresutils.benchmark import memory_logger
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
pypsa.pf.logger.setLevel(logging.WARNING)
|
pypsa.pf.logger.setLevel(logging.WARNING)
|
||||||
@ -688,22 +687,20 @@ if __name__ == "__main__":
|
|||||||
np.random.seed(solve_opts.get("seed", 123))
|
np.random.seed(solve_opts.get("seed", 123))
|
||||||
|
|
||||||
fn = getattr(snakemake.log, "memory", None)
|
fn = getattr(snakemake.log, "memory", None)
|
||||||
with memory_logger(filename=fn, interval=30.0) as mem:
|
|
||||||
if "overrides" in snakemake.input.keys():
|
|
||||||
overrides = override_component_attrs(snakemake.input.overrides)
|
|
||||||
n = pypsa.Network(
|
|
||||||
snakemake.input.network, override_component_attrs=overrides
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
n = pypsa.Network(snakemake.input.network)
|
|
||||||
|
|
||||||
n = prepare_network(n, solve_opts, config=snakemake.config)
|
if "overrides" in snakemake.input.keys():
|
||||||
|
overrides = override_component_attrs(snakemake.input.overrides)
|
||||||
|
n = pypsa.Network(snakemake.input.network, override_component_attrs=overrides)
|
||||||
|
else:
|
||||||
|
n = pypsa.Network(snakemake.input.network)
|
||||||
|
|
||||||
n = solve_network(
|
n = prepare_network(n, solve_opts, config=snakemake.config)
|
||||||
n, config=snakemake.config, opts=opts, log_fn=snakemake.log.solver
|
|
||||||
)
|
|
||||||
|
|
||||||
n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
|
n = solve_network(
|
||||||
n.export_to_netcdf(snakemake.output[0])
|
n, config=snakemake.config, opts=opts, log_fn=snakemake.log.solver
|
||||||
|
)
|
||||||
|
|
||||||
|
n.meta = dict(snakemake.config, **dict(wildcards=dict(snakemake.wildcards)))
|
||||||
|
n.export_to_netcdf(snakemake.output[0])
|
||||||
|
|
||||||
logger.info("Maximum memory usage: {}".format(mem.mem_usage))
|
logger.info("Maximum memory usage: {}".format(mem.mem_usage))
|
||||||
|
Loading…
Reference in New Issue
Block a user