Adpated to latest SignalTables version + SignalTables functions used in TestFirstOrder2.jl (especially, writing signals to file)

Author: MartinOtter

Manifest.toml

@@ -201,9 +201,9 @@ version = "0.4.0"
 
 [[deps.DiffEqBase]]
 deps = ["ArrayInterfaceCore", "ChainRulesCore", "DataStructures", "Distributions", "DocStringExtensions", "FastBroadcast", "ForwardDiff", "FunctionWrappers", "LinearAlgebra", "Logging", "MuladdMacro", "NonlinearSolve", "Parameters", "Printf", "RecursiveArrayTools", "Reexport", "Requires", "SciMLBase", "Setfield", "SparseArrays", "StaticArrays", "Statistics", "ZygoteRules"]
-git-tree-sha1 = "9862c61c6049b0ad5a6b433e31d2c6c8ff373056"
+git-tree-sha1 = "f7a479aac5f3917b8472ac5f1b77d6f296fe58f1"
 uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
-version = "6.92.2"
+version = "6.92.3"
 
 [[deps.DiffEqCallbacks]]
 deps = ["DataStructures", "DiffEqBase", "ForwardDiff", "LinearAlgebra", "NLsolve", "Parameters", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArrays"]
@@ -533,9 +533,9 @@ version = "0.11.0"
 
 [[deps.MonteCarloMeasurements]]
 deps = ["Distributed", "Distributions", "LinearAlgebra", "MacroTools", "Random", "RecipesBase", "Requires", "SLEEFPirates", "StaticArrays", "Statistics", "StatsBase", "Test"]
-git-tree-sha1 = "03619e255664666b352a5e5f6b45e8b00d439870"
+git-tree-sha1 = "a7e89fde6ff10000e1a8f4d697b978d3908e913a"
 uuid = "0987c9cc-fe09-11e8-30f0-b96dd679fdca"
-version = "1.0.8"
+version = "1.0.9"
 
 [[deps.MozillaCACerts_jll]]
 uuid = "14a3606d-f60d-562e-9121-12d972cd8159"

Project.toml

@@ -3,26 +3,6 @@ name = "Modia"
 uuid = "cb905087-75eb-5f27-8515-1ce0ec8e839e"
 version = "0.9.0-dev"
 
-[compat]
-DiffEqBase = "6.92.2"
-DataFrames = "1"
-DifferentialEquations = "7"
-FiniteDiff = "2"
-ForwardDiff = "0.10"
-JSON = "0.21"
-Measurements = "2"
-ModiaBase = "0.11"
-MonteCarloMeasurements = "1"
-OrderedCollections = "1"
-RecursiveFactorization = "0.2"
-Reexport = "1"
-SignalTables = "0.2"
-StaticArrays = "1"
-Sundials = "4"
-TimerOutputs = "0.5"
-Unitful = "1"
-julia = "1.7"
-
 [deps]
 DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
@@ -46,5 +26,25 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
 
+[compat]
+DiffEqBase = "6.82.0"
+DataFrames = "1"
+DifferentialEquations = "7"
+FiniteDiff = "2"
+ForwardDiff = "0.10"
+JSON = "0.21"
+Measurements = "2"
+ModiaBase = "0.11"
+MonteCarloMeasurements = "1"
+OrderedCollections = "1"
+RecursiveFactorization = "0.2"
+Reexport = "1"
+SignalTables = "0.2, 0.3"
+StaticArrays = "1"
+Sundials = "4"
+TimerOutputs = "0.5"
+Unitful = "1"
+julia = "1.7"
+
 [extras]
 CPUSummary = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"

docs/src/Functions.md

@@ -60,7 +60,10 @@ showEvaluatedParameters
 CurrentModule = Modia
 ```
 
-The simulation result of a model `instantiatedModel` supports the functions of
+The simulation result of a model `instantiatedModel` are provided as *signal table*
+(see [SignalTables.jl]()).
+Therefore, all functions[SignalTables.jl functions] can be used.
+These functions
 [ModiaResult](https://modiasim.github.io/ModiaResult.jl/stable/Functions.html) and
 exports them, so the functions can be accessed without prefixing them with `Modia`.
 

src/CodeGeneration.jl

@@ -184,9 +184,9 @@ mutable struct SimulationOptions{FloatType,TimeType}
         rawStopTime = get(kwargs, :stopTime, startTime)
         stopTime    = convertTimeVariable(TimeType, rawStopTime)
         interval    = convertTimeVariable(TimeType, get(kwargs, :interval , (stopTime - startTime)/500.0) )
-        dtmax       = get(kwargs, :dtmax, 100*getValue(interval))
+        dtmax       = get(kwargs, :dtmax, 100*getValueOnly(interval))
         if ismissing(dtmax) || isnothing(dtmax)
-            dtmax = 100*getValue(interval)
+            dtmax = 100*getValueOnly(interval)
         end
         dtmax = convert(Float64, dtmax)
         desiredResultTimeUnit = unit(rawStopTime)
@@ -1676,7 +1676,7 @@ function new_x_segmented_variable!(m::SimulationModel{FloatType,TimeType}, x_nam
         new_result_info = false
         x_info = result.info[x_name]
         @assert(x_info.kind == RESULT_X)
-        @assert(basetype(startOrInit) == FloatType)
+        @assert(eltypeOrType(startOrInit) == FloatType)
         @assert(length( x_info.id[end].dims ) == ndims(startOrInit))   # Number of dimensions cannot change
         #if typeof(startOrInit) <: Number
         #    @assert(xi_info.scalar)
@@ -1713,10 +1713,17 @@ function new_x_segmented_variable!(m::SimulationModel{FloatType,TimeType}, x_nam
         # after function initialStateVector!(...) was called.
         t_unit = get(result.info[result.timeName].signal, :unit, "")
         der_x_unit = x_unit == "" ? SignalTables.unitAsParseableString(unit(1/uparse(t_unit))) : SignalTables.unitAsParseableString(unit(uparse(x_unit)/uparse(t_unit)))
-        x_var = Var(unit=x_unit, start=xi_info.startOrInit, fixed=xi_info.fixed, state=true, der=xi_info.der_x_name)
-        
-        result.info[x_name]     = ResultInfo(RESULT_X    , x_var, FloatType) 
-        result.info[der_x_name] = ResultInfo(RESULT_DER_X, Var(unit=der_x_unit), FloatType)
+        if x_unit == ""
+            x_var = Var(start=xi_info.startOrInit, fixed=xi_info.fixed, state=true, der=xi_info.der_x_name)        
+        else
+            x_var = Var(unit=x_unit, start=xi_info.startOrInit, fixed=xi_info.fixed, state=true, der=xi_info.der_x_name)
+        end
+        result.info[x_name]     = ResultInfo(RESULT_X, x_var, FloatType) 
+        if der_x_unit == ""
+            result.info[der_x_name] = ResultInfo(RESULT_DER_X, Var(), FloatType)        
+        else
+            result.info[der_x_name] = ResultInfo(RESULT_DER_X, Var(unit=der_x_unit), FloatType)
+        end
     end 
     return x_segmented_startIndex
 end
@@ -1765,7 +1772,7 @@ function new_w_segmented_variable!(m::SimulationModel, name::String, w_segmented
         else
             signal = Var(unit=unit)
         end            
-        result.info[name] = ResultInfo(RESULT_W_SEGMENTED, signal, ValuesID(m.nsegments, w_index, w_size), basetype(w_segmented_default))
+        result.info[name] = ResultInfo(RESULT_W_SEGMENTED, signal, ValuesID(m.nsegments, w_index, w_size), eltypeOrType(w_segmented_default))
     end
     #println("new_w_segmented_variable: w_segmented_temp = ", result.w_segmented_temp)
     return w_index
@@ -2012,7 +2019,7 @@ function generate_getDerivatives!(FloatType, TimeType, AST::Vector{Expr}, equati
     end
 
     # Generate code of the function
-    # temporarily removed: _m.time = $TimeType(Modia.getValue(_time))
+    # temporarily removed: _m.time = $TimeType(Modia.getValueOnly(_time))
     code = quote
                 function $functionName(_x, _m::Modia.SimulationModel{$FloatType,$TimeType}, _time::$TimeType)::Nothing
                     _FloatType = $FloatType

src/EventHandler.jl

@@ -19,9 +19,9 @@ should be used. Only in special cases, the other flags are useful.
 
 
 using  ForwardDiff
-getValue(v) = v
-getValue(v::ForwardDiff.Dual) = v.value
-getValue(v::Measurements.Measurement) = Measurements.value(v)
+getValueOnly(v) = v
+getValueOnly(v::ForwardDiff.Dual) = v.value
+getValueOnly(v::Measurements.Measurement) = Measurements.value(v)
 
 
 const nClock = 100
@@ -278,12 +278,12 @@ function after!(h::EventHandler{FloatType,TimeType}, nr::Int, t::Number, tAsStri
 end
 
 
-#positive!(h, nr, crossing, crossingAsString, leq_mode; restart=Restart) = positive!(h, nr, getValue(crossing), crossingAsString, leq_mode; restart=restart)
+#positive!(h, nr, crossing, crossingAsString, leq_mode; restart=Restart) = positive!(h, nr, getValueOnly(crossing), crossingAsString, leq_mode; restart=restart)
 
 function positive!(h::EventHandler{FloatType,TimeType}, nr::Int, crossing, crossingAsString::String,
                    leq::Union{Nothing,Modia.LinearEquations{FloatType}};
                    restart::EventRestart=Restart)::Bool where {FloatType,TimeType}
-    crossing = getValue(crossing)
+    crossing = getValueOnly(crossing)
 
     if h.initial
         if !isnothing(leq) && leq.mode >= 0
@@ -330,7 +330,7 @@ end
 function negative!(h::EventHandler{FloatType,TimeType}, nr::Int, crossing, crossingAsString::String,
                    leq::Union{Nothing,Modia.LinearEquations{FloatType}};
                    restart::EventRestart=Restart)::Bool where {FloatType,TimeType}
-    crossing = getValue(crossing)
+    crossing = getValueOnly(crossing)
 
     if h.initial
         if !isnothing(leq) && leq.mode >= 0
@@ -419,7 +419,7 @@ function edge!(h::EventHandler{FloatType,TimeType}, nr::Int, crossing, crossingA
                "iteration variables $(leq.vTear_names). This is not supported."
     end
 
-    crossing = getValue(crossing)
+    crossing = getValueOnly(crossing)
 
     if h.initial
         h.zPositive[nr] = crossing > convert(FloatType,0)

src/Modia.jl

@@ -10,7 +10,7 @@ module Modia
 
 const path = dirname(dirname(@__FILE__))   # Absolute path of package directory
 const Version = "0.9.0-dev"
-const Date = "2022-07-03"
+const Date = "2022-07-04"
 const modelsPath = joinpath(Modia.path, "models")
 
 print(" \n\nWelcome to ")
@@ -83,13 +83,10 @@ export instantiateModel, @instantiateModel, assert, stringifyDefinition
 export stripUnit
 
 export simulate!, linearize!, get_result
-#export @usingModiaPlot, usePlotPackage, usePreviousPlotPackage, currentPlotPackage
-export resultInfo, showResultInfo, rawSignal, getPlotSignal, defaultHeading
-export signalNames, timeSignalName, hasSignal
 export hasParameter, getParameter, getEvaluatedParameter
 export showParameters, showEvaluatedParameters
 
-export SimulationModel, measurementToString, get_lastValue, getLastValue
+export SimulationModel, measurementToString, get_lastValue, getLastValue, getStateNames
 export positive, negative, previous, edge, after, reinit, pre
 export initial, terminal, isInitial, isTerminal, initLinearEquationsIteration!
 export get_xNames
@@ -113,11 +110,6 @@ using ModiaBase.BLTandPantelidesUtilities
 using ModiaBase.BLTandPantelides
 using ModiaBase.Differentiate
 
-#import SignalTables
-#import SignalTables.: usePlotPackage, usePreviousPlotPackage, currentPlotPackage
-#import SignalTables.: resultInfo, showResultInfo, getPlotSignal, getDefaultHeading
-#import SignalTables.: signalNames, timeSignalName, hasSignal
-
 import StaticArrays   # Make StaticArrays available for the tests
 
 

src/Result.jl

@@ -72,12 +72,12 @@ mutable struct ResultInfo
     aliasName::String                # Name of non-eliminated variable
     aliasNegate::Bool                # = true, if info[aliasName] signal must be negated  
     id::Vector{ValuesID}             # Location of the variable values with respect to ResultKind and Result
-    _basetype                        # If known, basetype(signal.values/.values); if not known: Nothing
+    _eltypeOrType                        # If known, eltypeOrType(signal.values/.values); if not known: Nothing
     value::Any                       # Value of constant variable (without unit)    
 
-    ResultInfo(kind::ResultKind, signal, _basetype)                                       = new(kind             , signal, ""       , false      , ValuesID[]  , _basetype, nothing)  
-    ResultInfo(kind::ResultKind, signal, id::ValuesID, _basetype)                         = new(kind             , signal, ""       , false      , ValuesID[id], _basetype, nothing)     
-    ResultInfo(signal::SignalTables.SymbolDictType, value)                                = new(RESULT_CONSTANT  , signal, ""       , false      , ValuesID[]  , basetype(value), value)    
+    ResultInfo(kind::ResultKind, signal, _eltypeOrType)                                       = new(kind             , signal, ""       , false      , ValuesID[]  , _eltypeOrType, nothing)  
+    ResultInfo(kind::ResultKind, signal, id::ValuesID, _eltypeOrType)                         = new(kind             , signal, ""       , false      , ValuesID[id], _eltypeOrType, nothing)     
+    ResultInfo(signal::SignalTables.SymbolDictType, value)                                = new(RESULT_CONSTANT  , signal, ""       , false      , ValuesID[]  , eltypeOrType(value), value)    
     ResultInfo(signal::SignalTables.SymbolDictType, aliasName::String, aliasNegate::Bool) = new(RESULT_ELIMINATED, signal, aliasName, aliasNegate, ValuesID[], Nothing, nothing)
 end
 
@@ -130,15 +130,23 @@ mutable struct Result{FloatType,TimeType}
             @assert(!haskey(info, xi_info.der_x_name))
             x_unit     = xi_info.unit
             der_x_unit = x_unit == "" ? "1/s" : unitAsParseableString(uparse(x_unit)/u"s")
-            x_var = Var(unit=x_unit, start=xi_info.startOrInit, fixed=xi_info.fixed, state=true, der=xi_info.der_x_name)
+            if x_unit == ""
+                x_var = Var(start=xi_info.startOrInit, fixed=xi_info.fixed, state=true, der=xi_info.der_x_name)
+            else
+                x_var = Var(unit=x_unit, start=xi_info.startOrInit, fixed=xi_info.fixed, state=true, der=xi_info.der_x_name)
+            end
             if !isnan(xi_info.nominal)
                 x_var[:nominal] = xi_info.nominal
             end
             if xi_info.unbounded
                 x_var[:unbounded] = true
             end
-            info[xi_info.x_name]     = ResultInfo(RESULT_X    , x_var, FloatType)
-            info[xi_info.der_x_name] = ResultInfo(RESULT_DER_X, Var(unit=der_x_unit), FloatType)
+            info[xi_info.x_name]     = ResultInfo(RESULT_X, x_var, FloatType)
+            if der_x_unit == ""
+                info[xi_info.der_x_name] = ResultInfo(RESULT_DER_X, Var(), FloatType)            
+            else
+                info[xi_info.der_x_name] = ResultInfo(RESULT_DER_X, Var(unit=der_x_unit), FloatType)
+            end
         end
 
         # Fill info with w_invariant
@@ -214,12 +222,12 @@ function signalResultValues(t::AbstractVector, s::AbstractVector, resultInfo::Re
     id = resultInfo.id
     @assert(length(id) > 0)    
     inlineValues = resultInfo.kind == RESULT_X || resultInfo.kind == RESULT_DER_X
-    _basetype    = resultInfo._basetype
+    _eltypeOrType    = resultInfo._eltypeOrType
     ndims_s      = length(id[1].dims)
     if id[1].segment == -1 && ndims_s == 0
         # Scalar signal that is defined in every segment
         index = id[1].index
-        sc = _basetype[ustrip.(ti[index]) for sk in s for ti in sk]
+        sc = _eltypeOrType[ustrip.(ti[index]) for sk in s for ti in sk]
 
     else
         # Find largest dims = dimsMax in all segments
@@ -248,10 +256,10 @@ function signalResultValues(t::AbstractVector, s::AbstractVector, resultInfo::Re
         dims  = (dims1, dimsMax...)
         if hasMissing
             # Allocate target memory with missing values
-            sc = Array{Union{_basetype,Missing}, length(dims)}(missing, dims)
+            sc = Array{Union{_eltypeOrType,Missing}, length(dims)}(missing, dims)
         else
             # Allocate target memory with undef values
-            sc = Array{_basetype, length(dims)}(undef, dims)
+            sc = Array{_eltypeOrType, length(dims)}(undef, dims)
         end
 
         # Copy subset of s-values to target sc