Changeset e031642 in OpenModelica

Timestamp:

2018-08-10T23:59:03+02:00 (6 years ago)

Author:

hudson <openmodelica@…>

Branches:

Added-citation-metadata, maintenance/v1.14, maintenance/v1.15, maintenance/v1.16, maintenance/v1.17, maintenance/v1.18, maintenance/v1.19, maintenance/v1.20, maintenance/v1.21, maintenance/v1.22, maintenance/v1.23, master, omlib-staging

Children:

9533d85

Parents:

4c3f8551

git-author:

Adrian Pop <adrian.pop@…> (08/10/18 23:59:03)

git-committer:

hudson <openmodelica@…> (08/10/18 23:59:03)

Message:

update tests

Belonging to [master]:

• OpenModelica/OMCompiler#2600
• OpenModelica/OpenModelica-testsuite#1012

Location:

flattening/modelica

Files:

• algorithms-functions/FunctionVariability.mo (modified) (1 diff)
• built-in-functions/Delay5.mo (modified) (1 diff)
• built-in-functions/Delay7.mo (modified) (1 diff)
• others/SampleError.mo (modified) (1 diff)
• scodeinst/FuncVariability.mo (modified) (1 diff)
• scodeinst/FunctionNonInputOutputParameter.mo (added)
• scodeinst/Makefile (modified) (1 diff)
• scodeinst/OCGTests.mos (modified) (4 diffs)

flattening/modelica/algorithms-functions/FunctionVariability.mo

@@ -16 +16 @@
 // Result:
 // Error processing file: FunctionVariability.mo
-// [flattening/modelica/algorithms-functions/FunctionVariability.mo:13:3-13:19:writable] Error: Function argument x=a is not a constant expression.
+// [flattening/modelica/algorithms-functions/FunctionVariability.mo:13:3-13:19:writable] Error: Function argument x=a with variability continuous is not a constant expression.
 // Error: Error occurred while flattening model FunctionVariability
 //

flattening/modelica/built-in-functions/Delay5.mo

@@ -18 +18 @@
 // Result:
 // Error processing file: Delay5.mo
-// [flattening/modelica/built-in-functions/Delay5.mo:14:3-14:18:writable] Error: Function argument delayTime=a is not a parameter expression.
+// [flattening/modelica/built-in-functions/Delay5.mo:14:3-14:18:writable] Error: Function argument delayTime=a with variability continuous is not a parameter expression.
 // [flattening/modelica/built-in-functions/Delay5.mo:14:3-14:18:writable] Error: No matching function found for delay in component <NO COMPONENT>
 // candidates are .OpenModelica.Internal.delay2<function>(Real expr, Real parameter delayTime) => Real

flattening/modelica/built-in-functions/Delay7.mo

@@ -17 +17 @@
 // Result:
 // Error processing file: Delay7.mo
-// [flattening/modelica/built-in-functions/Delay7.mo:15:3-15:21:writable] Error: Function argument delayMax=b is not a parameter expression.
+// [flattening/modelica/built-in-functions/Delay7.mo:15:3-15:21:writable] Error: Function argument delayMax=b with variability continuous is not a parameter expression.
 // [flattening/modelica/built-in-functions/Delay7.mo:15:3-15:21:writable] Error: No matching function found for delay in component <NO COMPONENT>
 // candidates are .OpenModelica.Internal.delay2<function>(Real expr, Real parameter delayTime) => Real

flattening/modelica/others/SampleError.mo

@@ -13 +13 @@
 // Result:
 // Error processing file: SampleError.mo
-// [flattening/modelica/others/SampleError.mo:8:3-10:11:writable] Error: Function argument start=r is not a parameter expression.
+// [flattening/modelica/others/SampleError.mo:8:3-10:11:writable] Error: Function argument start=r with variability continuous is not a parameter expression.
 // Error: Error occurred while flattening model SampleError
 //

flattening/modelica/scodeinst/FuncVariability.mo

@@ -18 +18 @@
 // Result:
 // Error processing file: FuncVariability.mo
-// [flattening/modelica/scodeinst/FuncVariability.mo:15:3-15:19:writable] Error: Function argument x=time is not a parameter expression.
+// [flattening/modelica/scodeinst/FuncVariability.mo:15:3-15:19:writable] Error: Function argument x=time with variability continuous is not a parameter expression.
 //
 // # Error encountered! Exiting...

flattening/modelica/scodeinst/Makefile

@@ -470 +470 @@
 FunctionMultiOutput4.mo \
 FunctionNoOutput1.mo \
+FunctionNonInputOutputParameter.mo \
 FunctionRecordArg1.mo \
 FunctionRecordArg2.mo \

flattening/modelica/scodeinst/OCGTests.mos

@@ -122 +122 @@
 // ""
 // "Check of Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheel completed successfully.
-// Class Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheel has 1051 equation(s) and 1051 variable(s).
-// 764 of these are trivial equation(s)."
+// Class Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheel has 1039 equation(s) and 1039 variable(s).
+// 752 of these are trivial equation(s)."
 // ""
 // "Check of Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving completed successfully.
-// Class Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving has 2063 equation(s) and 2063 variable(s).
-// 1541 of these are trivial equation(s)."
+// Class Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetDriving has 2039 equation(s) and 2039 variable(s).
+// 1517 of these are trivial equation(s)."
 // ""
 // "Check of Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetPulling completed successfully.
-// Class Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetPulling has 2155 equation(s) and 2155 variable(s).
-// 1617 of these are trivial equation(s)."
+// Class Modelica.Mechanics.MultiBody.Examples.Elementary.RollingWheelSetPulling has 2131 equation(s) and 2131 variable(s).
+// 1593 of these are trivial equation(s)."
 // ""
 // "Check of Modelica.Mechanics.MultiBody.Examples.Elementary.SpringDamperSystem completed successfully.
@@ -146 +146 @@
 // ""
 // "Check of Modelica.Mechanics.MultiBody.Examples.Elementary.Surfaces completed successfully.
-// Class Modelica.Mechanics.MultiBody.Examples.Elementary.Surfaces has 1247 equation(s) and 1247 variable(s).
-// 976 of these are trivial equation(s)."
+// Class Modelica.Mechanics.MultiBody.Examples.Elementary.Surfaces has 1241 equation(s) and 1241 variable(s).
+// 970 of these are trivial equation(s)."
 // ""
 // "Check of Modelica.Mechanics.MultiBody.Examples.Elementary.ThreeSprings completed successfully.
@@ -174 +174 @@
 // ""
 // "Check of Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic completed successfully.
-// Class Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic has 9016 equation(s) and 9016 variable(s).
-// 6689 of these are trivial equation(s)."
+// Class Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic has 8980 equation(s) and 8980 variable(s).
+// 6653 of these are trivial equation(s)."
 // ""
 // "Check of Modelica.Mechanics.MultiBody.Examples.Loops.Fourbar1 completed successfully.
@@ -223 +223 @@
 // "Check of PowerSystems.Examples.AC3ph.Inverters.Rectifier completed successfully.
 // Class PowerSystems.Examples.AC3ph.Inverters.Rectifier has 229 equation(s) and 229 variable(s).
-// 108 of these are trivial equation(s)."
+// 109 of these are trivial equation(s)."
 // ""
 // endResult