Skip to content

Commit 4f425a1

Browse files
authored
V0.12.1 (#134)
* Update Project.toml * Update scheduler.jl pass through for print keyword * pull down FMIZoo compat for testing * workshop initial * rm backup file
1 parent 4a35090 commit 4f425a1

File tree

11 files changed

+4532
-4083
lines changed

11 files changed

+4532
-4083
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "FMIFlux"
22
uuid = "fabad875-0d53-4e47-9446-963b74cae21f"
3-
version = "0.12.0"
3+
version = "0.12.1"
44

55
[deps]
66
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"

examples/pluto-src/HybridModelingUsingFMI/HybridModelingUsingFMI.jl

Lines changed: 4 additions & 4076 deletions
Large diffs are not rendered by default.

examples/pluto-src/SciMLUsingFMUs/SciMLUsingFMUs.jl

Lines changed: 4518 additions & 0 deletions
Large diffs are not rendered by default.

examples/pluto-src/HybridModelingUsingFMI/src/plan_complete.png renamed to examples/pluto-src/SciMLUsingFMUs/src/plan_complete.png

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

examples/pluto-src/HybridModelingUsingFMI/src/plan_train.png renamed to examples/pluto-src/SciMLUsingFMUs/src/plan_train.png

File renamed without changes.

src/scheduler.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ mutable struct SequentialScheduler <: BatchScheduler
206206
end
207207
end
208208

209-
function initialize!(scheduler::BatchScheduler; runkwargs...)
209+
function initialize!(scheduler::BatchScheduler; print::Bool=true, runkwargs...)
210210

211211
lastIndex = 0
212212
scheduler.step = 0
@@ -216,7 +216,7 @@ function initialize!(scheduler::BatchScheduler; runkwargs...)
216216
scheduler.runkwargs = runkwargs
217217
end
218218

219-
scheduler.elementIndex = apply!(scheduler)
219+
scheduler.elementIndex = apply!(scheduler; print=print)
220220

221221
if scheduler.plotStep > 0
222222
plot(scheduler, lastIndex)
@@ -230,7 +230,7 @@ function update!(scheduler::BatchScheduler; print::Bool=true)
230230
scheduler.step += 1
231231

232232
if scheduler.applyStep > 0 && scheduler.step % scheduler.applyStep == 0
233-
scheduler.elementIndex = apply!(scheduler)
233+
scheduler.elementIndex = apply!(scheduler; print=print)
234234
end
235235

236236
# max/avg error
@@ -491,4 +491,4 @@ function apply!(scheduler::SequentialScheduler; print::Bool=true)
491491
end
492492

493493
return next
494-
end
494+
end

test/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
88
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
99
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
1010
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
11+
12+
[compat]
13+
FMIZoo = "0.3.0"

0 commit comments

Comments
 (0)