@@ -53,7 +53,7 @@ void createTwoWindings(DataObject elmTr2) {
5353
5454 RatedModel ratedModel = RatedModel .create (typTr2 , highAtEnd1 );
5555 double nominalVoltageEnd2 = vl2 .getNominalV ();
56- TransformerModel transformerModel = TransformerModel .create (typTr2 , ratedModel .ratedS , nominalVoltageEnd2 );
56+ TransformerModel transformerModel = TransformerModel .create (elmTr2 . getLocName (), typTr2 , ratedModel .ratedS , nominalVoltageEnd2 );
5757
5858 if (!tapChangerAtEnd1 ) {
5959 // Structural ratio at end2 = ratedU2 / vn2
@@ -119,7 +119,7 @@ void createThreeWindings(DataObject elmTr3) {
119119 double ratedU2 = ratedModel2 .ratedU1 ;
120120 double ratedU3 = ratedModel3 .ratedU1 ;
121121
122- Transformer3WModel transformer3WModel = Transformer3WModel .create (typTr3 , rated3WModel , vn0 );
122+ Transformer3WModel transformer3WModel = Transformer3WModel .create (elmTr3 . getLocName (), typTr3 , rated3WModel , vn0 );
123123 TransformerModel transformerModel1 = transformer3WModel .getEnd (windingTypeEnds .get (0 ));
124124 TransformerModel transformerModel2 = transformer3WModel .getEnd (windingTypeEnds .get (1 ));
125125 TransformerModel transformerModel3 = transformer3WModel .getEnd (windingTypeEnds .get (2 ));
@@ -266,10 +266,10 @@ private TransformerModel(Complex impedance, Complex shuntAdmittance) {
266266 this .b = shuntAdmittance .getImaginary ();
267267 }
268268
269- private static TransformerModel create (DataObject typTr2 , double ratedApparentPower , double nominalVoltageEnd2 ) {
269+ private static TransformerModel create (String transformerId , DataObject typTr2 , double ratedApparentPower , double nominalVoltageEnd2 ) {
270270
271271 Complex impedance = createImpedance ("uktr" , "pcutr" , typTr2 , ratedApparentPower , nominalVoltageEnd2 );
272- Complex shuntAdmittance = createShuntAdmittance ("curmg" , "pfe" , typTr2 , ratedApparentPower , nominalVoltageEnd2 );
272+ Complex shuntAdmittance = createShuntAdmittance (transformerId , "curmg" , "pfe" , typTr2 , ratedApparentPower , nominalVoltageEnd2 );
273273 Complex proportion = createProportion ("itrdr" , "itrdl" , typTr2 );
274274
275275 if (isProportionDefined (proportion ) && shuntAdmittance .abs () != 0.0 ) {
@@ -286,10 +286,10 @@ private static Complex createImpedance(String uktrT, String pcutrT, DataObject t
286286 return createImpedanceFromMeasures (uktr , pcutr , ratedApparentPower , nominalVoltage );
287287 }
288288
289- private static Complex createShuntAdmittance (String curmgT , String pfeT , DataObject typTr2 , double ratedApparentPower , double nominalVoltage ) {
289+ private static Complex createShuntAdmittance (String transformerId , String curmgT , String pfeT , DataObject typTr2 , double ratedApparentPower , double nominalVoltage ) {
290290 float curmg = typTr2 .getFloatAttributeValue (curmgT );
291291 if (curmg == 0 ) {
292- LOGGER .warn ("curmg is zero" );
292+ LOGGER .warn ("{} of transformer '{}' is zero, skipping shunt admittance" , transformerId , curmgT );
293293 return Complex .ZERO ;
294294 }
295295 float pfe = typTr2 .getFloatAttributeValue (pfeT );
@@ -388,7 +388,7 @@ private TransformerModel getEnd(WindingType windingType) {
388388 return transformerModels .get (windingType );
389389 }
390390
391- private static Transformer3WModel create (DataObject typTr3 , Rated3WModel rated3WModel , double nominalVoltage ) {
391+ private static Transformer3WModel create (String transformerId , DataObject typTr3 , Rated3WModel rated3WModel , double nominalVoltage ) {
392392 double ratedSH = rated3WModel .getEnd (WindingType .HIGH ).ratedS ;
393393 double ratedSM = rated3WModel .getEnd (WindingType .MEDIUM ).ratedS ;
394394 double ratedSL = rated3WModel .getEnd (WindingType .LOW ).ratedS ;
@@ -403,7 +403,7 @@ private static Transformer3WModel create(DataObject typTr3, Rated3WModel rated3W
403403 Complex zM = zHM .add (zML ).subtract (zLH ).multiply (0.5 );
404404 Complex zL = zML .add (zLH ).subtract (zHM ).multiply (0.5 );
405405
406- Complex ysh = TransformerModel .createShuntAdmittance ("curm3" , "pfe" , typTr3 , ratedSH , nominalVoltage );
406+ Complex ysh = TransformerModel .createShuntAdmittance (transformerId , "curm3" , "pfe" , typTr3 , ratedSH , nominalVoltage );
407407 int i3loc = typTr3 .findIntAttributeValue ("i3loc" ).orElse (0 );
408408
409409 Complex yshH = assignShuntAdmittanceToWinding (ysh , i3loc , WindingType .HIGH );
0 commit comments