Adapted _buildFunction to Modia 0.11.0

Author: MartinOtter

Project.toml

@@ -1,7 +1,7 @@
 authors = ["Andrea Neumayr <[email protected]>", "Martin Otter <[email protected]>", "Gerhard Hippmann <[email protected]>"]
 name = "Modia3D"
 uuid = "07f2c1e0-90b0-56cf-bda7-b44b56e34eed"
-version = "0.12.0"
+version = "0.12.1"
 
 [compat]
 Colors = "0.12, 0.11, 0.10"
@@ -12,7 +12,7 @@ HTTP = "0.9"
 JSON = "0.21"
 Measurements = "2"
 MeshIO = "0.4.10"
-Modia = "0.10.0"
+Modia = "0.11.0, 0.10.0"
 MonteCarloMeasurements = "1"
 OrderedCollections = "1"
 Reexport = "1.0"

src/Modia3D.jl

@@ -4,8 +4,8 @@
 module Modia3D
 
 const path = dirname(dirname(@__FILE__))   # Absolute path of package directory
-const Version = "0.12.0"
-const Date = "2023-05-30"
+const Version = "0.12.1"
+const Date = "2023-06-04"
 
 println("\nImporting Modia3D Version $Version ($Date)")
 

src/ModiaInterface/buildModel3D.jl

@@ -65,10 +65,19 @@ equations = :[
 ]
 ```
 """
-function build_Model3D!(model::AbstractDict, FloatType::Type, TimeType::Type, unitless::Bool,
-                       ID, modelPath::Union{Expr,Symbol,Nothing},
-                       buildOption::String = "ComputeGeneralizedForces")   # ComputeJointAccelerations, ComputeJointAccelerationsOn
+function build_Model3D!(model::AbstractDict, modelModule, FloatType::Type, TimeType::Type, 
+                        instantiateModelOptions::OrderedDict{Symbol,Any},
+                        ID, modelPath::Union{Expr,Symbol,Nothing},
+                        buildOption::String = "ComputeGeneralizedForces")   # ComputeJointAccelerations, ComputeJointAccelerationsOn
     @assert(buildOption == "ComputeGeneralizedForces")
+    #println("modelPath = $modelPath")
+    modelPathAsString = isnothing(modelPath) ? "" : string(modelPath)
+    unitless = instantiateModelOptions[:unitless]
+    if !unitless
+        source    = instantiateModelOptions[:source]
+        modelName = instantiateModelOptions[:modelName]
+        error("\nError from Model3D(..) in model $modelName at $source:\n@instantiatedModel(..., unitless=true, ...) required, because units not yet fully supported by Model3D.\n")   
+    end
     jointInfo = []
     getJointInfo!(model, jointInfo)
 
@@ -111,9 +120,6 @@ function build_Model3D!(model::AbstractDict, FloatType::Type, TimeType::Type, un
     jointStatesFreeMotion_isrot123 = Expr[]
     freeMotionIndices              = OrderedCollections.OrderedDict{String,Int}()
 
-    #println("modelPath = $modelPath")
-    modelPathAsString = isnothing(modelPath) ? "" : string(modelPath)
-
     i=1
     for joint in jointInfo
         path      = joint.path