Update mesh_fd solvers

Reference updated solver backend
BlockResearchGroup · Nov 11, 2021 · dcd6276 · dcd6276
1 parent c601b51
commit dcd6276
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/compas_fd/__init__.py b/src/compas_fd/__init__.py
@@ -12,6 +12,9 @@
     compas_fd.datastructures
     compas_fd.fd
     compas_fd.loads
+    compas_fd.numdata
+    compas_fd.results
+    compas_fd.solvers
 
 """
 

diff --git a/src/compas_fd/fd/mesh_fd_iter_numpy.py b/src/compas_fd/fd/mesh_fd_iter_numpy.py
@@ -2,7 +2,9 @@
 from numpy import float64
 
 import compas_fd
-from .fd_iter_numpy import fd_iter_numpy
+
+from compas_fd.numdata import FDNumericalData
+from compas_fd.solvers import FDConstraintSolver
 
 
 def mesh_fd_iter_numpy(mesh: 'compas_fd.datastructures.CableMesh') -> 'compas_fd.datastructures.CableMesh':
@@ -30,18 +32,11 @@ def mesh_fd_iter_numpy(mesh: 'compas_fd.datastructures.CableMesh') -> 'compas_fd
     loads = array(mesh.vertices_attributes(('px', 'py', 'pz')), dtype=float64)
     constraints = list(mesh.vertices_attribute('constraint'))
 
-    result = fd_iter_numpy(vertices=vertices,
-                           fixed=fixed,
-                           edges=edges,
-                           forcedensities=forcedensities,
-                           loads=loads,
-                           constraints=constraints,
-                           max_iter=100,
-                           tol_res=1E-3,
-                           tol_xyz=1E-3)
+    numdata = FDNumericalData.from_params(vertices, fixed, edges, forcedensities, loads)
+    solver = FDConstraintSolver(numdata, constraints, max_iter=100, tol_res=1E-3, tol_dxyz=1E-3)
+    result = solver()
 
     _update_mesh(mesh, result)
-
     return mesh