diff --git a/Manifest.toml b/Manifest.toml index 9d6bb14..5832005 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -102,9 +102,9 @@ version = "0.10.2" [[deps.CUDA]] deps = ["AbstractFFTs", "Adapt", "BFloat16s", "CEnum", "CompilerSupportLibraries_jll", "ExprTools", "GPUArrays", "GPUCompiler", "LLVM", "LazyArtifacts", "Libdl", "LinearAlgebra", "Logging", "Printf", "Random", "Random123", "RandomNumbers", "Reexport", "Requires", "SparseArrays", "SpecialFunctions", "TimerOutputs"] -git-tree-sha1 = "e2d995efe0e223773a74778ce539e60025b09e52" +git-tree-sha1 = "3eb49a30d6093dfb6cd60ea66ff681a7db87178a" uuid = "052768ef-5323-5732-b1bb-66c8b64840ba" -version = "3.7.0" +version = "3.7.1" [[deps.Cairo]] deps = ["Cairo_jll", "Colors", "Glib_jll", "Graphics", "Libdl", "Pango_jll"] diff --git a/analysis/radial_distribution_function/radial_distribution_function.jl b/analysis/radial_distribution_function/radial_distribution_function.jl index 7eed4f2..4b2aea4 100644 --- a/analysis/radial_distribution_function/radial_distribution_function.jl +++ b/analysis/radial_distribution_function/radial_distribution_function.jl @@ -139,11 +139,13 @@ function radial_distribution(; return (lower_radii, gs, particle_radius) end -function plot_radial_distributions( +function plot_radial_distributions(; v₀s::NTuple{N,Float64}, lower_radii::AbstractVector{Float64}, gs::Vector{Vector{Float64}}, particle_radius::Float64, + include_comparison::Bool, + filename_addition::String="", ) where {N} println("Plotting the radial distributions") @@ -176,33 +178,41 @@ function plot_radial_distributions( ) for (g_ind, g) in enumerate(gs) + v₀ = round(Int64, v₀s[g_ind]) scatterlines!( - ax, lower_radii, g; markersize=3, linewidth=0.5, label=L"v_0 = %$(v₀s[g_ind])" + ax, + lower_radii, + g; + markersize=3, + linewidth=1, + label=L"Simulation with $v_0 = %$(v₀)$", ) end - comparison_curve = CSV.read( - "analysis/radial_distribution_function/g_of_r_d_ratio_with_0_37_packing_ratio.csv", - DataFrames.DataFrame; - header=3, - ) - lines!( - ax, - comparison_curve.r_d_ratio, - comparison_curve.g_of_r_d_ratio; - label="Similar system", - color=:green, - ) + if include_comparison + comparison_curve = CSV.read( + "analysis/radial_distribution_function/g_of_r_d_ratio_with_0_37_packing_ratio.csv", + DataFrames.DataFrame; + header=3, + ) + lines!( + ax, + comparison_curve.r_d_ratio, + comparison_curve.g_of_r_d_ratio; + label=L"Reference with $v_0 = 0$", + color=:orange, + ) + end axislegend(ax; position=:rt, padding=3, rowgap=-3) - save_fig("radial_distribution.pdf", fig) + save_fig("radial_distribution$filename_addition.pdf", fig) return nothing end function run_radial_distribution_analysis() - v₀s = (0.0, 20.0) + v₀s = (0.0, 40.0, 80.0) n_particles = 1000 @@ -211,10 +221,21 @@ function run_radial_distribution_analysis() ) lower_radii, gs, particle_radius = radial_distribution(; - sim_dirs=sim_dirs, n_radii=56, n_last_snapshots=200, n_particles=n_particles + sim_dirs=sim_dirs, n_radii=58, n_last_snapshots=200, n_particles=n_particles ) - plot_radial_distributions(v₀s, lower_radii, gs, particle_radius) + plot_radial_distributions(; + v₀s=v₀s[1:1], lower_radii, gs=gs[1:1], particle_radius, include_comparison=true + ) + + plot_radial_distributions(; + v₀s=v₀s[1:end], + lower_radii, + gs=gs[1:end], + particle_radius, + include_comparison=false, + filename_addition="_all_vs", + ) return nothing end \ No newline at end of file diff --git a/src/setup.jl b/src/setup.jl index 305ae62..61b7f29 100644 --- a/src/setup.jl +++ b/src/setup.jl @@ -69,7 +69,7 @@ function gen_sim_consts( skin_r = skin_to_interaction_r_ratio * interaction_r - buffer = 2.2 + buffer = 2.5 max_approach_after_one_integration_step = buffer * (2 * v₀ * δt) @assert skin_r >= interaction_r + max_approach_after_one_integration_step @@ -78,7 +78,7 @@ function gen_sim_consts( Int64, (skin_r - interaction_r) / max_approach_after_one_integration_step ) else - n_steps_before_verlet_list_update = 1200 + n_steps_before_verlet_list_update = 1000 end grid_n = round(Int64, ceil(sqrt(n_particles)))