Added possibility to use Variables with attributes also for scripting. Fixed problem with lookup of derivative function in Julia 1.3.

Author: HildingElmqvist

src/language/Execution.jl

@@ -348,7 +348,9 @@ function prepare_ida(instance::Instance, first_F_args, initial_bindings::Abstrac
         s = get_start(var)
         if isa(s, AbstractArray)
             append!(x0, vec(s))
-            append!(x_nominal, vec(var.nominal === nothing ? fill(1.0, var.size) : var.nominal))
+            append!(x_nominal, 
+                vec(var.nominal !== nothing ? var.nominal : var.size !== nothing ?
+                    fill(1.0, var.size) : fill(1.0, length(s))) )
             # @show name, vec(s)            
             append!(diffstates, fill(is_diffstate, length(s)))
         else

src/language/Instantiation.jl

@@ -174,6 +174,12 @@ Variable(;
     Variable(variability, T, size, value, 
     unit, displayUnit, min, max, start, fixed, nominal, info, flow, state, property)
 
+Variable(v; args...) = if typeof(v)==Variable; n=deepcopy(v); @show n; for (k,val) in args n[k]=val end; n else Variable(value=v; args...) end
+
+function Base.size(v::Variable)
+    return size(v.value)
+end
+
 function Base.show(io::IO, v::Variable)
     print(io, "Variable(")
     first = true
@@ -208,7 +214,7 @@ function Base.show(io::IO, v::Variable)
         first = false
     end
 
-    if v.fixed != nothing
+    if v.fixed != false
         if !first; print(io, ", ") end
         print(io, "fixed = ", v.fixed)
         first = false
@@ -250,9 +256,39 @@ function Base.show(io::IO, v::Variable)
         first = false
     end
 
+    if v.info != ""
+        if !first; print(io, ", ") end
+        print(io, "info = ", "\"$(v.info)\"")
+        first = false
+    end
+    
     println(io, ")")
 end
 
+#Base.:+(v1::Variable, v2::Variable) = Variable(value=v1.value+v2.value)
+Base.:+(v1::Variable, v2::Variable) = Variable(value=v1.value+v2.value, 
+  info=if v1.info==nothing && v2.info==nothing; nothing else "("*v1.info*") + ("*v2.info*")" end, 
+  min=if v1.min==nothing || v2.min==nothing; nothing else v1.min+v2.min end, 
+  max=if v1.max==nothing || v2.max==nothing; nothing else v1.max+v2.max end)
+Base.:+(v1, v2::Variable) = Variable(value=v1+v2.value)
+Base.:+(v1::Variable, v2) = Variable(value=v1.value+v2)
+Base.:+(v1::Variable) = Variable(value=+v1.value)
+
+Base.:-(v1::Variable, v2::Variable) = Variable(value=v1.value-v2.value)
+Base.:-(v1, v2::Variable) = Variable(value=v1-v2.value)
+Base.:-(v1::Variable, v2) = Variable(value=v1.value-v2)
+Base.:-(v1::Variable) = Variable(value=-v1.value)
+
+Base.:*(v1::Variable, v2::Variable) = Variable(value=v1.value*v2.value,
+  info=if v1.info==nothing && v2.info==nothing; nothing else "("*v1.info*") * ("*v2.info*")" end, 
+  min=if v1.min==nothing || v2.min==nothing; nothing else min(v1.min*v2.min, v1.max*v2.min, v1.min*v2.max, v1.max*v2.max) end, 
+  max=if v1.max==nothing || v2.max==nothing; nothing else max(v1.min*v2.min, v1.max*v2.min, v1.min*v2.max, v1.max*v2.max) end)
+Base.:*(v1, v2::Variable) = Variable(value=v1*v2.value)
+Base.:*(v1::Variable, v2) = Variable(value=v1.value*v2)
+
+Base.:/(v1::Variable, v2::Variable) = Variable(value=v1.value/v2.value)
+Base.:/(v1, v2::Variable) = Variable(value=v1/v2.value)
+Base.:/(v1::Variable, v2) = Variable(value=v1.value/v2)
 
 "Check that a start value (possibly default) exists for the var, or give an error."
 function check_start(var::Variable, name)

src/models/ModiaBase.jl

@@ -11,6 +11,7 @@ using .Synchronous: sample, Clock, previous, hold, positive, positiveChange, pos
 Shortcut for `Variable`
 """
 Var(; args...) = Variable(; args...)
+Var(value; args...) = Variable(value=value; args...)
 
 """
 Create a floating-point `Variable`

src/symbolic/DAEquations/BasicStructuralTransform.jl

@@ -1822,8 +1822,8 @@ function generateCode(newStateSelection, useKinsol, params, realStates, unknowns
 
     if false
         open("FDAE.jl") do f
-        func = readstring(f)
-      end
+            func = read(f, String)
+        end
     end
 
     FUNC = Meta.parse(func)

src/symbolic/DAEquations/SymbolicTransform.jl

@@ -804,7 +804,12 @@ function differentiate(e)
             for i in 1:length(arguments)
                 arg_der = differentiate(arguments[i])
                 if arg_der != zero
-                    path = split(string(op), ".")
+                    # op does not contain full path to function in Julia 1.3, use typeof()
+                    typeofop = string(typeof(op))
+                    # remove typeof(...)
+                    typeofop = split(typeofop, "(")[2]
+                    typeofop = split(typeofop, ")")[1]                    
+                    path = split(typeofop, ".")
                     if length(path) >= 2
                         mod = path[end-1]
                     else