Move EquationAndStateInfo.jl and StateSelection.jl from ModiaBase to Modia and adapt Modia

Author: MartinOtter

Project.toml

@@ -10,12 +10,14 @@ FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
 ModiaBase = "ec7bf1ca-419d-4510-bbab-199861c55244"
 ModiaResult = "16a87621-1533-42f6-8e19-4a825980cec2"
 MonteCarloMeasurements = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+RecursiveFactorization = "f2c3362d-daeb-58d1-803e-2bc74f2840b4"
 Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 Sundials = "c3572dad-4567-51f8-b174-8c6c989267f4"
@@ -30,10 +32,11 @@ FiniteDiff = "2"
 ForwardDiff = "0.10"
 JSON = "0.21"
 Measurements = "2"
-ModiaBase = "0.9.2"
+ModiaBase = "0.10, 0.9.2"
 ModiaResult = "0.4.1"
 MonteCarloMeasurements = "1"
 OrderedCollections = "1"
+RecursiveFactorization = "0.2"
 Reexport = "1"
 StaticArrays = "1"
 Sundials = "4.4"

examples/MotorControl.jl

@@ -142,7 +142,7 @@ end
 #=
 module MotorControlModuleMonteCarlo
 
-using ModiaBase.Modia
+using Modia
 using Unitful
 using Main.MotorControlModule
 include("../test/SimulateAndPlot.jl")

examples/runexamples.jl

@@ -10,11 +10,4 @@ include("MotorControl.jl")
 include("Pendulum.jl")   
 include("ServoSystem.jl")
 
-include("Pendulum3D_1.jl")
-include("Pendulum3D_2.jl")
-include("Pendulum3D_3.jl")
-include("BouncingSphere3D_1.jl")
-include("BouncingSphere3D_2.jl")
-include("Mobile3D.jl")
-
 end

src/CodeGeneration.jl

@@ -275,7 +275,7 @@ end
 - `modelName::String`: Name of the model
 - `getDerivatives::Function`: Function that is used to evaluate the model equations,
   typically generated with [`Modia.generate_getDerivatives!`].
-- `equationInfo::ModiaBase.EquationInfo`: Information about the states and the equations.
+- `equationInfo::Modia.EquationInfo`: Information about the states and the equations.
 - `x_startValues`:: Deprecated (is no longer used).
 - `parameters`: A hierarchical NamedTuple of (key, value) pairs defining the parameter and init/start values.
 - variableNames: A vector of variable names. A name can be a Symbol or a String.
@@ -289,8 +289,8 @@ mutable struct SimulationModel{FloatType,TimeType}
     cpuLast::UInt64                   # Last time from time_ns()
     options::SimulationOptions{FloatType,TimeType}
     getDerivatives!::Function
-    equationInfo::ModiaBase.EquationInfo
-    linearEquations::Vector{ModiaBase.LinearEquations{FloatType}}
+    equationInfo::Modia.EquationInfo
+    linearEquations::Vector{Modia.LinearEquations{FloatType}}
     eventHandler::EventHandler{FloatType,TimeType}
     vSolvedWithInitValuesAndUnit::OrderedDict{String,Any}   # Dictionary of (names, init values with units) for all explicitly solved variables with init-values defined
 
@@ -419,9 +419,9 @@ mutable struct SimulationModel{FloatType,TimeType}
         x_vec = [zeros(FloatType, equationInfo.x_info[i].length) for i in equationInfo.nxFixedLength+1:length(equationInfo.x_info)]
 
         # Construct data structure for linear equations
-        linearEquations = ModiaBase.LinearEquations{FloatType}[]
+        linearEquations = Modia.LinearEquations{FloatType}[]
         for leq in equationInfo.linearEquations
-            push!(linearEquations, ModiaBase.LinearEquations{FloatType}(leq...))
+            push!(linearEquations, Modia.LinearEquations{FloatType}(leq...))
         end
 
         # Initialize execution flags
@@ -447,9 +447,9 @@ mutable struct SimulationModel{FloatType,TimeType}
 
     function SimulationModel{FloatType,TimeType}(m::SimulationModel) where {FloatType,TimeType}
         # Construct data structure for linear equations
-        linearEquations = ModiaBase.LinearEquations{FloatType}[]
+        linearEquations = Modia.LinearEquations{FloatType}[]
         for leq in m.equationInfo.linearEquations
-            push!(linearEquations, ModiaBase.LinearEquations{FloatType}(leq...))
+            push!(linearEquations, Modia.LinearEquations{FloatType}(leq...))
         end
 
         # Initialize execution flags
@@ -852,7 +852,7 @@ end
 
 Return the names of the elements of the x-vector in a Vector{String}.
 """
-get_xNames(m::SimulationModel) = ModiaBase.get_xNames(m.equationInfo)
+get_xNames(m::SimulationModel) = Modia.get_xNames(m.equationInfo)
 
 
 
@@ -1512,7 +1512,7 @@ Symbol `functionName` as function name. By `eval(code)` or
 
 - `AST::Vector{Expr}`: Abstract Syntax Tree of the equations as vector of `Expr`.
 
-- `equationInfo::ModiaBase.EquationInfo`: Data structure returned by `ModiaBase.getSortedAndSolvedAST
+- `equationInfo::Modia.EquationInfo`: Data structure returned by `Modia.getSortedAndSolvedAST
             holding information about the states.
 
 - `parameters`: Vector of parameter names (as vector of symbols)
@@ -1528,7 +1528,7 @@ Symbol `functionName` as function name. By `eval(code)` or
 
 - `hasUnits::Bool`: = true, if variables have units. Note, the units of the state vector are defined in equationinfo.
 """
-function generate_getDerivatives!(AST::Vector{Expr}, equationInfo::ModiaBase.EquationInfo,
+function generate_getDerivatives!(AST::Vector{Expr}, equationInfo::Modia.EquationInfo,
                                   parameters, variables, previousVars, preVars, holdVars, functionName::Symbol;
                                   pre::Vector{Symbol} = Symbol[], hasUnits=false)
 
@@ -1540,7 +1540,7 @@ function generate_getDerivatives!(AST::Vector{Expr}, equationInfo::ModiaBase.Equ
 
     if length(x_info) == 1 && x_info[1].x_name == "_dummy_x" && x_info[1].der_x_name == "der(_dummy_x)"
         # Explicitly solved pure algebraic variables. Introduce dummy equation
-        push!(code_der_x, :( ModiaBase.appendVariable!(_m.der_x, -_x[1]) ))
+        push!(code_der_x, :( Modia.appendVariable!(_m.der_x, -_x[1]) ))
     else
         i1 = 1
         for i in 1:equationInfo.nxFixedLength
@@ -1562,10 +1562,10 @@ 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} = ModiaBase.SVector{$v_length,_FloatType}(_x[$i1:$i2])) )
+                    push!(code_x, :( $x_name::Modia.SVector{$v_length,_FloatType} = Modia.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)) )
+                    push!(code_x, :( $x_name = Modia.SVector{$v_length,_FloatType}(_x[$i1:$i2])::Modia.SVector{$v_length,_FloatType}*@u_str($x_unit)) )
                 end
                 i1 = i2 + 1
             end
@@ -1588,9 +1588,9 @@ function generate_getDerivatives!(AST::Vector{Expr}, equationInfo::ModiaBase.Equ
         for xe in equationInfo.x_info
             der_x_name = xe.der_x_name_julia
             if hasUnits
-                push!(code_der_x, :( ModiaBase.appendVariable!(_m.der_x, Modia.stripUnit( $der_x_name )) ))
+                push!(code_der_x, :( Modia.appendVariable!(_m.der_x, Modia.stripUnit( $der_x_name )) ))
             else
-                push!(code_der_x, :( ModiaBase.appendVariable!(_m.der_x, $der_x_name) ))
+                push!(code_der_x, :( Modia.appendVariable!(_m.der_x, $der_x_name) ))
             end
         end
     end
@@ -1654,7 +1654,7 @@ function generate_getDerivatives!(AST::Vector{Expr}, equationInfo::ModiaBase.Equ
                     $(code_pre...)
 
                     if _m.storeResult
-                        ModiaBase.TimerOutputs.@timeit _m.timer "Modia addToResult!" begin
+                        Modia.TimerOutputs.@timeit _m.timer "Modia addToResult!" begin
                             $(code_copy...)
                             Modia.addToResult!(_m, $(variables...))
                         end