Skip to content

Add fillet intersection method #272

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.

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

Draft
wants to merge 128 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
fbf6ad4
changed child bookkeeping to use a dict instead of list
anilyil Mar 28, 2023
4aed9bb
added active child dvgeo handling
anilyil Mar 29, 2023
9bf2136
fix bug with dict keys
anilyil Mar 29, 2023
e7d2e23
added derivatives. may not work
anilyil Apr 4, 2023
569cde4
undo shape func related changes
anilyil Apr 11, 2023
6dc522c
Merge branch 'main' into children_dict
anilyil May 17, 2023
93a49d4
black
anilyil May 17, 2023
df2dbc5
start dvgeomulti mods
hajdik Jul 8, 2023
232d625
Merge branch 'children_dict' of github.com:anilyil/pygeo into fillet
hajdik Jul 8, 2023
73240dc
Merge branch 'main' of github.com:mdolab/pygeo into fillet
hajdik Jul 8, 2023
02f46b1
fillet intersection class
hajdik Jul 12, 2023
a2260f0
common warp
hajdik Jul 12, 2023
8b37009
hajdik Jul 12, 2023
6ca059f
fillet component class
hajdik Jul 13, 2023
da851b6
new component class
hajdik Jul 13, 2023
de245fb
fillet interface for intersection curve
hajdik Jul 17, 2023
b72f727
can add component
hajdik Jul 17, 2023
5d29cb3
clean up inits
hajdik Jul 17, 2023
56c89ce
can add curves to components in intersection
hajdik Jul 17, 2023
f9ce47f
distinguish between intersection curves on fillet
hajdik Jul 17, 2023
1a99712
Merge branch 'mdolab:main' into fillet
hajdik Jul 18, 2023
2da39cd
add pointset to multi for fillet intersection component
hajdik Jul 18, 2023
98ae0ef
reworking component
hajdik Jul 18, 2023
62d788b
Merge branch 'main' into children_dict
anilyil Jul 19, 2023
9b8ae1a
DV changes update all pointsets
hajdik Jul 20, 2023
99b5a85
warping fillet almost works probably
hajdik Jul 20, 2023
03e3cab
okay yeah that would help. fillet is WARPED now
hajdik Jul 20, 2023
22d5bc4
Merge branch 'main' into children_dict
anilyil Aug 29, 2023
c1d0598
Merge remote-tracking branch 'origin/children_dict' into children_dict
anilyil Aug 29, 2023
bce1320
fixes for tests
anilyil Aug 29, 2023
57204dc
added docstring
anilyil Aug 29, 2023
a37410f
change mphys wrapper to use child names instead of indices
anilyil Aug 29, 2023
4584ce2
fix for the name check
anilyil Aug 29, 2023
a141498
added tests for active child argument
anilyil Aug 29, 2023
c38bce4
Merge branch 'main' into children_dict
anilyil Aug 31, 2023
33f4a91
Merge branch 'children_dict' of github.com:anilyil/pygeo into fillet
hajdik Sep 25, 2023
2f7d5f2
families go to correct pointsets
hajdik Sep 25, 2023
1732402
debugging fillet warp
hajdik Sep 25, 2023
db87800
warping works through adflow
hajdik Sep 26, 2023
fd05dea
works with full curve for intersection definition
hajdik Oct 2, 2023
54c97c8
start project_b
hajdik Oct 2, 2023
74159d8
comment
hajdik Oct 3, 2023
cf5331f
Merge branch 'fillet' of github.com:hajdik/pygeo into fillet
hajdik Oct 3, 2023
c369a49
dummy sens
hajdik Oct 3, 2023
af75204
Merge branch 'fillet' of github.com:hajdik/pygeo into fillet
hajdik Oct 3, 2023
0b4cd95
sketching derivatives
hajdik Oct 3, 2023
7bc137b
stop separate comp&fillet dicts
hajdik Oct 3, 2023
fe13ee7
project_b for fillet
hajdik Oct 3, 2023
aaf157d
split fillet points into 3
hajdik Oct 4, 2023
2b27126
adding all the pointsets ever
hajdik Oct 5, 2023
e8b7a72
bug
hajdik Oct 5, 2023
670f5a6
getndv bug
hajdik Oct 5, 2023
65d5d43
ncurvepts
hajdik Oct 6, 2023
709a3a9
fixing small bugs with larger ones
hajdik Oct 6, 2023
a261395
wing surf ptset passes test
hajdik Oct 9, 2023
c29fa99
hey maybe actually get updated points into multi
hajdik Oct 10, 2023
e92a6fa
derivative debug still
hajdik Oct 10, 2023
de52129
Merge branch 'fillet' of github.com:hajdik/pygeo into fillet
hajdik Oct 10, 2023
a24bc16
parallelism for intersection indices, might be necessary?
hajdik Oct 10, 2023
d98fe2e
todos
hajdik Oct 11, 2023
b58583f
deriv todos
hajdik Oct 12, 2023
50a7fd1
figuring out compSens
hajdik Oct 24, 2023
2a7f5b2
cleanup
hajdik Oct 24, 2023
9d573b7
cleanup
hajdik Oct 26, 2023
e11cda8
closer to working
hajdik Oct 26, 2023
ceb4733
yikees
hajdik Oct 27, 2023
336c19d
complex
hajdik Oct 27, 2023
f838f3f
fix jac addition
hajdik Oct 27, 2023
6a8b224
cleanup
hajdik Oct 27, 2023
a610d0a
comments
hajdik Oct 30, 2023
b90acdd
detail in warning
hajdik Nov 1, 2023
b6ade72
another copy
hajdik Nov 1, 2023
0e92735
make addCurve flexible
hajdik Nov 3, 2023
46e1320
allow curve to be 1 pt
hajdik Nov 3, 2023
f7ca357
works with tiny test
hajdik Nov 6, 2023
018d63e
removing for debug
hajdik Nov 6, 2023
bd55fa8
narrator voice: it was very, very necessary
hajdik Nov 6, 2023
71321e0
handle pointsets unaffected by a pointset
hajdik Nov 6, 2023
0008e06
stop hard coding pointset name
hajdik Nov 7, 2023
4526057
fix handling of derivatives for DVs on other DVGeos
hajdik Nov 10, 2023
d27b90f
parallelism or something
hajdik Nov 14, 2023
708c4d7
fix zeroing of seeds on intersection
hajdik Nov 15, 2023
b77e053
finish passing options
hajdik Nov 16, 2023
025ccae
debug statements
hajdik Nov 16, 2023
4d951ac
fixes failure in parallel
hajdik Nov 17, 2023
17ac04f
parallel communication
hajdik Nov 20, 2023
c371097
galen stop finding bugs
hajdik Nov 21, 2023
a286db0
Merge branch 'fillet' of github.com:hajdik/pygeo into fillet
hajdik Nov 21, 2023
811e2b8
coordXfer changes to DVGeomulti that do not work
gawng Nov 21, 2023
fb774f7
Merge branch 'fillet' of github.com:hajdik/pygeo into myfillet
gawng Nov 21, 2023
3a7ce00
coordxfer bug
gawng Nov 26, 2023
fe08001
broke print statements
hajdik Nov 27, 2023
5ad8970
these are the changes to get coordXfer working in DVGeoMulti fillet m…
gawng Nov 28, 2023
8c84a28
Merge branch 'fillet' of github.com:hajdik/pygeo into myfillet
gawng Nov 28, 2023
a49d14e
remove print statement in sensitivity call
gawng Nov 28, 2023
032086d
add coordxfer to writeout capability
gawng Nov 28, 2023
6995529
make the test pointset names unique
hajdik Nov 28, 2023
8d3264b
I made a bug in the dvcon sensitivities... fixed now
gawng Nov 29, 2023
255c0c6
hannah fixed the parallel dv bug in sensitivitity
gawng Nov 30, 2023
55538d2
print statements
hajdik Dec 12, 2023
21749ab
Merge pull request #1 from gawng/myfillet
hajdik Dec 12, 2023
ec95e57
take out unnecessary allreduce causing derivative errors in parallel!
hajdik Dec 12, 2023
69b61a3
handle constraint & mesh pointsets differently
hajdik Dec 14, 2023
44b787d
clean up
hajdik Dec 14, 2023
254b121
tol
hajdik May 17, 2024
d49cb62
partially merge main in
hajdik May 17, 2024
ff076de
another one
hajdik May 17, 2024
0549548
add this back
hajdik May 31, 2024
a21cf69
separate out distances from warping and add new blending function
hajdik Jun 28, 2024
ad6c606
fix
hajdik Jun 28, 2024
e2267d4
fix weighting for tangency, add old version back for comparison
hajdik Jul 17, 2024
672e1e8
handle the dat file pointwise exports without manual edits
hajdik Jul 19, 2024
f2b848a
Merge branch 'fillet' of github.com:hajdik/pygeo into fillet
hajdik Jul 19, 2024
324bbec
start framework for rotations
hajdik Jul 24, 2024
b1167cc
Merge branch 'fillet' of github.com:hajdik/pygeo into fillet
hajdik Aug 1, 2024
f61254b
vector
hajdik Aug 12, 2024
59f306b
rotation, some formatting
hajdik Nov 4, 2024
0280ccb
comment
hajdik Nov 4, 2024
a9cdcc3
Merge branch 'fillet' of github.com:hajdik/pygeo into fillet
hajdik Nov 4, 2024
e065c1e
slow
hajdik Nov 4, 2024
f8c80e3
this runs but something is wrong :/
hajdik Nov 22, 2024
62e1394
rotation works!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1 but is mesh dependent :/
hajdik Nov 27, 2024
a91f2bb
start switch from secondary curve to FD curves
hajdik Nov 27, 2024
37723ff
Merge branch 'fillet' of github.com:hajdik/pygeo into fillet
hajdik Nov 27, 2024
85dd8ff
rotation works with a vector in one direction
hajdik Dec 3, 2024
f0a0fd1
options for rotation vector
hajdik Jan 7, 2025
92aff84
hide vscode junk, results of mphys tests, loose dat files
hajdik May 23, 2025
c3ae025
Merge branch 'main' of github.com:mdolab/pygeo into fillet
hajdik May 23, 2025
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
13 changes: 8 additions & 5 deletions pygeo/parameterization/DVGeo.py
Original file line number Diff line number Diff line change
Expand Up @@ -2999,7 +2999,7 @@ def addVariablesPyOpt(
optProb, globalVars, localVars, sectionlocalVars, spanwiselocalVars, ignoreVars, freezeVars
)

def writeTecplot(self, fileName, solutionTime=None):
def writeTecplot(self, fileName, solutionTime=None, writeEmbedding=True):
"""Write the (deformed) current state of the FFD's to a tecplot file,
including the children

Expand All @@ -3021,7 +3021,7 @@ def writeTecplot(self, fileName, solutionTime=None):
vol_counter = 0

# Write master volumes:
vol_counter += self._writeVols(f, vol_counter, solutionTime)
vol_counter += self._writeVols(f, vol_counter, solutionTime, writeEmbedding)

closeTecplot(f)
if len(self.points) > 0:
Expand Down Expand Up @@ -4558,16 +4558,19 @@ def _cascadedDVJacobian(self, config=None):

return Jacobian

def _writeVols(self, handle, vol_counter, solutionTime):
def _writeVols(self, handle, vol_counter, solutionTime, writeEmbedding):
for i in range(len(self.FFD.vols)):
writeTecplot3D(handle, "FFD_vol%d" % i, self.FFD.vols[i].coef, solutionTime)
self.FFD.vols[i].computeData(recompute=True)
writeTecplot3D(handle, "embedding_vol", self.FFD.vols[i].data, solutionTime)

if writeEmbedding:
writeTecplot3D(handle, "embedding_vol", self.FFD.vols[i].data, solutionTime)

vol_counter += 1

# Write children volumes:
for child in self.children.values():
vol_counter += child._writeVols(handle, vol_counter, solutionTime)
vol_counter += child._writeVols(handle, vol_counter, solutionTime, writeEmbedding)

return vol_counter

Expand Down
Loading
Loading