Skip to content

Commit dd35d65

Browse files
baggepinnenbaggepinnen
authored
Merge branch 'main' into fj2
2 parents efda722 + 4e5ee3a commit dd35d65

25 files changed

+3771
-302
lines changed

‎.github/workflows/CI.yml

+5
Original file line numberDiff line numberDiff line change
@@ -41,3 +41,8 @@ jobs:
4141
private_registry_uuid: 309a7822-a73e-4490-9504-7d1983f27685
4242
- uses: julia-actions/julia-buildpkg@v1
4343
- uses: julia-actions/julia-runtest@v1
44+
- uses: julia-actions/julia-processcoverage@v1
45+
- uses: codecov/codecov-action@v4
46+
with:
47+
token: ${{ secrets.CODECOV_TOKEN }}
48+
if: matrix.os == 'ubuntu-latest' && matrix.arch == 'x64'

‎.github/workflows/Documentation.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,12 @@ jobs:
3232
private_registry_name: JuliaSimRegistry
3333
private_registry_uuid: 309a7822-a73e-4490-9504-7d1983f27685
3434
- name: Install dependencies
35-
run: DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=docs -e 'using Pkg;
36-
ENV["DISPLAY"] = "0";
35+
run: DISPLAY=:0 xvfb-run --auto-servernum -s '-screen 0 1024x768x24' julia --project=docs -e 'using Pkg;
3736
Pkg.setprotocol!(; domain = "github.com", protocol = "ssh");
3837
Pkg.add(PackageSpec(name = "JuliaSimCompiler", url = "https://github.com/JuliaComputing/JuliaSimCompiler.jl", rev = "master"));
3938
Pkg.develop(PackageSpec(path=pwd()));
4039
Pkg.instantiate()'
4140
- name: Build and deploy
4241
env:
4342
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
44-
run: DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24' julia --project=docs/ docs/make.jl
43+
run: DISPLAY=:0 xvfb-run --auto-servernum -s '-screen 0 1024x768x24' julia --project=docs/ docs/make.jl

‎LICENSE

+69-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,69 @@
1-
(C) JuliaHub Inc. 2022-2023. All rights reserved.
1+
(C) JuliaHub Inc. 2022-2023. All rights reserved.
2+
3+
===============================================================================
4+
5+
Parts of the code in the PlanarMechanics submodule have been adapted from the PlanarMechanics modelica library, which is licensed under the 3-Clause BSD License. The original license text is included below.
6+
7+
BSD 3-Clause License
8+
9+
Copyright (c) 2010-2023, Deutsches Zentrum fuer Luft- und Raumfahrt e.V.
10+
All rights reserved.
11+
12+
Redistribution and use in source and binary forms, with or without
13+
modification, are permitted provided that the following conditions are met:
14+
15+
1. Redistributions of source code must retain the above copyright notice, this
16+
list of conditions and the following disclaimer.
17+
18+
2. Redistributions in binary form must reproduce the above copyright notice,
19+
this list of conditions and the following disclaimer in the documentation
20+
and/or other materials provided with the distribution.
21+
22+
3. Neither the name of the copyright holder nor the names of its
23+
contributors may be used to endorse or promote products derived from
24+
this software without specific prior written permission.
25+
26+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
27+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
28+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
29+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
30+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
31+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
32+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
33+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
34+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
35+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36+
37+
===============================================================================
38+
39+
Parts of the code in Multibody.jl have been adapted from the Modelica Standard Library, which is licensed under the 3-Clause BSD License. The original license text is included below.
40+
41+
BSD 3-Clause License
42+
43+
Copyright (c) 1998-2024, Modelica Association and contributors
44+
All rights reserved.
45+
46+
Redistribution and use in source and binary forms, with or without
47+
modification, are permitted provided that the following conditions are met:
48+
49+
* Redistributions of source code must retain the above copyright notice, this
50+
list of conditions and the following disclaimer.
51+
52+
* Redistributions in binary form must reproduce the above copyright notice,
53+
this list of conditions and the following disclaimer in the documentation
54+
and/or other materials provided with the distribution.
55+
56+
* Neither the name of the copyright holder nor the names of its
57+
contributors may be used to endorse or promote products derived from
58+
this software without specific prior written permission.
59+
60+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
61+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
62+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
63+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
64+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
65+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
66+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
67+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
68+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
69+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎Project.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Multibody"
22
uuid = "e1cad5d1-98ef-44f9-a79a-9ca4547f95b9"
33
authors = ["Fredrik Bagge Carlson, JuliaHub Inc."]
4-
version = "0.1.1"
4+
version = "0.2.0"
55

66
[deps]
77
CoordinateTransformations = "150eb455-5306-5404-9cee-2592286d6298"
@@ -13,6 +13,7 @@ MeshIO = "7269a6da-0436-5bbc-96c2-40638cbb6118"
1313
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
1414
ModelingToolkitStandardLibrary = "16a59e39-deab-5bd0-87e4-056b12336739"
1515
Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc"
16+
SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
1617
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
1718

1819
[weakdeps]
@@ -23,14 +24,15 @@ Render = ["Makie"]
2324

2425
[compat]
2526
CoordinateTransformations = "0.6"
26-
DataInterpolations = "5"
27+
DataInterpolations = "5, 6"
2728
FileIO = "1"
2829
JuliaSimCompiler = "0.1.12"
2930
LinearAlgebra = "1.6"
3031
MeshIO = "0.4"
3132
ModelingToolkit = "9"
3233
ModelingToolkitStandardLibrary = "2.7.2"
3334
Rotations = "1.4"
35+
SparseArrays = "1"
3436
StaticArrays = "1"
3537
julia = "1"
3638

0 commit comments

Comments
 (0)