Skip to content

Fix formatting of nout parameter in CombiTable1Ds #4

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.

Sign up for GitHub

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

Open
MatthiasBSchaefer wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix formatting of nout parameter in CombiTable1Ds #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8325058
Fix formatting of nout parameter in CombiTable1Ds
MatthiasBSchaefer Jul 20, 2026
c0592d1
Fix comment formatting in ModelicaIO.c
MatthiasBSchaefer Jul 21, 2026
e8d08cc
Fix formatting of delimiter parameter declaration
MatthiasBSchaefer Jul 22, 2026
37900ca
Add comment to ModelicaIO.c header
MatthiasBSchaefer Jul 22, 2026
55d59e5
Update comment from 'stupid' to 'smart'
MatthiasBSchaefer Jul 22, 2026
58d4ea0
Update header with changelog entry
MatthiasBSchaefer Jul 22, 2026
eea5f01
Fix formatting of temperature coefficient parameter
MatthiasBSchaefer Jul 22, 2026
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
4 changes: 2 additions & 2 deletions Modelica/Blocks/Tables.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package Tables
extends Modelica.Icons.Package;
block CombiTable1Ds
"Table look-up in one dimension (matrix/file) with one input and n outputs"
extends Modelica.Blocks.Interfaces.SIMO(final nout=size(columns, 1));
extends Modelica.Blocks.Interfaces.SIMO(final nout = size(columns, 1));
parameter Boolean tableOnFile=false
"= true, if table is defined on file or in function usertab"
annotation (Dialog(group="Table data definition"));
Expand All @@ -20,7 +20,7 @@ package Tables
enable=tableOnFile,
loadSelector(filter="Text files (*.txt);;MATLAB MAT-files (*.mat);;Comma-separated values files (*.csv)",
caption="Open file in which table is present")));
parameter String delimiter="," "Column delimiter character for CSV file"
parameter String delimiter = "," "Column delimiter character for CSV file"
annotation (Dialog(
group="Table data definition",
enable=tableOnFile and isCsvExt),
Expand Down
2 changes: 1 addition & 1 deletion Modelica/Electrical/Analog/Basic/Resistor.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ model Resistor "Ideal linear electrical resistor"
parameter SI.Resistance R(start=1)
"Resistance at temperature T_ref";
parameter SI.Temperature T_ref=300.15 "Reference temperature";
parameter SI.LinearTemperatureCoefficient alpha=0
parameter SI.LinearTemperatureCoefficient alpha= 0.0
"Temperature coefficient of resistance (R_actual = R*(1 + alpha*(T_heatPort - T_ref)))";

extends Modelica.Electrical.Analog.Interfaces.OnePort;
Expand Down
6 changes: 5 additions & 1 deletion Modelica/Resources/C-Sources/ModelicaIO.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* ModelicaIO.c - Array I/O functions
/* ModelicaIO.c - Array I/O functions

Copyright (C) 2016-2025, Modelica Association and contributors
All rights reserved.
Expand Down Expand Up @@ -27,6 +27,7 @@
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
JUST A SMART COMMENT
*/

/* Definition of interface to external functions for array I/O
Expand All @@ -37,6 +38,9 @@
Modelica.Utilities.Streams.writeRealMatrix

Changelog:
July 22, 2026: by Matthias Schaefer
update header

Nov. 27, 2021: by Thomas Beutlich
Fixed error handling for invalid format specifier in
text file (ticket #3903)
Expand Down
Loading