Add TimerOutputs to Project.toml file and timer to solution of linear equation systems

Author: MartinOtter

Manifest.toml

@@ -104,6 +104,11 @@ version = "0.8.5"
 deps = ["ArgTools", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
 
+[[ExprTools]]
+git-tree-sha1 = "b7e3d17636b348f005f11040025ae8c6f645fe92"
+uuid = "e2ba6199-217a-4e67-a87a-7c52f15ade04"
+version = "0.1.6"
+
 [[FillArrays]]
 deps = ["LinearAlgebra", "Random", "SparseArrays"]
 git-tree-sha1 = "25b9cc23ba3303de0ad2eac03f840de9104c9253"
@@ -417,6 +422,12 @@ uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
 deps = ["InteractiveUtils", "Logging", "Random", "Serialization"]
 uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
+[[TimerOutputs]]
+deps = ["ExprTools", "Printf"]
+git-tree-sha1 = "209a8326c4f955e2442c07b56029e88bb48299c7"
+uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
+version = "0.5.12"
+
 [[UUIDs]]
 deps = ["Random", "SHA"]
 uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

Project.toml

@@ -10,6 +10,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
 MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
+TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
 [compat]
@@ -18,5 +19,6 @@ DiffRules = "1.0"
 Measurements = "2.6, 2.5, 2.4, 2.3"
 MonteCarloMeasurements = "0.10, 0.9"
 OrderedCollections = "1.4, 1.3"
+TimerOutputs = "0.5"
 Unitful = "1.6, 1.5, 1.4, 1.3"
 julia = "1.6, 1.5"

src/EquationAndStateInfo.jl

@@ -7,6 +7,7 @@
 import DataFrames
 import OrderedCollections
 using  LinearAlgebra
+import TimerOutputs
 
 export StateCategory, XD, XALG, XLAMBDA, XMUE
 export ResidualCategory, FD, FC_ALG, FC_LOW_HIGH, FC_MUE
@@ -108,7 +109,7 @@ LinearEquations(args...) = LinearEquations{Float64}(args...)
 
 
 """
-     iterating = LinearEquationsIteration(leq::LinearEquations{FloatType}, isInitial::Bool, time)
+     iterating = LinearEquationsIteration(leq::LinearEquations{FloatType}, isInitial::Bool, time, timer)
 
 This function solves a linear equation system in residual form "residual = A*x - b"
 by iterating with a while loop over this system:
@@ -132,7 +133,7 @@ function getDerivatives!(_der_x, _x, _m, _time)::Nothing
 end
 ```
 """
-function LinearEquationsIteration(leq::LinearEquations{FloatType}, isInitial::Bool, time)::Bool where {FloatType}
+function LinearEquationsIteration(leq::LinearEquations{FloatType}, isInitial::Bool, time, timer)::Bool where {FloatType}
     #=
     while LinearEquationsIteration(leq, isInitial,time)
         # body of while-loop
@@ -313,8 +314,10 @@ function LinearEquationsIteration(leq::LinearEquations{FloatType}, isInitial::Bo
             end
         else
             x .= b
-            leq.luA = lu!(A)
-            ldiv!(leq.luA, x)
+            TimerOutputs.@timeit timer "luA ldiv!" begin
+                leq.luA = lu!(A)
+                ldiv!(leq.luA, x)
+            end
         end
 
     elseif leq.A_is_constant && !isInitial  # isInitial=false, LU decomposition of A is available in leq.luA    

src/StateSelection.jl

@@ -931,7 +931,7 @@ function addLinearEquations!(eq::EquationGraph, hasConstantCoefficients::Bool)::
         local $(vAssigned_names...)
         _leq_mode = _m.linearEquations[$leq_index]
         _leq_mode.mode = -2
-        while ModiaBase.LinearEquationsIteration(_leq_mode, _m.isInitial, _m.time)
+        TinyModia.TimerOutputs.@timeit _m.timer "LinearEquationsIteration" while ModiaBase.LinearEquationsIteration(_leq_mode, _m.isInitial, _m.time, _m.timer)
             $(while_body...)
         end
         _leq_mode = nothing