diff --git a/Modelica/Blocks/Tables.mo b/Modelica/Blocks/Tables.mo index 50e38d1d56..2a89e8f1b4 100644 --- a/Modelica/Blocks/Tables.mo +++ b/Modelica/Blocks/Tables.mo @@ -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")); @@ -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), diff --git a/Modelica/Electrical/Analog/Basic/Resistor.mo b/Modelica/Electrical/Analog/Basic/Resistor.mo index d1e388a86b..cf5e501973 100644 --- a/Modelica/Electrical/Analog/Basic/Resistor.mo +++ b/Modelica/Electrical/Analog/Basic/Resistor.mo @@ -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; diff --git a/Modelica/Resources/C-Sources/ModelicaIO.c b/Modelica/Resources/C-Sources/ModelicaIO.c index 4d5472763d..a9651c89ef 100644 --- a/Modelica/Resources/C-Sources/ModelicaIO.c +++ b/Modelica/Resources/C-Sources/ModelicaIO.c @@ -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. @@ -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 @@ -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)