Skip to content
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

Remove redundant text in celsius to kelvin icon #4539

Closed
wants to merge 67 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
e5d47ed
Add missing macro definitions (#4283)
beutlich Jan 29, 2024
47f5115
Upgrade zlib to v1.3.1 (#4281)
beutlich Jan 29, 2024
0c750c7
Add redundant algorithm (#4284)
HansOlsson Jan 29, 2024
1eeee38
Merge pull request #4094 from henrikt-ma/first-figure
AHaumer Jan 24, 2024
80b78bd
Merge pull request #4291 from maltelenz/backport-first-figure
AHaumer Feb 2, 2024
ce4e6bd
Merge pull request #4290 from maltelenz/backport-4284
AHaumer Feb 2, 2024
74424e6
Merge pull request #4275 from maltelenz/bugfix/reference-syntax
AHaumer Feb 2, 2024
1e8050d
Merge pull request #4049 from pierre-haessig/master
christoff-buerger Feb 2, 2024
60774bf
Merge pull request #4299 from Harisankar-Allimangalath/backport_PR4049
AHaumer Feb 6, 2024
da5c5de
Merge pull request #4298 from Harisankar-Allimangalath/backport_PR4275
AHaumer Feb 6, 2024
2fd31ec
Compatibility fix for Dymola 2024x; not needed in coming release.
HansOlsson Feb 13, 2024
75e2380
resolves #4309 (#4310)
AHaumer Feb 13, 2024
5cac4ab
resolves #4304 (#4311)
AHaumer Feb 13, 2024
b162f33
Fix plot scripts (#4322)
HansOlsson Feb 15, 2024
e2782e8
Fix typo (#4324)
beutlich Feb 15, 2024
e0ec3fd
Merge pull request #4318 from Harisankar-Allimangalath/backport_PR4310
AHaumer Feb 15, 2024
85da0e1
Merge pull request #4320 from Harisankar-Allimangalath/backport_PR4311
AHaumer Feb 15, 2024
ef9fc25
Merge pull request #4314 from HansOlsson/FixAndTrue
AHaumer Feb 16, 2024
406bf87
Merge pull request #4313 from HansOlsson/FixPower0
AHaumer Feb 16, 2024
c544e8d
Fix comparison signals (#4328)
beutlich Feb 27, 2024
b9355a4
Merge pull request #4326 from Harisankar-Allimangalath/backport_PR4313
AHaumer Feb 27, 2024
af02ffc
Bump copyright year (#4319)
Harisankar-Allimangalath Feb 27, 2024
36e5c00
Consider shiftTime for verbose extrapolation in CombiTimeTable (#4345)
beutlich Feb 28, 2024
fde13be
Revisit Modelica.Electrical.Analog.Examples.Lines.LightningSegmentedT…
beutlich Mar 3, 2024
b46c7e8
Document limitations on CSV import (#4354)
beutlich Mar 12, 2024
90d43f3
Rebuild binaries
beutlich Feb 28, 2024
2e0ff6f
Merge pull request #4353 from AHaumer/PowerConvertersReferenceResults
hubertus65 Mar 27, 2024
24e8fa5
Merge pull request #4372 from Harisankar-Allimangalath/backport_PR4353
AHaumer Apr 19, 2024
f69ee78
Update CoupledClutches.mos
Harisankar-Allimangalath May 22, 2024
e2109bd
Update MultipleResonance.mo (#4351)
hubertus65 Mar 13, 2024
7daaddb
Fix ComplexImpedance ctor call
beutlich Mar 28, 2024
812e0c7
Merge pull request #4271 from beutlich/update-red-dot
hubertus65 Mar 12, 2024
fd46443
Check y - not internal state. (#4416)
HansOlsson Jun 11, 2024
715668b
Restore derivatives for one-sided extrapolation by constant continuat…
HansOlsson Jun 11, 2024
5e08d0b
Rebuild binaries (#4426)
beutlich Jun 23, 2024
6e65b0c
Fix illegal ModelicaTest.Media.TestOnly.WaterIF97_dewEnthalpy (#4437)
beutlich Aug 1, 2024
53d61a4
Fix links (#4435)
beutlich Aug 1, 2024
550f4c4
Bump actions to avoid deprecation warnings (#4434)
beutlich Aug 1, 2024
4d01fda
Fix typos [ci skip] (#4433)
beutlich Aug 1, 2024
900d94a
Remove parameter keyword in functions (#4444)
Esther-Devakirubai Aug 9, 2024
6352363
Update documentation according to changes in the Modelica Specificati…
beutlich Aug 12, 2024
5531256
Add unit="1" to quaternions. (#4397) (#4445)
Esther-Devakirubai Aug 13, 2024
57d764b
Fixes regression introduced by #4306 by using public alias variables …
beutlich Aug 16, 2024
926a611
Fix documentation typo (#4448)
Esther-Devakirubai Aug 16, 2024
02d676b
Add comparison signals for DynamicPipeEnergyConservationCheck and Dyn…
Esther-Devakirubai Aug 17, 2024
68c7a88
Fix dimension errors in functions of Modelica.Media.Interfaces.Partia…
Esther-Devakirubai Aug 19, 2024
21b928e
Resolve #4336 (#4447)
beutlich Aug 19, 2024
402d027
Add comparison signals for HBridge_TrianglePWM_RL, same as HBridge_RL…
Esther-Devakirubai Aug 19, 2024
8f6cac8
Updated comparison signals for ModelicaTest.Fluid.TestComponents.Fitt…
Esther-Devakirubai Aug 21, 2024
d4fa6c9
Removed useless and numerically critical error signals from MoistAir …
Esther-Devakirubai Sep 10, 2024
67fcd1d
Make type explicit (#4393) (#4462)
Esther-Devakirubai Sep 10, 2024
4f119bb
Merge pull request #4461 from HansOlsson/MinPorts (#4469)
arunkumar-narasimhan Sep 26, 2024
5114284
Math asserts (#4344) (#4470)
Esther-Devakirubai Oct 24, 2024
f6037d4
AdditionalSqrt (#4452)
Esther-Devakirubai Oct 24, 2024
3662661
MSL 4.1.0 Regressions: set FundamentalWave..SymmetricPolyphaseWinding…
AHaumer Oct 21, 2024
47f0895
removed vendor-specific annotation
AHaumer Oct 21, 2024
ffc7b5c
moved the modifier zeroInductor.i0(nominal=10) from Modelica/Magnetic…
AHaumer Oct 22, 2024
72d5551
Merge pull request #4491 from beutlich/backport-issue4486
AHaumer Oct 28, 2024
e510161
Remove extra comparisonSignals file that doesn't match an existing mo…
maltelenz Jan 7, 2025
e826418
Make propagation final of lifted parameters in Spring (#4407)
henrikt-ma Jan 17, 2025
4b0b69c
Add missing experiment annotations (#4516)
casella Jan 21, 2025
ebbb262
Merge pull request #4521 from maltelenz/backport4516
AHaumer Jan 21, 2025
d2592ea
Merge pull request #4520 from maltelenz/backport4407
AHaumer Jan 21, 2025
a1abb9c
Remove dead link to old OM wiki (#4501)
beutlich Jan 29, 2025
714237b
#refs #4301 Fix feature check macros for POSIX realpath (#4530)
beutlich Feb 13, 2025
7bec602
Apply the same solution as #4486 to the quasi-static example (#4534)
beutlich Feb 17, 2025
fe42634
Removed redundent text in celcius to kelvin icon (#4466)
qnikil7 Feb 20, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions .CI/Test/ModelicaUtilities.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* ModelicaUtilities.h - External utility functions header

Copyright (C) 2010-2020, Modelica Association and contributors
Copyright (C) 2010-2024, Modelica Association and contributors
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -31,14 +31,11 @@

/* Utility functions which can be called by external Modelica functions.

These functions are defined in section 12.8.6 of the
Modelica Specification 3.0 and section 12.9.6 of the
Modelica Specification 3.1 and later.
These functions are defined in section 12.9.6 of the Modelica Specification 3.6.

A generic C-implementation of these functions cannot be given,
because it is tool dependent how strings are output in a
window of the respective simulation tool. Therefore, only
this header file is shipped with the Modelica Standard Library.
console or window of the respective simulation tool.
*/

#ifndef MODELICA_UTILITIES_H
Expand Down Expand Up @@ -213,6 +210,11 @@ resources use, ModelicaError or ModelicaFormatError to signal
the error.
*/

#undef MODELICA_NORETURN
#undef MODELICA_NORETURNATTR
#undef MODELICA_FORMATATTR_PRINTF
#undef MODELICA_FORMATATTR_VPRINTF

#if defined(__cplusplus)
}
#endif
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/checkCI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 5
- name: Build libraries
Expand All @@ -34,11 +34,11 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 5
- name: Setup python environment
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install python packages
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 5
- name: Get moparser
Expand All @@ -86,11 +86,11 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 5
- name: Setup python environment
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Check deprecated Text.lineColor annotation
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/checkCron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
if: github.repository_owner == 'modelica'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 5
- name: Setup python environment
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install python packages
Expand All @@ -28,11 +28,11 @@ jobs:
if: github.repository_owner == 'modelica'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 5
- name: Setup python environment
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install python packages
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/generateReleaseNotes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:
timeout-minutes: 5
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
fetch-depth: 5
- name: Setup python environment
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8
- name: Install python packages
Expand All @@ -37,7 +37,7 @@ jobs:
DOCRAPTOR_API_KEY: ${{ secrets.DOCRAPTOR_API_KEY }}
DOCRAPTOR_TEST: ${{ github.event.inputs.watermark }}
run: python ./Modelica/Resources/Documentation/Generate-ReleaseNotes.py ${{ github.event.inputs.milestone }} ${{ github.event.inputs.version }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ResolvedGitHubIssues-Version-${{ github.event.inputs.version }}
path: ./Modelica/Resources/Documentation/Version-${{ github.event.inputs.version }}/
21 changes: 14 additions & 7 deletions Modelica/Blocks/Sources.mo
Original file line number Diff line number Diff line change
Expand Up @@ -1684,13 +1684,13 @@ parameter Real table[:, <strong>2</strong>]=[0, 0; 1, 1; 2, 4];
if verboseExtrapolation and (
extrapolation == Modelica.Blocks.Types.Extrapolation.LastTwoPoints or
extrapolation == Modelica.Blocks.Types.Extrapolation.HoldLastPoint) then
assert(noEvent(time >= t_min), "
Extrapolation warning: Time (=" + String(time) + ") must be greater or equal
than the minimum abscissa value t_min (=" + String(t_min) + ") defined in the table.
assert(noEvent(time >= t_min + shiftTime), "
Extrapolation warning: Time must be greater or equal
than the shifted minimum abscissa value defined in the table.
", level=AssertionLevel.warning);
assert(noEvent(time <= t_max), "
Extrapolation warning: Time (=" + String(time) + ") must be less or equal
than the maximum abscissa value t_max (=" + String(t_max) + ") defined in the table.
assert(noEvent(time <= t_max + shiftTime), "
Extrapolation warning: Time must be less or equal
than the shifted maximum abscissa value defined in the table.
", level=AssertionLevel.warning);
end if;

Expand Down Expand Up @@ -1840,7 +1840,7 @@ fileName is \"NoName\" or has only blanks.
</pre></blockquote></li>
<li><strong>Read</strong> from a <strong>file</strong> \"fileName\" where the matrix is stored as
\"tableName\". CSV, text and MATLAB MAT-file format is possible.
(The text format is described below).
(Both the limitations on the CSV format and the text format are described below).
The MAT-file format comes in four different versions: v4, v6, v7 and v7.3.
The library supports at least v4, v6 and v7 whereas v7.3 is optional.
It is most convenient to generate the MAT-file from FreeMat or MATLAB&reg;
Expand All @@ -1865,6 +1865,13 @@ When the constant \"NO_FILE_SYSTEM\" is defined, all file I/O related parts of t
source code are removed by the C-preprocessor, such that no access to files takes place.
</p>
<p>
If the table is read from a CSV file, the following limitations apply
</p>
<ol>
<li>Non-numeric data is not supported (in the lines following the header lines), even if such columns are excluded.</li>
<li>Double-quoted data entries in the first header line shall not contain the column delimiter.</li>
</ol>
<p>
If tables are read from a text file, the file needs to have the
following structure (\"-----\" is not part of the file content):
</p>
Expand Down
36 changes: 32 additions & 4 deletions Modelica/Blocks/Tables.mo
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ fileName is \"NoName\" or has only blanks.
</pre></blockquote></li>
<li><strong>Read</strong> from a <strong>file</strong> \"fileName\" where the matrix is stored as
\"tableName\". CSV, text and MATLAB MAT-file format is possible.
(The text format is described below).
(Both the limitations on the CSV format and the text format are described below).
The MAT-file format comes in four different versions: v4, v6, v7 and v7.3.
The library supports at least v4, v6 and v7 whereas v7.3 is optional.
It is most convenient to generate the MAT-file from FreeMat or MATLAB&reg;
Expand All @@ -202,6 +202,13 @@ When the constant \"NO_FILE_SYSTEM\" is defined, all file I/O related parts of t
source code are removed by the C-preprocessor, such that no access to files takes place.
</p>
<p>
If the table is read from a CSV file, the following limitations apply
</p>
<ol>
<li>Non-numeric data is not supported (in the lines following the header lines), even if such columns are excluded.</li>
<li>Double-quoted data entries in the first header line shall not contain the column delimiter.</li>
</ol>
<p>
If tables are read from a text file, the file needs to have the
following structure (\"-----\" is not part of the file content):
</p>
Expand Down Expand Up @@ -439,7 +446,7 @@ fileName is \"NoName\" or has only blanks.
</pre></blockquote></li>
<li><strong>Read</strong> from a <strong>file</strong> \"fileName\" where the matrix is stored as
\"tableName\". CSV, text and MATLAB MAT-file format is possible.
(The text format is described below).
(Both the limitations on the CSV format and the text format are described below).
The MAT-file format comes in four different versions: v4, v6, v7 and v7.3.
The library supports at least v4, v6 and v7 whereas v7.3 is optional.
It is most convenient to generate the MAT-file from FreeMat or MATLAB&reg;
Expand All @@ -466,6 +473,13 @@ When the constant \"NO_FILE_SYSTEM\" is defined, all file I/O related parts of t
source code are removed by the C-preprocessor, such that no access to files takes place.
</p>
<p>
If the table is read from a CSV file, the following limitations apply
</p>
<ol>
<li>Non-numeric data is not supported (in the lines following the header lines), even if such columns are excluded.</li>
<li>Double-quoted data entries in the first header line shall not contain the column delimiter.</li>
</ol>
<p>
If tables are read from a text file, the file needs to have the
following structure (\"-----\" is not part of the file content):
</p>
Expand Down Expand Up @@ -640,7 +654,7 @@ fileName is \"NoName\" or has only blanks.
</pre></blockquote></li>
<li><strong>Read</strong> from a <strong>file</strong> \"fileName\" where the matrix is stored as
\"tableName\". CSV, text and MATLAB MAT-file format is possible.
(The text format is described below).
(Both the limitations on the CSV format and the text format are described below).
The MAT-file format comes in four different versions: v4, v6, v7 and v7.3.
The library supports at least v4, v6 and v7 whereas v7.3 is optional.
It is most convenient to generate the MAT-file from FreeMat or MATLAB&reg;
Expand All @@ -667,6 +681,13 @@ When the constant \"NO_FILE_SYSTEM\" is defined, all file I/O related parts of t
source code are removed by the C-preprocessor, such that no access to files takes place.
</p>
<p>
If the table is read from a CSV file, the following limitations apply
</p>
<ol>
<li>Non-numeric data is not supported (in the lines following the header lines).</li>
<li>Double-quoted data entries in the first header line shall not contain the column delimiter.</li>
</ol>
<p>
If tables are read from a text file, the file needs to have the
following structure (\"-----\" is not part of the file content):
</p>
Expand Down Expand Up @@ -831,7 +852,7 @@ fileName is \"NoName\" or has only blanks.
</pre></blockquote></li>
<li><strong>Read</strong> from a <strong>file</strong> \"fileName\" where the matrix is stored as
\"tableName\". CSV, text and MATLAB MAT-file format is possible.
(The text format is described below).
(Both the limitations on the CSV format and the text format are described below).
The MAT-file format comes in four different versions: v4, v6, v7 and v7.3.
The library supports at least v4, v6 and v7 whereas v7.3 is optional.
It is most convenient to generate the MAT-file from FreeMat or MATLAB&reg;
Expand All @@ -858,6 +879,13 @@ When the constant \"NO_FILE_SYSTEM\" is defined, all file I/O related parts of t
source code are removed by the C-preprocessor, such that no access to files takes place.
</p>
<p>
If the table is read from a CSV file, the following limitations apply
</p>
<ol>
<li>Non-numeric data is not supported (in the lines following the header lines).</li>
<li>Double-quoted data entries in the first header line shall not contain the column delimiter.</li>
</ol>
<p>
If tables are read from a text file, the file needs to have the
following structure (\"-----\" is not part of the file content):
</p>
Expand Down
Loading