Expected output

OpenModelica · Mar 19, 2017 · 4d1d53e · 4d1d53e
1 parent f67d29e
commit 4d1d53e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/openmodelica/cppruntime/fmu/modelExchange/2.0/testDrumBoiler.mos b/openmodelica/cppruntime/fmu/modelExchange/2.0/testDrumBoiler.mos
@@ -134,7 +134,7 @@ val(evaporator_qm_S, 100);
 //   <ScalarVariable
 //     name=\"der(controller.x)\"
 //     valueReference=\"3\"
-//     description=\"State of block\"
+//     description=\"der(State of block)\"
 //     variability=\"continuous\"
 //     causality=\"local\"
 //     initial=\"calculated\">
@@ -144,7 +144,7 @@ val(evaporator_qm_S, 100);
 //   <ScalarVariable
 //     name=\"der(evaporator.V_l)\"
 //     valueReference=\"4\"
-//     description=\"volumes of liquid phase\"
+//     description=\"der(volumes of liquid phase)\"
 //     variability=\"continuous\"
 //     causality=\"local\"
 //     initial=\"calculated\">
@@ -154,7 +154,7 @@ val(evaporator_qm_S, 100);
 //   <ScalarVariable
 //     name=\"der(evaporator.p)\"
 //     valueReference=\"5\"
-//     description=\"pressure inside drum boiler\"
+//     description=\"der(pressure inside drum boiler)\"
 //     variability=\"continuous\"
 //     causality=\"local\"
 //     initial=\"calculated\">
@@ -3463,10 +3463,10 @@ val(evaporator_qm_S, 100);
 // ""
 // 10.0
 // 1.0
-// 1.066186930067338
-// 1.132373860134676
-// -16.62186190266782
-// 101.4102120346218
-// 66.98717532203503
-// -1.132373860134676
+// 1.066186919287032
+// 1.132373838574064
+// -16.62186183089507
+// 101.4102117488924
+// 66.98717542979452
+// -1.132373838574064
 // endResult
diff --git a/openmodelica/xml/Bug3857.mos b/openmodelica/xml/Bug3857.mos
@@ -134,7 +134,7 @@ readFile("Bug3857.xml"); getErrorString();
 //     </isLinearTimedVariables>
 //       <VariableCategory>state</VariableCategory>
 //     </ScalarVariable> 
-//     <ScalarVariable name=\"der(PI.I.y)\" description=\"Connector of Real output signal\" valueReference=\"6\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
+//     <ScalarVariable name=\"der(PI.I.y)\" description=\"der(Connector of Real output signal)\" valueReference=\"6\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
 //       <Real     />
 //       <QualifiedName>
 //         <exp:QualifiedNamePart name=\"PI\"/>
@@ -147,7 +147,7 @@ readFile("Bug3857.xml"); getErrorString();
 //       <VariableCategory>derivative</VariableCategory>
 //     </ScalarVariable> 
 //
-//     <ScalarVariable name=\"der(inertia1.phi)\" description=\"Absolute rotation angle of component\" valueReference=\"7\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
+//     <ScalarVariable name=\"der(inertia1.phi)\" description=\"der(Absolute rotation angle of component)\" valueReference=\"7\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
 //       <Real    unit=\"Hz\" />
 //       <QualifiedName>
 //         <exp:QualifiedNamePart name=\"inertia1\"/>
@@ -159,7 +159,7 @@ readFile("Bug3857.xml"); getErrorString();
 //       <VariableCategory>derivative</VariableCategory>
 //     </ScalarVariable> 
 //
-//     <ScalarVariable name=\"der(inertia2.w)\" description=\"Absolute angular velocity of component (= der(phi))\" valueReference=\"8\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
+//     <ScalarVariable name=\"der(inertia2.w)\" description=\"der(Absolute angular velocity of component (= der(phi)))\" valueReference=\"8\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
 //       <Real    unit=\"s-2\" />
 //       <QualifiedName>
 //         <exp:QualifiedNamePart name=\"inertia2\"/>
@@ -171,7 +171,7 @@ readFile("Bug3857.xml"); getErrorString();
 //       <VariableCategory>derivative</VariableCategory>
 //     </ScalarVariable> 
 //
-//     <ScalarVariable name=\"der(integrator.y)\" description=\"Connector of Real output signal\" valueReference=\"9\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
+//     <ScalarVariable name=\"der(integrator.y)\" description=\"der(Connector of Real output signal)\" valueReference=\"9\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
 //       <Real     />
 //       <QualifiedName>
 //         <exp:QualifiedNamePart name=\"integrator\"/>
@@ -183,7 +183,7 @@ readFile("Bug3857.xml"); getErrorString();
 //       <VariableCategory>derivative</VariableCategory>
 //     </ScalarVariable> 
 //
-//     <ScalarVariable name=\"der(spring.phi_rel)\" description=\"Relative rotation angle (= flange_b.phi - flange_a.phi)\" valueReference=\"10\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
+//     <ScalarVariable name=\"der(spring.phi_rel)\" description=\"der(Relative rotation angle (= flange_b.phi - flange_a.phi))\" valueReference=\"10\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
 //       <Real    unit=\"Hz\" />
 //       <QualifiedName>
 //         <exp:QualifiedNamePart name=\"spring\"/>
@@ -195,7 +195,7 @@ readFile("Bug3857.xml"); getErrorString();
 //       <VariableCategory>derivative</VariableCategory>
 //     </ScalarVariable> 
 //
-//     <ScalarVariable name=\"der(spring.w_rel)\" description=\"Relative angular velocity (= der(phi_rel))\" valueReference=\"11\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
+//     <ScalarVariable name=\"der(spring.w_rel)\" description=\"der(Relative angular velocity (= der(phi_rel)))\" valueReference=\"11\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
 //       <Real    unit=\"s-2\" />
 //       <QualifiedName>
 //         <exp:QualifiedNamePart name=\"spring\"/>
@@ -5204,8 +5204,8 @@ readFile("Bug3857.xml"); getErrorString();
 //     </isLinearTimedVariables>
 //       <VariableCategory>state</VariableCategory>
 //     </ScalarVariable> 
-//     <ScalarVariable name=\"der(T)\" description=\"Temperature\" valueReference=\"1\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
-//       <Real  min=\"0.0\"  unit=\"s-1.K\" />
+//     <ScalarVariable name=\"der(T)\" description=\"der(Temperature)\" valueReference=\"1\" variability=\"continuous\" causality=\"internal\" alias=\"noAlias\">
+//       <Real    unit=\"s-1.K\" />
 //       <QualifiedName>
 //         <exp:QualifiedNamePart name=\"T\"/>
 //       </QualifiedName>