Merge pull request #114 from ModiaSim/mo_minor_improvements

Minor improvements

Author: MartinOtter

create_Modia3D_sysimage.jl

@@ -13,17 +13,16 @@
 #
 module Create_Modia3D_sysimage
 
-path            = dirname(@__FILE__)
-file            = joinpath(path, "create_Modia3D_sysimage.jl")
-precompile_file = joinpath(path, "create_Modia3D_sysimage_precompile_statements_file.jl")
+path = dirname(@__FILE__)
+file = joinpath(path, "create_Modia3D_sysimage.jl")
 Modia3D_sysimage_path = joinpath(pwd(), Sys.iswindows() ? "Modia3D_sysimage.dll" : "Modia3D_sysimage.so")
 
 import Pkg
 project     = Pkg.project()
 projectPath = project.path
 availablePackages = keys(project.dependencies)
 addPackages       = setdiff!(["Modia", "Modia3D", "ModiaPlot_PyPlot", "PackageCompiler", "Revise"], availablePackages)
-println("!!! Creating sysimage for Modia3D from $file")
+println("!!! Creating sysimage for Modia3D (executing: $file)")
 println("!!! This will include all packages from project $projectPath")
 if length(addPackages) > 0
     println("!!! Additionally, it will include the following packages")
@@ -32,18 +31,11 @@ if length(addPackages) > 0
     Pkg.add(addPackages)
 end
 
-#= Seem to make startup slower
-println("!!! Define additional artefacts for precompilation ...")
-using Modia3D
-usePlotPackage("PyPlot")
-@usingModiaPlot
-include("$path/test/Basic/ModelsForPrecompilation.jl")
-=#
-
 # Create sysimage
 using PackageCompiler
 create_sysimage(sysimage_path = Modia3D_sysimage_path,
-                precompile_statements_file = precompile_file)
+                precompile_statements_file = joinpath(path, "create_Modia3D_sysimage_precompile_statements_file.jl"))
+                #precompile_execution_file  = joinpath(path, "create_Modia3D_sysimage_precompile_execution_file.jl"))
 
 println("!!! Modia3D sysimage created. Use sysimage by starting julia with:")
 println("  julia -J$Modia3D_sysimage_path")

create_Modia3D_sysimage_precompile_statements_file.jl

@@ -1,3 +1,5 @@
+# The precompile statements are generated via: 
+#     julia --trace-compile=stderr
 precompile(Tuple{typeof(Modia3D.ModiatorServer)})
 precompile(Tuple{typeof(Base.setindex!), Base.Dict{HTTP.Handlers.Route, Any}, Function, HTTP.Handlers.Route})
 precompile(Tuple{typeof(HTTP.Handlers.gh), String})

test/Basic/PendulumWithBar2.jl

@@ -10,6 +10,7 @@ Bar = Model(
     Lx = 0.1,
     frame0 = Object3D(feature=Solid(shape=Beam(axis=1, length=:Lx, width=:(0.2*Lx), thickness=:(0.2*Lx)),
                                     solidMaterial="Aluminium",
+                                    massProperties=MassPropertiesFromShape(),
                                     visualMaterial = VisualMaterial(color="Turquoise4", transparency=0.5))),
 	frame1 = Object3D(parent=:frame0,
                       translation=:[-Lx/2, 0.0, 0.0],

test/includeTests.jl

@@ -5,6 +5,7 @@ Modia3D.loadPalettes!(solidMaterialPalette       = "$(Modia3D.path)/palettes/sol
                       visualMaterialPalette      = "$(Modia3D.path)/palettes/visualMaterials.json")
 
 Test.@testset "Basic" begin
+    include(joinpath("Basic", "Pendulum.jl"))   
     include(joinpath("Basic", "ModelsForPrecompilation.jl"))
     include(joinpath("Basic", "AllShapes.jl"))
     include(joinpath("Basic", "PendulumWithBar1.jl"))