diff --git a/_setup/geometries/geometry.py b/_setup/geometries/geometry.py index 4a8a00af6af9a9c01c7d514c21ae62f0b9b5f377..7e593e526c1f313233d1273211201d35f0ee1822 100644 --- a/_setup/geometries/geometry.py +++ b/_setup/geometries/geometry.py @@ -47,7 +47,7 @@ class Geometry: ''' def __init__(self, geometry=None, meshSize=None, forceNetgenMeshSize=False, scaling=1.0 \ - , structuredMesh=False, structuredAbtuseMesh=False): + , structuredMesh=False, structuredObtuseMesh=False): self._geometry = geometry self.meshSize = meshSize @@ -55,7 +55,7 @@ class Geometry: self.scaling = scaling self.structuredMesh = structuredMesh - self.structuredAbtuseMesh = structuredAbtuseMesh + self.structuredObtuseMesh = structuredObtuseMesh #TOECDO self.boundingBox = None @@ -98,7 +98,7 @@ class Geometry: ngmesh = netgenMesh(3) ngmesh.Load( self._geometry ) else: - if(self.structuredMesh or self.structuredAbtuseMesh): + if(self.structuredMesh or self.structuredObtuseMesh): ngmesh = self._GenerateStructuredMesh() else: if( isinstance(self._geometry, _standardGeometry._StandardGeometry)): @@ -138,21 +138,21 @@ class Geometry: def _GenerateStructuredMesh(self): from commics._setup.geometries.standardGeometries import cuboid from commics._setup.geometries.standardGeometries._structuredMeshing \ - import StructuredMesh_Cuboid, StructuredAbtuseMesh_Cuboid + import StructuredMesh_Cuboid, StructuredObtuseMesh_Cuboid if(len(self.meshSize) != 3): raise ValueError("For structured mesh, provide meshSize as (hx, hy, hz)") if not(isinstance(self._geometry, cuboid.Cuboid)): raise NotImplementedError("Structured meshing only for Cuboid geo") - if self.structuredAbtuseMesh and self.structuredMesh: - raise ValueError("structuredAbtuseMesh=True and structuredMesh=True ?!") + if self.structuredObtuseMesh and self.structuredMesh: + raise ValueError("structuredObtuseMesh=True and structuredMesh=True ?!") p1, p2 = self._geometry.GetXminXmax() if self.structuredMesh: return StructuredMesh_Cuboid(p1, p2, self.meshSize) else: - return StructuredAbtuseMesh_Cuboid(p1, p2, self.meshSize) + return StructuredObtuseMesh_Cuboid(p1, p2, self.meshSize) diff --git a/_setup/geometries/standardGeometries/_structuredMeshing/__init__.py b/_setup/geometries/standardGeometries/_structuredMeshing/__init__.py index 4dfccb0fb385187942ba1a01b80044767a22abff..a8b3963fafbacaba319d59dab20f1aa76bd466e1 100644 --- a/_setup/geometries/standardGeometries/_structuredMeshing/__init__.py +++ b/_setup/geometries/standardGeometries/_structuredMeshing/__init__.py @@ -2,7 +2,7 @@ print("Importing module", __name__) from commics._setup.geometries.standardGeometries._structuredMeshing.structuredMesh_Cuboid \ import StructuredMesh_Cuboid -from commics._setup.geometries.standardGeometries._structuredMeshing.structuredAbtuseMesh_Cuboid \ - import StructuredAbtuseMesh_Cuboid +from commics._setup.geometries.standardGeometries._structuredMeshing.structuredObtuseMesh_Cuboid \ + import StructuredObtuseMesh_Cuboid -__all__ = ["StructuredMesh_Cuboid", "StructuredAbtuseMesh_Cuboid"] +__all__ = ["StructuredMesh_Cuboid", "StructuredObtuseMesh_Cuboid"] diff --git a/_setup/geometries/standardGeometries/_structuredMeshing/addStructuredAbtuseMesh_MicroCuboid.py b/_setup/geometries/standardGeometries/_structuredMeshing/addStructuredObtuseMesh_MicroCuboid.py similarity index 94% rename from _setup/geometries/standardGeometries/_structuredMeshing/addStructuredAbtuseMesh_MicroCuboid.py rename to _setup/geometries/standardGeometries/_structuredMeshing/addStructuredObtuseMesh_MicroCuboid.py index cb93f2ec6a9fbd1b101a0f781ee5c69e71792c72..a0686280447fa10346460245211aa787554d5521 100644 --- a/_setup/geometries/standardGeometries/_structuredMeshing/addStructuredAbtuseMesh_MicroCuboid.py +++ b/_setup/geometries/standardGeometries/_structuredMeshing/addStructuredObtuseMesh_MicroCuboid.py @@ -3,7 +3,7 @@ ################################################################################ -def AddStructuredAbtuseMesh_MicroCuboid(ngmesh, p, center): +def AddStructuredObtuseMesh_MicroCuboid(ngmesh, p, center): from netgen.meshing import Element3D ngmesh.Add(Element3D(1, [p[0, 0, 0], p[1, 0, 0], center, p[1, 1, 0]])) diff --git a/_setup/geometries/standardGeometries/_structuredMeshing/structuredAbtuseMesh_Cuboid.py b/_setup/geometries/standardGeometries/_structuredMeshing/structuredObtuseMesh_Cuboid.py similarity index 90% rename from _setup/geometries/standardGeometries/_structuredMeshing/structuredAbtuseMesh_Cuboid.py rename to _setup/geometries/standardGeometries/_structuredMeshing/structuredObtuseMesh_Cuboid.py index 523312ad91378931b91df25c6a0d28b6a05385cc..fdc9f271737ed0720488ac9d1874644eb93c6187 100644 --- a/_setup/geometries/standardGeometries/_structuredMeshing/structuredAbtuseMesh_Cuboid.py +++ b/_setup/geometries/standardGeometries/_structuredMeshing/structuredObtuseMesh_Cuboid.py @@ -3,9 +3,9 @@ ################################################################################ -def StructuredAbtuseMesh_Cuboid(Xmin, Xmax, h): - from commics._setup.geometries.standardGeometries._structuredMeshing.addStructuredAbtuseMesh_MicroCuboid \ - import AddStructuredAbtuseMesh_MicroCuboid +def StructuredObtuseMesh_Cuboid(Xmin, Xmax, h): + from commics._setup.geometries.standardGeometries._structuredMeshing.addStructuredObtuseMesh_MicroCuboid \ + import AddStructuredObtuseMesh_MicroCuboid from commics._setup.geometries.standardGeometries._structuredMeshing.addStructuredMesh_BoundaryFaceCuboid \ import AddStructuredMesh_BoundaryFaceCuboid @@ -39,7 +39,7 @@ def StructuredAbtuseMesh_Cuboid(Xmin, Xmax, h): for cx in range(Ncells[0]): for cy in range(Ncells[1]): for cz in range(Ncells[2]): - AddStructuredAbtuseMesh_MicroCuboid(ngmesh, nodes[cx:cx+2, cy:cy+2, cz:cz+2], inside_nodes[cx, cy, cz]) + AddStructuredObtuseMesh_MicroCuboid(ngmesh, nodes[cx:cx+2, cy:cy+2, cz:cz+2], inside_nodes[cx, cy, cz]) fd = ngmesh.Add (FaceDescriptor(bc=1,domin=1,domout=0,surfnr=1))