Merge branch 'main' into main

Project.toml

@@ -1,10 +1,9 @@
 name = "FMI"
 uuid = "14a09403-18e3-468f-ad8a-74f8dda2d9ac"
 authors = ["TT <tobias.thummerer@informatik.uni-augsburg.de>", "LM <lars.mikelsons@informatik.uni-augsburg.de>", "JK <josef.kircher@student.uni-augsburg.de>"]
-version = "0.12.4"
+version = "0.13.0"
 
 [deps]
-DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
 DifferentialEquations = "0c46a032-eb83-5123-abaf-570d42b7fbaa"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 FMIExport = "31b88311-cab6-44ed-ba9c-fe5a9abbd67a"
@@ -15,11 +14,12 @@ Requires = "ae029012-a4dd-5104-9daa-d747884805df"
 ThreadPools = "b189fb0b-2eb5-4ed4-bc0c-d34c51242431"
 
 [compat]
-DiffEqCallbacks = "2.26.0"
-DifferentialEquations = "7.7.0"
-FMIExport = "0.2.0"
-FMIImport = "0.15.7"
-ProgressMeter = "1.7.0"
+DifferentialEquations = "7.10.0 - 7.11.0"
+Downloads = "1"
+FMIExport = "0.3.0"
+FMIImport = "0.16.0"
+LinearAlgebra = "1"
+ProgressMeter = "1.7.0 - 1.9.0"
 Requires = "1.3.0"
 ThreadPools = "2.1.1"
 julia = "1.6"

README.md

@@ -87,6 +87,7 @@ To keep dependencies nice and clean, the original package [*FMI.jl*](https://git
 - [*FMIImport.jl*](https://github.com/ThummeTo/FMIImport.jl): Importing FMUs into Julia
 - [*FMIExport.jl*](https://github.com/ThummeTo/FMIExport.jl): Exporting stand-alone FMUs from Julia Code
 - [*FMICore.jl*](https://github.com/ThummeTo/FMICore.jl): C-code wrapper for the FMI-standard
+- [*FMISensitivity.jl*](https://github.com/ThummeTo/FMISensitivity.jl): Static and dynamic sensitivities over FMUs
 - [*FMIBuild.jl*](https://github.com/ThummeTo/FMIBuild.jl): Compiler/Compilation dependencies for FMIExport.jl
 - [*FMIFlux.jl*](https://github.com/ThummeTo/FMIFlux.jl): Machine Learning with FMUs (differentiation over FMUs)
 - [*FMIZoo.jl*](https://github.com/ThummeTo/FMIZoo.jl): A collection of testing and example FMUs

cross_checks/Project.toml

@@ -12,5 +12,4 @@ Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 
 [compat]
-FMIImport = "0.15"
 julia = "1.6"

docs/make.jl

@@ -43,6 +43,7 @@ makedocs(sitename="FMI.jl",
                 "FMI3 specific content" => "fmi3_lowlevel_librarys.md"
             ]
             "API Index" => "index_library.md"
+            "FMI Tool Information" => "fmi-tool-info.md"            
             "Related Publication" => "related.md"
             "Contents" => "contents.md"
             hide("Deprecated" => "deprecated.md")

docs/src/fmi-tool-info.md

@@ -0,0 +1,31 @@
+# FMU Import Compatibility information (*FMIImport.jl*) 
+This section contains information about how import and simulation of *FMI.jl* and *FMIInmport.jl* where tested.
+
+## FMI-3.0
+FMI3 is for now only beta supported and information will be deployed together with the full support release.
+
+## FMI-2.0
+*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*.
+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. 
+There are different branches for different OS-configurations avalibale.
+
+# FMU Export Compatibility information (*FMIExport.jl*) 
+Detailed export information and automatically generated FMUs will be deployed soon in the repository.
+
+## FMI-3.0
+| **File name** | **x86_64-windows** |  **x86_64-linux** | 
+| :--- | --- | --- |
+| BouncingBall | coming soon | coming soon |
+| Manipulation | coming soon | coming soon |
+| NeuralFMU | coming soon | coming soon |
+
+## FMI-2.0
+| **File name** | **x86_64-windows** |  **x86_64-linux** | 
+| :--- | --- | --- |
+| BouncingBall | [ME](https://github.com/ThummeTo/FMIExport.jl/tree/main/examples/FMI2/BouncingBall) | coming soon |
+| Manipulation | [ME](https://github.com/ThummeTo/FMIExport.jl/tree/main/examples/FMI2/Manipulation) | coming soon |
+| NeuralFMU | [ME](https://github.com/ThummeTo/FMIExport.jl/tree/main/examples/FMI2/NeuralFMU) | coming soon |
+
+## Validation tools
+- [Dassault Dymola 2022X](https://www.3ds.com/de/produkte-und-services/catia/produkte/dymola/)
+- [FMU Check](https://fmu-check.herokuapp.com/)

examples/src/.gitignore

@@ -0,0 +1,2 @@
+FMI_*_Benchmark/
+tmp/

src/FMI.jl

@@ -11,6 +11,8 @@ using Requires
 
 using FMIImport
 
+import FMIImport.FMICore: unsense, getCurrentComponent
+
 # TODO recheck export import list
 # fmi2 imports
 import FMIImport: fmi2CallbackLogger, fmi2CallbackAllocateMemory, fmi2CallbackFreeMemory, fmi2CallbackStepFinished