Skip to content

Commit 29c5081

Browse files
committed
Expected output
1 parent d069b65 commit 29c5081

File tree

3 files changed

+45
-13
lines changed

3 files changed

+45
-13
lines changed

flattening/modelica/connectors/CGraphBug.mos

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -500,19 +500,45 @@ instantiateModel(Test); getErrorString();
500500
// mass.r_0[1] = mass.frame_a.r_0[1];
501501
// mass.r_0[2] = mass.frame_a.r_0[2];
502502
// mass.r_0[3] = mass.frame_a.r_0[3];
503-
// mass.Q[1] = 0.0;
504-
// mass.Q[2] = 0.0;
505-
// mass.Q[3] = 0.0;
506-
// mass.Q[4] = 1.0;
507-
// mass.phi[1] = 0.0;
508-
// mass.phi[2] = 0.0;
509-
// mass.phi[3] = 0.0;
510-
// mass.phi_d[1] = 0.0;
511-
// mass.phi_d[2] = 0.0;
512-
// mass.phi_d[3] = 0.0;
513-
// mass.phi_dd[1] = 0.0;
514-
// mass.phi_dd[2] = 0.0;
515-
// mass.phi_dd[3] = 0.0;
503+
// if true then
504+
// mass.Q[1] = 0.0;
505+
// mass.Q[2] = 0.0;
506+
// mass.Q[3] = 0.0;
507+
// mass.Q[4] = 1.0;
508+
// mass.phi[1] = 0.0;
509+
// mass.phi[2] = 0.0;
510+
// mass.phi[3] = 0.0;
511+
// mass.phi_d[1] = 0.0;
512+
// mass.phi_d[2] = 0.0;
513+
// mass.phi_d[3] = 0.0;
514+
// mass.phi_dd[1] = 0.0;
515+
// mass.phi_dd[2] = 0.0;
516+
// mass.phi_dd[3] = 0.0;
517+
// elseif mass.useQuaternions then
518+
// mass.frame_a.R = Modelica.Mechanics.MultiBody.Frames.from_Q({mass.Q[1], mass.Q[2], mass.Q[3], mass.Q[4]}, Modelica.Mechanics.MultiBody.Frames.Quaternions.angularVelocity2({mass.Q[1], mass.Q[2], mass.Q[3], mass.Q[4]}, {der(mass.Q[1]), der(mass.Q[2]), der(mass.Q[3]), der(mass.Q[4])}));
519+
// {0.0} = Modelica.Mechanics.MultiBody.Frames.Quaternions.orientationConstraint({mass.Q[1], mass.Q[2], mass.Q[3], mass.Q[4]});
520+
// mass.phi[1] = 0.0;
521+
// mass.phi[2] = 0.0;
522+
// mass.phi[3] = 0.0;
523+
// mass.phi_d[1] = 0.0;
524+
// mass.phi_d[2] = 0.0;
525+
// mass.phi_d[3] = 0.0;
526+
// mass.phi_dd[1] = 0.0;
527+
// mass.phi_dd[2] = 0.0;
528+
// mass.phi_dd[3] = 0.0;
529+
// else
530+
// mass.phi_d[1] = der(mass.phi[1]);
531+
// mass.phi_d[2] = der(mass.phi[2]);
532+
// mass.phi_d[3] = der(mass.phi[3]);
533+
// mass.phi_dd[1] = der(mass.phi_d[1]);
534+
// mass.phi_dd[2] = der(mass.phi_d[2]);
535+
// mass.phi_dd[3] = der(mass.phi_d[3]);
536+
// mass.frame_a.R = Modelica.Mechanics.MultiBody.Frames.axesRotations({mass.sequence_angleStates[1], mass.sequence_angleStates[2], mass.sequence_angleStates[3]}, {mass.phi[1], mass.phi[2], mass.phi[3]}, {mass.phi_d[1], mass.phi_d[2], mass.phi_d[3]});
537+
// mass.Q[1] = 0.0;
538+
// mass.Q[2] = 0.0;
539+
// mass.Q[3] = 0.0;
540+
// mass.Q[4] = 1.0;
541+
// end if;
516542
// mass.g_0 = Modelica.Mechanics.MultiBody.World$world.gravityAcceleration({mass.frame_a.r_0[1], mass.frame_a.r_0[2], mass.frame_a.r_0[3]} + Modelica.Mechanics.MultiBody.Frames.resolve1(mass.frame_a.R, {mass.r_CM[1], mass.r_CM[2], mass.r_CM[3]}), Modelica.Mechanics.MultiBody.Types.GravityTypes.UniformGravity, {0.0, -9.81, 0.0}, 398600000000000.0);
517543
// mass.v_0[1] = der(mass.frame_a.r_0[1]);
518544
// mass.v_0[2] = der(mass.frame_a.r_0[2]);

flattening/modelica/connectors/ConnectTypes.mo

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ end ConnectTypes;
4242
// parameter Integer c.n = 1;
4343
// constant Real c.c = 2.0;
4444
// equation
45+
// assert(true, "automatically generated from connect");
4546
// assert(c.n == a.c.n, "automatically generated from connect");
4647
// assert(c.p == a.c.p, "automatically generated from connect");
4748
// c.e[1] = time;

flattening/modelica/others/ThermoPower.Examples.BraytonCycle.ClosedLoopSimulator.mos

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3346,14 +3346,17 @@ instantiateModel(ThermoPower.Examples.BraytonCycle.ClosedLoopSimulator); getErro
33463346
// when initial() then
33473347
// plant.compressor.Eta.tableOnFileRead = 1.0;
33483348
// end when;
3349+
// assert(true, \"tableOnFile = false and parameter table is an empty matrix\");
33493350
// plant.compressor.Eta.y = Modelica.Blocks.Tables.CombiTable2D$plant$compressor$Eta.getTableValue(plant.compressor.Eta.tableID, plant.compressor.Eta.u1, plant.compressor.Eta.u2, plant.compressor.Eta.tableOnFileRead);
33503351
// when initial() then
33513352
// plant.compressor.PressRatio.tableOnFileRead = 1.0;
33523353
// end when;
3354+
// assert(true, \"tableOnFile = false and parameter table is an empty matrix\");
33533355
// plant.compressor.PressRatio.y = Modelica.Blocks.Tables.CombiTable2D$plant$compressor$PressRatio.getTableValue(plant.compressor.PressRatio.tableID, plant.compressor.PressRatio.u1, plant.compressor.PressRatio.u2, plant.compressor.PressRatio.tableOnFileRead);
33543356
// when initial() then
33553357
// plant.compressor.Phic.tableOnFileRead = 1.0;
33563358
// end when;
3359+
// assert(true, \"tableOnFile = false and parameter table is an empty matrix\");
33573360
// plant.compressor.Phic.y = Modelica.Blocks.Tables.CombiTable2D$plant$compressor$Phic.getTableValue(plant.compressor.Phic.tableID, plant.compressor.Phic.u1, plant.compressor.Phic.u2, plant.compressor.Phic.tableOnFileRead);
33583361
// plant.compressor.N_T_design = plant.compressor.Ndesign / sqrt(plant.compressor.Tdes_in);
33593362
// plant.compressor.N_T = 100.0 * plant.compressor.omega / (sqrt(plant.compressor.gas_in.T) * plant.compressor.N_T_design);
@@ -3471,10 +3474,12 @@ instantiateModel(ThermoPower.Examples.BraytonCycle.ClosedLoopSimulator); getErro
34713474
// when initial() then
34723475
// plant.turbine.Phic.tableOnFileRead = 1.0;
34733476
// end when;
3477+
// assert(true, \"tableOnFile = false and parameter table is an empty matrix\");
34743478
// plant.turbine.Phic.y = Modelica.Blocks.Tables.CombiTable2D$plant$turbine$Phic.getTableValue(plant.turbine.Phic.tableID, plant.turbine.Phic.u1, plant.turbine.Phic.u2, plant.turbine.Phic.tableOnFileRead);
34753479
// when initial() then
34763480
// plant.turbine.Eta.tableOnFileRead = 1.0;
34773481
// end when;
3482+
// assert(true, \"tableOnFile = false and parameter table is an empty matrix\");
34783483
// plant.turbine.Eta.y = Modelica.Blocks.Tables.CombiTable2D$plant$turbine$Eta.getTableValue(plant.turbine.Eta.tableID, plant.turbine.Eta.u1, plant.turbine.Eta.u2, plant.turbine.Eta.tableOnFileRead);
34793484
// plant.turbine.N_T_design = plant.turbine.Ndesign / sqrt(plant.turbine.Tdes_in);
34803485
// plant.turbine.N_T = 100.0 * plant.turbine.omega / (sqrt(plant.turbine.gas_in.T) * plant.turbine.N_T_design);

0 commit comments

Comments
 (0)