Skip to content

Commit

Permalink
Updating Modelica.Blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
GallLeo authored and beutlich committed Jan 21, 2025
1 parent f7a0109 commit 39d5b83
Show file tree
Hide file tree
Showing 28 changed files with 123,880 additions and 123,917 deletions.
7,180 changes: 3,574 additions & 3,606 deletions Modelica/Blocks/Examples/Noise/ActuatorWithNoise/ActuatorWithNoise.csv

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Check of <a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise">Modelica.Blocks.Examples.Noise.ActuatorWithNoise</a>
The model has the same number of unknowns and equations: 814
The model could not be deduced to be symbolically well-posed.
The model has
802+2*motor.dqToThreePhase.m+motor.voltageQuasiRMSSensor.ToSpacePhasor1.m+ motor.currentQuasiRMSSensor.ToSpacePhasor1.m
796+2*(motor.dqToThreePhase.m+motor.rotorDisplacementAngle.m)+motor.voltageQuasiRMSSensor.ToSpacePhasor1.m +motor.currentQuasiRMSSensor.ToSpacePhasor1.m
scalar unknowns and
805+2*motor.dqToThreePhase.m+motor.currentQuasiRMSSensor.ToSpacePhasor1.m
800+(if not motor.smpm.useDamperCage then 1 else 0)+2*motor.dqToThreePhase.m+( if not constantForce.useSupport then 1 else 0)+motor.currentQuasiRMSSensor.ToSpacePhasor1.m +motor.rotorDisplacementAngle.m
scalar equations.
However, exploiting the given bindings parameters gives the same number of unknowns and equations:
808+2*motor.dqToThreePhase.m
However, exploiting the given numerical settings of parameters gives the same number of unknowns and equations:
814
Check of <a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise">Modelica.Blocks.Examples.Noise.ActuatorWithNoise</a> successful.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
time
controller.busdelay.y
controller.speed_PI.x
controller.positionToSpeed.x
controller.position_PI.x
controller.speed_PI.x
elastoGap.s_rel
elastoGap.v_rel
controller.busdelay.y
gearbox.phi_rel
gearbox.w_rel
slewRateLimiter.y
rodMass.s
rodMass.v
slewRateLimiter.y
elastoGap.s_rel
elastoGap.v_rel
76 changes: 38 additions & 38 deletions Modelica/Blocks/Examples/Noise/ActuatorWithNoise/creation.txt
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
[ResultCreationLog]
modelName="Modelica.Blocks.Examples.Noise.ActuatorWithNoise"
modelName = "Modelica.Blocks.Examples.Noise.ActuatorWithNoise"

// Test info
generationTool="Dymola Version 2020x (64-bit), 2019-10-10"
generationDateAndTime="2020-05-05T00:31:12Z"
gitURL="https://github.com/modelica/ModelicaStandardLibrary.git"
gitRevision=bd753330a
gitStatus="D Modelica/Resources/C-Sources/ModelicaInternal.c, M ModelicaServices/package.mo"
testPC="LAPTOP"
testOS="Microsoft Windows [Version 10.0.18363.815]"
testUser="tbeu"
testDescription="Reg test MSL v4.0.0-rc.1"
generationTool = Dymola Version 2023x Refresh 1, 2023-04-12
generationDateAndTime = 2024-09-17 23:23:01
gitURL = https://github.com/modelica/ModelicaStandardLibrary
gitRevision = 67fcd1d3
gitStatus =
testPC = LTXA320
testOS = Windows [Version 10.0.19041]
testUser = Matthias Schaefer
testDescription =
compiler = Microsoft Visual Studio 2022

// Experiment settings (standardized annotation)
StartTime=0
StopTime=8 // from model
Interval=0.005 // used annotation from model, multiplied by 0.5
Tolerance=1e-06 // used annotation from model, multiplied by 0.1
StartTime = 0.0 // set by user or program default value
StopTime = 8.0 // from experiment annotation
Interval = 0.005 // set by user or program default value
Tolerance = 1e-06 // set by user or program default value

// Experiment settings (tool specific)
// The following lines can be used as mos-script in Dymola
Advanced.PedanticModelica := false;
SetDymolaCompiler("vs", {"MSVCDir=c:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build"});
Evaluate := false;
OutputCPUtime := false;
translateModel("Modelica.Blocks.Examples.Noise.ActuatorWithNoise");
Advanced.StoreProtectedVariables := true;
Advanced.EfficientMinorEvents := false;
clearFlags();
Advanced.PlaceDymolaSourceFirst=2;
Advanced.HideDymosim := true;
Advanced.PlaceDymolaSourceFirst := 2;
Advanced.StoreProtectedVariables := true;
SetDymolaCompiler("vs", {"CCompiler=MSVC","MSVCDir=C:/Program Files/Microsoft Visual Studio/2022/Community/VC/Auxiliary/Build"});
experimentSetupOutput(
textual=false,
doublePrecision=true,
states=true,
derivatives=true,
inputs=true,
outputs=true,
auxiliaries=true,
equidistant=true,
events=true,
debug=false);
textual=false,
doublePrecision=false,
states=true,
derivatives=true,
inputs=true,
outputs=true,
auxiliaries=true,
equidistant=true,
events=true,
onlyStopTime=false,
debug=false);
simulateModel(
problem="Modelica.Blocks.Examples.Noise.ActuatorWithNoise",
startTime=0,
stopTime=8,
outputInterval=0.005,
method="Dassl",
tolerance=1e-06,
resultFile="ActuatorWithNoise");
problem="Modelica.Blocks.Examples.Noise.ActuatorWithNoise",
startTime=0.0,
stopTime=8,
method="Dassl",
tolerance=1e-06,
resultFile="result",
outputInterval=0.005);
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
Log-file of program ./dymosim
(generated: Tue May 5 00:31:24 2020)
(generated: Tue Sep 17 23:23:01 2024)

dymosim started
... "Modelica.Blocks.Examples.Noise.ActuatorWithNoise" simulating
... "dsin.txt" loading (dymosim input file)
... "ActuatorWithNoise.mat" creating (simulation result file)
... "result.mat" creating (simulation result file)

Integration started at T = 0 using integration method DASSL
(DAE multi-step solver (dassl/dasslrt of Petzold modified by Dassault Systemes))

Integration terminated successfully at T = 8
CPU-time for integration : 2.73 seconds
CPU-time for one grid interval : 1.7 milliseconds
CPU-time for integration : 1.24 seconds
CPU-time for one grid interval : 0.777 milliseconds
CPU-time for initialization : 0 seconds
Number of result points : 3605
Number of result points : 3573
Number of grid points : 1601
Number of accepted steps : 100793
Number of f-evaluations (dynamics) : 184528
Number of crossing function evaluations : 103790
Number of Jacobian-evaluations : 28960
Number of accepted steps : 100254
Number of f-evaluations (dynamics) : 183315
Number of crossing function evaluations : 103104
Number of Jacobian-evaluations : 28659
Number of model time events : 1600
Number of input time events : 0
Number of state events : 202
Number of state events : 186
Number of step events : 0
Minimum integration stepsize : 6.65e-11
Maximum integration stepsize : 0.000686
Maximum integration stepsize : 0.000865
Maximum integration order : 5
Calling terminal section
... "dsfinal.txt" creating (final states)

SUCCESSFUL simulation of Modelica.Blocks.Examples.Noise.ActuatorWithNoise
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
 = true
Translation of Modelica.Blocks.Examples.Noise.ActuatorWithNoise:
Translation of <a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise">Modelica.Blocks.Examples.Noise.ActuatorWithNoise</a>
The DAE has 814 scalar unknowns and 814 scalar equations.

Statistics

Original Model
Number of components: 122
Variables: 1119
Number of components: 123
Variables: 1123
Constants: 17 (17 scalars)
Parameters: 383 (461 scalars)
Parameters: 387 (465 scalars)
Unknowns: 719 (814 scalars)
Differentiated variables: 38 scalars
Equations: 500
Nontrivial: 399
Equations: 501
Nontrivial: 400
Translated Model
Constants: 428 scalars
Free parameters: 90 scalars
Parameter depending: 161 scalars
Constants: 429 scalars
Free parameters: 92 scalars
Parameter depending: 162 scalars
Continuous time states: 11 scalars
Time-varying variables: 172 scalars
Alias variables: 441 scalars
Expand All @@ -29,25 +28,24 @@ Translated Model
Initialization problem
Sizes of linear systems of equations: {2}
Sizes after manipulation of the linear systems: {2}

Settings
Advanced.StoreProtectedVariables = true
Selected continuous time states
Statically selected continuous time states
controller.position_PI.x
controller.positionToSpeed.x
controller.speed_PI.x
elastoGap.s_rel
elastoGap.v_rel
gearbox.phi_rel
gearbox.w_rel
rodMass.s
rodMass.v
slewRateLimiter.y

<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$controller.position_PI:x">controller.position_PI.x</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$controller.positionToSpeed:x">controller.positionToSpeed.x</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$controller.speed_PI:x">controller.speed_PI.x</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$elastoGap:s_rel">elastoGap.s_rel</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$elastoGap:v_rel">elastoGap.v_rel</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$gearbox:phi_rel">gearbox.phi_rel</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$gearbox:w_rel">gearbox.w_rel</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$rodMass:s">rodMass.s</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$rodMass:v">rodMass.v</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#diagram$:slewRateLimiter.y">slewRateLimiter.y</a>
Dynamically selected continuous time states
There is one set of dynamic state selection.
There is one state to be selected from:
controller.busdelay.y
motor.smpm.idq_sr[]
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#diagram$controller:busdelay.y">controller.busdelay.y</a>
<a href="Modelica://Modelica.Blocks.Examples.Noise.ActuatorWithNoise#text$motor.smpm:idq_sr">motor.smpm.idq_sr[]</a>
Finished
Loading

0 comments on commit 39d5b83

Please sign in to comment.