Skip to content

Commit 87c4925

Browse files
committed
Rename SimulationModel -> InstantiatedModel
1 parent e81114f commit 87c4925

18 files changed

+145
-145
lines changed

docs/src/Internal.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ CurrentModule = Modia
7070
```
7171

7272
```@docs
73-
SimulationModel
73+
InstantiatedModel
7474
generate_getDerivatives!
7575
init!
7676
outputs!

docs/src/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ Bug fixes
471471
- @reexport using Unitful
472472
- @reexport using DifferentialEquations
473473
- Cleanup of test files (besides ModiaLang, no other package needed in the environment to run the tests).
474-
- Change `SimulationModel{FloatType,ParType,EvaluatedParType,TimeType}` to `SimulationModel{FloatType,TimeType}`
474+
- Change `InstantiatedModel{FloatType,ParType,EvaluatedParType,TimeType}` to `InstantiatedModel{FloatType,TimeType}`
475475

476476

477477
#### Version 0.9.1

docs/src/tutorial/Modeling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ testArray1 = @instantiateModel(TestArray1, logCode=true)
528528
Note, the generated code is shown in the REPL if `logCode=true` is defined:
529529

530530
```julia
531-
function getDerivatives(_x, _m::Modia.SimulationModel{_FloatType,_TimeType} ...
531+
function getDerivatives(_x, _m::Modia.InstantiatedModel{_FloatType,_TimeType} ...
532532
...
533533
v::ModiaBase.SVector{3,_FloatType} = ModiaBase.SVector{3,_FloatType}(_x[1:3])
534534
var"der(v)" = -v

docs/src/tutorial/Simulation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ modelInstance = @instantiateModel(model; FloatType = Float64, aliasReduction=tru
2424

2525
The macro performs structural and symbolic transformations, generates a function for
2626
calculation of derivatives suitable for use with [DifferentialEquations.jl](https://github.com/SciML/DifferentialEquations.jl)
27-
and returns [`SimulationModel`](@ref) that can be used in other functions,
27+
and returns [`InstantiatedModel`](@ref) that can be used in other functions,
2828
for example to simulate or plot results. Explanation of the arguments:
2929

3030
* `model`: model (declarations and equations)

examples/Pendulum.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ println("\n... Numerically linearize at stopTime = 10 with Float64 and Double64:
4141

4242
#= DoubleFloats is not necessarily defined in the environment
4343
using Modia.DoubleFloats
44-
pendulum3 = SimulationModel{Measurement{Double64}}(pendulum2)
44+
pendulum3 = InstantiatedModel{Measurement{Double64}}(pendulum2)
4545
(A_10_Double64, x_10_Double64) = linearize!(pendulum3, stopTime=10)
4646
=#
4747

models/HeatTransfer/InsulatedRod2.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ end
8484

8585

8686
# Called once before initialization of a new simulation segment
87-
function initSegment_InsulatedRod2!(instantiatedModel::SimulationModel{FloatType,TimeType}, path::String, ID,
87+
function initSegment_InsulatedRod2!(instantiatedModel::InstantiatedModel{FloatType,TimeType}, path::String, ID,
8888
parameters::AbstractDict; log=false)::Nothing where {FloatType,TimeType}
8989
obj::InsulatedRodStruct{FloatType} = Modia.get_instantiatedSubmodel(instantiatedModel, ID)
9090

@@ -99,7 +99,7 @@ end
9999

100100

101101
# Open an initialized InsulatedRod2 model and return a reference to it
102-
function openInsulatedRod!(instantiatedModel::SimulationModel{FloatType,TimeType}, ID)::InsulatedRodStruct{FloatType} where {FloatType,TimeType}
102+
function openInsulatedRod!(instantiatedModel::InstantiatedModel{FloatType,TimeType}, ID)::InsulatedRodStruct{FloatType} where {FloatType,TimeType}
103103
obj::InsulatedRodStruct{FloatType} = Modia.get_instantiatedSubmodel(instantiatedModel, ID)
104104
Modia.copy_Vector_x_segmented_value_from_state(instantiatedModel, obj.T_startIndex, obj.T)
105105
return obj

0 commit comments

Comments
 (0)