Skip to content

Commit

Permalink
Move images
Browse files Browse the repository at this point in the history
  • Loading branch information
Uwe Fechner committed Dec 13, 2023
1 parent d125b01 commit 9edec72
Show file tree
Hide file tree
Showing 13 changed files with 60 additions and 13 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: CI
on:
push:
branches:
- main
tags: ['*']
pull_request:
workflow_dispatch:
concurrency:
# Skip intermediate builds: always.
# Cancel intermediate builds: only if it is a pull request build.
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
jobs:
docs:
name: Documentation
runs-on: ubuntu-latest
timeout-minutes: 40
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
with:
version: '1'
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-docdeploy@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
- run: |
julia --project=docs -e '
using Documenter: DocMeta, doctest
using PkgHelpers
DocMeta.setdocmeta!(PkgHelpers, :DocTestSetup, :(using PkgHelpers); recursive=true)
doctest(PkgHelpers)'
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ bin/kps-image-1.10.so
.CondaPkg
src/__pycache__
.vscode/settings.json
docs/build
docs/build/
docs/src/src
docs/src/docs
docs/src/docs/src
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ drag attached.
## Installation

1. make sure you are running a `bash` terminal (shell) and you have at least 16GB RAM (MAC, Linux and Windows supported).
On Windows, you can use [git for windows](https://gitforwindows.org/) which provides git AND a bash shell, but for using Julia from a `bash` terminal you must also install either [Installation and usage of VSCode](docs/vscode.md) or [Windows Terminal](https://learn.microsoft.com/en-us/windows/terminal/install). `Windows Terminal` is the simple and clean solution, `VSCode` the comfortable, fancy solution.
On Windows, you can use [git for windows](https://gitforwindows.org/) which provides git AND a bash shell, but for using Julia from a `bash` terminal you must also install either [Installation and usage of VSCode](docs/images/vscode.md) or [Windows Terminal](https://learn.microsoft.com/en-us/windows/terminal/install). `Windows Terminal` is the simple and clean solution, `VSCode` the comfortable, fancy solution.
2. install Julia 1.10 using `juliaup`, see [https://github.com/JuliaLang/juliaup](https://github.com/JuliaLang/juliaup). If `juliaup` is already installed, the following commands will do:
```
juliaup add 1.10
Expand Down Expand Up @@ -39,7 +39,7 @@ include("src/Tether_01.jl")
```
You should see a plot similar to:

![Falling mass](docs/FallingMass.png)
![Falling mass](docs/images/FallingMass.png)

This example shows a mass that is thrown upwards, slows down and then falls.

Expand Down Expand Up @@ -89,7 +89,7 @@ From the Julia prompt, run the simulation:
```julia
include("src/Tether_02.jl")
```
![Spring damper](docs/SpringDamper.png)
![Spring damper](docs/images/SpringDamper.png)

Mass, attached to a spring damper element. One end of the spring at the origin, the second end
attached to the mass. Mass initially below the origin, spring un-stretched. Z-axis pointing
Expand All @@ -101,7 +101,7 @@ upwards.
```julia
include("src/Tether_03.jl")
```
![Non-linear Spring damper](docs/Nonlinear.png)
![Non-linear Spring damper](docs/images/Nonlinear.png)

Mass, attached to a spring damper element. One end of the spring at the origin, the second end
attached to the mass. Mass initially below the origin, spring un-stretched. Z-axis pointing
Expand Down Expand Up @@ -219,7 +219,7 @@ We loop backwards over the particles, starting with the last particle, because o

Finally in this example we plot the result dynamically as 2D video. Screenshot:

![Tether 2D](docs/Tether2d.png)
![Tether 2D](docs/images/Tether2d.png)


#### Benchmarking
Expand Down
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
9 changes: 9 additions & 0 deletions docs/make.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ if ("TestEnv" ∈ keys(Pkg.project().dependencies))
end
using Documenter: deploydocs, makedocs

src="src"
dst="docs/src/src"
mkpath(dst)
cp(src, dst; force=true)
src="docs/images"
dst="docs/src/docs/images"
mkpath(dst)
cp(src, dst; force=true)

src="README.md"
dst="docs/src/index.md"
if ! isfile(dst)
Expand Down
10 changes: 5 additions & 5 deletions docs/src/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ drag attached.
## Installation

1. make sure you are running a `bash` terminal (shell) and you have at least 16GB RAM (MAC, Linux and Windows supported).
On Windows, you can use [git for windows](https://gitforwindows.org/) which provides git AND a bash shell, but for using Julia from a `bash` terminal you must also install either [Installation and usage of VSCode](docs/vscode.md) or [Windows Terminal](https://learn.microsoft.com/en-us/windows/terminal/install). `Windows Terminal` is the simple and clean solution, `VSCode` the comfortable, fancy solution.
On Windows, you can use [git for windows](https://gitforwindows.org/) which provides git AND a bash shell, but for using Julia from a `bash` terminal you must also install either [Installation and usage of VSCode](docs/images/vscode.md) or [Windows Terminal](https://learn.microsoft.com/en-us/windows/terminal/install). `Windows Terminal` is the simple and clean solution, `VSCode` the comfortable, fancy solution.
2. install Julia 1.10 using `juliaup`, see [https://github.com/JuliaLang/juliaup](https://github.com/JuliaLang/juliaup). If `juliaup` is already installed, the following commands will do:
```
juliaup add 1.10
Expand Down Expand Up @@ -39,7 +39,7 @@ include("src/Tether_01.jl")
```
You should see a plot similar to:

![Falling mass](docs/FallingMass.png)
![Falling mass](docs/images/FallingMass.png)

This example shows a mass that is thrown upwards, slows down and then falls.

Expand Down Expand Up @@ -89,7 +89,7 @@ From the Julia prompt, run the simulation:
```julia
include("src/Tether_02.jl")
```
![Spring damper](docs/SpringDamper.png)
![Spring damper](docs/images/SpringDamper.png)

Mass, attached to a spring damper element. One end of the spring at the origin, the second end
attached to the mass. Mass initially below the origin, spring un-stretched. Z-axis pointing
Expand All @@ -101,7 +101,7 @@ upwards.
```julia
include("src/Tether_03.jl")
```
![Non-linear Spring damper](docs/Nonlinear.png)
![Non-linear Spring damper](docs/images/Nonlinear.png)

Mass, attached to a spring damper element. One end of the spring at the origin, the second end
attached to the mass. Mass initially below the origin, spring un-stretched. Z-axis pointing
Expand Down Expand Up @@ -219,7 +219,7 @@ We loop backwards over the particles, starting with the last particle, because o

Finally in this example we plot the result dynamically as 2D video. Screenshot:

![Tether 2D](docs/Tether2d.png)
![Tether 2D](docs/images/Tether2d.png)


#### Benchmarking
Expand Down
3 changes: 1 addition & 2 deletions docs/src/python.md
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
## Python and Julia in harmonie

## Python and Julia in harmony
2 changes: 2 additions & 0 deletions src/Tethers.jl
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module Tethers
end

0 comments on commit 9edec72

Please sign in to comment.