Merge branch 'master' into tabs

Author: HildingElmqvist

README.md

@@ -92,7 +92,6 @@ The version released now is partial since certain prototype functionalities need
 ### Enhance and refactor prototype codes for:
 
 - Alias handling
-- Unit handling (change to use Unitful.jl instead of SIUnits.jl)
 - Handle overdetermined equations
 - Introduction of partial and block attribute to models 
 - Automatic state selection

REQUIRE

@@ -1,4 +1,3 @@
 julia 0.6
 ModiaMath
-SIUnits
 Unitful

src/language/Execution.jl

@@ -18,9 +18,7 @@ import ..Instantiation: Symbolic, Der, Instance, AbstractDict, VariableDict, Var
 import ..Instantiation: Variability, constant, parameter, discrete, continuous
 
 import ModiaMath #0.7
-using SIUnits
-using SIUnits.ShortUnits
-import Unitful
+using Unitful
 using ..ModiaLogging
 
 const PrintJSONsolved = false 
@@ -134,7 +132,7 @@ function code_eliminated_func(fname, unpack, eliminated_computations, vars, x::S
         T, dims = var.typ, get_dims(var)
 #        if T == A; T = Float64; end
 #        if T != Any || T != Float64; T = Any; end  # Hack to handle units
-        if typeof(T) <: SIUnits.SIUnit; T = Float64; end # To handle units
+        if typeof(T) <: Unitful.Unitlike; T = Float64; end # To handle units
 #        @show T, string(var)
 
         if !isempty(dims);  T = Array{T,length(dims)};  end
@@ -831,4 +829,4 @@ function makeJSON(ex::Expr)
   end
 end
 
-end
+end

src/language/Instantiation.jl

@@ -29,9 +29,7 @@ using DataStructures.OrderedDict
 end
 
 import ModiaMath #0.7
-using SIUnits
-using SIUnits.ShortUnits
-import Unitful
+using Unitful
 using ..ModiaLogging 
 #using ..Synchronous
 
@@ -52,7 +50,7 @@ mutable struct Variable  # {T,n}
     typ
     size
     value #  ::T
-    unit::SIUnits.SIUnit
+    unit::Unitful.Unitlike
     displayUnit
     min
     max
@@ -67,7 +65,7 @@ end
 # The variability, type and info are added as attributes in the type for uniform treatment. 
 # Input/output, etc should also be added.
 
-Variable(;value=nothing, info="", unit=if typeof(value) <: SIUnits.SIQuantity; SIUnits.unit(value) else SIPrefix end, 
+Variable(;value=nothing, info="", unit=if typeof(value) <: Unitful.Quantity; Unitful.unit(value) else Unitful.NoUnits end, 
     displayUnit=unit, 
     min=nothing, max=nothing, start=nothing, fixed::Bool=false, nominal=nothing,
     variability=continuous, T=if value==nothing; Any else typeof(value) end, size=if value==nothing; nothing else Base.size(value) end, flow::Bool=false, state::Bool=true, property=general) = 
@@ -99,7 +97,7 @@ function Base.show(io::IO, v::Variable)
     print(io, "start = ", v.start)
     first = false
   end
-  if v.unit != SIPrefix
+  if v.unit != NoUnits
     if ! first; print(io, ", ") end
     print(io, "unit = ", v.unit)
     first = false
@@ -1005,4 +1003,4 @@ function prettyPrint(e::Expr)
 end
 
 
-end 
+end 

src/models/Electric.jl

@@ -11,18 +11,18 @@ module Electric
 using ..Instantiation
 using ..Blocks
 using ..Synchronous: positive
-using SIUnits
+using Unitful
 
 using Modia
 
 export Pin, Ground, OnePort, Resistor, Capacitor, Inductor, 
   ConstantVoltage, StepVoltage, SignalVoltage, SineVoltage, IdealOpAmp3Pin, IdealDiode,
   Voltage, Current, Resistance, Capacitance
 
-Voltage(; args...) = Variable(;T=Volt, size=(), start=0.0, args...)
-Current(; args...) = Variable(;T=Ampere, size=(), start=0.0, args...)
-Resistance(; args...) = Variable(;T=Ohm, size=(), args...)
-Capacitance(; args...) = Variable(;T=Farad, size=(), args...)
+Voltage(; args...) = Variable(;T=Unitful.V, size=(), start=0.0, args...)
+Current(; args...) = Variable(;T=Unitful.A, size=(), start=0.0, args...)
+Resistance(; args...) = Variable(;T=Unitful.Ω, size=(), args...)
+Capacitance(; args...) = Variable(;T=Unitful.F, size=(), args...)
 
 @model Pin1 begin
   v=Float()
@@ -127,7 +127,7 @@ end
 end
 
 @model ConstantVoltage begin
-  V=1*Volt
+  V=1u"V"
   @extends OnePort()
   @inherits v
 @equations begin
@@ -136,7 +136,7 @@ end
 end
 
 @model StepVoltage begin
-  V=1*Volt
+  V=1u"V"
   startTime = 0*Seconds
   t = Var(start=0.0)
   @extends OnePort()
@@ -257,4 +257,4 @@ end
   end
 end 
 
-end
+end

src/models/ModiaBase.jl

@@ -3,32 +3,31 @@
 using .Instantiation
 using .ModelElaboration
 
-using SIUnits
-using SIUnits.ShortUnits
+using Unitful
 using .StructuralTransform
 using .Synchronous: sample, Clock, previous, hold, positive, positiveChange, positiveEdge
 
 Var(; args...) = Variable(; args...)
 
-Float(value=nothing; info="", size=nothing, unit=SIPrefix, displayUnit=SIPrefix, 
+Float(value=nothing; info="", size=nothing, unit=NoUnits, displayUnit=NoUnits, 
     min=nothing, max=nothing, start=nothing, fixed::Bool=false, nominal=nothing,
     variability=continuous, 
     flow::Bool=false, state::Bool=true) = Variable(variability, Float64, size, value, 
     unit, displayUnit, min, max, start, fixed, nominal, info, flow, state, general)
 
-Boolean(value=nothing; info="", size=nothing, unit=SIPrefix, displayUnit=SIPrefix, 
+Boolean(value=nothing; info="", size=nothing, unit=NoUnits, displayUnit=NoUnits, 
     min=nothing, max=nothing, start=nothing, fixed::Bool=false, nominal=nothing,
     variability=continuous, 
     flow::Bool=false, state::Bool=true) = Variable(variability, Bool, size, value, 
     unit, displayUnit, min, max, start, fixed, nominal, info, flow, state, general)
 
-Integ(value=nothing; info="", size=nothing, unit=SIPrefix, displayUnit=SIPrefix, 
+Integ(value=nothing; info="", size=nothing, unit=NoUnits, displayUnit=NoUnits, 
     min=nothing, max=nothing, start=nothing, fixed::Bool=false, nominal=nothing,
     variability=continuous, 
     flow::Bool=false, state::Bool=true) = Variable(variability, Int, size, value, 
     unit, displayUnit, min, max, start, fixed, nominal, info, flow, state, general)
 
-Str(value=nothing; info="", size=nothing, unit=SIPrefix, displayUnit=SIPrefix, 
+Str(value=nothing; info="", size=nothing, unit=NoUnits, displayUnit=NoUnits, 
     min=nothing, max=nothing, start=nothing, fixed::Bool=false, nominal=nothing,
     variability=continuous, 
     flow::Bool=false, state::Bool=true) = Variable(variability, String, size, value, 
@@ -56,4 +55,4 @@ Par(value; args...) = Variable(variability=parameter, value=value; args...)
 
 const undefined=nothing
 
-#end
+#end

src/symbolic/DAEquations/SymbolicTransform.jl

@@ -19,9 +19,7 @@ using ..Instantiation
 import ..Instantiation: GetField, This, Der, Symbolic, time_global, simulationModel_symbol
 using Base.Meta: quot, isexpr
 using DataStructures
-using SIUnits
-using SIUnits.ShortUnits
-using SIUnits.SIQuantity
+using Unitful
 using ..Synchronous
 using ..BLTandPantelidesUtilities
 #using ..Utilities
@@ -145,7 +143,7 @@ function getincidence(e)
 #    @show e typeof(e)
     if isa(e, Function)
       incidence = [e in operators ? nothing : e] 
-    elseif typeof(e) <: SIUnits.SIQuantity
+    elseif typeof(e) <: Unitful.Quantity
  #     dump(e)
       incidence = nothing
     elseif typeof(e) == Instantiation.GetField
@@ -512,10 +510,10 @@ end
 #      diff = if ! derAsFunction; :($zero*$e) else zero*e end
       diff = if ! derAsFunction; :($zero) else zero*e end
       if ! noUnits 
-        diff = diff / SIUnits.Second
+        diff = diff / Unitful.s
       end
-    elseif typeof(e) <: SIUnits.SIQuantity ||  typeof(e) <: SIUnits.SIUnit
-      diff = zero*e / SIUnits.Second
+    elseif typeof(e) <: Unitful.Quantity ||  typeof(e) <: Unitful.Unitlike
+      diff = zero*e / Unitful.s
     elseif typeof(e) in [Array{Float64}, Array{Int64}]
 #      diff = :($zero*$e) # zero*e
       diff = :($zero) # zero*e
@@ -541,12 +539,12 @@ end
 #        dump(e)
         i = findfirst(realStates, e)
         if i > 0
-          diff = Der(e) # / SIUnits.Second 
+          diff = Der(e) # / Unitful.s
 #        @show realStates i e diff
         else
 #          diff = GetField(This(), Symbol("DER("*string(e.name)*")"))
 #          dummyDerivatives[Symbol("DER("*string(e.name)*")")] = nothing
-          diff = GetField(This(), Symbol("der_"*string(e.name))) # / SIUnits.Second # With units
+          diff = GetField(This(), Symbol("der_"*string(e.name))) # / Unitful.s # With units
           dummyDerivatives[Symbol("der_"*string(e.name))] = nothing
           if logDifferentiateVariable
             println("  Dummy derivative: ", diff)
@@ -565,7 +563,7 @@ end
       if true
         diff = GetField(This(), Symbol("der_der_"*string(e.base.name))) 
         if ! noUnits 
-          diff = diff / SIUnits.Second
+          diff = diff / Unitful.s
         end
         dummyDerivatives[Symbol("der_der_"*string(e.base.name))] = nothing
       elseif e.base.name == Symbol("j.s")   # Hack!!!
@@ -1094,4 +1092,4 @@ function newDifferentiateEquations(equations, variables, A, B, ESorted, ESolved)
 end
   
 end
-  
+

src/symbolic/Utilities.jl

@@ -12,7 +12,7 @@ module Utilities
 using ..Instantiation: GetField, Der, InitVariable, Extends, Instance, Variable, Variability, constant, parameter, discrete, continuous, Connect, vars_of
 using ..Execution: split_variables
 using Base.Meta: quot, isexpr
-using SIUnits
+using Unitful
 using ..Instantiation
 
 using ..ModiaLogging 
@@ -132,7 +132,7 @@ function showVariable(v)
       logModia("start = ", v.start)
       first = false
     end
-    if v.unit != SIPrefix
+    if v.unit != NoUnits
       if ! first; logModia(", ") end
       logModia("unit = ", v.unit)
       first = false
@@ -342,4 +342,4 @@ function printJSON(file, inst::Instance, fullName, name, parent="", indent="", l
 end
 
 
-end
+end

test/models/TestVariableTypes.jl

@@ -9,7 +9,6 @@ using Modia
 using ModiaMath.plot
 #using FixedSizeArrays
 using StaticArrays
-using SIUnits
 using Unitful
 using Unitful.DefaultSymbols
 import Unitful:
@@ -40,7 +39,7 @@ Float3x3(;args...) = Variable(T=Float64, size=(3,3); args...)
 FixedFloat3(;args...) = Variable(T=Vec{3,Float64}; args...)
 FixedFloat3x3(;args...) = Variable(T=Mat{3,3,Float64}; args...)
 
-Voltage(; args...) = Variable(T=Volt; args...)
+Voltage(; args...) = Variable(T=Unitful.V; args...)
 
 #Real = (;args...)->Variable(typ=Float64; args...)
 
@@ -137,7 +136,7 @@ println()
 
   v4 = [1,2,3]
   v5 = [1,2,3]
-  v6 = 10.0Volt
+  v6 = 10.0u"V"
   end
 end 
 
@@ -161,8 +160,8 @@ println("Variable(T=Array{Float64,1}; args...) does not work with storeEliminate
   l = 2u"m" + 30cm + 55.7mm  # + 2m not possible due to variable m
 @equations begin
   # SIunits
-  v1 = 10.0Meter  
-  v2 = 5.5Volt  
+  v1 = 10.0u"m"
+  v2 = 5.5u"V"
   # Unitful
   v3 = 1u"kg" + 2u"g" + 10*sin(2*time)*u"hg"  
 #  der(v3) = 1.0u"kg/s"  # Differential equations with units are not handled yet
@@ -172,7 +171,7 @@ println("Variable(T=Array{Float64,1}; args...) does not work with storeEliminate
 end 
 
 result = simulate(TestVariableUnits1, 1)
-#result = checkSimulation(TestVariableUnits1, 1, "v1", 10Meter)
+#result = checkSimulation(TestVariableUnits1, 1, "v1", 10u"m")
 @show result["v2"][end]
 @show result["v3"][end]
 @show result["v4"][end]
@@ -188,4 +187,4 @@ plot(result, ("v3", "v4", "a"), figure=1)
 
 end
 
-end
+end