Skip to content

Commit

Permalink
fixed missing rsy in parameters.py and wrong utils4pp module name in …
Browse files Browse the repository at this point in the history
…plot_field.py
  • Loading branch information
repepo committed Nov 13, 2024
1 parent 928e91f commit ac70fc8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions bin/parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def Ncheb(Ek):
# Ek_gap = 2e-4
# Ek = Ek_gap*(1-ricb)**2

Ek = 1e-3
Ek = 1e-4

anelastic = 0
variable_viscosity = 0
Expand Down Expand Up @@ -134,13 +134,13 @@ def Ncheb(Ek):
# Pm = 0.001
# Em = Ek/Pm; Le2 = Lambda*Em; Le = np.sqrt(Le2)
# Or use the Lehnert number and the magnetic Ekman number (i.e. Le and Em: uncomment and set the following three lines):
Le = 10**-3; Lu=2e3
Le = 1e-3; Lu=2e3
Em = Le/Lu
Le2 = Le**2

# Normalization of the background magnetic field
cnorm = 'rms_cmb' # Sets the radial rms field at the CMB as unity
# cnorm = 'mag_energy' # Unit magnetic energy as in Luo & Jackson 2022 (I. Torsional oscillations)
# cnorm = 'rms_cmb' # Sets the radial rms field at the CMB as unity
cnorm = 'mag_energy' # Unit magnetic energy as in Luo & Jackson 2022 (I. Torsional oscillations)
# cnorm = 'Schmitt2012' # as above but times 2
# cnorm = 3.86375 # G101 of Schmitt 2012, ricb = 0.35
# cnorm = 4.067144 # Zhang & Fearn 1994, ricb = 0.35
Expand Down Expand Up @@ -199,8 +199,8 @@ def Ncheb(Ek):
# Additional arguments for 'Two zone' or 'User defined' case (modify if needed).
rc = 0.7 # transition radius
h = 0.1 # transition width
sym = -1 # radial symmetry
args = [rc, h, sym]
rsy = -1 # radial symmetry
args = [rc, h, rsy]

# Thermal boundary conditions
# 0 for isothermal, theta=0
Expand Down Expand Up @@ -240,10 +240,10 @@ def Ncheb(Ek):
BV2_comp = 0.0

# Additional arguments for 'Two zone' or 'User defined' case (modify if needed).
rc = 0.7 # transition radius
h = 0.1 # transition width
sym = -1 # radial symmetry
args_comp = [rc, h, sym]
rcc = 0.7 # transition radius
hc = 0.1 # transition width
rsyc = -1 # radial symmetry
args_comp = [rcc, hc, rsyc]

# Compositional boundary conditions
# 0 for constant composition, xi=0
Expand Down Expand Up @@ -274,7 +274,7 @@ def Ncheb(Ek):

# Chebyshev polynomial truncation level. Use function def at top or set manually. N must be even if ricb = 0.
N = Ncheb(Ek)
# N = 24
# N = 48

# Spherical harmonic truncation lmax and approx lmax/N ratio:
g = 1.0
Expand Down Expand Up @@ -313,7 +313,7 @@ def Ncheb(Ek):
# M magnitude, R real, I imaginary

# Number of desired eigenvalues
nev = 4
nev = 3

# Number of vectors in Krylov space for solver
# ncv = 100
Expand Down
2 changes: 1 addition & 1 deletion tools/plot_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import utils as ut
import parameters as par
import utils_pp as upp
import utils4pp as upp

'''
Script to plot meridional cuts of a solution field
Expand Down

0 comments on commit ac70fc8

Please sign in to comment.