Skip to content

Commit eed07d2

Browse files
Merge branch 'main' of github.com:modelica/fmi-standard into v3.0.x
2 parents f869a54 + c682b28 commit eed07d2

36 files changed

+208
-149
lines changed
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
---
2+
name: Issue
3+
about: File an issue
4+
---
5+
16
<!--
27
38
This project is used for the development of the FMI Standard (https://fmi-standard.org/)
File renamed without changes.

.github/workflows/build-spec.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-20.04
1919
steps:
2020

21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4.1.7
2222

2323
- name: Build code snippets
2424
run: |
@@ -31,13 +31,13 @@ jobs:
3131
runs-on: windows-2022
3232
steps:
3333

34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4.1.7
3535

3636
- run: |
3737
PowerShell -ExecutionPolicy Bypass -Command ./generate_figures.ps1
3838
3939
- name: Create ZIP archive
40-
uses: actions/upload-artifact@v3
40+
uses: actions/upload-artifact@v4.4.0
4141
with:
4242
name: schema-figures
4343
path: docs/images/schema/*.png
@@ -49,11 +49,11 @@ jobs:
4949
steps:
5050

5151
- name: Checkout
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4.1.7
5353
with:
5454
submodules: recursive
5555

56-
- uses: actions/download-artifact@v3
56+
- uses: actions/download-artifact@v4.1.8
5757
with:
5858
name: schema-figures
5959
path: docs/images/schema
@@ -88,7 +88,7 @@ jobs:
8888
cp docs/images/schema/*.png build/images/schema
8989
9090
- name: Create ZIP archive
91-
uses: actions/upload-artifact@v3
91+
uses: actions/upload-artifact@v4.4.0
9292
with:
9393
name: FMI-Specification
9494
path: build/*

CONTRIBUTING.adoc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ If you haven't already done so https://help.github.com/articles/cloning-a-reposi
2121
or your favorite Git client.
2222
To build the HTML document you have two alternatives.
2323

24+
To open the repository in https://www.gitpod.io/[Gitpod], https://github.com/modelica/fmi-standard/fork[fork] the repository and open `https://gitpod.io/#https://github.com/<your-github-user-name>/fmi-standard`.
25+
2426
`Alternative 1:` Docker (recommended)
2527

2628
. Install https://www.docker.com/get-started[Docker]
@@ -259,12 +261,11 @@ master
259261
Follow these steps to create a (pre-)release:
260262

261263
* update the FMI version in the schema, XML examples, and header files
262-
* update <<CHANGELOG.adoc#,CHANGELOG.adoc>>
263-
* download the `fmi-standard.zip` artifact from https://circleci.com/gh/modelica/fmi-standard[CirleCI] and check for completeness
264+
* download the `fmi-standard.zip` artifact from https://github.com/modelica/fmi-standard/actions and check for completeness
264265
* create a tag on `master` (e.g. `v3.0-rc.1`) and push it together with a commit to trigger the CI
265266
* create a new https://github.com/modelica/fmi-standard/releases[release] on GitHub for the tag
266267
** check `This a pre-release` if it's not the final release
267-
** add the text from `CHANGELOG.adoc`
268+
** add a description of the changes
268269
** add the version to `fmi-standard.zip` (e.g. `fmi-standard-3.0-rc.1.zip`) and upload it to the release
269270

270271
== Corporate Contributor License Agreement

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Copyright (C) 2008-2011 MODELISAR consortium,
2-
2012-2023 Modelica Association Project "FMI"
2+
2012-2024 Modelica Association Project "FMI"
33
All rights reserved.
44

55
Source code or other data, such as C-header and XML-schema files, that

README.adoc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ The following https://github.com/modelica/fmi-standard/blob/main/docs/2_6_versio
2727
- https://github.com/modelica/fmi-ls-xcp[XCP] -- information for calibration and measurement
2828
- https://github.com/modelica/fmi-ls-bus[Network Communication] -- mapping of variables to buses
2929
- https://github.com/modelica/fmi-ls-struct[Structure] -- semantic grouping of variables
30+
- https://github.com/modelica/fmi-ls-ref[REF] -- stimuli and reference results
3031

3132
== Copyright and License
3233

33-
Code and documentation copyright (C) 2008-2011 the MODELISAR consortium and 2012-2023 the Modelica Association Project FMI.
34+
Code and documentation copyright (C) 2008-2011 the MODELISAR consortium and 2012-2024 the Modelica Association Project FMI.
3435
Code released under the https://opensource.org/licenses/BSD-2-Clause[2-Clause BSD License].
3536
Docs released under https://creativecommons.org/licenses/by-sa/4.0/[Attribution-ShareAlike 4.0 International].

docs/0___preamble.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
The https://fmi-standard.org/[Functional Mock-up Interface (FMI)] is a free standard that defines a container and an interface to exchange dynamic models using a combination of XML files, binaries and C code, distributed as a ZIP file.
2-
[[MAP,MAP]]It is supported by https://fmi-standard.org/tools/[more than 170 tools] and maintained as a https://www.modelica.org/projects[Modelica Association Project] (MAP FMI).
2+
[[MAP,MAP]]It is supported by https://fmi-standard.org/tools/[more than 200 tools] and maintained as a https://www.modelica.org/projects[Modelica Association Project] (MAP FMI).
33
https://github.com/modelica/fmi-standard/releases[Releases] and https://github.com/modelica/fmi-standard/issues[issues] can be found on https://github.com/modelica/fmi-standard[github.com/modelica/fmi-standard].
44

55
{empty} +
66
{empty}
77

8-
Copyright (C) 2008-2011 MODELISAR Consortium and 2012-2023 The Modelica Association Project FMI.
8+
Copyright (C) 2008-2011 MODELISAR Consortium and 2012-2024 The Modelica Association Project FMI.
99

1010
This document is licensed under the Attribution-ShareAlike 4.0 International license.
1111
The code is released under the 2-Clause BSD License.

docs/1___overview.adoc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ The following features have been removed:
4343

4444
* The asynchronous mode for FMUs known from FMI 2.0 CS: this mode was not supported by tools and it can be suitably replaced by Co-Simulation implementations that control the asynchronous computation of FMUs via separate processes/threads created for each FMU.
4545

46-
* The FMI `fmi2SetRealInputDerivatives` function: replaced by enabling the setting of inputs in <<IntermediateUpdateMode>>.
46+
* The FMI function `fmi2SetRealInputDerivatives`: replaced by enabling the setting of inputs in <<IntermediateUpdateMode>>.
4747

4848
Parallel to the new standard features, the FMI Design Community has improved the standard quality by:
4949

5050
* modernizing the development methodology (e.g. moving to github and following the github process) and a text-based source format,
5151

52-
* publishing the FMI Standard now primarily as html to support easier navigation within the document and viewing on a wider range of devices,
52+
* publishing the FMI Standard now primarily as HTML to support easier navigation within the document and viewing on a wider range of devices,
5353

5454
* supplying a large set of continuously validated Reference FMUs, and
5555

5656
* integrating within the FMI Standard only validated C-code, XML and XSD snippets to reduce redundancy and ensure correctness.
5757

5858

59-
==== Changes in FMI 3.0.1 [[fmi-301]]
59+
==== Changes in FMI 3.0.x
6060

61-
Clarifications and fixes in FMI 3.0.1 are listed in the https://github.com/modelica/fmi-standard/releases[Release notes on Github.]
61+
Clarifications and fixes of all FMI 3.0 patch releases (FMI 3.0.x) are listed in the https://github.com/modelica/fmi-standard/releases[release notes on GitHub].
6262

6363
=== Overview
6464

@@ -119,6 +119,7 @@ image::images/co-simulation-data-flow.svg[width=40%, align="center"]
119119
The Scheduled Execution interface exposes individual <<model-partition, model partitions>>.
120120
A scheduler provided by the <<importer>> can control the execution of each model partition separately.
121121
In some ways the Scheduled Execution interface has similarities to the Model Exchange interface: the first externalizes a scheduling algorithm usually found in a controller algorithm (see <<fmi-for-scheduled-execution>>) and the second interface externalizes the ODE/DAE solver.
122+
_[See also https://modelica.github.io/fmi-guides/main/fmi-guide/#_use_cases_for_scheduled_execution[Use-cases for Scheduled Execution] in the FMI 3.0 Implementers' Guide.]_
122123

123124
.Schematic view of data flow between user, the scheduler of the importer and model partitions of the FMU for Scheduled Execution
124125
[#figure-scheduled-execution-data-flow]
@@ -290,7 +291,7 @@ Allocator must free::
290291
All memory (and other resources) allocated by the FMU are freed (released) by the FMU.
291292
Likewise, resources allocated by the importer are released by the importer.
292293
+
293-
Reason: this helps to prevent memory leaks and runtime errors due to incompatible runtime environments for different components.
294+
Reason: This helps to prevent memory leaks and runtime errors due to incompatible runtime environments for different components.
294295

295296
Immutable strings::
296297
All strings passed as arguments or returned are read-only and must not be modified by the receiver.

docs/2_1_common_math.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ An ordering is defined on latexmath:[\mathbb{\text{T}}] that leads to the notati
2626
|Description
2727

2828
^|latexmath:[t_1 < t_2]
29-
|latexmath:[(t_{\mathit{R1}},t_{\mathit{I1}}) < (t_{\mathit{R2}}, t_{\mathit{I2}})\ \Leftrightarrow \ t_{\mathit{R1}} < t_{\mathit{R2}}\ \textbf{or} \ t_{\mathit{R1}}= t_{\mathit{R2}} \ \textbf{and} \ t_{\mathit{I1}} < t_{\mathit{I2}}]
29+
|latexmath:[(t_{\mathit{R}\hspace{0.1em}1},t_{\mathit{I}\hspace{0.1em}1}) < (t_{\mathit{R}\hspace{0.1em}2}, t_{\mathit{I}\hspace{0.1em}2})\ \Leftrightarrow \ t_{\mathit{R}\hspace{0.1em}1} < t_{\mathit{R}\hspace{0.1em}2}\ \textbf{or} \ ( t_{\mathit{R}\hspace{0.1em}1}= t_{\mathit{R}\hspace{0.1em}2} \ \textbf{and} \ t_{\mathit{I}\hspace{0.1em}1} < t_{\mathit{I}\hspace{0.1em}2}] )
3030
|latexmath:[t_1] is before latexmath:[t_2]
3131

3232
^|latexmath:[t_1 = t_2]
33-
|latexmath:[(t_{\mathit{R1}},t_{\mathit{I1}}) = (t_{\mathit{R2}},t_{\mathit{I2}}) \ \Leftrightarrow t_{\mathit{R1}}= t_{\mathit{R2}}\ \textbf{and} \ t_{\mathit{I1}} = t_{\mathit{I2}}]
33+
|latexmath:[(t_{\mathit{R}\hspace{0.1em}1},t_{\mathit{I}\hspace{0.1em}1}) = (t_{\mathit{R}\hspace{0.1em}2},t_{\mathit{I}\hspace{0.1em}2}) \ \Leftrightarrow t_{\mathit{R}\hspace{0.1em}1}= t_{\mathit{R}\hspace{0.1em}2}\ \textbf{and} \ t_{\mathit{I}\hspace{0.1em}1} = t_{\mathit{I}\hspace{0.1em}2}]
3434
|latexmath:[t_1] is identical to latexmath:[t_2]
3535

3636
^|latexmath:[t^{+}]
37-
|latexmath:[{(t_R,t_I)}^{+} \Leftrightarrow (\lim_{\mathit{\epsilon \rightarrow 0}}{\left(t_R + \varepsilon \right),t_{\mathit{Imax}})}]
37+
|latexmath:[{(t_R,t_I)}^{+} \Leftrightarrow (\lim_{\mathit{\varepsilon \rightarrow 0}}{\left(t_R + \varepsilon \right),t_{\mathit{Imax}})}]
3838
|right limit at latexmath:[t].
3939
latexmath:[t_{\mathit{Imax}}] is the largest occurring integer index of super-dense time at this latexmath:[t_R]
4040

4141
^|latexmath:[^-t]
42-
|latexmath:[^{-}{(t_R,t_I)} \Leftrightarrow (\lim_{\mathit{\epsilon \rightarrow 0}}{\left( t_R - \varepsilon \right),0)}]
42+
|latexmath:[^{-}{(t_R,t_I)} \Leftrightarrow (\lim_{\mathit{\varepsilon \rightarrow 0}}{\left( t_R - \varepsilon \right),0)}]
4343
|left limit at latexmath:[t]
4444

4545
^|latexmath:[v^+(t)]
@@ -58,9 +58,9 @@ latexmath:[t_{\mathit{Imax}}] is the largest occurring integer index of super-de
5858
\end{cases}
5959
\Leftrightarrow
6060
\begin{cases}
61-
v(^-t) & \text{ during } v(\left( t_R, 0 \right)) \text{, v not clocked } \\
62-
v(\left( t_R,t_I - 1 \right)) & \text{ for } v(\left( t_R,t_I \right)) \text{ with } I > 0 \text{, v not clocked } \\
63-
v \text{ at previous tick of k } & \text{ if } v \text{ for clocked variable } v \text{ of clock k}
61+
v(^-t) & \text{ during } v(\left( t_R, 0 \right)) \text{, } v \text{ not clocked } \\
62+
v(\left( t_R,t_I - 1 \right)) & \text{ for } v(\left( t_R,t_I \right)) \text{ with } t_I > 0 \text{, } v \text{ not clocked } \\
63+
v \text{ at previous tick of k } & \text{ if } v \text{ is a clocked variable of clock k}
6464
\end{cases}
6565
]
6666
a|previous value

0 commit comments

Comments
 (0)