Skip to content

Commit 37e6da2

Browse files
HansOlssonbeutlich
authored andcommitted
Add extra variables for easier check.
1 parent be949b2 commit 37e6da2

File tree

5 files changed

+60
-0
lines changed

5 files changed

+60
-0
lines changed

ModelicaTest/Tables/CombiTable1Ds.mo

+12
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,26 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
1313
partial model TestDer
1414
extends Test;
1515
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
16+
Real integrated "Integral that should equal d_t_new.u";
17+
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
18+
initial equation
19+
integrated=d_t_new.u;
1620
equation
21+
der(integrated)=factor1*d_t_new.y;
1722
connect(t_new.y[1], d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
1823
end TestDer;
1924

2025
partial model TestDer2
2126
extends TestDer;
2227
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
28+
Real integrated2 "Integral that should equal d_t_new.u";
29+
Real der_integrated2;
30+
initial equation
31+
integrated2=d_t_new.u;
32+
der_integrated2=d2_t_new.u;
2333
equation
34+
der(integrated2)=factor1*der_integrated2;
35+
der(der_integrated2)=factor1*d2_t_new.y;
2436
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
2537
end TestDer2;
2638

ModelicaTest/Tables/CombiTable1Dv.mo

+12
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,26 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
1313
partial model TestDer
1414
extends Test;
1515
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
16+
Real integrated "Integral that should equal d_t_new.u";
17+
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
18+
initial equation
19+
integrated=d_t_new.u;
1620
equation
21+
der(integrated)=factor1*d_t_new.y;
1722
connect(t_new.y[1], d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
1823
end TestDer;
1924

2025
partial model TestDer2
2126
extends TestDer;
2227
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
28+
Real integrated2 "Integral that should equal d_t_new.u";
29+
Real der_integrated2;
30+
initial equation
31+
integrated2=d_t_new.u;
32+
der_integrated2=d2_t_new.u;
2333
equation
34+
der(integrated2)=factor1*der_integrated2;
35+
der(der_integrated2)=factor1*d2_t_new.y;
2436
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
2537
end TestDer2;
2638

ModelicaTest/Tables/CombiTable2Ds.mo

+12
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,26 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
1010
partial model TestDer
1111
extends Test;
1212
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
13+
Real integrated "Integral that should equal d_t_new.u";
14+
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
15+
initial equation
16+
integrated=d_t_new.u;
1317
equation
18+
der(integrated)=factor1*d_t_new.y;
1419
connect(t_new.y, d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
1520
end TestDer;
1621

1722
partial model TestDer2
1823
extends TestDer;
1924
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
25+
Real integrated2 "Integral that should equal d_t_new.u";
26+
Real der_integrated2;
27+
initial equation
28+
integrated2=d_t_new.u;
29+
der_integrated2=d2_t_new.u;
2030
equation
31+
der(integrated2)=factor1*der_integrated2;
32+
der(der_integrated2)=factor1*d2_t_new.y;
2133
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
2234
end TestDer2;
2335

ModelicaTest/Tables/CombiTable2Dv.mo

+12
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,26 @@ package CombiTable2Dv "Test models for Modelica.Blocks.Tables.CombiTable2Dv"
1010
partial model TestDer
1111
extends Test;
1212
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
13+
Real integrated "Integral that should equal d_t_new.u";
14+
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
15+
initial equation
16+
integrated=d_t_new.u;
1317
equation
18+
der(integrated)=factor1*d_t_new.y;
1419
connect(t_new.y[1], d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
1520
end TestDer;
1621

1722
partial model TestDer2
1823
extends TestDer;
1924
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
25+
Real integrated2 "Integral that should equal d_t_new.u";
26+
Real der_integrated2;
27+
initial equation
28+
integrated2=d_t_new.u;
29+
der_integrated2=d2_t_new.u;
2030
equation
31+
der(integrated2)=factor1*der_integrated2;
32+
der(der_integrated2)=factor1*d2_t_new.y;
2133
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
2234
end TestDer2;
2335

ModelicaTest/Tables/CombiTimeTable.mo

+12
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,26 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
1010
partial model TestDer
1111
extends Test;
1212
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
13+
Real integrated "Integral that should equal d_t_new.u";
14+
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
15+
initial equation
16+
integrated=d_t_new.u;
1317
equation
18+
der(integrated)=factor1*d_t_new.y;
1419
connect(t_new.y[1], d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
1520
end TestDer;
1621

1722
partial model TestDer2
1823
extends TestDer;
1924
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
25+
Real integrated2 "Integral that should equal d_t_new.u";
26+
Real der_integrated2;
27+
initial equation
28+
integrated2=d_t_new.u;
29+
der_integrated2=d2_t_new.u;
2030
equation
31+
der(integrated2)=factor1*der_integrated2;
32+
der(der_integrated2)=factor1*d2_t_new.y;
2133
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
2234
end TestDer2;
2335

0 commit comments

Comments
 (0)