martavp
|
cfcf5cf490
|
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
|
2022-11-21 18:10:31 +01:00 |
|
martavp
|
24ea8448da
|
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
|
2022-11-21 18:10:11 +01:00 |
|
martavp
|
b20130eb2f
|
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
|
2022-11-21 18:09:51 +01:00 |
|
martavp
|
6b5b8b2d3b
|
Update doc/myopic.rst
Co-authored-by: energyLS <89515385+energyLS@users.noreply.github.com>
|
2022-11-21 18:09:36 +01:00 |
|
Fabian Neumann
|
7120ef6aa7
|
Merge pull request #285 from PyPSA/fix-typos
fix typos
|
2022-11-18 09:20:45 +01:00 |
|
Fabian
|
df4eb85a19
|
fix typos
|
2022-11-18 09:08:07 +01:00 |
|
Fabian Neumann
|
45cda4e2cd
|
Merge pull request #273 from PyPSA/shipping-defaults
Change default of shipping demand to oil
|
2022-11-17 15:55:59 +01:00 |
|
Fabian Neumann
|
e846cea2b7
|
Merge pull request #279 from PyPSA/fix/subworkflow-paths
Fix relative imports from subworkflow PyPSA-EUR
|
2022-11-17 15:55:17 +01:00 |
|
Fabian Neumann
|
1ee5cd3557
|
Merge pull request #281 from PyPSA/FabianHofmann-patch-2
CI: make coincbc and ipopt installed by conda
|
2022-11-16 12:48:13 +01:00 |
|
Fabian Hofmann
|
e25fb02e9c
|
CI: make coincbc and ipopt installed by conda
|
2022-11-16 12:44:28 +01:00 |
|
Fabian Hofmann
|
24d6ca16ed
|
Merge pull request #280 from PyPSA/FabianHofmann-patch-1
Fix input listing in Snakefile
|
2022-11-16 12:23:36 +01:00 |
|
Fabian Hofmann
|
e1e18a50e7
|
Fix input listing in Snakefile
|
2022-11-16 12:18:58 +01:00 |
|
Fabian Neumann
|
d35d3c3c21
|
Merge pull request #197 from PyPSA/cp-env
Snakefile: export conda environment
|
2022-11-15 14:49:52 +01:00 |
|
euronion
|
ae8f601f0a
|
Fix relative imports from subworkflow PyPSA-EUR
|
2022-11-14 09:38:09 +01:00 |
|
Fabian Neumann
|
16a92477f0
|
methanol in shipping
|
2022-11-13 18:25:32 +01:00 |
|
Fabian Neumann
|
84618b3ee1
|
distribute international shipping by port trade volumes
|
2022-11-13 13:43:05 +01:00 |
|
Fabian Neumann
|
3815d0da61
|
add release note
|
2022-11-10 15:31:25 +01:00 |
|
Fabian Neumann
|
6c51152ab5
|
config: shipping now defaults to (synthetic) oil demand not hydrogen
|
2022-11-10 15:29:52 +01:00 |
|
Fabian Neumann
|
c8d09da145
|
Merge pull request #271 from nnhjy/patch-1
Update make_summary.py
|
2022-11-03 13:55:26 +01:00 |
|
Huang, Jiangyi
|
80868e5f0f
|
Update make_summary.py
The value for `na_action` needs to be "ignore" or "None".
|
2022-11-03 13:46:20 +01:00 |
|
Fabian Neumann
|
de0e21aec3
|
Merge branch 'improve-doc' of github.com:martavp/pypsa-eur-sec into martavp-improve-doc
|
2022-10-25 09:46:28 +02:00 |
|
martavp
|
f6e017257e
|
correct small spelling mistakes
|
2022-10-25 09:29:49 +02:00 |
|
martavp
|
11585429b0
|
small spelling corrections
|
2022-10-25 09:28:18 +02:00 |
|
martavp
|
9bc0e2afb7
|
update description of mechanical and chemical recycling of plastics
|
2022-10-25 09:23:35 +02:00 |
|
martavp
|
0b53e34f58
|
Merge pull request #22 from Adam-Dvorak1/improve-doc
Final industry sections, latex math edits, formatting unification, typo fixes
|
2022-10-25 09:04:07 +02:00 |
|
Fabian Neumann
|
776596ab9a
|
Merge pull request #270 from nnhjy/master
untrack *.json
|
2022-10-18 13:55:57 +02:00 |
|
Adam-Dvorak1
|
e9ffaac223
|
Small edits
|
2022-10-07 19:10:05 +02:00 |
|
Adam-Dvorak1
|
a3268604c2
|
config file.
|
2022-10-07 19:02:12 +02:00 |
|
Adam-Dvorak1
|
b4457a75e3
|
latex formatting
|
2022-10-07 18:49:37 +02:00 |
|
Adam-Dvorak1
|
87c444c898
|
formatting latex math
|
2022-10-07 18:46:39 +02:00 |
|
Adam-Dvorak1
|
c3d2213402
|
Typos
|
2022-10-07 18:39:07 +02:00 |
|
Adam-Dvorak1
|
0f86d52c03
|
Typos and formatting
|
2022-10-07 18:37:43 +02:00 |
|
Adam-Dvorak1
|
5ca89f8955
|
Typos and modeled to modelled (UK version)
|
2022-10-07 18:31:36 +02:00 |
|
Adam-Dvorak1
|
c2cf870876
|
Minor edits
|
2022-10-07 18:24:52 +02:00 |
|
Adam-Dvorak1
|
6bc99291c9
|
Other industry subsectors
|
2022-10-07 18:10:58 +02:00 |
|
Adam-Dvorak1
|
dfd0d080ed
|
Update supply_demand.rst
|
2022-10-07 17:05:34 +02:00 |
|
Adam-Dvorak1
|
59027615c8
|
Replacing CO2
|
2022-10-07 16:54:57 +02:00 |
|
Adam-Dvorak1
|
9e40a0f5f2
|
Add non-metallic mineral products title
|
2022-10-07 16:42:43 +02:00 |
|
Adam-Dvorak1
|
9cd701496c
|
Adding chemistry section
|
2022-10-07 16:38:50 +02:00 |
|
Adam-Dvorak1
|
f3f08340af
|
Update supply_demand.rst
|
2022-10-07 16:23:39 +02:00 |
|
Adam-Dvorak1
|
e13292da71
|
Update supply_demand.rst
|
2022-10-07 16:22:09 +02:00 |
|
Adam-Dvorak1
|
374a7900f3
|
Linking test
|
2022-10-07 16:17:54 +02:00 |
|
nnhjy
|
4f7b2b9868
|
untrack *.json
|
2022-10-06 18:43:41 +02:00 |
|
martavp
|
c6b997547a
|
Merge pull request #21 from ebbekyhl/patch-2
Update myopic and extend carbon budget description
|
2022-10-03 10:28:21 +02:00 |
|
martavp
|
9eea4a8fba
|
Merge pull request #20 from Parisra/Improve-Doc-final-edit
Improve doc final edit
|
2022-10-03 10:27:36 +02:00 |
|
Fabian Neumann
|
5c6ff44e13
|
Merge pull request #242 from PyPSA/nh3
add ammonia as carrier: with Haber-Bosch, crackers, store, load
|
2022-10-01 16:01:45 +02:00 |
|
Fabian Neumann
|
1611d63a8a
|
Merge branch 'master' into nh3
|
2022-10-01 16:01:39 +02:00 |
|
Fabian Neumann
|
7ed88d5ff1
|
Merge pull request #268 from PyPSA/co2seq_sector_opt
update sector opt for co2 seq potential
|
2022-10-01 15:58:47 +02:00 |
|
lisazeyen
|
9a74e3d699
|
set co2seq to limit of sequestration potential
|
2022-09-29 09:12:36 +02:00 |
|
lisazeyen
|
7606562449
|
update sector opt for co2 seq potential
|
2022-09-28 16:09:53 +02:00 |
|