ComplexMath.'abs' is not inlined

[Francesco Casella]

Please run this simple model with -d=dumpdaelow

model TestComplexAbs
 Complex z;
 Real x;
equation
 z = Complex(time, 1);
 x = Modelica.ComplexMath.'abs'(z);
end TestComplexAbs;

The output is

1/1 (1): z.re = time   [dynamic |0|0|0|0|] 
2/2 (1): z.im = 1.0   [dynamic |0|0|0|0|] 
3/3 (1): x = Modelica.ComplexMath.'abs'(z)   [dynamic |0|0|0|0|] 

For some reason, the 'abs' function is not inlined as required by the annotation in its definition, otherwise the third line should read

x = (z.re^2 + z.im^2)^0.5

Please make sure inlining works with this function, otherwise the backend cannot generate symbolic Jacobians if the function is involved in a nonlinear algebraic loop

[Vitalij Ruge]

@casella
Inlining of functions will be done with normalInlineFunction

######################################## 
pre-optimization module normalInlineFunction (simulation) 
######################################## 
Equations (3, 3) 
======================================== 
1/1 (1): z.re = time   [dynamic] 
2/2 (1): z.im = 1.0   [dynamic] 
3/3 (1): x = (z.re ^ 2.0 + z.im ^ 2.0) ^ 0.5   [dynamic] 

I guess we do partitional some inlining for records like constructor in frondend and inlining function in backend in the optdaemodul normalInlineFunction .

I prefer your expectation that things belong together.

[Francesco Casella]

@vitalij, there was some issue with the NF that did not pass the Inline annotation to the backend. This should now be fixed, I'll check again tomorrow.

[Francesco Casella]

Unfortunately, if I run the model with -d=newInst,dumpdaelow I still get

Equations (3, 3) 
======================================== 
1/1 (1): z.im = 1.0   [dynamic |0|0|0|0|] 
2/2 (1): z.re = time   [dynamic |0|0|0|0|] 
3/3 (1): x = Modelica.ComplexMath.'abs'(z)   [dynamic |0|0|0|0|] 

@vitalij, how did you get the result reported in comment:2?

[Vitalij Ruge]

setCommandLineOptions("+d=optdaedump,newInst");
loadModel(Modelica);
getErrorString();
loadString("
model TestComplexAbs
 Complex z;
 Real x;
equation
 z = Complex(time, 1);
 x = Modelica.ComplexMath.'abs'(z);
end TestComplexAbs;
");

getErrorString();
simulate(TestComplexAbs);

[Francesco Casella]

Oops, sorry, I missed the right -d flag.

Thanks @vitalij!