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

DVGeoMulti anisotropy and loop efficiency #167

Merged
merged 7 commits into from
Nov 29, 2022
Merged

DVGeoMulti anisotropy and loop efficiency #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f826e60
slightly refactored curve-based update
sseraj Oct 30, 2022
979970d
removed outdated update_d function
sseraj Oct 30, 2022
f1256db
refactored sens
sseraj Oct 30, 2022
7aefd11
added anisotropy option
sseraj Oct 31, 2022
84ead37
Merge branch 'main' into anisotropy
sseraj Nov 17, 2022
8d25ff1
updated docstring
sseraj Nov 17, 2022
a6d250a
added anisotropy option to test
sseraj Nov 23, 2022
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
216 changes: 110 additions & 106 deletions pygeo/parameterization/DVGeoMulti.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ def addIntersection(
trackSurfaces=None,
excludeSurfaces=None,
remeshBwd=True,
anisotropy=[1.0, 1.0, 1.0],
):
"""
Method that defines intersections between components.
Expand Down Expand Up @@ -211,6 +212,14 @@ def addIntersection(
Flag to specify whether to remesh feature curves on the side opposite that
which is specified by the march direction.

anisotropy : list of float, optional
List with three entries specifying scaling factors in the [x, y, z] directions.
The factors multiply the [x, y, z] distances used in the curve-based deformation.
Smaller factors in a certain direction will amplify the effect of the parts of the curve
that lie in that direction from the points being warped.
This tends to increase the mesh quality in one direction at the expense of other directions.
This can be useful when the initial intersection curve is skewed.

"""

# Assign mutable defaults
Expand Down Expand Up @@ -241,6 +250,7 @@ def addIntersection(
trackSurfaces,
excludeSurfaces,
remeshBwd,
anisotropy,
self.debug,
self.dtype,
)
Expand Down Expand Up @@ -941,6 +951,7 @@ def __init__(
trackSurfaces,
excludeSurfaces,
remeshBwd,
anisotropy,
debug,
dtype,
):
Expand Down Expand Up @@ -1022,7 +1033,6 @@ def __init__(

self.dStarA = dStarA
self.dStarB = dStarB
# self.halfdStar = self.dStar/2.0
self.points = OrderedDict()

# Make surface names lowercase
Expand All @@ -1036,6 +1046,9 @@ def __init__(
raise Error(f"Surface {k} cannot be in both trackSurfaces and excludeSurfaces.")
self.excludeSurfaces[k.lower()] = v

# Save anisotropy list
self.anisotropy = anisotropy

# process the feature curves

# list to save march directions
Expand Down Expand Up @@ -1435,9 +1448,28 @@ def update(self, ptSetName, delta):
print("The intersection topology has changed. The intersection will not be updated.")
return delta

# define an epsilon to avoid dividing by zero later on
# Define an epsilon to avoid dividing by zero later on
eps = 1e-50

# Get the two end points for the line elements
r0 = coor[conn[:, 0]]
r1 = coor[conn[:, 1]]

# Get the deltas for two end points
dr0 = dr[conn[:, 0]]
dr1 = dr[conn[:, 1]]

# Compute the lengths of each element in each coordinate direction
length_x = r1[:, 0] - r0[:, 0]
length_y = r1[:, 1] - r0[:, 1]
length_z = r1[:, 2] - r0[:, 2]

# Compute the 'a' coefficient
a = (length_x) ** 2 + (length_y) ** 2 + (length_z) ** 2

# Compute the total length of each element
length = np.sqrt(a)

# loop over the points that get affected
for i in range(len(factors)):
# j is the index of the point in the full set we are working with.
Expand All @@ -1448,46 +1480,37 @@ def update(self, ptSetName, delta):

# Run vectorized weighted interpolation

# get the two end points for the line elements
r0 = coor[conn[:, 0]]
r1 = coor[conn[:, 1]]
# Compute the distances from the point being updated to the first end point of each element
# The distances are scaled by the user-specified anisotropy in each direction
dist_x = (r0[:, 0] - rp[0]) * self.anisotropy[0]
dist_y = (r0[:, 1] - rp[1]) * self.anisotropy[1]
dist_z = (r0[:, 2] - rp[2]) * self.anisotropy[2]

# get the deltas for two end points
dr0 = dr[conn[:, 0]]
dr1 = dr[conn[:, 1]]
# Compute b and c coefficients
b = 2 * (length_x * dist_x + length_y * dist_y + length_z * dist_z)
c = dist_x**2 + dist_y**2 + dist_z**2

# compute a, b, and c coefficients
a = (r1[:, 0] - r0[:, 0]) ** 2 + (r1[:, 1] - r0[:, 1]) ** 2 + (r1[:, 2] - r0[:, 2]) ** 2
b = 2 * (
(r1[:, 0] - r0[:, 0]) * (r0[:, 0] - rp[0])
+ (r1[:, 1] - r0[:, 1]) * (r0[:, 1] - rp[1])
+ (r1[:, 2] - r0[:, 2]) * (r0[:, 2] - rp[2])
)
c = (r0[:, 0] - rp[0]) ** 2 + (r0[:, 1] - rp[1]) ** 2 + (r0[:, 2] - rp[2]) ** 2

# distances for each element
dists = np.sqrt(np.maximum(a, 0.0))

# compute some re-occurring terms
# the determinant can be zero or negative, but it CANNOT be positive
# this is because the quadratic that defines the distance from the line cannot have two roots.
# if the point is on the line, the quadratic will have a single root...
det = b * b - 4 * a * c
# these might be negative 1e-20sth so clip them...
# these will be strictly zero or greater than zero.
# Numerically, they cannot be negative bec. we are working with real numbers
# Compute some recurring terms

# The discriminant can be zero or negative, but it CANNOT be positive
# This is because the quadratic that defines the distance from the line cannot have two roots
# If the point is on the line, the quadratic will have a single root
disc = b * b - 4 * a * c

# Clip a + b + c might because it might be negative 1e-20 or so
# Analytically, it cannot be negative
sabc = np.sqrt(np.maximum(a + b + c, 0.0))
sc = np.sqrt(np.maximum(c, 0.0))
sc = np.sqrt(c)

# denominators on the integral evaluations
# add an epsilon so that these terms never become zero
# det <= 0, sabc and sc >= 0, therefore the den1 and den2 should be <=0
den1 = det * sabc - eps
den2 = det * sc - eps
# Compute denominators for the integral evaluations
# Add an epsilon so that these terms never become zero
# disc <= 0, sabc and sc >= 0, therefore the den1 and den2 should be <=0
den1 = disc * sabc - eps
den2 = disc * sc - eps

# integral evaluations
eval1 = (-2 * (2 * a + b) / den1 + 2 * b / den2) * dists
eval2 = ((2 * b + 4 * c) / den1 - 4 * c / den2) * dists
eval1 = (-2 * (2 * a + b) / den1 + 2 * b / den2) * length
eval2 = ((2 * b + 4 * c) / den1 - 4 * c / den2) * length

# denominator only gets one integral
den = np.sum(eval1)
Expand All @@ -1506,39 +1529,6 @@ def update(self, ptSetName, delta):

return delta

def update_d(self, ptSetName, dPt, dSeam):

"""forward mode differentiated version of the update routine.
Note that dPt and dSeam are both one dimensional arrays
"""
pts = self.points[ptSetName][0]
indices = self.points[ptSetName][1]
factors = self.points[ptSetName][2]

# we need to reshape the arrays for simpler code
dSeam = dSeam.reshape((len(self.seam0), 3))

for i in range(len(factors)):
# j is the index of the point in the full set we are
# working with.
j = indices[i]

# Do it vectorized
rr = pts[j] - self.seam0
LdefoDist = 1.0 / np.sqrt(rr[:, 0] ** 2 + rr[:, 1] ** 2 + rr[:, 2] ** 2 + 1e-16)
LdefoDist3 = LdefoDist**3
Wi = LdefoDist3
den = np.sum(Wi)
interp_d = np.zeros(3)
for iDim in range(3):
interp_d[iDim] = np.sum(Wi * dSeam[:, iDim]) / den

# Now the delta is replaced by 1-factor times the weighted
# interp of the seam * factor of the original:
dPt[j * 3 + iDim] = factors[i] * dPt[j * 3 + iDim] + (1 - factors[i]) * interp_d[iDim]

return

def sens(self, dIdPt, ptSetName, comm):
# Return the reverse accumulation of dIdpt on the seam
# nodes. Also modifies the dIdp array accordingly.
Expand All @@ -1556,9 +1546,24 @@ def sens(self, dIdPt, ptSetName, comm):
# bar connectivity for the remeshed elements
conn = self.seamConn

# define an epsilon to avoid dividing by zero later on
# Define an epsilon to avoid dividing by zero later on
eps = 1e-50

# Get the two end points for the line elements
r0 = coor[conn[:, 0]]
r1 = coor[conn[:, 1]]

# Compute the lengths of each element in each coordinate direction
length_x = r1[:, 0] - r0[:, 0]
length_y = r1[:, 1] - r0[:, 1]
length_z = r1[:, 2] - r0[:, 2]

# Compute the 'a' coefficient
a = (length_x) ** 2 + (length_y) ** 2 + (length_z) ** 2

# Compute the total length of each element
length = np.sqrt(a)

# if we are handling more than one function,
# seamBar will contain the seeds for each function separately
seamBar = np.zeros((dIdPt.shape[0], self.seam0.shape[0], self.seam0.shape[1]))
Expand All @@ -1567,51 +1572,50 @@ def sens(self, dIdPt, ptSetName, comm):
if self.projectFlag:
seamBar += self.seamBarProj[ptSetName]

for k in range(dIdPt.shape[0]):
for i in range(len(factors)):
for i in range(len(factors)):

# j is the index of the point in the full set we are working with.
j = indices[i]

# coordinates of the original point
rp = pts[j]

# Compute the distances from the point being updated to the first end point of each element
# The distances are scaled by the user-specified anisotropy in each direction
dist_x = (r0[:, 0] - rp[0]) * self.anisotropy[0]
dist_y = (r0[:, 1] - rp[1]) * self.anisotropy[1]
dist_z = (r0[:, 2] - rp[2]) * self.anisotropy[2]

# j is the index of the point in the full set we are working with.
j = indices[i]
# Compute b and c coefficients
b = 2 * (length_x * dist_x + length_y * dist_y + length_z * dist_z)
c = dist_x**2 + dist_y**2 + dist_z**2

# Compute some reccurring terms
disc = b * b - 4 * a * c
sabc = np.sqrt(np.maximum(a + b + c, 0.0))
sc = np.sqrt(c)

# coordinates of the original point
rp = pts[j]
# Compute denominators for the integral evaluations
den1 = disc * sabc - eps
den2 = disc * sc - eps

# integral evaluations
eval1 = (-2 * (2 * a + b) / den1 + 2 * b / den2) * length
eval2 = ((2 * b + 4 * c) / den1 - 4 * c / den2) * length

# denominator only gets one integral
den = np.sum(eval1)

evalDiff = eval1 - eval2

for k in range(dIdPt.shape[0]):

# This is the local seed (well the 3 seeds for the point)
localVal = dIdPt[k, j, :] * (1 - factors[i])

# Scale the dIdpt by the factor..dIdpt is input/output
dIdPt[k, j, :] *= factors[i]

# get the two end points for the line elements
r0 = coor[conn[:, 0]]
r1 = coor[conn[:, 1]]
# compute a, b, and c coefficients
a = (r1[:, 0] - r0[:, 0]) ** 2 + (r1[:, 1] - r0[:, 1]) ** 2 + (r1[:, 2] - r0[:, 2]) ** 2
b = 2 * (
(r1[:, 0] - r0[:, 0]) * (r0[:, 0] - rp[0])
+ (r1[:, 1] - r0[:, 1]) * (r0[:, 1] - rp[1])
+ (r1[:, 2] - r0[:, 2]) * (r0[:, 2] - rp[2])
)
c = (r0[:, 0] - rp[0]) ** 2 + (r0[:, 1] - rp[1]) ** 2 + (r0[:, 2] - rp[2]) ** 2
# distances for each element
dists = np.sqrt(np.maximum(a, 0.0))

# compute some re-occurring terms
det = b * b - 4 * a * c
sabc = np.sqrt(np.maximum(a + b + c, 0.0))
sc = np.sqrt(np.maximum(c, 0.0))
# denominators on the integral evaluations
den1 = det * sabc - eps
den2 = det * sc - eps
# integral evaluations
eval1 = (-2 * (2 * a + b) / den1 + 2 * b / den2) * dists
eval2 = ((2 * b + 4 * c) / den1 - 4 * c / den2) * dists

# denominator only gets one integral
den = np.sum(eval1)

evalDiff = eval1 - eval2

# do each direction separately
for iDim in range(3):
# seeds for the r0 point
Expand Down
40 changes: 20 additions & 20 deletions tests/reg_tests/ref/test_DVGeometryMulti.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
0.5000000000000001
],
[
0.7558449415434537,
-0.24394738584941952,
0.6
0.7558449428676686,
-0.24394738447815498,
0.5999996601638932
],
[
0.25605261415058045,
-0.255844941543454,
0.5999999999999998
0.256052615521845,
-0.2558449428676688,
0.5999996601638931
],
[
0.244155058456546,
Expand All @@ -53,14 +53,14 @@
0.5000000000000001
],
[
0.5053236379334723,
-0.29993130781401534,
0.5053277931846962,
-0.2999322798665185,
0.49999999999999994
],
[
0.24708325952691404,
0.11365293918431664,
0.5099999814704442
0.24708302434712967,
0.11366224292977958,
0.5099995525452042
],
[
0.4991275125824375,
Expand All @@ -83,14 +83,14 @@
0.5
],
[
0.5034910244798204,
0.250158409569657,
0.40000002247842625
0.5033972433771731,
0.2501558793802895,
0.39999967796693864
],
[
0.7439518647480551,
0.25565690131339736,
0.6000006907728282
0.7439510846445981,
0.2556895615629042,
0.599999995198642
],
[
0.4940512221529827,
Expand All @@ -103,9 +103,9 @@
0.6
],
[
0.5058615792821614,
-0.24989823945022754,
0.5999999972179789
0.5058601713172411,
-0.2498982730316979,
0.5999996580987095
],
[
0.24999999999999997,
Expand Down
1 change: 1 addition & 0 deletions tests/reg_tests/test_DVGeometryMulti.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ def test_boxes(self, train=False):
curveEpsDict=curveEpsDict,
trackSurfaces=trackSurfaces,
excludeSurfaces=excludeSurfaces,
anisotropy=[1.0, 1.0, 0.8],
)

# Add a few design variables
Expand Down