v1.0.0 (ThummeTo#111)

* WIP

* preparation for FMIBase.jl

* bug fixes, preparations for FMI3 and FMIBase

* minor change

* Julia 1.9+ extension system

* getValue bug fix (strings)

* Julia 1.9+ extensions

.github/workflows/Eval.yml

@@ -55,4 +55,4 @@ jobs:
             import Pkg;
             Pkg.instantiate(); 
             Pkg.add(path="./PkgEval.jl")'
-          julia --project=. ./test/FMI2/eval.jl
+          julia --project=. ./test/eval.jl

Project.toml

@@ -1,21 +1,27 @@
 name = "FMIImport"
 uuid = "9fcbc62e-52a0-44e9-a616-1359a0008194"
 authors = ["TT <[email protected]>", "LM <[email protected]>", "JK <[email protected]>"]
-version = "0.16.4"
+version = "1.0.0"
 
 [deps]
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
-EzXML = "8f5d6c58-4d21-5cfd-889c-e3ad7ee6a615"
-FMICore = "8af89139-c281-408e-bce2-3005eb87462f"
+FMIBase = "900ee838-d029-460e-b485-d98a826ceef2"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+PackageExtensionCompat = "65ce6f38-6b18-4e1d-a461-8949797d7930"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
-ZipFile = "a5390f91-8eb1-5f08-bee0-b1d1ffed6cea"
+Requires = "ae029012-a4dd-5104-9daa-d747884805df"
+
+[weakdeps]
+FMIZoo = "724179cf-c260-40a9-bd27-cccc6fe2f195"
+
+[extensions]
+FMIZooExt = ["FMIZoo"]
 
 [compat]
 Downloads = "1"
-EzXML = "1.1.0"
-FMICore = "0.20.0"
+FMIBase = "1.0.0"
 Libdl = "1"
+PackageExtensionCompat = "1.0.0"
 RelocatableFolders = "1"
-ZipFile = "0.10.0"
+Requires = "1.3.0"
 julia = "1.6"

README.md

@@ -35,10 +35,11 @@ To keep dependencies nice and clean, the original package [*FMI.jl*](https://git
 - [*FMI.jl*](https://github.com/ThummeTo/FMI.jl): High level loading, manipulating, saving or building entire FMUs from scratch
 - [*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
+- [*FMIBase.jl*](https://github.com/ThummeTo/FMIBase.jl): Common concepts for import and export of FMUs
 - [*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)
+- [*FMIFlux.jl*](https://github.com/ThummeTo/FMIFlux.jl): Machine Learning with FMUs
 - [*FMIZoo.jl*](https://github.com/ThummeTo/FMIZoo.jl): A collection of testing and example FMUs
 
 ## What Platforms are supported?

ext/FMIZooExt.jl

@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2021 Frederic Bruder, Tobias Thummerer, Lars Mikelsons
+# Licensed under the MIT license. See LICENSE file in the project root for details.
+#
+
+module FMIZooExt
+
+using FMIImport, FMIZoo
+
+function FMIImport.loadFMU(modelName::AbstractString, tool::AbstractString, version::AbstractString, fmiversion::AbstractString="2.0"; kwargs...)
+    fname = get_model_filename(modelName, tool, version, fmiversion)
+    return FMIImport.loadFMU(fname; kwargs...)
+end
+
+end # FMIZooExt