From 45b4fbc1d1fb5db5bdc8620e28c594148bf18410 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 20 Jan 2026 11:58:25 +0100 Subject: [PATCH 01/24] DUMMY: Only4PRTesting: add whitespaces to CombiTimeTable --- Modelica/Blocks/Sources.mo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 8fbd5f270a..efc97809c3 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1635,7 +1635,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; parameter SI.Time shiftTime=startTime "Shift time of first table column" annotation (Dialog(group="Table data interpretation")); - parameter Modelica.Blocks.Types.TimeEvents timeEvents=Modelica.Blocks.Types.TimeEvents.Always + parameter Modelica.Blocks.Types.TimeEvents timeEvents = Modelica.Blocks.Types.TimeEvents.Always "Time event handling of table interpolation" annotation (Dialog(group="Table data interpretation", enable=smoothness == Modelica.Blocks.Types.Smoothness.LinearSegments)); parameter Boolean verboseExtrapolation=false @@ -1650,7 +1650,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; final parameter Real t_maxScaled=Internal.getTimeTableTmax(tableID) "Maximum (scaled) abscissa value defined in table"; protected - final parameter Real p_offset[nout]=(if size(offset, 1) == 1 then ones(nout)*offset[1] else offset) + final parameter Real p_offset[nout] = (if size(offset, 1) == 1 then ones(nout)*offset[1] else offset) "Offsets of output signals"; parameter Modelica.Blocks.Types.ExternalCombiTimeTable tableID= Modelica.Blocks.Types.ExternalCombiTimeTable( From 3787f03cb44a97feb83939b77add62e29d389d1d Mon Sep 17 00:00:00 2001 From: Matthias Schaefer <86839591+MatthiasBSchaefer@users.noreply.github.com> Date: Thu, 5 Mar 2026 15:46:21 +0100 Subject: [PATCH 02/24] adding spaces in Sources.mo --- Modelica/Blocks/Sources.mo | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index efc97809c3..718977bebb 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1595,16 +1595,16 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; parameter Real table[:, :] = fill(0.0, 0, 2) "Table matrix (time = first column; e.g., table=[0, 0; 1, 1; 2, 4])" annotation (Dialog(group="Table data definition",enable=not tableOnFile)); - parameter String tableName="NoName" + parameter String tableName = "NoName" "Table name on file or in function usertab (see docu)" annotation (Dialog(group="Table data definition",enable=tableOnFile)); - parameter String fileName="NoName" "File where matrix is stored" + parameter String fileName = "NoName" "File where matrix is stored" annotation (Dialog( group="Table data definition", 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), @@ -1618,10 +1618,10 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; "Columns of table to be interpolated" annotation (Dialog(group="Table data interpretation", groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/CombiTimeTable.png")); - parameter Modelica.Blocks.Types.Smoothness smoothness=Modelica.Blocks.Types.Smoothness.LinearSegments + parameter Modelica.Blocks.Types.Smoothness smoothness = Modelica.Blocks.Types.Smoothness.LinearSegments "Smoothness of table interpolation" annotation (Dialog(group="Table data interpretation")); - parameter Modelica.Blocks.Types.Extrapolation extrapolation=Modelica.Blocks.Types.Extrapolation.LastTwoPoints + parameter Modelica.Blocks.Types.Extrapolation extrapolation = Modelica.Blocks.Types.Extrapolation.LastTwoPoints "Extrapolation of data outside the definition range" annotation (Dialog(group="Table data interpretation")); parameter SI.Time timeScale( From daf479fb2ae0c00db63c4321861a4f79be16697a Mon Sep 17 00:00:00 2001 From: Matthias Schaefer <86839591+MatthiasBSchaefer@users.noreply.github.com> Date: Thu, 12 Mar 2026 15:38:10 +0100 Subject: [PATCH 03/24] Update Continuous.mo removing empty spaces in Modelica.Blocks.Continuous.LimPID --- Modelica/Blocks/Continuous.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Continuous.mo b/Modelica/Blocks/Continuous.mo index bd3b79f9f1..fc168e718a 100644 --- a/Modelica/Blocks/Continuous.mo +++ b/Modelica/Blocks/Continuous.mo @@ -765,7 +765,7 @@ to compute u by an algebraic equation. "Control error (set point - measurement)"; parameter .Modelica.Blocks.Types.SimpleController controllerType= .Modelica.Blocks.Types.SimpleController.PID "Type of controller"; - parameter Real k = 1 "Gain of controller, must be non-zero"; + parameter Real k=1 "Gain of controller, must be non-zero"; parameter SI.Time Ti(min=Modelica.Constants.small)=0.5 "Time constant of Integrator block" annotation (Dialog(enable= controllerType == .Modelica.Blocks.Types.SimpleController.PI or From dc1f64ab96c3170556ef26da3cd378dd653ce032 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 10:35:58 +0100 Subject: [PATCH 04/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 718977bebb..1ab836d399 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1604,7 +1604,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; 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), From 56664ca45b11bb6fd24379df3023b5da753ae5ac Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 11:14:31 +0100 Subject: [PATCH 05/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 1ab836d399..edb92401cc 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1589,7 +1589,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; "Table look-up with respect to time and various interpolation and extrapolation methods (data from matrix/file)" import Modelica.Blocks.Tables.Internal; extends Modelica.Blocks.Interfaces.MO(final nout=max([size(columns, 1); size(offset, 1)])); - parameter Boolean tableOnFile=false + parameter Boolean tableOnFile = false "= true, if table is defined on file or in function usertab" annotation (Dialog(group="Table data definition")); parameter Real table[:, :] = fill(0.0, 0, 2) From 006484b783348c4586ac55341a11868939e51086 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 11:16:41 +0100 Subject: [PATCH 06/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index edb92401cc..81262c74c8 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1602,7 +1602,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; annotation (Dialog( group="Table data definition", enable=tableOnFile, - loadSelector(filter="Text files (*.txt);;MATLAB MAT-files (*.mat);;Comma-separated values files (*.csv)", + 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" annotation (Dialog( From 097ed04bb0cec2f900e4d409b8314796e7073fcd Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 11:45:51 +0100 Subject: [PATCH 07/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 81262c74c8..435c4f3b60 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1616,7 +1616,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; annotation (Dialog(group="Table data definition",enable=tableOnFile)); parameter Integer columns[:]=2:size(table, 2) "Columns of table to be interpolated" - annotation (Dialog(group="Table data interpretation", + annotation (Dialog(group = "Table data interpretation", groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/CombiTimeTable.png")); parameter Modelica.Blocks.Types.Smoothness smoothness = Modelica.Blocks.Types.Smoothness.LinearSegments "Smoothness of table interpolation" From 3e5e3d5c68cd30e68533b2bb71b703a562f6148f Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 11:51:54 +0100 Subject: [PATCH 08/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 435c4f3b60..cd5071d232 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1620,7 +1620,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; groupImage="modelica://Modelica/Resources/Images/Blocks/Sources/CombiTimeTable.png")); parameter Modelica.Blocks.Types.Smoothness smoothness = Modelica.Blocks.Types.Smoothness.LinearSegments "Smoothness of table interpolation" - annotation (Dialog(group="Table data interpretation")); + annotation (Dialog(group = "Table data interpretation")); parameter Modelica.Blocks.Types.Extrapolation extrapolation = Modelica.Blocks.Types.Extrapolation.LastTwoPoints "Extrapolation of data outside the definition range" annotation (Dialog(group="Table data interpretation")); From b58cc05265787287dee854a1ff21394e0b73b842 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 11:57:58 +0100 Subject: [PATCH 09/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index cd5071d232..3b7181c0f9 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1645,7 +1645,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; "Minimum abscissa value defined in table"; final parameter SI.Time t_max=t_maxScaled*timeScale "Maximum abscissa value defined in table"; - final parameter Real t_minScaled=Internal.getTimeTableTmin(tableID) + final parameter Real t_minScaled = Internal.getTimeTableTmin(tableID) "Minimum (scaled) abscissa value defined in table"; final parameter Real t_maxScaled=Internal.getTimeTableTmax(tableID) "Maximum (scaled) abscissa value defined in table"; From 55f710b74d937f745a29bd624544eef78f3dc11b Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 12:00:38 +0100 Subject: [PATCH 10/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 3b7181c0f9..fa35c881f0 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1638,7 +1638,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; parameter Modelica.Blocks.Types.TimeEvents timeEvents = Modelica.Blocks.Types.TimeEvents.Always "Time event handling of table interpolation" annotation (Dialog(group="Table data interpretation", enable=smoothness == Modelica.Blocks.Types.Smoothness.LinearSegments)); - parameter Boolean verboseExtrapolation=false + parameter Boolean verboseExtrapolation = false "= true, if warning messages are to be printed if time is outside the table definition range" annotation (Dialog(group="Table data interpretation", enable=extrapolation == Modelica.Blocks.Types.Extrapolation.LastTwoPoints or extrapolation == Modelica.Blocks.Types.Extrapolation.HoldLastPoint)); final parameter SI.Time t_min=t_minScaled*timeScale From cb30eddfe8800c64070bf49ae0027e19a8b5173e Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 12:03:41 +0100 Subject: [PATCH 11/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index fa35c881f0..79425b3a2c 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1641,7 +1641,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; parameter Boolean verboseExtrapolation = false "= true, if warning messages are to be printed if time is outside the table definition range" annotation (Dialog(group="Table data interpretation", enable=extrapolation == Modelica.Blocks.Types.Extrapolation.LastTwoPoints or extrapolation == Modelica.Blocks.Types.Extrapolation.HoldLastPoint)); - final parameter SI.Time t_min=t_minScaled*timeScale + final parameter SI.Time t_min = t_minScaled*timeScale "Minimum abscissa value defined in table"; final parameter SI.Time t_max=t_maxScaled*timeScale "Maximum abscissa value defined in table"; From 4dfa7aa1a252c280260e602d4ca576ac48e23f7e Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 12:09:59 +0100 Subject: [PATCH 12/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 79425b3a2c..68999bd006 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1629,7 +1629,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; annotation (Dialog(group="Table data interpretation"), Evaluate=true); parameter Real offset[:]={0} "Offsets of output signals" annotation (Dialog(group="Table data interpretation")); - parameter SI.Time startTime=0 + parameter SI.Time startTime = 0 "Output = offset for time < startTime" annotation (Dialog(group="Table data interpretation")); parameter SI.Time shiftTime=startTime From 3b296a4de9bf16d235ae872252aa55adb02a988a Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 12:20:30 +0100 Subject: [PATCH 13/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 68999bd006..c9cee435df 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1632,7 +1632,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; parameter SI.Time startTime = 0 "Output = offset for time < startTime" annotation (Dialog(group="Table data interpretation")); - parameter SI.Time shiftTime=startTime + parameter SI.Time shiftTime = startTime "Shift time of first table column" annotation (Dialog(group="Table data interpretation")); parameter Modelica.Blocks.Types.TimeEvents timeEvents = Modelica.Blocks.Types.TimeEvents.Always From d2dd5a3e0a5411507bfc1d5372a5ba22e5b875d6 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 12:24:39 +0100 Subject: [PATCH 14/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index c9cee435df..f56887ff02 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1625,7 +1625,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; "Extrapolation of data outside the definition range" annotation (Dialog(group="Table data interpretation")); parameter SI.Time timeScale( - min=Modelica.Constants.eps)=1 "Time scale of first table column" + min=Modelica.Constants.eps) = 1 "Time scale of first table column" annotation (Dialog(group="Table data interpretation"), Evaluate=true); parameter Real offset[:]={0} "Offsets of output signals" annotation (Dialog(group="Table data interpretation")); From beb2cd21de50c88b8639386fcc9b17286ca73c11 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 12:36:43 +0100 Subject: [PATCH 15/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index f56887ff02..d4fd9d9286 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1643,7 +1643,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; annotation (Dialog(group="Table data interpretation", enable=extrapolation == Modelica.Blocks.Types.Extrapolation.LastTwoPoints or extrapolation == Modelica.Blocks.Types.Extrapolation.HoldLastPoint)); final parameter SI.Time t_min = t_minScaled*timeScale "Minimum abscissa value defined in table"; - final parameter SI.Time t_max=t_maxScaled*timeScale + final parameter SI.Time t_max = t_maxScaled*timeScale "Maximum abscissa value defined in table"; final parameter Real t_minScaled = Internal.getTimeTableTmin(tableID) "Minimum (scaled) abscissa value defined in table"; From 5118516d55938b69f9feb0ae9af3678b99d3964c Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 13:52:25 +0100 Subject: [PATCH 16/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index d4fd9d9286..97cc4dfc09 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1647,7 +1647,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; "Maximum abscissa value defined in table"; final parameter Real t_minScaled = Internal.getTimeTableTmin(tableID) "Minimum (scaled) abscissa value defined in table"; - final parameter Real t_maxScaled=Internal.getTimeTableTmax(tableID) + final parameter Real t_maxScaled = Internal.getTimeTableTmax(tableID) "Maximum (scaled) abscissa value defined in table"; protected final parameter Real p_offset[nout] = (if size(offset, 1) == 1 then ones(nout)*offset[1] else offset) From fb6e97069e98415efe8e64c30d26bcf77e3b7522 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 14:08:02 +0100 Subject: [PATCH 17/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 97cc4dfc09..46464982c8 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1652,7 +1652,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; protected final parameter Real p_offset[nout] = (if size(offset, 1) == 1 then ones(nout)*offset[1] else offset) "Offsets of output signals"; - parameter Modelica.Blocks.Types.ExternalCombiTimeTable tableID= + parameter Modelica.Blocks.Types.ExternalCombiTimeTable tableID = Modelica.Blocks.Types.ExternalCombiTimeTable( if tableOnFile then if isCsvExt then "Values" else tableName else "NoName", if tableOnFile and fileName <> "NoName" and not Modelica.Utilities.Strings.isEmpty(fileName) then fileName else "NoName", From eca8daf568782c9facc46cdeb8b798fd4897e613 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 14:36:47 +0100 Subject: [PATCH 18/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 46464982c8..f85e6555e7 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1666,7 +1666,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; if tableOnFile then verboseRead else false, delimiter, nHeaderLines) "External table object"; - discrete SI.Time nextTimeEvent(start=0, fixed=true) + discrete SI.Time nextTimeEvent(start = 0, fixed=true) "Next time event instant"; discrete Real nextTimeEventScaled(start=0, fixed=true) "Next scaled time event instant"; From 9658af495358f76daaf0ff8436440ff83308c633 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 14:57:27 +0100 Subject: [PATCH 19/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index f85e6555e7..bf82214d79 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1668,7 +1668,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; nHeaderLines) "External table object"; discrete SI.Time nextTimeEvent(start = 0, fixed=true) "Next time event instant"; - discrete Real nextTimeEventScaled(start=0, fixed=true) + discrete Real nextTimeEventScaled(start = 0, fixed=true) "Next scaled time event instant"; Real timeScaled "Scaled time"; final parameter Boolean isCsvExt = if tableOnFile then Modelica.Utilities.Strings.findLast(fileName, ".csv", caseSensitive=false) + 3 == Modelica.Utilities.Strings.length(fileName) else false; From eac62d8ed38c60c9fb4c5f68a5d8587889d10262 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 15:11:20 +0100 Subject: [PATCH 20/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index bf82214d79..6a487684ee 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1625,7 +1625,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; "Extrapolation of data outside the definition range" annotation (Dialog(group="Table data interpretation")); parameter SI.Time timeScale( - min=Modelica.Constants.eps) = 1 "Time scale of first table column" + min = Modelica.Constants.eps) = 1 "Time scale of first table column" annotation (Dialog(group="Table data interpretation"), Evaluate=true); parameter Real offset[:]={0} "Offsets of output signals" annotation (Dialog(group="Table data interpretation")); From e8df556c82532a71c42136a963b1faa3025c7c31 Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 15:31:28 +0100 Subject: [PATCH 21/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 6a487684ee..9332871595 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1629,7 +1629,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; annotation (Dialog(group="Table data interpretation"), Evaluate=true); parameter Real offset[:]={0} "Offsets of output signals" annotation (Dialog(group="Table data interpretation")); - parameter SI.Time startTime = 0 + parameter SI.Time startTime = 0 "Output = offset for time < startTime" annotation (Dialog(group="Table data interpretation")); parameter SI.Time shiftTime = startTime From afdd24645291a24743a05ac7a04a8cf5c40922ed Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Thu, 26 Mar 2026 15:46:06 +0100 Subject: [PATCH 22/24] add further space to Modelica.Blocks.Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 9332871595..697445d004 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1627,7 +1627,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; parameter SI.Time timeScale( min = Modelica.Constants.eps) = 1 "Time scale of first table column" annotation (Dialog(group="Table data interpretation"), Evaluate=true); - parameter Real offset[:]={0} "Offsets of output signals" + parameter Real offset[:] = {0} "Offsets of output signals" annotation (Dialog(group="Table data interpretation")); parameter SI.Time startTime = 0 "Output = offset for time < startTime" From a104f2f58249e811200ac9551f0628880273166e Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Fri, 27 Mar 2026 14:26:25 +0100 Subject: [PATCH 23/24] added some more spaces to Modelica\Blocks\Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 697445d004..12e003d57c 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1597,7 +1597,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; annotation (Dialog(group="Table data definition",enable=not tableOnFile)); parameter String tableName = "NoName" "Table name on file or in function usertab (see docu)" - annotation (Dialog(group="Table data definition",enable=tableOnFile)); + annotation (Dialog(group = "Table data definition",enable=tableOnFile)); parameter String fileName = "NoName" "File where matrix is stored" annotation (Dialog( group="Table data definition", From c33cb0fd91ef3124bc24956734474c4a09580d0c Mon Sep 17 00:00:00 2001 From: Matthias Schaefer Date: Fri, 27 Mar 2026 14:35:23 +0100 Subject: [PATCH 24/24] added some more spaces to Modelica\Blocks\Sources.mo --- Modelica/Blocks/Sources.mo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modelica/Blocks/Sources.mo b/Modelica/Blocks/Sources.mo index 12e003d57c..9998bf3bc1 100644 --- a/Modelica/Blocks/Sources.mo +++ b/Modelica/Blocks/Sources.mo @@ -1594,7 +1594,7 @@ parameter Real table[:, 2]=[0, 0; 1, 1; 2, 4]; annotation (Dialog(group="Table data definition")); parameter Real table[:, :] = fill(0.0, 0, 2) "Table matrix (time = first column; e.g., table=[0, 0; 1, 1; 2, 4])" - annotation (Dialog(group="Table data definition",enable=not tableOnFile)); + annotation (Dialog(group = "Table data definition",enable=not tableOnFile)); parameter String tableName = "NoName" "Table name on file or in function usertab (see docu)" annotation (Dialog(group = "Table data definition",enable=tableOnFile));