EasyFEA 1.2.1__tar.gz → 1.2.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/_gauss.py +0 -1
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/_gmsh_interface.py +69 -14
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/_group_elems.py +131 -113
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/_mesh.py +19 -11
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/materials/_elastic.py +39 -36
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/materials/_phasefield.py +210 -150
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/materials/_utils.py +1 -1
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/_dic.py +2 -2
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/_phasefield.py +69 -52
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/_simu.py +13 -10
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/utilities/Display.py +2 -2
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA.egg-info/PKG-INFO +5 -2
- {EasyFEA-1.2.1 → easyfea-1.2.2}/PKG-INFO +5 -2
- {EasyFEA-1.2.1 → easyfea-1.2.2}/README.md +4 -1
- {EasyFEA-1.2.1 → easyfea-1.2.2}/pyproject.toml +1 -1
- {EasyFEA-1.2.1 → easyfea-1.2.2}/AUTHORS.md +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/Geoms.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/Materials.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/Simulations.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/__about__.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/__init__.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/__init__.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/_boundary_conditions.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/_utils.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/elems/__init__.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/elems/_hexa.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/elems/_point.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/elems/_prism.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/elems/_quad.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/elems/_seg.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/elems/_tetra.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/fem/elems/_tri.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/materials/__init__.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/materials/_beam.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/materials/_thermal.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/Solvers.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/__init__.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/_beam.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/_elastic.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/_thermal.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/simulations/_utils.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/utilities/Folder.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/utilities/Numba_Interface.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/utilities/Paraview_Interface.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/utilities/PyVista_Interface.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/utilities/__init__.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/utilities/_observers.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA/utilities/_tic.py +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA.egg-info/SOURCES.txt +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA.egg-info/dependency_links.txt +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA.egg-info/requires.txt +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/EasyFEA.egg-info/top_level.txt +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/LICENSE.txt +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/setup.cfg +0 -0
- {EasyFEA-1.2.1 → easyfea-1.2.2}/setup.py +0 -0
|
@@ -43,6 +43,11 @@ class Mesher:
|
|
|
43
43
|
self.__verbosity = verbosity
|
|
44
44
|
"""the mesher can write in terminal"""
|
|
45
45
|
|
|
46
|
+
# TODO Add debug config to print exceptions and errors
|
|
47
|
+
# use geom.Plot() to display the error
|
|
48
|
+
# catch the exception and print it
|
|
49
|
+
# create a Mesher Exception ?
|
|
50
|
+
|
|
46
51
|
self._Init_gmsh()
|
|
47
52
|
|
|
48
53
|
if verbosity:
|
|
@@ -295,11 +300,6 @@ class Mesher:
|
|
|
295
300
|
|
|
296
301
|
factory = self._factory
|
|
297
302
|
|
|
298
|
-
if elemType.startswith(("QUAD", "HEXA")):
|
|
299
|
-
contour.meshSize *= 2
|
|
300
|
-
for incl in inclusions:
|
|
301
|
-
incl.meshSize *= 2
|
|
302
|
-
|
|
303
303
|
# Creates a contour surface
|
|
304
304
|
loopContour, lines, points = self._Loop_From_Geom(contour)
|
|
305
305
|
|
|
@@ -354,6 +354,14 @@ class Mesher:
|
|
|
354
354
|
self._Synchronize() # mandatory
|
|
355
355
|
|
|
356
356
|
setRecombine = elemType.startswith(("QUAD","HEXA"))
|
|
357
|
+
if setRecombine:
|
|
358
|
+
# simply multiplies the mesh size by 2 because
|
|
359
|
+
# setRecombine recombines triangles into quadrangles
|
|
360
|
+
points = np.asarray(gmsh.model.getEntities(0))
|
|
361
|
+
sizes = gmsh.model.mesh.getSizes(points)
|
|
362
|
+
if sizes.max() > 0:
|
|
363
|
+
unique = list(set(sizes))
|
|
364
|
+
[gmsh.model.mesh.setSize(points[np.where(sizes==val)[0]], val*2) for val in unique]
|
|
357
365
|
|
|
358
366
|
for surf in surfaces:
|
|
359
367
|
|
|
@@ -436,7 +444,32 @@ class Mesher:
|
|
|
436
444
|
geom_line = factory.addCircleArc(p1, p3, p2)
|
|
437
445
|
else:
|
|
438
446
|
raise Exception("You need to give lines or arcs.")
|
|
439
|
-
factory.fragment(ents, [(1, geom_line)], removeTool=False)
|
|
447
|
+
factory.fragment(ents, [(1, geom_line)], removeTool=False)
|
|
448
|
+
|
|
449
|
+
def _Additional_Points(self, dim: int, points:list[Point], meshSize: float=0.0) -> None:
|
|
450
|
+
"""Adds points to existing dim entities.
|
|
451
|
+
|
|
452
|
+
Parameters
|
|
453
|
+
----------
|
|
454
|
+
dim : int
|
|
455
|
+
dimension (dim >= 1)
|
|
456
|
+
points : list[Point]
|
|
457
|
+
points
|
|
458
|
+
meshSize : float
|
|
459
|
+
meshSize
|
|
460
|
+
"""
|
|
461
|
+
|
|
462
|
+
assert dim >= 1
|
|
463
|
+
|
|
464
|
+
factory = self._factory
|
|
465
|
+
|
|
466
|
+
for point in points:
|
|
467
|
+
ents = factory.getEntities(dim)
|
|
468
|
+
if isinstance(point, Point):
|
|
469
|
+
p = factory.addPoint(*point.coord, meshSize)
|
|
470
|
+
else:
|
|
471
|
+
raise Exception("You need to give a list of point.")
|
|
472
|
+
factory.fragment(ents, [(0, p)], removeTool=False)
|
|
440
473
|
|
|
441
474
|
def _Spline_From_Points(self, points: Points) -> tuple[int, list[int]]:
|
|
442
475
|
"""Creates a gmsh spline from points.\n
|
|
@@ -904,7 +937,7 @@ class Mesher:
|
|
|
904
937
|
|
|
905
938
|
return crackLines, crackSurfaces, openPoints, openLines
|
|
906
939
|
|
|
907
|
-
def Mesh_Beams(self, beams: list, elemType=ElemType.SEG2, folder="") -> Mesh:
|
|
940
|
+
def Mesh_Beams(self, beams: list, elemType=ElemType.SEG2, additionalPoints:list[Point]=[], folder="") -> Mesh:
|
|
908
941
|
"""Creates a beam mesh.
|
|
909
942
|
|
|
910
943
|
Parameters
|
|
@@ -915,6 +948,8 @@ class Mesher:
|
|
|
915
948
|
element type, by default "SEG2" ["SEG2", "SEG3", "SEG4"]
|
|
916
949
|
folder : str, optional
|
|
917
950
|
default mesh.msh folder, by default "" does not save the mesh
|
|
951
|
+
additionalPoints : list[Point]
|
|
952
|
+
additional points that will be added to the mesh.
|
|
918
953
|
|
|
919
954
|
Returns
|
|
920
955
|
-------
|
|
@@ -937,10 +972,12 @@ class Mesher:
|
|
|
937
972
|
|
|
938
973
|
points = []
|
|
939
974
|
lines = []
|
|
975
|
+
list_meshSize = []
|
|
940
976
|
|
|
941
977
|
for beam in beams:
|
|
942
978
|
line = beam.line
|
|
943
|
-
|
|
979
|
+
list_meshSize.append(line.meshSize)
|
|
980
|
+
|
|
944
981
|
pt1 = line.pt1; x1 = pt1.x; y1 = pt1.y; z1 = pt1.z
|
|
945
982
|
pt2 = line.pt2; x2 = pt2.x; y2 = pt2.y; z2 = pt2.z
|
|
946
983
|
|
|
@@ -950,7 +987,12 @@ class Mesher:
|
|
|
950
987
|
points.append(p2)
|
|
951
988
|
|
|
952
989
|
line = factory.addLine(p1, p2)
|
|
953
|
-
lines.append(line)
|
|
990
|
+
lines.append(line)
|
|
991
|
+
|
|
992
|
+
# removes meshSize = 0
|
|
993
|
+
list_meshSize = [m for m in list_meshSize if m>0]
|
|
994
|
+
mS = np.min(list_meshSize) if len(list_meshSize) > 0 else 0
|
|
995
|
+
self._Additional_Points(1, additionalPoints, mS)
|
|
954
996
|
|
|
955
997
|
self._Set_PhysicalGroups(setLines=False)
|
|
956
998
|
|
|
@@ -999,7 +1041,7 @@ class Mesher:
|
|
|
999
1041
|
def Mesh_2D(self, contour: _Geom, inclusions: list[_Geom]=[], elemType=ElemType.TRI3,
|
|
1000
1042
|
cracks:list[_Geom]=[], refineGeoms: list[Union[_Geom,str]]=[],
|
|
1001
1043
|
isOrganised=False, additionalSurfaces:list[_Geom]=[],
|
|
1002
|
-
additionalLines:list[Union[Line,CircleArc]]=[], folder="") -> Mesh:
|
|
1044
|
+
additionalLines:list[Union[Line,CircleArc]]=[], additionalPoints: list[Point]=[], folder="") -> Mesh:
|
|
1003
1045
|
"""Creates a 2D mesh from a contour and inclusions that must form a closed plane surface.
|
|
1004
1046
|
|
|
1005
1047
|
Parameters
|
|
@@ -1020,6 +1062,8 @@ class Mesher:
|
|
|
1020
1062
|
additional surfaces that will be added to or removed from the surfaces created by the contour and the inclusions. (e.g Domain, Circle, Contour, Points)
|
|
1021
1063
|
additionalLines : list[Union[Line,CircleArc]]
|
|
1022
1064
|
additional lines that will be added to the surfaces created by the contour and the inclusions. (e.g Domain, Circle, Contour, Points)
|
|
1065
|
+
additionalPoints : list[Point]
|
|
1066
|
+
additional points that will be added to the surfaces created by the contour and the inclusions.
|
|
1023
1067
|
folder : str, optional
|
|
1024
1068
|
default mesh.msh folder, by default "" does not save the mesh
|
|
1025
1069
|
|
|
@@ -1040,6 +1084,11 @@ class Mesher:
|
|
|
1040
1084
|
self._Surfaces(contour, inclusions, elemType, isOrganised)
|
|
1041
1085
|
self._Additional_Surfaces(2, additionalSurfaces, elemType, isOrganised)
|
|
1042
1086
|
self._Additional_Lines(2, additionalLines)
|
|
1087
|
+
self._Additional_Points(2, additionalPoints)
|
|
1088
|
+
# TODO: add contour to refineGeoms by default when adding surfaces, lines or points
|
|
1089
|
+
# additionalSurfaces, additionalLines, additionalPoints
|
|
1090
|
+
# adding these lines, points or surfaces will probably break the old mesh size conditions.
|
|
1091
|
+
# adding contour to refineGeoms ensures that the mesh size is correct.
|
|
1043
1092
|
|
|
1044
1093
|
# Recovers 2D entities
|
|
1045
1094
|
entities2D = factory.getEntities(2)
|
|
@@ -1065,7 +1114,7 @@ class Mesher:
|
|
|
1065
1114
|
extrude=[0,0,1], layers:list[int]=[], elemType=ElemType.TETRA4,
|
|
1066
1115
|
cracks: list[_Geom]=[], refineGeoms: list[Union[_Geom,str]]=[],
|
|
1067
1116
|
isOrganised=False, additionalSurfaces:list[_Geom]=[],
|
|
1068
|
-
additionalLines:list[Union[Line,CircleArc]]=[], folder="") -> Mesh:
|
|
1117
|
+
additionalLines:list[Union[Line,CircleArc]]=[], additionalPoints: list[Point]=[], folder="") -> Mesh:
|
|
1069
1118
|
"""Creates a 3D mesh by extruding a surface constructed from a contour and inclusions.
|
|
1070
1119
|
|
|
1071
1120
|
Parameters
|
|
@@ -1090,6 +1139,8 @@ class Mesher:
|
|
|
1090
1139
|
additional surfaces that will be added to or removed from the surfaces created by the contour and the inclusions. (e.g Domain, Circle, Contour, Points)
|
|
1091
1140
|
additionalLines : list[Union[Line,CircleArc]]
|
|
1092
1141
|
additional lines that will be added to the surfaces created by the contour and the inclusions. (e.g Domain, Circle, Contour, Points)
|
|
1142
|
+
additionalPoints : list[Point]
|
|
1143
|
+
additional points that will be added to the surfaces created by the contour and the inclusions.
|
|
1093
1144
|
folder : str, optional
|
|
1094
1145
|
default mesh.msh folder, by default "" does not save the mesh
|
|
1095
1146
|
|
|
@@ -1107,9 +1158,10 @@ class Mesher:
|
|
|
1107
1158
|
|
|
1108
1159
|
factory = self._factory
|
|
1109
1160
|
|
|
1110
|
-
self._Surfaces(contour, inclusions)
|
|
1161
|
+
self._Surfaces(contour, inclusions, elemType)
|
|
1111
1162
|
self._Additional_Surfaces(2, additionalSurfaces, elemType, isOrganised)
|
|
1112
1163
|
self._Additional_Lines(2, additionalLines)
|
|
1164
|
+
self._Additional_Points(2, additionalPoints)
|
|
1113
1165
|
|
|
1114
1166
|
# get created surfaces
|
|
1115
1167
|
surfaces = [entity[1] for entity in factory.getEntities(2)]
|
|
@@ -1137,7 +1189,7 @@ class Mesher:
|
|
|
1137
1189
|
axis: Line=Line(Point(), Point(0,1)), angle=360, layers:list[int]=[30], elemType=ElemType.TETRA4,
|
|
1138
1190
|
cracks: list[_Geom]=[], refineGeoms: list[Union[_Geom,str]]=[],
|
|
1139
1191
|
isOrganised=False, additionalSurfaces:list[_Geom]=[],
|
|
1140
|
-
additionalLines:list[Union[Line,CircleArc]]=[],
|
|
1192
|
+
additionalLines:list[Union[Line,CircleArc]]=[], additionalPoints: list[Point]=[], folder="") -> Mesh:
|
|
1141
1193
|
"""Creates a 3D mesh by rotating a surface along an axis.
|
|
1142
1194
|
|
|
1143
1195
|
Parameters
|
|
@@ -1164,6 +1216,8 @@ class Mesher:
|
|
|
1164
1216
|
additional surfaces that will be added to or removed from the surfaces created by the contour and the inclusions. (e.g Domain, Circle, Contour, Points)
|
|
1165
1217
|
additionalLines : list[Union[Line,CircleArc]]
|
|
1166
1218
|
additional lines that will be added to the surfaces created by the contour and the inclusions. (e.g Domain, Circle, Contour, Points)
|
|
1219
|
+
additionalPoints : list[Point]
|
|
1220
|
+
additional points that will be added to the surfaces created by the contour and the inclusions.
|
|
1167
1221
|
folder : str, optional
|
|
1168
1222
|
default mesh.msh folder, by default "" does not save the mesh
|
|
1169
1223
|
|
|
@@ -1181,9 +1235,10 @@ class Mesher:
|
|
|
1181
1235
|
|
|
1182
1236
|
factory = self._factory
|
|
1183
1237
|
|
|
1184
|
-
self._Surfaces(contour, inclusions)
|
|
1238
|
+
self._Surfaces(contour, inclusions, elemType)
|
|
1185
1239
|
self._Additional_Surfaces(2, additionalSurfaces, elemType, isOrganised)
|
|
1186
1240
|
self._Additional_Lines(2, additionalLines)
|
|
1241
|
+
self._Additional_Points(2, additionalPoints)
|
|
1187
1242
|
|
|
1188
1243
|
# get created surfaces
|
|
1189
1244
|
surfaces = [entity[1] for entity in factory.getEntities(2)]
|