diff --git a/anisotropy/salomepl/geometry.py b/anisotropy/salomepl/geometry.py index 2f42aca..090378f 100644 --- a/anisotropy/salomepl/geometry.py +++ b/anisotropy/salomepl/geometry.py @@ -48,6 +48,7 @@ class StructureGeometry(object): self.r0 = r0 self.filletsEnabled = filletsEnabled #self.fillets = fillets + self.filletScale = 0.8 # General attributes self.shape = None diff --git a/anisotropy/samples/bodyCentered.py b/anisotropy/samples/bodyCentered.py index 0a2e5dd..33f1c36 100644 --- a/anisotropy/samples/bodyCentered.py +++ b/anisotropy/samples/bodyCentered.py @@ -34,7 +34,7 @@ class BodyCentered(StructureGeometry): rTol = 3 minRound = fix(10 ** rTol * analytical) * 10 ** -rTol - return minRound + return minRound * self.filletScale def build(self): ### diff --git a/anisotropy/samples/faceCentered.py b/anisotropy/samples/faceCentered.py index cb91813..ee718aa 100644 --- a/anisotropy/samples/faceCentered.py +++ b/anisotropy/samples/faceCentered.py @@ -33,7 +33,7 @@ class FaceCentered(StructureGeometry): rTol = 3 minRound = fix(10 ** rTol * analytical) * 10 ** -rTol - return minRound + return minRound * self.filletScale def build(self): ### diff --git a/anisotropy/samples/simple.py b/anisotropy/samples/simple.py index e3f251c..417580e 100644 --- a/anisotropy/samples/simple.py +++ b/anisotropy/samples/simple.py @@ -33,7 +33,7 @@ class Simple(StructureGeometry): rTol = 3 minRound = fix(10 ** rTol * analytical) * 10 ** -rTol - return minRound + return minRound * self.filletScale def build(self): ### diff --git a/playground/analytics.ipynb b/playground/analytics.ipynb index e78ecab..b1bd02d 100644 --- a/playground/analytics.ipynb +++ b/playground/analytics.ipynb @@ -1005,7 +1005,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3 (ipykernel)", + "display_name": "Python 3", "language": "python", "name": "python3" }, diff --git a/playground/geometry.ipynb b/playground/geometry.ipynb index 65e07f8..c8cba52 100644 --- a/playground/geometry.ipynb +++ b/playground/geometry.ipynb @@ -38,7 +38,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3 (ipykernel)", + "display_name": "Python 3", "language": "python", "name": "python3" }, diff --git a/playground/salome-run.py b/playground/salome-run.py index dd1189b..2e335e7 100644 --- a/playground/salome-run.py +++ b/playground/salome-run.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- import sys; path = "/home/nafaryus/projects/anisotropy"; sys.path.extend([path, path + "/env/lib/python3.10/site-packages"]) -from anisotropy.samples import Simple, FaceCentered +from anisotropy.samples import Simple, FaceCentered, BodyCentered s = Simple([1, 0, 0], 0.28, filletsEnabled = True) diff --git a/playground/test_smesh.py b/playground/test_smesh.py index 01fa80f..9d1ae05 100644 --- a/playground/test_smesh.py +++ b/playground/test_smesh.py @@ -20,3 +20,12 @@ algo = mesh.Tetrahedron(algo = ALGO) ### # fc 111 0.12 N3D N2D(0.1, 0.0001, Mod) # 3min 321k + +### +# fc 100 +# theta max min fineness gr.rate perEdge perRadius choralErr +# 0.01 0.1 0.001 custom 0.3 3 5 0.05 +# 0.12 0.1 0.001 moderate 0.3 1 2 0.05 +# +# fc 111 +# 0.12 0.1 0.001 moderate 0.3 1 2 0.05