Skip to content

Commit

Permalink
Update Modelica.Electrical and Modelica.ComplexBlocks
Browse files Browse the repository at this point in the history
  • Loading branch information
GallLeo committed Oct 14, 2024
1 parent 7df34b2 commit b83d589
Show file tree
Hide file tree
Showing 79 changed files with 710,641 additions and 569,227 deletions.
4,006 changes: 2,003 additions & 2,003 deletions Modelica/ComplexBlocks/Examples/ShowTransferFunction/ShowTransferFunction.csv

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Check of <a href="Modelica://Modelica.ComplexBlocks.Examples.ShowTransferFunction">Modelica.ComplexBlocks.Examples.ShowTransferFunction</a>
The model has the same number of unknowns and equations: 29
Check of <a href="Modelica://Modelica.ComplexBlocks.Examples.ShowTransferFunction">Modelica.ComplexBlocks.Examples.ShowTransferFunction</a> successful.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ logFrequencySweep.y
const.y.re
const.y.im
transferFunction.y.re
transferFunction.y.im
transferFunction.y.im
76 changes: 38 additions & 38 deletions Modelica/ComplexBlocks/Examples/ShowTransferFunction/creation.txt
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
[ResultCreationLog]
modelName="Modelica.ComplexBlocks.Examples.ShowTransferFunction"
modelName = "Modelica.ComplexBlocks.Examples.ShowTransferFunction"

// Test info
generationTool="Dymola Version 2020x (64-bit), 2019-10-10"
generationDateAndTime="2020-05-05T00:31:42Z"
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:03
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=1 // from model
Interval=0.0005 // used annotation from model, multiplied by 0.5
Tolerance=1e-06 // used default, because no tolerance annotation in model
StartTime = 0.0 // set by user or program default value
StopTime = 1.0 // from experiment annotation
Interval = 0.0005 // 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.ComplexBlocks.Examples.ShowTransferFunction");
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.ComplexBlocks.Examples.ShowTransferFunction",
startTime=0,
stopTime=1,
outputInterval=0.0005,
method="Dassl",
tolerance=1e-06,
resultFile="ShowTransferFunction");
problem="Modelica.ComplexBlocks.Examples.ShowTransferFunction",
startTime=0.0,
stopTime=1,
method="Dassl",
tolerance=1e-06,
resultFile="result",
outputInterval=0.0005);
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
Log-file of program ./dymosim
(generated: Tue May 5 00:31:48 2020)
(generated: Tue Sep 17 23:23:03 2024)

dymosim started
... "Modelica.ComplexBlocks.Examples.ShowTransferFunction" simulating
... "dsin.txt" loading (dymosim input file)
... "ShowTransferFunction.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 = 1
CPU-time for integration : 0.034 seconds
CPU-time for one grid interval : 0.017 milliseconds
CPU-time for initialization : 0 seconds
CPU-time for integration : 0.002 seconds
CPU-time for one grid interval : 0.001 milliseconds
CPU-time for initialization : 0.001 seconds
Number of result points : 2002
Number of grid points : 2001
Number of accepted steps : 21
Expand All @@ -25,3 +27,5 @@ Integration terminated successfully at T = 1
Maximum integration order : 1
Calling terminal section
... "dsfinal.txt" creating (final states)

SUCCESSFUL simulation of Modelica.ComplexBlocks.Examples.ShowTransferFunction
Original file line number Diff line number Diff line change
@@ -1,29 +1,30 @@
 = true
Translation of Modelica.ComplexBlocks.Examples.ShowTransferFunction:
Translation of <a href="Modelica://Modelica.ComplexBlocks.Examples.ShowTransferFunction">Modelica.ComplexBlocks.Examples.ShowTransferFunction</a>
The DAE has 29 scalar unknowns and 29 scalar equations.

Statistics

Original Model
Number of components: 13
Variables: 44
Parameters: 15 (19 scalars)
Variables: 49
Constants: 3 (3 scalars)
Parameters: 17 (21 scalars)
Unknowns: 29 (29 scalars)
Equations: 16
Nontrivial: 14
Translated Model
Constants: 4 scalars
Free parameters: 10 scalars
Parameter depending: 6 scalars
Time-varying variables: 17 scalars
Alias variables: 11 scalars
Constants: 8 scalars
Free parameters: 11 scalars
Parameter depending: 11 scalars
Time-varying variables: 10 scalars
Alias variables: 13 scalars
Number of mixed real/discrete systems of equations: 0
Sizes of linear systems of equations: { }
Sizes after manipulation of the linear systems: { }
Sizes of nonlinear systems of equations: { }
Sizes after manipulation of the nonlinear systems: { }
Number of numerical Jacobians: 0

Settings
Advanced.StoreProtectedVariables = true
Selected continuous time states
Selected continuous time states
Finished
Loading

0 comments on commit b83d589

Please sign in to comment.