diff --git a/scripts/build_industry_demand.py b/scripts/build_industry_demand.py index fde2bdc4..db22f9d5 100644 --- a/scripts/build_industry_demand.py +++ b/scripts/build_industry_demand.py @@ -349,4 +349,4 @@ def match_technology(df): nodal_df.to_csv( snakemake.output.industrial_energy_demand_per_node, float_format="%.2f" - ) \ No newline at end of file + ) diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py index 6c7fdf2d..02f76fe4 100644 --- a/scripts/prepare_sector_network.py +++ b/scripts/prepare_sector_network.py @@ -54,7 +54,7 @@ def add_carrier_buses(n, carrier, nodes=None): if not isinstance(nodes, pd.Index): nodes = pd.Index(nodes) - n.add("Carrier", carrier) #, co2_emissions=costs.at[carrier, "CO2 intensity"]) + n.add("Carrier", carrier) # , co2_emissions=costs.at[carrier, "CO2 intensity"]) n.madd("Bus", nodes, location=location, carrier=carrier) @@ -2675,11 +2675,10 @@ def add_rail_transport(n, costs): # Add location. TODO: move it into pypsa-earth n.buses.location = n.buses.index - - # Change the carrier name of oil powerplants so include it in the emission counting - n.carriers = n.carriers.rename({"oil": "oil EOP"}) - n.generators['carrier'].replace("oil", "oil EOP", inplace=True) + # Change the carrier name of oil powerplants so include it in the emission counting + n.carriers = n.carriers.rename({"oil": "oil EOP"}) + n.generators["carrier"].replace("oil", "oil EOP", inplace=True) # Set carrier of AC loads n.loads.loc[nodes, "carrier"] = "AC"