bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'PyPSA:master' into adding_solar_tracking_single_axis

Browse Source
This commit is contained in:
Parisra 2024-04-29 14:27:26 +02:00 committed by GitHub
commit 17b3e1677d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View File

@ -31,7 +31,7 @@ jobs:
os: os:
- ubuntu-latest - ubuntu-latest
- macos-latest - macos-latest
# - windows-latest - windows-latest
inhouse: inhouse:
- stable - stable
- master - master

2
Snakefile
View File

@ -8,7 +8,7 @@ from os.path import normpath, exists
from shutil import copyfile, move, rmtree from shutil import copyfile, move, rmtree
from snakemake.utils import min_version from snakemake.utils import min_version
min_version("8.5") min_version("8.11")
from scripts._helpers import path_provider, copy_default_files, get_scenarios, get_rdir from scripts._helpers import path_provider, copy_default_files, get_scenarios, get_rdir

2
envs/environment.yaml
View File

@ -20,7 +20,7 @@ dependencies:
- openpyxl!=3.1.1 - openpyxl!=3.1.1
- pycountry - pycountry
- seaborn - seaborn
- snakemake-minimal>=8.5 - snakemake-minimal>=8.11
- memory_profiler - memory_profiler
- yaml - yaml
- pytables - pytables

2
scripts/add_existing_baseyear.py
View File

@ -310,7 +310,7 @@ def add_power_capacities_installed_before_baseyear(n, grouping_years, costs, bas
n.madd( n.madd(
"Generator", "Generator",
new_capacity.index, new_capacity.index,
suffix=" " + name_suffix, suffix=name_suffix,
bus=new_capacity.index, bus=new_capacity.index,
carrier=generator, carrier=generator,
p_nom=new_capacity, p_nom=new_capacity,