Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More minor changes #26

Merged
merged 8 commits into from
Mar 14, 2024
Merged

More minor changes #26

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3172ca2
Re-define num in spectral line
dschwoerer Jan 15, 2024
df1d354
use NETCDF4 format
dschwoerer Jan 15, 2024
c2f25c2
Fix max_fac inner
dschwoerer Jan 15, 2024
e7fa8a4
Handle many poloidal points better
dschwoerer Jan 15, 2024
3cb4b70
handle maxfac_inner = 1 differently
dschwoerer Jan 15, 2024
5002e00
Ensure inner_ort is passed to recursive invocaation
dschwoerer Jan 26, 2024
eaf3dea
Apply black/isort changes
dschwoerer Jan 26, 2024
ec0c68b
Remove commented out code
dschwoerer Jan 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply black/isort changes
  • Loading branch information
@dschwoerer @github-actions
dschwoerer authored and github-actions[bot] committed Jan 26, 2024
commit eaf3dea546259d8b4615ff8b4779ad9e5eb737cc
26 changes: 12 additions & 14 deletions zoidberg/field.py
View file
Original file line number Diff line number Diff line change
@@ -650,23 +650,22 @@ def CD(self, m, k):
Sympy function CD_mk (R) (Dirichlet boudary conditions)
"""

alpha = (
lambda n, b: (-1.0) ** n
/ (gamma(b + n + 1) * gamma(n + 1) * 2.0 ** (2 * n + b))
alpha = lambda n, b: (
(-1.0) ** n / (gamma(b + n + 1) * gamma(n + 1) * 2.0 ** (2 * n + b))
if (n >= 0)
else 0.0
)
alpha_st = lambda n, b: alpha(n, b) * (2 * n + b)

beta = (
lambda n, b: gamma(b - n) / (gamma(n + 1) * 2.0 ** (2 * n - b + 1))
beta = lambda n, b: (
gamma(b - n) / (gamma(n + 1) * 2.0 ** (2 * n - b + 1))
if (n >= 0 and n < b)
else 0.0
)
beta_st = lambda n, b: beta(n, b) * (2 * n - b)

delta = (
lambda n, b: alpha(n, b)
delta = lambda n, b: (
alpha(n, b)
* np.sum([1.0 / i + 1.0 / (b + i) for i in range(1, n + 1)])
/ 2
if (n > 0)
@@ -705,23 +704,22 @@ def CN(self, m, k):
Sympy function CN_mk (R) (Neumann boundary conditions)
"""

alpha = (
lambda n, b: (-1.0) ** n
/ (gamma(b + n + 1) * gamma(n + 1) * 2.0 ** (2 * n + b))
alpha = lambda n, b: (
(-1.0) ** n / (gamma(b + n + 1) * gamma(n + 1) * 2.0 ** (2 * n + b))
if (n >= 0)
else 0.0
)
alpha_st = lambda n, b: alpha(n, b) * (2 * n + b)

beta = (
lambda n, b: gamma(b - n) / (gamma(n + 1) * 2.0 ** (2 * n - b + 1))
beta = lambda n, b: (
gamma(b - n) / (gamma(n + 1) * 2.0 ** (2 * n - b + 1))
if (n >= 0 and n < b)
else 0.0
)
beta_st = lambda n, b: beta(n, b) * (2 * n - b)

delta = (
lambda n, b: alpha(n, b)
delta = lambda n, b: (
alpha(n, b)
* np.sum([1.0 / i + 1.0 / (b + i) for i in range(1, n + 1)])
/ 2
if (n > 0)
6 changes: 3 additions & 3 deletions zoidberg/poloidal_grid.py
View file
Original file line number Diff line number Diff line change
@@ -383,9 +383,9 @@ def findIndex(self, R, Z, tol=1e-10, show=False):

# Create a mask for the positions
mask = np.ones(xind.shape)
mask[
np.logical_or((xind < 0.5), (xind > (nx - 1.5)))
] = 0.0 # Set to zero if near the boundary
mask[np.logical_or((xind < 0.5), (xind > (nx - 1.5)))] = (
0.0 # Set to zero if near the boundary
)

if show and plotting_available:
plt.plot(self.R, self.Z, ".")