Skip to content

Commit 6d5913c

Browse files
authored
v0.1.0.1 (#64)
* minor adjustments for fmibase.jl * fixed build-in sensitivities
1 parent f8b9874 commit 6d5913c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Project.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "FMICore"
22
uuid = "8af89139-c281-408e-bce2-3005eb87462f"
33
authors = ["TT <tobias.thummerer@informatik.uni-augsburg.de>", "LM <lars.mikelsons@informatik.uni-augsburg.de>", "JK <josef.kircher@student.uni-augsburg.de>"]
4-
version = "1.0.0"
4+
version = "1.0.1"
55

66
[deps]
77
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

src/FMI3/cfunc.jl

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function fmi3InstantiateModelExchange(cfunc::Ptr{Nothing},
2424
instanceName, fmuInstantiationToken, fmuResourceLocation,
2525
visible, loggingOn, instanceEnvironment, logMessage)
2626

27-
@debug "fmi3InstantiateModelExchange(instanceName: $(instanceName), fmuType: $(fmuType), fmuInstantiationToken: $(fmuInstantiationToken), fmuResourceLocation: $(fmuResourceLocation), visible: $(visible), loggingOn: $(loggingOn)) → $(status)"
27+
@debug "fmi3InstantiateModelExchange(instanceName: $(instanceName), fmuInstantiationToken: $(fmuInstantiationToken), fmuResourceLocation: $(fmuResourceLocation), visible: $(visible), loggingOn: $(loggingOn)) → $(status)"
2828
return status
2929
end
3030
export fmi3InstantiateModelExchange
@@ -56,7 +56,7 @@ function fmi3InstantiateCoSimulation(cfunc::Ptr{Nothing},
5656
visible, loggingOn, eventModeUsed, earlyReturnAllowed, requiredIntermediateVariables,
5757
nRequiredIntermediateVariables, instanceEnvironment, logMessage, intermediateUpdate)
5858

59-
@debug "fmi3InstantiateCoSimulation(instanceName: $(instanceName), fmuType: $(fmuType), fmuInstantiationToken: $(fmuInstantiationToken), fmuResourceLocation: $(fmuResourceLocation), visible: $(visible), loggingOn: $(loggingOn)) → $(status)"
59+
@debug "fmi3InstantiateCoSimulation(instanceName: $(instanceName), fmuInstantiationToken: $(fmuInstantiationToken), fmuResourceLocation: $(fmuResourceLocation), visible: $(visible), loggingOn: $(loggingOn)) → $(status)"
6060
return status
6161
end
6262
export fmi3InstantiateCoSimulation
@@ -88,7 +88,7 @@ function fmi3InstantiateScheduledExecution(cfunc::Ptr{Nothing},
8888
visible, loggingOn, eventModeUsed, earlyReturnAllowed, requiredIntermediateVariables,
8989
nRequiredIntermediateVariables, instanceEnvironment, logMessage, clockUpdate, lockPreemption, unlockPreemption)
9090

91-
@debug "fmi3InstantiateScheduledExecution(instanceName: $(instanceName), fmuType: $(fmuType), fmuInstantiationToken: $(fmuInstantiationToken), fmuResourceLocation: $(fmuResourceLocation), visible: $(visible), loggingOn: $(loggingOn)) → $(status)"
91+
@debug "fmi3InstantiateScheduledExecution(instanceName: $(instanceName), fmuInstantiationToken: $(fmuInstantiationToken), fmuResourceLocation: $(fmuResourceLocation), visible: $(visible), loggingOn: $(loggingOn)) → $(status)"
9292
return status
9393
end
9494
export fmi3InstantiateScheduledExecution
@@ -989,7 +989,7 @@ function fmi3GetDirectionalDerivative!(cfunc::Ptr{Nothing}, c::fmi3Instance,
989989
nSeed::Csize_t,
990990
sensitivity::AbstractArray{fmi3Float64},
991991
nSensitivity::Csize_t)
992-
@assert fmi3ProvidesDirectionalDerivatives(c.fmu) ["fmi3GetDirectionalDerivative!(...): This FMU does not support build-in directional derivatives!"]
992+
993993
status = ccall(cfunc,
994994
fmi3Status,
995995
(fmi3Instance, Ptr{fmi3ValueReference}, Csize_t, Ptr{fmi3ValueReference}, Csize_t, Ptr{fmi3Float64}, Csize_t, Ptr{fmi3Float64}, Csize_t),
@@ -1126,7 +1126,7 @@ This function can only be called in Model Exchange.
11261126
fmi3GetNumberOfEventIndicators must be called after a structural parameter is changed. As long as no structural parameters changed, the number of states is given in the modelDescription.xml, alleviating the need to call this function.
11271127
"""
11281128
function fmi3GetNumberOfEventIndicators!(cfunc::Ptr{Nothing}, c::fmi3Instance, nEventIndicators::Ref{Csize_t})
1129-
ccall(cfunc,
1129+
status = ccall(cfunc,
11301130
fmi3Status,
11311131
(fmi3Instance, Ptr{Csize_t}),
11321132
c, nEventIndicators)

0 commit comments

Comments
 (0)