@enervance/insight-cim-model 0.0.142 → 0.0.143

package/dist/converter/integral7/converter.integral7.d.ts

@@ -82,6 +82,7 @@ export declare class ConverterIntegral7 {
     convertEinspeisungen(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], objectMappingConfig: IObjectMappingConfig, energySourceTypeMappingConfig: IEnergySourceTypeMapping[]): Promise<void>;
     convertErsatzQuerZweige(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], targetClass: string): Promise<void>;
     convertGeneratoren(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], energyTypesConfig: any): Promise<void>;
+    private convertEnergySourceToSynchronousMachine;
     convertAsynchronmotor(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], defaultValuesConfig: IDefaultValuesConfig): Promise<void>;
     convertKraftwerksbloecke(cimModel: INTEGRALModelContainer, knotenSfIDs: number[], energyTypesConfig: any): Promise<void>;
     convertErsatzQuerZweige2ExternalNetworkInjection(cimModel: INTEGRALModelContainer, result: Ersatzquerzweig[]): Promise<void>;

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

@@ -134,6 +134,7 @@ const DiagramObject_1 = require("../../model/diagram/DiagramObject.js");
 const util_asset_model_1 = require("./util-asset.model.js");
 const cim_constants_1 = require("../../constants/cim-constants.js");
 const EVWireObject_1 = require("../../model/extensions/enervance/assets/EVWireObject.js");
+const SynchronousMachine_1 = require("../../model/wires/SynchronousMachine.js");
 class ConverterIntegral7 {
     constructor() {
         /** Exportnetze gemäß Konfiguration  */
@@ -1149,7 +1150,6 @@ class ConverterIntegral7 {
         });
     }
     convertEinspeisungen(cimModel, knotenSfIDs, objectMappingConfig, energySourceTypeMappingConfig) {
-        var _a;
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const targetConfig = objectMappingConfig.Einspeisung;
             const targetClass = objectMappingConfig.Einspeisung.class;
@@ -1164,17 +1164,23 @@ class ConverterIntegral7 {
                         yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, result);
                         break;
                     }
-                    default: {
-                        if ((_a = targetConfig.referencePriority) === null || _a === void 0 ? void 0 : _a.prio) {
-                            // Westnetz Hochspannungsheuristik
-                            const i7SlacksResults = result.filter(it => it.spannungsgeregelt);
-                            const i7EnergySourceResults = result.filter(it => !it.spannungsgeregelt);
-                            yield this.convertEinspeisungen2EnergySource(cimModel, i7EnergySourceResults, energySourceTypeMappingConfig);
-                            yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, i7SlacksResults);
-                        }
-                        else {
-                            yield this.convertEinspeisungen2EnergySource(cimModel, result, energySourceTypeMappingConfig);
+                    case cim_class_names_1.ClassNames.EnergySource: {
+                        for (const config of objectMappingConfig.Einspeisung.referencePriorityMapping) {
+                            const filtered = result.filter(it => it.spannungsgeregelt && it.einspprio === config.prio);
+                            switch (config.class) {
+                                case 'ExternalNetworkInjection': {
+                                    yield this.convertEinspeisungen2ExternalNetworkInjection(cimModel, filtered);
+                                }
+                                case 'SynchronousMachine': {
+                                    yield this.convertEnergySourceToSynchronousMachine(cimModel, filtered);
+                                }
+                            }
                         }
+                        const i7EnergySourceResults = result.filter(it => !it.spannungsgeregelt);
+                        yield this.convertEinspeisungen2EnergySource(cimModel, i7EnergySourceResults, energySourceTypeMappingConfig);
+                        const others = result.filter(it => !it.spannungsgeregelt && !it.einspprio);
+                        console.log(`convertEinspeisungen nicht konvertierte Objekte ${others.length}`);
+                        break;
                     }
                 }
             }
@@ -1522,6 +1528,60 @@ class ConverterIntegral7 {
             }
         });
     }
+    convertEnergySourceToSynchronousMachine(cimModel, result) {
+        for (const i7Data of result) {
+            try {
+                const synchronousMachine = new SynchronousMachine_1.SynchronousMachine((0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_SM'], 32, true), i7Data.kurzname);
+                const inBetrieb = (0, parser_utils_1.convertToBooleanI7)(i7Data.betrieb);
+                const powerData = (0, utils_2.getActiveReactivePower)(i7Data);
+                const p = powerData[0];
+                const q = powerData[1];
+                const prio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
+                synchronousMachine.referencePriority = prio;
+                // SSH Profil
+                synchronousMachine.setActivePower(p * -1); //convert to load sign system
+                synchronousMachine.setReactivePower(q * -1); //convert to load sign system
+                /** Set machine type */
+                synchronousMachine.type = SynchronousMachineKind_1.SynchronousMachineKind.generator;
+                /** Set machine operatingMode */
+                synchronousMachine.operatingMode = SynchronousMachineOperatingMode_1.SynchronousMachineOperatingMode.generator;
+                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;
+                synchronousMachine.maxQ = maxQ ? maxQ : undefined;
+                synchronousMachine.minQ = minQ ? minQ : undefined;
+                synchronousMachine.ratedS = Math.sqrt(Math.pow(p, 2) + Math.pow(q, 2));
+                const usoll = +i7Data.usoll;
+                synchronousMachine.ratedU = usoll;
+                synchronousMachine.aggregate = true;
+                /** RegulatingControl */
+                let regulatingControl = undefined;
+                // TODO targetDeadband: ab welcher spannung soll reguliert werden.
+                switch (i7Data.spannungsgeregelt) {
+                    case 1: {
+                        regulatingControl = new RegulatingControl_1.RegulatingControl(common_utils_1.CommonUtils.generateUUID(), (0, util_create_1.createNotation)(['GEN'], 32, true));
+                        regulatingControl.targetValue = usoll !== undefined ? usoll : synchronousMachine.ratedU;
+                        regulatingControl.mode = RegulatingControlModeKind_1.RegulatingControlModeKind.voltage;
+                        regulatingControl.discrete = false;
+                        regulatingControl.enabled = true;
+                        synchronousMachine.controlEnabled = true;
+                        regulatingControl.addRegulatingCondEq(synchronousMachine);
+                        synchronousMachine.regulatingControlUUID = regulatingControl.getUUID();
+                        cimModel.addRegulatingControl(regulatingControl);
+                        break;
+                    }
+                    default: {
+                        synchronousMachine.controlEnabled = false;
+                    }
+                }
+                this.setTopologyEnergySourceConsumerObject(cimModel, synchronousMachine, i7Data);
+                cimModel.addSynchronousMachine(synchronousMachine);
+                this.addIdMapping(i7Data.id, synchronousMachine.mrid, integral_sql_1.Integral7TableNames.GENERATOR);
+            }
+            catch (err) {
+                this.logger.error(`Err convertEnergySourceToSynchronousMachine ${i7Data.id} ${err}`);
+            }
+        }
+    }
     convertAsynchronmotor(cimModel, knotenSfIDs, defaultValuesConfig) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             // Generatoren werden als GeneratingUnit und SynchronousMachine abgebildet
@@ -2801,9 +2861,6 @@ class ConverterIntegral7 {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             for (const i7Data of result) {
                 try {
-                    if (i7Data.guid === '_0c9bfad8-1f90-4974-93f1-4e7af3440040') {
-                        console.log();
-                    }
                     const cn = cimModel.objects.get(this.integralID2UUID.get(i7Data.anschluss));
                     const cimrdfid = (0, parser_utils_1.getUUID)(i7Data.guid, this.objectMappingConfig.standardiseUuid);
                     const externalNetworkInjection = new INTEGRALExternalNetworkInjection_1.INTEGRALExternalNetworkInjection(cimrdfid, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_', cimrdfid.substring(0, 8), '_ENI'], 32, true), i7Data.kurzname);