@enervance/insight-cim-model 0.0.176 → 0.0.177

package/dist/converter/integral7/converter.integral7.js

@@ -49,6 +49,11 @@ const INTEGRALPowerTransformerEndInfo_1 = require("../../model/extensions/integr
 const INTEGRALPowerTransformer3WInfo_1 = require("../../model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js");
 const INTEGRALTapChangerInfo_1 = require("../../model/extensions/integral/assetinfo/INTEGRALTapChangerInfo.js");
 const EVWireInfo_1 = require("../../model/extensions/enervance/assetinfo/EVWireInfo.js");
+const INTEGRALMultiplierFactor_1 = require("../../model/extensions/integral/common/INTEGRALMultiplierFactor.js");
+const INTEGRALACLineSegment_1 = require("../../model/extensions/integral/wires/INTEGRALACLineSegment.js");
+const INTEGRALAsynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALAsynchronousMachine.js");
+const INTEGRALExternalNetworkInjection_1 = require("../../model/extensions/integral/wires/INTEGRALExternalNetworkInjection.js");
+const INTEGRALSynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALSynchronousMachine.js");
 const GeneratingUnit_1 = require("../../model/generation/GeneratingUnit.js");
 const GeneratorControlSource_1 = require("../../model/generation/GeneratorControlSource.js");
 const HydroEnergyConversionKind_1 = require("../../model/generation/HydroEnergyConversionKind.js");
@@ -56,8 +61,8 @@ const HydroGeneratingUnit_1 = require("../../model/generation/HydroGeneratingUni
 const NuclearGeneratingUnit_1 = require("../../model/generation/NuclearGeneratingUnit.js");
 const SolarGeneratingUnit_1 = require("../../model/generation/SolarGeneratingUnit.js");
 const ThermalGeneratingUnit_1 = require("../../model/generation/ThermalGeneratingUnit.js");
-const WindGeneratingUnit_1 = require("../../model/generation/WindGeneratingUnit.js");
 const WindGenUnitKind_1 = require("../../model/generation/WindGenUnitKind.js");
+const WindGeneratingUnit_1 = require("../../model/generation/WindGeneratingUnit.js");
 const ConformLoadGroup_1 = require("../../model/loadmodel/ConformLoadGroup.js");
 const LoadArea_1 = require("../../model/loadmodel/LoadArea.js");
 const SubLoadArea_1 = require("../../model/loadmodel/SubLoadArea.js");
@@ -93,17 +98,21 @@ const SynchronousMachineOperatingMode_1 = require("../../model/wires/Synchronous
 const TapChangerControl_1 = require("../../model/wires/TapChangerControl.js");
 const TransformerControlMode_1 = require("../../model/wires/TransformerControlMode.js");
 const mysql_controller_1 = require("../../util/database/mysql-controller.js");
-const INTEGRALMultiplierFactor_1 = require("../../model/extensions/integral/common/INTEGRALMultiplierFactor.js");
-const INTEGRALACLineSegment_1 = require("../../model/extensions/integral/wires/INTEGRALACLineSegment.js");
-const INTEGRALAsynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALAsynchronousMachine.js");
-const INTEGRALExternalNetworkInjection_1 = require("../../model/extensions/integral/wires/INTEGRALExternalNetworkInjection.js");
-const INTEGRALSynchronousMachine_1 = require("../../model/extensions/integral/wires/INTEGRALSynchronousMachine.js");
+const INTEGRALModelContainer_1 = require("../../model-container/model/INTEGRALModelContainer.js");
+const AngleDegrees_1 = require("../../model/domain/AngleDegrees.js");
+const INTEGRALEquivalentInjection_1 = require("../../model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js");
+const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel/INTEGRALConformLoad.js");
+const AsynchronousMachineKind_1 = require("../../model/wires/AsynchronousMachineKind.js");
+const util_graph2tree_1 = require("../../util/collection/util-graph2tree.js");
 const util_create_1 = require("../../util/util-create.js");
 const utils_1 = require("../../util/utils.js");
+const common_utils_1 = require("../../utils2/common.utils.js");
+const parser_utils_1 = require("../../utils2/parser.utils.js");
 const integral_prefix_1 = require("./config/integral-prefix.js");
 const data_structures_i7_1 = require("./interface-i7/data-structures-i7.js");
 const export_frame_i7_1 = require("./interface-i7/export-frame-i7.js");
 const KnotenSo_1 = require("./model/integral/KnotenSo.js");
+const Laengskupplung_1 = require("./model/integral/Laengskupplung.js");
 const Leitung_1 = require("./model/integral/Leitung.js");
 const Schaltanlage_1 = require("./model/integral/Schaltanlage.js");
 const Schaltanlagenabschnitt_1 = require("./model/integral/Schaltanlagenabschnitt.js");
@@ -112,38 +121,31 @@ const Standort_1 = require("./model/integral/Standort.js");
 const integral_sql_1 = require("./sql/integral.sql.js");
 const utils_2 = require("./utils.js");
 const utils_trafo3w_1 = require("./utils-trafo3w.js");
-const INTEGRALModelContainer_1 = require("../../model-container/model/INTEGRALModelContainer.js");
-const Laengskupplung_1 = require("./model/integral/Laengskupplung.js");
-const INTEGRALConformLoad_1 = require("../../model/extensions/integral/loadmodel/INTEGRALConformLoad.js");
-const AngleDegrees_1 = require("../../model/domain/AngleDegrees.js");
-const AsynchronousMachineKind_1 = require("../../model/wires/AsynchronousMachineKind.js");
-const INTEGRALEquivalentInjection_1 = require("../../model/extensions/integral/equivalents/INTEGRALEquivalentInjection.js");
-const util_graph2tree_1 = require("../../util/collection/util-graph2tree.js");
-const parser_utils_1 = require("../../utils2/parser.utils.js");
-const common_utils_1 = require("../../utils2/common.utils.js");
-const SVCControlMode_1 = require("../../model/wires/SVCControlMode.js");
+const CsPpccControlKind_1 = require("../../model/dc/CsPpccControlKind.js");
 const DCGround_1 = require("../../model/dc/DCGround.js");
+const DCPolarityKind_1 = require("../../model/dc/DCPolarityKind.js");
+const VsCapabilityCurve_1 = require("../../model/dc/VsCapabilityCurve.js");
 const INTEGRALEquivalentBranch_1 = require("../../model/extensions/amprion/equivalents/INTEGRALEquivalentBranch.js");
-const PhaseTapChangerLinear_1 = require("../../model/wires/PhaseTapChangerLinear.js");
 const DCConverterUnit_1 = require("../../model/extensions/integral/dc/DCConverterUnit.js");
-const DCPolarityKind_1 = require("../../model/dc/DCPolarityKind.js");
+const ApparentPowerLimit_1 = require("../../model/operationallimits/ApparentPowerLimit.js");
+const ControlAreaTypeKind_1 = require("../../model/operations/ControlAreaTypeKind.js");
+const AsynchronousMachine_1 = require("../../model/wires/AsynchronousMachine.js");
+const PhaseTapChangerLinear_1 = require("../../model/wires/PhaseTapChangerLinear.js");
 const RotatingMachine_1 = require("../../model/wires/RotatingMachine.js");
+const SVCControlMode_1 = require("../../model/wires/SVCControlMode.js");
 const SynchronousMachine_1 = require("../../model/wires/SynchronousMachine.js");
-const AsynchronousMachine_1 = require("../../model/wires/AsynchronousMachine.js");
-const ControlAreaTypeKind_1 = require("../../model/operations/ControlAreaTypeKind.js");
-const CsPpccControlKind_1 = require("../../model/dc/CsPpccControlKind.js");
-const ApparentPowerLimit_1 = require("../../model/operationallimits/ApparentPowerLimit.js");
 const executor_1 = require("./dl-convert/executor.js");
 const Diagram_1 = require("../../model/diagram/Diagram.js");
-const util_cim_model_1 = require("./util-cim.model.js");
 const cim_constants_1 = require("../../constants/cim-constants.js");
 const EVWireObject_1 = require("../../model/extensions/enervance/assets/EVWireObject.js");
 const INTEGRALPowerTransformer2WInfo_1 = require("../../model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js");
+const impedance_utils_1 = require("./impedance.utils.js");
+const util_cim_model_1 = require("./util-cim.model.js");
 class ConverterIntegral7 {
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
         this.exportFrames = new Map();
-        /** Grenznetze gemäß Konfiguration  */
+        /** Grenznetz gemäß Konfiguration  */
         this.exportFramesBoundary = new Map();
         /** ContainerModel mit Default-CIM-Instanzen */
         this.cimModelDefault = new INTEGRALModelContainer_1.INTEGRALModelContainer();
@@ -539,84 +541,86 @@ class ConverterIntegral7 {
             /**
              * DL Profile
              **/
-            this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);
-            yield this.executor.mergeDataFromIntegralID2UUID(this.integralID2UUID);
-            for (const boundaryFrame of this.exportFramesBoundary.values()) {
-                yield this.executor.mergeDataFromFrame(boundaryFrame);
-            }
-            yield this.executor.mergeDataFromFrame(frame);
-            yield this.executor.loadAllSchemaVariants();
-            const netz_standortIds = standortIDs.map(standortId => {
-                return { id: standortId };
-            });
-            const netz_knotensoIds = knotenSoIDs.map(knotenSoId => {
-                return { id: knotenSoId };
-            });
-            for (const entry of this.exportFramesBoundary.entries()) {
-                entry[1].integral7Modell.integralStandorte.forEach((_, key) => {
-                    netz_standortIds.push({ id: key });
+            if (!frame.boundary) {
+                this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);
+                yield this.executor.mergeDataFromIntegralID2UUID(this.integralID2UUID);
+                for (const boundaryFrame of this.exportFramesBoundary.values()) {
+                    yield this.executor.mergeDataFromFrame(boundaryFrame);
+                }
+                yield this.executor.mergeDataFromFrame(frame);
+                yield this.executor.loadAllSchemaVariants();
+                const netz_standortIds = standortIDs.map(standortId => {
+                    return { id: standortId };
                 });
-                entry[1].integral7Modell.integralKnotenSo.forEach((_, key) => {
-                    netz_knotensoIds.push({ id: key });
+                const netz_knotensoIds = knotenSoIDs.map(knotenSoId => {
+                    return { id: knotenSoId };
                 });
-            }
-            const netzLeitungIds = [...integral7Modell.integralLeitungen.keys()];
-            const netzHgueLeitungIds = [...integral7Modell.integralHgueLeitungIds.values()];
-            const netzErsatzlaengszweigIds = [...integral7Modell.integalErsatzLaengszweigIds.values()];
-            const netzStreckenlastIds = [...integral7Modell.integralLeitungen.values()].map(leitung => leitung.streckenlastId).filter(id => id !== undefined && id !== null);
-            const allLeitungIds = [...new Set([...netzLeitungIds, ...netzHgueLeitungIds, ...netzErsatzlaengszweigIds, ...netzStreckenlastIds]).values()];
-            const convertOptions = {
-                only: {
-                    netz_standortIds,
-                    netz_knotensoIds,
-                    netz_schaltanlagenIds: schaltanlagenIDs.map(schaltanlagenId => {
-                        return { id: schaltanlagenId };
-                    }),
-                    netz_saabschnittIds: schaltanlagenAbschnittIDs.map(schaltanlagenAbschnittId => {
-                        return { id: schaltanlagenAbschnittId };
-                    }),
-                    netz_schaltfeldIds: schaltfeldIDs.map(schaltfeldId => {
-                        return { id: schaltfeldId };
-                    }),
-                    netz_leitungIds: allLeitungIds.map(leitungId => {
-                        return { id: leitungId };
-                    })
+                for (const entry of this.exportFramesBoundary.entries()) {
+                    entry[1].integral7Modell.currentSitesBoundary.forEach((_, key) => {
+                        netz_standortIds.push({ id: key });
+                    });
+                    entry[1].integral7Modell.integralKnotenSo.forEach((_, key) => {
+                        netz_knotensoIds.push({ id: key });
+                    });
                 }
-            };
-            const resultingObjects = yield this.executor.convert(convertOptions);
-            for (const resultingObject of resultingObjects) {
-                if (resultingObject instanceof Diagram_1.Diagram) {
-                    // UUIDs von Diagram-Objekten werden aus I7 übernommen
-                    frame.cimModel.addDiagram(resultingObject);
-                    while (resultingObject.diagramElements.length > 0) {
-                        const currentDiagramObject = resultingObject.diagramElements.pop();
-                        // const diagramObject = resultingObject as DiagramObject;
-                        const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObject, this.configUuid, currentDiagramObject.getIdentifiedObjectUUID());
-                        currentDiagramObject.mrid = uuid;
-                        for (const diagramObjectPoint of currentDiagramObject.diagramObjectPoints) {
-                            const key = uuid + String((_a = diagramObjectPoint.sequenceNumber) !== null && _a !== void 0 ? _a : 1);
-                            const pointUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObjectPoint, this.configUuid, key);
-                            diagramObjectPoint.mrid = pointUuid;
+                const netzLeitungIds = [...integral7Modell.integralLeitungen.keys()];
+                const netzHgueLeitungIds = [...integral7Modell.integralHgueLeitungIds.values()];
+                const netzErsatzlaengszweigIds = [...integral7Modell.integalErsatzLaengszweigIds.values()];
+                const netzStreckenlastIds = [...integral7Modell.integralLeitungen.values()].map(leitung => leitung.streckenlastId).filter(id => id !== undefined && id !== null);
+                const allLeitungIds = [...new Set([...netzLeitungIds, ...netzHgueLeitungIds, ...netzErsatzlaengszweigIds, ...netzStreckenlastIds]).values()];
+                const convertOptions = {
+                    only: {
+                        netz_standortIds,
+                        netz_knotensoIds,
+                        netz_schaltanlagenIds: schaltanlagenIDs.map(schaltanlagenId => {
+                            return { id: schaltanlagenId };
+                        }),
+                        netz_saabschnittIds: schaltanlagenAbschnittIDs.map(schaltanlagenAbschnittId => {
+                            return { id: schaltanlagenAbschnittId };
+                        }),
+                        netz_schaltfeldIds: schaltfeldIDs.map(schaltfeldId => {
+                            return { id: schaltfeldId };
+                        }),
+                        netz_leitungIds: allLeitungIds.map(leitungId => {
+                            return { id: leitungId };
+                        })
+                    }
+                };
+                const resultingObjects = yield this.executor.convert(convertOptions);
+                for (const resultingObject of resultingObjects) {
+                    if (resultingObject instanceof Diagram_1.Diagram) {
+                        // UUIDs von Diagram-Objekten werden aus I7 übernommen
+                        frame.cimModel.addDiagram(resultingObject);
+                        while (resultingObject.diagramElements.length > 0) {
+                            const currentDiagramObject = resultingObject.diagramElements.pop();
+                            // const diagramObject = resultingObject as DiagramObject;
+                            const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObject, this.configUuid, currentDiagramObject.getIdentifiedObjectUUID());
+                            currentDiagramObject.mrid = uuid;
+                            for (const diagramObjectPoint of currentDiagramObject.diagramObjectPoints) {
+                                const key = uuid + String((_a = diagramObjectPoint.sequenceNumber) !== null && _a !== void 0 ? _a : 1);
+                                const pointUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DiagramObjectPoint, this.configUuid, key);
+                                diagramObjectPoint.mrid = pointUuid;
+                            }
+                            frame.cimModel.addDiagramObject(currentDiagramObject);
                         }
-                        frame.cimModel.addDiagramObject(currentDiagramObject);
-                    }
-                    resultingObject.diagramElements = [];
-                    // } else if (resultingObject instanceof DiagramObject) {
-                    //   // UUIDs gemäß UUID v5 generieren
-                    //   const diagramObject = resultingObject as DiagramObject;
-                    //   const uuid = CommonUtils.generateUUIDv5(ClassNames.DiagramObject, this.configUuid, diagramObject.getIdentifiedObjectUUID());
-                    //   diagramObject.mrid = uuid;
-                    //
-                    //   for (const diagramObjectPoint of diagramObject.diagramObjectPoints) {
-                    //     const key = uuid + String(diagramObjectPoint.sequenceNumber ?? 1);
-                    //     const pointUuid = CommonUtils.generateUUIDv5(ClassNames.DiagramObjectPoint, this.configUuid, key);
-                    //     diagramObjectPoint.mrid = pointUuid;
-                    //   }
-                    //   frame.cimModel.addDiagramObject(resultingObject);
-                }
-            }
-            this.executor.dataManager.cimModelGraph.purgeAll();
-            this.executor.dataManager.dbObjectKeyCimModelUuidGraph.purgeAll();
+                        resultingObject.diagramElements = [];
+                        // } else if (resultingObject instanceof DiagramObject) {
+                        //   // UUIDs gemäß UUID v5 generieren
+                        //   const diagramObject = resultingObject as DiagramObject;
+                        //   const uuid = CommonUtils.generateUUIDv5(ClassNames.DiagramObject, this.configUuid, diagramObject.getIdentifiedObjectUUID());
+                        //   diagramObject.mrid = uuid;
+                        //
+                        //   for (const diagramObjectPoint of diagramObject.diagramObjectPoints) {
+                        //     const key = uuid + String(diagramObjectPoint.sequenceNumber ?? 1);
+                        //     const pointUuid = CommonUtils.generateUUIDv5(ClassNames.DiagramObjectPoint, this.configUuid, key);
+                        //     diagramObjectPoint.mrid = pointUuid;
+                        //   }
+                        //   frame.cimModel.addDiagramObject(resultingObject);
+                    }
+                }
+                this.executor.dataManager.cimModelGraph.purgeAll();
+                this.executor.dataManager.dbObjectKeyCimModelUuidGraph.purgeAll();
+            }
         });
     }
     assignTerminalSequenceNumber(cimModel) {
@@ -900,7 +904,7 @@ class ConverterIntegral7 {
                         integral_prefix_1.SCHALTFELD_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
-                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, i7Data === null || i7Data === void 0 ? void 0 : i7Data.bezeichner, i7Data.kurzname, i7Schluessel);
+                    const bay = new AMPRIONBay_1.AMPRIONBay(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_B'], 32, true), i7Data.kurzname, i7Schluessel);
                     bay.key = i7Schluessel;
                     if (i7Data.feldnummer > 0) {
                         const stop = true;
@@ -933,7 +937,7 @@ class ConverterIntegral7 {
                     const substation = cimModel.getSubstation(this.integralID2UUID.get(i7Data.standort));
                     const rdfid = (0, parser_utils_1.getUUID)(i7Data.guid_cn, this.objectMappingConfig.standardiseUuid);
                     // const vl = new VoltageLevel(getUUID(i7Data.guid_v, this.objectMappingConfig.standardiseUuid), createNotation([getName(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
-                    const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VoltageLevel, this.configUuid, rdfid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), i7Data.un.toString(), '_VL']), i7Data.kurzname);
+                    const vl = new VoltageLevel_1.VoltageLevel(common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VoltageLevel, this.configUuid, rdfid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', i7Data.un.toString(), '_VL']), i7Data.kurzname);
                     //const rdfid = getUUID(i7Data.guid); /**This is the mrid for TopologicalNode */
                     const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', rdfid.substring(0, 8), '_CN']), i7Data.kurzname, i7Data.kommentar);
                     connectivityNode.setConnectivityNodeContainer(vl);
@@ -970,6 +974,7 @@ class ConverterIntegral7 {
                     integral7.integralKnotenSo.set(i7Data.id, object);
                     object.standort = integral7.integralStandorte.get(object.standortid);
                     cimModel.addVoltageLevel(vl);
+                    //cimModel.addBaseVoltage(baseVoltage);
                     cimModel.addConnectivityNode(connectivityNode);
                     this.checkAnschlussIDs(i7Data.id, integral7);
                     this.addIdMapping(i7Data.id, connectivityNode.mrid, integral_sql_1.Integral7TableNames.KNOTEN_SO);
@@ -1382,6 +1387,15 @@ class ConverterIntegral7 {
                     const qType = Math.sqrt(Math.pow(genType === null || genType === void 0 ? void 0 : genType.sr, 2) - Math.pow(pType, 2));
                     // AMP I7 Profil
                     synchronousMachine.cos_phi = i7Data.cos_phi;
+                    if (synchronousMachine.getUUID() === '03ee3f18-9984-48eb-bc26-09e8c182fbda') {
+                        let stop = true;
+                    }
+                    if (synchronousMachine.getUUID() === 'f6d81d19-dca0-48e9-a43e-4ab1f6bf697d') {
+                        let stop = true;
+                    }
+                    if (synchronousMachine.getUUID() === '90d65269-183e-40f4-a437-c089df5b0b63') {
+                        let stop = true;
+                    }
                     // SSH Profil
                     synchronousMachine.setActivePower(p * -1); //convert to load sign system
                     synchronousMachine.setReactivePower(q * -1); //convert to load sign system
@@ -1422,7 +1436,7 @@ class ConverterIntegral7 {
                     // synchronousMachine.shortCircuitRotorType: ShortCircuitRotorKind;
                     // synchronousMachine.voltageRegulationRange: number;
                     /** Create ReactiveCapabilityCurves */
-                    if (minP !== undefined && maxP !== undefined && minQvonPmin != undefined && maxQvonPmax !== undefined) {
+                    if (minP !== undefined && maxP !== undefined && minQvonPmin !== undefined && maxQvonPmax !== undefined) {
                         const reactiveCapabilityCurve = new ReactiveCapabilityCurve_1.ReactiveCapabilityCurve((0, parser_utils_1.getUUID)(i7Data.guid_rcc, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)(['CurveData', synchronousMachine.mrid, '_RCC']));
                         reactiveCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
                         reactiveCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
@@ -2217,8 +2231,7 @@ class ConverterIntegral7 {
                     const qr = (0, parser_utils_1.isNumericI7)(i7Data.qr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qr) : undefined;
                     const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
                     shunt.nomU = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
-                    // Set electrical properties
-                    // Set electrical properties (EQ)
+                    // Set electrical properties (EQ core)
                     if ((0, parser_utils_1.isNumericI7)(i7Data.aktstufe) && (0, parser_utils_1.isNumericI7)(i7Data.maxstufe)) {
                         shunt.sections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
                         shunt.normalSections = (0, parser_utils_1.convertToNumberI7)(i7Data.aktstufe);
@@ -2254,7 +2267,7 @@ class ConverterIntegral7 {
                     }
                     shunt.bPerSection = (0, utils_2.calculateBPerSection)(qr * -1, shunt.nomU, shunt.maximumSections);
                     shunt.gPerSection = (0, utils_2.calculateGPerSection)(pr, shunt.nomU, shunt.maximumSections);
-                    //SHC section
+                    //Set electrical properties (EQ short circuit)
                     const r0 = (0, parser_utils_1.isNumericI7)(i7Data.r0) ? i7Data.r0 : undefined;
                     const x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0) ? i7Data.x0 : undefined;
                     shunt.b0PerSection = (0, utils_2.calculateB0PerSection)(/*r0,*/ Math.abs(x0)) * -1;
@@ -2351,13 +2364,12 @@ class ConverterIntegral7 {
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
                     const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
-                    const uref = (0, parser_utils_1.isNumericI7)(i7Data.uref) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uref) : undefined;
                     const mrez = (0, parser_utils_1.isNumericI7)(i7Data.mrez) ? (0, parser_utils_1.convertToNumberI7)(i7Data.mrez) : undefined;
                     const qkapr = (0, parser_utils_1.isNumericI7)(i7Data.qkapr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qkapr) : undefined;
                     const qindr = (0, parser_utils_1.isNumericI7)(i7Data.qindr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qindr) : undefined;
                     /** EQ */
-                    statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(uref, qkapr);
-                    statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(uref, qindr)) * -1;
+                    statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(ur, qkapr);
+                    statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(ur, qindr)) * -1;
                     statVarCom.slope = mrez !== 0 ? 1 / mrez : 0;
                     statVarCom.sVCControlMode = SVCControlMode_1.SVCControlMode.voltage;
                     statVarCom.aggregate = false;
@@ -2388,15 +2400,13 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SVC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SVC), knotenSfIDs));
                 for (const i7Data of result) {
                     const statVarCom = new StaticVarCompensator_1.StaticVarCompensator((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SVC']), i7Data.kurzname);
-                    const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                     const ur = (0, parser_utils_1.isNumericI7)(i7Data.ur) ? (0, parser_utils_1.convertToNumberI7)(i7Data.ur) : undefined;
-                    const uref = (0, parser_utils_1.isNumericI7)(i7Data.uref) ? (0, parser_utils_1.convertToNumberI7)(i7Data.uref) : undefined;
                     const mrez = (0, parser_utils_1.isNumericI7)(i7Data.mrez) ? (0, parser_utils_1.convertToNumberI7)(i7Data.mrez) : undefined;
                     const qkapr = (0, parser_utils_1.isNumericI7)(i7Data.qkapr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qkapr) : undefined;
                     const qindr = (0, parser_utils_1.isNumericI7)(i7Data.qindr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qindr) : undefined;
                     /** EQ */
-                    statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(uref, qkapr);
-                    statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(uref, qindr)) * -1;
+                    statVarCom.capacitiveRating = (0, utils_2.calculateStatVarComRating)(ur, qkapr);
+                    statVarCom.inductiveRating = Math.abs((0, utils_2.calculateStatVarComRating)(ur, qindr)) * -1;
                     statVarCom.slope = mrez !== 0 ? 1 / mrez : 0;
                     statVarCom.sVCControlMode = SVCControlMode_1.SVCControlMode.voltage;
                     statVarCom.aggregate = false;
@@ -2423,7 +2433,7 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KOPFSTATION_KLASSISCH, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_KLASSISCH), knotenSfIDs));
                 for (const i7Data of result) {
                     /** Containment DC DCConverterUnit */
-                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
+                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
                     dcConverterUnit.governorSCDAc = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
                     dcConverterUnit.governorSCDDc = (0, parser_utils_1.isNumericI7)(i7Data.krdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.krdc) : undefined;
                     // Topologie
@@ -2451,9 +2461,10 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const csConverter = new CsConverter_1.CsConverter((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CSC']), i7Data.kurzname);
+                    const csConverter = new CsConverter_1.CsConverter((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_CSC']), i7Data.kurzname);
                     const pr = (0, parser_utils_1.isNumericI7)(i7Data.pr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pr) : undefined;
                     const pges = (0, parser_utils_1.isNumericI7)(i7Data.pges) ? (0, parser_utils_1.convertToNumberI7)(i7Data.pges) : undefined;
+                    const qges = (0, parser_utils_1.isNumericI7)(i7Data.qges) ? (0, parser_utils_1.convertToNumberI7)(i7Data.qges) : undefined;
                     /** Wenn Leitungen konvertiert werden, wird das Attribut operationMode gesetzt. */
                     csConverter.equipmentContainer = dcConverterUnit;
                     /** Bemessungsleistung (Gleichstromseite) in MW
@@ -2480,7 +2491,7 @@ class ConverterIntegral7 {
                     csConverter.minGamma = (0, parser_utils_1.isNumericI7)(i7Data.gamma) ? (0, parser_utils_1.convertToNumberI7)(i7Data.gamma) : 21.5;
                     /** SSH profile export*/
                     csConverter.p = pges ? pges * -1 : 0;
-                    csConverter.q = (0, parser_utils_1.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
+                    csConverter.q = qges ? qges * -1 : 0;
                     this.setTopologyEnergySourceConsumerObject(cimModel, csConverter, i7Data);
                     /** Status */
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
@@ -2522,9 +2533,7 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_KOPFSTATION_VSC, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_KOPFSTATION_VSC), knotenSfIDs));
                 for (const i7Data of result) {
                     /** Containment DC DCConverterUnit */
-                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
-                    /** target voltage local*/
-                    const localTargetVoltage = (0, parser_utils_1.isNumericI7)(i7Data.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7Data.usoll) : undefined;
+                    const dcConverterUnit = new DCConverterUnit_1.INTEGRALDCConverterUnit((0, parser_utils_1.getUUID)(i7Data.guid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCCU']));
                     dcConverterUnit.referencePriority = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
                     dcConverterUnit.governorSCDAc = (0, parser_utils_1.isNumericI7)(i7Data.kr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.kr) : undefined;
                     dcConverterUnit.governorSCDDc = (0, parser_utils_1.isNumericI7)(i7Data.krdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.krdc) : undefined;
@@ -2557,10 +2566,7 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`DCConverterUnit ${i7Data.id} besitzt keinen ConnectivityNode.`);
                     }
-                    const vsConverter = new VsConverter_1.VsConverter((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_VSC']), i7Data.kurzname);
-                    if (vsConverter.getUUID() === '1b2b2901-0bb9-4aa3-9117-06d68fbbc7cb') {
-                        let stop = true;
-                    }
+                    const vsConverter = new VsConverter_1.VsConverter((0, parser_utils_1.getUUID)(i7Data.guid_dcconverterp, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_VSC']), i7Data.kurzname);
                     /** Wenn Leitungen konvertiert werden, wird das Attribut operationMode gesetzt. */
                     vsConverter.equipmentContainer = dcConverterUnit;
                     /** Bemessungsleistung (Gleichstromseite) in MW
@@ -2578,13 +2584,18 @@ class ConverterIntegral7 {
                     vsConverter.switchingLoss = undefined;
                     /*  csConverter.maxModulationIndex = ;
                         csConverter.maxValveCurrent =  */
+                    /** CapabilityCurveData */
+                    const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
+                    const minP = (0, parser_utils_1.isNumericI7)(i7Data.p_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_min) : undefined;
+                    const maxQ = (0, parser_utils_1.isNumericI7)(i7Data.q_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_max) : undefined;
+                    const minQ = (0, parser_utils_1.isNumericI7)(i7Data.q_min) ? (0, parser_utils_1.convertToNumberI7)(i7Data.q_min) : undefined;
                     /** SSH export values */
                     vsConverter.p = (0, parser_utils_1.isNumericI7)(i7Data.pges) ? i7Data.pges * -1 : 0;
                     vsConverter.q = (0, parser_utils_1.isNumericI7)(i7Data.qges) ? i7Data.qges * -1 : 0;
                     this.setTopologyEnergySourceConsumerObject(cimModel, vsConverter, i7Data, targetVoltages);
                     vsConverter.droop = 0; //pu
                     vsConverter.droopCompensation = 0; //Resistance
-                    vsConverter.qShare = 0; //PerCent
+                    vsConverter.qShare = 100; //PerCent
                     /** Status */
                     const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
                     vsConverter.normallyInService = inBetrieb;
@@ -2598,6 +2609,40 @@ class ConverterIntegral7 {
                     vsConverter.dCTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
                     acDCConverterDCTerminal.dcNode = dcNode;
                     dcNode.dcTerminals.set(acDCConverterDCTerminal.getUUID(), acDCConverterDCTerminal);
+                    /** Create ReactiveCapabilityCurves */
+                    if (minP !== undefined && maxP !== undefined && minQ != undefined && maxQ !== undefined) {
+                        let keyVsCapabilityCurve = cim_class_names_1.ClassNames.VsCapabilityCurve + i7Data.id + vsConverter.getUUID();
+                        let uuidVsCapabilityCurve = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.VsCapabilityCurve, this.configUuid, keyVsCapabilityCurve);
+                        const vsCapabilityCurve = new VsCapabilityCurve_1.VsCapabilityCurve(uuidVsCapabilityCurve, (0, util_create_1.createNotation)(['CurveData', vsConverter.getUUID().substring(0, 8), '_VCC']));
+                        vsCapabilityCurve.curveStyle = CurveStyle_1.CurveStyle.straightLineYValues;
+                        vsCapabilityCurve.xUnit = UnitSymbol_1.UnitSymbol.W;
+                        vsCapabilityCurve.y1Unit = UnitSymbol_1.UnitSymbol.VAr;
+                        vsCapabilityCurve.y2Unit = UnitSymbol_1.UnitSymbol.VAr;
+                        //reactive capability curve data for pmin
+                        let keyCurveData = cim_class_names_1.ClassNames.CurveData + vsCapabilityCurve.getUUID() + 'MINP';
+                        let uuidCurveData = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.CurveData, this.configUuid, keyCurveData);
+                        const curveData1 = new CurveData_1.CurveData(uuidCurveData);
+                        curveData1.curve = vsCapabilityCurve;
+                        curveData1.xvalue = minP; //pMin
+                        curveData1.y1value = minQ; //qMin
+                        curveData1.y2value = maxQ; //qMax pMin
+                        cimModel.addCurveData(curveData1);
+                        //reactive capability curve data for pmax
+                        keyCurveData = cim_class_names_1.ClassNames.CurveData + vsCapabilityCurve.getUUID() + 'MAXP';
+                        uuidCurveData = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.CurveData, this.configUuid, keyCurveData);
+                        const curveData2 = new CurveData_1.CurveData(uuidCurveData);
+                        curveData2.curve = vsCapabilityCurve;
+                        curveData2.xvalue = maxP; //pMax
+                        curveData2.y1value = minQ; //qMin pMax
+                        curveData2.y2value = maxQ; //qMin pMax
+                        cimModel.addCurveData(curveData2);
+                        cimModel.addVsCapabilityCurve(vsCapabilityCurve);
+                        vsConverter.capabilityCurve = vsCapabilityCurve;
+                        vsCapabilityCurve.VsConverterDCSides.set(vsConverter.getUUID(), vsConverter);
+                    }
+                    else {
+                        vsConverter.targetQpcc = 0;
+                    }
                     /** DCNode speichern, um später DCLines anschließen zu können*/
                     cimModel.addDCConverterUnit(dcConverterUnit);
                     cimModel.addVSConverter(vsConverter);
@@ -2784,7 +2829,7 @@ class ConverterIntegral7 {
         });
     }
     setTopologyEnergySourceConsumerObject(cimModel, condEquip, i7Data, targetVoltages, generatingUnit, isStatcom) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
         condEquip.normallyInService = inBetrieb;
         const connectivityNode = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
@@ -2856,7 +2901,7 @@ class ConverterIntegral7 {
             spannungsregelungLokal = (0, parser_utils_1.isBooleanI7)(i7DataHgue.spannungsgeregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7DataHgue.spannungsgeregelt) : false;
             spannungsregelungRemote = (0, parser_utils_1.isBooleanI7)(i7DataHgue.rpv_geregelt) ? (0, parser_utils_1.convertToBooleanI7)(i7DataHgue.rpv_geregelt) : false;
             knotenSpgGeregelt = cimModel.objects.get(this.integralID2UUID.get(i7DataHgue.knotenspgreg));
-            isRegulatingControl = false;
+            isRegulatingControl = spannungsregelungLokal || spannungsregelungRemote;
         }
         else if (i7DataSVC) {
             isRegulatingControl = true;
@@ -2897,7 +2942,9 @@ class ConverterIntegral7 {
                     if ((knotenSpgGeregelt || connectivityNode) && spannungsregelungLokal) {
                         switch (knotenSpgGeregelt) {
                             case undefined: {
-                                cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
+                                if (cpTerminal.connectivityNode.getConnectivityNodeContainer() instanceof Bay_1.Bay) {
+                                    cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
+                                }
                                 if (cterminal === undefined) {
                                     cterminal = (0, util_graph2tree_1.getControlledNode)(cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)), cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)));
                                 }
@@ -2938,7 +2985,7 @@ class ConverterIntegral7 {
                     rControl.targetDeadband = (0, parser_utils_1.isNumericI7)(uband) ? uband : undefined; //zulässiges Spannungsband
                     /** Spannung in kilo*/
                     //TODO TEMP FIX bei lokaler Regelegung bleibt usoll = null.
-                    rControl.targetValue = !usoll ? i7Data.usoll : usoll;
+                    rControl.targetValue = (0, parser_utils_1.isNumericI7)(usoll) ? usoll : ((0, parser_utils_1.isNumericI7)(i7DataEinsp === null || i7DataEinsp === void 0 ? void 0 : i7DataEinsp.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7DataEinsp.usoll) : tCn.getBaseVoltageAsNumber());
                     const guidSuffix = (_a = tCn === null || tCn === void 0 ? void 0 : tCn.getVoltageLevel()) === null || _a === void 0 ? void 0 : _a.getUUID().substring(0, 8);
                     rControl.name = (0, util_create_1.createNotation)([rControl.name, '_', guidSuffix, '_RC'], 32, true);
                     rControl.terminalUUID = cterminal.getUUID();
@@ -2952,9 +2999,6 @@ class ConverterIntegral7 {
                         term.addRegulatingControl(rControl);
                     }
                 }
-                else {
-                    const stop = true;
-                }
             }
             else if (isRegulatingControl && i7DataSVC) {
                 /** Regelung */
@@ -2962,6 +3006,7 @@ class ConverterIntegral7 {
                 const cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
                 let tVMax = undefined;
                 let tVMin = undefined;
+                let uref = (0, parser_utils_1.isNumericI7)(i7DataSVC.uref) ? (0, parser_utils_1.convertToNumberI7)(i7DataSVC.uref) : undefined;
                 if (cterminal) {
                     tCn = cterminal.getConnectivityNode();
                     if (tCn) {
@@ -3011,7 +3056,7 @@ class ConverterIntegral7 {
                             }
                         }
                     }
-                    rControl.targetValue = usoll;
+                    rControl.targetValue = uref != undefined && uref > 0 ? uref : usoll;
                     rControl.targetDeadband = uband;
                     rControl.terminal = cterminal;
                     const guidSuffix = (_b = tCn === null || tCn === void 0 ? void 0 : tCn.getVoltageLevel()) === null || _b === void 0 ? void 0 : _b.getUUID().substring(0, 8);
@@ -3022,54 +3067,57 @@ class ConverterIntegral7 {
                     cterminal.addRegulatingControl(rControl);
                     cimModel.addRegulatingControl(rControl);
                 }
-                else {
-                    const stop = true;
-                }
             }
-            else if (i7DataHgue) {
-                let cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
+            else if (i7DataHgue) { //DC and AC controls for HVDC systems
                 const regelungU = (0, parser_utils_1.convertToBooleanI7)(i7DataHgue.u_geregelt);
                 const regelungP = (0, parser_utils_1.convertToBooleanI7)(i7DataHgue.p_geregelt);
                 condEquip.pccTerminal = cpTerminal;
                 if (condEquip instanceof CsConverter_1.CsConverter) {
                     if (regelungU) {
-                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.inverter;
+                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
                         condEquip.pPccControl = CsPpccControlKind_1.CsPpccControlKind.dcVoltage;
                         condEquip.targetUdc = (0, parser_utils_1.isNumericI7)(i7DataHgue.udc) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.udc) : condEquip.ratedUdc;
+                        condEquip.targetPpcc = (0, parser_utils_1.isNumericI7)(i7DataHgue.pges) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pges) : ((0, parser_utils_1.isNumericI7)(i7DataHgue.pr) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pr) : undefined);
+                        condEquip.targetIdc = (0, parser_utils_1.isNumericI7)(condEquip.targetPpcc) && (0, parser_utils_1.isNumericI7)(condEquip.targetUdc) ? condEquip.targetPpcc / condEquip.targetUdc : undefined;
                     }
                     else if (regelungP) {
-                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
+                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.inverter;
                         condEquip.pPccControl = CsPpccControlKind_1.CsPpccControlKind.activePower;
+                        condEquip.targetUdc = (0, parser_utils_1.isNumericI7)(i7DataHgue.udc) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.udc) : condEquip.ratedUdc;
                         condEquip.targetPpcc = (0, parser_utils_1.isNumericI7)(i7DataHgue.pges) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pges) : ((0, parser_utils_1.isNumericI7)(i7DataHgue.pr) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pr) : undefined);
+                        condEquip.targetIdc = (0, parser_utils_1.isNumericI7)(condEquip.targetPpcc) && (0, parser_utils_1.isNumericI7)(condEquip.targetUdc) ? condEquip.targetPpcc / condEquip.targetUdc : undefined;
                     }
                     else {
-                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.rectifier;
+                        condEquip.operatingMode = CsOperatingModeKind_1.CsOperatingModeKind.inverter;
                         condEquip.pPccControl = CsPpccControlKind_1.CsPpccControlKind.activePower;
+                        condEquip.targetUdc = (0, parser_utils_1.isNumericI7)(i7DataHgue.udc) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.udc) : condEquip.ratedUdc;
                         condEquip.targetPpcc = (0, parser_utils_1.isNumericI7)(i7DataHgue.pges) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pges) : ((0, parser_utils_1.isNumericI7)(i7DataHgue.pr) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.pr) : undefined);
+                        condEquip.targetIdc = (0, parser_utils_1.isNumericI7)(condEquip.targetPpcc) && (0, parser_utils_1.isNumericI7)(condEquip.targetUdc) ? condEquip.targetPpcc / condEquip.targetUdc : undefined;
                     }
                 }
                 else if (condEquip instanceof VsConverter_1.VsConverter) {
                     usoll = (0, parser_utils_1.isNumericI7)(i7DataHgue.usoll) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.usoll) : undefined;
                     if (regelungU) {
                         condEquip.pPccControl = VsPpccControlKind_1.VsPpccControlKind.udc;
-                        condEquip.targetUdc = condEquip.ratedUdc;
+                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
                     }
                     else if (regelungP) {
                         condEquip.pPccControl = VsPpccControlKind_1.VsPpccControlKind.pPcc;
-                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.powerFactorPcc;
-                        condEquip.targetPpcc = condEquip.baseS * -1; //ActivePower
-                        condEquip.targetQpcc = 0; //ReactivePower, TODO: define ReactivePowerCapabilityCurve
+                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
                     }
-                    if (spannungsregelungLokal || spannungsregelungRemote) {
+                    if ((spannungsregelungLokal || spannungsregelungRemote) && usoll == undefined) {
                         //get rated voltage of controlled node.
+                        let cterminal = undefined; //connection point terminal of this device
+                        let tVMax = undefined; //maximum target voltage
+                        let tVMin = undefined; //minimum target voltage
+                        //get target voltage of controlled node.
                         if (knotenSpgGeregelt && spannungsregelungRemote) {
                             cterminal = (0, util_graph2tree_1.getControlledNode)(connectivityNode, knotenSpgGeregelt);
-                            if (cterminal === undefined) {
-                                let stop = true;
-                            }
                             if (cterminal) {
                                 tCn = cterminal.getConnectivityNode();
                                 if (tCn) {
+                                    tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
+                                    tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
                                     usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
                                 }
                                 else {
@@ -3080,9 +3128,10 @@ class ConverterIntegral7 {
                                 this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Anschlusspunkt (Terminal) des entfernt geregelter Knoten konnte nicht ermittelt werden.`);
                             }
                         }
-                        else if ((knotenSpgGeregelt || connectivityNode) && spannungsregelungLokal && usoll === undefined) {
+                        if ((knotenSpgGeregelt || connectivityNode) && spannungsregelungLokal) {
                             switch (knotenSpgGeregelt) {
                                 case undefined: {
+                                    cterminal = (0, util_graph2tree_1.getNextBusbar)(connectivityNode);
                                     if (cterminal === undefined) {
                                         cterminal = (0, util_graph2tree_1.getControlledNode)(cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)), cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss)));
                                     }
@@ -3095,18 +3144,20 @@ class ConverterIntegral7 {
                             if (cterminal) {
                                 tCn = cterminal.getConnectivityNode();
                                 if (tCn) {
+                                    tVMax = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umax'];
+                                    tVMin = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['umin'];
                                     usoll = targetVoltages.get(this.UUID2Integral7ID.get(tCn.getUUID()).find(elem => elem))['usoll'];
                                 }
+                                else {
+                                    this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Lokal geregelter Knoten konnte nicht ermittelt werden.`);
+                                }
                             }
                         }
-                        condEquip.qPccControl = VsQpccControlKind_1.VsQpccControlKind.voltagePcc;
-                        if (usoll !== undefined) {
-                            condEquip.targetUpcc = usoll;
-                        }
-                        else {
-                            this.logger.debug(`debug --- ${i7Data.constructor.name} ${i7Data.id} Sollspannung konnte nicht ermittelt werden.`);
-                        }
                     }
+                    condEquip.targetUpcc = usoll;
+                    condEquip.targetQpcc = 0; //ReactivePower, TODO: define ReactivePowerCapabilityCurve
+                    condEquip.targetUdc = (0, parser_utils_1.isNumericI7)(i7DataHgue.udc) ? (0, parser_utils_1.convertToNumberI7)(i7DataHgue.udc) : condEquip.ratedUdc;
+                    condEquip.targetPpcc = condEquip.baseS * -1;
                 }
             }
             let equipmentContainer = this.determineEquipmentContainer('VoltageLevel', cimModel, connectivityNode.connectivityNodeContainer);
@@ -3142,8 +3193,16 @@ class ConverterIntegral7 {
                     i7Schluessel = ((_p = (_o = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _o === void 0 ? void 0 : _o.key) !== null && _p !== void 0 ? _p : '') +
                         integral_prefix_1.HGUEKOPFVSC_PRAEFIX + i7Data.bezeichner;
                 }
-                else if (condEquip instanceof CsConverter_1.CsConverter) {
+                else if (condEquip instanceof SynchronousMachine_1.SynchronousMachine) {
                     i7Schluessel = ((_r = (_q = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _q === void 0 ? void 0 : _q.key) !== null && _r !== void 0 ? _r : '') +
+                        integral_prefix_1.GENERATOR_PRAEFIX + i7Data.bezeichner;
+                }
+                else if (condEquip instanceof AsynchronousMachine_1.AsynchronousMachine) {
+                    i7Schluessel = ((_t = (_s = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _s === void 0 ? void 0 : _s.key) !== null && _t !== void 0 ? _t : '') +
+                        integral_prefix_1.ASYNCHRONMOTOR_PRAEFIX + i7Data.bezeichner;
+                }
+                else if (condEquip instanceof CsConverter_1.CsConverter) {
+                    i7Schluessel = ((_v = (_u = equipmentContainer === null || equipmentContainer === void 0 ? void 0 : equipmentContainer.getSubstation()) === null || _u === void 0 ? void 0 : _u.key) !== null && _v !== void 0 ? _v : '') +
                         integral_prefix_1.HGUEKOPFKLASSISCH_PRAEFIX + i7Data.bezeichner;
                 }
                 condEquip.key = i7Schluessel;
@@ -3153,11 +3212,11 @@ class ConverterIntegral7 {
                 }
             }
             else {
-                this.logger.error(`error --- ${(_s = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _s === void 0 ? void 0 : _s.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
+                this.logger.error(`error --- ${(_w = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _w === void 0 ? void 0 : _w.name} ${i7Data.id} besitzt keinen EquipmentContainer.`);
             }
         }
         else {
-            this.logger.error(`error --- ${(_t = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _t === void 0 ? void 0 : _t.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
+            this.logger.error(`error --- ${(_x = condEquip === null || condEquip === void 0 ? void 0 : condEquip.constructor) === null || _x === void 0 ? void 0 : _x.name}  ${i7Data.id} besitzt keinen ConnectivityNode.`);
         }
         return rControl;
     }
@@ -3469,7 +3528,7 @@ class ConverterIntegral7 {
                         this.setConductingEquipmentOperationalLimit(cimModel, 'Rating ' + seriesCompensator.name, terminal, seriesCompensator.getUUID(), ir, cim_class_names_1.ClassNames.CurrentLimit);
                     }
                     else {
-                        this.logger.debug(`Längsdrossel ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
+                        this.logger.debug(`Längskondensator ${i7Data.id} ${seriesCompensator.mrid} besitzt keine Terminalinstanz.`);
                     }
                     // Umspannanlage
                     const substationUUID = this.integralID2UUID.get(i7Data.standort);
@@ -3688,7 +3747,7 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_FREILEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_FREILEITUNG), []));
                 for (const i7Data of result) {
                     const typ = new EVWireInfo_1.EVWireInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
-                    this.setWireInfoProperties(typ, i7Data, 'Freileitung');
+                    this.setWireInfoProperties(typ, i7Data, integral_sql_1.I7Objects.TYP_FREILEITUNG);
                     this.cimModelDefault.addEVWireInfo(typ);
                 }
             }
@@ -3700,7 +3759,7 @@ class ConverterIntegral7 {
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.TYP_KABEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.TYP_KABEL), []));
                 for (const i7Data of result) {
                     const typ = new EVWireInfo_1.EVWireInfo(common_utils_1.CommonUtils.generateUUID(), i7Data.name);
-                    this.setWireInfoProperties(typ, i7Data, 'Kabel');
+                    this.setWireInfoProperties(typ, i7Data, integral_sql_1.I7Objects.TYP_KABEL);
                     this.cimModelDefault.addEVWireInfo(typ);
                 }
             }
@@ -3745,6 +3804,12 @@ class ConverterIntegral7 {
                     tableName = integral_sql_1.Integral7TableNames.FREILEITUNG;
                 }
                 const leitungStromkreisabschnitt = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(type, this.getAvailableColumnNames(tableName), leitungIDs));
+                let result_ohl = undefined;
+                let result_cable = undefined;
+                if (type.match(integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL_FREILEITUNG)) {
+                    result_cable = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STROMKREISABSCHNITT_KABEL, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.KABEL), leitungIDs));
+                    result_ohl = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.STROMKREISABSCHNITT_FREILEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.FREILEITUNG), leitungIDs));
+                }
                 for (const i7Data of result) {
                     /** Alle Stromkreisabschnitte */
                     const stromkreisabschnitte = leitungStromkreisabschnitt.filter(elem => elem.leitung === i7Data.id);
@@ -3783,7 +3848,7 @@ class ConverterIntegral7 {
                             '-' +
                             (0, utils_2.ueberpruefeZeichenkette)(stk.bezeichner);
                         const uuid = (0, parser_utils_1.getUUID)(stk.custom_guid_0120 + stk.custom_guid_2137, this.objectMappingConfig.standardiseUuid);
-                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuid, (0, util_create_1.createNotation)([name, '_' + stk.pos.toString(), '_' + uuid.substring(0, 8), '_ACLS'], 32, true), i7Data.stkabname, i7Schluessel);
+                        const acLineSegment = new INTEGRALACLineSegment_1.INTEGRALACLineSegment(uuid, stk.bezeichner, i7Data.stkabname, i7Schluessel);
                         const key = acLineSegment.getUUID();
                         const uuidWireObject = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.EVWireObject, this.configUuid, key);
                         acLineSegment.key = i7Schluessel;
@@ -3813,13 +3878,10 @@ class ConverterIntegral7 {
                      *  KnotenZw -> Netzschlaufe -> KnotenSo -> Anschlusspunkt
                      */
                     const acLineSegmentStart = acLineSegments[0];
-                    if (line.getUUID() === '4637c6dc-fad5-45f1-91e0-091d00717a3b' || line.getUUID() === 'a992f3c9-f2e1-4cd6-8cc6-fd3d5d167871') {
-                        const stop = true;
-                    }
                     const startTerminal = this.createBoundaryConnection(frame, acLineSegmentStart, i7Data.aknoten, PhaseCode_1.PhaseCode.ABC);
                     if (startTerminal) {
                         //this.setACLineSegmentCurrentLimt(cimModel, acLineSegmentStart, acLineSegmentStart.description, startTerminal);
-                        /**Add boundary injection if start is connected to boudarypoint */
+                        /**Add boundary injection if start is connected to boundarypoint */
                         let bdf = this.getConnectedBoundaryModel(this.integralID2UUID.get(i7Data.aknoten));
                         let tmp_cn = bdf === null || bdf === void 0 ? void 0 : bdf.cimModel.getConnectivityNode(startTerminal.getConnectivityNodeUUID());
                         if (tmp_cn && tmp_cn.boundaryPoint) {
@@ -3836,7 +3898,8 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentStart.mrid} besitzt keinen Anfangsknoten. ${i7Data.aknoten} ${this.integralID2UUID.get(i7Data.aknoten)}`);
                     }
-                    this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentStart, stromkreisabschnitte[0], defaultValuesConfig);
+                    let cable = result_cable.filter(elem => elem.id === stromkreisabschnitte[0].id);
+                    this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentStart, stromkreisabschnitte[0], cable.length > 0, defaultValuesConfig);
                     cimModel.addACLineSegment(acLineSegmentStart);
                     /** Mitte */
                     const anzahl = acLineSegments.length;
@@ -3856,7 +3919,8 @@ class ConverterIntegral7 {
                         if (tmp_terminal) {
                             tmp_terminal = undefined;
                         }
-                        this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegments[i], stromkreisabschnitte[i], defaultValuesConfig);
+                        cable = result_cable.filter(elem => elem.id === stromkreisabschnitte[i].id);
+                        this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegments[i], stromkreisabschnitte[i], cable.length > 0, defaultValuesConfig);
                         /**Connect end of aclinesegment i+1*/
                         tmp_terminal = this.createConnection(cimModel, acLineSegment2, cn, PhaseCode_1.PhaseCode.ABC, true);
                         //this.setACLineSegmentCurrentLimt(cimModel, acLineSegment2, acLineSegment2.description, tmp_terminal);
@@ -3888,7 +3952,8 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`Leitung ${i7Data.id} ${acLineSegmentZiel.mrid} besitzt keinen Zielknoten.`);
                     }
-                    this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentZiel, stromkreisabschnitte[stromkreisabschnitte.length - 1], defaultValuesConfig);
+                    cable = result_cable.filter(elem => elem.id === stromkreisabschnitte[stromkreisabschnitte.length - 1].id);
+                    this.setACLineSegmentProperties(this.cimModelDefault, cimModel, acLineSegmentZiel, stromkreisabschnitte[stromkreisabschnitte.length - 1], cable.length > 0, defaultValuesConfig);
                     cimModel.addACLineSegment(acLineSegmentZiel);
                     /** BaseVoltages für ACLineSegments*/
                     const stkBaseVoltage = acLineSegments.find(elem => elem.baseVoltage !== undefined);
@@ -3950,31 +4015,48 @@ class ConverterIntegral7 {
             if (this.isTableAvailable(integral_sql_1.Integral7TableNames.HGUE_LEITUNG) && integral7.hgueAnschlussKnotenIDs.length > 0) {
                 // const result: Hgueleitung[] = await this.queryFunctionWrapper(getNetzQuery(I7Objects.HGUE_LEITUNG, limit, offset, []));
                 const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.HGUE_LEITUNG, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.HGUE_LEITUNG), integral7.hgueAnschlussKnotenIDs));
+                let dcLineSegmentSet = [];
                 for (const i7Data of result) {
                     //console.log(getUUID(i7Data.guid_dcline));
                     integral7.integralHgueLeitungIds.add(i7Data.id);
+                    /**
+                     * Differentiation is done between monopolar and bipolar hvdc systems
+                     * Differentiation is done between current source converters (csc, HgueKopfKlassisch) and voltage source converters (vsc, HgueKopfVSC)
+                     * CSC:
+                     *  - only monopole (asymmetrical monopole (metallic return))
+                     *  - no metallic return in every case
+                     *  - only power control defined
+                     *  - a metallic return is always assumed) with two groundings (one per end) is assumed in every case
+                     * VSC:
+                     *  - monopole and bipole possible (asymmetrical monopole (metallic return), bipole)
+                     *  - metallic return in every case (there is no data about ground return in INTEGRAL)
+                     *  - power control, voltage control (ac and dc), angle difference
+                     *  - topology informations of second pole are not available in INTEGRAL model, thus this will be created during conversion
+                     *  - a metallic return is always assumed) with two groundings (one per end) is assumed in every case
+                     */
                     const dcLine = new DCLine_1.DCLine((0, parser_utils_1.getUUID)(i7Data.guid_dcline, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCL']));
                     let dcLineNeg = undefined;
+                    let dcLineNeutral = undefined;
                     const i7Schluessel = integral_prefix_1.HGUELEITUNG_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     /** operationMode der Anfangs- und Zielkopfstation setzen */
                     let converterStart = false;
                     let converterStartNeg = false;
-                    let converterUnitStartSide = false;
+                    //let converterUnitStartSide: boolean = false;
                     let converterTarget = false;
                     let converterTargetNeg = false;
-                    let converterUnitTargetSide = false;
-                    let bipol = (0, parser_utils_1.convertToBooleanI7)(i7Data.bipol);
-                    if (bipol === undefined) {
-                        bipol = false;
+                    //let converterUnitTargetSide: boolean = false;
+                    let bipole = (0, parser_utils_1.convertToBooleanI7)(i7Data.bipol);
+                    if (bipole === undefined) {
+                        bipole = false;
                     }
-                    let dcNode = undefined;
+                    let dcNodeStartMiddle = undefined;
+                    let dcNodeTargetMiddle = undefined;
                     //Parameter "guidp" is available for monopolar and bipolar dc systems. Thus create DCLineSegment with positive sign property in any case.
                     const dcLineSegment = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidp, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCLS']), i7Data.kurzname, i7Schluessel);
+                    dcLineSegmentSet.push(dcLineSegment);
                     let dcLineSegmentNeg = undefined;
-                    if (dcLineSegment.getUUID() === '579b6a04-23c5-452f-b7ad-db283dad1cdb') {
-                        const stop = true;
-                    }
+                    let dcLineSegmentNeutral = undefined;
                     /**EQ: not given directly by the INTEGRAL system model */
                     dcLineSegment.length = undefined;
                     dcLineSegment.capacitance = undefined;
@@ -3983,92 +4065,118 @@ class ConverterIntegral7 {
                     dcLineSegment.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : undefined;
                     dcLineSegment.equipmentContainer = dcLine;
                     //create second dcLineSegment in case this dcLine is a bipol.
-                    if (bipol) {
+                    if (bipole) {
                         const dcLineKey = dcLine.getUUID();
                         const dcLineUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCLine, this.configUuid, dcLineKey);
                         dcLineNeg = new DCLine_1.DCLine(dcLineUuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCL']));
                         dcLineSegmentNeg = new DCLineSegment_1.DCLineSegment((0, parser_utils_1.getUUID)(i7Data.guidn, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCLS'], 32, true), (0, util_create_1.createNotation)([i7Data.kurzname, '_neg'], 12, true), i7Schluessel);
+                        dcLineSegmentSet.push(dcLineSegmentNeg);
                         dcLineSegmentNeg.length = dcLineSegment.length;
                         dcLineSegmentNeg.capacitance = undefined;
                         dcLineSegmentNeg.inductance = undefined;
                         dcLineSegmentNeg.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : undefined;
                         dcLineSegmentNeg.equipmentContainer = dcLineNeg;
                     }
+                    //create metallic return
+                    const dcLineKey = dcLine.getUUID() + 'mid';
+                    const dcLineNeutralUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCLine, this.configUuid, dcLineKey);
+                    const dcLineSegmentUuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCLineSegment, this.configUuid, dcLineNeutralUuid);
+                    dcLineNeutral = new DCLine_1.DCLine(dcLineNeutralUuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCL']));
+                    dcLineSegmentNeutral = new DCLineSegment_1.DCLineSegment(dcLineSegmentUuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCLS'], 32, true), (0, util_create_1.createNotation)([i7Data.kurzname, '_mid'], 12, true), i7Schluessel);
+                    dcLineSegmentSet.push(dcLineSegmentNeutral);
+                    dcLineSegmentNeutral.length = dcLineSegment.length;
+                    dcLineSegmentNeutral.capacitance = undefined;
+                    dcLineSegmentNeutral.inductance = undefined;
+                    dcLineSegmentNeutral.resistance = (0, parser_utils_1.isNumericI7)(i7Data.rdc) ? (0, parser_utils_1.convertToNumberI7)(i7Data.rdc) : undefined;
+                    dcLineSegmentNeutral.equipmentContainer = dcLineNeutral;
+                    //get ACDCConverter at both ends of DCLine
                     const acDCConverterStart = cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.anetzobjekt)) : undefined;
                     converterStart = (0, parser_utils_1.convertToBooleanI7)(acDCConverterStart !== undefined);
                     let acDCConverterStartNeg = undefined;
                     const acDCConverterTarget = cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt)) ? cimModel.getObject(this.integralID2UUID.get(i7Data.enetzobjekt)) : undefined;
                     converterTarget = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTarget !== undefined);
                     let acDCConverterTargetNeg = undefined;
-                    if (acDCConverterTarget === undefined) {
-                        const stop = true;
-                    }
-                    else if (acDCConverterStart === undefined) {
-                        const stop = true;
-                    }
                     const int7hguekopfStart = converterStart ? (_a = integral7.integralHgueKopf) === null || _a === void 0 ? void 0 : _a.get(this.UUID2Integral7ID.get(acDCConverterStart.getUUID()).find(elem => elem)) : undefined;
                     const int7hguekopfTarget = converterTarget ? (_b = integral7.integralHgueKopf) === null || _b === void 0 ? void 0 : _b.get(this.UUID2Integral7ID.get(acDCConverterTarget.getUUID()).find(elem => elem)) : undefined;
-                    //Setting acDCConverterStartNeg and acDCConverterTargetNeg in case this DCLine is a bipol
-                    if (bipol) {
-                        acDCConverterStartNeg = converterStart && int7hguekopfStart !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopfStart, acDCConverterStart.constructor.name, acDCConverterStart) : undefined;
+                    //Get DCConverterUnit for HVDC system (positive, negative, ground for both sides)
+                    const converterUnitStart = (acDCConverterStart === null || acDCConverterStart === void 0 ? void 0 : acDCConverterStart.equipmentContainer) ? acDCConverterStart.equipmentContainer : undefined;
+                    const converterUnitTarget = (acDCConverterTarget === null || acDCConverterTarget === void 0 ? void 0 : acDCConverterTarget.equipmentContainer) ? acDCConverterTarget.equipmentContainer : undefined;
+                    let converterUnitStartNeg = undefined;
+                    let converterUnitTargetNeg = undefined;
+                    let converterUnitStartGround = undefined;
+                    let converterUnitTargetGround = undefined;
+                    //Setting acDCConverterStartNeg, acDCConverterTargetNeg,  in case this DCLine is a bipol
+                    if (bipole) {
+                        let converterUnitKey = converterUnitStart.getUUID();
+                        let converterUnitNegUUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCConverterUnit, this.configUuid, converterUnitKey);
+                        converterUnitStartNeg = new DCConverterUnit_1.INTEGRALDCConverterUnit(converterUnitNegUUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_NEG_DCCU']), '', 'second converter unit of bipole');
+                        converterUnitStartNeg.setSubstation(converterUnitStart.getSubstation());
+                        acDCConverterStartNeg = converterStart && int7hguekopfStart !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopfStart, acDCConverterStart.constructor.name, acDCConverterStart, converterUnitStartNeg, this.configUuid) : undefined;
                         converterStartNeg = (0, parser_utils_1.convertToBooleanI7)(acDCConverterStartNeg !== undefined);
-                        acDCConverterTargetNeg = converterTarget && int7hguekopfTarget !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopfTarget, acDCConverterTarget.constructor.name, acDCConverterTarget) : undefined;
+                        converterUnitKey = converterUnitTarget.getUUID();
+                        converterUnitNegUUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCConverterUnit, this.configUuid, converterUnitKey);
+                        converterUnitTargetNeg = new DCConverterUnit_1.INTEGRALDCConverterUnit(converterUnitNegUUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_NEG_DCCU']), '', 'second converter unit of bipole');
+                        converterUnitTargetNeg.setSubstation(converterUnitTarget.getSubstation());
+                        acDCConverterTargetNeg = converterTarget && int7hguekopfTarget !== undefined ? (0, util_create_1.createACDCConverterNeg)(cimModel, int7hguekopfTarget, acDCConverterTarget.constructor.name, acDCConverterTarget, converterUnitTargetNeg, this.configUuid) : undefined;
                         converterTargetNeg = (0, parser_utils_1.convertToBooleanI7)(acDCConverterTargetNeg !== undefined);
                     }
                     //Set grounding for dcConverterUnit
-                    const converterUnitStart = (acDCConverterStart === null || acDCConverterStart === void 0 ? void 0 : acDCConverterStart.equipmentContainer) ? acDCConverterStart.equipmentContainer : undefined;
-                    converterUnitStartSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitStart !== undefined);
-                    const converterUnitTarget = (acDCConverterTarget === null || acDCConverterTarget === void 0 ? void 0 : acDCConverterTarget.equipmentContainer) ? acDCConverterTarget.equipmentContainer : undefined;
-                    converterUnitTargetSide = (0, parser_utils_1.convertToBooleanI7)(converterUnitTarget !== undefined);
-                    if (converterStart && !converterStartNeg) {
-                        dcNode = createDCGround(cimModel, acDCConverterStart, int7hguekopfStart);
-                    }
-                    else if (converterStart && converterStartNeg) {
-                        dcNode = createDCGround(cimModel, acDCConverterStart, int7hguekopfStart);
-                        connectDCGround(cimModel, acDCConverterStartNeg, int7hguekopfStart, dcNode, DCPolarityKind_1.DCPolarityKind.middle);
-                    }
-                    switch (bipol) {
-                        case true: {
-                            if (converterUnitStartSide && !converterUnitTargetSide) {
-                                converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
-                                this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r DCConverterUnit am Leitungsende konnte nicht ermittelt werden.`);
-                            }
-                            else if (converterUnitStartSide && converterUnitTargetSide) {
+                    let converterUnitKey = converterUnitStart.getUUID() + 'GROUND';
+                    let converterUnitGroundUUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCConverterUnit, this.configUuid, converterUnitKey);
+                    converterUnitStartGround = new DCConverterUnit_1.INTEGRALDCConverterUnit(converterUnitGroundUUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_GND_DCCU']));
+                    converterUnitStartGround.setSubstation(converterUnitStart.getSubstation());
+                    converterUnitKey = converterUnitTarget.getUUID() + 'GROUND';
+                    converterUnitGroundUUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCConverterUnit, this.configUuid, converterUnitKey);
+                    converterUnitTargetGround = new DCConverterUnit_1.INTEGRALDCConverterUnit(converterUnitGroundUUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_GND_DCCU']));
+                    converterUnitTargetGround.setSubstation(converterUnitTarget.getSubstation());
+                    if (converterStart && converterTarget) {
+                        dcNodeStartMiddle = createDCGround(cimModel, acDCConverterStart, converterUnitStartGround, int7hguekopfStart, bipole);
+                        //connectDCGround(cimModel, int7hguekopfStart, dcNodeStartMiddle, DCPolarityKind.middle/*, acDCConverterStart*/);
+                        dcNodeTargetMiddle = createDCGround(cimModel, acDCConverterTarget, converterUnitTargetGround, int7hguekopfTarget, bipole);
+                        //connectDCGround(cimModel, int7hguekopfTarget, dcNodeTargetMiddle, DCPolarityKind.middle/*, acDCConverterTarget*/);
+                        switch (bipole) {
+                            case true: {
                                 converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
                                 converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
-                                if (converterTarget && !converterTargetNeg) {
-                                    dcNode = createDCGround(cimModel, acDCConverterTarget, int7hguekopfTarget);
+                                converterUnitStartGround.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
+                                converterUnitTargetGround.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
+                                converterUnitStartNeg.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
+                                converterUnitTargetNeg.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.bipolar;
+                                if (converterStartNeg && converterTargetNeg) {
+                                    connectDCGround(cimModel, int7hguekopfStart, dcNodeStartMiddle, DCPolarityKind_1.DCPolarityKind.middle, acDCConverterStartNeg);
+                                    connectDCGround(cimModel, int7hguekopfTarget, dcNodeTargetMiddle, DCPolarityKind_1.DCPolarityKind.middle, acDCConverterTargetNeg);
                                 }
-                                else if (converterTarget && converterTargetNeg) {
-                                    dcNode = createDCGround(cimModel, acDCConverterTarget, int7hguekopfTarget);
-                                    connectDCGround(cimModel, acDCConverterTargetNeg, int7hguekopfTarget, dcNode, DCPolarityKind_1.DCPolarityKind.middle);
+                                else if (!converterStartNeg && !converterTargetNeg) {
+                                    this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r DCConverterUnit an den Leitungsenden konnten für den zweiten Pol nicht ermittelt werden.`);
                                 }
-                                else {
-                                    this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r ACDCConverter konnte nicht ermittelt werden.`);
+                                else if (!converterStartNeg) {
+                                    this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: es konnte nur die DCConverterUnit ${acDCConverterTargetNeg.getUUID()} am Leitungsende für den zweiten Pol ermittelt werden.`);
                                 }
+                                else if (!converterTargetNeg) {
+                                    this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: es konnte nur die DCConverterUnit ${acDCConverterStartNeg.getUUID()} am Leitungsende für den zweiten Pol ermittelt werden.`);
+                                }
+                                break;
                             }
-                            else {
-                                this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r DCConverterUnit's konnten nicht ermittelt werden.`);
-                            }
-                            break;
-                        }
-                        case false: {
-                            if (converterUnitStartSide && !converterUnitTargetSide) {
-                                converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
-                                this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r DCConverterUnit am Leitungsende konnte nicht ermittelt werden.`);
+                            case false: {
+                                converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarMetallicReturn;
+                                converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarMetallicReturn;
+                                break;
                             }
-                            else if (converterUnitStartSide && converterUnitTargetSide) {
-                                converterUnitStart.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
-                                converterUnitTarget.operationMode = DCConverterOperatingModeKind_1.DCConverterOperatingModeKind.monopolarGroundReturn;
-                                createDCGround(cimModel, acDCConverterTarget, int7hguekopfTarget);
+                            default: {
+                                this.logger.info(`info --- HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: gehört zu einem monopolaren HGÜ-System`);
                             }
-                            break;
-                        }
-                        default: {
-                            this.logger.info(`info --- HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: die bipol-Eigenschaft ist nicht gesetzt.`);
                         }
                     }
-                    // Topologie DC
+                    else if (!converterStart && !converterTarget) {
+                        this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: zugehörende/r DCConverterUnit an den Leitungsenden konnten nicht ermittelt werden.`);
+                    }
+                    else if (!converterStart) {
+                        this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: es konnte nur die DCConverterUnit ${int7hguekopfTarget.id} am Leitungsende ermittelt werden.`);
+                    }
+                    else if (!converterTarget) {
+                        this.logger.error(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid}: es konnte nur die DCConverterUnit ${int7hguekopfStart.id} am Leitungsanfang ermittelt werden.`);
+                    }
+                    // Topologie DC - connect DCLines (both poles if exists and metallic return)
                     /* Anfang / Ende DCNodes*/
                     let startDCNode = converterStart ? getDCNodeFromConverter(acDCConverterStart, DCPolarityKind_1.DCPolarityKind.positive) : undefined;
                     const startDCNodeNeg = converterStartNeg ? getDCNodeFromConverter(acDCConverterStartNeg, DCPolarityKind_1.DCPolarityKind.negative) : undefined;
@@ -4119,11 +4227,65 @@ class ConverterIntegral7 {
                     else {
                         this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten NEG. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
                     }
+                    if (dcNodeStartMiddle) {
+                        const dcTerminalKey = int7hguekopfStart.guid_dcterminalm1 + int7hguekopfStart.guid_dcterminalm2; //TODO: ->cgmes Objekte verwenden
+                        const dcTerminalM3UUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCTerminal, this.configUuid, dcTerminalKey);
+                        const dcTerminal = new DCTerminal_1.DCTerminal(dcTerminalM3UUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCT'], 32, true));
+                        dcTerminal.dCConductingEquipment = dcLineSegmentNeutral;
+                        dcTerminal.dcNode = dcNodeStartMiddle;
+                        dcLineSegmentNeutral.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
+                        dcNodeStartMiddle.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
+                        cimModel.addDCTerminal(dcTerminal);
+                    }
+                    else {
+                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
+                    }
+                    if (dcNodeTargetMiddle) {
+                        const dcTerminalKey = int7hguekopfTarget.guid_dcterminalm1 + int7hguekopfTarget.guid_dcterminalm2;
+                        const dcTerminalM3UUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, dcTerminalKey);
+                        const dcTerminal = new DCTerminal_1.DCTerminal(dcTerminalM3UUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCT'], 32, true));
+                        dcTerminal.dCConductingEquipment = dcLineSegmentNeutral;
+                        dcTerminal.dcNode = dcNodeTargetMiddle;
+                        dcLineSegmentNeutral.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
+                        dcNodeTargetMiddle.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
+                        cimModel.addDCTerminal(dcTerminal);
+                    }
+                    else {
+                        this.logger.debug(`HGÜ-Leitung ${i7Data.id} ${dcLineSegment.mrid} besitzt keinen Zielknoten NEG. ${i7Data.enetzobjekt} ${this.integralID2UUID.get(i7Data.enetzobjekt)}`);
+                    }
+                    /** Create OperationalLimitSets */
+                    for (const obj of dcLineSegmentSet) {
+                        for (const dCT of obj.dCTerminals.values()) {
+                            const dcTerminal = dCT;
+                            const equipmentKey = dcTerminal.getUUID();
+                            for (const elem of dcTerminal.dcNode.dcTerminals.values()) {
+                                if (elem instanceof ACDCConverterDCTerminal_1.ACDCConverterDCTerminal) {
+                                    const pR = elem.dCConductingEquipment.baseS; //apparent power is set equal to active power in MVA
+                                    const uR = acDCConverterStart.ratedUdc; //voltage in kV
+                                    if (pR != undefined && uR != undefined) {
+                                        let ir = (pR * Math.pow(10, 6)) / (uR * Math.pow(10, 3)); //assumption: pr is BaseS
+                                        if (bipole) {
+                                            ir = ir / 2;
+                                        }
+                                        this.setConductingEquipmentOperationalLimit(cimModel, obj.name, dCT, equipmentKey, ir, cim_class_names_1.ClassNames.CurrentLimit);
+                                    }
+                                }
+                            }
+                        }
+                    }
                     cimModel.addDCLine(dcLine);
                     cimModel.addDCLineSegment(dcLineSegment);
-                    if (bipol && dcLineNeg && dcLineSegmentNeg) {
+                    cimModel.addDCConverterUnit(converterUnitStartGround);
+                    cimModel.addDCConverterUnit(converterUnitTargetGround);
+                    if (bipole && dcLineNeg && dcLineSegmentNeg) {
                         cimModel.addDCLine(dcLineNeg);
                         cimModel.addDCLineSegment(dcLineSegmentNeg);
+                        cimModel.addDCConverterUnit(converterUnitStartNeg);
+                        cimModel.addDCConverterUnit(converterUnitTargetNeg);
+                    }
+                    if (dcLineNeutral && dcLineSegmentNeutral) {
+                        cimModel.addDCLine(dcLineNeutral);
+                        cimModel.addDCLineSegment(dcLineSegmentNeutral);
                     }
                     this.addIdMapping(i7Data.id, dcLineSegment.mrid, integral_sql_1.Integral7TableNames.HGUE_LEITUNG);
                 }
@@ -4147,6 +4309,8 @@ class ConverterIntegral7 {
                     typTrafo.iLeer = i7Data.i_leer;
                     typTrafo.ukr = i7Data.ukr;
                     typTrafo.pkr = i7Data.pkr;
+                    impedance_utils_1.ImpedanceUtils.extendTrafo2WAssetTypeByCim(typTrafo);
+                    impedance_utils_1.ImpedanceUtils.extendTrafo2WAssetTypeByPandaPower(typTrafo);
                     typTrafo.schaltgruppe = i7Data.schaltgr;
                     typTrafo.spezialRegelung = (0, parser_utils_1.isNumericI7)(i7Data.trafo_spezial) ? (0, parser_utils_1.convertToNumberI7)(i7Data.trafo_spezial) : undefined;
                     typTrafo.x00r1 = i7Data.x00r1;
@@ -4312,7 +4476,10 @@ class ConverterIntegral7 {
                     if (i7Data.ur2 === 25) {
                         const stop = true;
                     }
-                    const powerTransformer = new PowerTransformer_1.PowerTransformer(uuid, i7Data.bezeichner, i7Data.langname, i7Data.kommentar);
+                    if (uuid === 'a4480d0ac6e0413eb2ef683bf7b171a6') {
+                        let stop = true;
+                    }
+                    const powerTransformer = new PowerTransformer_1.PowerTransformer(uuid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', uuid.substring(0, 8), '_PT']), i7Data.kurzname, i7Data.kommentar);
                     const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
                     /** AssetInfos */
                     if (i7Data.baujahr) {
@@ -4326,7 +4493,7 @@ class ConverterIntegral7 {
                         this.logger.debug(`Trafo2W ${i7Data.id} besitzt keine Umspannanlage.`);
                     }
                     const i7Schluessel = (substation === null || substation === void 0 ? void 0 : substation.key) +
-                        integral_prefix_1.TRAFO2WPRAEFIX_PRAEFIX +
+                        integral_prefix_1.TRAFO2W_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     powerTransformer.key = i7Schluessel;
                     if (powerTransformer.getUUID() === '515508dc-5982-4686-ad26-08d39db91421') {
@@ -4370,22 +4537,38 @@ class ConverterIntegral7 {
                     // Wicklung 1
                     const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1, this.objectMappingConfig.standardiseUuid), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
-                    const pkr = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '');
-                    const ukr = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '');
+                    const pkr = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '12', false);
+                    const ukr = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '12', false);
                     const sr = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber, false);
-                    const ur = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd1.endNumber);
+                    const ur = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 1);
+                    const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, 2);
                     const sdauer = (0, parser_utils_1.isNumericI7)(i7Data.s_dauer) ? (0, parser_utils_1.convertToNumberI7)(i7Data.s_dauer) : sr;
                     // P0 Lastverluste im I7 Modell p_leer
                     const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
                     // Leerlaufverluste
                     const iLeer = (0, utils_2.getTrafoIleer)(i7Data, powerTransformerInfo);
                     // Berechnung
-                    powerTransformerEnd1.r = (0, utils_2.calculateR)(ur, pkr, sr);
-                    powerTransformerEnd1.x = (0, utils_2.calculateX)(ur, ukr, sr);
                     // TODO was ist P0 in I7 Trafomodell
                     // P0 Lastverluste abhängig von Last
-                    powerTransformerEnd1.g = (0, utils_2.calculateG)(ur, pLeer);
-                    powerTransformerEnd1.b = (0, utils_2.calculateB)(ur, sr, iLeer, pLeer);
+                    if (powerTransformer.getUUID() === '3a2bfb03-28bd-4505-8579-e8e648357ce1') {
+                        const stop = true;
+                    }
+                    if (powerTransformer.getUUID() === '87e6221e-d850-4efe-a924-f7d1d751705e') {
+                        const stop = true;
+                    }
+                    if (powerTransformer.getUUID() === 'a4480d0ac6e0413eb2ef683bf7b171a6') {
+                        let stop = true;
+                    }
+                    if (ur >= ur2) {
+                        powerTransformerEnd1.g = (0, utils_2.calculateG)(ur, pLeer);
+                        powerTransformerEnd1.b = (0, utils_2.calculateB)(ur, sr, iLeer, pLeer);
+                        powerTransformerEnd1.r = (0, utils_2.calculateR)(ur, pkr, sr);
+                        powerTransformerEnd1.x = (0, utils_2.calculateX)(ur, ukr, sr, powerTransformerEnd1.r);
+                    }
+                    else {
+                        powerTransformerEnd1.r = 0;
+                        powerTransformerEnd1.x = 0;
+                    }
                     powerTransformerEnd1.ratedU = ur;
                     powerTransformerEnd1.ratedS = sr;
                     //Short-Circuit data export EQ-SC profile //TODO: Read data for enervancetransformertype object.
@@ -4421,10 +4604,17 @@ class ConverterIntegral7 {
                     const powerTransformerEnd2 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w2, this.objectMappingConfig.standardiseUuid), `W2-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd2.endNumber = 2;
                     const sr2 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber, false);
-                    const ur2 = (0, utils_2.getUrTrafo)(i7Data, powerTransformerInfo, powerTransformerEnd2.endNumber);
                     // Berechnung
-                    powerTransformerEnd2.r = 0;
-                    powerTransformerEnd2.x = 0;
+                    if (ur2 > ur) {
+                        powerTransformerEnd2.g = (0, utils_2.calculateG)(ur2, pLeer);
+                        powerTransformerEnd2.b = (0, utils_2.calculateB)(ur2, sr2, iLeer, pLeer);
+                        powerTransformerEnd2.r = (0, utils_2.calculateR)(ur2, pkr, sr2);
+                        powerTransformerEnd2.x = (0, utils_2.calculateX)(ur2, ukr, sr2, powerTransformerEnd2.r);
+                    }
+                    else {
+                        powerTransformerEnd2.r = 0;
+                        powerTransformerEnd2.x = 0;
+                    }
                     powerTransformerEnd2.ratedS = sr2;
                     powerTransformerEnd2.ratedU = ur2;
                     /*       const ziel = cimModel.getObject(this.integralID2UUID.get(i7Data.eknoten));
@@ -4447,10 +4637,16 @@ class ConverterIntegral7 {
                     powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
                     powerTransformerEnd2.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd2.endNumber, powerTransformerEnd2.grounded);
                     powerTransformerEnd2.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd2.endNumber);
+                    if (uuid === '402aec99-ba2c-42fa-b4ed-b4928901f47b') {
+                        let stop = true;
+                    }
                     // NullSystem Impedanzen (nur Reaktanzen)
-                    let starconnectionCount = (0, utils_2.getGroundingCountFromWindingConnection)(powerTransformer);
-                    //const zeroSequImpedanzWx = calculateZeroSequImpedanzenTrafo2W([r0kr1, x0kr1, r0kr2, x0kr2], [r00r1, x00r1, r00r2, x00r2], [ur, ur2]);
-                    const zeroSequImpedanzWx = (0, utils_2.calculateComplexZeroSequImpedanzenTrafo)([r0kr1, x0kr1, r0kr2, x0kr2], [r00r1, x00r1, r00r2, x00r2], [ur, ur2], starconnectionCount)[0];
+                    let starconnectionCount = (0, utils_2.getGroundingCountFromWindingConnection)(powerTransformer) <= 1 ? (0, utils_2.getGroundingCountFromWindingConnection)(powerTransformer) : 1;
+                    const retVal = (0, utils_2.calculateComplexZeroSequImpedanzenTrafo)([r0kr1, x0kr1, r0kr2, x0kr2], [r00r1, x00r1, r00r2, x00r2], [ur, ur2], starconnectionCount, powerTransformer);
+                    if (retVal[1] == false) { //return value is false, thus there was an error in computation
+                        this.logger.warn(`PowerTransformer3W ${i7Data.id} ${powerTransformer.mrid} hat unterbestimmte Definitionen in den Nullsystemdaten.`);
+                    }
+                    const zeroSequImpedanzWx = retVal[0];
                     powerTransformerEnd1.x0 = zeroSequImpedanzWx.x01;
                     powerTransformerEnd1.r0 = zeroSequImpedanzWx.r01;
                     powerTransformerEnd2.x0 = zeroSequImpedanzWx.x02;
@@ -4540,7 +4736,7 @@ class ConverterIntegral7 {
                     }
                     const facility = util_cim_model_1.UtilCimModel.createFacilityInstanceForPsr(cimModel, powerTransformer, cim_constants_1.CimAssetAliasNames.Transformer, this.configUuid);
                     const i7Schluessel = (substation === null || substation === void 0 ? void 0 : substation.key) +
-                        integral_prefix_1.TRAFO3WPRAEFIX_PRAEFIX +
+                        integral_prefix_1.TRAFO3W_PRAEFIX +
                         (0, utils_2.ueberpruefeZeichenkette)(i7Data.bezeichner);
                     powerTransformer.key = i7Schluessel;
                     /** AssetInfos */
@@ -4560,9 +4756,6 @@ class ConverterIntegral7 {
                     else {
                         powerTransformer.isPartOfGeneratorUnit = false;
                     }
-                    if (i7Data.nametyp) {
-                        const stop = true;
-                    }
                     const x00r1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x00r1');
                     const x0kr1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x0kr1');
                     const x00r2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'x00r2');
@@ -4571,12 +4764,12 @@ class ConverterIntegral7 {
                     const r0kr1 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r0kr1');
                     const r00r2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r00r2');
                     const r0kr2 = (0, utils_2.getX0R0Transformer)(i7Data, powerTransformerInfo, 'r0kr2');
-                    const pkr12 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '12');
-                    const pkr13 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '13');
-                    const pkr23 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '23');
-                    const ukr12 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '12');
-                    const ukr13 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '13');
-                    const ukr23 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '23');
+                    const pkr12 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '12', true);
+                    const pkr13 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '13', true);
+                    const pkr23 = (0, utils_2.getPkrTrafo)(i7Data, powerTransformerInfo, '23', true);
+                    const ukr12 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '12', true);
+                    const ukr13 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '13', true);
+                    const ukr23 = (0, utils_2.getUkrTrafo)(i7Data, powerTransformerInfo, '23', true);
                     const sr1 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 1, true);
                     const sr2 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 2, true);
                     const sr3 = (0, utils_2.getSrTrafo)(i7Data, powerTransformerInfo, 3, true);
@@ -4590,13 +4783,19 @@ class ConverterIntegral7 {
                     const pLeer = (0, utils_2.getTrafoPleer)(i7Data, powerTransformerInfo);
                     // Leerlaufstrom bezogen auf Wicklung mit dem grössten Sr in %
                     const iLeer = (0, utils_2.getTrafoIleer)(i7Data, powerTransformerInfo);
+                    if (powerTransformer.getUUID() === '3f58ef46-918f-44d4-8b53-d4078caa2d92') {
+                        const stop = true;
+                    }
+                    if (powerTransformer.getUUID() === '1a74be35-0fd7-4295-bd02-e1413b183a4d') {
+                        const stop = true;
+                    }
+                    if (powerTransformer.getUUID() === '2f5150da-57be-40e8-a629-88cf4afe44e0') {
+                        const stop = true;
+                    }
                     // Impedanzen //TODO: prove if rated voltage is correct!!! current assumption: ur1>ur2>ur3
-                    const impedanzW1 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, pLeer, iLeer);
-                    const impedanzW2 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
+                    const impedanzW1 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(1, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, ur1 >= ur2 ? pLeer : 0, ur1 >= ur2 ? iLeer : 0);
+                    const impedanzW2 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(2, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, ur1 < ur2 ? pLeer : 0, ur1 < ur2 ? iLeer : 0);
                     const impedanzW3 = (0, utils_trafo3w_1.calculateImpedanzenTrafo3W)(3, ur1, ur2, ur3, sr1, sr2, sr3, pkr12, pkr13, pkr23, ukr12, ukr13, ukr23, 0, 0);
-                    if (powerTransformer.getUUID() === '120a9c2c93ff4a81b494ff63d356c266') {
-                        let stop = true;
-                    }
                     const powerTransformerEnd1 = new PowerTransformerEnd_1.PowerTransformerEnd((0, parser_utils_1.getUUID)(i7Data.guid_w1, this.objectMappingConfig.standardiseUuid), `W1-${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`);
                     powerTransformerEnd1.endNumber = 1;
                     // Topologie
@@ -4647,9 +4846,6 @@ class ConverterIntegral7 {
                             equivalentInjection = this.createBoundaryEquivalentInjection(frame, tmp_cn);
                         }
                     }
-                    if (powerTransformer.mrid === '49afe40b-89cc-419f-afc5-f330c6589f82') {
-                        const stop = true;
-                    }
                     //set transformer end winding connection
                     powerTransformerEnd1.connectionKind = (0, utils_2.getSchaltgruppe)(schaltgruppe, powerTransformerEnd1.endNumber, powerTransformerEnd1.grounded);
                     powerTransformerEnd1.phaseAngleClock = (0, utils_2.getSchaltgruppeAngleClock)(schaltgruppe, powerTransformerEnd1.endNumber);
@@ -4791,9 +4987,6 @@ class ConverterIntegral7 {
                     const spannungsband = integral7.targetVoltages.get(spRegKnoten.id);
                     const cnUUID = this.integralID2UUID.get(spRegKnoten.id);
                     const connectivityNode = cimModel.getObject(cnUUID);
-                    if (cnUUID !== undefined) {
-                        const stop = true;
-                    }
                     try {
                         this.convertTapChangers(i7Data, powerTransformerEnds, cimModel, powerTransformerInfo, connectivityNode, spannungsband);
                     }
@@ -4982,14 +5175,14 @@ class ConverterIntegral7 {
             //if (winding1) {
             powerTransformer.powerTransformerEnd[0].endNumber = 1;
             powerTransformer.powerTransformerEnd[1].endNumber = 2;
-            powerTransformer.powerTransformerEnd[1].phaseAngleClock = 12 - powerTransformer.powerTransformerEnd[0].phaseAngleClock;
+            powerTransformer.powerTransformerEnd[1].phaseAngleClock = (12 - powerTransformer.powerTransformerEnd[0].phaseAngleClock) % 12;
             powerTransformer.powerTransformerEnd[0].phaseAngleClock = 0;
             //} else {
             //  const isNull = true;
             //}
         }
     }
-    setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, defaultValuesConfig) {
+    setACLineSegmentProperties(defaultModel, cimModel, acLineSegment, data, cable, defaultValuesConfig) {
         if ((0, parser_utils_1.isBooleanI7)(data.flag_impedanzlos) && (0, parser_utils_1.convertToBooleanI7)(data.flag_impedanzlos)) {
             data.flag_impedanzlos = 1;
         }
@@ -5004,7 +5197,7 @@ class ConverterIntegral7 {
         else {
             acLineSegment.length = 1;
         }
-        const assetType = defaultModel.getWireInfoByName(data.nametyp);
+        const assetType = defaultModel.getWireInfoByName(data.nametyp, cable);
         // r0
         if ((0, parser_utils_1.isNumericI7)(data.r0) && data.r0 > 0 && !data.flag_impedanzlos) {
             acLineSegment.r0 = data.r0;
@@ -5140,7 +5333,7 @@ class ConverterIntegral7 {
     createIfNotExistOperationalLimitType(cimModel, name, type, direction) {
         let operationalLimitType = cimModel.getOperationalLimitTypeByName(name);
         if (!operationalLimitType) {
-            const key = type + direction;
+            const key = type + direction + cimModel.geographicalRegions.values().next().value.mrid;
             const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.OperationalLimitType, this.configUuid, key);
             operationalLimitType = new OperationalLimitType_1.OperationalLimitType(uuid, name);
             operationalLimitType.direction = direction;
@@ -5171,9 +5364,6 @@ class ConverterIntegral7 {
             terminal.conductingEquipment = conductingEquipment;
             conductingEquipment.addTerminal(terminal);
             terminal.connected = (terminal.connected !== undefined) ? terminal.connected : connected;
-            if (terminal.connected === false) {
-                const stop = true;
-            }
             if (!isNameSet) {
                 terminal.name = (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_' + terminal.name], 32, true);
             }
@@ -5181,6 +5371,7 @@ class ConverterIntegral7 {
         return terminal;
     }
     createBoundaryConnection(frame, conductingEquipment, i7ObjectID, phase) {
+        var _a;
         const cimModel = frame.cimModel;
         const anschlussUUID = this.integralID2UUID.get(i7ObjectID);
         let terminal = undefined;
@@ -5211,7 +5402,7 @@ class ConverterIntegral7 {
                     const key = cn.getUUID() + (conductingEquipment === null || conductingEquipment === void 0 ? void 0 : conductingEquipment.getUUID());
                     const uuid = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, key);
                     terminal = new Terminal_1.Terminal(uuid, (0, util_create_1.createNotation)([conductingEquipment.getUUID().substring(0, 8), '_', cn.getUUID().substring(0, 8), '_BD_T']));
-                    /** wchtig uuid zu setzen, da sonst ein memory leak entsteht */
+                    /** wichtig uuid zu setzen, da sonst ein memory leak entsteht */
                     terminal.connectivityNodeUUID = cn.mrid;
                     terminal.phases = phase;
                     terminal.connected = true;
@@ -5237,6 +5428,8 @@ class ConverterIntegral7 {
                 }
                 if (cn) {
                     this.annotateBoundaryNode(frame.name, frame.isoCode, frame.tsoName, cn);
+                    const int7id = (_a = this.UUID2Integral7ID.get(cn.getSubstation().getUUID())) === null || _a === void 0 ? void 0 : _a[0];
+                    frame.integral7Modell.currentSitesBoundary.set(int7id, frameBD.integral7Modell.integralStandorte.get(int7id));
                 }
                 else {
                     this.logger.error(`error --- Für das Objekt ${conductingEquipment.constructor.name} ${conductingEquipment.getUUID()} / ${conductingEquipment.equipmentContainer.constructor.name} ${conductingEquipment.equipmentContainer.getUUID()} konnte am I7-Objekt ${i7ObjectID} kein Grenzknoten bestimmt werden`);
@@ -5264,7 +5457,7 @@ class ConverterIntegral7 {
     createBoundaryEquivalentInjection(frame, cn) {
         let equivalentInjection = undefined;
         //Test if frame is boundary.
-        if (false /*!frame.boundary*/) {
+        if (true /*frame.boundary*/) {
             //Test if boundary Injection for this mas already exists
             let equivinj_exists = false;
             frame.cimModel.equivalentInjections.forEach((equivinj, uuid) => {
@@ -5359,15 +5552,6 @@ class ConverterIntegral7 {
                  * 2 - Niederspannungsseite (Anschluss 3)
                  * 3 - Externer Knoten
                  * */
-                if (powerTransformerEnds[0] && powerTransformerEnds[0].getTerminal() === undefined) {
-                    const stop = true;
-                }
-                if (powerTransformerEnds[1] && powerTransformerEnds[1].getTerminal() === undefined) {
-                    const stop = true;
-                }
-                if (powerTransformerEnds[2] && powerTransformerEnds[2].getTerminal() === undefined) {
-                    const stop = true;
-                }
                 let tempKnotenId = i7Data.spgreg_anschluss === 0 ? this.UUID2Integral7ID.get((_a = powerTransformerEnds[0].getTerminal()) === null || _a === void 0 ? void 0 : _a.getConnectivityNodeUUID())[0] : undefined;
                 tempKnotenId = i7Data.spgreg_anschluss === 1 ? this.UUID2Integral7ID.get((_b = powerTransformerEnds[1].getTerminal()) === null || _b === void 0 ? void 0 : _b.getConnectivityNodeUUID())[0] : tempKnotenId;
                 tempKnotenId = i7Data.spgreg_anschluss === 2 ? this.UUID2Integral7ID.get((_c = powerTransformerEnds[2].getTerminal()) === null || _c === void 0 ? void 0 : _c.getConnectivityNodeUUID())[0] : tempKnotenId;
@@ -5700,6 +5884,9 @@ class ConverterIntegral7 {
             // Topologie
             powerTransformerEnd.terminal = terminal;
             this.setConductingEquipmentOperationalLimit(cimModel, `W${powerTransformerEnd.endNumber}${powerTransformer === null || powerTransformer === void 0 ? void 0 : powerTransformer.name}`, terminal, powerTransformer.getUUID(), sdauer, cim_class_names_1.ClassNames.ApparentPowerLimit);
+            if (powerTransformer.getUUID() === '4d14cd95-215c-45f3-8136-b06d69ee0191') {
+                const stop = true;
+            }
             let isTrafo2w = i7Data.trafowicklung3w3 === undefined ? true : false;
             // Erdung / Sternpunkt
             if (sternpunktKnotenMap.has(i7Data.id) && isTrafo2w) {
@@ -5902,9 +6089,6 @@ class ConverterIntegral7 {
             uMax = uMax * invert;
             //test for uMin and uMax voltage add are not symmetrical...
             if (Math.abs(lowerVoltageStepDecrement) !== Math.abs(upperVoltageStepIncrement) || uMax < uMin || uMax === uMin || ratioPhaseTapChangerPresent) {
-                if (uMax === uMin) {
-                    const stop = true;
-                }
                 const keyTable = ratioTapChanger === null || ratioTapChanger === void 0 ? void 0 : ratioTapChanger.getUUID();
                 const uuidTable = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.RatioTapChangerTable, this.configUuid, keyTable);
                 const ratioTapChangerTable = new RatioTapChangerTable_1.RatioTapChangerTable(uuidTable, `${i7Data.bezeichner} W_${tapChangerNumber}`);
@@ -5979,9 +6163,6 @@ class ConverterIntegral7 {
          * */
         /** Regelung */
         const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`), this.objectMappingConfig.standardiseUuid), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
-        if (ratioTapChanger.mrid === 'df659ba2-a075-4f7d-bdd6-6b038cae962a') {
-            const stop = true;
-        }
         ratioTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) ? !(0, parser_utils_1.convertToBooleanI7)(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`) : false;
         ratioTapChanger.transformerEnd = transformerEnd;
         //transformerEnd.ratioTapChanger = ratioTapChanger;
@@ -6081,12 +6262,6 @@ class ConverterIntegral7 {
                 break;
             }
         }
-        if (phaseTapChanger.mrid === 'df659ba2-a075-4f7d-bdd6-6b038cae962a') {
-            const stop = true;
-        }
-        if (phaseTapChanger.mrid === '3d0bdc23-fe46-408d-99b3-369a02d28a28') {
-            const stop = true;
-        }
         // Attribute
         phaseTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`)) ? (0, parser_utils_1.convertToBooleanI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${tapChangerNumber}`)) : false;
         phaseTapChanger.transformerEnd = transformerEnd;
@@ -6460,7 +6635,7 @@ function getDCNodeFromConverter(acDcConverter, polarity) {
     }
     return ret_val;
 }
-function createDCGround(cimModel, acDCConverter, i7Data) {
+function createDCGround(cimModel, acDCConverter, dcConverterUnitGround, i7Data, bipole, dcLineNeutral) {
     const dcConverterUnit = acDCConverter.equipmentContainer;
     const dcGround = new DCGround_1.DCGround((0, parser_utils_1.getUUID)(i7Data.guid_dcground), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCG'], 32, true));
     const dcTerminalG = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(i7Data.guid_dcterminalg), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCG_DCT']));
@@ -6473,7 +6648,15 @@ function createDCGround(cimModel, acDCConverter, i7Data) {
     dcTerminalM1.dcNode = dcNodeG;
     dcGround.equipmentContainer = dcConverterUnit;
     dcGround.dCTerminals.set(dcTerminalG.getUUID(), dcTerminalG);
-    dcNodeG.dcEquipmentContainer = dcConverterUnit;
+    if (bipole && dcLineNeutral !== undefined) {
+        dcNodeG.dcEquipmentContainer = dcLineNeutral;
+    }
+    else if (bipole && dcLineNeutral === undefined) {
+        dcNodeG.dcEquipmentContainer = dcConverterUnitGround;
+    }
+    else {
+        dcNodeG.dcEquipmentContainer = dcConverterUnit;
+    }
     dcNodeG.dcTerminals.set(dcTerminalG.getUUID(), dcTerminalG);
     dcNodeG.dcTerminals.set(dcTerminalM1.getUUID(), dcTerminalM1);
     acDCConverter.dCTerminals.set(dcTerminalM1.getUUID(), dcTerminalM1);
@@ -6492,16 +6675,16 @@ function createDCGround(cimModel, acDCConverter, i7Data) {
  * @param i7Data
  * @param endNumber Start means a value of '1'. Target means a value of '2'.
  */
-function connectDCGround(cimModel, acdcConverter, i7Data, dcNode, polarity) {
+function connectDCGround(cimModel, i7Data, dcNode, polarity, acdcConverter) {
     let dcTerminalMx = undefined;
     let dcNodeG = dcNode;
     const dcTerminalM1UUID = (0, parser_utils_1.getUUID)(i7Data.guid_dcterminalm1);
     const dcTerminalM2UUID = (0, parser_utils_1.getUUID)(i7Data.guid_dcterminalm2);
     if (dcNodeG.dcTerminals.get(dcTerminalM1UUID)) {
-        dcTerminalMx = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(dcTerminalM2UUID), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_NEG', '_DCT']));
+        dcTerminalMx = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(dcTerminalM2UUID), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_MID_DCT']));
     }
     else {
-        dcTerminalMx = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(dcTerminalM1UUID), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT']));
+        dcTerminalMx = new ACDCConverterDCTerminal_1.ACDCConverterDCTerminal((0, parser_utils_1.getUUID)(dcTerminalM1UUID), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_MID_DCT']));
     }
     dcTerminalMx.polarity = polarity;
     dcNodeG.dcTerminals.set(dcTerminalMx.getUUID(), dcTerminalMx);