From 94e242b4ae8bec5acd2d7be56f0c76733c79c8b9 Mon Sep 17 00:00:00 2001
From: mr0321 <145195994+mr0321@users.noreply.github.com>
Date: Wed, 23 Jul 2025 08:59:03 +0300
Subject: [PATCH] Moves custom settings to general. reduces mismatches for
 CGM_RELAXED_2. Addresses #350

---
 emf/common/loadflow_tool/loadflow_settings.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/emf/common/loadflow_tool/loadflow_settings.py b/emf/common/loadflow_tool/loadflow_settings.py
index 05c06fb1..f09366d4 100644
--- a/emf/common/loadflow_tool/loadflow_settings.py
+++ b/emf/common/loadflow_tool/loadflow_settings.py
@@ -61,7 +61,12 @@
     # 'slackBusCountryFilter': [],
     # 'actionableSwitchesIds': [],
     'asymmetrical': 'False',
-    'minNominalVoltageTargetVoltageCheck': '20.0'
+    'minNominalVoltageTargetVoltageCheck': '20.0',
+    # For loadflow
+    'stateVectorScalingMode': 'LINE_SEARCH',
+    'voltageInitModeOverride': 'FULL_VOLTAGE',
+    # Fix Kirchoff 1st law error
+    'slackDistributionFailureBehavior': 'FAIL',
 }
 
 OPENLOADFLOW_DEFAULT = pypowsybl.loadflow.Parameters(
@@ -122,8 +127,8 @@
     'maxOuterLoopIterations': '30',  # eumd:PowerFlowSettings.maxIterationNumber "30"
     'lowImpedanceThreshold': '1.0E-5',  # cim:PowerFlowSettings.impedanceThreshold "1e-05" ;
     'newtonRaphsonStoppingCriteriaType': 'PER_EQUATION_TYPE_CRITERIA',
-    'maxActivePowerMismatch': '0.5',  # cim:PowerFlowSettings.activePowerTolerance "0.1"
-    'maxReactivePowerMismatch': '0.5',  # cim:PowerFlowSettings.reactivePowerTolerance "0.1"
+    'maxActivePowerMismatch': '0.1',  # cim:PowerFlowSettings.activePowerTolerance "0.1"
+    'maxReactivePowerMismatch': '0.1',  # cim:PowerFlowSettings.reactivePowerTolerance "0.1"
     'maxVoltageMismatch': '1.0E-4',  # cim:PowerFlowSettings.voltageTolerance "0.0001" ;
     'maxAngleMismatch': '1.0E-5',  # cim:PowerFlowSettings.voltageAngleLimit "10" ; TODO - How to convert
     'slackBusPMaxMismatch': '0.09',  # To fulfill QOCDC SV_INJECTION_LIMIT = 0.1
@@ -141,11 +146,6 @@
     'maxAngleMismatch': '1.0E-5',  # cim:PowerFlowSettings.voltageAngleLimit "10" ; TODO - How to convert
     'slackBusPMaxMismatch': '0.09',  # To fulfill QOCDC SV_INJECTION_LIMIT = 0.1
     'disableVoltageControlOfGeneratorsOutsideActivePowerLimits': 'true', # supress q part of igm-ssh-vs-cgm-ssh error
-    # For loadflow
-    'stateVectorScalingMode': 'LINE_SEARCH',
-    'voltageInitModeOverride': 'FULL_VOLTAGE',
-    # Fix Kirchoff 1st law error
-    'slackDistributionFailureBehavior': 'FAIL',
 }
 
 # Preparing CGM PROVIDER settings options from default settings