Merge branch 'release/v0.4.5' into fix/Mview

Author: WolfBunke

dataprocessing/eGo_data_processing.py

@@ -47,7 +47,7 @@ def data_processing():
 #        'ego_dp_substation_hvmv.sql',                       # Abstract HVMV Substations of the high voltage level from OSM
 #        'ego_dp_substation_ehv.sql',                        # Abstract EHV Substations of the extra high voltage level from OSM
 #        'ego_dp_substation_otg.sql',                        # Assign osmTGmod-id to HVMV and EHV substations
-#       'ego_dp_substation_hvmv_voronoi.sql',               # HVMV Voronoi cells based on HVMV substations
+#        'ego_dp_substation_hvmv_voronoi.sql',               # HVMV Voronoi cells based on HVMV substations
 #        'ego_dp_substation_ehv_voronoi.sql',                # EHV Voronoi cells based on EHV substations
 
     ## GRIDDISTRICT
@@ -95,23 +95,23 @@ def data_processing():
 #	'ego_dp_powerflow_electrical_neighbour.sql',		# Create border crossing lines and buses in neighbouring countries
 #	'ego_dp_powerflow_fix_ehv_subnetworks.sql',		# Fix topological errors in eHV grid
 #	'ego_dp_powerflow_grid_future_scenarios.sql',		# Copy grid to future scenarios 
-#	'ego_dp_powerflow_assignment_otgid.sql',		# assign otg_id to pp lists
-#	'ego_dp_powerflow_assignment_unid.sql',			# create a unified_id over all pp (res and conv)	    
-#	'ego_dp_powerflow_create_pp_mview.sql',			# create mviews to display power plants per scenario
-#	'ego_dp_powerflow_assignment_generator.sql',  		# Assign generators to corresponding substation (SQ, NEP2035, eGo100)
-#	'ego_dp_powerflow_assignment_load.sql',        		# Assign loads to their corresponding substation (SQ, NEP2035, eGo100)
-#	'ego_dp_powerflow_assignment_storage.sql',		# Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100)
-#	'ego_dp_powerflow_timeseries_generator.sql',		# Transfer renpassG!S results into the corresponding powerflow table
-#	'ego_dp_powerflow_griddistrict_demand.py',		# Demand per MV Griddistrict
-#	'ego_dp_powerflow_timeseries_demand.sql',		# Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100)
-#	'ego_dp_powerflow_lopf_data.sql',			# Set marginal costs for generators and storages
-#	'ego_dp_data_check.sql',				# Check powerflow data for plausibility
+	'ego_dp_powerflow_assignment_otgid.sql',		# assign otg_id to pp lists
+	'ego_dp_powerflow_assignment_unid.sql',			# create a unified_id over all pp (res and conv)	    
+	'ego_dp_powerflow_create_pp_mview.sql',			# create mviews to display power plants per scenario
+	'ego_dp_powerflow_assignment_generator.sql',  		# Assign generators to corresponding substation (SQ, NEP2035, eGo100)
+	'ego_dp_powerflow_assignment_load.sql',        		# Assign loads to their corresponding substation (SQ, NEP2035, eGo100)
+	'ego_dp_powerflow_assignment_storage.sql',		# Assign storages to their corresponding substation (SQ, NEP 2035, eGo 100)
+	'ego_dp_powerflow_timeseries_generator.sql',		# Transfer renpassG!S results into the corresponding powerflow table
+	'ego_dp_powerflow_griddistrict_demand.py',		# Demand per MV Griddistrict
+	'ego_dp_powerflow_timeseries_demand.sql',		# Insert demand series into corresponding powerflow table (SQ, NEP2035, eGo100)
+	'ego_dp_powerflow_lopf_data.sql',			# Set marginal costs for generators and storages
+	'ego_dp_data_check.sql',				# Check powerflow data for plausibility
     ## POST-PROCESSING
-#        'ego_pp_nep2035_grid_variations.sql'			# Create extension_tables and insert NEP-data
+        'ego_pp_nep2035_grid_variations.sql'			# Create extension_tables and insert NEP-data
 
     ## VERSIONING
-#   	'ego_dp_versioning.sql',				# Versioning
-	'ego_dp_versioning_mviews.sql' ,			# Versioning of mviews
+   	'ego_dp_versioning.sql',				# Versioning
+#	'ego_dp_versioning_mviews.sql' ,			# Versioning of mviews
 
 
 

dataprocessing/python_scripts/ego_dp_loadarea_peakload.py

@@ -128,7 +128,7 @@ def add_sectoral_peak_load(load_areas, **kwargs):
                                       columns=columns)
 
     write_ego_scenario_log(conn=conn,
-                           version='v0.4.4',
+                           version='v0.4.5',
                            io='input',
                            schema='model_draft',
                            table=table,
@@ -276,7 +276,7 @@ def add_sectoral_peak_load(load_areas, **kwargs):
     metadata.submit_comment(conn, json_str, schema, target_table)
 
     write_ego_scenario_log(conn=conn,
-                           version='v0.4.4',
+                           version='v0.4.5',
                            io='output',
                            schema='model_draft',
                            table=target_table,

dataprocessing/python_scripts/ego_dp_powerflow_griddistrict_demand.py

@@ -65,7 +65,7 @@ def demand_per_mv_grid_district():
     annual_demand_df = annual_demand_df.loc[~pd.isnull(annual_demand_df.index)]
 
     write_scenario_log(conn=conn,
-                           version='v0.4.4',
+                           version='v0.4.5',
                            project='eGoDP',
                            io='input',
                            schema='model_draft',
@@ -80,7 +80,7 @@ def demand_per_mv_grid_district():
         index_col='polygon_id')
 
     write_scenario_log(conn=conn,
-                           version='v0.4.4',
+                           version='v0.4.5',
                            project='eGoDP',
                            io='input',
                            schema='model_draft',
@@ -188,7 +188,7 @@ def demand_per_mv_grid_district():
     metadata.submit_comment(conn, json_str, schema, target_table)
 
     write_scenario_log(conn=conn,
-                           version='v0.4.4',
+                           version='v0.4.5',
                            project='eGoDP',
                            io='output',
                            schema=schema,

dataprocessing/python_scripts/setup_ego_mv_powerflow.py

@@ -68,7 +68,7 @@ def create_powerflow_schema(engine, schema, tables):
             tools.grant_db_access(conn, schema, table, group)
 
             write_ego_scenario_log(conn=conn,
-                                   version='v0.4.4',
+                                   version='v0.4.5',
                                    io='output',
                                    schema=schema,
                                    table=table,