Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Empty file modified .git-blame-ignore-revs
100644 → 100755
Empty file.
Empty file modified .gitattributes
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE/bug_report.md
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE/config.yml
100644 → 100755
Empty file.
Empty file modified .github/ISSUE_TEMPLATE/feature_request.md
100644 → 100755
Empty file.
Empty file modified .github/dependabot.yml
100644 → 100755
Empty file.
Empty file modified .github/pull_request_template.md
100644 → 100755
Empty file.
Empty file modified .github/workflows/codeql.yml
100644 → 100755
Empty file.
Empty file modified .github/workflows/update-fixed-env.yaml
100644 → 100755
Empty file.
Empty file modified .gitignore
100644 → 100755
Empty file.
Empty file modified .pre-commit-config.yaml
100644 → 100755
Empty file.
Empty file modified .readthedocs.yml
100644 → 100755
Empty file.
Empty file modified .reuse/dep5
100644 → 100755
Empty file.
Empty file modified .sync-send
100644 → 100755
Empty file.
Empty file modified CITATION.cff
100644 → 100755
Empty file.
Empty file modified LICENSES/CC-BY-4.0.txt
100644 → 100755
Empty file.
Empty file modified LICENSES/CC0-1.0.txt
100644 → 100755
Empty file.
Empty file modified LICENSES/MIT.txt
100644 → 100755
Empty file.
Empty file modified README.md
100644 → 100755
Empty file.
Empty file modified Snakefile
100644 → 100755
Empty file.
Empty file modified borg-it
100644 → 100755
Empty file.
Empty file modified config/config.default.yaml
100644 → 100755
Empty file.
Empty file modified config/create_scenarios.py
100644 → 100755
Empty file.
Empty file modified config/examples/config.entsoe-all.yaml
100644 → 100755
Empty file.
Empty file modified config/examples/config.perfect.yaml
100644 → 100755
Empty file.
Empty file modified config/examples/config.validation.yaml
100644 → 100755
Empty file.
Empty file modified config/scenarios.template.yaml
100644 → 100755
Empty file.
Empty file modified config/test/config.electricity.yaml
100644 → 100755
Empty file.
Empty file modified config/test/config.myopic.yaml
100644 → 100755
Empty file.
Empty file modified config/test/config.overnight.yaml
100644 → 100755
Empty file.
Empty file modified config/test/config.perfect.yaml
100644 → 100755
Empty file.
Empty file modified config/test/config.scenarios.yaml
100644 → 100755
Empty file.
Empty file modified config/test/config.validator.yaml
100644 → 100755
Empty file.
Empty file modified config/test/scenarios.yaml
100644 → 100755
Empty file.
Empty file modified data/agg_p_nom_minmax.csv
100644 → 100755
Empty file.
Empty file modified data/ammonia_plants.csv
100644 → 100755
Empty file.
Empty file modified data/attributed_ports.json
100644 → 100755
Empty file.
Empty file modified data/biomass_transport_costs_supplychain1.csv
100644 → 100755
Empty file.
Empty file modified data/biomass_transport_costs_supplychain2.csv
100644 → 100755
Empty file.
Empty file modified data/cement-plants-noneu.csv
100644 → 100755
Empty file.
Empty file modified data/ch_cantons.csv
100644 → 100755
Empty file.
Empty file modified data/ch_industrial_production_per_subsector.csv
100644 → 100755
Empty file.
Empty file modified data/custom_extra_functionality.py
100644 → 100755
Empty file.
Empty file modified data/custom_powerplants.csv
100644 → 100755
Empty file.
Empty file modified data/district_heat_share.csv
100644 → 100755
Empty file.
Empty file modified data/egs_costs.json
100644 → 100755
Empty file.
Empty file modified data/eia_hydro_annual_capacity.csv
100644 → 100755
Empty file.
Empty file modified data/eia_hydro_annual_generation.csv
100644 → 100755
Empty file.
Empty file modified data/entsoegridkit/README.md
100644 → 100755
Empty file.
Empty file modified data/entsoegridkit/buses.csv
100644 → 100755
Empty file.
Empty file modified data/entsoegridkit/converters.csv
100644 → 100755
Empty file.
Empty file modified data/entsoegridkit/generators.csv
100644 → 100755
Empty file.
Empty file modified data/entsoegridkit/lines.csv
100644 → 100755
Empty file.
Empty file modified data/entsoegridkit/links.csv
100644 → 100755
Empty file.
Empty file modified data/entsoegridkit/transformers.csv
100644 → 100755
Empty file.
Empty file modified data/era5-annual-HDD-per-country.csv
100644 → 100755
Empty file.
Empty file modified data/era5-annual-runoff-per-country.csv
100644 → 100755
Empty file.
Empty file modified data/existing_infrastructure/existing_heating_raw.csv
100644 → 100755
Empty file.
Empty file modified data/gr-e-11.03.02.01.01-cc.csv
100644 → 100755
Empty file.
Empty file modified data/heat_load_profile_BDEW.csv
100644 → 100755
Empty file.
Empty file modified data/hydro_capacities.csv
100644 → 100755
Empty file.
Empty file modified data/links_p_nom.csv
100644 → 100755
Empty file.
Empty file modified data/nuclear_p_max_pu.csv
100644 → 100755
Empty file.
Empty file modified data/parameter_corrections.yaml
100644 → 100755
Empty file.
Empty file modified data/refineries-noneu.csv
100644 → 100755
Empty file.
Empty file modified data/retro/comparative_level_investment.csv
100644 → 100755
Empty file.
Empty file modified data/retro/data_building_stock.csv
100644 → 100755
Empty file.
Empty file modified data/retro/electricity_taxes_eu.csv
100644 → 100755
Empty file.
Empty file modified data/retro/floor_area_missing.csv
100644 → 100755
Empty file.
Empty file modified data/retro/retro_cost_germany.csv
100644 → 100755
Empty file.
Empty file modified data/retro/u_values_poland.csv
100644 → 100755
Empty file.
Empty file modified data/retro/window_assumptions.csv
100644 → 100755
Empty file.
Empty file modified data/switzerland-new_format-all_years.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/nep/new_lines.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/nep/new_links.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/template/new_lines.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/template/new_links.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/template/upgraded_lines.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/template/upgraded_links.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/tyndp2020/new_lines.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/tyndp2020/new_links.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/tyndp2020/upgraded_lines.csv
100644 → 100755
Empty file.
Empty file modified data/transmission_projects/tyndp2020/upgraded_links.csv
100644 → 100755
Empty file.
Empty file modified data/unit_commitment.csv
100644 → 100755
Empty file.
Empty file modified doc/Makefile
100644 → 100755
Empty file.
Empty file modified doc/conf.py
100644 → 100755
Empty file.
Empty file modified doc/configtables/adjustments.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/atlite.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/biomass.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/clustering.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/co2_budget.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/conventional.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/costs.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/countries.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/electricity.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/enable.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/energy.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/existing_capacities.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/foresight.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/hydro.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/industry.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/lines.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/links.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/load.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/offwind-ac.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/offwind-dc.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/onwind.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/opts.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/plotting.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/run.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/scenario.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/sector-opts.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/sector.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/snapshots.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/solar-thermal.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/solar.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/solving.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/toplevel.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/transformers.csv
100644 → 100755
Empty file.
Empty file modified doc/configtables/transmission_projects.csv
100644 → 100755
Empty file.
Empty file modified doc/configuration.rst
100644 → 100755
Empty file.
Empty file modified doc/contributing.rst
100644 → 100755
Empty file.
Empty file modified doc/costs.rst
100644 → 100755
Empty file.
Empty file modified doc/data_sources.rst
100644 → 100755
Empty file.
Empty file modified doc/foresight.rst
100644 → 100755
Empty file.
Empty file modified doc/img/Heat_and_el_demand_timeseries.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/base.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/corine.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/countries.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/country_shapes.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/demand-map-heat.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/distance_hist.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/eez.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/elec.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/elec_s.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/elec_s_128.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/elec_s_256.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/elec_s_37.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/elec_s_512.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/elec_s_X.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/eligibility.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/era5.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/europe_shape.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/fec_industry_today_tomorrow.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/gas_pipeline_figure.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/gebco_2019_grid_image.jpg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/hotmaps.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/hydrocapacities.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/hydrogeneration.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/inflow-box.png
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified doc/img/inflow-ts.png
100644 → 100755
Empty file modified doc/img/intro-workflow.png
100644 → 100755
Empty file modified doc/img/load-box.png
100644 → 100755
Empty file modified doc/img/load-ts.png
100644 → 100755
Empty file modified doc/img/multisector_figure.pdf
100644 → 100755
Empty file.
Empty file modified doc/img/multisector_figure.png
100644 → 100755
Empty file modified doc/img/multisector_figure.svg
100644 → 100755
Empty file modified doc/img/natura.png
100644 → 100755
Empty file modified doc/img/nuts3.png
100644 → 100755
Empty file modified doc/img/nuts3_shapes.png
100644 → 100755
Empty file modified doc/img/offshore_shapes.png
100644 → 100755
Empty file modified doc/img/offwindac-gridcell.png
100644 → 100755
Empty file modified doc/img/offwinddc-gridcell.png
100644 → 100755
Empty file modified doc/img/onwind-gridcell.png
100644 → 100755
Empty file modified doc/img/p_nom_max_hist.png
100644 → 100755
Empty file modified doc/img/potential_heatmap.png
100644 → 100755
Empty file modified doc/img/powerplantmatching.png
100644 → 100755
Empty file modified doc/img/process-emissions.png
100644 → 100755
Empty file modified doc/img/profile_ts.png
100644 → 100755
Empty file modified doc/img/pypsa-eur-grid.png
100644 → 100755
Empty file modified doc/img/regions_offshore.png
100644 → 100755
Empty file modified doc/img/regions_offshore_elec_s.png
100644 → 100755
Empty file modified doc/img/regions_offshore_elec_s_X.png
100644 → 100755
Empty file modified doc/img/regions_onshore.png
100644 → 100755
Empty file modified doc/img/regions_onshore_elec_s.png
100644 → 100755
Empty file modified doc/img/regions_onshore_elec_s_X.png
100644 → 100755
Empty file modified doc/img/results.png
100644 → 100755
Empty file modified doc/img/sarah.png
100644 → 100755
Empty file modified doc/img/scenarios.png
100644 → 100755
Empty file modified doc/img/solar-gridcell.png
100644 → 100755
Empty file modified doc/img/synchronisation.png
100644 → 100755
Empty file modified doc/img/tech-colors.png
100644 → 100755
Empty file modified doc/img/underwater_hist.png
100644 → 100755
Empty file modified doc/img/validation_production_bar_elec_s_37_ec_lv1.0_Ept.png
100644 → 100755
Empty file modified doc/img/workflow.png
100644 → 100755
Empty file modified doc/index.rst
100644 → 100755
Empty file.
Empty file modified doc/installation.rst
100644 → 100755
Empty file.
Empty file modified doc/introduction.rst
100644 → 100755
Empty file.
Empty file modified doc/licenses.rst
100644 → 100755
Empty file.
Empty file modified doc/limitations.rst
100644 → 100755
Empty file.
Empty file modified doc/make.bat
100644 → 100755
Empty file.
Empty file modified doc/plotting.rst
100644 → 100755
Empty file.
Empty file modified doc/preparation.rst
100644 → 100755
Empty file.
Empty file modified doc/publications.bib
100644 → 100755
Empty file.
Empty file modified doc/publications.rst
100644 → 100755
Empty file.
Empty file modified doc/release_notes.rst
100644 → 100755
Empty file.
Empty file modified doc/requirements.txt
100644 → 100755
Empty file.
Empty file modified doc/retrieve.rst
100644 → 100755
Empty file.
Empty file modified doc/sector.rst
100644 → 100755
Empty file.
Empty file modified doc/simplification.rst
100644 → 100755
Empty file.
Empty file modified doc/solving.rst
100644 → 100755
Empty file.
Empty file modified doc/spatial_resolution.rst
100644 → 100755
Empty file.
Empty file modified doc/supply_demand.rst
100644 → 100755
Empty file.
Empty file modified doc/support.rst
100644 → 100755
Empty file.
Empty file modified doc/tutorial.rst
100644 → 100755
Empty file.
Empty file modified doc/tutorial_sector.rst
100644 → 100755
Empty file.
Empty file modified doc/validation.rst
100644 → 100755
Empty file.
Empty file modified doc/wildcards.rst
100644 → 100755
Empty file.
Empty file modified envs/environment.fixed.yaml
100644 → 100755
Empty file.
Empty file modified envs/environment.yaml
100644 → 100755
Empty file.
Empty file modified envs/retrieve.yaml
100644 → 100755
Empty file.
Empty file modified matplotlibrc
100644 → 100755
Empty file.
Empty file modified rules/collect.smk
100644 → 100755
Empty file.
Empty file modified rules/common.smk
100644 → 100755
Empty file.
Empty file modified rules/development.smk
100644 → 100755
Empty file.
Empty file modified rules/postprocess.smk
100644 → 100755
Empty file.
Empty file modified rules/solve_electricity.smk
100644 → 100755
Empty file.
Empty file modified rules/solve_myopic.smk
100644 → 100755
Empty file.
Empty file modified rules/solve_overnight.smk
100644 → 100755
Empty file.
Empty file modified rules/solve_perfect.smk
100644 → 100755
Empty file.
Empty file modified rules/validate.smk
100644 → 100755
Empty file.
Empty file modified scripts/__init__.py
100644 → 100755
Empty file.
Empty file modified scripts/_benchmark.py
100644 → 100755
Empty file.
Empty file modified scripts/_helpers.py
100644 → 100755
Empty file.
Empty file modified scripts/add_brownfield.py
100644 → 100755
Empty file.
54 changes: 37 additions & 17 deletions scripts/add_existing_baseyear.py
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,9 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
ppl = pd.read_csv(snakemake.input.powerplants, index_col=0)

if snakemake.input.get("custom_powerplants"):
if snakemake.input.custom_powerplants.endswith("german_chp_{clusters}.csv"):
if snakemake.input.custom_powerplants.endswith(
f"german_chp_base_s_{snakemake.wildcards.clusters}_l{snakemake.wildcards.ll}_{snakemake.wildcards.opts}_{snakemake.wildcards.sector_opts}_{snakemake.wildcards.planning_horizons}.csv"
):
logger.info("Supersedeing default German CHPs with custom_powerplants.")
ppl = ppl.query("~(Set == 'CHP' and Country == 'DE')")
ppl = add_custom_powerplants(ppl, snakemake.input.custom_powerplants, True)
Expand All @@ -462,6 +464,14 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
# phase out date at the end of the year)
chp.Fueltype = chp.Fueltype.map(rename_fuel)

# assign clustered bus
# chp["bus"] = chp["bus"].astype(int)
# chp["cluster_bus"] = chp.bus.map(clustermaps)
# if snakemake.params.add_district_heating_subnodes:
# chp.loc[chp.subnode.notna(), "cluster_bus"] = chp.loc[
# chp.subnode.notna(), "subnode"
# ]

chp["grouping_year"] = np.take(
grouping_years, np.digitize(chp.DateIn, grouping_years, right=True)
)
Expand Down Expand Up @@ -561,7 +571,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
p_nom.index,
suffix=f" urban central {generator} CHP-{grouping_year}",
bus0=bus0,
bus1=p_nom.index,
bus1=p_nom.index.str.split().str[:2].str.join(" "),
bus2=p_nom.index + " urban central heat",
bus3="co2 atmosphere",
carrier=f"urban central {generator} CHP",
Expand All @@ -570,8 +580,8 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
overnight_cost=costs.at[key, "investment"]
* costs.at[key, "efficiency"],
marginal_cost=costs.at[key, "VOM"],
efficiency=efficiency_power.dropna(),
efficiency2=efficiency_heat.dropna(),
efficiency=efficiency_power[p_nom.index],
efficiency2=efficiency_heat[p_nom.index],
efficiency3=costs.at[generator, "CO2 intensity"],
build_year=grouping_year,
lifetime=costs.at[key, "lifetime"],
Expand All @@ -582,17 +592,19 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
"Link",
p_nom.index,
suffix=f" urban {key}-{grouping_year}",
bus0=spatial.biomass.df.loc[p_nom.index]["nodes"],
bus1=p_nom.index,
bus0=spatial.biomass.df.loc[
p_nom.index.str.split().str[:2].str.join(" ")
]["nodes"].values,
bus1=p_nom.index.str.split().str[:2].str.join(" "),
bus2=p_nom.index + " urban central heat",
carrier=generator,
p_nom=p_nom,
capital_cost=costs.at[key, "fixed"] * costs.at[key, "efficiency"],
overnight_cost=costs.at[key, "investment"]
* costs.at[key, "efficiency"],
marginal_cost=costs.at[key, "VOM"],
efficiency=efficiency_power,
efficiency2=efficiency_heat,
efficiency=efficiency_power[p_nom.index],
efficiency2=efficiency_heat[p_nom.index],
build_year=grouping_year,
lifetime=costs.at[key, "lifetime"],
)
Expand Down Expand Up @@ -621,7 +633,7 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
p_nom.index,
suffix=f" urban central {generator} CHP-{grouping_year}",
bus0=bus0,
bus1=p_nom.index,
bus1=p_nom.index.str.split().str[:2].str.join(" "),
bus2=p_nom.index + " urban central heat",
bus3="co2 atmosphere",
carrier=f"urban central {generator} CHP",
Expand All @@ -642,8 +654,10 @@ def add_chp_plants(n, grouping_years, costs, baseyear):
"Link",
p_nom.index,
suffix=f" urban {key}-{grouping_year}",
bus0=spatial.biomass.df.loc[p_nom.index]["nodes"],
bus1=p_nom.index,
bus0=spatial.biomass.df.loc[
p_nom.index.str.split().str[:2].str.join(" ")
]["nodes"].values,
bus1=p_nom.index.str.split().str[:2].str.join(" "),
bus2=p_nom.index + " urban central heat",
carrier=generator,
p_nom=p_nom / costs.at[key, "efficiency"],
Expand Down Expand Up @@ -784,8 +798,10 @@ def add_heating_capacities_installed_before_baseyear(
"electricity_distribution_grid"
]:
nodes_elec = nodes + " low voltage"
nodes_biomass = nodes
else:
nodes_elec = nodes
nodes_elec = nodes.str.split().str[:2].str.join(" ")
nodes_biomass = nodes_elec

too_large_grouping_years = [
gy for gy in grouping_years if gy >= int(baseyear)
Expand Down Expand Up @@ -826,7 +842,10 @@ def add_heating_capacities_installed_before_baseyear(
name=nodes,
)
.to_pandas()
.reindex(index=n.snapshots)
.T.reset_index()
.drop_duplicates()
.set_index("name")
.T.reindex(index=n.snapshots)
if time_dep_hp_cop
else costs.at[costs_name, "efficiency"]
)
Expand Down Expand Up @@ -944,7 +963,7 @@ def add_heating_capacities_installed_before_baseyear(
"Link",
nodes,
suffix=f" {heat_system} biomass boiler-{grouping_year}",
bus0=spatial.biomass.df.loc[nodes, "nodes"].values,
bus0=spatial.biomass.df.loc[nodes_biomass, "nodes"].values,
bus1=nodes + " " + heat_system.value + " heat",
carrier=heat_system.value + " biomass boiler",
efficiency=costs.at["biomass boiler", "efficiency"],
Expand Down Expand Up @@ -1006,9 +1025,10 @@ def set_defaults(n):

snakemake = mock_snakemake(
"add_existing_baseyear",
configfiles="config/test/config.myopic.yaml",
clusters="5",
ll="v1.5",
# configfiles="config/test/config.myopic.yaml",
# clusters="5",
clusters="27",
ll="vopt",
opts="",
sector_opts="none",
planning_horizons="2020",
Expand Down
Empty file modified scripts/base_network.py
100644 → 100755
Empty file.
Empty file modified scripts/build_ammonia_production.py
100644 → 100755
Empty file.
Empty file modified scripts/build_biomass_transport_costs.py
100644 → 100755
Empty file.
Empty file.
Empty file modified scripts/build_central_heating_temperature_profiles/run.py
100644 → 100755
Empty file.
Empty file modified scripts/build_clustered_population_layouts.py
100644 → 100755
Empty file.
Empty file modified scripts/build_cop_profiles/BaseCopApproximator.py
100644 → 100755
Empty file.
Empty file modified scripts/build_cop_profiles/CentralHeatingCopApproximator.py
100644 → 100755
Empty file.
Empty file modified scripts/build_cop_profiles/DecentralHeatingCopApproximator.py
100644 → 100755
Empty file.
Empty file modified scripts/build_cop_profiles/run.py
100644 → 100755
Empty file.
Empty file modified scripts/build_cross_border_flows.py
100644 → 100755
Empty file.
Empty file modified scripts/build_cutout.py
100644 → 100755
Empty file.
Empty file modified scripts/build_daily_heat_demand.py
100644 → 100755
Empty file.
Empty file modified scripts/build_district_heat_share.py
100644 → 100755
Empty file.
Empty file modified scripts/build_egs_potentials.py
100644 → 100755
Empty file.
Empty file modified scripts/build_electricity_prices.py
100644 → 100755
Empty file.
Empty file modified scripts/build_electricity_production.py
100644 → 100755
Empty file.
Empty file modified scripts/build_energy_totals.py
100644 → 100755
Empty file.
Empty file modified scripts/build_existing_heating_distribution.py
100644 → 100755
Empty file.
Empty file modified scripts/build_gas_input_locations.py
100644 → 100755
Empty file.
Empty file modified scripts/build_gas_network.py
100644 → 100755
Empty file.
Empty file modified scripts/build_gdp_pop_non_nuts3.py
100644 → 100755
Empty file.
Empty file modified scripts/build_heat_totals.py
100644 → 100755
Empty file.
Empty file modified scripts/build_hourly_heat_demand.py
100644 → 100755
Empty file.
Empty file modified scripts/build_hydro_profile.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industrial_distribution_key.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industrial_energy_demand_per_country_today.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industrial_energy_demand_per_node.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industrial_energy_demand_per_node_today.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industrial_production_per_country.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industrial_production_per_country_tomorrow.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industrial_production_per_node.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industry_sector_ratios.py
100644 → 100755
Empty file.
Empty file modified scripts/build_industry_sector_ratios_intermediate.py
100644 → 100755
Empty file.
Empty file modified scripts/build_monthly_prices.py
100644 → 100755
Empty file.
Empty file modified scripts/build_osm_network.py
100644 → 100755
Empty file.
Empty file modified scripts/build_population_layouts.py
100644 → 100755
Empty file.
Empty file modified scripts/build_population_weighted_energy_totals.py
100644 → 100755
Empty file.
Empty file modified scripts/build_renewable_profiles.py
100644 → 100755
Empty file.
Empty file modified scripts/build_salt_cavern_potentials.py
100644 → 100755
Empty file.
Empty file modified scripts/build_sequestration_potentials.py
100644 → 100755
Empty file.
Empty file modified scripts/build_ship_raster.py
100644 → 100755
Empty file.
Empty file modified scripts/build_shipping_demand.py
100644 → 100755
Empty file.
Empty file modified scripts/build_solar_thermal_profiles.py
100644 → 100755
Empty file.
Empty file modified scripts/build_temperature_profiles.py
100644 → 100755
Empty file.
Empty file modified scripts/build_transmission_projects.py
100644 → 100755
Empty file.
Empty file modified scripts/build_transport_demand.py
100644 → 100755
Empty file.
Empty file modified scripts/clean_osm_data.py
100644 → 100755
Empty file.
Empty file modified scripts/cluster_network.py
100644 → 100755
Empty file.
Empty file modified scripts/definitions/heat_sector.py
100644 → 100755
Empty file.
Empty file modified scripts/definitions/heat_system.py
100644 → 100755
Empty file.
Empty file modified scripts/definitions/heat_system_type.py
100644 → 100755
Empty file.
Empty file modified scripts/determine_availability_matrix_MD_UA.py
100644 → 100755
Empty file.
Empty file modified scripts/make_summary.py
100644 → 100755
Empty file.
Empty file modified scripts/make_summary_perfect.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_gas_network.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_hydrogen_network.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_power_network.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_power_network_clustered.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_power_network_perfect.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_statistics.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_statistics_comparison.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_statistics_single.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_summary.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_validation_cross_border_flows.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_validation_electricity_prices.py
100644 → 100755
Empty file.
Empty file modified scripts/plot_validation_electricity_production.py
100644 → 100755
Empty file.
Empty file modified scripts/prepare_osm_network_release.py
100644 → 100755
Empty file.
Empty file modified scripts/prepare_perfect_foresight.py
100644 → 100755
Empty file.
Empty file modified scripts/retrieve_cost_data.py
100644 → 100755
Empty file.
Empty file modified scripts/retrieve_databundle.py
100644 → 100755
Empty file.
Empty file modified scripts/retrieve_electricity_demand.py
100644 → 100755
Empty file.
Empty file modified scripts/retrieve_eurostat_data.py
100644 → 100755
Empty file.
Loading