random initial conditions +ed to CALiPPSO's module

rdhr · Feb 22, 2022 · 08ab2f6 · 08ab2f6
1 parent 8541779
commit 08ab2f6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -1,10 +1,6 @@
 [deps]
 CALiPPSO = "06591efd-5e2b-42e5-a742-7087027635df"
-Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
-Distributions = "0.25.49"
 Documenter = "0.27"
-StaticArrays = "1.3.5"
diff --git a/docs/make.jl b/docs/make.jl
@@ -1,8 +1,8 @@
 # const precompile_main_function = false
 # include("../src/CALiPPSO.jl")
+# using .CALiPPSO
 using CALiPPSO
-# using StaticArrays
-include("../src/random_initial_conditions.jl")
+# include("../src/random_initial_conditions.jl")
 using Documenter
 
 makedocs(sitename="CALiPPSO",

diff --git a/src/CALiPPSO.jl b/src/CALiPPSO.jl
@@ -1,13 +1,13 @@
-
 module CALiPPSO
 
 export produce_jammed_configuration, precompile_main_function # main function!! and a function used to precompile it on a small system
+export generate_random_configuration, radius_from_phi # function to generate a low density, random initial configuration; and compute r from φ
 export convergence_info, PeriodicNumber, MonoParticle, MonoPacking, PeriodicVector, Packing # `struct`s defined in the package
 export network_of_contacts, check_for_overlaps, PeriodicVectors, packing_fraction, get_non_rattlers, get_rattlers, is_isostatic, get_coordination_number, total_force # other useful functions; mostly for packings
 export volume_d_ball, norm # these functions are needed for generating random initial packings, in the 'random_initial_conditions.jl' script. Nevertheless, it could be the case that they're also useful when analysing results, specially 'norm'
 
 include("Packing.jl")
-
+include("random_initial_conditions.jl")
 
 using JuMP # Library for using high level interface for optimization and model creation/manipulation 
 const max_threads = Int(round(Sys.CPU_THREADS/2)) # max number of processes to be used by any optimizer. By default, half the number of threads available in a computer

diff --git a/src/random_initial_conditions.jl b/src/random_initial_conditions.jl
@@ -1,9 +1,4 @@
-using Distributions, StaticArrays
-
-if !(@isdefined produce_jammed_configuration)
-    include("CALiPPSO.jl")
-end
-using .CALiPPSO
+using Distributions
 
 #################################################
 # Functions to obtain particle radii from packing fraction and other simple geometric properties