Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/pypsa-de/export_ariadne_variables.py
Original file line number Diff line number Diff line change
Expand Up @@ -4296,7 +4296,7 @@ def get_economy(n, region):
var = pd.Series()

def get_tsc(n, country):
n.statistics.set_parameters(drop_zero=False)
pypsa.options.params.statistics.drop_zero = False
capex = n.statistics.capex(
groupby=pypsa.statistics.groupers["name", "carrier"], nice_names=False
)
Expand Down
8 changes: 4 additions & 4 deletions scripts/pypsa-de/modify_prenetwork.py
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ def add_hydrogen_turbines(n):
h2_plants.bus2 = ""
h2_plants.efficiency2 = 1
# add the new links
n.import_components_from_dataframe(h2_plants, "Link")
n.add("Link", h2_plants.index, **h2_plants)

# special handling of CHPs
gas_plants = n.links[
Expand All @@ -937,7 +937,7 @@ def add_hydrogen_turbines(n):
h2_plants.bus0 = h2_plants.bus1 + " H2"
h2_plants.bus3 = ""
h2_plants.efficiency3 = 1
n.import_components_from_dataframe(h2_plants, "Link")
n.add("Link", h2_plants.index, **h2_plants)


def force_retrofit(n, params):
Expand Down Expand Up @@ -980,7 +980,7 @@ def force_retrofit(n, params):
h2_plants.capital_cost *= 1 + params["cost_factor"]
h2_plants.overnight_cost *= 1 + params["cost_factor"]
# add the new links
n.import_components_from_dataframe(h2_plants, "Link")
n.add("Link", h2_plants.index, **h2_plants)
n.links.drop(gas_plants, inplace=True)

# special handling of CHPs
Expand All @@ -1001,7 +1001,7 @@ def force_retrofit(n, params):
h2_plants.efficiency3 = 1 # default value
h2_plants.capital_cost *= 1 + params["cost_factor"]
h2_plants.overnight_cost *= 1 + params["cost_factor"]
n.import_components_from_dataframe(h2_plants, "Link")
n.add("Link", h2_plants.index, **h2_plants)
n.links.drop(gas_plants, inplace=True)


Expand Down
Loading