Merge pull request #139 from ModiaSim/reduce_alloc

Reduce memory allocation if states or tearing variables are SVectors …

Author: MartinOtter

Project.toml

@@ -1,7 +1,7 @@
 name = "Modia"
 uuid = "cb905087-75eb-5f27-8515-1ce0ec8e839e"
 authors = ["Hilding Elmqvist <[email protected]>", "Martin Otter <[email protected]>"]
-version = "0.8.1"
+version = "0.8.2"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

docs/src/index.md

@@ -36,11 +36,14 @@ functionalities of these packages.
 
 ## Release Notes
 
+### Version 0.8.2
+
+- Memory allocation reduced if states or tearing variables are SVectors.
+
 ### Version 0.8.1
 
 - Missing file Modia/test/TestLinearEquations.jl added.
 
-
 ### Version 0.8.0 
 
 **Non-backwards** compatible changes

src/CodeGeneration.jl

@@ -1561,11 +1561,15 @@ function generate_getDerivatives!(AST::Vector{Expr}, equationInfo::Modia.Equatio
                 # x-element is a static vector
                 i2 = i1 + xe.length - 1
                 v_length = xe.length
+                x_elements = Expr[]
+                for i in i1:i2
+                    push!(x_elements, :( _x[$i] ))
+                end
                 if !hasUnits || xe.unit == ""
-                    push!(code_x, :( $x_name::Modia.SVector{$v_length,_FloatType} = Modia.SVector{$v_length,_FloatType}(_x[$i1:$i2])) )
+                    push!(code_x, :( $x_name = Modia.SVector{$v_length,_FloatType}($(x_elements...)) ))
                 else
                     x_unit = xe.unit
-                    push!(code_x, :( $x_name = Modia.SVector{$v_length,_FloatType}(_x[$i1:$i2])::Modia.SVector{$v_length,_FloatType}*@u_str($x_unit)) )
+                    push!(code_x, :( $x_name = Modia.SVector{$v_length,_FloatType}($(x_elements...))*@u_str($x_unit)) )
                 end
                 i1 = i2 + 1
             end

src/Modia.jl

@@ -9,8 +9,8 @@ Main module of Modia.
 module Modia
 
 const path = dirname(dirname(@__FILE__))   # Absolute path of package directory
-const Version = "0.8.0"
-const Date = "2022-03-01"
+const Version = "0.8.2"
+const Date = "2022-03-04"
 const modelsPath = joinpath(Modia.path, "models")
 
 print(" \n\nWelcome to ")

src/StateSelection.jl

@@ -901,10 +901,14 @@ function addLinearEquations!(eq::EquationGraph, hasConstantCoefficients::Bool, u
             i2 = i1 + v_length - 1
             if v_startOrInit isa AbstractVector
                 # v is a vector
+                x_elements = Expr[]
+                for i in i1:i2
+                    push!(x_elements, :( _leq_mode.x[$i] ))
+                end
                 if v_unit == ""
-                    push!(while_body, :( $v_julia_name::Modia.SVector{$v_length,_FloatType} = Modia.SVector{$v_length,_FloatType}(_leq_mode.x[$i1:$i2])) )
+                    push!(while_body, :( $v_julia_name = Modia.SVector{$v_length,_FloatType}($(x_elements...))) )
                 else
-                    push!(while_body, :( $v_julia_name = Modia.SVector{$v_length}(_leq_mode.x[$i1:$i2])::Modia.SVector{$v_length,_FloatType}*@u_str($v_unit)) )
+                    push!(while_body, :( $v_julia_name = Modia.SVector{$v_length,_FloatType}($(x_elements...))*@u_str($v_unit)) )
                 end
             elseif v_startOrInit isa Number || v_startOrInit isa Nothing
                 # v is a scalar or nothing (= assumed to be a scalar)