changed points to verts in baker
This commit is contained in:
parent
699d0c1796
commit
967170d765
@ -86,7 +86,7 @@ def qlinear(X, R):
|
||||
q = CFD quantities of interest at the simplex points
|
||||
"""
|
||||
|
||||
phis = get_phis(X, R.points)
|
||||
phis = get_phis(X, R.verts)
|
||||
qlin = np.sum([q_i * phi_i for q_i, phi_i in zip(R.q, phis)])
|
||||
return phis, qlin
|
||||
|
||||
@ -99,7 +99,7 @@ def qlinear_3D(X, R):
|
||||
q = CFD quantities of interest at the simplex points(R)
|
||||
"""
|
||||
|
||||
phis = get_phis_3D(X, R.points)
|
||||
phis = get_phis_3D(X, R.verts)
|
||||
qlin = sum([q_i * phi_i for q_i, phi_i in zip(R.q, phis)])
|
||||
return phis, qlin
|
||||
|
||||
@ -107,7 +107,7 @@ def get_error_quadratic(phi, R, S):
|
||||
B = [] # baker eq 9
|
||||
w = [] # baker eq 11
|
||||
|
||||
for (s, q) in zip(S.points, S.q):
|
||||
for (s, q) in zip(S.verts, S.q):
|
||||
cur_phi, cur_qlin = qlinear(s, R)
|
||||
(phi1, phi2, phi3) = cur_phi
|
||||
|
||||
@ -143,7 +143,7 @@ def get_error_cubic(phi, R, S):
|
||||
B = [] # baker eq 9
|
||||
w = [] # baker eq 11
|
||||
|
||||
for (s, q) in zip(S.points, S.q):
|
||||
for (s, q) in zip(S.verts, S.q):
|
||||
cur_phi, cur_qlin = qlinear(s, R)
|
||||
(phi1, phi2, phi3) = cur_phi
|
||||
|
||||
@ -192,7 +192,7 @@ def get_error_sauron(phi, R, S, order = 2):
|
||||
p = pattern(order, len(phi), offset = -1)
|
||||
log.debug("pattern: %s" % p)
|
||||
|
||||
for (s,q) in zip(S.points, S.q):
|
||||
for (s,q) in zip(S.verts, S.q):
|
||||
cur_phi, cur_qlin = qlinear(s, R)
|
||||
l = []
|
||||
for i in p:
|
||||
@ -283,7 +283,7 @@ def run_baker_3D(X, R, S):
|
||||
# calculate values only for the triangle
|
||||
phi, qlin = qlinear_3D(X, R)
|
||||
|
||||
if len(S.points) == 0:
|
||||
if len(S.verts) == 0:
|
||||
answer = {
|
||||
'a': None,
|
||||
'b': None,
|
||||
@ -300,7 +300,7 @@ def run_baker_3D(X, R, S):
|
||||
B = [] # baker eq 9
|
||||
w = [] # baker eq 11
|
||||
|
||||
for (s, q) in zip(S.points, S.q):
|
||||
for (s, q) in zip(S.verts, S.q):
|
||||
cur_phi, cur_qlin = qlinear_3D(s, R)
|
||||
(phi1, phi2, phi3, phi4) = cur_phi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user