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.

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

[SMApp] Adding a mixed Displacement/Strain element #12897

Open
wants to merge 155 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 135 commits
Commits
Show all changes
155 commits
Select commit Hold shift + click to select a range
5c163b7
header of new element
AlejandroCornejo Mar 26, 2024
b0a19de
cpp added
AlejandroCornejo Mar 26, 2024
5d7db0b
compiling
AlejandroCornejo Mar 26, 2024
182fb24
adding comments to the header file
AlejandroCornejo Mar 26, 2024
bb7d3cd
adding new variables
AlejandroCornejo Mar 26, 2024
d4a2924
element registration
AlejandroCornejo Mar 26, 2024
58d3e7f
Equation ID added
AlejandroCornejo Mar 26, 2024
dcfe3bf
Adding GetDof list
AlejandroCornejo Mar 26, 2024
6bee3d3
todo
AlejandroCornejo Mar 26, 2024
0035b11
.
AlejandroCornejo Mar 26, 2024
9a3269d
renaming
AlejandroCornejo Mar 27, 2024
24681e5
starting implementation
AlejandroCornejo Mar 27, 2024
e845c3c
Calculate N_epsilon
AlejandroCornejo Mar 27, 2024
88615e0
adding kinematic varible
AlejandroCornejo Mar 27, 2024
39f8c8d
more methods
AlejandroCornejo Mar 27, 2024
99d22da
assemble RHS
AlejandroCornejo Mar 27, 2024
0370310
assembly of LHS
AlejandroCornejo Mar 27, 2024
7b5194f
Equivalent strain added
AlejandroCornejo Mar 27, 2024
4afedd3
check
AlejandroCornejo Mar 27, 2024
adec4bf
calc kin
AlejandroCornejo Mar 27, 2024
e76b0fa
CalculateLocalSystem
AlejandroCornejo Mar 27, 2024
775e8e8
minor
AlejandroCornejo Mar 27, 2024
11a0772
coming
AlejandroCornejo Mar 27, 2024
98164e8
minor mistake
AlejandroCornejo Mar 27, 2024
c435ae2
add calc LHS and RHS
AlejandroCornejo Mar 27, 2024
2a5c2b7
added to the solver
AlejandroCornejo Mar 27, 2024
4533a3f
added conv crit
AlejandroCornejo Mar 27, 2024
dc700b4
another error
AlejandroCornejo Mar 27, 2024
583bb93
better
AlejandroCornejo Mar 27, 2024
4dab8e4
missing W
AlejandroCornejo Mar 27, 2024
7699e2a
now corrected in 2D
AlejandroCornejo Apr 3, 2024
9029381
minor
AlejandroCornejo Apr 3, 2024
e63d185
more impl
AlejandroCornejo Apr 3, 2024
5a491e6
outputing
AlejandroCornejo Apr 3, 2024
851ea97
in 3d also
AlejandroCornejo Apr 3, 2024
f46c190
.
AlejandroCornejo Apr 3, 2024
247cfd8
optimized
AlejandroCornejo Apr 3, 2024
1c39325
error identified
AlejandroCornejo Apr 3, 2024
24dfe3c
Fin Mat Resp added
AlejandroCornejo Apr 3, 2024
d7769c4
more consistent
AlejandroCornejo Apr 3, 2024
accf809
added safe nuls
AlejandroCornejo Apr 3, 2024
25690bd
safer now to avoid bad printing
AlejandroCornejo Apr 3, 2024
582bb9e
addind initialize sol step
AlejandroCornejo Apr 3, 2024
df2a49c
now correctly linearized for non symmetric tangent cons matrices
AlejandroCornejo Apr 3, 2024
5a24031
avoid to use secant
AlejandroCornejo Apr 3, 2024
425184c
Merge branch 'master' into adding-mixed-u-epsilon-FE
AlejandroCornejo Apr 4, 2024
73fafb2
to check yet
AlejandroCornejo Apr 4, 2024
26e5591
good version but fluctuating
AlejandroCornejo Apr 4, 2024
f40d068
Merge branch 'master' into adding-mixed-u-epsilon-FE
AlejandroCornejo Apr 11, 2024
3e4b8c1
to check, working?
AlejandroCornejo Apr 11, 2024
e9a7f70
renaming
AlejandroCornejo Apr 12, 2024
228b143
elegant solution
AlejandroCornejo Apr 13, 2024
0d63081
back to origin
AlejandroCornejo Apr 13, 2024
6edd713
better convergence
AlejandroCornejo Apr 14, 2024
4218b5b
as paper
AlejandroCornejo Apr 15, 2024
51611da
add nodalStrain
AlejandroCornejo Apr 15, 2024
9598396
linearized ok
AlejandroCornejo Apr 15, 2024
5c8110d
not working
AlejandroCornejo Apr 15, 2024
1137b43
sin salida
AlejandroCornejo Apr 15, 2024
f72e2ed
.
AlejandroCornejo Apr 15, 2024
cb42a35
as thesis
AlejandroCornejo Apr 15, 2024
0a79612
oscillating
AlejandroCornejo Apr 16, 2024
415d8ed
no secant version
AlejandroCornejo Apr 16, 2024
3992ae9
as benedetti
AlejandroCornejo Apr 16, 2024
2c1f148
minor
AlejandroCornejo Apr 17, 2024
d8d6a30
ok
AlejandroCornejo Apr 18, 2024
7df6471
minor
AlejandroCornejo Apr 18, 2024
c9e325d
cleaner
AlejandroCornejo Apr 18, 2024
0569752
cleaner
AlejandroCornejo Apr 18, 2024
dfcba13
m
AlejandroCornejo Apr 18, 2024
497a5d3
depending on h
AlejandroCornejo Apr 19, 2024
12e8992
jh
AlejandroCornejo Apr 19, 2024
3aef367
working in elastic
AlejandroCornejo Apr 19, 2024
dc56db2
detail
AlejandroCornejo Apr 19, 2024
ec4ffc0
ok
AlejandroCornejo Apr 19, 2024
da85395
better linearizatioon
AlejandroCornejo Apr 20, 2024
27e2b71
full quasi lin
AlejandroCornejo Apr 21, 2024
e1621bd
both options
AlejandroCornejo Apr 21, 2024
aa75263
better
AlejandroCornejo Apr 22, 2024
121dc17
to remove
AlejandroCornejo Apr 22, 2024
5affcca
cleaning
AlejandroCornejo Apr 25, 2024
6b9b99f
adding
AlejandroCornejo Apr 26, 2024
b6fe1d4
cosmetics
AlejandroCornejo Apr 26, 2024
4a606e6
to improve quadratures
AlejandroCornejo Apr 28, 2024
efec941
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Apr 28, 2024
60ba32f
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo May 8, 2024
6ad4e67
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo May 14, 2024
aee8f0b
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo May 22, 2024
f25eced
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo May 28, 2024
58a5aaa
gauss quadratures
AlejandroCornejo May 29, 2024
4df8284
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Jun 5, 2024
1061ed6
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Jun 13, 2024
54bc20e
adding methods to mixed FE, comp now with AITS
AlejandroCornejo Jun 13, 2024
84ed161
ok in 3D mixed
AlejandroCornejo Jun 13, 2024
44303bc
adding lobatto for quads
AlejandroCornejo Jun 18, 2024
928b56f
remove unused vars
AlejandroCornejo Jun 18, 2024
e1444e7
more fixing
AlejandroCornejo Jun 18, 2024
1a4e29a
no lumping
AlejandroCornejo Jun 18, 2024
93fe37c
adding proper lobatto cuadratures to mixed element
AlejandroCornejo Jun 19, 2024
cc68127
no scaling and proper convergence crti
AlejandroCornejo Jun 19, 2024
cf32477
update lobatto quad and using two methods
AlejandroCornejo Jun 19, 2024
f579f34
latest version
AlejandroCornejo Jun 19, 2024
0130d66
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Jun 26, 2024
a603cb4
minor mistake
AlejandroCornejo Jun 26, 2024
538d6c0
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Jul 12, 2024
37f1946
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Sep 27, 2024
535fabf
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Oct 28, 2024
399b591
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Dec 3, 2024
157062c
renaming
AlejandroCornejo Dec 3, 2024
81b009d
cleaning
AlejandroCornejo Dec 3, 2024
a0c99b2
stable version
AlejandroCornejo Dec 3, 2024
59a2b32
remove includes
AlejandroCornejo Dec 4, 2024
fae9b12
correct lobatto 3rd order and clean gauss
AlejandroCornejo Dec 4, 2024
7fd0cbf
clean quadrilateral gauss quadrature
AlejandroCornejo Dec 4, 2024
6eef700
adding lobatto for triangle linear
AlejandroCornejo Dec 4, 2024
1fd6d93
TODO: add more lobatto quad for triangle
AlejandroCornejo Dec 4, 2024
3c58e0a
remove watch
AlejandroCornejo Dec 4, 2024
021b8cf
more cleaning and add try catch
AlejandroCornejo Dec 5, 2024
3518810
removing old changes
AlejandroCornejo Dec 5, 2024
58d4cdf
updating some more classical quadratures
AlejandroCornejo Dec 6, 2024
65b74b6
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Dec 6, 2024
3cf8f2e
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Dec 9, 2024
58a074c
now lobatto for quad ok
AlejandroCornejo Dec 9, 2024
a3aaf4e
no extra 0
AlejandroCornejo Dec 9, 2024
53dbf6d
Merge branch 'correct-gauss-lobatto-quadrature-quadrilateral' into mi…
AlejandroCornejo Dec 9, 2024
c309881
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Dec 10, 2024
8fdccf6
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Dec 30, 2024
e4648f5
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Jan 10, 2025
90fb133
correct quad
AlejandroCornejo Jan 10, 2025
a4fe96e
CI suggestions
AlejandroCornejo Jan 10, 2025
bd1a095
Ci improvements
AlejandroCornejo Jan 13, 2025
3e2cb0b
unused code now
AlejandroCornejo Jan 13, 2025
1848d2a
minor opt
AlejandroCornejo Jan 13, 2025
e978cdd
add test
AlejandroCornejo Jan 13, 2025
549092e
tighten tol
AlejandroCornejo Jan 13, 2025
ad5bc70
Merge branch 'hotfix-base-solid-element' into mixed-u-E-cornejo-element
AlejandroCornejo Jan 17, 2025
02e29e1
old now, unused
AlejandroCornejo Jan 17, 2025
d95afa2
avoid resize which now is repeated
AlejandroCornejo Jan 17, 2025
96e3e03
some comments
AlejandroCornejo Jan 17, 2025
3a70351
improve read. and avoid repetition, use clear()
AlejandroCornejo Jan 17, 2025
a8a64fc
remove CalculateB method and check
AlejandroCornejo Jan 17, 2025
6cc4794
strain calculation ok
AlejandroCornejo Jan 17, 2025
6b6c7b1
moving to private some stuff
AlejandroCornejo Jan 17, 2025
646ecd1
using element size utils
AlejandroCornejo Jan 17, 2025
747dbb4
tiny mistake
AlejandroCornejo Jan 17, 2025
ddc4b71
adding new nodal var
AlejandroCornejo Jan 17, 2025
b8651ee
using core STRAIN_VECTOR nodal variable now
AlejandroCornejo Jan 17, 2025
e273d46
UNDO CHANGE
AlejandroCornejo Jan 17, 2025
142a585
more sneak
AlejandroCornejo Jan 17, 2025
d93946a
Merge branch 'master' into mixed-u-E-cornejo-element
AlejandroCornejo Jan 17, 2025
eb2a078
last sneak
AlejandroCornejo Jan 17, 2025
f565f2f
rename vectors to avoid confusion
AlejandroCornejo Jan 21, 2025
b583500
moving stuff to private
AlejandroCornejo Jan 21, 2025
1599a2e
Update applications/StructuralMechanicsApplication/custom_elements/so…
AlejandroCornejo Jan 21, 2025
c15b3aa
space
AlejandroCornejo Jan 21, 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
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,10 @@ void BaseSolidElement::CalculateOnIntegrationPoints(
if ( rOutput.size() != number_of_integration_points )
rOutput.resize( number_of_integration_points, false );

for (IndexType i_gauss = 0; i_gauss < number_of_integration_points; ++i_gauss) {
rOutput[i_gauss] = 0.0;
}

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is a hotfix that affects any solid element. I'd make a fast PR only for this (just to merge it as fast as possible and to ease any eventual backtraking).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok! incoming

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if (mConstitutiveLawVector[0]->Has( rVariable)) {
GetValueOnConstitutiveLaw(rVariable, rOutput);
} else {
Expand Down

Large diffs are not rendered by default.

Loading
Loading