Ignore pre-commit changes in `git blame` #158

lkstrp · 2024-08-06T14:44:40Z

Adds .git-blame-ignore-revs to ignore pre-commit changes from #156 in git blame.

github-actions · 2024-08-06T16:01:57Z

Validator Report

I am the Validator. Download all artifacts here.
I'll be back and edit this comment for each new commit.

Config
prefix: 240806oilrefineries

⚠️ Config changes detected!

Results may differ due to these changes:

diff --git a/config/config.yaml b/config/config.yaml
index 7dda084..9e8dcb1 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -177,6 +177,94 @@ co2_budget:
   2045: 0.050
   2050: 0.000 # climate-neutral by 2050
 
+limits_capacity_max:
+  Generator:
+    onwind:
+      DE:
+        2020: 54.5
+        2025: 69
+        2030: 160
+        2035: 160
+        2040: 160
+        2045: 160
+    offwind:
+      DE:
+        2020: 7.8
+        2025: 8
+        2030: 30
+        2035: 70
+        2040: 70
+        2045: 70
+    solar:
+      DE:
+        2020: 53.7
+        2025: 110 # EEG2023; assumes for 2026: 128 GW, assuming a fair share reached by end of 2025
+        2030: 400
+        2035: 400
+        2040: 400
+        2045: 400
+
+limits_capacity_min:
+  Generator:
+    onwind:
+      DE:
+        2030: 115   # Wind-an-Land Law
+        2035: 115   # Wind-an-Land Law
+        2040: 115   # Wind-an-Land Law
+        2045: 115
+    offwind:
+      DE:
+        2030: 30   # Wind-auf-See Law
+        2035: 30
+        2040: 30
+        2045: 30
+    solar:
+      DE:
+          # EEG2023; Ziel for 2024: 88 GW and for 2026: 128 GW,
+          # assuming at least 1/3 of difference reached in 2025
+        2025: 101
+        2030: 101
+        2035: 101
+        2040: 101
+        2045: 101
+
+
+# limits_capacity_min:
+#     Generator:
+#       onwind:
+#         DE:
+#           2030: 115 # Wind-an-Land Law
+#           2035: 157 # Wind-an-Land Law
+#           2040: 160 # Wind-an-Land Law
+#           2045: 160
+#       offwind:
+#         DE:
+#           2030: 30 # Wind-auf-See Law
+#           2035: 40 # 40 Wind-auf-See Law
+#           # assuming at least 1/3 of difference reached in 2040
+#           2040: 50
+#           2045: 70 #70 Wind-auf-See Law
+#       solar:
+#         DE:
+#           # EEG2023; Ziel for 2024: 88 GW and for 2026: 128 GW,
+#           # assuming at least 1/3 of difference reached in 2025
+#           2025: 101
+#           2030: 215 # PV strategy
+#           2035: 309
+#           2040: 400 # PV strategy
+#           2045: 400
+#           # What about the EEG2023 "Strommengenpfad"?
+
+h2_import_max:
+  DE:
+    2020: 0
+    2025: 5
+    2030: 20
+    2035: 50
+    2040: 100
+    2045: 150
+    2050: 200
+
 wasserstoff_kernnetz:
   enable: false
   reload_locations: false
@@ -218,6 +306,7 @@ sector:
       2045: 0.8
       2050: 1.0
   central_heat_vent: true
+  co2_budget_national: true
   co2_spatial: true
   biomass_spatial: true
   #TBD what to include in config
@@ -342,129 +431,6 @@ solving:
         H2 pipeline: 0.3
         H2 pipeline (Kernnetz): 0.3
         H2 pipeline retrofitted: 0.3
-  constraints:
-    limits_capacity_max:
-      Generator:
-        onwind:
-          DE:
-            2020: 54.5
-            2025: 69
-            2030: 160
-            2035: 160
-            2040: 160
-            2045: 160
-        offwind:
-          DE:
-            2020: 7.8
-            2025: 8
-            2030: 30
-            2035: 70
-            2040: 70
-            2045: 70
-        solar:
-          DE:
-            2020: 53.7
-            2025: 110 # EEG2023; assumes for 2026: 128 GW, assuming a fair share reached by end of 2025
-            2030: 400
-            2035: 400
-            2040: 400
-            2045: 400
-    limits_capacity_min:
-      Generator:
-        onwind:
-          DE:
-            2030: 115   # Wind-an-Land Law
-            2035: 115   # Wind-an-Land Law
-            2040: 115   # Wind-an-Land Law
-            2045: 115
-        offwind:
-          DE:
-            2030: 30   # Wind-auf-See Law
-            2035: 30
-            2040: 30
-            2045: 30
-        solar:
-          DE:
-              # EEG2023; Ziel for 2024: 88 GW and for 2026: 128 GW,
-              # assuming at least 1/3 of difference reached in 2025
-            2025: 101
-            2030: 101
-            2035: 101
-            2040: 101
-            2045: 101
-  # For reference, this are the values specified in the laws
-  # limits_capacity_min:
-  #     Generator:
-  #       onwind:
-  #         DE:
-  #           2030: 115 # Wind-an-Land Law
-  #           2035: 157 # Wind-an-Land Law
-  #           2040: 160 # Wind-an-Land Law
-  #           2045: 160
-  #       offwind:
-  #         DE:
-  #           2030: 30 # Wind-auf-See Law
-  #           2035: 40 # 40 Wind-auf-See Law
-  #           # assuming at least 1/3 of difference reached in 2040
-  #           2040: 50
-  #           2045: 70 #70 Wind-auf-See Law
-  #       solar:
-  #         DE:
-  #           # EEG2023; Ziel for 2024: 88 GW and for 2026: 128 GW,
-  #           # assuming at least 1/3 of difference reached in 2025
-  #           2025: 101
-  #           2030: 215 # PV strategy
-  #           2035: 309
-  #           2040: 400 # PV strategy
-  #           2045: 400
-  #           # What about the EEG2023 "Strommengenpfad"?
-    # boundary condition of maximum volumes
-    limits_volume_max:
-      # constrain electricity import in TWh
-      electricity_import:
-        DE:
-          2020: -20
-          2025: 0
-          2030: 0
-          2035: 40
-          2040: 80
-          2045: 125
-      electrolysis:
-      # boundary condition lower?
-        DE:
-          2020: 0
-          2025: 5
-          2030: 45
-          2035: 130
-          2040: 215
-          2045: 300
-      h2_derivate_import:
-      # boundary condition lower?
-        DE:
-          2020: 0
-          2025: 0
-          2030: 10
-          2035: 105
-          2040: 200
-          2045: 300
-      h2_import:
-      # boundary condition lower?
-        DE:
-          2020: 0
-          2025: 5
-          2030: 15
-          2035: 115
-          2040: 220
-          2045: 325
-    limits_volume_min:
-      electrolysis:
-        DE:
-          2020: 0
-          2025: 0
-          2030: 0
-          2035: 0
-          2040: 0
-          2045: 0
   # solver:
   #   options: gurobi-numeric-focus
   # solver_options:

Result plots comparison

	Base branch	Feature branch
primary_energy.png
secondary_energy.png
final_energy.png

Result files comparison

	Numeric	Status	NMAE	MAPE
20240731newcutout/KN2045_Bal_v4/csvs/curtailment.csv	72.2%	⚠️Changed	0.09	31.5%
20240731newcutout/KN2045_Bal_v4/csvs/nodal_supply_energy.csv	59.2%	✅ Almost equal	0.00	1.51e+07%
20240731newcutout/KN2045_Bal_v4/csvs/costs.csv	65.1%	✅ Almost equal	0.02	37.9%
20240731newcutout/KN2045_Bal_v4/csvs/nodal_cfs.csv	64.1%	✅ Almost equal	0.02	5.59e+02%
20240731newcutout/KN2045_Bal_v4/csvs/market_values.csv	77.9%	✅ Almost equal	0.03	1.6%
20240731newcutout/KN2045_Bal_v4/csvs/supply_energy.csv	64.7%	✅ Almost equal	0.03	46.7%
20240731newcutout/KN2045_Bal_v4/csvs/cfs.csv	72.3%	✅ Almost equal	0.04	3.3%
20240731newcutout/KN2045_Bal_v4/csvs/cumulative_cost.csv	84.7%	✅ Almost equal	0.09	0.0%
20240731newcutout/KN2045_Bal_v4/csvs/energy.csv	72.9%	✅ Almost equal	0.02	36.9%
20240731newcutout/KN2045_Bal_v4/csvs/prices.csv	81.1%	✅ Almost equal	0.00	1.4%
20240731newcutout/KN2045_Bal_v4/csvs/nodal_costs.csv	58.2%	✅ Almost equal	0.00	3.14e+07%
20240731newcutout/KN2045_Bal_v4/csvs/price_statistics.csv	57.1%	✅ Almost equal	0.08	0.9%
20240731newcutout/KN2045_Bal_v4/csvs/supply.csv	64.7%	✅ Almost equal	0.01	52.2%
20240731newcutout/KN2045_Bal_v4/csvs/nodal_capacities.csv	64.6%	✅ Almost equal	0.00	6.54e+06%
20240731newcutout/KN2045_Bal_v4/csvs/capacities.csv	72.6%	✅ Almost equal	0.01	45.1%
20240731newcutout/KN2045_Bal_v4/csvs/metrics.csv	54.5%	✅ Almost equal	0.05	16.5%
20240731newcutout/KN2045_Bal_v4/csvs/weighted_prices.csv		✅ Equal

MAPE: Mean Absolute Percentage Error
NMAE: Mean Absolute Error on Min-Max Normalized Data
Status Thresholds: NMAE > 0.05 and MAPE > 5%

Comparing lkstrp-patch-2 (90d7227) with main (fc8bf80).
Branch is 1 commits ahead and 1 commits behind main.
Last updated on 2024-08-06 18:01:57 CEST.

* first stab at enabling H2 and H2 retrofit gas plants * forcing gas turbines from one year on * fixing efficiency of hydrogen gas turbines * bug fixing params * dropping gas plants after forcing them to retrofit * make unravelling of oil bus consistent with new refineries I.e. separate DE oil primary from DE oil. * update exporter * ci: add validator * select images and add repo owner path * Update PULL_REQUEST_TEMPLATE.md * Update Changelog.md * update submodule * Update .pre-commit-config.yaml * remove reuse check * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Using config_provider for additional functionality exclusively (#154) * using exclusively config_provider * moving bc to solving config * style changes * minor style changes * cosmetic changes * add back default values of constraints * remove unused function arguments * small fix for exporter * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: Michael Lindner <michaellindner@posteo.de> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Create .git-blame-ignore-revs (#158) * minor changes for running single node network (#160) * minor changes for running single node network * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * Fix hydrogen import boundary condition (#159) * include retrofitted and Kernnetz pipelines for hydrogen import boundary condition * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * bugfixing mock_snakemake and fullfilling prerequisites for review --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> * first stab at enabling H2 and H2 retrofit gas plants * forcing gas turbines from one year on * fix merge bugs * change exporter to report hydrogen plants * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * change name of retrofitted H2 * updating exporter * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fix bus0 auf H2 plants * finish rename of h2 retrofit * default efficiency = 1 --------- Co-authored-by: Tom Brown <tom@nworbmot.org> Co-authored-by: Michael Lindner <michaellindner@posteo.de> Co-authored-by: lkstrp <lkstrp@pm.me> Co-authored-by: Micha <michaellindner@pik-potsdam.de> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Julian Geis <j.geis@tu-berlin.de>

Create .git-blame-ignore-revs

90d7227

lindnemi merged commit 0324120 into main Aug 6, 2024
4 checks passed

toniseibold pushed a commit that referenced this pull request Aug 7, 2024

Create .git-blame-ignore-revs (#158)

f5c6e6f

lkstrp deleted the lkstrp-patch-2 branch September 10, 2024 07:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Ignore pre-commit changes in `git blame` #158

Ignore pre-commit changes in `git blame` #158

lkstrp commented Aug 6, 2024

github-actions bot commented Aug 6, 2024 •

edited

Loading

Ignore pre-commit changes in git blame #158

Ignore pre-commit changes in git blame #158

Conversation

lkstrp commented Aug 6, 2024

github-actions bot commented Aug 6, 2024 • edited Loading

Validator Report

Ignore pre-commit changes in `git blame` #158

Ignore pre-commit changes in `git blame` #158

github-actions bot commented Aug 6, 2024 •

edited

Loading