Skip to content

Commit

Permalink
Fix_after_comment_2
Browse files Browse the repository at this point in the history
  • Loading branch information
Margherita-Capitani committed Nov 6, 2024
1 parent c0fd003 commit 5fe53d7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
3 changes: 2 additions & 1 deletion data/costs.csv
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ decentral solar thermal,2030,lifetime,20,years,HP;
central solar thermal,2030,FOM,1.4,%/year,HP;
central solar thermal,2030,investment,140000,EUR/1000m2,HP;
central solar thermal,2030,lifetime,20,years,HP;
HVAC overhead,2030,investment,40,EUR/MW/km,Hagspiel;
HVAC overhead,2030,investment,400,EUR/MW/km,Hagspiel;
MVAC overhead,2030,investment,40,EUR/MW/km,Hagspiel;
HVAC overhead,2030,lifetime,40,years,Hagspiel;
HVAC overhead,2030,FOM,2,%/year,Hagspiel;
HVDC overhead,2030,investment,400,EUR/MW/km,Hagspiel;
Expand Down
4 changes: 2 additions & 2 deletions scripts/add_electricity.py
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def attach_conventional_generators(
n.generators.loc[idx].bus.map(bus_values).dropna()
)
else:
# Singolo valore che influenza tutti i generatori di tecnologia k indipendentemente dal paese
# Single value affecting all k technology generators regardless of country.
n.generators.loc[idx, attr] = values


Expand Down Expand Up @@ -357,7 +357,7 @@ def attach_load(n, load_file, tech_modelling):

def update_transmission_costs(n, costs, length_factor=1.0, simple_hvdc_costs=False):
n.lines["capital_cost"] = (
n.lines["length"] * length_factor * costs.at["HVAC overhead", "capital_cost"]
n.lines["length"] * length_factor * costs.at["MVAC overhead", "capital_cost"]
)


Expand Down
4 changes: 1 addition & 3 deletions scripts/cluster_buildings.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ def get_central_points_geojson_with_buildings(
"cluster": i,
}
)
central_features = gpd.GeoDataFrame(central_features, crs=microgrid_buildings.crs)
if microgrid_buildings.crs != "EPSG:4326":
central_features = central_features.to_crs("EPSG:4326")
central_features = gpd.GeoDataFrame(central_features, crs="EPSG:4326")
central_features.to_file(output_filepath_centroids, driver="GeoJSON")

clusters = []
Expand Down

0 comments on commit 5fe53d7

Please sign in to comment.