*** Wartungsfenster jeden ersten Mittwoch vormittag im Monat ***

Skip to content
Snippets Groups Projects
Commit d46028b5 authored by Carl-Martin Pfeiler's avatar Carl-Martin Pfeiler
Browse files

Fixed misspelling: abtuse --> obtuse

parent 4f4f3a7b
No related merge requests found
......@@ -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)
......
......@@ -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"]
......@@ -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]]))
......
......@@ -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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment