Merge pull request #80 from ModiaSim/Remove_Unitful_u_str_workaround

Remove Unitful u_str workaround

Author: MartinOtter

Manifest.toml

@@ -9,9 +9,9 @@ version = "0.5.3"
 
 [[CategoricalArrays]]
 deps = ["Compat", "Future", "Missings", "Printf", "Reexport", "Requires"]
-git-tree-sha1 = "11419d157ab75a54a8af63315e7a279a593971bc"
+git-tree-sha1 = "94d16e77dfacc59f6d6c1361866906dbb65b6f6b"
 uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597"
-version = "0.5.1"
+version = "0.5.2"
 
 [[CodecZlib]]
 deps = ["BinaryProvider", "Libdl", "Test", "TranscodingStreams"]
@@ -27,9 +27,9 @@ version = "1.4.0"
 
 [[DataFrames]]
 deps = ["CategoricalArrays", "CodecZlib", "Compat", "DataStreams", "Dates", "InteractiveUtils", "IteratorInterfaceExtensions", "LinearAlgebra", "Missings", "Printf", "Random", "Reexport", "SortingAlgorithms", "Statistics", "StatsBase", "TableTraits", "Tables", "Test", "TranscodingStreams", "Unicode", "WeakRefStrings"]
-git-tree-sha1 = "60c2820c9ae93cc33e98cd820e0b449d551c7874"
+git-tree-sha1 = "7e032a76f3455e38660ac456791951ac2d0b1e70"
 uuid = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
-version = "0.15.1"
+version = "0.16.0"
 
 [[DataStreams]]
 deps = ["Dates", "Missings", "Test", "WeakRefStrings"]
@@ -39,9 +39,9 @@ version = "0.4.1"
 
 [[DataStructures]]
 deps = ["InteractiveUtils", "OrderedCollections", "Random", "Serialization", "Test"]
-git-tree-sha1 = "8fc6e166e24fda04b2b648d4260cdad241788c54"
+git-tree-sha1 = "ca971f03e146cf144a9e2f2ce59674f5bf0e8038"
 uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
-version = "0.14.0"
+version = "0.15.0"
 
 [[Dates]]
 deps = ["Printf"]
@@ -53,9 +53,9 @@ uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 
 [[DiffEqBase]]
 deps = ["Compat", "IteratorInterfaceExtensions", "LinearAlgebra", "RecipesBase", "RecursiveArrayTools", "Requires", "Roots", "SparseArrays", "StaticArrays", "Statistics", "SuiteSparse", "TableTraits", "Test", "TreeViews"]
-git-tree-sha1 = "b8c9c5a296e426d0ad978e6e7ad699dde444d3a1"
+git-tree-sha1 = "9b077135e38482dcf74daf2406b9da4dc4dcb0ca"
 uuid = "2b5f629d-d688-5b77-993f-72d75c75574e"
-version = "4.31.1"
+version = "4.31.2"
 
 [[Distributed]]
 deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"]
@@ -143,9 +143,9 @@ version = "0.6.0"
 
 [[RecursiveArrayTools]]
 deps = ["RecipesBase", "Requires", "StaticArrays", "Statistics", "Test"]
-git-tree-sha1 = "5ac1ea7d018bec90b0be614a9a37d1fd80dce8d9"
+git-tree-sha1 = "152afd0272d2f468c9f564d6f64cc3c10a8c1e94"
 uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
-version = "0.18.4"
+version = "0.18.5"
 
 [[Reexport]]
 deps = ["Pkg"]
@@ -190,19 +190,19 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [[StaticArrays]]
 deps = ["InteractiveUtils", "LinearAlgebra", "Random", "Statistics", "Test"]
-git-tree-sha1 = "97c4bf0f647488dd7ac01ea12be5885f88762938"
+git-tree-sha1 = "1eb114d6e23a817cd3e99abc3226190876d7c898"
 uuid = "90137ffa-7385-5640-81b9-e52037218182"
-version = "0.10.0"
+version = "0.10.2"
 
 [[Statistics]]
 deps = ["LinearAlgebra", "SparseArrays"]
 uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 
 [[StatsBase]]
-deps = ["DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "Test"]
-git-tree-sha1 = "2722397d88f8ffef551948f6c20e1d74a743298c"
+deps = ["DataStructures", "DelimitedFiles", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "Test"]
+git-tree-sha1 = "7b596062316c7d846b67bf625d5963a832528598"
 uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
-version = "0.26.0"
+version = "0.27.0"
 
 [[SuiteSparse]]
 deps = ["Libdl", "LinearAlgebra", "SparseArrays"]
@@ -216,15 +216,15 @@ version = "2.6.0"
 
 [[TableTraits]]
 deps = ["IteratorInterfaceExtensions", "Test"]
-git-tree-sha1 = "da062a2c31f16178f68190243c24140801720a43"
+git-tree-sha1 = "eba4b1d0a82bdd773307d652c6e5f8c82104c676"
 uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c"
-version = "0.4.0"
+version = "0.4.1"
 
 [[Tables]]
-deps = ["Requires", "Test"]
-git-tree-sha1 = "940944e6b68a35046282897a2218891c7cf14a32"
+deps = ["IteratorInterfaceExtensions", "Requires", "TableTraits", "Test"]
+git-tree-sha1 = "89f8fde6394579580fb75088e45ad95551199c7c"
 uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
-version = "0.1.12"
+version = "0.1.14"
 
 [[Test]]
 deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
@@ -251,9 +251,9 @@ uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
 [[Unitful]]
 deps = ["LinearAlgebra", "Random", "Test"]
-git-tree-sha1 = "15c921708e19258fc9e7723aafc5f15c973ee77f"
+git-tree-sha1 = "ba654182cad07cd6c1f3ae969475e556db3283ea"
 uuid = "1986cc42-f94f-5a68-af5c-568840ba703d"
-version = "0.13.0"
+version = "0.14.0"
 
 [[WeakRefStrings]]
 deps = ["Missings", "Random", "Test"]

src/Modia.jl

@@ -99,14 +99,6 @@ import Unitful
 end
 
 
-
-# Make string macro U_str available by "using Modia"
-include("language/Unitful_U_str.jl")
-using  .Unitful_U_str
-export @U_str
-
-
-
 # Include all sub-modules of Modia
 include("language/ModiaLogging.jl")
 include("language/Instantiation.jl")

src/language/Unitful_U_str.jl

@@ -11,7 +11,7 @@ using Unitful
 using Modia    # Unitful_U_str.jl is included in Modia.jl
 
 const T1_type = u"N*m"    # gives warning
-const T2_type = U"N*m"    # gives no warning
+const T2_type = u"N*m"    # gives no warning
 ```
 """
 module Unitful_U_str

src/models/Rotational.jl

@@ -17,9 +17,9 @@ using Modia
 
 "Rotational angle variable"
 Angle(; args...) = Variable(; start = 0.0, size = (), 
-                       T = U"rad", info = "Rotational angle", args...)
+                       T = u"rad", info = "Rotational angle", args...)
 TorqueVar(; args...) = Variable(; start = 0.0, size = (), 
-                           T = U"N*m", info = "Torque", args...)
+                           T = u"N*m", info = "Torque", args...)
 
 """
 Connector for 1D rotational systems
@@ -33,14 +33,14 @@ end
 1D-rotational component with inertia
 """
 @model Inertia begin
-    J = Parameter(0, min=0, info = "Moment of inertia", T = U"kg*m^2")
+    J = Parameter(0, min=0, info = "Moment of inertia", T = u"kg*m^2")
 
     flange_a = Flange(info = "Left flange of shaft")
     flange_b = Flange(info = "Right flange of shaft")
 
     phi = Angle()
-    w = Var(start = 0.0, info = "Angular velocity", T = U"rad/s")
-    a = Var(info = "Angular acceleration", T = U"rad/s^2")
+    w = Var(start = 0.0, info = "Angular velocity", T = u"rad/s")
+    a = Var(info = "Angular acceleration", T = u"rad/s^2")
     @equations begin 
         phi = flange_a.phi
         phi = flange_b.phi
@@ -69,8 +69,8 @@ end
 Linear 1D rotational spring
 """
 @model Spring begin
-    c = Parameter(min = 0, start = 1.0e5, info = "Spring constant", T = U"N*m/rad")
-    phi_rel0 = Parameter(0.0, start = 0.0, info = "Unstretched spring angle", T = U"rad")
+    c = Parameter(min = 0, start = 1.0e5, info = "Spring constant", T = u"N*m/rad")
+    phi_rel0 = Parameter(0.0, start = 0.0, info = "Unstretched spring angle", T = u"rad")
     @extends PartialCompliant()
     @inherits tau, phi_rel
     @equations begin 
@@ -82,9 +82,9 @@ end
 Linear 1D rotational spring with damper
 """
 @model SpringDamper begin
-    c = Parameter(min = 0, start = 1.0e5, info = "Spring constant", T = U"N*m/rad")
-    d = Parameter(info = "Damping constant", T = U"N*m*s/rad")
-    phi_rel0 = Parameter(0.0, start = 0.0, info = "Unstretched spring angle", T = U"rad")
+    c = Parameter(min = 0, start = 1.0e5, info = "Spring constant", T = u"N*m/rad")
+    d = Parameter(info = "Damping constant", T = u"N*m*s/rad")
+    phi_rel0 = Parameter(0.0, start = 0.0, info = "Unstretched spring angle", T = u"rad")
     @extends PartialCompliant(phi_rel=Angle(size=(), state=false))
     @inherits tau, phi_rel
     @equations begin 
@@ -96,7 +96,7 @@ end
 Electromotoric force (electric/mechanic) transformer
 """
 @model EMF begin
-    k = Parameter(1.0, info = "Transformation coefficient", T = U"N*m/A")
+    k = Parameter(1.0, info = "Transformation coefficient", T = u"N*m/A")
 
     p = Pin(info = "Positive pin")
     n = Pin(info = "Negative pin")
@@ -105,7 +105,7 @@ Electromotoric force (electric/mechanic) transformer
     v = Voltage()
     i = Current()
     phi = Angle(state = false)
-    w = Variable(T = U"rad/s", info = "Angular velocity")
+    w = Variable(T = u"rad/s", info = "Angular velocity")
     @equations begin 
         v = p.v - n.v
         0 = p.i + n.i

test/models/TestVariableTypes.jl

@@ -30,7 +30,7 @@ import Modia.Unitful:
     nm, μm, mm, cm, m, km, inch, ft, mi,
     ac,
     mg, g, kg, A,
-    °Ra, °F, °C, K,
+    Ra, °F, °C, K,
     rad, °,
     ms, s, minute, hr,
     J, A, N, mol, cd, V,
@@ -154,7 +154,8 @@ const Vec3 = SVector{3,Float64}
 
             v4 = [1,2,3]
             v5 = [1,2,3]
-            v6 = 10.0u"V"
+            #v6 = 10.0u"V"
+            v6 = 10.0
         end
     end 
 
@@ -164,7 +165,7 @@ const Vec3 = SVector{3,Float64}
 
 # ----------------------
 
-
+#=
     @model TestVariableUnits1 begin
         # Real3 := Variable{Float64,3}
         # typealias Voltage Variable{Volt}
@@ -204,6 +205,8 @@ const Vec3 = SVector{3,Float64}
 
     plot(result, ("v3", "v4", "a"), figure=1)
 
+=#
+
 end
 
 end