Skip to content

Commit

Permalink
Expected output
Browse files Browse the repository at this point in the history 
- Remove scripting test for simplify. We have tests in the
  bootstrapping testsuite instead.
- Tests the new URI lookup
- Updated for assertions triggered during -d=gen
- Updates from inlining expressions
- Updates for using the logger in FMUs

Belonging to [master]:
  - OpenModelica/OMCompiler#2116
  - OpenModelica/OpenModelica-testsuite#829
  • Loading branch information
@sjoelund @OpenModelica-Hudson
sjoelund authored and OpenModelica-Hudson committed Jan 29, 2018
1 parent 86c0c27 commit 4efe142
Show file tree
Hide file tree
Showing 23 changed files with 1,903 additions and 1,865 deletions.
4 changes: 3 additions & 1 deletion flattening/modelica/algorithms-functions/AssignmentErrorInput.mo
View file
Expand Up @@ -15,7 +15,9 @@ end AssignmentErrorInput;
// Result:
// Error processing file: AssignmentErrorInput.mo
// [flattening/modelica/algorithms-functions/AssignmentErrorInput.mo:7:3-7:11:writable] Error: Trying to assign to input component x.
// Error: Error occurred while flattening model AssignmentErrorInput
// Error: Tried to use function
// .Func
// , but it was not instantiated.
//
// # Error encountered! Exiting...
// # Please check the error message and the flags.
Expand Down
2 changes: 1 addition & 1 deletion flattening/modelica/connectors/CGraphBug.mos
View file
Expand Up @@ -257,7 +257,7 @@ instantiateModel(Test); getErrorString();
// Q := Modelica.Mechanics.MultiBody.Frames.Quaternions.from_T({{R.T[1,1], R.T[1,2], R.T[1,3]}, {R.T[2,1], R.T[2,2], R.T[2,3]}, {R.T[3,1], R.T[3,2], R.T[3,3]}}, {Q_guess[1], Q_guess[2], Q_guess[3], Q_guess[4]});
// end Modelica.Mechanics.MultiBody.Frames.to_Q;
//
// function Modelica.Mechanics.MultiBody.World$world.gravityAcceleration \"Standard gravity fields (no/parallel/point field)\"
// function Modelica.Mechanics.MultiBody.World$world.gravityAcceleration \"Inline before index reduction\" \"Standard gravity fields (no/parallel/point field)\"
// input Real[3] r(quantity = \"Length\", unit = \"m\") \"Position vector from world frame to actual point, resolved in world frame\";
// output Real[3] gravity(quantity = \"Acceleration\", unit = \"m/s2\") \"Gravity acceleration at position r, resolved in world frame\";
// input enumeration(NoGravity, UniformGravity, PointGravity) gravityType = gravityType \"Type of gravity field\";
Expand Down
4 changes: 3 additions & 1 deletion flattening/modelica/declarations/DoubleClassDeclaration1.mo
View file
Expand Up @@ -12,12 +12,14 @@ end M;

// Result:
// Error processing file: DoubleClassDeclaration1.mo
// Failed to parse file: DoubleClassDeclaration1.mo!
//
// [flattening/modelica/declarations/DoubleClassDeclaration1.mo:7:1-8:6:writable] Notification: From here:
// [flattening/modelica/declarations/DoubleClassDeclaration1.mo:10:1-11:6:writable] Error: An element with name M is already declared in this scope.
// Error: Error occurred while flattening model M
//
// # Error encountered! Exiting...
// # Please check the error message and the flags.
// Failed to parse file: DoubleClassDeclaration1.mo!
//
// Execution failed!
// endResult
4 changes: 2 additions & 2 deletions flattening/modelica/equations/Bug4124.mos
View file
Expand Up @@ -46,13 +46,13 @@ instantiateModel(Bug4124); getErrorString();
// external \"C\" sPort = MDD_serialPortConstructor(deviceName, bufferSize, parity, receiver, baud);
// end Modelica_DeviceDrivers.Communication.SerialPort.constructor;
//
// function Modelica_DeviceDrivers.Communication.SerialPort.destructor
// function Modelica_DeviceDrivers.Communication.SerialPort.destructor \"Icon for functions\"
// input Modelica_DeviceDrivers.Communication.SerialPort sPort;
//
// external \"C\" MDD_serialPortDestructor(sPort);
// end Modelica_DeviceDrivers.Communication.SerialPort.destructor;
//
// function Modelica_DeviceDrivers.Communication.SerialPort_.read
// function Modelica_DeviceDrivers.Communication.SerialPort_.read \"Icon for functions\"
// input Modelica_DeviceDrivers.Communication.SerialPort sPort;
// input Modelica_DeviceDrivers.Packaging.SerialPackager pkg;
//
Expand Down
41 changes: 27 additions & 14 deletions flattening/modelica/mosfiles/ZeroRange.mos
View file
Expand Up @@ -4,41 +4,54 @@

loadFile("ZeroRange.mo");

ZeroRange.testRangeLoop(0,1,-1);
ZeroRange.testRangeLoop(0,1,0);
ZeroRange.testRangeLoop(0,1,1);
ZeroRange.testRangeLoop(0,1,-1);getErrorString();
ZeroRange.testRangeLoop(0,1,0);getErrorString();
ZeroRange.testRangeLoop(0,1,1);getErrorString();

ZeroRange.testRangeLoop(0,-1,-1);
ZeroRange.testRangeLoop(0,-1,0);
ZeroRange.testRangeLoop(0,-1,1);
ZeroRange.testRangeLoop(0,-1,-1);getErrorString();
ZeroRange.testRangeLoop(0,-1,0);getErrorString();
ZeroRange.testRangeLoop(0,-1,1);getErrorString();

// ZeroRange.testRangeLoop(0,0,1);

setCommandLineOptions("-d=noevalfunc,gen");
ZeroRange.testRangeLoop(0,1,-1);
ZeroRange.testRangeLoop(0,1,0);
ZeroRange.testRangeLoop(0,1,1);
ZeroRange.testRangeLoop(0,1,-1);getErrorString();
ZeroRange.testRangeLoop(0,1,0);getErrorString();
ZeroRange.testRangeLoop(0,1,1);getErrorString();

ZeroRange.testRangeLoop(0,-1,-1);
ZeroRange.testRangeLoop(0,-1,0);
ZeroRange.testRangeLoop(0,-1,1);
ZeroRange.testRangeLoop(0,0,1);
ZeroRange.testRangeLoop(0,-1,-1);getErrorString();
ZeroRange.testRangeLoop(0,-1,0);getErrorString();
ZeroRange.testRangeLoop(0,-1,1);getErrorString();
ZeroRange.testRangeLoop(0,0,1);getErrorString();

// Result:
// true
// 0
// ""
// 1
// ""
// 2
// ""
// 2
// ""
// 1
// ""
// 0
// ""
// true
// 0
// ""
// 1
// ""
// 2
// ""
// 2
// ""
// 1
// ""
// 0
// [:-1:-1--1:-1:readonly]Modelica Assert: assertion range step != 0 failed!
// ""
// fail()
// "Error: assertion range step != 0 failed
// "
// endResult
2 changes: 1 addition & 1 deletion flattening/modelica/scoping/InnerOuterSamePrefix.mo
View file
Expand Up @@ -3898,7 +3898,7 @@ end InnerOuterSamePrefix;// Result:
// Q := Modelica.Mechanics.MultiBody.Frames.Quaternions.from_T({{R.T[1,1], R.T[1,2], R.T[1,3]}, {R.T[2,1], R.T[2,2], R.T[2,3]}, {R.T[3,1], R.T[3,2], R.T[3,3]}}, {Q_guess[1], Q_guess[2], Q_guess[3], Q_guess[4]});
// end Modelica.Mechanics.MultiBody.Frames.to_Q;
//
// function Modelica.Mechanics.MultiBody.World.gravityAcceleration "Gravity field acceleration depending on field type and position"
// function Modelica.Mechanics.MultiBody.World.gravityAcceleration "Inline before index reduction" "Gravity field acceleration depending on field type and position"
// input Real[3] r(quantity = "Length", unit = "m") "Position vector from world frame to actual point, resolved in world frame";
// input enumeration(NoGravity, UniformGravity, PointGravity) gravityType = gravityType "Type of gravity field";
// input Real[3] g(quantity = "Acceleration", unit = "m/s2") = {0.0, -g, 0.0} "Constant gravity acceleration, resolved in world frame, if gravityType=1";
Expand Down
5 changes: 5 additions & 0 deletions metamodelica/meta/Ticket2974.mos
View file
Expand Up @@ -53,5 +53,10 @@ test();getErrorString();
// expected type:
// tuple<polymorphic<T1>, polymorphic<T2>>
// [SimCode/SimCodeFunctionUtil.mo:0:0-0:0:writable] Error: Internal error function getCalledFunctionsInFunction2: Class P.f2 not found in global scope.
// [<interactive>:26:5-26:10:writable] Error: Type mismatch for positional argument 1 in P.f(inTup=t1). The argument has type:
// polymorphic<T1>
// expected type:
// tuple<polymorphic<T1>, polymorphic<T2>>
// [SimCode/SimCodeFunctionUtil.mo:0:0-0:0:writable] Error: Internal error function getCalledFunctionsInFunction2: Class P.f2 not found in global scope.
// "
// endResult
40 changes: 20 additions & 20 deletions ...elica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum.mos
View file
Expand Up @@ -32,26 +32,26 @@ val(rev_phi, 3);
// LOG_SUCCESS | info | The simulation finished successfully.
// "
// end SimulationResult;
// "[openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1105:3-1105:183:writable] Warning: Parameter world_z_label_cylinders_3__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1104:3-1104:183:writable] Warning: Parameter world_z_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1103:3-1103:183:writable] Warning: Parameter world_z_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1102:3-1102:174:writable] Warning: Parameter world_z_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1101:3-1101:170:writable] Warning: Parameter world_z_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1100:3-1100:183:writable] Warning: Parameter world_y_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1099:3-1099:183:writable] Warning: Parameter world_y_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1098:3-1098:174:writable] Warning: Parameter world_y_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1097:3-1097:170:writable] Warning: Parameter world_y_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1096:3-1096:183:writable] Warning: Parameter world_x_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1095:3-1095:183:writable] Warning: Parameter world_x_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1094:3-1094:174:writable] Warning: Parameter world_x_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1093:3-1093:170:writable] Warning: Parameter world_x_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1092:3-1092:76:writable] Warning: Parameter world_label2 has no value, and is fixed during initialization (fixed=true), using available start value (start="y") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1091:3-1091:78:writable] Warning: Parameter world_label1 has no value, and is fixed during initialization (fixed=true), using available start value (start="x") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1090:3-1090:179:writable] Warning: Parameter world_gravityArrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1089:3-1089:175:writable] Warning: Parameter world_gravityArrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1088:3-1088:169:writable] Warning: Parameter rev_cylinder_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1087:3-1087:166:writable] Warning: Parameter body_sphere_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="sphere") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1086:3-1086:170:writable] Warning: Parameter body_cylinder_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// "[openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1104:3-1104:183:writable] Warning: Parameter world_z_label_cylinders_3__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1103:3-1103:183:writable] Warning: Parameter world_z_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1102:3-1102:183:writable] Warning: Parameter world_z_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1101:3-1101:174:writable] Warning: Parameter world_z_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1100:3-1100:170:writable] Warning: Parameter world_z_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1099:3-1099:183:writable] Warning: Parameter world_y_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1098:3-1098:183:writable] Warning: Parameter world_y_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1097:3-1097:174:writable] Warning: Parameter world_y_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1096:3-1096:170:writable] Warning: Parameter world_y_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1095:3-1095:183:writable] Warning: Parameter world_x_label_cylinders_2__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1094:3-1094:183:writable] Warning: Parameter world_x_label_cylinders_1__shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1093:3-1093:174:writable] Warning: Parameter world_x_arrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1092:3-1092:170:writable] Warning: Parameter world_x_arrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1091:3-1091:76:writable] Warning: Parameter world_label2 has no value, and is fixed during initialization (fixed=true), using available start value (start="y") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1090:3-1090:78:writable] Warning: Parameter world_label1 has no value, and is fixed during initialization (fixed=true), using available start value (start="x") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1089:3-1089:179:writable] Warning: Parameter world_gravityArrowLine_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1088:3-1088:175:writable] Warning: Parameter world_gravityArrowHead_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cone") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1087:3-1087:169:writable] Warning: Parameter rev_cylinder_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1086:3-1086:166:writable] Warning: Parameter body_sphere_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="sphere") as default value.
// [openmodelica/fmi/ModelExchange/1.0/Modelica_Mechanics_MultiBody_Examples_Elementary_Pendulum_me_FMU.mo:1085:3-1085:170:writable] Warning: Parameter body_cylinder_shapeType has no value, and is fixed during initialization (fixed=true), using available start value (start="cylinder") as default value.
// "
// 0.0
// -2.58015084103757
Expand Down

0 comments on commit 4efe142

Please sign in to comment.