Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for fmi3 refactor in fmi.jl #70

Merged

Conversation

JoKircher
Copy link
Contributor

to get the tests in FMI.jl to work these minor PR has to be merged first.

src/FMI3/ext.jl Outdated
#@assert isa(dstArray[i], String) "fmi3Get!(...): Unknown data type for value reference `$(vr)` at index $(i), should be `String`, is `$(typeof(dstArray[i]))`."
dstArray[i] = fmi3GetString(inst, vr)
elseif mv.datatype.datatype == fmi3Binary
elseif tisa(mv, FMICore.mvBinary)
Copy link
Owner

Choose a reason for hiding this comment

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

tisa?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

small typo, fixed in d44b18d

src/FMI3/c.jl Outdated
@@ -355,7 +355,7 @@ function fmi3ExitInitializationMode(c::FMU3Instance)
elseif fmi3IsScheduledExecution(c.fmu)
c.state = fmi3InstanceStateClockActivationMode
else
c.state = fmi3InstanceStateEventMode
c.state = fmi3InstanceStateContinuousTimeMode
Copy link
Owner

Choose a reason for hiding this comment

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

compliant to state machine in FMI3-sepc?

Copy link
Contributor Author

@JoKircher JoKircher Jan 11, 2023

Choose a reason for hiding this comment

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

nope, artifact of a test, fixed in d44b18d

@ThummeTo
Copy link
Owner

Please add project.toml version inc (minor change, last digit).
Thanks!

@JoKircher
Copy link
Contributor Author

fixed in d44b18d

@ThummeTo ThummeTo changed the base branch from main to v0.15.0 January 30, 2023 08:23
@ThummeTo ThummeTo merged commit 5909f28 into ThummeTo:v0.15.0 Jan 30, 2023
ThummeTo added a commit that referenced this pull request Mar 6, 2023
* added tests for simletypes (#75)

* FMI2: Parse type and unit definitions into `modelDescription` (#74)

* Changes in parsing of `modelDescription` to also consider
`TypeDefinitions` and `UnitDefinitions`.
Requires the definitions made in
manuelbb-upb/FMICore.jl@a0c8bb2

* remove fallback for `:start` attribute if `declaredType`
is defined for a `scalarVariable`.

* Update docstring of `fmi2GetUnit` in src/FMI2/ext.jl

Co-authored-by: JoKircher <[email protected]>

* remove `targetArray` from `parseModelDescriptionVariable` in src/FMI2/md.jl

Co-authored-by: JoKircher <[email protected]>

* remove `targetArray` from `parseModelDescriptionVariable` in src/FMI2/md.jl

Co-authored-by: JoKircher <[email protected]>

* remove `targetArray` from `parseModelDescriptionVariable` in src/FMI2/md.jl

Co-authored-by: JoKircher <[email protected]>

---------

Co-authored-by: JoKircher <[email protected]>

* Check and extend tests (#73)

* update tests with new reference version

* add some more tests

* bump version

* Changes for fmi3 refactor in fmi.jl (#70)

* add modelvariables working

* small changs for fmi 3

* fix of PR comments

* more fixed

* updates to get most of fmi3 tests to work

* more changs for rework -smol

* bump version

* V0.15.0 Fixes and Tests for `fmi2SimpleType` and `fmi2Unit` (#77)

* Simplification of Simple Type Attributes

* Fixed former test issues and introduced
additional tests for simple types and units.

* fix condensing (#79)

Co-authored-by: ThummeTo <[email protected]>

* Change `fmi2Reset` logic (#78)

* Change fmi2Reset logic

* Trying to revert changes to libcallbackFunctions.so

* Accomodate property methods for `fmi2SimpleType`. (#81)

* WIP

* finished refactor

* minor changes

---------

Co-authored-by: JoKircher <[email protected]>
Co-authored-by: Manuel <[email protected]>
@JoKircher JoKircher deleted the changes-for-fmi3-refactor-in-fmi.jl branch March 10, 2023 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants