Skip to content

Commit

Permalink
v0.17.3 (#45)
Browse files Browse the repository at this point in the history
* minor modifications

* updated readme
  • Loading branch information
ThummeTo authored Jul 19, 2023
1 parent 2d1210b commit b2d8111
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "FMICore"
uuid = "8af89139-c281-408e-bce2-3005eb87462f"
authors = ["TT <[email protected]>", "LM <[email protected]>", "JK <[email protected]>"]
version = "0.17.2"
version = "0.17.3"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

2\. Install [*FMICore.jl*](https://github.com/ThummeTo/FMICore.jl):
```julia-repl
(@v1.6) pkg> add FMICore
(@v1) pkg> add FMICore
```

3\. If you want to check that everything works correctly, you can run the tests bundled with [*FMICore.jl*](https://github.com/ThummeTo/FMICore.jl):
```julia-repl
(@v1.6) pkg> test FMICore
(@v1) pkg> test FMICore
```

## What FMI.jl-Library should I use?
Expand All @@ -36,7 +36,7 @@ To keep dependencies nice and clean, the original package [*FMI.jl*](https://git
- [*FMIZoo.jl*](https://github.com/ThummeTo/FMIZoo.jl): A collection of testing and example FMUs

## What Platforms are supported?
[*FMICore.jl*](https://github.com/ThummeTo/FMICore.jl) is tested (and testing) under Julia Versions *1.6.6 LTS* and *latest* on Windows *latest*, Ubuntu *latest* and MacOS *latest*. `x64` and `x86` architectures are tested.
[*FMICore.jl*](https://github.com/ThummeTo/FMICore.jl) is tested (and testing) under Julia Versions *v1.6 LTS* and *v1 latest* on Windows *latest*, Ubuntu *latest* and MacOS *latest*. `x64` and `x86` architectures are tested.

## How to cite?
Tobias Thummerer, Lars Mikelsons and Josef Kircher. 2021. **NeuralFMU: towards structural integration of FMUs into neural networks.** Martin Sjölund, Lena Buffoni, Adrian Pop and Lennart Ochel (Ed.). Proceedings of 14th Modelica Conference 2021, Linköping, Sweden, September 20-24, 2021. Linköping University Electronic Press, Linköping (Linköping Electronic Conference Proceedings ; 181), 297-306. [DOI: 10.3384/ecp21181297](https://doi.org/10.3384/ecp21181297)
Expand Down
15 changes: 15 additions & 0 deletions src/FMI2/struct.jl
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,16 @@ mutable struct FMU2Solution{C} <: FMUSolution where {C}
values # ToDo: DataType
valueReferences::Union{Array, Nothing} # ToDo: Array{fmi2ValueReference}

# record events
events::Array{FMU2Event, 1}

# record event indicators
recordEventIndicators::Union{Array{Int, 1}, Nothing}
eventIndicators # ToDo: DataType

# record eigenvalues
eigenvalues # ToDo: DataType

evals_∂ẋ_∂x::Integer
evals_∂y_∂x::Integer
evals_∂ẋ_∂u::Integer
Expand All @@ -67,6 +75,8 @@ mutable struct FMU2Solution{C} <: FMUSolution where {C}
evals_stepcompleted::Integer
evals_timechoice::Integer
evals_savevalues::Integer
evals_saveeventindicators::Integer
evals_saveeigenvalues::Integer

function FMU2Solution{C}() where {C}
inst = new{C}()
Expand All @@ -78,6 +88,9 @@ mutable struct FMU2Solution{C} <: FMUSolution where {C}

inst.events = []

inst.recordEventIndicators = nothing
inst.eigenvalues = nothing

inst.evals_∂ẋ_∂x = 0
inst.evals_∂y_∂x = 0
inst.evals_∂ẋ_∂u = 0
Expand All @@ -94,6 +107,8 @@ mutable struct FMU2Solution{C} <: FMUSolution where {C}
inst.evals_stepcompleted = 0
inst.evals_timechoice = 0
inst.evals_savevalues = 0
inst.evals_saveeventindicators = 0
inst.evals_saveeigenvalues = 0

return inst
end
Expand Down

2 comments on commit b2d8111

@ThummeTo
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/87797

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.17.3 -m "<description of version>" b2d8111b909d2fb0748c8b0265a632fca3d607b2
git push origin v0.17.3

Please sign in to comment.