On Nov 2, 2020 LDAP authentication will be disabled - see http://status.ncsa.illinois.edu for details.

Commit 1023f285 authored by Brockton Brendal's avatar Brockton Brendal

Current working version; major change: added looping over radii

parent 8914e54f
......@@ -327,7 +327,7 @@ def POWER(argv, args):
local_val = local_val.astype(np.complex_)
# TODO: rewrite as array notation using np.cumtrapz
for i in range(0, len(t)):
local_val[i] = scipy.integrate.cumtrapz(prod[:i], x=(t[:i]))
local_val[i] = np.trapz(prod[:i], x=(t[:i]))
val += local_val
val *= 1/(16 * math.pi)
......@@ -414,8 +414,6 @@ def POWER(argv, args):
print("argv[2:]:", argv[2:])
print("len(argv):",len(argv))
sys.exit()
for sim_path in paths:
......@@ -504,6 +502,8 @@ def POWER(argv, args):
psi4dsetname = dsets[(radius, (l,m))]
mp_psi4 = loadHDF5Series(simdirs+"mp_psi4.h5", psi4dsetname)
mp_psi4_vars.append(mp_psi4)
#------------------------------------------------
# Coordinate conversion to Tortoise
#------------------------------------------------
......@@ -531,7 +531,13 @@ def POWER(argv, args):
#-----------------------------------------------------------------
# Strain Conversion
#-----------------------------------------------------------------
print("f0:",f0)
hTable = psi4ToStrain(mp_psi4_vars[i], f0) # table of strain
print("hTable:",hTable)
sys.exit()
time = hTable[:, 0]
h = hTable[:, 1]
hplus = h.real
......
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 to comment