rename ExponentialDisc, cancel disc shifting

JuliaAstroSim · Oct 6, 2024 · 5d277a1 · 5d277a1
1 parent 4cf4975
commit 5d277a1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/src/AstroIC.jl b/src/AstroIC.jl
@@ -37,7 +37,7 @@ export
 
     PlummerStarCluster,
     GasCloud,
-    ExponentialDisk,
+    ExponentialDisc,
     Bulge,
 
     solarsystem,
@@ -73,7 +73,7 @@ Generate initial conditions in `units`
 # Usable IC configs
 - `PlummerStarCluster`
 - `GasCloud`
-- `ExponentialDisk`
+- `ExponentialDisc`
 
 $_common_keywords
 """

diff --git a/src/disk.jl b/src/disk.jl
@@ -2,7 +2,7 @@
 $(TYPEDEF)
 $(TYPEDFIELDS)
 """
-mutable struct ExponentialDisk{I, Len, MASS} <: InitialConditionConfig
+mutable struct ExponentialDisc{I, Len, MASS} <: InitialConditionConfig
     collection::Collection
     NumSamples::I
 
@@ -19,18 +19,18 @@ $(TYPEDSIGNATURES)
 - `collection` particle type
 - `NumSamples` amount of particles
 """
-function ExponentialDisk(;
+function ExponentialDisc(;
         collection::Collection = STAR,
         NumSamples::Int64 = 1000,
         TotalMass::Number = 1.0e10u"Msun",
         ScaleRadius::Number = 2.0u"kpc",
         ScaleHeight::Number = 0.02u"kpc",
         HoleRadius::Number = 0.0u"kpc",
     )
-    return ExponentialDisk(collection, NumSamples, TotalMass, ScaleRadius, ScaleHeight, HoleRadius)
+    return ExponentialDisc(collection, NumSamples, TotalMass, ScaleRadius, ScaleHeight, HoleRadius)
 end
 
-function Base.show(io::IO, config::ExponentialDisk)
+function Base.show(io::IO, config::ExponentialDisc)
     print(io,
         "Config of Exponential Disk Initial Conditions:",
         "\n    Particle Collection: ", config.collection,
@@ -144,7 +144,7 @@ end
 $(TYPEDSIGNATURES)
 
 """
-function generate(config::ExponentialDisk, units = uAstro;
+function generate(config::ExponentialDisc, units = uAstro;
         RotationCurve = nothing,
         MaxRadius = 5 * config.ScaleRadius,
         MaxHeight = MaxRadius,
@@ -211,6 +211,12 @@ function generate(config::ExponentialDisk, units = uAstro;
         spl = Spline1D(ustrip.(uLen, xc), ustrip.(uVel, vc); k, bc)
         v = spl(ustrip.(uLen, R)) * uVel
         vel = rotational_velocity.(pos.x, pos.y, v, rotational_ratio)
+
+        # Cancel out shifting
+        v0 = mean(vel)
+        vel = vel .- v0
+        uVel = getuVel(units)
+        vel = uconvert.(uVel, vel)
     end
 
     # Packing

diff --git a/src/precompile.jl b/src/precompile.jl
@@ -2,8 +2,8 @@
     @compile_workload begin
         NumSamples = 5
         data = generate(PlummerStarCluster(; NumSamples))
-        data = generate(ExponentialDisk(; NumSamples))
-        data = generate(ExponentialDisk(; NumSamples, HoleRadius = 0.2u"kpc"))
+        data = generate(ExponentialDisc(; NumSamples))
+        data = generate(ExponentialDisc(; NumSamples, HoleRadius = 0.2u"kpc"))
         data = generate(Bulge(; NumSamples))
         data = generate(Bulge(; NumSamples), RotationCurve = ([0.0, 5.0, 10.0]*u"kpc", [0.0, 200.0, 230.0]*u"km/s"))
         p = sum(data.Pos)

diff --git a/test/disk.jl b/test/disk.jl
@@ -1,5 +1,5 @@
 @testset "Disk" begin
-    config = ExponentialDisk(
+    config = ExponentialDisc(
         collection = STAR,
         NumSamples = 100,
         TotalMass = 1.0e8u"Msun",