Commit 8c0233d5 by Zoltan Karsa

bugfix

parent b2a76014
...@@ -29,7 +29,7 @@ void parosit(const double* x1, const double* x2, double* a, double* b, const int ...@@ -29,7 +29,7 @@ void parosit(const double* x1, const double* x2, double* a, double* b, const int
float alpha = x1[tid]; float alpha = x1[tid];
for (int i = 0; i < m; i++) { for (int i = 0; i < m; i++) {
float betha = x2[i]; float betha = x2[i];
if ((alpha + betha) < PI && betha > alpha && alpha > 0.0) { if ((alpha + betha) < PI && betha >= alpha && alpha > 0.0) {
a[tid*m+i] = alpha; a[tid*m+i] = alpha;
b[tid*m+i] = betha; b[tid*m+i] = betha;
} else { } else {
...@@ -131,7 +131,7 @@ def angles_ratet(anglestopick, plot = False): ...@@ -131,7 +131,7 @@ def angles_ratet(anglestopick, plot = False):
cos = cp.cos(anglestopick) cos = cp.cos(anglestopick)
sin = cp.sin(anglestopick) sin = cp.sin(anglestopick)
Dx = cp.outer(cp.full(anglestopick.size, 1.0), Ex).flatten() Dx = cp.outer(cp.full(anglestopick.size, 1.0, dtype=cp.float64), Ex).flatten()
Dy = cp.outer(cos, Ey).flatten() Dy = cp.outer(cos, Ey).flatten()
Dz = cp.outer(sin, Ey).flatten() Dz = cp.outer(sin, Ey).flatten()
......
#bin/bash
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
time python tetrarun.py -n 321 -v 100 -w 100
\ No newline at end of file
...@@ -32,15 +32,9 @@ def main(argv): ...@@ -32,15 +32,9 @@ def main(argv):
outputfile = arg outputfile = arg
elif opt in ("-p", "--plot"): elif opt in ("-p", "--plot"):
PLOT = True PLOT = True
print('Output file is: ', outputfile)
print('Conf: ', [n, v, w])
space = gen_angels_to_pick(n, PLOT) space = gen_angels_to_pick(n, PLOT)
Cx, Cy = angles_alap(space, PLOT) Cx, Cy = angles_alap(space, PLOT)
print(Cx)
print(Cy)
Dx, Dy, Dz = angles_ratet(space) Dx, Dy, Dz = angles_ratet(space)
res = start_kernel(Cx, Cy, Dx, Dy, Dz, v, w) res = start_kernel(Cx, Cy, Dx, Dy, Dz, v, w)
......
import cupy as cp import cupy as cp
def expSpace(min, max, N, exponentialliness = 20.0): def expSpace(min, max, N, exponentialliness = 20.0):
LinVec = cp.linspace(0, cp.log10(exponentialliness+1),N) LinVec = cp.linspace(0, cp.log10(exponentialliness+1, dtype=cp.float64),N, dtype=cp.float64)
return (max-min)/exponentialliness * (10.0**LinVec - 1) + min return (max-min)/exponentialliness * (10.0**LinVec - 1) + min
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment