add functionality for post discretization of lines and transmission infrastructure links
This commit is contained in:
parent
3d24b20585
commit
26184e370b
@ -45,6 +45,7 @@ from _helpers import (
|
|||||||
)
|
)
|
||||||
from pypsa.descriptors import get_activity_mask
|
from pypsa.descriptors import get_activity_mask
|
||||||
from pypsa.descriptors import get_switchable_as_dense as get_as_dense
|
from pypsa.descriptors import get_switchable_as_dense as get_as_dense
|
||||||
|
from pypsa.optimization.abstract import optimize_transmission_expansion_iteratively
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
pypsa.pf.logger.setLevel(logging.WARNING)
|
pypsa.pf.logger.setLevel(logging.WARNING)
|
||||||
@ -919,11 +920,13 @@ def solve_network(n, config, solving, **kwargs):
|
|||||||
elif skip_iterations:
|
elif skip_iterations:
|
||||||
status, condition = n.optimize(**kwargs)
|
status, condition = n.optimize(**kwargs)
|
||||||
else:
|
else:
|
||||||
kwargs["track_iterations"] = (cf_solving.get("track_iterations", False),)
|
kwargs["track_iterations"] = cf_solving["track_iterations"]
|
||||||
kwargs["min_iterations"] = (cf_solving.get("min_iterations", 4),)
|
kwargs["min_iterations"] = cf_solving["min_iterations"]
|
||||||
kwargs["max_iterations"] = (cf_solving.get("max_iterations", 6),)
|
kwargs["max_iterations"] = cf_solving["max_iterations"]
|
||||||
status, condition = n.optimize.optimize_transmission_expansion_iteratively(
|
kwargs["lines_disc"] = config["post-discretization"]["lines"]
|
||||||
**kwargs
|
kwargs["links_disc"] = config["post-discretization"]["links"]
|
||||||
|
status, condition = optimize_transmission_expansion_iteratively(
|
||||||
|
n, **kwargs
|
||||||
)
|
)
|
||||||
|
|
||||||
if status != "ok" and not rolling_horizon:
|
if status != "ok" and not rolling_horizon:
|
||||||
|
Loading…
Reference in New Issue
Block a user