Skip to content

Commit 6400730

Browse files
committed
Julia 0.6 and 0.7 support removed
1 parent bb5c247 commit 6400730

39 files changed

+129
-407
lines changed

README.md

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ A more detailed overview of the available features is given in the
1919
Papers about Modia3D:
2020

2121
- *[Collision Handling with Variable-Step Integrators](docs/resources/documentation/CollisionHandling_Neumayr_Otter_2017.pdf)* ([EOOLT 2017, December](http://www.eoolt.org/2017/))
22-
- *[Component-Based 3D Modeling of Dynamic Systems](docs/resources/documentation/ComponentBased3DModeling_Neumayr_Otter_2018.pdf)*([American Modelica Conference 2018, October](https://www.modelica.org/events/modelica2018Americas/index_html))
23-
- *[Algorithms for Component-Based 3D Modeling](docs/resources/documentation/AlgorithmsComponentBased3DModeling_Neumayr_Otter_2019.pdf)*([13th International Modelica Conference 2019, March](https://modelica.org/events/modelica2019))
22+
- *[Component-Based 3D Modeling of Dynamic Systems](http://www.ep.liu.se/ecp/154/019/ecp18154019.pdf)*([American Modelica Conference 2018, October](https://www.modelica.org/events/modelica2018Americas/index_html))
23+
- *[Algorithms for Component-Based 3D Modeling](http://www.ep.liu.se/ecp/157/039/ecp19157039.pdf)*([13th International Modelica Conference 2019, March](https://modelica.org/events/modelica2019))
2424

2525

2626
Before releasing version 1.0, Modia3D shall be
@@ -32,15 +32,9 @@ Special 3D algorithms (Modia3D) + power/flexibility of equation based modeling (
3232

3333
## Installation
3434

35-
**Modia3D** is registered in METADATA.jl and can be installed with Pkg.add:
35+
**Modia3D** is registered in METADATA.jl and can be installed in the following way (Julia >= 1.0 is required):
3636

3737
```julia
38-
# Julia 0.6:
39-
julia> Pkg.add("Modia3D")
40-
julia> Pkg.add("ModiaMath") # in order to use simulate!(..) and plot(..)
41-
julia> Pkg.add("PyPlot") # in order that plots are shown
42-
43-
# Julia 0.7 and 1.0
4438
julia> ]add Modia3D
4539
add ModiaMath # in order to use simulate!(..) and plot(..)
4640
add PyPlot # in order that plots are shown
@@ -64,8 +58,7 @@ are supported. To install the free version for *Windows* or for *Linux* perform
6458
provide your contact information and click on *Request download* for *Community Edition*.
6559
Afterwards, you get a link to download the library and you need to unzip the file.
6660

67-
2. In your Julia **startup file** (Julia 0.6: `HOME/.juliarc.jl`, Julia 0.7 and 1.0:
68-
`HOME/.julia/config/startup.jl`) include the environment variable
61+
2. In your Julia **startup file** (`HOME/.julia/config/startup.jl`) include the environment variable
6962
`ENV["DLR_VISUALIZATION"] = "<path-to-library>/Visualization/Extras/SimVis"`.
7063
Make sure that the SimVis executable under this directory has execution rights.
7164
For example in Linux with command:
@@ -131,7 +124,7 @@ ModiaMath.plot(result, ["revolute.phi", "revolute.w"]);
131124

132125
## Status
133126

134-
The package has been tested with Julia `0.6.4`, `0.7.0`, `1.0.0`, `1.0.1` on Windows 7,
127+
The package has been tested with Julia on Windows 7,
135128
via the TravisCL on Linux (x86_64-pc-linux-gnu) and macOS (x86_64-apple-darwin14.5.0)
136129
and via the Appveyor CL on Windows.
137130

REQUIRE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
julia 0.6
2-
ModiaMath
1+
julia 1.0
2+
ModiaMath 0.5.0
33
StaticArrays
44
DataFrames
55
DataStructures
Binary file not shown.
Binary file not shown.

docs/src/index.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,33 @@ There are the following operations on an instance of an assembly:
116116
In the future it is planned to support `QuasiStaticAnalysis` as well.
117117

118118

119+
## Release Notes
120+
121+
### Version 0.3.0
122+
123+
124+
125+
### Version 0.2.1
126+
127+
- Adapted to Julia 0.7 and 1.0 (including using new package manager via Project.toml, Manifest.toml files).
128+
129+
- Travis Continuous Integration added.
130+
131+
- Wrong UUID of Modia3D and referenced ModiaMath corrected (did not correspond to the UUID in Julias METADATA).
132+
133+
- PyPlot was removed from the REQUIRE and Project.toml files and code was added, so that PyPlot is automatically imported in ModiaMath if it is available in the current environment of the user. The benefit is that Modia3D and ModiaMath can be used, even if PyPlot is not installed. This is especially useful for ContinuousIntegration, because automatic installation of PyPlot often fails. Inspect the wiki page Installing PyPlot in a robust way to install PyPlot in a robust way.
134+
135+
- All extra packages used in examples and tests are now referenced via Modia3D (for example using Modia3D.StaticArrays instead of using StaticArrays). The benefit is that all examples and tests can be directly executed with include (for example: import Modia3D; include($(Modia3D.path)/examples/dynamics/Simulate_Pendulum.jl)) provided Modia3D is in the current environment. Previously, it was assumed that these extra packages are present in the users environment and an error occured, if this was not the case.
136+
137+
- Dependent packages updated to their newest versions.
138+
Especially, warnings from Unitful do no longer occur, due to the update to version 0.12.0.
139+
140+
141+
### Version 0.2.0
142+
143+
- First public release (for Julia 0.6.4)
144+
145+
119146
## Main developers
120147

121148
[Andrea Neumayr](mailto:[email protected]) and

examples/visual/Move_AllVisualObjects.jl

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,7 @@ visualObjects = VisualObjects(sceneOptions=Modia3D.SceneOptions(visualizeFrames=
4141
# Kinematic simulation
4242
Modia3D.initAnalysis!(visualObjects)
4343

44-
45-
@static if VERSION >= v"0.7.0-DEV.2005"
46-
LINSPACE(start,stop,length) = range(0.0, stop=stop, length=length)
47-
else
48-
LINSPACE(start,stop,length) = linspace(start,stop,length)
49-
end
50-
51-
for time = LINSPACE(0.0, 2.0, 101)
44+
for time = range(0.0, stop=2.0, length=101)
5245
# update positional degrees of freedom
5346
r1[3] = 2*time
5447
Modia3D.set_r!(visualObjects.shape1,r1)

examples/visual/Move_SolidFileMesh.jl

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,7 @@ fileMeshes = FileMeshes(sceneOptions=Modia3D.SceneOptions(visualizeFrames=true,d
2828
Modia3D.initAnalysis!(fileMeshes)
2929

3030

31-
@static if VERSION >= v"0.7.0-DEV.2005"
32-
LINSPACE(start,stop,length) = range(0.0, stop=stop, length=length)
33-
else
34-
LINSPACE(start,stop,length) = linspace(start,stop,length)
35-
end
36-
37-
for time = LINSPACE(0.0, 2.0, 101)
31+
for time = range(0.0, stop=2.0, length=101)
3832
r1[3] = 2*time
3933
Modia3D.set_r!(fileMeshes.fileMesh1, r1)
4034

src/Basics/_module.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ export linearMovement
2525
export PositionMVector, RotationMMatrix, assertRotationMatrix
2626

2727
using StaticArrays
28-
29-
@static if VERSION >= v"0.7.0-DEV.2005"
30-
using LinearAlgebra
31-
end
28+
using LinearAlgebra
3229

3330
include("environment.jl")
3431
include("constantsAndFunctions.jl")

src/Basics/constantsAndFunctions.jl

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,13 @@ function trailingPartOfTypeAsString(obj)::String
5959
name = string( typeof(obj) )
6060

6161
# Determine trailing solid (after last ".")
62-
@static if VERSION >= v"0.7.0-DEV.2005"
63-
i = first(something(findlast(".", name), 0:-1))
64-
else
65-
i = rsearchindex(name, ".")
66-
end
62+
i = first(something(findlast(".", name), 0:-1))
6763
return i > 0 && i < length(name) ? name[i+1:end] : name
6864
end
6965

7066
function trailingPartOfName(name::AbstractString)::String
7167
# Determine trailing part of name (after last ".")
72-
@static if VERSION >= v"0.7.0-DEV.2005"
73-
i = first(something(findlast(".", name), 0:-1))
74-
else
75-
i = rsearchindex(name, ".")
76-
end
68+
i = first(something(findlast(".", name), 0:-1))
7769
return i > 0 && i < length(name) ? name[i+1:end] : name
7870
end
7971

src/Composition/_module.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,7 @@ import Modia3D.Graphics
8181
import Modia3D.Signals
8282
import JSON
8383

84-
@static if VERSION >= v"0.7.0-DEV.2005"
85-
const NOTHING = Nothing
86-
else
87-
const NOTHING = Void
88-
end
84+
const NOTHING = Nothing
8985

9086

9187
const MaterialOrNothing = Union{Graphics.Material,NOTHING}

0 commit comments

Comments
 (0)