Skip to content

Commit

Permalink
Add extra variables for easier check.
Browse files Browse the repository at this point in the history
  • Loading branch information
@HansOlsson
HansOlsson committed Feb 11, 2025
1 parent 7332610 commit 88e863a
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 0 deletions.
12 changes: 12 additions & 0 deletions ModelicaTest/Tables/CombiTable1Ds.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,26 @@ package CombiTable1Ds "Test models for Modelica.Blocks.Tables.CombiTable1Ds"
partial model TestDer
extends Test;
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
Real integrated "Integral that should equal d_t_new.u";
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
initial equation
integrated=d_t_new.u;
equation
der(integrated)=factor1*d_t_new.y;
connect(t_new.y[1], d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
end TestDer;

partial model TestDer2
extends TestDer;
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
Real integrated2 "Integral that should equal d_t_new.u";
Real der_integrated2;
initial equation
integrated2=d_t_new.u;
der_integrated2=d2_t_new.u;
equation
der(integrated2)=factor1*der_integrated2;
der(der_integrated2)=factor1*d2_t_new.y;
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
end TestDer2;

Expand Down
12 changes: 12 additions & 0 deletions ModelicaTest/Tables/CombiTable1Dv.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,26 @@ package CombiTable1Dv "Test models for Modelica.Blocks.Tables.CombiTable1Dv"
partial model TestDer
extends Test;
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
Real integrated "Integral that should equal d_t_new.u";
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
initial equation
integrated=d_t_new.u;
equation
der(integrated)=factor1*d_t_new.y;
connect(t_new.y[1], d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
end TestDer;

partial model TestDer2
extends TestDer;
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
Real integrated2 "Integral that should equal d_t_new.u";
Real der_integrated2;
initial equation
integrated2=d_t_new.u;
der_integrated2=d2_t_new.u;
equation
der(integrated2)=factor1*der_integrated2;
der(der_integrated2)=factor1*d2_t_new.y;
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
end TestDer2;

Expand Down
12 changes: 12 additions & 0 deletions ModelicaTest/Tables/CombiTable2Ds.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,26 @@ package CombiTable2Ds "Test models for Modelica.Blocks.Tables.CombiTable2Ds"
partial model TestDer
extends Test;
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
Real integrated "Integral that should equal d_t_new.u";
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
initial equation
integrated=d_t_new.u;
equation
der(integrated)=factor1*d_t_new.y;
connect(t_new.y, d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
end TestDer;

partial model TestDer2
extends TestDer;
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
Real integrated2 "Integral that should equal d_t_new.u";
Real der_integrated2;
initial equation
integrated2=d_t_new.u;
der_integrated2=d2_t_new.u;
equation
der(integrated2)=factor1*der_integrated2;
der(der_integrated2)=factor1*d2_t_new.y;
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
end TestDer2;

Expand Down
12 changes: 12 additions & 0 deletions ModelicaTest/Tables/CombiTable2Dv.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,26 @@ package CombiTable2Dv "Test models for Modelica.Blocks.Tables.CombiTable2Dv"
partial model TestDer
extends Test;
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
Real integrated "Integral that should equal d_t_new.u";
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
initial equation
integrated=d_t_new.u;
equation
der(integrated)=factor1*d_t_new.y;
connect(t_new.y[1], d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
end TestDer;

partial model TestDer2
extends TestDer;
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
Real integrated2 "Integral that should equal d_t_new.u";
Real der_integrated2;
initial equation
integrated2=d_t_new.u;
der_integrated2=d2_t_new.u;
equation
der(integrated2)=factor1*der_integrated2;
der(der_integrated2)=factor1*d2_t_new.y;
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
end TestDer2;

Expand Down
12 changes: 12 additions & 0 deletions ModelicaTest/Tables/CombiTimeTable.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,26 @@ package CombiTimeTable "Test models for Modelica.Blocks.Sources.CombiTimeTable"
partial model TestDer
extends Test;
Modelica.Blocks.Continuous.Der d_t_new annotation(Placement(transformation(extent={{0,0},{20,20}})));
Real integrated "Integral that should equal d_t_new.u";
parameter Real factor1=1 "To prevent symbolic simplification" annotation(Evaluate=false);
initial equation
integrated=d_t_new.u;
equation
der(integrated)=factor1*d_t_new.y;
connect(t_new.y[1], d_t_new.u) annotation(Line(points={{-19,10},{-2,10}}, color={0,0,127}));
end TestDer;

partial model TestDer2
extends TestDer;
Modelica.Blocks.Continuous.Der d2_t_new annotation(Placement(transformation(extent={{40,0},{60,20}})));
Real integrated2 "Integral that should equal d_t_new.u";
Real der_integrated2;
initial equation
integrated2=d_t_new.u;
der_integrated2=d2_t_new.u;
equation
der(integrated2)=factor1*der_integrated2;
der(der_integrated2)=factor1*d2_t_new.y;
connect(d_t_new.y, d2_t_new.u) annotation(Line(points={{21,10},{26,10},{33,10},{38,10}}, color={0,0,127}));
end TestDer2;

Expand Down

0 comments on commit 88e863a

Please sign in to comment.