Skip to content

Commit 9b0f94c

Browse files
committed
[BUG] Unpacking vertex and indices correctly
1 parent ab70b6e commit 9b0f94c

File tree

1 file changed

+3
-27
lines changed

1 file changed

+3
-27
lines changed

gempy_engine/API/dual_contouring/_dual_contouring.py

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,13 @@
1-
2-
import numpy
3-
import warnings
4-
from typing import List
51
import os
2+
from typing import List
63

7-
import numpy as np
8-
9-
from gempy_engine.config import AvailableBackends
104
from ... import optional_dependencies
11-
125
from ...core.backend_tensor import BackendTensor
136
from ...core.data.dual_contouring_data import DualContouringData
147
from ...core.data.dual_contouring_mesh import DualContouringMesh
158
from ...core.utils import gempy_profiler_decorator
169
from ...modules.dual_contouring._parallel_triangulation import _should_use_parallel_processing, _process_surface_batch, _init_worker
1710
from ...modules.dual_contouring._sequential_triangulation import _sequential_triangulation
18-
from ...modules.dual_contouring.dual_contouring_interface import triangulate_dual_contouring, generate_dual_contouring_vertices
19-
from ...modules.dual_contouring.fancy_triangulation import triangulate
2011

2112
# Multiprocessing imports
2213
try:
@@ -38,25 +29,10 @@ def compute_dual_contouring(dc_data_per_stack: DualContouringData, left_right_co
3829
use_parallel = _should_use_parallel_processing(dc_data_per_stack.n_surfaces_to_export, BackendTensor.engine_backend)
3930
parallel_results = None
4031

41-
if use_parallel:
32+
if use_parallel and True:
4233
print(f"Using parallel processing for {dc_data_per_stack.n_surfaces_to_export} surfaces")
4334
parallel_results = _parallel_process_surfaces(dc_data_per_stack, left_right_codes, debug)
4435

45-
# if parallel_results is not None:
46-
# # Convert parallel results to DualContouringMesh objects
47-
# stack_meshes = []
48-
# for vertices_numpy, indices_numpy in parallel_results:
49-
# if TRIMESH_LAST_PASS := True:
50-
# vertices_numpy, indices_numpy = _last_pass(vertices_numpy, indices_numpy)
51-
#
52-
# stack_meshes.append(
53-
# DualContouringMesh(
54-
# vertices_numpy,
55-
# indices_numpy,
56-
# dc_data_per_stack
57-
# )
58-
# )
59-
# return stack_meshes
6036

6137
# Fall back to sequential processing
6238
print(f"Using sequential processing for {dc_data_per_stack.n_surfaces_to_export} surfaces")
@@ -77,7 +53,7 @@ def compute_dual_contouring(dc_data_per_stack: DualContouringData, left_right_co
7753
)
7854
indices_numpy = parallel_results[i]
7955
else:
80-
vertices_numpy, indices_numpy = _sequential_triangulation(
56+
indices_numpy, vertices_numpy = _sequential_triangulation(
8157
dc_data_per_stack,
8258
debug,
8359
i,

0 commit comments

Comments
 (0)