Martha Frysztacki
|
ba928bf839
|
Merge pull request #814 from yerbol-akhmetov/no_gas_gen
No gas generators
|
2023-12-28 10:11:45 +01:00 |
|
Martha Frysztacki
|
a74fa9b3c2
|
Merge branch 'master' into services_heat
|
2023-12-28 10:10:34 +01:00 |
|
Martha Frysztacki
|
61c54152b1
|
Merge pull request #813 from yerbol-akhmetov/issue1_issue2
Resolve waste heat and resistive heaters (issue1 and issue2)
|
2023-12-28 10:07:12 +01:00 |
|
yerbol-akhmetov
|
0f41ff79cf
|
update configtable for resistive_heaters
|
2023-12-28 13:53:15 +06:00 |
|
yerbol-akhmetov
|
640a4b1b2e
|
update boilers description in confitables
|
2023-12-28 13:51:30 +06:00 |
|
pre-commit-ci[bot]
|
125c406013
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-23 08:55:59 +00:00 |
|
yerbol-akhmetov
|
1bee34d57f
|
remove gas generators
|
2023-12-23 14:51:01 +06:00 |
|
yerbol-akhmetov
|
12096d1f2f
|
update configtable by adding resistive_heaters
|
2023-12-23 12:55:50 +06:00 |
|
yerbol-akhmetov
|
a3688a74fd
|
add resistive_heaters option to config.default
|
2023-12-23 12:31:31 +06:00 |
|
Fabian Hofmann
|
c3fd0e2177
|
Merge pull request #810 from PyPSA/env/restrict-snakemake
|
2023-12-21 23:14:28 +01:00 |
|
euronion
|
31f77bc888
|
Update environment.yaml
|
2023-12-21 17:52:34 +01:00 |
|
euronion
|
f251e89269
|
Update release_notes.rst
|
2023-12-21 17:52:31 +01:00 |
|
yerbol-akhmetov
|
17e9b4d1df
|
make resistive heaters separate of boilers
|
2023-12-21 20:59:35 +06:00 |
|
yerbol-akhmetov
|
25cfcaf97b
|
fix add_waste_heat
|
2023-12-21 20:54:17 +06:00 |
|
Martha Frysztacki
|
81041aa10e
|
Merge pull request #809 from yerbol-akhmetov/fix_f_weighting
fix f weighting for retro cost
|
2023-12-21 15:04:06 +01:00 |
|
pre-commit-ci[bot]
|
20b847c627
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-21 13:35:00 +00:00 |
|
euronion
|
17a4f53b9d
|
Restrict snakemake version to < 8.0.0
|
2023-12-21 11:57:24 +01:00 |
|
martacki
|
7d64a73382
|
simplify node_name formulation
|
2023-12-21 11:12:54 +01:00 |
|
pre-commit-ci[bot]
|
5ab9d149ba
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-21 10:07:58 +00:00 |
|
martacki
|
e8eb9df73f
|
generalize bus name to allow higher spatial resolution
|
2023-12-21 11:07:23 +01:00 |
|
pre-commit-ci[bot]
|
146fb170d8
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-21 09:41:15 +00:00 |
|
martacki
|
bb160d78b1
|
fix more deprecation warnings
|
2023-12-21 10:40:10 +01:00 |
|
pre-commit-ci[bot]
|
dfc2f06033
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-21 08:41:19 +00:00 |
|
martacki
|
4d63a3f21b
|
fix deprecation warnings
|
2023-12-21 09:37:13 +01:00 |
|
pre-commit-ci[bot]
|
f77f84af6a
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-20 19:27:58 +00:00 |
|
martacki
|
a292308c53
|
select correct sector name in endogeneous retrofitting
|
2023-12-20 20:11:37 +01:00 |
|
yerbol-akhmetov
|
79f443ecbd
|
fix f weighting for retro cost
|
2023-12-20 22:41:11 +06:00 |
|
pre-commit-ci[bot]
|
64300c26e5
|
[pre-commit.ci] pre-commit autoupdate (#806)
updates:
- [github.com/PyCQA/isort: 5.13.0 → 5.13.2](https://github.com/PyCQA/isort/compare/5.13.0...5.13.2)
- [github.com/psf/black: 23.11.0 → 23.12.0](https://github.com/psf/black/compare/23.11.0...23.12.0)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
|
2023-12-18 19:25:43 +00:00 |
|
Fabian Hofmann
|
179ab43ef9
|
Merge pull request #805 from PyPSA/env_fixes
Env fixes
|
2023-12-18 14:31:29 +01:00 |
|
Fabian
|
d39b579346
|
build_biomass_potentials: fix groupby and transpose
|
2023-12-18 12:56:08 +01:00 |
|
Fabian
|
cc08dff280
|
simplify_network: revert fillna
|
2023-12-18 12:44:21 +01:00 |
|
Fabian
|
4f67160993
|
fix snake format
|
2023-12-18 11:57:21 +01:00 |
|
martacki
|
22acdd03a0
|
omit future deprecation
|
2023-12-18 11:49:53 +01:00 |
|
martacki
|
ea42b3797d
|
simplify_network&pandas21: nans not supported
|
2023-12-18 11:43:04 +01:00 |
|
Fabian Hofmann
|
68aef7b628
|
constrain xarray more recent version
|
2023-12-18 11:23:32 +01:00 |
|
pre-commit-ci[bot]
|
ea3fdb6c15
|
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
|
2023-12-18 08:58:15 +00:00 |
|
martacki
|
7e543ad0cc
|
base_network: fix pandas 2.1 issue
|
2023-12-18 09:57:05 +01:00 |
|
martacki
|
84d38228ae
|
fix environment
|
2023-12-18 09:35:17 +01:00 |
|
Fabian Neumann
|
798a6b8481
|
Merge pull request #804 from PyPSA/revert-719-blast-furnace-with-cc
Revert "Add option for carbon capture in integrated steelworks"
|
2023-12-14 16:30:40 +01:00 |
|
Fabian Neumann
|
43674bcee8
|
Revert "Add option for carbon capture in integrated steelworks"
|
2023-12-14 16:30:30 +01:00 |
|
Fabian Neumann
|
b96bcf11a4
|
relax pypsa version constraint to allos 0.26.0
|
2023-12-12 18:31:24 +01:00 |
|
Fabian Neumann
|
c304738ea5
|
fix to restore compatibility with PyPSA v0.26.0
|
2023-12-12 18:18:03 +01:00 |
|
Fabian Neumann
|
dffe784704
|
address pandas 2.1.4 deprecation warnings on applymap and fillna(method='bfill')
|
2023-12-12 17:07:33 +01:00 |
|
Fabian Neumann
|
e0ca38be6e
|
Merge pull request #719 from PyPSA/blast-furnace-with-cc
Add option for carbon capture in integrated steelworks
|
2023-12-11 20:12:26 +01:00 |
|
Fabian Neumann
|
ea7a66b873
|
Merge pull request #794 from PyPSA/mv-focus-weights
move focus_weights into clustering configuration segment
|
2023-12-11 20:10:46 +01:00 |
|
Fabian Neumann
|
f200292267
|
add release note
|
2023-12-11 20:10:29 +01:00 |
|
Fabian Neumann
|
9b2edd076b
|
ensure just a single focus_weights definition
|
2023-12-11 20:08:27 +01:00 |
|
Fabian Neumann
|
82ce4ee44e
|
Merge pull request #802 from PyPSA/pre-commit-ci-update-config
[pre-commit.ci] pre-commit autoupdate
|
2023-12-11 20:05:33 +01:00 |
|
Fabian Neumann
|
938637013b
|
Merge pull request #801 from PyPSA/enspreso-zenodo
change JRC-ENSPRESO biomass data link to zenodo for enhanced reliability
|
2023-12-11 20:05:13 +01:00 |
|
pre-commit-ci[bot]
|
d215f3f3f6
|
[pre-commit.ci] pre-commit autoupdate
updates:
- [github.com/PyCQA/isort: 5.12.0 → 5.13.0](https://github.com/PyCQA/isort/compare/5.12.0...5.13.0)
|
2023-12-11 18:38:23 +00:00 |
|