Bring in line with DistributionFunctions and AstroBasis changes

JuliaStellarDynamics · Jun 10, 2024 · 13fca59 · 13fca59
1 parent 075f3ba
commit 13fca59
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/Project.toml b/Project.toml
@@ -12,8 +12,10 @@ OrbitalElements = "a3b07092-bde3-4843-b84f-c597d614ec7b"
 DistributionFunctions = "c869f47d-2815-40f9-b874-25ebe83f43af"
 
 [compat]
-julia = "1.6.7"
-OrbitalElements = "2"
+julia = ">= 1.6"
+OrbitalElements = "2"  # Any version from 2.0.0 up
+AstroBasis = ">= 0.3.0"  # Any version from 0.3.0 up
+
 
 [extras]
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

diff --git a/src/GFunc.jl b/src/GFunc.jl
@@ -7,16 +7,17 @@
 
 
 """
-    ndFdJ(EL::Tuple{Float64,Float64},ΩΩ::Tuple{Float64,Float64},res::Resonance, distributionfunction::DistributionFunction)
+    _ndFdJ(EL::Tuple{Float64,Float64},ΩΩ::Tuple{Float64,Float64},res::Resonance, distributionfunction::DistributionFunction)
 
 Distribution function derivative for `distributionfunction` for a given `E`,`L`.
 
     TODO: make frequencies an optional input
 """
-function ndFdJ(EL::Tuple{Float64,Float64},ΩΩ::Tuple{Float64,Float64},resonance::Resonance, df::EnergyAngularMomentumDistributionFunction)
+function _ndFdJ(EL::Tuple{Float64,Float64},ΩΩ::Tuple{Float64,Float64},resonance::Resonance, df::EnergyAngularMomentumDF)
 
-        DFDEval = DFDE(EL,df)
-        DFDLval = DFDL(EL,df)
+        DFDEval,DFDLval = gradient(EL,df)
+
+        # still allow these to be an optional argument
         Ω1,Ω2   = ΩΩ
         n1,n2   = resonance.number[1],resonance.number[2]
         ndotΩ   = n1*Ω1 + n2*Ω2
@@ -117,7 +118,7 @@ function MakeGu(distributionfunction::DistributionFunction,
             ndotΩ = n1*Ω1 + n2*Ω2
             # compute dF/dJ: call out for value
             #valndFdJ  = ndFdJ(n1,n2,Eval,Lval,ndotΩ)
-            valndFdJ = ndFdJ((Eval,Lval),(Ω1,Ω2),resonance,distributionfunction)
+            valndFdJ = _ndFdJ((Eval,Lval),(Ω1,Ω2),resonance,distributionfunction)
 
             # Common part of the integrand (to every np,nq)
             # True volume element (including Jacobians and normalization factors 

diff --git a/src/Utils/Compatibilities.jl b/src/Utils/Compatibilities.jl
@@ -65,9 +65,20 @@ function CheckBasisCompatibility(basis::AstroBasis.AbstractAstroBasis,
 
     compat = true
     for (key,value) in params.Basisparams
-        if value != getfield(basis,Symbol(key))
-            compat = false
-            break
+
+        # special case of dimension
+        if key == "dimension"
+            if value != dimension(basis)
+                compat = false
+                break
+            end
+        else
+
+            if value != getfield(basis,Symbol(key))
+                compat = false
+                break
+            end
+
         end
     end
     @assert compat "Incompatible basis and parameters."

diff --git a/src/Utils/ParameterStructure.jl b/src/Utils/ParameterStructure.jl
@@ -63,7 +63,7 @@ function LinearParameters(basis::AstroBasis.AbstractAstroBasis;
                           VERBOSE::Int64=0)
 
     # Basis parameters
-    Basisparams = AstroBasis.GetParameters(basis)
+    Basisparams = AstroBasis.getparameters(basis)
 
     # Basis parameters
     dimension = Basisparams["dimension"]