Add guard for frequency scale

JuliaStellarDynamics · Jun 19, 2024 · d70b7a9 · d70b7a9
1 parent 13fca59
commit d70b7a9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/Utils/ParameterStructure.jl b/src/Utils/ParameterStructure.jl
@@ -4,7 +4,7 @@ TODO:
 
 """
 
-struct LinearParameters
+mutable struct LinearParameters
 
     # Orbital Elements parameters
     Orbitalparams::OrbitalElements.OrbitalParameters

diff --git a/src/Xi.jl b/src/Xi.jl
@@ -144,6 +144,17 @@ function RunLinearResponse(model::OrbitalElements.Potential,
                             FHT::FiniteHilbertTransform.AbstractFHT,
                             basis::AstroBasis.AbstractAstroBasis,
                             params::LinearParameters)
+
+    # Check model against provided parameters
+    #OrbitalElements.frequency_scale(model)
+
+    # Check if frequency scale is set by the model already
+    Ω₀tmp = frequency_scale(model)
+
+    if Ω₀tmp != params.Ω₀ 
+        params.Ω₀ = Ω₀tmp
+        println("Overriding Ω₀ with model-set value.")
+    end
 
     # call the function to construct W matrices
     RunWmat(model,FHT,basis,params)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -79,7 +79,8 @@ OEparams = OrbitalElements.OrbitalParameters(EDGE=OrbitalElements.DEFAULT_EDGE,T
                                              ITERMAX=OrbitalElements.DEFAULT_ITERMAX,invε=OrbitalElements.DEFAULT_TOL)
 
 
-Parameters = LinearResponse.LinearParameters(basis,Orbitalparams=OEparams,Ω₀=OrbitalElements.frequency_scale(model),Ku=Ku,Kv=Kv,Kw=Kw,
+#Parameters = LinearResponse.LinearParameters(basis,Orbitalparams=OEparams,Ω₀=OrbitalElements.frequency_scale(model),Ku=Ku,Kv=Kv,Kw=Kw,
+Parameters = LinearResponse.LinearParameters(basis,Orbitalparams=OEparams,Ω₀=15.,Ku=Ku,Kv=Kv,Kw=Kw,
                                              modelname=modelname,dfname=dfname,
                                              wmatdir=wmatdir,gfuncdir=gfuncdir,modedir=modedir,axidir=modedir,
                                              lharmonic=lharmonic,n1max=n1max,