Skip to content

Commit 37fcb6a

Browse files
committed
Bump compats, traj lookback, set version to 0.2.0
1 parent afd9ffa commit 37fcb6a

File tree

12 files changed

+49
-11
lines changed

12 files changed

+49
-11
lines changed

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
matrix:
1313
version:
14-
- '1.10.4'
14+
- '1.11.6'
1515
os:
1616
- ubuntu-latest
1717
#- macOS-latest

.github/workflows/CompatHelper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ${{ matrix.os }}
1010
strategy:
1111
matrix:
12-
julia-version: [1.7.1]
12+
julia-version: [1.11.6]
1313
julia-arch: [x64]
1414
os: [ubuntu-latest]
1515
steps:

.github/workflows/CompatHelperManual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
if: "contains(github.event.head_commit.message, '[compat]')"
1010
strategy:
1111
matrix:
12-
julia-version: [1.7.1]
12+
julia-version: [1.11.6]
1313
julia-arch: [x64]
1414
os: [ubuntu-latest]
1515
steps:

.github/workflows/ManuallyBuildDoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- uses: actions/checkout@v1
1212
- uses: julia-actions/setup-julia@latest
1313
with:
14-
version: '1.10.4'
14+
version: '1.11.6'
1515
- run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
1616
- run: julia --project=docs -e '
1717
using Pkg;

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "AstroNbodySim"
22
uuid = "034523a5-eae8-49f5-9052-0ea364535333"
33
authors = ["islent <[email protected]>"]
4-
version = "0.1.1"
4+
version = "0.2.0"
55

66
[deps]
77
AstroIO = "c85a633c-0c3f-44a2-bffe-7f9d0681b3e7"
@@ -58,7 +58,7 @@ DataFrames = "1"
5858
DocStringExtensions = "0.8, 0.9"
5959
FFTW = "1"
6060
FileIO = "1"
61-
GLMakie = "0.9, 0.10, 0.11, 0.12, 0.13"
61+
GLMakie = "0.11, 0.12, 0.13"
6262
Images = "0.25, 0.26"
6363
IterativeSolvers = "0.9"
6464
LoopVectorization = "0.12"

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ Accretion history:
7575
### Solar System
7676
![Solar System](https://github.com/JuliaAstroSim/AstroNbodySim.jl/blob/main/docs/src/examples/pics/readme/SolarSystem.gif)
7777

78+
### Trajectory lookback
79+
![Trajectory lookback](https://github.com/JuliaAstroSim/AstroNbodySim.jl/blob/main/docs/src/examples/pics/readme/traj_lookback_all_arrow_axes_20250721v2_2Gyr.mp4)
80+
7881
## Supporting and Citing
7982

8083
This software was developed as part of academic research. If you would like to help support it, please star the repository. If you use this software as part of your research, teaching, or other activities, we would be grateful if you could cite the following:

README中文.md

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,49 @@ or
7272
### 太阳系可视化
7373
![Solar System](https://github.com/JuliaAstroSim/AstroNbodySim.jl/blob/main/docs/src/examples/pics/readme/SolarSystem.gif)
7474

75+
### 轨道回溯
76+
![Trajectory lookback](https://github.com/JuliaAstroSim/AstroNbodySim.jl/blob/main/docs/src/examples/pics/readme/traj_lookback_all_arrow_axes_20250721v2_2Gyr.mp4)
77+
7578
## 支持与引用
7679

7780
本项目用于学术研究。欢迎 Star 来支持我们。如果你在研究、教学和其他活动中用到了我们的代码,请引用如下文章:
7881
```tex
7982
%TODO WIP
8083
```
8184

82-
## 相关 Package
85+
## 代码架构
86+
87+
```mermaid
88+
graph LR
89+
A[AstroSimBase.jl] --> C[PhysicalParticles.jl]
90+
B[ParallelOperations.jl] --> C
91+
C --> D[AstroIO.jl]
92+
C --> E[AstroIC.jl]
93+
C --> F[PhysicalFDM.jl]
94+
C --> G[PhysicalFFT.jl]
95+
B --> H[PhysicalTrees.jl]
96+
C --> H
97+
B --> I[PhysicalMeshes.jl]
98+
C --> I
99+
D --> J[AstroPlot.jl]
100+
H --> J
101+
I --> J
102+
J --> K[AstroNbodySim.jl]
103+
D --> K
104+
E --> K
105+
F --> K
106+
G --> K
107+
H --> K
108+
I --> K
109+
J --> K
110+
K --> L[WaveDM.jl]
111+
F --> L
112+
G --> L
113+
I --> L
114+
N[GalacticDynamics.jl] --> E
115+
```
116+
117+
83118
- Basic data structure: [PhysicalParticles.jl](https://github.com/JuliaAstroSim/PhysicalParticles.jl)
84119
- File I/O: [AstroIO.jl](https://github.com/JuliaAstroSim/AstroIO.jl)
85120
- Initial Condition: [AstroIC.jl](https://github.com/JuliaAstroSim/AstroIC.jl)
Binary file not shown.

examples/04-collisions/04-collisions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ plot_positionslice(gpu.config.output.dir, "snapshot_", collect(0:100), ".gadget2
8686
collection = DISK,
8787
markersize = 2.0,
8888
)
89-
plt = mosaicview(gpu.config.output.dir, "pos_", collect(1:9:100), ".png"; fillvalue = 0.5, npad = 3, ncol = 4, rowmajor = true);
89+
plt = mosaic(gpu.config.output.dir, "pos_", collect(1:9:100), ".png"; fillvalue = 0.5, npad = 3, ncol = 4, rowmajor = true);
9090
save("output/mosaic-collision-DirectSumAdaptiveGPU.png", plt)
9191

9292
# write success flag for shell

examples/04-collisions/ParameterSpace.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function galaxy_colliders(angle::Float64, vel::Number;
122122
Makie.save("output/RotationCurve - $simlabel.png", fig)
123123

124124
Counts = collect(0:Int(TimeEnd/TimeBetweenSnapshots/50):Int(TimeEnd/TimeBetweenSnapshots))[1:end-1]
125-
fig = mosaicview(sim.config.output.dir, "pos_", Counts, ".png"; fillvalue=0.5, npad=5, ncol=10, rowmajor=true)
125+
fig = mosaic(sim.config.output.dir, "pos_", Counts, ".png"; fillvalue=0.5, npad=5, ncol=10, rowmajor=true)
126126
Makie.save("output/mosaic - $simlabel.png", fig)
127127

128128
# release memory of former simulations

0 commit comments

Comments
 (0)