- Minor (efficiency) improvement if states are SVectors.

- Require ModiaBase 0.9.2 (to get rid of performance issues in Modia3D).
- Replace ustrip(..) with ustrip.(..) at some places to get rid of warnings.
- Increment version number and provide release notes

Author: MartinOtter

Manifest.toml

@@ -183,9 +183,9 @@ version = "2.20.1"
 
 [[deps.DiffEqJump]]
 deps = ["ArrayInterface", "Compat", "DataStructures", "DiffEqBase", "FunctionWrappers", "Graphs", "LinearAlgebra", "PoissonRandom", "Random", "RandomNumbers", "RecursiveArrayTools", "Reexport", "StaticArrays", "TreeViews", "UnPack"]
-git-tree-sha1 = "ec1f3a5b4eac6502e45dcf79d213b200afd61990"
+git-tree-sha1 = "e30f058eb600407e3fd4ea082e2527e3a3671238"
 uuid = "c894b116-72e5-5b58-be3c-e6d8d4ac2b12"
-version = "8.2.0"
+version = "8.2.1"
 
 [[deps.DiffEqNoiseProcess]]
 deps = ["DiffEqBase", "Distributions", "LinearAlgebra", "Optim", "PoissonRandom", "QuadGK", "Random", "Random123", "RandomNumbers", "RecipesBase", "RecursiveArrayTools", "Requires", "ResettableStacks", "SciMLBase", "StaticArrays", "Statistics"]
@@ -497,9 +497,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
 [[deps.ModiaBase]]
 deps = ["DataFrames", "DiffRules", "LinearAlgebra", "Measurements", "MonteCarloMeasurements", "OrderedCollections", "RecursiveFactorization", "StaticArrays", "TimerOutputs", "Unitful"]
-git-tree-sha1 = "9e678c9f7ce692bb30855083b83fa35db09c0d32"
+git-tree-sha1 = "e32f09c491f569f254d3c7776326539f4b3c5f24"
 uuid = "ec7bf1ca-419d-4510-bbab-199861c55244"
-version = "0.9.1"
+version = "0.9.2"
 
 [[deps.ModiaResult]]
 deps = ["DataFrames", "Measurements", "MonteCarloMeasurements", "OrderedCollections", "Pkg", "Tables", "Unitful"]
@@ -614,9 +614,9 @@ version = "0.4.0"
 
 [[deps.Polyester]]
 deps = ["ArrayInterface", "BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "ManualMemory", "PolyesterWeave", "Requires", "Static", "StrideArraysCore", "ThreadingUtilities"]
-git-tree-sha1 = "93b829eedfc466c844c233f285fae94dcaa1870a"
+git-tree-sha1 = "2232d3865bc9a098e664f69cbe340b960d48217f"
 uuid = "f517fe37-dbe3-4b94-8317-1923a5111588"
-version = "0.6.5"
+version = "0.6.6"
 
 [[deps.PolyesterWeave]]
 deps = ["BitTwiddlingConvenienceFunctions", "CPUSummary", "IfElse", "Static", "ThreadingUtilities"]
@@ -746,9 +746,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.SciMLBase]]
 deps = ["ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "RecipesBase", "RecursiveArrayTools", "StaticArrays", "Statistics", "Tables", "TreeViews"]
@@ -808,9 +808,9 @@ version = "0.4.1"
 
 [[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"]
@@ -848,9 +848,9 @@ version = "6.44.0"
 
 [[deps.StrideArraysCore]]
 deps = ["ArrayInterface", "CloseOpenIntervals", "IfElse", "LayoutPointers", "ManualMemory", "Requires", "SIMDTypes", "Static", "ThreadingUtilities"]
-git-tree-sha1 = "2025a5d6564a93fa5b499dd216c0bc44537fb0d4"
+git-tree-sha1 = "e0a02838565c4600ecd1d8874db8cfe263aaa6c7"
 uuid = "7792a7ef-975c-4747-a70f-980b88e8d1da"
-version = "0.2.11"
+version = "0.2.12"
 
 [[deps.SuiteSparse]]
 deps = ["Libdl", "LinearAlgebra", "Serialization", "SparseArrays"]

Project.toml

@@ -1,7 +1,7 @@
 name = "ModiaLang"
 uuid = "34b37210-eaa3-4b48-8781-0b87bf559981"
 authors = ["Hilding Elmqvist <Hilding.Elmqvist@Mogram.net>", "Martin Otter <Martin.Otter@dlr.de>"]
-version = "0.11.1"
+version = "0.11.2"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -30,7 +30,7 @@ FiniteDiff = "2"
 ForwardDiff = "0.10"
 JSON = "0.21"
 Measurements = "2"
-ModiaBase = "0.9.1"
+ModiaBase = "0.9.2"
 ModiaResult = "0.4.1"
 MonteCarloMeasurements = "1"
 OrderedCollections = "1"

docs/src/index.md

@@ -28,6 +28,18 @@ julia> ]add ModiaPlot_PyPlot        # if plotting with PyPlot desired
 
 ## Release Notes
 
+### Version 0.11.2
+
+- Minor (efficiency) improvement if states are SVectors.
+- 
+
+
+### Version 0.11.1
+
+- Update of Manifest.toml file
+- Require ModiaBase 0.9.1 (with updated Manifest.toml file)
+
+
 ### Version 0.11.0
 
 Non-backwards compatible changes
@@ -94,6 +106,19 @@ Bug fixes
 - Function `ModiaLang.firstInitialOfAllSegments(..)` now correctly returns true for the first call of the getDerivatives function during the simulation.
 
 
+### Version 0.10.2
+
+- Minor (efficiency) improvement if states are SVectors.
+- Require ModiaBase 0.9.2 (to get rid of performance issues in Modia3D).
+- Replace ustrip(..) with ustrip.(..) at some places to get rid of warnings.
+
+
+### Version 0.10.1
+
+- Update of Manifest.toml file
+- Require ModiaBase 0.9.1 (with updated Manifest.toml file).
+
+
 ### Version 0.10.0
 
 - Require DifferentialEquations.jl version 7.

src/CodeGeneration.jl

@@ -1562,7 +1562,7 @@ function generate_getDerivatives!(AST::Vector{Expr}, equationInfo::ModiaBase.Equ
                 i2 = i1 + xe.length - 1
                 v_length = xe.length
                 if !hasUnits || xe.unit == ""
-                    push!(code_x, :( $x_name = ModiaBase.SVector{$v_length,_FloatType}(_x[$i1:$i2])::ModiaBase.SVector{$v_length,_FloatType}) )
+                    push!(code_x, :( $x_name::ModiaBase.SVector{$v_length,_FloatType} = ModiaBase.SVector{$v_length,_FloatType}(_x[$i1:$i2])) )
                 else
                     x_unit = xe.unit
                     push!(code_x, :( $x_name = ModiaBase.SVector{$v_length,_FloatType}(_x[$i1:$i2])::ModiaBase.SVector{$v_length,_FloatType}*@u_str($x_unit)) )

src/JSONModel.jl

@@ -31,7 +31,7 @@ function encodeModel(model, expressionsAsStrings=true)
     Base.remove_linenums!(model)
     model = removeBlock(model)
     if typeof(model) <: Quantity
-        return Dict(:_value => ustrip(model), :_unit=>string(unit(model)))
+        return Dict(:_value => ustrip.(model), :_unit=>string(unit(model)))
     elseif expressionsAsStrings && typeof(model) == Expr
         return Dict(:_Expr=>string(model))
     elseif typeof(model) == Expr

src/ModiaLang.jl

@@ -110,8 +110,8 @@ const drawIncidence = false
 
 const path = dirname(dirname(@__FILE__))   # Absolute path of package directory
 
-const Version = "0.11.1"
-const Date = "2022-02-21"
+const Version = "0.11.2"
+const Date = "2022-02-23"
 
 #println(" \n\nWelcome to Modia - Dynamic MODeling and Simulation in julIA")
 #=
@@ -598,16 +598,28 @@ function stateSelectionAndCodeGeneration(modStructure, Gexplicit, name, modelMod
         end
         if isexpr(lhs, :tuple) && all(a == 0 for a in lhs.args) || lhs == :(0)
             eq_rhs = makeDerVar(:($rhs), parameters, inputs, evaluateParameters)
-            eqs = :(ModiaLang.Unitful.ustrip.($eq_rhs))
+            if unitless
+                eqs = eq_rhs
+            else
+                eqs = :(ModiaLang.Unitful.ustrip.($eq_rhs))
+            end
+        #elseif isexpr(lhs, :tuple) && isexpr(rhs, :call) && unitless
+        #    eq_rhs = makeDerVar(:($rhs), parameters, inputs, evaluateParameters)
+        #    eq_lhs = makeDerVar(:($lhs), parameters, inputs, evaluateParameters)
+        #    eqs =  :( ($eq_rhs .-= $eq_lhs) )
         else
             eq_rhs = makeDerVar(:($rhs), parameters, inputs, evaluateParameters)
             eq_lhs = makeDerVar(:($lhs), parameters, inputs, evaluateParameters)
-            eqs = :( ModiaLang.Unitful.ustrip.($eq_rhs) .- ModiaLang.Unitful.ustrip.($eq_lhs))
+            if unitless
+                eqs = :( $eq_rhs .- $eq_lhs )            
+            else
+                eqs = :( ModiaLang.Unitful.ustrip.($eq_rhs) .- ModiaLang.Unitful.ustrip.($eq_lhs))
+            end
         end
         residual = :(ModiaBase.appendVariable!(_leq_mode.residuals, $eqs))
         residString = string(eqs)
         if logCalculations
-            return :(println("Calculating residual: ", $residString); $residualName = $eqs; println("  Residual: ", $residualName) )
+             return :(println("Calculating residual: ", $residString); $residualName = $eqs; println("  Residual: ", $residualName) )
 #            return makeDerVar(:(dump($(makeDerVar(eq.args[2]))); dump($(makeDerVar(eq.args[1]))); $residual; println($residualName, " = ", upreferred.(($(eq.args[2]) - $(eq.args[1]))))))
         else
             return residual

src/NamedTupleModels.jl

@@ -424,7 +424,7 @@ function flattenModelTuple!(model, modelStructure, modelName; unitless = false,
             for (x,x0) in zip(keys(v), v)
                 if x != :class
                     if unitless && typeof(x0) != Expr
-                        x0 = ustrip(x0)
+                        x0 = ustrip.(x0)
                     end
                     modelStructure.init[x] = x0
                     modelStructure.mappedParameters = (;modelStructure.mappedParameters..., x => x0)
@@ -436,7 +436,7 @@ function flattenModelTuple!(model, modelStructure, modelName; unitless = false,
             for (s,s0) in zip(keys(v), v)
                 if s != :class
                     if unitless
-                        s0 = ustrip(s0)
+                        s0 = ustrip.(s0)
                     end
                     modelStructure.start[s] = s0
                     modelStructure.mappedParameters = (;modelStructure.mappedParameters...,  s => s0)
@@ -449,7 +449,7 @@ function flattenModelTuple!(model, modelStructure, modelName; unitless = false,
 				typeof(v) <: NamedTuple && :class in keys(v) && v.class == :Par ||
 				typeof(v) <: NamedTuple && :parameter in keys(v) && v.parameter
             if unitless && !(typeof(v) <: NamedTuple)
-                v = ustrip(v)
+                v = ustrip.(v)
             end
             modelStructure.parameters[k] = v
             modelStructure.mappedParameters = (;modelStructure.mappedParameters..., k => v)
@@ -468,15 +468,15 @@ function flattenModelTuple!(model, modelStructure, modelName; unitless = false,
             if :init in keys(v)
                 x0 = v.init
                 if unitless && typeof(x0) != Expr
-                    x0 = ustrip(x0)
+                    x0 = ustrip.(x0)
                 end
                 modelStructure.init[k] = x0
                 modelStructure.mappedParameters = (;modelStructure.mappedParameters..., k => x0)
             end
             if :start in keys(v)
                 s0 = v.start
                 if unitless && typeof(s0) != Expr
-                    s0 = ustrip(s0)
+                    s0 = ustrip.(s0)
                 end
                 modelStructure.start[k] = s0
                 modelStructure.mappedParameters = (;modelStructure.mappedParameters..., k => s0)

test/TestTwoInertiasAndIdealGearWithUnits.jl

@@ -7,7 +7,7 @@ using Test
 TwoInertiasAndIdealGearWithUnits = Model(
     J1 = 0.0025u"kg*m^2",
     J2 = 170u"kg*m^2",
-    r  = 105,
+    r  = 105.0,
     tau_max = 1u"N*m",
 
     phi2 = Var(start = 0.5u"rad"), 
@@ -31,7 +31,7 @@ TwoInertiasAndIdealGearWithUnits = Model(
     ]
 )
 
-twoInertiasAndIdealGearWithUnits = @instantiateModel(TwoInertiasAndIdealGearWithUnits)
+twoInertiasAndIdealGearWithUnits = @instantiateModel(TwoInertiasAndIdealGearWithUnits, logCode=true)
 
 
 simulate!(twoInertiasAndIdealGearWithUnits, Tsit5(), stopTime = 4.0,