Merge pull request #424 from GermanZero-de/use-renewable-energy-data-…

…2023 Use renewable energy data 2023 for the calculation with year ref 2021
GermanZero-de · Dec 19, 2024 · 6b29017 · 6b29017
2 parents 618ebc8 + 9e3de1a
commit 6b29017
Show file tree

Hide file tree

Showing 7 changed files with 1,978 additions and 1,978 deletions.
diff --git a/src/climatevision/generator/refdata.py b/src/climatevision/generator/refdata.py
@@ -489,7 +489,7 @@ def filename(year_ref: int, what: str) -> str:
             "nat_organic_agri": "2020",  # FINISHED
             "nat_res_buildings": "2018",  # WE ARE USING THIS UNCHANGED (ONLY STATES AND NO NEW DATA)
             "population": "2021",  # FINISHED
-            "renewable_energy": "2021",  # LEON TO CHECK WHAT WENT WRONG
+            "renewable_energy": "2023",  # FINISHED
             "traffic": "2021",  # AGS TRANSPLANT 2018 to 2021 FINISHED
             "traffic_air": "2021",  # AGS TRANSPLANT 2018 to 2021 FINISHED
             "traffic_rail": "2021",  # AGS TRANSPLANT 2018 to 2021 FINISHED

diff --git a/tests/end_to_end_expected/2021/entries_03159016_2022_2035.json b/tests/end_to_end_expected/2021/entries_03159016_2022_2035.json
@@ -47,11 +47,11 @@
     "b_petrol_fec": 2008.2645355054158,
     "e_local_wind_onshore_ratio_power_to_area_sta": 0.417,
     "e_biomass_local_power_installable_sta": 6.616474937291133,
-    "e_PV_power_inst_agripv": 0.011387497,
-    "e_PV_power_inst_biomass": 8.424,
-    "e_PV_power_inst_facade": 0.011387497,
-    "e_PV_power_inst_park": 3.07462419,
-    "e_PV_power_inst_roof": 19.677594816,
+    "e_PV_power_inst_agripv": 0.015756144,
+    "e_PV_power_inst_biomass": 7.36,
+    "e_PV_power_inst_facade": 0.015756144,
+    "e_PV_power_inst_park": 4.25415888,
+    "e_PV_power_inst_roof": 27.226616832,
     "e_PV_power_inst_water": 0.5075,
     "e_PV_power_inst_wind_on": 13.5,
     "e_PV_power_to_be_inst_agri": 0.10063,