-
Notifications
You must be signed in to change notification settings - Fork 7
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
V4.1.0 #8
Closed
Closed
V4.1.0 #8
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
c0889b1
Removed duplicates in SignalNames 10 examples of ModelicaTest
MatthiasBSchaefer e270b28
Add newline characters at EOF
MatthiasBSchaefer 3627921
Merge branch 'modelica:v4.0.0' into v4.1.0
MatthiasBSchaefer fd64731
removed mislocated result file ModelicaTest/Media/TestOnly/R134a_setS…
MatthiasBSchaefer 7b1b11d
Update of reference files for MSL4.1.0: https://github.com/modelica/M…
MatthiasBSchaefer 6df9735
fix: csv's with a constant as first comparison variable
MatthiasBSchaefer f60864d
update reference files to branch maint\4.1.x commit 90d43f3
MatthiasBSchaefer 93954b2
Rename Spice3BenchmarkFourBitAdder.csv
MatthiasBSchaefer 6946c96
unix compatible compiler path in creation.txt
MatthiasBSchaefer febba79
revert to old reference result for Modelica/Magnetic/QuasiStatic/Fund…
MatthiasBSchaefer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
4,006 changes: 2,003 additions & 2,003 deletions
4,006
Modelica/ComplexBlocks/Examples/ShowTransferFunction/ShowTransferFunction.csv
Large diffs are not rendered by default.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
Modelica/ComplexBlocks/Examples/ShowTransferFunction/check_passed.log
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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. | ||
|
92 changes: 54 additions & 38 deletions
92
Modelica/ComplexBlocks/Examples/ShowTransferFunction/creation.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,65 @@ | ||
[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 | ||
gitURL = https://github.com/modelica/ModelicaStandardLibrary | ||
gitRevision = 677bec0b | ||
gitStatus = M Resources/Library/win32/ModelicaIO.lib | ||
M Resources/Library/win32/ModelicaMatIO.lib | ||
M Resources/Library/win32/ModelicaStandardTables.lib | ||
M Resources/Library/win32/gcctdm510/libModelicaIO.a | ||
M Resources/Library/win32/gcctdm510/libModelicaMatIO.a | ||
M Resources/Library/win32/gcctdm510/libModelicaStandardTables.a | ||
M Resources/Library/win32/gcctdm510/libzlib.a | ||
M Resources/Library/win32/zlib.lib | ||
M Resources/Library/win64/ModelicaIO.lib | ||
M Resources/Library/win64/ModelicaMatIO.lib | ||
M Resources/Library/win64/ModelicaStandardTables.lib | ||
M Resources/Library/win64/gcctdm510/libModelicaIO.a | ||
M Resources/Library/win64/gcctdm510/libModelicaMatIO.a | ||
M Resources/Library/win64/gcctdm510/libModelicaStandardTables.a | ||
M Resources/Library/win64/gcctdm510/libzlib.a | ||
M Resources/Library/win64/zlib.lib | ||
testPC = LTXA320 | ||
testOS = Windows [Version 10.0.19041] | ||
testUser = Matthias Schaefer | ||
testDescription = | ||
compiler = Microsoft Visual Studio 2022 | ||
generationDateAndTime = 2024-03-18 23:58:18 | ||
|
||
// 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 | ||
StopTime = 1.0 // from model. experiment annotation or dymola default | ||
Interval = 2000 // from model. experiment annotation or dymola default | ||
Tolerance = 1e-06 // set by user | ||
|
||
// 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.StoreProtectedVariables = true; | ||
Advanced.HideDymosim := true; | ||
Advanced.PlaceDymolaSourceFirst := 2; | ||
Advanced.StoreProtectedVariables := true; | ||
SetDymolaCompiler("vs", {"CCompiler=MSVC","MSVCDir=C:/Program Files (x86)/Microsoft Visual Studio 2022/Vc}); | ||
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, | ||
numberOfIntervals=2000, | ||
method="Dassl", | ||
tolerance=1e-06, | ||
outputInterval=0.0, | ||
resultFile="result"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 14 additions & 13 deletions
27
Modelica/ComplexBlocks/Examples/ShowTransferFunction/translate_passed.log
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is incorrect (and similar for other updated results).
The model experiment annotation has
Interval=0.001
. This seems more like a "number of steps", rather thanInterval
.The older creation.txt also had different comments that described how the settings were decided, while this sounds like it has the same comment regardless of how it was decided?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your feedback.
The pullrequest was reset to the draft-status, because of these inconsistencies in the NumberOfIntervals\ OutputInterval.
The creation.txt and so also the comments are generated automatically. So we don't know the intension behind the settings. With the comment we only mark that the simulation setting correspond with the experiment annotation or not.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But with the current comment I cannot tell if it came from the experiment annotation or from the dymola default?