Merge pull request #409 from Baltic-RCC/dev

Dev

Author: VeikoAunapuu

emf/common/loadflow_tool/settings_manager.py

@@ -17,9 +17,9 @@
 
 
 class LoadflowSettingsManager:
-    """Class-based settings manager for pypowsybl load flow, similar to RaoSettingsManager.
+    """Class-based settings manager for pypowsybl load flow parameters.
 
-    - Defaults are imported from loadflow.py.
+    - Defaults are imported from loadflow_settings.py.
     - Optional override file path is read from env:
         * LOADFLOW_CONFIG_OVERRIDE_PATH
       The file may be JSON or YAML.

emf/model_merger/merge_functions.py

@@ -965,7 +965,7 @@ def lvl8_report_cgm(merge_report: dict):
             violations.append(violations_list[0])
             quality_indicator_cgm = "Warning - non fatal inconsistencies"
     else:
-        violations = violations_list
+        violations.append(violations_list[1])
         quality_indicator_cgm = "Invalid - inconsistent data"
 
     #if scaling is failed then set error from error list

emf/model_merger/model_merger.py

@@ -119,8 +119,9 @@ def run_loadflow(merged_model):
             logger.info(f"Solving loadflow with settings: {lf_settings}")
             # report = pypowsybl.report.Reporter()
             manager = settings_manager.LoadflowSettingsManager(settings_keyword=lf_settings)
+            pp_loadflow_parameters = manager.build_pypowsybl_parameters()
             result = pypowsybl.loadflow.run_ac(network=merged_model.network,
-                                               parameters=manager.build_pypowsybl_parameters(),
+                                               parameters=pp_loadflow_parameters,
                                                # reporter=loadflow_report,
                                                )
             if result[0].status_text == 'Converged':
@@ -147,7 +148,7 @@ def run_loadflow(merged_model):
         merged_model.loadflow_status = result[0].status.name  # store main island loadflow status
         merged_model.loadflow_settings = lf_settings
 
-        return merged_model
+        return merged_model, pp_loadflow_parameters
 
     def handle(self, task_object: dict, properties: dict, **kwargs):
 
@@ -359,7 +360,7 @@ def handle(self, task_object: dict, properties: dict, **kwargs):
 
         # TODO - run other LF if default fails
         # Run loadflow on merged model
-        merged_model = self.run_loadflow(merged_model=merged_model)
+        merged_model, pp_loadflow_parameters = self.run_loadflow(merged_model=merged_model)
         logger.info(
             f"Loadflow status of main island: {merged_model.loadflow_status} [settings: {merged_model.loadflow_settings}]")
 
@@ -372,8 +373,7 @@ def handle(self, task_object: dict, properties: dict, **kwargs):
                     merged_model = scaler.scale_balance(model=merged_model,
                                                         ac_schedules=ac_schedules,
                                                         dc_schedules=dc_schedules,
-                                                        lf_settings=getattr(loadflow_settings,
-                                                                            merged_model.loadflow_settings))
+                                                        lf_settings=pp_loadflow_parameters)
                 except Exception as e:
                     logger.error(e)
                     merged_model.scaled = False
@@ -454,7 +454,7 @@ def handle(self, task_object: dict, properties: dict, **kwargs):
                 except Exception as error:
                     logging.error(f"Unexpected error on uploading to OPDM: {error}", exc_info=True)
             else:
-                logger.info(f"Model not uploaded to OPDM due to convergance issue: {merged_model.loadflow[0]['status']}")
+                logger.info(f"Model not uploaded to OPDM due to convergence or failed scaling issues")
 
         # Create zipped model data
         merged_model_object = BytesIO()