bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'country-specific-dh-forward-temperatures' of https://github.com/PyPSA/pypsa-eur into country-specific-dh-forward-temperatures

Browse Source
This commit is contained in:
AmosSchledorn 2024-08-08 17:00:09 +02:00
commit b31767cb20
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/add_existing_baseyear.py
View File

@ -22,11 +22,10 @@ from _helpers import (
update_config_from_wildcards, update_config_from_wildcards,
) )
from add_electricity import sanitize_carriers from add_electricity import sanitize_carriers
from prepare_sector_network import cluster_heat_buses, define_spatial, prepare_costs
from definitions.heat_sector import HeatSector from definitions.heat_sector import HeatSector
from definitions.heat_system import HeatSystem from definitions.heat_system import HeatSystem
from definitions.heat_system_type import HeatSystemType from definitions.heat_system_type import HeatSystemType
from prepare_sector_network import cluster_heat_buses, define_spatial, prepare_costs
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
cc = coco.CountryConverter() cc = coco.CountryConverter()

7
scripts/prepare_sector_network.py
View File

@ -30,6 +30,9 @@ from build_energy_totals import (
build_eurostat_co2, build_eurostat_co2,
) )
from build_transport_demand import transport_degree_factor from build_transport_demand import transport_degree_factor
from definitions.heat_sector import HeatSector
from definitions.heat_system import HeatSystem
from definitions.heat_system_type import HeatSystemType
from networkx.algorithms import complement from networkx.algorithms import complement
from networkx.algorithms.connectivity.edge_augmentation import k_edge_augmentation from networkx.algorithms.connectivity.edge_augmentation import k_edge_augmentation
from prepare_network import maybe_adjust_costs_and_potentials from prepare_network import maybe_adjust_costs_and_potentials
@ -37,10 +40,6 @@ from pypsa.geo import haversine_pts
from pypsa.io import import_components_from_dataframe from pypsa.io import import_components_from_dataframe
from scipy.stats import beta from scipy.stats import beta
from definitions.heat_sector import HeatSector
from definitions.heat_system import HeatSystem
from definitions.heat_system_type import HeatSystemType
spatial = SimpleNamespace() spatial = SimpleNamespace()
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)