Skip to content

Commit

Permalink
expected output
Browse files Browse the repository at this point in the history
  • Loading branch information
Willi Braun committed Jan 26, 2016
1 parent 90105a6 commit d7423a8
Show file tree
Hide file tree
Showing 10 changed files with 319 additions and 149 deletions.
136 changes: 69 additions & 67 deletions openmodelica/xml/testMSD.mos
View file
Expand Up @@ -26,7 +26,27 @@ readFile("stateSpace-MSD.xml");
// <variables dimension=\"44\">
// <orderedVariables dimension=\"17\">
// <variablesList>
// <variable id=\"1\" name=\"force1.f\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Driving force as input signal\">
// <variable id=\"1\" name=\"$DER.mass1.flange_b.s\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonFlow\" stream=\"NonStream\" comment=\"Absolute position of flange\">
// <classesNames>
// <element>
// MSD
// </element>
// <element>
// Modelica.Mechanics.Translational.Components.Mass$mass1
// </element>
// <element>
// Modelica.Mechanics.Translational.Interfaces.Flange_b
// </element>
// <element>
// Modelica.SIunits.Position
// </element>
// </classesNames>
// <attributesValues>
// <fixed string=\"false\">
// </fixed>
// </attributesValues>
// </variable>
// <variable id=\"2\" name=\"force1.f\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Driving force as input signal\">
// <classesNames>
// <element>
// MSD
Expand All @@ -43,7 +63,7 @@ readFile("stateSpace-MSD.xml");
// </unit>
// </attributesValues>
// </variable>
// <variable id=\"2\" name=\"force1.s\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Distance between flange and support (= flange.s - support.s)\">
// <variable id=\"3\" name=\"force1.s\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Distance between flange and support (= flange.s - support.s)\">
// <classesNames>
// <element>
// MSD
Expand All @@ -62,7 +82,7 @@ readFile("stateSpace-MSD.xml");
// </unit>
// </attributesValues>
// </variable>
// <variable id=\"3\" name=\"damper1.lossPower\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Loss power leaving component via heatPort (&gt; 0, if heat is flowing out of component)\">
// <variable id=\"4\" name=\"damper1.lossPower\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Loss power leaving component via heatPort (&gt; 0, if heat is flowing out of component)\">
// <classesNames>
// <element>
// MSD
Expand All @@ -81,7 +101,7 @@ readFile("stateSpace-MSD.xml");
// </unit>
// </attributesValues>
// </variable>
// <variable id=\"4\" name=\"damper1.flange_a.s\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonFlow\" stream=\"NonStream\" comment=\"Absolute position of flange\">
// <variable id=\"5\" name=\"damper1.flange_a.s\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonFlow\" stream=\"NonStream\" comment=\"Absolute position of flange\">
// <classesNames>
// <element>
// MSD
Expand All @@ -103,7 +123,7 @@ readFile("stateSpace-MSD.xml");
// </unit>
// </attributesValues>
// </variable>
// <variable id=\"5\" name=\"damper1.v_rel\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative velocity (= der(s_rel))\">
// <variable id=\"6\" name=\"damper1.v_rel\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative velocity (= der(s_rel))\">
// <classesNames>
// <element>
// MSD
Expand All @@ -127,7 +147,7 @@ readFile("stateSpace-MSD.xml");
// </initialValue>
// </attributesValues>
// </variable>
// <variable id=\"6\" name=\"damper1.s_rel\" variability=\"continuousState\" direction=\"none\" type=\"Real\" differentiatedIndex=\"1\" derivativeName=\"damper1.v_rel\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative distance (= flange_b.s - flange_a.s)\">
// <variable id=\"7\" name=\"damper1.s_rel\" variability=\"continuousState\" direction=\"none\" type=\"Real\" differentiatedIndex=\"1\" derivativeName=\"damper1.v_rel\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative distance (= flange_b.s - flange_a.s)\">
// <classesNames>
// <element>
// MSD
Expand All @@ -153,7 +173,7 @@ readFile("stateSpace-MSD.xml");
// </initialValue>
// </attributesValues>
// </variable>
// <variable id=\"7\" name=\"mass1.a\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Absolute acceleration of component\">
// <variable id=\"8\" name=\"mass1.a\" variability=\"continuous\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Absolute acceleration of component\">
// <classesNames>
// <element>
// MSD
Expand All @@ -174,7 +194,7 @@ readFile("stateSpace-MSD.xml");
// </initialValue>
// </attributesValues>
// </variable>
// <variable id=\"8\" name=\"mass1.v\" variability=\"continuousState\" direction=\"none\" type=\"Real\" differentiatedIndex=\"1\" derivativeName=\"mass1.a\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Absolute velocity of component\">
// <variable id=\"9\" name=\"mass1.v\" variability=\"continuousState\" direction=\"none\" type=\"Real\" differentiatedIndex=\"1\" derivativeName=\"mass1.a\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Absolute velocity of component\">
// <classesNames>
// <element>
// MSD
Expand All @@ -198,7 +218,7 @@ readFile("stateSpace-MSD.xml");
// </initialValue>
// </attributesValues>
// </variable>
// <variable id=\"9\" name=\"mass1.flange_b.s\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonFlow\" stream=\"NonStream\" comment=\"Absolute position of flange\">
// <variable id=\"10\" name=\"mass1.flange_b.s\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonFlow\" stream=\"NonStream\" comment=\"Absolute position of flange\">
// <classesNames>
// <element>
// MSD
Expand All @@ -220,7 +240,7 @@ readFile("stateSpace-MSD.xml");
// </unit>
// </attributesValues>
// </variable>
// <variable id=\"10\" name=\"mass1.s\" variability=\"continuousState\" direction=\"none\" type=\"Real\" differentiatedIndex=\"1\" derivativeName=\"mass1.v\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Absolute position of center of component (s = flange_a.s + L/2 = flange_b.s - L/2)\">
// <variable id=\"11\" name=\"mass1.s\" variability=\"continuousState\" direction=\"none\" type=\"Real\" differentiatedIndex=\"1\" derivativeName=\"mass1.v\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Absolute position of center of component (s = flange_a.s + L/2 = flange_b.s - L/2)\">
// <classesNames>
// <element>
// MSD
Expand All @@ -244,7 +264,7 @@ readFile("stateSpace-MSD.xml");
// </initialValue>
// </attributesValues>
// </variable>
// <variable id=\"11\" name=\"spring1.f\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Force between flanges (positive in direction of flange axis R)\">
// <variable id=\"12\" name=\"spring1.f\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Force between flanges (positive in direction of flange axis R)\">
// <classesNames>
// <element>
// MSD
Expand All @@ -263,7 +283,7 @@ readFile("stateSpace-MSD.xml");
// </unit>
// </attributesValues>
// </variable>
// <variable id=\"12\" name=\"spring1.s_rel\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative distance (= flange_b.s - flange_a.s)\">
// <variable id=\"13\" name=\"spring1.s_rel\" variability=\"continuousDummyState\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative distance (= flange_b.s - flange_a.s)\">
// <classesNames>
// <element>
// MSD
Expand All @@ -284,7 +304,7 @@ readFile("stateSpace-MSD.xml");
// </initialValue>
// </attributesValues>
// </variable>
// <variable id=\"13\" name=\"$DER.spring1.f\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Force between flanges (positive in direction of flange axis R)\">
// <variable id=\"14\" name=\"$DER.spring1.f\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Force between flanges (positive in direction of flange axis R)\">
// <classesNames>
// <element>
// MSD
Expand All @@ -301,7 +321,7 @@ readFile("stateSpace-MSD.xml");
// </fixed>
// </attributesValues>
// </variable>
// <variable id=\"14\" name=\"$DER.spring1.s_rel\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative distance (= flange_b.s - flange_a.s)\">
// <variable id=\"15\" name=\"$DER.spring1.s_rel\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative distance (= flange_b.s - flange_a.s)\">
// <classesNames>
// <element>
// MSD
Expand All @@ -318,7 +338,7 @@ readFile("stateSpace-MSD.xml");
// </fixed>
// </attributesValues>
// </variable>
// <variable id=\"15\" name=\"$DER.damper1.v_rel\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative velocity (= der(s_rel))\">
// <variable id=\"16\" name=\"$DER.damper1.v_rel\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonConnector\" stream=\"NonStreamConnector\" comment=\"Relative velocity (= der(s_rel))\">
// <classesNames>
// <element>
// MSD
Expand All @@ -335,7 +355,7 @@ readFile("stateSpace-MSD.xml");
// </fixed>
// </attributesValues>
// </variable>
// <variable id=\"16\" name=\"$DER.damper1.flange_a.s\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonFlow\" stream=\"NonStream\" comment=\"Absolute position of flange\">
// <variable id=\"17\" name=\"$DER.damper1.flange_a.s\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonFlow\" stream=\"NonStream\" comment=\"Absolute position of flange\">
// <classesNames>
// <element>
// MSD
Expand All @@ -355,26 +375,6 @@ readFile("stateSpace-MSD.xml");
// </fixed>
// </attributesValues>
// </variable>
// <variable id=\"17\" name=\"$DER.mass1.flange_b.s\" variability=\"continuousDummyDer\" direction=\"none\" type=\"Real\" fixed=\"false\" flow=\"NonFlow\" stream=\"NonStream\" comment=\"Absolute position of flange\">
// <classesNames>
// <element>
// MSD
// </element>
// <element>
// Modelica.Mechanics.Translational.Components.Mass$mass1
// </element>
// <element>
// Modelica.Mechanics.Translational.Interfaces.Flange_b
// </element>
// <element>
// Modelica.SIunits.Position
// </element>
// </classesNames>
// <attributesValues>
// <fixed string=\"false\">
// </fixed>
// </attributesValues>
// </variable>
// </variablesList>
// </orderedVariables>
// <knownVariables dimension=\"12\">
Expand Down Expand Up @@ -1118,76 +1118,78 @@ readFile("stateSpace-MSD.xml");
// <additionalInfo>
// <solvingInfo>
// <matchingAlgorithm>
// <solvedIn variableId=\"1\" equationId=\"6\" />
// <solvedIn variableId=\"2\" equationId=\"9\" />
// <solvedIn variableId=\"3\" equationId=\"8\" />
// <solvedIn variableId=\"4\" equationId=\"2\" />
// <solvedIn variableId=\"5\" equationId=\"5\" />
// <solvedIn variableId=\"6\" equationId=\"7\" />
// <solvedIn variableId=\"7\" equationId=\"10\" />
// <solvedIn variableId=\"1\" equationId=\"1\" />
// <solvedIn variableId=\"2\" equationId=\"7\" />
// <solvedIn variableId=\"3\" equationId=\"10\" />
// <solvedIn variableId=\"4\" equationId=\"9\" />
// <solvedIn variableId=\"5\" equationId=\"3\" />
// <solvedIn variableId=\"6\" equationId=\"6\" />
// <solvedIn variableId=\"7\" equationId=\"8\" />
// <solvedIn variableId=\"8\" equationId=\"11\" />
// <solvedIn variableId=\"9\" equationId=\"1\" />
// <solvedIn variableId=\"10\" equationId=\"12\" />
// <solvedIn variableId=\"11\" equationId=\"4\" />
// <solvedIn variableId=\"12\" equationId=\"3\" />
// <solvedIn variableId=\"13\" equationId=\"14\" />
// <solvedIn variableId=\"14\" equationId=\"13\" />
// <solvedIn variableId=\"15\" equationId=\"15\" />
// <solvedIn variableId=\"9\" equationId=\"12\" />
// <solvedIn variableId=\"10\" equationId=\"2\" />
// <solvedIn variableId=\"11\" equationId=\"13\" />
// <solvedIn variableId=\"12\" equationId=\"5\" />
// <solvedIn variableId=\"13\" equationId=\"4\" />
// <solvedIn variableId=\"14\" equationId=\"15\" />
// <solvedIn variableId=\"15\" equationId=\"14\" />
// <solvedIn variableId=\"16\" equationId=\"16\" />
// <solvedIn variableId=\"17\" equationId=\"17\" />
// </matchingAlgorithm>
// <bltRepresentation>
// <bltRepresentation>
// <bltBlock id=\"1\">
// <involvedEquation equationId=\"17\" />
// <involvedEquation equationId=\"1\" />
// </bltBlock>
// </bltRepresentation>
// <bltRepresentation>
// <bltBlock id=\"2\">
// <involvedEquation equationId=\"12\" />
// <involvedEquation equationId=\"13\" />
// </bltBlock>
// <bltBlock id=\"3\">
// <involvedEquation equationId=\"9\" />
// <involvedEquation equationId=\"10\" />
// </bltBlock>
// <bltBlock id=\"4\">
// <involvedEquation equationId=\"6\" />
// <involvedEquation equationId=\"7\" />
// </bltBlock>
// <bltBlock id=\"5\">
// <involvedEquation equationId=\"2\" />
// <involvedEquation equationId=\"3\" />
// </bltBlock>
// <bltBlock id=\"6\">
// <involvedEquation equationId=\"1\" />
// <involvedEquation equationId=\"2\" />
// </bltBlock>
// <bltBlock id=\"7\">
// <involvedEquation equationId=\"3\" />
// <involvedEquation equationId=\"4\" />
// </bltBlock>
// <bltBlock id=\"8\">
// <involvedEquation equationId=\"4\" />
// <involvedEquation equationId=\"5\" />
// </bltBlock>
// <bltBlock id=\"9\">
// <involvedEquation equationId=\"5\" />
// <involvedEquation equationId=\"6\" />
// </bltBlock>
// <bltBlock id=\"10\">
// <involvedEquation equationId=\"7\" />
// <involvedEquation equationId=\"8\" />
// </bltBlock>
// <bltBlock id=\"11\">
// <involvedEquation equationId=\"13\" />
// <involvedEquation equationId=\"14\" />
// </bltBlock>
// <bltBlock id=\"12\">
// <involvedEquation equationId=\"14\" />
// <involvedEquation equationId=\"15\" />
// </bltBlock>
// <bltBlock id=\"13\">
// <involvedEquation equationId=\"15\" />
// <involvedEquation equationId=\"16\" />
// </bltBlock>
// <bltBlock id=\"14\">
// <involvedEquation equationId=\"16\" />
// <involvedEquation equationId=\"17\" />
// </bltBlock>
// <bltBlock id=\"15\">
// <involvedEquation equationId=\"8\" />
// <involvedEquation equationId=\"9\" />
// </bltBlock>
// <bltBlock id=\"16\">
// <involvedEquation equationId=\"10\" />
// <involvedEquation equationId=\"11\" />
// </bltBlock>
// <bltBlock id=\"17\">
// <involvedEquation equationId=\"11\" />
// <involvedEquation equationId=\"12\" />
// </bltBlock>
// </bltRepresentation>
// </bltRepresentation>
Expand Down
2 changes: 1 addition & 1 deletion simulation/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6.mos
View file
Expand Up @@ -85,7 +85,7 @@ runScript(modelTesting);getErrorString();
// * Linear torn systems: 7 {(31,13.2%) 425,(1,100.0%) 5,(1,100.0%) 5,(1,100.0%) 5,(1,100.0%) 5,(1,100.0%) 5,(1,100.0%) 5}
// * Non-linear torn systems: 6 {1 13,1 13,1 13,1 13,1 13,1 13}
// Notification: Model statistics after passing the back-end for simulation:
// * Number of independent subsystems: 724
// * Number of independent subsystems: 737
// * Number of states: 4 (load.phi,load.w,filter.x[1],filter.x[2])
// * Number of discrete variables: 0 ('+d=discreteinfo' for list of discrete vars)
// * Number of discrete states: 0 ('+d=discreteinfo' for list of discrete states)
Expand Down
2 changes: 1 addition & 1 deletion simulation/libraries/msl32/Modelica.Mechanics.MultiBody.Examples.Loops.EngineV6_analytic.mos
View file
Expand Up @@ -56,7 +56,7 @@ runScript(modelTesting);getErrorString();
// * Linear torn systems: 1 {(1,100.0%) 392}
// * Non-linear torn systems: 0
// Notification: Model statistics after passing the back-end for simulation:
// * Number of independent subsystems: 303
// * Number of independent subsystems: 310
// * Number of states: 4 (load.phi,load.w,filter.x[1],filter.x[2])
// * Number of discrete variables: 0 ('+d=discreteinfo' for list of discrete vars)
// * Number of discrete states: 0 ('+d=discreteinfo' for list of discrete states)
Expand Down
2 changes: 1 addition & 1 deletion simulation/modelica/resolveLoops/ElectricalCircuit2.mos
View file
Expand Up @@ -60,7 +60,7 @@ res := OpenModelica.Scripting.compareSimulationResults("ElectricalCircuit2_res.m
// * Linear torn systems: 2 {(1,100.0%) 4,(1,100.0%) 3}
// * Non-linear torn systems: 0
// Notification: Model statistics after passing the back-end for simulation:
// * Number of independent subsystems: 2
// * Number of independent subsystems: 3
// * Number of states: 1 (inductor1.i)
// * Number of discrete variables: 0 ('+d=discreteinfo' for list of discrete vars)
// * Number of discrete states: 0 ('+d=discreteinfo' for list of discrete states)
Expand Down
2 changes: 1 addition & 1 deletion simulation/modelica/resolveLoops/NPendulum2.mos
View file
Expand Up @@ -50,7 +50,7 @@ res := OpenModelica.Scripting.compareSimulationResults("Pendulum.Pendulum2_res.m
// * Linear torn systems: 1 {(2,100.0%) 7}
// * Non-linear torn systems: 0
// Notification: Model statistics after passing the back-end for simulation:
// * Number of independent subsystems: 56
// * Number of independent subsystems: 57
// * Number of states: 4 ('+d=stateselection' for list of states)
// * Number of discrete variables: 0 ('+d=discreteinfo' for list of discrete vars)
// * Number of discrete states: 0 ('+d=discreteinfo' for list of discrete states)
Expand Down
2 changes: 1 addition & 1 deletion simulation/modelica/resolveLoops/NPendulum3.mos
View file
Expand Up @@ -53,7 +53,7 @@ res := OpenModelica.Scripting.compareSimulationResults("Pendulum.Pendulum3_res.m
// * Linear torn systems: 1 {(3,100.0%) 16}
// * Non-linear torn systems: 0
// Notification: Model statistics after passing the back-end for simulation:
// * Number of independent subsystems: 87
// * Number of independent subsystems: 88
// * Number of states: 6 ('+d=stateselection' for list of states)
// * Number of discrete variables: 0 ('+d=discreteinfo' for list of discrete vars)
// * Number of discrete states: 0 ('+d=discreteinfo' for list of discrete states)
Expand Down

0 comments on commit d7423a8

Please sign in to comment.