Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor adjustments #375

Merged
merged 2 commits into from
Sep 17, 2024
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
1 change: 1 addition & 0 deletions config.bright.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,7 @@ plotting:
natural gas: brown
SMR: '#4F4F2F'
oil: '#B5A642'
oil EOP: '#B5A677'
oil boiler: '#B5A677'
lines: k
transmission lines: k
Expand Down
1 change: 1 addition & 0 deletions scripts/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -742,6 +742,7 @@ def get_last_commit_message(path):
subprocess.check_output(
["git", "log", "-n", "1", "--pretty=format:%H %s"],
stderr=subprocess.STDOUT,
shell=True,
)
.decode()
.strip()
Expand Down
4 changes: 2 additions & 2 deletions scripts/prepare_sector_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -2737,8 +2737,8 @@ def add_rail_transport(n, costs):
# clustering of regions must be double checked.. refer to regions onshore

# Change the carrier "oil" so that it
n.carriers = n.carriers.rename({"oil": "Oil EOP"})
n.generators["carrier"].replace("oil", "Oil EOP", inplace=True)
n.carriers = n.carriers.rename({"oil": "oil EOP"})
n.generators["carrier"].replace("oil", "oil EOP", inplace=True)

# Add location. TODO: move it into pypsa-earth
n.buses.location = n.buses.index
Expand Down
Loading