Version number changed to 0.8.1 + missing file TestLinearEquations.jl added

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.0"
+version = "0.8.1"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

docs/src/index.md

@@ -32,6 +32,11 @@ Note, Modia exports all exported symbols of
 
 ## Release Notes
 
+### Version 0.8.1
+
+- Missing file Modia/test/TestLinearEquations.jl added.
+
+
 ### Version 0.8.0 
 
 **Non-backwards** compatible changes

test/TestLinearEquations.jl

@@ -0,0 +1,95 @@
+"""
+    module TestLinearEquations - Test LinearEquations(..) in ModiaBase/src/EquationAndStateInfo.jl
+"""
+module TestLinearEquations
+
+using Test
+using Modia
+using Modia.TimerOutputs
+
+println("... Test TestLinearEquations")
+
+# Solve A*x = b as residual equation
+const A = [1.0 2.0 3.0 4.0 5.0;
+           0.0 2.0 0.0 0.0 0.0;
+           0.0 0.0 3.0 0.0 0.0;
+           0.0 0.0 0.0 4.0 0.0;
+           0.0 0.0 0.0 0.0 5.0]
+const b = [-1.0, -2.0, -3.0, -4.0, -5.0]
+const isInitial = true       # the first call must be performed with isInitial=true
+const time  = 0.0            # only for warning/error messages
+const timer = TimerOutput()  # timer to measure the time to solve the linear equation system
+const leq   = Modia.LinearEquations(["x2", "x1"], [:x1], [1,5], 1, false)
+
+computeResidual1(x1)    = A*x1-b
+computeResidual2(x1,x2) = x1[1] + 2*x1[2] + 3*x1[3] + 4*x2
+
+# Solution
+const x1_sol = A\b
+const x2_sol = -(x1_sol[1] + 2*x1_sol[2] + 3*x1_sol[3])/4.0
+
+# Test function for ODE mode
+function solveLinearEquation(leq,isInitial,time,timer)
+    local x1::Vector{Float64}, x2
+    leq.mode = -3
+    while Modia.LinearEquationsIteration!(leq, isInitial, time, timer)
+        x1 = leq.x_vec[1]
+        x2 = leq.x[1]
+        append!(leq.residuals, computeResidual1(x1))
+        append!(leq.residuals, computeResidual2(x1,x2))
+    end
+    return (x1,x2)
+end
+
+# Test function for DAE mode
+function solveLinearEquation(leq,isInitial,solve_leq,isStoreResult,time,timer)
+    local x1, x2
+    leq.mode = -3
+    while Modia.LinearEquationsIteration!(leq, isInitial, solve_leq, isStoreResult, time, timer)
+        x1 = leq.x_vec[1]
+        x2 = leq.x[1]
+        append!(leq.residuals, computeResidual1(x1))
+        append!(leq.residuals, computeResidual2(x1,x2))
+    end
+    return (x1,x2)
+end
+
+@testset "Test TestLinearEquations" begin
+    # Test ODE mode (x is always explicitly computed by solving the linear equation system)
+    leq.odeMode = true
+    (x1,x2) = solveLinearEquation(leq,isInitial,time,timer)
+
+    d1   = x1_sol-x1
+    err1 = sqrt(d1'*d1) + abs(x2_sol - x2)
+    @test isapprox(err1, 0.0, atol=1e-13)
+
+
+    # Test DAE mode
+    leq.odeMode = false
+
+    # x is computed explicitly at initialization or at an event
+    (x1,x2) = solveLinearEquation(leq,false,true,false,time,timer)
+    d2   = x1_sol-x1
+    err2 = sqrt(d2'*d2) + abs(x2_sol - x2)
+    @test isapprox(err2, 0.0, atol=1e-13)
+
+    # x is computed by DAE solver
+    leq.x = [6.0, 1.0, 2.0, 3.0, 4.0, 5.0]  # Provide x from DAE solver
+    (x1,x2) = solveLinearEquation(leq,false,false,false,time,timer)
+    residuals = leq.residuals      # Store residuals in DAE solver
+    d3 = leq.x - vcat(x2,x1)
+    d4 = vcat(A*leq.x[2:6] - b, leq.x[2] + 2*leq.x[3] + 3*leq.x[4] + 4*leq.x[1]) - residuals
+    err3 = sqrt(d3'*d3)
+    err4 = sqrt(d4'*d4)
+    @test isapprox(err3, 0.0, atol=1e-15)
+    @test isapprox(err4, 0.0, atol=1e-15)
+
+    # x is computed by DAE solver at a communication point (leq.residuals is not provided)
+    leq.x = [6.0, 1.0, 2.0, 3.0, 4.0, 5.0]  # Provide x from DAE solver
+    (x1,x2) = solveLinearEquation(leq,false,false,true,time,timer)
+    d5 = leq.x - vcat(x2,x1)
+    err5 = sqrt(d5'*d5)
+    @test isapprox(err5, 0.0, atol=1e-15)
+end
+
+end