Skip to content

Commit c22f30e

Browse files
kabdelhakadrpo
authored andcommitted
[BE] fix solvable call check
1 parent b49f2c1 commit c22f30e

File tree

6 files changed

+4
-21
lines changed

6 files changed

+4
-21
lines changed

.CI/compliance-newinst.failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ModelicaCompliance.Algorithms.For.ArrayRangeExp
21
ModelicaCompliance.Algorithms.For.ImplicitBoolIterator
32
ModelicaCompliance.Algorithms.For.ImplicitEnumIterator
43
ModelicaCompliance.Algorithms.For.ImplicitIntegerIterator

.CI/compliance.failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
ModelicaCompliance.Algorithms.For.ArrayRangeExp
21
ModelicaCompliance.Algorithms.For.EnumRange
32
ModelicaCompliance.Algorithms.For.RealRange
43
ModelicaCompliance.Algorithms.For.ShadowedIterator

OMCompiler/Compiler/BackEnd/BackendDAEUtil.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3002,7 +3002,7 @@ algorithm
30023002
then traversingincidenceRowExpSolvableFinder(e1, tpl);
30033003

30043004
// use the inlined function to analyze the ocuring variables
3005-
case (DAE.CALL(), (vars, pa, visitedPaths, ofunctionTree as SOME(functionTree))) guard not AvlSetPath.hasKey(visitedPaths, inExp.path)
3005+
case (DAE.CALL(path=Absyn.IDENT()), (vars, pa, visitedPaths, ofunctionTree as SOME(functionTree))) guard not AvlSetPath.hasKey(visitedPaths, inExp.path)
30063006
algorithm
30073007
(e1,_) := Inline.forceInlineCall(inExp, {}, (SOME(functionTree), {DAE.NORM_INLINE(),DAE.DEFAULT_INLINE()}));
30083008
false := referenceEq(inExp,e1);

testsuite/simulation/libraries/3rdParty/ThermoPower/ThermoPower.Examples.HRB.Simulators.ClosedLoopDigitalSimulator.mos

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,7 @@ simulate(ThermoPower.Examples.HRB.Simulators.ClosedLoopDigitalSimulator);getErro
1111
// record SimulationResult
1212
// resultFile = "ThermoPower.Examples.HRB.Simulators.ClosedLoopDigitalSimulator_res.mat",
1313
// simulationOptions = "startTime = 0.0, stopTime = 400.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'ThermoPower.Examples.HRB.Simulators.ClosedLoopDigitalSimulator', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
14-
// messages = "stdout | warning | While solving non-linear system an assertion failed during initialization.
15-
// | | | | | The non-linear solver tries to solve the problem that could take some time.
16-
// | | | | | It could help to provide better start-values for the iteration variables.
17-
// | | | | | For more information simulate with -lv LOG_NLS_V
18-
// stdout | warning | While solving non-linear system an assertion failed during initialization.
19-
// | | | | | The non-linear solver tries to solve the problem that could take some time.
20-
// | | | | | It could help to provide better start-values for the iteration variables.
21-
// | | | | | For more information simulate with -lv LOG_NLS_V
22-
// assert | debug | Solving non-linear system 564 failed at time=0.
23-
// | | | | For more information please use -lv LOG_NLS.
24-
// assert | warning | Failed to solve the initialization problem without homotopy method. If homotopy is available the homotopy method is used now.
25-
// LOG_SUCCESS | info | The initialization finished successfully with 4 homotopy steps.
14+
// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method.
2615
// LOG_SUCCESS | info | The simulation finished successfully.
2716
// "
2817
// end SimulationResult;

testsuite/simulation/libraries/3rdParty/ThermoSysPro/ThermoSysPro.Examples.SimpleExamples.TestDynamicWaterHeating.mos

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,10 +200,6 @@ getEnvironmentVar("REFERENCEFILES")+"/ThermoSysPro/ThermoSysPro.Examples.SimpleE
200200
// resultFile = "ThermoSysPro.Examples.SimpleExamples.TestDynamicWaterHeating_res.mat",
201201
// simulationOptions = "startTime = 0.0, stopTime = 1000.0, numberOfIntervals = 500, tolerance = 0.0001, method = 'dassl', fileNamePrefix = 'ThermoSysPro.Examples.SimpleExamples.TestDynamicWaterHeating', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
202202
// messages = "LOG_SUCCESS | info | The initialization finished successfully without homotopy method.
203-
//stdout | warning | While solving non-linear system an assertion failed at time 683.009.
204-
//| | | | | The non-linear solver tries to solve the problem that could take some time.
205-
//| | | | | It could help to provide better start-values for the iteration variables.
206-
//| | | | | For more information simulate with -lv LOG_NLS_V
207203
// LOG_SUCCESS | info | The simulation finished successfully.
208204
// "
209205
// end SimulationResult;

testsuite/simulation/modelica/inheritances/Ticket4258a.mos

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ simulate(simple_BasicHX_water_gas); getErrorString();
2727
// "Warning: The model contains alias variables with conflicting start and/or nominal values. It is recommended to resolve the conflicts, because otherwise the system could be hard to solve. To print the conflicting alias sets and the chosen candidates please use -d=aliasConflicts.
2828
// Warning: Some equations could not be differentiated for following variables having attribute stateSelect=StateSelect.prefer. They will be treated as if they had stateSelect=StateSelect.default
2929
// ========================================
30-
// 1: WT_Nachreformer.pipe_1.mediums[1].T
31-
// 2: WT_Nachreformer.pipe_1.mediums[5].T
30+
// 1: WT_Nachreformer.pipe_1.mediums[5].T
31+
// 2: WT_Nachreformer.pipe_1.mediums[1].T
3232
// 3: WT_Nachreformer.pipe_1.mediums[2].T
3333
// 4: WT_Nachreformer.pipe_1.mediums[3].T
3434
// 5: WT_Nachreformer.pipe_1.mediums[4].T

0 commit comments

Comments
 (0)