diff --git a/setup.py b/setup.py index 176746c..56025f4 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ # eg: 'keyword1', 'keyword2', 'keyword3', ], - packages=['bgem', 'bgem.polygons', 'bgem.bspline', 'bgem.gmsh', 'bgem.external', 'bgem.geometry', 'bgem.stochastic'], #setuptools.find_packages(where='src'), + packages=['bgem', 'bgem.core', 'bgem.polygons', 'bgem.bspline', 'bgem.gmsh', 'bgem.external', 'bgem.geometry', 'bgem.stochastic'], #setuptools.find_packages(where='src'), package_dir={'': 'src'}, #py_modules=[os.path.splitext(os.path.basename(path))[0] for path in glob.glob('src/*.py')], # package_data={ diff --git a/src/bgem/gmsh/gmsh.py b/src/bgem/gmsh/gmsh.py index 833b6a2..2ca88dc 100644 --- a/src/bgem/gmsh/gmsh.py +++ b/src/bgem/gmsh/gmsh.py @@ -590,8 +590,8 @@ def _assign_physical_groups(self, obj): # set physical groups for reg, tags in reg_to_tags.values(): - reg._gmsh_id = gmsh.model.addPhysicalGroup(reg.dim, tags, tag=-1) - gmsh.model.setPhysicalName(reg.dim, reg._gmsh_id, reg.name) + reg_gmsh_id = gmsh.model.addPhysicalGroup(reg.dim, tags, tag=-1) + gmsh.model.setPhysicalName(reg.dim, reg_gmsh_id, reg.name) def _set_mesh_step(self, obj: 'ObjectSet'): diff --git a/src/bgem/stochastic/fr_set.py b/src/bgem/stochastic/fr_set.py index c01f421..0ff9ece 100644 --- a/src/bgem/stochastic/fr_set.py +++ b/src/bgem/stochastic/fr_set.py @@ -1093,7 +1093,7 @@ def make_fractures_gmsh(self, gmsh_geom: 'GeometryOCC', transform=None): shape = shape.scale([fr.rx, fr.ry, 1]) \ .rotate(axis=[0, 0, 1], angle=fr.shape_angle) \ .rotate(axis=fr.rotation_axis, angle=fr.rotation_angle) \ - .translate(fr.center + shift) \ + .translate(fr.center) \ .set_region(region_name) region_map[region_name] = i shapes.append(shape) diff --git a/tests/stochastic/test_hausdorf_dfn.py b/tests/stochastic/test_hausdorf_dfn.py index 10cb1ef..f27867b 100644 --- a/tests/stochastic/test_hausdorf_dfn.py +++ b/tests/stochastic/test_hausdorf_dfn.py @@ -91,7 +91,7 @@ def plot_dfn(power): im = Image.new('RGBA', s, (255, 255, 255, 255)) draw = ImageDraw.Draw(im) - fracture_box = [1, 1, 0] + fracture_box = [1, 1, 1] sample_range = (0.001, 1) power = 2.1 conf_range = [0.001, 1]