bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
594 Commits 1 Branch 0 Tags 133 MiB
dc997c6ff2
Commit Graph

594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
martavp
d4be632e7a add add_land_constraint. The constraint is now imposed in a simplified way. 
The p_nom for already installed capacities are substrated from the p_nom_max of extendable capacities.
 2020-08-17 12:04:45 +02:00
martavp
59f2a8b09d
Update myopic.rst 2020-08-17 11:56:29 +02:00
martavp
20512754ce
Update myopic.rst 2020-08-14 12:32:00 +02:00
martavp
661804da7c add rough description of myopic code 2020-08-14 12:18:18 +02:00
martavp
6037882dbb small change in commented line 2020-08-14 11:04:35 +02:00
Tom Brown
8c196a7a21 Take care of CHPs when doing p_nom < threshold & extra_functionality 
- add_brownfield.py: Have to make sure that for each CHP there is both
  a heat and electric link, but they have different p_nom for each
  CHP, so have to make sure we don't remove one without the other.

- solve_network.py: Make sure extra_functionality constraints for CHP
  power-heat feasibility graph also work for non-extendable CHPs.
 2020-08-14 09:11:19 +02:00
Tom Brown
7e6c7b3dd3 Merge branch 'master' of github.com:martavp/pypsa-eur-sec into martavp-master 2020-08-12 18:10:41 +02:00
Tom Brown
663e1195e1 Add suffix -year to optimized components before solving 
This simplifies the structure of add_brownfield.py dramatically.

Some other changes need to be make elsewhere because of name
changes (e.g. battery constraints in solve_network.py).
 2020-08-12 18:08:01 +02:00
martavp
89a48bfad3 include existing conventional carriers in config file 2020-08-12 11:24:15 +02:00
martavp
18ff256811 Update cost for wind and solar, including the AC and DC connection costs for offshore. 
In order to calculate connection costs, average values for underground_fraction and average_distance are calculated for all the buses in the initial network mapped to the clustered network.
 2020-08-12 11:08:09 +02:00
Tom Brown
9012125585 Snakefile: Force configs to be copied before solving 
This reinstates old behaviour for both myopic and overnight foresight
settings.

Also account for the fact that the planning_horizon is now integer in
config.yaml rather than a string.
 2020-08-11 11:41:53 +02:00
Tom Brown
16b05a570d Distribute heating technologies within each country by population 2020-08-11 11:09:39 +02:00
Tom Brown
a59b2bce19 Add location attribute to each bus 
E.g. "DE0 0 residential rural heat" has location "DE0 0", and "EU gas"
and "co2 atmosphere" have location "EU".
 2020-08-11 11:07:55 +02:00
Tom Brown
1d6b6483e0 add_existing_baseyear: Divide p_nom by efficiency for Links 
This is because the p_nom of a Link is the thermal capacity at bus0,
whereas the capacities we have are the electrical capacity at bus1.
 2020-08-11 09:55:39 +02:00
martavp
e7cf956902
Merge pull request #1 from PyPSA/master 
Update my fork
 2020-08-11 09:00:24 +02:00
Tom Brown
658f8ad00c Distribute existing power plants to the correct nodes 
Previously they were distributed only by country to the first node in
the country.

Now conventional power plants are assigned to the correct node using
the bus map from PyPSA-Eur.

Wind and solar are distributed in each country by capacity factor.

The code has been refactored and a bug was fixed whereby total
capacities of wind and solar in each country were not correct.

Now the years in the config.yaml for myopic are integers not strings.
 2020-08-10 20:30:29 +02:00
Tom Brown
b57a6c18f8 Make directory for costs files configurable 
Default to parallel directory for technology_data repository.
 2020-07-30 08:27:33 +02:00
Tom Brown
ece21bfdfa add_existing_baseyear.py: Add carrier to conventional generators 2020-07-30 08:22:27 +02:00
Tom Brown
7abe928337 prepare_sector_network: Fix costs bug and carrier bug 
In prepare_costs, you need the min_count=1 in the sum so that it
generates NaNs for missing data (rather than 0) so that NaNs can be
subsituted by .fillna in the next line. Otherwise many values
(discount rates and efficiencies for solar, wind) are set to zero.

Also added carriers, storage and generators for coal, nuclear and
oil. (This needs to be organized better soon so that the carriers are
defined in config.yaml.)
 2020-07-29 15:50:40 +02:00
Tom Brown
9ad61eb8de README: Fix GitHub release badge 2020-07-20 10:13:00 +02:00
martavp
4523f324cd Group the generators existing before base year into categories and add them to the network as e.g. solar-2005, solar-2010, solar-2015 2020-07-18 11:22:30 +02:00
martavp
17a348d1e6 Add lifetime attribute to generators, links and stores in prepare_sector_network and use that attribute to check if a generator optimized in a previous time step should be added in add_brownfield (or if its lifetime has expired) 2020-07-17 15:20:20 +02:00
martavp
fa0b88a9b1 Add lifetime and build_year attributes to generators, links and stores. 2020-07-14 20:04:36 +02:00
martavp
d66105a6dd Load 2 level multindex costs file in prepares_sector_network rule 2020-07-14 20:03:08 +02:00
martavp
7d1500604f import prepare_cost function from prepare_sector_network 2020-07-14 13:28:10 +02:00
Tom Brown
34123088c8 README: Include zenodo DOI and other badges 2020-07-10 09:22:41 +02:00
Tom Brown
b16eb41d7c README: Link to readthedocs and remove info in documentation 
I.e. avoid duplication of text.
 2020-07-08 18:52:18 +02:00
Tom Brown
c24728279c PyPSA-Eur-Sec Version 0.1.0 
Please see the release notes in the documentation for more
information.
 2020-07-08 18:37:12 +02:00
martavp
201e4d2f57 simplify make_summary and plot_summary since now overnight also includes planning_horizons and carbon_budget_name 2020-07-08 16:35:50 +02:00
martavp
b23b7a143c Add carbon_budget_name and planning_horizons to the wildcards also for the overnight option (they are not used in this case). Also, rename prenetworks_bf to prenetworks_brownfield 2020-07-08 16:34:15 +02:00
martavp
dedabe695e Add conditional use of add_land_use_constraint (only for config['foresight']='myopic') 2020-07-08 16:32:17 +02:00
martavp
a4c22a29a4 Remove generators, stores and links whose installationYear + lifetime < year. Correct commented lines to YearDecomissioning > year 2020-07-08 16:28:08 +02:00
martavp
2b3dc60f11 Add default lifetime to config.file 2020-07-08 16:24:23 +02:00
martavp
e8e83de5d2 clean code, delete commented lines 2020-07-08 09:06:58 +02:00
martavp
25bb11cdfe deletes solve_baseyear rule, since it is not needed, base year is also solved with solve_myopic rule 2020-07-08 09:04:20 +02:00
martavp
059d1daed8 activate rule add_land_use constraint 2020-07-08 08:53:17 +02:00
martavp
bd939b4792 add aditional data files with existing renewable capacities, heating capacitites, co2_budget and country codes 2020-07-07 18:51:49 +02:00
martavp
8c53506897 include dependence of the number of header lines in csv files based on if overnigh or mypic option is selected 2020-07-07 18:46:12 +02:00
martavp
cf3c45321e include planning_horizons and co2_budget_name in multindex if options['foresight']='myopic' 2020-07-07 18:42:25 +02:00
martavp
0f85f18e86 Add land use constraint to e.g. all the solar installed in different years 2020-07-07 18:40:17 +02:00
martavp
236da36d5e Include myopic option in prepare_network.py so that, when selected, it reads CO2_limit from a carbon_budget file 2020-07-07 18:37:42 +02:00
martavp
d3b99a6a44 Modify snakefile to include myopic option. 2020-07-07 18:30:37 +02:00
martavp
6187710c7d Merge branch 'master' of https://github.com/martavp/pypsa-eur-sec 2020-07-07 18:28:27 +02:00
martavp
95f80aeba7 Add scripts to (a) include existing power and heating capacities installed before the base year, and (b) add to year n, capacities optimized in year n-1. 
Existing onwind and offwind capacity are now read from IRENA database, similarly to solar capacities. Previously we were using thewindpower.net database which is not open.
 2020-07-07 18:26:31 +02:00
martavp
acdf61b5f9 Add scripts to (a) include existing power and heating capacities installed before the base year, and (b) add to year n, capacities optimized in year n-1. 2020-07-07 18:20:51 +02:00
martavp
8e243c5d23 Add myopic option, planning horizons, and name of co2 budget path to default config file 2020-07-07 18:18:45 +02:00
Tom Brown
2bee13fe40 plot_summary: Plot energy / CO2 balances for each carrier 
Take data from supply_energy.csv and plot the balances for each
carrier.

One summary for energy excludes CO2 flows (unlike graphs/energy.pdf).
 2020-05-13 13:40:00 +02:00
Tom Brown
eb34356722 make_summary: Remove erroneous power outputs for non-multi links 
This bug in PyPSA was fixed in:

f484adc876
 2020-05-13 13:25:32 +02:00
Tom Brown
1c5f471acb Include option for grid connection cost for onshore and utility PV 
Only include these technologies since they are connected at new
locations.

Other technologies can fit in at existing connections.
 2020-05-11 13:37:10 +02:00
Tom Brown
bdb3c8886d make_summary.py: Fix so that it works with simpl != "" 
Non-empty simpl is needed for cases where the resource resolution
is higher than the network resolution, e.g.

simpl = 70
cluster = 37m
 2020-05-07 18:16:28 +02:00