@enervance/insight-cim-model 0.0.207 → 0.0.208-dev
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/converter/integral7/converter.integral7.js +32 -17
- package/dist/converter/integral7/converter.integral7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/data-manager.d.ts +1 -4
- package/dist/converter/integral7/dl-convert/data-manager.js +37 -43
- package/dist/converter/integral7/dl-convert/data-manager.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-converter-i7.d.ts +6 -4
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js +69 -57
- package/dist/converter/integral7/dl-convert/dl-converter-i7.js.map +1 -1
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.d.ts +0 -10
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js +1 -43
- package/dist/converter/integral7/dl-convert/dl-graphs/cim-model-graph.js.map +1 -1
- package/dist/converter/integral7/dl-convert/executor.d.ts +1 -1
- package/dist/converter/integral7/dl-convert/executor.js +42 -36
- package/dist/converter/integral7/dl-convert/executor.js.map +1 -1
- package/dist/converter/integral7/interface-i7/data-structures-i7.d.ts +0 -23
- package/dist/converter/integral7/interface-i7/export-frame-i7.d.ts +0 -22
- package/dist/converter/integral7/interface-i7/export-frame-i7.js +6 -39
- package/dist/converter/integral7/interface-i7/export-frame-i7.js.map +1 -1
- package/dist/converter/integral7/model/dl-utils/util-functions.d.ts +2 -0
- package/dist/converter/integral7/model/dl-utils/util-functions.js +8 -0
- package/dist/converter/integral7/model/dl-utils/util-functions.js.map +1 -1
- package/dist/converter/integral7/utils.d.ts +5 -0
- package/dist/converter/integral7/utils.js +20 -1
- package/dist/converter/integral7/utils.js.map +1 -1
- package/dist/model/dc/DCTerminal.js +1 -1
- package/dist/model/dc/DCTerminal.js.map +1 -1
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.d.ts +2 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js +6 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer2WInfo.js.map +1 -1
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.d.ts +2 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js +6 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformer3WInfo.js.map +1 -1
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformerInfo.d.ts +2 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformerInfo.js +6 -0
- package/dist/model/extensions/integral/assetinfo/INTEGRALPowerTransformerInfo.js.map +1 -1
- package/dist/utils2/common.utils.js +3 -0
- package/dist/utils2/common.utils.js.map +1 -1
- package/package.json +2 -1
|
@@ -538,9 +538,7 @@ class ConverterIntegral7 {
|
|
|
538
538
|
yield this.assignTerminalSequenceNumber(cimModel);
|
|
539
539
|
logExecutionTime(this.logger, startTime, `assignment of sequence number`);
|
|
540
540
|
/** DC Model */
|
|
541
|
-
/**
|
|
542
|
-
* DL Profile
|
|
543
|
-
**/
|
|
541
|
+
/** DL Profile */
|
|
544
542
|
if (!frame.boundary) {
|
|
545
543
|
this.executor = new executor_1.Executor(this.mysqlController, this.configUuid);
|
|
546
544
|
yield this.executor.mergeDataFromIntegralID2UUID(this.integralID2UUID);
|
|
@@ -569,6 +567,7 @@ class ConverterIntegral7 {
|
|
|
569
567
|
const netzStreckenlastIds = [...integral7Modell.integralLeitungen.values()].map(leitung => leitung.streckenlastId).filter(id => id !== undefined && id !== null);
|
|
570
568
|
const allLeitungIds = [...new Set([...netzLeitungIds, ...netzHgueLeitungIds, ...netzErsatzlaengszweigIds, ...netzStreckenlastIds]).values()];
|
|
571
569
|
const convertOptions = {
|
|
570
|
+
visible_only: true,
|
|
572
571
|
only: {
|
|
573
572
|
netz_standortIds,
|
|
574
573
|
netz_knotensoIds,
|
|
@@ -619,7 +618,6 @@ class ConverterIntegral7 {
|
|
|
619
618
|
}
|
|
620
619
|
}
|
|
621
620
|
this.executor.dataManager.cimModelGraph.purgeAll();
|
|
622
|
-
this.executor.dataManager.dbObjectKeyCimModelUuidGraph.purgeAll();
|
|
623
621
|
}
|
|
624
622
|
});
|
|
625
623
|
}
|
|
@@ -1003,7 +1001,7 @@ class ConverterIntegral7 {
|
|
|
1003
1001
|
});
|
|
1004
1002
|
}
|
|
1005
1003
|
convertSammelschienenAbschnitte(cimModel, integral7, schaltanlagenAbschnittIDs) {
|
|
1006
|
-
var _a;
|
|
1004
|
+
var _a, _b;
|
|
1007
1005
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
1008
1006
|
if (this.isTableAvailable(integral_sql_1.Integral7TableNames.SAMMELSCHIENE)) {
|
|
1009
1007
|
const result = yield this.mysqlController.execQuery((0, integral_sql_1.getI7Query)(integral_sql_1.I7Objects.SAMMELSCHIENE, this.getAvailableColumnNames(integral_sql_1.Integral7TableNames.SAMMELSCHIENE), schaltanlagenAbschnittIDs));
|
|
@@ -1014,7 +1012,11 @@ class ConverterIntegral7 {
|
|
|
1014
1012
|
const connectivityNode = new AMPRIONConnectivityNode_1.AMPRIONConnectivityNode(rdfid, i7Data.bezeichner, i7Data.kurzname);
|
|
1015
1013
|
const voltageLevel = cimModel.getVoltageLevel(this.integralID2UUID.get(i7Schaltanlagenabschnitt.id));
|
|
1016
1014
|
connectivityNode.nodeNumber = i7Data.id_psse_cape;
|
|
1017
|
-
const keyBusbarSection =
|
|
1015
|
+
const keyBusbarSection = [
|
|
1016
|
+
integral_sql_1.I7Objects.SAMMELSCHIENE,
|
|
1017
|
+
(_a = voltageLevel === null || voltageLevel === void 0 ? void 0 : voltageLevel.getUUID()) !== null && _a !== void 0 ? _a : '',
|
|
1018
|
+
(_b = connectivityNode === null || connectivityNode === void 0 ? void 0 : connectivityNode.getUUID()) !== null && _b !== void 0 ? _b : ''
|
|
1019
|
+
].join('');
|
|
1018
1020
|
const uuidBusbarSection = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.BusbarSection, this.configUuid, keyBusbarSection);
|
|
1019
1021
|
const busbarSection = new BusbarSection_1.BusbarSection(uuidBusbarSection, i7Data.bezeichner, i7Schaltanlagenabschnitt.kurzname);
|
|
1020
1022
|
busbarSection.ipMax = i7Data.limit_ip;
|
|
@@ -1419,10 +1421,12 @@ class ConverterIntegral7 {
|
|
|
1419
1421
|
synchronousMachine.ratedPowerFactor = cosphir ? cosphir : undefined;
|
|
1420
1422
|
/** EQ-SC */
|
|
1421
1423
|
synchronousMachine.earthing = ((_a = i7Data.erdung) === null || _a === void 0 ? void 0 : _a.length) > 0 && i7Data.erdung != 'isoliert' ? true : false;
|
|
1422
|
-
synchronousMachine.r = (0, parser_utils_1.isNumericI7)(i7Data.rg) ? (0,
|
|
1424
|
+
synchronousMachine.r = (0, parser_utils_1.isNumericI7)(i7Data.rg) ? (0, utils_2.calculatePU2OHM)((0, parser_utils_1.convertToNumberI7)(i7Data.rg), synchronousMachine.ratedU, synchronousMachine.ratedS) :
|
|
1425
|
+
((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.rg) ? (0, utils_2.calculatePU2OHM)((0, parser_utils_1.convertToNumberI7)(i7Data.rg), synchronousMachine.ratedU, synchronousMachine.ratedS) : undefined);
|
|
1423
1426
|
synchronousMachine.r0 = 0;
|
|
1424
1427
|
synchronousMachine.r2 = 0;
|
|
1425
|
-
synchronousMachine.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0g) ? (0, parser_utils_1.convertToNumberI7)(i7Data.x0g) :
|
|
1428
|
+
synchronousMachine.x0 = (0, parser_utils_1.isNumericI7)(i7Data.x0g) ? (0, utils_2.calculatePU2OHM)((0, parser_utils_1.convertToNumberI7)(i7Data.x0g), synchronousMachine.ratedU, synchronousMachine.ratedS) :
|
|
1429
|
+
((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.x0g) ? (0, utils_2.calculatePU2OHM)((0, parser_utils_1.convertToNumberI7)(i7Data.x0g), synchronousMachine.ratedU, synchronousMachine.ratedS) : undefined);
|
|
1426
1430
|
synchronousMachine.x2 = 0;
|
|
1427
1431
|
synchronousMachine.satDirectSubtransX = (0, parser_utils_1.isNumericI7)(i7Data.xd2s) ? (0, parser_utils_1.convertToNumberI7)(i7Data.xd2s) : ((0, parser_utils_1.isNumericI7)(genType === null || genType === void 0 ? void 0 : genType.xd2s) ? (0, parser_utils_1.convertToNumberI7)(genType.xd2s) : undefined);
|
|
1428
1432
|
// synchronousMachine.earthingStarPointR
|
|
@@ -1881,6 +1885,9 @@ class ConverterIntegral7 {
|
|
|
1881
1885
|
convertErsatzQuerZweige2EquivalentInjection(cimModel, targetVoltages, result) {
|
|
1882
1886
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
1883
1887
|
for (const i7Data of result) {
|
|
1888
|
+
if (i7Data.guid === '_8addc711-52fd-4ff6-b5ff-50aadc1a32ec') {
|
|
1889
|
+
const stop = true;
|
|
1890
|
+
}
|
|
1884
1891
|
const einspeisePrio = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : 1;
|
|
1885
1892
|
const flag_lfl = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_lfl);
|
|
1886
1893
|
const flag_ks = (0, parser_utils_1.convertToBooleanI7)(i7Data.flag_ks);
|
|
@@ -1929,12 +1936,12 @@ class ConverterIntegral7 {
|
|
|
1929
1936
|
}
|
|
1930
1937
|
else if (flag_lfl || flag_ks) {
|
|
1931
1938
|
equivalentInjection.regulationCapability = false;
|
|
1932
|
-
equivalentInjection.r = r1;
|
|
1933
|
-
equivalentInjection.r0 = r0;
|
|
1934
|
-
equivalentInjection.r2 = r1;
|
|
1935
|
-
equivalentInjection.x = x1;
|
|
1936
|
-
equivalentInjection.x0 = x0;
|
|
1937
|
-
equivalentInjection.x2 = x1;
|
|
1939
|
+
equivalentInjection.r = (0, parser_utils_1.isNumericI7)(r1) ? 1e9 : r1;
|
|
1940
|
+
equivalentInjection.r0 = (0, parser_utils_1.isNumericI7)(r0) ? 1e9 : r0;
|
|
1941
|
+
equivalentInjection.r2 = (0, parser_utils_1.isNumericI7)(r1) ? 1e9 : r1;
|
|
1942
|
+
equivalentInjection.x = (0, parser_utils_1.isNumericI7)(x1) ? 1e9 : x1;
|
|
1943
|
+
equivalentInjection.x0 = (0, parser_utils_1.isNumericI7)(x0) ? 1e9 : x0;
|
|
1944
|
+
equivalentInjection.x2 = (0, parser_utils_1.isNumericI7)(x1) ? 1e9 : x1;
|
|
1938
1945
|
}
|
|
1939
1946
|
/** Export Extended Ward equivalent with no voltage regulation */
|
|
1940
1947
|
else if (((r_ext !== undefined && r_ext !== 0) || (x_ext !== undefined && x_ext !== 0))) {
|
|
@@ -2753,6 +2760,9 @@ class ConverterIntegral7 {
|
|
|
2753
2760
|
externalNetworkInjection.multiplierFactorUUID = mf.getUUID();
|
|
2754
2761
|
}
|
|
2755
2762
|
/** Convert EQ-profile dataset. */
|
|
2763
|
+
if (i7Data.guid === '_ab64e281-72d0-45fb-8cb3-da4ae99a4f8c') {
|
|
2764
|
+
const stop = true;
|
|
2765
|
+
}
|
|
2756
2766
|
let einspeisePrioritaet = (0, parser_utils_1.isNumericI7)(i7Data.einspprio) ? (0, parser_utils_1.convertToNumberI7)(i7Data.einspprio) : undefined;
|
|
2757
2767
|
const maxP = (0, parser_utils_1.isNumericI7)(i7Data.p_max) ? (0, parser_utils_1.convertToNumberI7)(i7Data.p_max) : undefined;
|
|
2758
2768
|
externalNetworkInjection.maxP = maxP;
|
|
@@ -4195,6 +4205,7 @@ class ConverterIntegral7 {
|
|
|
4195
4205
|
if (startDCNodeNeg) {
|
|
4196
4206
|
const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminaln1')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
|
|
4197
4207
|
dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
|
|
4208
|
+
dcTerminal.connected = true;
|
|
4198
4209
|
dcTerminal.dcNode = startDCNodeNeg;
|
|
4199
4210
|
dcLineSegmentNeg.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
4200
4211
|
startDCNodeNeg.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
@@ -4208,6 +4219,7 @@ class ConverterIntegral7 {
|
|
|
4208
4219
|
if (targetDCNode) {
|
|
4209
4220
|
const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminalp2')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_DCT'], 32, true));
|
|
4210
4221
|
dcTerminal.dCConductingEquipment = dcLineSegment;
|
|
4222
|
+
dcTerminal.connected = true;
|
|
4211
4223
|
dcTerminal.dcNode = targetDCNode;
|
|
4212
4224
|
dcLineSegment.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
4213
4225
|
targetDCNode.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
@@ -4219,6 +4231,7 @@ class ConverterIntegral7 {
|
|
|
4219
4231
|
if (targetDCNodeNeg) {
|
|
4220
4232
|
const dcTerminal = new DCTerminal_1.DCTerminal((0, parser_utils_1.getUUID)(eval('i7Data.guid_dcterminaln2')), (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_neg', '_DCT'], 32, true));
|
|
4221
4233
|
dcTerminal.dCConductingEquipment = dcLineSegmentNeg;
|
|
4234
|
+
dcTerminal.connected = true;
|
|
4222
4235
|
dcTerminal.dcNode = targetDCNodeNeg;
|
|
4223
4236
|
dcLineSegmentNeg.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
4224
4237
|
targetDCNodeNeg.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
@@ -4232,6 +4245,7 @@ class ConverterIntegral7 {
|
|
|
4232
4245
|
const dcTerminalM3UUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.DCTerminal, this.configUuid, dcTerminalKey);
|
|
4233
4246
|
const dcTerminal = new DCTerminal_1.DCTerminal(dcTerminalM3UUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCT'], 32, true));
|
|
4234
4247
|
dcTerminal.dCConductingEquipment = dcLineSegmentNeutral;
|
|
4248
|
+
dcTerminal.connected = true;
|
|
4235
4249
|
dcTerminal.dcNode = dcNodeStartMiddle;
|
|
4236
4250
|
dcLineSegmentNeutral.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
4237
4251
|
dcNodeStartMiddle.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
@@ -4245,6 +4259,7 @@ class ConverterIntegral7 {
|
|
|
4245
4259
|
const dcTerminalM3UUID = common_utils_1.CommonUtils.generateUUIDv5(cim_class_names_1.ClassNames.Terminal, this.configUuid, dcTerminalKey);
|
|
4246
4260
|
const dcTerminal = new DCTerminal_1.DCTerminal(dcTerminalM3UUID, (0, util_create_1.createNotation)([(0, utils_2.getName)(i7Data), '_mid', '_DCT'], 32, true));
|
|
4247
4261
|
dcTerminal.dCConductingEquipment = dcLineSegmentNeutral;
|
|
4262
|
+
dcTerminal.connected = true;
|
|
4248
4263
|
dcTerminal.dcNode = dcNodeTargetMiddle;
|
|
4249
4264
|
dcLineSegmentNeutral.dCTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
4250
4265
|
dcNodeTargetMiddle.dcTerminals.set(dcTerminal.getUUID(), dcTerminal);
|
|
@@ -6158,7 +6173,7 @@ class ConverterIntegral7 {
|
|
|
6158
6173
|
* */
|
|
6159
6174
|
/** Regelung */
|
|
6160
6175
|
const ratioTapChanger = new RatioTapChanger_1.RatioTapChanger((0, parser_utils_1.getUUID)(eval(`i7Data.guid_tch${tapChangerNumber}`), this.objectMappingConfig.standardiseUuid), `${transformerEnd.name} W_${transformerEnd.endNumber}`);
|
|
6161
|
-
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}`) :
|
|
6176
|
+
ratioTapChanger.ltcFlag = (0, parser_utils_1.isNumericI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`)) ? !(0, parser_utils_1.convertToBooleanI7)(eval(`i7Data.unter_last_nicht_verstellbar_s${gestufteSeite}`)) : true;
|
|
6162
6177
|
ratioTapChanger.transformerEnd = transformerEnd;
|
|
6163
6178
|
//transformerEnd.ratioTapChanger = ratioTapChanger;
|
|
6164
6179
|
ratioTapChanger.neutralU = transformerEnd.ratedU;
|
|
@@ -6258,9 +6273,9 @@ class ConverterIntegral7 {
|
|
|
6258
6273
|
}
|
|
6259
6274
|
}
|
|
6260
6275
|
// Attribute
|
|
6261
|
-
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}`)) :
|
|
6276
|
+
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}`)) : true;
|
|
6262
6277
|
phaseTapChanger.transformerEnd = transformerEnd;
|
|
6263
|
-
|
|
6278
|
+
phaseTapChanger.neutralU = transformerEnd.ratedU;
|
|
6264
6279
|
// Wirkleistungsregelung Anschluss
|
|
6265
6280
|
const pRegulationToNode = (0, parser_utils_1.isNumericI7)(i7Data.nach_a_nr) ? (0, parser_utils_1.convertToNumberI7)(i7Data.nach_a_nr) : undefined;
|
|
6266
6281
|
const regulatingTransformerEnd = transformerEnds.find(elem => elem.endNumber === pRegulationToNode);
|