Skip to content

Commit

Permalink
Fixed experiment annotations
Browse files Browse the repository at this point in the history
  • Loading branch information
@casella
casella committed Jul 1, 2018
1 parent fef5a01 commit a16c109
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 48 deletions.
34 changes: 17 additions & 17 deletions ScalableTestSuite/Electrical/TransmissionLine.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ package TransmissionLine "Models of transmission lines"
voltage_equations = tlm2.vol[N];
voltage_equations_delayed = delay(tlm2.vol[1], TD);
voltage_modelica_delayed = delay(tlm1.signalvoltage.p.v, TD);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8), Documentation(info = "<html><p>In this model, the verification of the TransmissionLineModelica and the TransmissionLineEquations are performed.The formula of the time delay is used for the verification of the implemented transmission line circuit models to check whether the time delay of the models satisfies the theoretical one. Time delay between the ends of a transmission line can be calculated as follows:</p><p><img src=\"modelica://ScalableTestSuite/Resources/Images/TransmissionLine/timedelay.png\"/></p>Therefore, using the time delay formula, input voltages of the both models are delayed by the theoretical time delay. Moreover, it is checked whether the output voltages of the transmission line circuit models are matching with the delayed input voltages.<p>The parameters for the TransmissionLineCheck are: </p><table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8), Documentation(info = "<html><p>In this model, the verification of the TransmissionLineModelica and the TransmissionLineEquations are performed.The formula of the time delay is used for the verification of the implemented transmission line circuit models to check whether the time delay of the models satisfies the theoretical one. Time delay between the ends of a transmission line can be calculated as follows:</p><p><img src=\"modelica://ScalableTestSuite/Resources/Images/TransmissionLine/timedelay.png\"/></p>Therefore, using the time delay formula, input voltages of the both models are delayed by the theoretical time delay. Moreover, it is checked whether the output voltages of the transmission line circuit models are matching with the delayed input voltages.<p>The parameters for the TransmissionLineCheck are: </p><table border=\"1\" cellspacing=\"0\" cellpadding=\"2\">
<tr>
<th>Parameters</th>
<th>Comment</th>
Expand Down Expand Up @@ -309,98 +309,98 @@ package TransmissionLine "Models of transmission lines"

model TransmissionLineEquations_N_10
extends Models.TransmissionLineEquations(N = 10, L = 100, res = 48e-6, cap = 101e-12, ind = 253e-9, w = 1 / 2e-7);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineEquations_N_10;

model TransmissionLineEquations_N_20
extends TransmissionLineEquations_N_10(N = 20);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineEquations_N_20;

model TransmissionLineEquations_N_40
extends TransmissionLineEquations_N_10(N = 40);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineEquations_N_40;

model TransmissionLineEquations_N_80
extends TransmissionLineEquations_N_10(N = 80);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineEquations_N_80;

model TransmissionLineEquations_N_160
extends TransmissionLineEquations_N_10(N = 160);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineEquations_N_160;

model TransmissionLineEquations_N_320
extends TransmissionLineEquations_N_10(N = 320);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineEquations_N_320;

model TransmissionLineEquations_N_640
extends TransmissionLineEquations_N_10(N = 640);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineEquations_N_640;

model TransmissionLineEquations_N_1280
extends TransmissionLineEquations_N_10(N = 1280);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineEquations_N_1280;

model TransmissionLineModelica_N_10
extends Models.TransmissionLineModelica(N = 10, r = 48e-6, c = 101e-12, l = 253e-9, length = 100, w = 1 / 2e-7);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineModelica_N_10;

model TransmissionLineModelica_N_20
extends TransmissionLineModelica_N_10(N = 20);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineModelica_N_20;

model TransmissionLineModelica_N_40
extends TransmissionLineModelica_N_10(N = 40);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineModelica_N_40;

model TransmissionLineModelica_N_80
extends TransmissionLineModelica_N_10(N = 80);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineModelica_N_80;

model TransmissionLineModelica_N_160
extends TransmissionLineModelica_N_10(N = 160);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineModelica_N_160;

model TransmissionLineModelica_N_320
extends TransmissionLineModelica_N_10(N = 320);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineModelica_N_320;

model TransmissionLineModelica_N_640
extends TransmissionLineModelica_N_10(N = 640);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineModelica_N_640;


model TransmissionLineModelica_N_1280
extends TransmissionLineModelica_N_10(N = 1280);
annotation(experiment(StopTime = 4e-6, Tolerance = 1e-8),
annotation(experiment(StopTime = 4e-6, Interval=2e-9, Tolerance = 1e-8),
__OpenModelica_simulationFlags(s = "ida"));
end TransmissionLineModelica_N_1280;
annotation(Documentation(info = "<html><p>In this package there are 16 tests for different N values; 8 for the TransmissionLineModelica and 8 for the TransmissionLineEquations.</p><p> The tests for the both models are performed according to the N values as shown in the table below:</p><table border=\"1\">
Expand Down
58 changes: 27 additions & 31 deletions ScalableTestSuite/Thermal/Advection.mo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,14 +170,10 @@ package Advection "1D advection models"
model SteamPipe
extends Models.SteamPipe(w_in_pipe = 2, N = 100);
Medium.SpecificEnthalpy h_out_pipe_th = delay(h_in_pipe, tau);
annotation (experiment(StopTime=15, Interval=4e-3, Tolerance = 1e-7,
annotation (experiment(StopTime=15, Interval=4e-3, Tolerance = 1e-7),
Documentation(info="<html>
<p>After the initial transient has settled down, the step change of the specific enthalpy at the inlet is propagated to the outlet at a velocity roughly equal to that of the fluid. The outlet specific enthalpy is approximately equal to the inlet enthalpy delayed by the ratio tau between the total mass and the mass flow rate. There is a significant effect of numerical diffusion even for large values of N.</p>
</html>"),
experiment(
StopTime=20,
NumberOfIntervals=5000,
Tolerance=1e-007));
</html>"));
end SteamPipe;
end Verification;

Expand All @@ -197,181 +193,181 @@ package Advection "1D advection models"
"Temperature increase at inlet";
parameter Modelica.SIunits.Frequency f = 0.5
"Frequency of fluid speed oscillations";
annotation (experiment(StopTime=20, NumberOfIntervals=5000, Tolerance = 1e-6));
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6));
end SimpleAdvection_N_100;

model SimpleAdvection_N_200
extends SimpleAdvection_N_100(N = 200);
annotation (experiment(StopTime=20, NumberOfIntervals=5000, Tolerance = 1e-6));
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6));
end SimpleAdvection_N_200;

model SimpleAdvection_N_400
extends SimpleAdvection_N_100(N = 400);
annotation (experiment(StopTime=20, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end SimpleAdvection_N_400;

model SimpleAdvection_N_800
extends SimpleAdvection_N_100(N = 800);
annotation (experiment(StopTime=20, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end SimpleAdvection_N_800;

model SimpleAdvection_N_1600
extends SimpleAdvection_N_100(N = 1600);
annotation (experiment(StopTime=20, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end SimpleAdvection_N_1600;

model SimpleAdvection_N_3200
extends SimpleAdvection_N_100(N = 3200);
annotation (experiment(StopTime=20, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end SimpleAdvection_N_3200;

model SimpleAdvection_N_6400
extends SimpleAdvection_N_100(N = 6400);
annotation (experiment(StopTime=20, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end SimpleAdvection_N_6400;

model SimpleAdvection_N_12800
extends SimpleAdvection_N_100(N = 12800);
annotation (experiment(StopTime=20, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=20, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end SimpleAdvection_N_12800;

model AdvectionReaction_N_100
extends Models.AdvectionReaction(
N = 100,
mu = 500);
annotation (experiment(StopTime=1, NumberOfIntervals=5000, Tolerance = 1e-6));
annotation (experiment(StopTime=1, Interval=4e-3, Tolerance = 1e-6));
end AdvectionReaction_N_100;

model AdvectionReaction_N_200
extends Models.AdvectionReaction(
N = 200,
mu = 1000);
annotation (experiment(StopTime=1, NumberOfIntervals=5000, Tolerance = 1e-6));
annotation (experiment(StopTime=1, Interval=4e-3, Tolerance = 1e-6));
end AdvectionReaction_N_200;

model AdvectionReaction_N_400
extends Models.AdvectionReaction(
N = 400,
mu = 2000);
annotation (experiment(StopTime=1, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=1, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end AdvectionReaction_N_400;

model AdvectionReaction_N_800
extends Models.AdvectionReaction(
N = 800,
mu = 4000);
annotation (experiment(StopTime=1, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=1, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end AdvectionReaction_N_800;

model AdvectionReaction_N_1600
extends Models.AdvectionReaction(
N = 1600,
mu = 8000);
annotation (experiment(StopTime=1, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=1, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end AdvectionReaction_N_1600;

model AdvectionReaction_N_3200
extends Models.AdvectionReaction(
N = 3200,
mu = 16000);
annotation (experiment(StopTime=1, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=1, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end AdvectionReaction_N_3200;

model AdvectionReaction_N_6400
extends Models.AdvectionReaction(
N = 6400,
mu = 32000);
annotation (experiment(StopTime=1, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=1, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end AdvectionReaction_N_6400;

model AdvectionReaction_N_12800
extends Models.AdvectionReaction(
N = 12800,
mu = 64000);
annotation (experiment(StopTime=1, NumberOfIntervals=5000, Tolerance = 1e-6),
annotation (experiment(StopTime=1, Interval=4e-3, Tolerance = 1e-6),
__OpenModelica_simulationFlags(s = "ida"));
end AdvectionReaction_N_12800;

model SteamPipe_N_10
extends Models.SteamPipe(N = 10);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_10;

model SteamPipe_N_20
extends Models.SteamPipe(N = 20);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_20;

model SteamPipe_N_40
extends Models.SteamPipe(N = 40);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_40;

model SteamPipe_N_80
extends Models.SteamPipe(N = 80);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_80;

model SteamPipe_N_160
extends Models.SteamPipe(N = 160);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_160;

model SteamPipe_N_320
extends Models.SteamPipe(N = 320);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_320;

model SteamPipe_N_640
extends Models.SteamPipe(N = 640);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_640;

model SteamPipe_N_1280
extends Models.SteamPipe(N = 1280);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_1280;

model SteamPipe_N_2560
extends Models.SteamPipe(N = 2560);
annotation (experiment(
StopTime=20,
NumberOfIntervals=5000,
Interval=4e-3,
Tolerance=1e-007));
end SteamPipe_N_2560;
end ScaledExperiments;
Expand Down

0 comments on commit a16c109

Please sign in to comment.