Merge branch 'fixes/#280-validate-egon100_missing-cossborder-lines' i…

…nto test-branch-egon100re-29-08-24
openego · Aug 29, 2024 · 40de458 · 40de458
2 parents 243e21c + e00212a
commit 40de458
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/egon/data/datasets/pypsaeur/__init__.py b/src/egon/data/datasets/pypsaeur/__init__.py
@@ -371,23 +371,28 @@ def clean_database():
             WHERE "bus0" IN (
             SELECT bus_id FROM grid.egon_etrago_bus
                 WHERE country != 'DE'
-                AND scn_name = '{scn_name}')
+                AND scn_name = '{scn_name}'
+                AND bus_id NOT IN (SELECT bus_i FROM osmtgmod_results.bus_data))
             AND "bus1" IN (
             SELECT bus_id FROM grid.egon_etrago_bus
                 WHERE country != 'DE'
-                AND scn_name = '{scn_name}')
+                AND scn_name = '{scn_name}'
+                AND bus_id NOT IN (SELECT bus_i FROM osmtgmod_results.bus_data))
             );
 
+
             DELETE FROM {"grid.egon_etrago_" + comp}
             WHERE scn_name = '{scn_name}'
             AND "bus0" IN (
             SELECT bus_id FROM grid.egon_etrago_bus
                 WHERE country != 'DE'
-                AND scn_name = '{scn_name}')
+                AND scn_name = '{scn_name}'
+                AND bus_id NOT IN (SELECT bus_i FROM osmtgmod_results.bus_data))
             AND "bus1" IN (
             SELECT bus_id FROM grid.egon_etrago_bus
                 WHERE country != 'DE'
-                AND scn_name = '{scn_name}')
+                AND scn_name = '{scn_name}'
+                AND bus_id NOT IN (SELECT bus_i FROM osmtgmod_results.bus_data))
             ;"""
         )