...
 
......@@ -109,7 +109,7 @@ class RootCap(object):
self.domain = Domain()
p = CoonsPatch(ni=self.patch_cons[0].ni, nj=self.patch_cons[3].ni, block_name='cap_base-0000')
p = CoonsPatch(ni=self.patch_cons[0].ni, nj=self.patch_cons[3].ni, name='cap_base-0000')
p.add_edge(0, self.patch_cons[0].copy())
p.add_edge(1, self.patch_cons[2].copy())
p.add_edge(2, self.patch_cons[3].copy())
......@@ -120,7 +120,7 @@ class RootCap(object):
p.P._flip_block()
self.domain.add_blocks(p.P.split(33))
for i in [0, 1]:
p = CoonsPatch(ni=self.collar_ps[i].ni, nj=self.base_cons[i].ni, block_name = 'cap-%04d' % i)
p = CoonsPatch(ni=self.collar_ps[i].ni, nj=self.base_cons[i].ni, name='cap-%04d' % i)
p.add_edge(0, self.collar_ps[i].copy())
p.add_edge(1, self.collar_ps[i+1].copy())
p.add_edge(2, self.base_cons[i].copy())
......@@ -130,7 +130,7 @@ class RootCap(object):
self.patches.append(p)
self.domain.add_blocks(p.P)
for i in [2, 3]:
p = CoonsPatch(ni=self.collar_ps[i+1].ni, nj=self.base_cons[i].ni, block_name = 'cap-%04d' % i)
p = CoonsPatch(ni=self.collar_ps[i+1].ni, nj=self.base_cons[i].ni, name='cap-%04d' % i)
p.add_edge(0, self.collar_ps[i+1])
p.add_edge(1, self.collar_ps[i])
p.add_edge(2, self.base_cons[i])
......
......@@ -227,7 +227,7 @@ class CoonsBladeTip(object):
self.domain.add_blocks(p.P)
# suction side leading edge patch
p = CoonsPatch(ni=self.c2LEs.ni, nj=self.c0LEs.ni, block_name='tip-LEs')
p = CoonsPatch(ni=self.c2LEs.ni, nj=self.c0LEs.ni, name='tip-LEs')
p.add_edge(0,self.c2LEs)
p.add_edge(1,self.c3LE)
p.add_edge(2,self.c0LEs)
......@@ -240,7 +240,7 @@ class CoonsBladeTip(object):
# else:
self.domain.add_blocks(p.P)
# pressure side leading edge patch
p = CoonsPatch(ni=self.c0LEp.ni, nj=self.c2LEp.ni, block_name='tip-LEp')
p = CoonsPatch(ni=self.c0LEp.ni, nj=self.c2LEp.ni, name='tip-LEp')
p.add_edge(0,self.c0LEp)
p.add_edge(1,self.c1p)
p.add_edge(2,self.c2LEp)
......@@ -253,7 +253,7 @@ class CoonsBladeTip(object):
# else:
self.domain.add_blocks(p.P)
# suction side trailing edge patch
p = CoonsPatch(ni=self.c0TEs.ni, nj=self.c2TEs.ni, block_name='tip-TEs')
p = CoonsPatch(ni=self.c0TEs.ni, nj=self.c2TEs.ni, name='tip-TEs')
p.add_edge(0,self.c0TEs)
p.add_edge(1,self.c1s)
p.add_edge(2,self.c2TEs)
......@@ -266,7 +266,7 @@ class CoonsBladeTip(object):
# else:
self.domain.add_blocks(p.P)
# pressure side trailing edge patch
p = CoonsPatch(ni=self.c2TEp.ni, nj=self.c0TEp.ni, block_name='tip-TEp')
p = CoonsPatch(ni=self.c2TEp.ni, nj=self.c0TEp.ni, name='tip-TEp')
p.add_edge(0,self.c2TEp)
p.add_edge(1,self.c3TE)
p.add_edge(2,self.c0TEp)
......@@ -472,7 +472,7 @@ class CoonsBladeTip(object):
self.connectors.extend(cv1)
for i in range(8):
p = CoonsPatch(nj=cu[i].ni, ni=cv0[i].ni, interpolant='cubic', block_name='tip-base'+str(i))
p = CoonsPatch(nj=cu[i].ni, ni=cv0[i].ni, interpolant='cubic', name='tip-base' + str(i))
# p = CoonsPatch(interpolant='linear')
p.add_edge(2, cu[i])
p.add_edge(3, cu[i+1])
......
This diff is collapsed.
......@@ -204,7 +204,7 @@ class CoonsNacelle(object):
self.collar_vs.append(self.collar_vs[0])
for i in range(8):
p = CoonsPatch(ni=self.collar_u0s[i].ni, nj=self.collar_vs[i].ni, block_name='hub_collar'+str(i))
p = CoonsPatch(ni=self.collar_u0s[i].ni, nj=self.collar_vs[i].ni, name='hub_collar' + str(i))
p.add_edge(0, self.collar_u0s[i].copy())
p.add_edge(1, self.collar_u1s[i].copy())
p.add_edge(2, self.collar_vs[i].copy())
......@@ -266,7 +266,7 @@ class CoonsNacelle(object):
self.base_vs.append(self.base_vs[0])
for n in range(nb):
p = CoonsPatch(ni=self.base_u0s[n].ni, nj=self.base_vs[n].ni, block_name='hub_base'+str(n), interpolant='linear')
p = CoonsPatch(ni=self.base_u0s[n].ni, nj=self.base_vs[n].ni, name='hub_base' + str(n), interpolant='linear')
p.add_edge(0, self.base_u0s[n].copy())
p.add_edge(1, self.collar_u0s[n].copy())
p.add_edge(2, self.base_vs[n].copy())
......@@ -389,7 +389,7 @@ class CoonsNacelle(object):
l8 = Curve(points=self.cnu1.points.copy())
l8.points = l8.points[::-1]
p = CoonsPatch(ni=self.base_u0s[-1].ni, nj=self.cu0.ni, block_name='nacelle_front0')
p = CoonsPatch(ni=self.base_u0s[-1].ni, nj=self.cu0.ni, name='nacelle_front0')
p.add_edge(0, self.base_u0s[-1].copy())
p.add_edge(1, self.cv0.copy())
p.add_edge(2, self.cu0.copy())
......@@ -397,7 +397,7 @@ class CoonsNacelle(object):
p.update()
self.patches.append(p)
self.domain.add_blocks(p.P)
p = CoonsPatch(ni=self.base_u0s[0].ni, nj=self.cu1.copy().ni, block_name='nacelle_front1')
p = CoonsPatch(ni=self.base_u0s[0].ni, nj=self.cu1.copy().ni, name='nacelle_front1')
p.add_edge(0, self.base_u0s[0].copy())
p.add_edge(1, self.cv1.copy())
p.add_edge(2, self.cu1.copy())
......@@ -406,7 +406,7 @@ class CoonsNacelle(object):
self.patches.append(p)
self.domain.add_blocks(p.P)
p = CoonsPatch(ni=self.cnu0.ni, nj=l3.ni, block_name='nacelle_collar0')
p = CoonsPatch(ni=self.cnu0.ni, nj=l3.ni, name='nacelle_collar0')
p.add_edge(0, self.cnu0.copy())
p.add_edge(1, self.cv0.copy())
p.add_edge(2, l3.copy())
......@@ -414,7 +414,7 @@ class CoonsNacelle(object):
p.update()
self.patches.append(p)
self.domain.add_blocks(p.P)
p = CoonsPatch(ni=self.cnu1.ni, nj=l4.ni, block_name='nacelle_collar1')
p = CoonsPatch(ni=self.cnu1.ni, nj=l4.ni, name='nacelle_collar1')
p.add_edge(0, self.cnu1.copy())
p.add_edge(1, self.cv1.copy())
p.add_edge(2, l4.copy())
......@@ -423,7 +423,7 @@ class CoonsNacelle(object):
self.patches.append(p)
self.domain.add_blocks(p.P)
p = CoonsPatch(ni=l7.ni, nj=l6.ni, block_name='nacelle_rear')
p = CoonsPatch(ni=l7.ni, nj=l6.ni, name='nacelle_rear')
p.add_edge(0, l7.copy())
p.add_edge(1, self.cnu0.copy())
p.add_edge(2, l6.copy())
......@@ -483,7 +483,7 @@ class CoonsNacelle(object):
self.spinner_cons.append(cu1)
self.spinner_cons.append(cu2)
p = CoonsPatch(ni=cv0s[1].ni, nj=cv1s[1].ni, block_name='spinner_tip')
p = CoonsPatch(ni=cv0s[1].ni, nj=cv1s[1].ni, name='spinner_tip')
p.add_edge(0, cv0s[1].copy())
p.add_edge(1, cu2.copy())
p.add_edge(2, cv1s[1].copy())
......@@ -504,7 +504,7 @@ class CoonsNacelle(object):
cbase0 = Curve(points=self.base_u0s[4].points.copy())
cbase0.points = cbase0.points[::-1]
p = CoonsPatch(ni=cbase0.ni, nj=cv0s[0].ni, block_name='spinner_base0')
p = CoonsPatch(ni=cbase0.ni, nj=cv0s[0].ni, name='spinner_base0')
p.add_edge(0, cbase0.copy())
p.add_edge(1, cu1.copy())
p.add_edge(2, cv0s[0].copy())
......@@ -522,7 +522,7 @@ class CoonsNacelle(object):
p.P.z[i, j, 0] = P1[2]
self.domain.add_blocks(p.P)
p = CoonsPatch(ni=cv1s[0].ni, nj=self.base_u0s[3].ni, block_name='spinner_base1')
p = CoonsPatch(ni=cv1s[0].ni, nj=self.base_u0s[3].ni, name='spinner_base1')
p.add_edge(0, cv1s[0].copy())
p.add_edge(1, cvm0.copy())
p.add_edge(2, self.base_u0s[3].copy())
......
This diff is collapsed.