- Minor (efficiency) improvement of linear equation system if iteration variables are SVectors.

- Simplify appendVariable!(..) to get rid of performance problems in Modia3D.

Author: MartinOtter

Manifest.toml

@@ -440,9 +440,9 @@ version = "0.1.0"
 
 [[deps.SLEEFPirates]]
 deps = ["IfElse", "Static", "VectorizationBase"]
-git-tree-sha1 = "3a5ae1db486e4ce3ccd2b392389943481e20401f"
+git-tree-sha1 = "61a96d8b89083a53fb2b745f3b59a05359651bbe"
 uuid = "476501e8-09a2-5ece-8869-fb82de89a1fa"
-version = "0.6.29"
+version = "0.6.30"
 
 [[deps.Serialization]]
 uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
@@ -478,9 +478,9 @@ version = "0.3.3"
 
 [[deps.StaticArrays]]
 deps = ["LinearAlgebra", "Random", "Statistics"]
-git-tree-sha1 = "95c6a5d0e8c69555842fc4a927fc485040ccc31c"
+git-tree-sha1 = "6354dfaf95d398a1a70e0b28238321d5d17b2530"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "1.3.5"
+version = "1.4.0"
 
 [[deps.Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]

Project.toml

@@ -1,7 +1,7 @@
 name = "ModiaBase"
 uuid = "ec7bf1ca-419d-4510-bbab-199861c55244"
 authors = ["Hilding Elmqvist <Hilding.Elmqvist@Mogram.net>", "Martin Otter <Martin.Otter@dlr.de>"]
-version = "0.9.1"
+version = "0.9.2"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

docs/src/index.md

@@ -77,6 +77,15 @@ julia> ]add ModiaBase
 
 ## Release Notes
 
+### Version 0.9.2
+
+- Minor (efficiency) improvement of linear equation system if iteration variables are SVectors. 
+
+
+### Version 0.9.1
+
+- Update of Manifest.toml file
+
 ### Version 0.9.0
 
 Non-backwards compatible improvements

src/ModiaBase.jl

@@ -9,8 +9,8 @@ Main module of ModiaBase.
 module ModiaBase
 
 const path    = dirname(dirname(@__FILE__))   # Absolute path of package directory
-const Version = "0.9.1"
-const Date    = "2022-02-21"
+const Version = "0.9.2"
+const Date    = "2022-02-23"
 
 #println("\nImporting ModiaBase Version $Version ($Date)")
 
@@ -19,21 +19,8 @@ using StaticArrays
 
 
 # append! as needed in EquationAndStateInfo.jl and in ModiaLang/src/CodeGeneration.jl
-appendVariable!(v1::Vector{FloatType}, s::FloatType)               where {FloatType}   = push!(v1,s)
-appendVariable!(v1::Vector{FloatType}, v2::Vector{FloatType})      where {FloatType}   = append!(v1,v2)
-appendVariable!(v1::Vector{FloatType}, v2::SVector{N,FloatType})   where {N,FloatType} = append!(v1,v2)
-appendVariable!(v1::Vector{FloatType}, v2::NTuple{ N,FloatType})   where {N,FloatType} = append!(v1,v2)
-@inline function appendVariable!(v1::Vector{FloatType}, v2::NTuple{N,SVector{M,FloatType}}) where {N,M,FloatType} 
-    @inbounds for e in v2
-        appendVariable!(v1,e)   # dispatch can be performed at compile-time, because typeof(e) = SVector{M,FloatType}
-    end
-end
-@inline function appendVariable!(v1::Vector{FloatType}, v2::Tuple) where {FloatType}
-    @inbounds for e in v2
-        appendVariable!(v1,e)   # dispatch is performed at run-time, because typeof(e) is not known at compile-time.
-    end
-end
-
+appendVariable!(v1::Vector{FloatType}, s::FloatType) where {FloatType} = push!(v1,s)
+appendVariable!(v1::Vector{FloatType}, v2)           where {FloatType} = append!(v1,v2)
 
 include("LinearIntegerEquations.jl")
 

src/StateSelection.jl

@@ -901,7 +901,7 @@ function addLinearEquations!(eq::EquationGraph, hasConstantCoefficients::Bool, u
             if v_startOrInit isa AbstractVector
                 # v is a vector
                 if v_unit == ""
-                    push!(while_body, :( $v_julia_name = ModiaBase.SVector{$v_length,_FloatType}(_leq_mode.x[$i1:$i2])::ModiaBase.SVector{$v_length,_FloatType}) )
+                    push!(while_body, :( $v_julia_name::ModiaBase.SVector{$v_length,_FloatType} = ModiaBase.SVector{$v_length,_FloatType}(_leq_mode.x[$i1:$i2])) )
                 else
                     push!(while_body, :( $v_julia_name = ModiaBase.SVector{$v_length}(_leq_mode.x[$i1:$i2])::ModiaBase.SVector{$v_length,_FloatType}*@u_str($v_unit)) )
                 end