Skip to content

Commit 4fd9d39

Browse files
committed
Merge branch 'main' of https://github.com/ThummeTo/FMI.jl into v0.14.0
2 parents 068723b + 765a88c commit 4fd9d39

12 files changed

+5300
-13
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
|---|---|
99
| Documentation | [![Build Docs](https://github.com/ThummeTo/FMI.jl/actions/workflows/Documentation.yml/badge.svg)](https://github.com/ThummeTo/FMI.jl/actions/workflows/Documentation.yml) [![Dev Docs](https://img.shields.io/badge/docs-dev-blue.svg)](https://ThummeTo.github.io/FMI.jl/dev) |
1010
| Examples | [![Examples (latest)](https://github.com/ThummeTo/FMI.jl/actions/workflows/Example.yml/badge.svg)](https://github.com/ThummeTo/FMI.jl/actions/workflows/Example.yml) |
11-
| Tests | [![Test (latest)](https://github.com/ThummeTo/FMI.jl/actions/workflows/TestLatest.yml/badge.svg)](https://github.com/ThummeTo/FMI.jl/actions/workflows/TestLatest.yml) [![Test (LTS)](https://github.com/ThummeTo/FMI.jl/actions/workflows/TestLTS.yml/badge.svg)](https://github.com/ThummeTo/FMI.jl/actions/workflows/TestLTS.yml) |
11+
| Tests | [![Test (latest)](https://github.com/ThummeTo/FMI.jl/actions/workflows/TestLatest.yml/badge.svg)](https://github.com/ThummeTo/FMI.jl/actions/workflows/TestLatest.yml) [![Test (LTS)](https://github.com/ThummeTo/FMI.jl/actions/workflows/TestLTS.yml/badge.svg)](https://github.com/ThummeTo/FMI.jl/actions/workflows/TestLTS.yml) [![Aqua QA](https://raw.githubusercontent.com/JuliaTesting/Aqua.jl/master/badge.svg)](https://github.com/JuliaTesting/Aqua.jl) |
1212
| FMI cross checks| [![FMI2 Cross Checks](https://github.com/ThummeTo/FMI.jl/actions/workflows/CrossChecks.yml/badge.svg)](https://github.com/ThummeTo/FMI.jl/actions/workflows/CrossChecks.yml) |
1313
| Package evaluation| [![Run PkgEval](https://github.com/ThummeTo/FMI.jl/actions/workflows/Eval.yml/badge.svg)](https://github.com/ThummeTo/FMI.jl/actions/workflows/Eval.yml) |
1414
| Code coverage | [![Coverage](https://codecov.io/gh/ThummeTo/FMI.jl/branch/main/graph/badge.svg)](https://codecov.io/gh/ThummeTo/FMI.jl) |

docs/src/deprecated.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# deprecated Functions
22

3-
this doc page is necessary as all exported functions must be documented in the manual with documenter configred to check for missing documentation, therefor this hidden page exists
3+
this doc page is necessary as all exported functions must be documented in the manual with documenter configured to check for missing documentation, therefor this hidden page exists
44

5-
### internal funtions: remove export?
5+
### internal functions: remove export?
66
```@docs
77
fmi2CallbackLogger
88
fmi2CallbackAllocateMemory

docs/src/faq.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This list some common - often numerical - errors, that can be fixed by better un
55

66
----------
77

8-
## Solving non-linear system failes
8+
## Solving non-linear system fails
99
### Description
1010
Error message or warning, that solving of a non-linear system failed, close to the simulation start time.
1111

@@ -60,6 +60,6 @@ This can be solved by allowing for more interpolation points during searching of
6060
fmu.executionConfig.rootSearchInterpolationPoints = 1000 # default value is 10
6161
```
6262
This will have negative performance impact on systems with extreme amount of events (thousands per second).
63-
For systems with only a few events there won't be a noticable slow down.
63+
For systems with only a few events there won't be a noticeable slow down.
6464

6565
----------

docs/src/features.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For a more detailed overview, please see the `?FMUExecutionConfig`.
1818
### Logging FMI-calls
1919
To log all FMI-calls that happen (including "hidden" calls e.g. if you are using `simulate`) you can enable debugging for *FMICore.jl* using `ENV["JULIA_DEBUG"] = "FMICore"`. This will log any `fmi2xxx`- and `fmi3xxx`-call, including the given parameters and return value. This can be *a lot* of calls, so you may want to redirect your REPL output to file.
2020
### Printing internal FMU messages
21-
Many FMUs support for printing debugging messages. To force message printing, you can use the keyword `logginOn=true` either ...
21+
Many FMUs support for printing debugging messages. To force message printing, you can use the keyword `loggingOn=true` either ...
2222
- in the call `fmiInstantiate`, for example `fmiInstantiate(myFMU; loggingOn=true)` or
2323
- as part of the `executionConfig`, for example `myFMU.executionConfig.loggingOn=true`
2424
You can further control which message types - like `OK`, `Warning`, `Discard`, `Error`, `Fatal`, `Pending` - should be logged by using the keywords `logStatus{TYPE}=true` as part of `fmiInstantiate` or (soon) the execution configuration. By default, all are activated.
@@ -63,7 +63,7 @@ Of course, you have to use the same piece of memory (to write your return values
6363
**Views:** You can use [array-views](https://docs.julialang.org/en/v1/base/arrays/#Views-(SubArrays-and-other-view-types)) instead of array-slices as input for in-place-functions, which further reduces memory allocations.
6464

6565
## AD-Ecosystem (differentiation over FMUs)
66-
Sensitivites over FMUs are fully integrated into *FMI.jl*, *FMIImport.jl* and *FMIFlux.jl*. Supported are *ForwardDiff.jl* together with all AD-frameworks, that use the interface of *ChainRules.jl* like e.g. *Zygote.jl* and *ReverseDiff.jl*. As a result, you can use implicite solvers or you can use FMUs as part of machine learning applications.
66+
Sensitivites over FMUs are fully integrated into *FMI.jl*, *FMIImport.jl* and *FMIFlux.jl*. Supported are *ForwardDiff.jl* together with all AD-frameworks, that use the interface of *ChainRules.jl* like e.g. *Zygote.jl* and *ReverseDiff.jl*. As a result, you can use implicit solvers or you can use FMUs as part of machine learning applications.
6767

6868
## Watch your progress
6969
When simulating FMUs with *FMI.jl*, a progress meter is shown per default. You can control the appearance via the keyword argument `showProgress` for `simulate`, `simulateME`, `simulateCS` and `simulateSE`.

docs/src/fmi-tool-info.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ FMI3 is for now only beta supported and information will be deployed together wi
77
## FMI-2.0
88
*FMI.jl* and *FMIImport.jl* are validated by simulating **all valid** FMI2-FMUs from the official [FMI-Cross-Check](https://github.com/modelica/fmi-cross-check) in ME- as well as in CS-Mode, excluding the tools *AMESim*, *Test-FMUs*, *SimulationX* and *Silver*.
99
For more information see [our automated GitHub-Action](https://github.com/ThummeTo/FMI.jl/tree/main/cross_checks). The results files - as defined by the FMI Cross Check - can be found in [the forked repository](https://github.com/ThummeTo/fmi-cross-check/tree/master) inside of the corresponding sub folders.
10-
There are different branches for different OS-configurations avalibale.
10+
There are different branches for different OS-configurations available.
1111

1212
# FMU Export Compatibility information (*FMIExport.jl*)
1313
Detailed export information and automatically generated FMUs will be deployed soon in the repository.

docs/src/fmi2_lowlevel_modeldescription_functions.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Working with the FMI model description
22

3-
The FMI model description provides all human readable information on the model. The following fuctions can be used to obtain all information provided by the model descripton, wich in turn can be extrated from the fmu.
3+
The FMI model description provides all human readable information on the model. The following functions can be used to obtain all information provided by the model description, which in turn can be extracted from the fmu.
44

55
## Loading/Parsing
66

@@ -19,7 +19,7 @@ fmi2GetGenerationTool
1919
fmi2GetGenerationDateAndTime
2020
```
2121

22-
## tecnical information about the FMU
22+
## technical information about the FMU
2323

2424
```@docs
2525
fmi2GetModelIdentifier

docs/src/fmi3_lowlevel_modeldescription_functions.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Working with the FMI model description
22

3-
The FMI model description provides all human readable information on the model. The following fuctions can be used to obtain all information provided by the model descripton, wich in turn can be extrated from the fmu.
3+
The FMI model description provides all human readable information on the model. The following functions can be used to obtain all information provided by the model description, which in turn can be extracted from the fmu.
44

55
## Loading/Parsing
66

@@ -20,7 +20,7 @@ fmi3GetGenerationTool
2020
fmi3GetGenerationDateAndTime
2121
```
2222

23-
## tecnical information about the FMU
23+
## technical information about the FMU
2424

2525
```@docs
2626
fmi3GetModelIdentifier

0 commit comments

Comments
 (0)