Skip to content

Commit 31716f6

Browse files
efaulhabersvchb
andauthored
Use latest version of JuliaFormatter (trixi-framework#661)
* Use latest version of JuliaFormatter * Reformat code --------- Co-authored-by: Sven Berger <[email protected]>
1 parent c374aca commit 31716f6

File tree

32 files changed

+189
-189
lines changed

32 files changed

+189
-189
lines changed

.github/workflows/FormatCheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
#
2626
# julia -e 'using Pkg; Pkg.add(PackageSpec(name = "JuliaFormatter", version = "0.13.0"))'
2727
run: |
28-
julia -e 'using Pkg; Pkg.add(PackageSpec(name = "JuliaFormatter", version="1.0.45"))'
28+
julia -e 'using Pkg; Pkg.add(PackageSpec(name = "JuliaFormatter", version="1.0.62"))'
2929
julia -e 'using JuliaFormatter; format(".")'
3030
- name: Format check
3131
run: |

docs/make.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ makedocs(sitename="TrixiParticles.jl",
115115
"Examples" => "examples.md",
116116
"Visualization" => "visualization.md",
117117
"Preprocessing" => [
118-
"Sampling of Geometries" => joinpath("preprocessing", "preprocessing.md"),
118+
"Sampling of Geometries" => joinpath("preprocessing", "preprocessing.md")
119119
],
120120
"Components" => [
121121
"Overview" => "overview.md",
@@ -127,7 +127,7 @@ makedocs(sitename="TrixiParticles.jl",
127127
"Density Calculators" => joinpath("general", "density_calculators.md"),
128128
"Smoothing Kernels" => joinpath("general", "smoothing_kernels.md"),
129129
"Neighborhood Search" => joinpath("general", "neighborhood_search.md"),
130-
"Util" => joinpath("general", "util.md"),
130+
"Util" => joinpath("general", "util.md")
131131
],
132132
"Systems" => [
133133
"Discrete Element Method (Solid)" => joinpath("systems",
@@ -138,18 +138,18 @@ makedocs(sitename="TrixiParticles.jl",
138138
"entropically_damped_sph.md"),
139139
"Total Lagrangian SPH (Elastic Structure)" => joinpath("systems",
140140
"total_lagrangian_sph.md"),
141-
"Boundary" => joinpath("systems", "boundary.md"),
141+
"Boundary" => joinpath("systems", "boundary.md")
142142
],
143143
"Time Integration" => "time_integration.md",
144144
"Callbacks" => "callbacks.md",
145145
"TrixiBase.jl API Reference" => "reference-trixibase.md",
146-
"PointNeighbors.jl API Reference" => "reference-pointneighbors.md",
146+
"PointNeighbors.jl API Reference" => "reference-pointneighbors.md"
147147
],
148148
"Authors" => "authors.md",
149149
"Contributing" => "contributing.md",
150150
"Code of Conduct" => "code_of_conduct.md",
151151
"License" => "license.md",
152-
"References" => "references.md",
152+
"References" => "references.md"
153153
])
154154

155155
deploydocs(repo="github.com/trixi-framework/TrixiParticles.jl",

examples/n_body/n_body_benchmark_trixi.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ velocity = [0.0 1.66007664274403694e-3 -2.76742510726862411e-3 2.964601375647616
6262

6363
masses = [
6464
1.0, 9.54791938424326609e-4, 2.85885980666130812e-4, 4.36624404335156298e-5,
65-
5.15138902046611451e-5,
65+
5.15138902046611451e-5
6666
] * SOLAR_MASS
6767

6868
# Offset sun momentum

examples/n_body/n_body_solar_system.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ velocity = [-1.4663 -1.5205e+04 -3.4770e+04 2.9288e+04 2.4533e+04 -1.0724e+03 8.
2020
4.8370 2.5180e+04 -316.8994 -172.5873 -1.9295e+03 -4.8696e+03 -1.3824e+03 2.4527e+03 1.9082e+03]
2121

2222
masses = [
23-
1.99e30, 3.30e23, 4.87e24, 5.97e24, 6.42e23, 1.90e27, 5.68e26, 8.68e25, 1.02e26,
23+
1.99e30, 3.30e23, 4.87e24, 5.97e24, 6.42e23, 1.90e27, 5.68e26, 8.68e25, 1.02e26
2424
]
2525

2626
initial_condition = InitialCondition(; coordinates, velocity, density=1.0, mass=masses)

examples/postprocessing/interpolation_point_line.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ println(interpolate_point([
2727
[position_x, 0.1],
2828
[position_x, 0.0],
2929
[position_x, -0.01],
30-
[position_x, -0.05],
30+
[position_x, -0.05]
3131
], semi, fluid_system, sol))
3232

3333
# It is also possible to interpolate along a line

src/callbacks/density_reinit.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function Base.show(io::IO, ::MIME"text/plain",
3131
callback = cb.affect!
3232
setup = [
3333
"interval" => callback.interval,
34-
"reinit_initial_solution" => callback.reinit_initial_solution,
34+
"reinit_initial_solution" => callback.reinit_initial_solution
3535
]
3636
summary_box(io, "DensityReinitializationCallback", setup)
3737
end

src/callbacks/info.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function Base.show(io::IO, ::MIME"text/plain", cb::DiscreteCallback{<:Any, <:Inf
1919
callback = cb.affect!
2020

2121
setup = [
22-
"interval" => callback.interval,
22+
"interval" => callback.interval
2323
]
2424
summary_box(io, "InfoCallback", setup)
2525
end

src/callbacks/post_process.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ function Base.show(io::IO, ::MIME"text/plain",
156156
"output directory" => callback.output_directory,
157157
"append timestamp" => callback.append_timestamp ? "yes" : "no",
158158
"write json file" => callback.write_csv ? "yes" : "no",
159-
"write csv file" => callback.write_json ? "yes" : "no",
159+
"write csv file" => callback.write_json ? "yes" : "no"
160160
]
161161

162162
for (i, key) in enumerate(keys(callback.func))
@@ -193,7 +193,7 @@ function Base.show(io::IO, ::MIME"text/plain",
193193
"output directory" => callback.output_directory,
194194
"append timestamp" => callback.append_timestamp ? "yes" : "no",
195195
"write json file" => callback.write_csv ? "yes" : "no",
196-
"write csv file" => callback.write_json ? "yes" : "no",
196+
"write csv file" => callback.write_json ? "yes" : "no"
197197
]
198198

199199
for (i, key) in enumerate(keys(callback.func))

src/callbacks/solution_saving.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ function Base.show(io::IO, ::MIME"text/plain",
251251
"save final solution" => solution_saving.save_final_solution ? "yes" :
252252
"no",
253253
"output directory" => abspath(solution_saving.output_directory),
254-
"prefix" => solution_saving.prefix,
254+
"prefix" => solution_saving.prefix
255255
]
256256
summary_box(io, "SolutionSavingCallback", setup)
257257
end
@@ -275,7 +275,7 @@ function Base.show(io::IO, ::MIME"text/plain",
275275
"save final solution" => solution_saving.save_final_solution ? "yes" :
276276
"no",
277277
"output directory" => abspath(solution_saving.output_directory),
278-
"prefix" => solution_saving.prefix,
278+
"prefix" => solution_saving.prefix
279279
]
280280
summary_box(io, "SolutionSavingCallback", setup)
281281
end
@@ -300,7 +300,7 @@ function Base.show(io::IO, ::MIME"text/plain",
300300
"save final solution" => solution_saving.save_final_solution ? "yes" :
301301
"no",
302302
"output directory" => abspath(solution_saving.output_directory),
303-
"prefix" => solution_saving.prefix,
303+
"prefix" => solution_saving.prefix
304304
]
305305
summary_box(io, "SolutionSavingCallback", setup)
306306
end

src/callbacks/stepsize.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function Base.show(io::IO, ::MIME"text/plain",
9494

9595
setup = [
9696
"is constant" => string(is_constant(stepsize_callback)),
97-
"CFL number" => stepsize_callback.cfl_number,
97+
"CFL number" => stepsize_callback.cfl_number
9898
]
9999
summary_box(io, "StepsizeCallback", setup)
100100
end

0 commit comments

Comments
 (0)