diff --git a/setup.py b/setup.py index 61898821..257f5f03 100644 --- a/setup.py +++ b/setup.py @@ -19,8 +19,9 @@ def readfile(filename, split=False): # into the 'requirements.txt' file. requires = [ # minimal requirements listing + "opencmiss.maths", "opencmiss.utils >= 0.3", - "opencmiss.zinc", # not yet on pypi - need manual install from opencmiss.org + "opencmiss.zinc >= 3.5", "scipy", "numpy", ] diff --git a/src/scaffoldmaker/meshtypes/meshtype_1d_bifurcationtree1.py b/src/scaffoldmaker/meshtypes/meshtype_1d_bifurcationtree1.py index d502dd7c..4e0cd891 100644 --- a/src/scaffoldmaker/meshtypes/meshtype_1d_bifurcationtree1.py +++ b/src/scaffoldmaker/meshtypes/meshtype_1d_bifurcationtree1.py @@ -4,7 +4,7 @@ from __future__ import division from math import cos, radians, sin, sqrt -from opencmiss.utils.maths.vectorops import add, cross, magnitude, mult, normalize, sub +from opencmiss.maths.vectorops import add, cross, magnitude, mult, normalize, sub from opencmiss.utils.zinc.field import findOrCreateFieldCoordinates, findOrCreateFieldFiniteElement from opencmiss.zinc.element import Element, Elementbasis from opencmiss.utils.zinc.general import ChangeManager diff --git a/src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcation1.py b/src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcation1.py index 28e47b6b..094edef6 100644 --- a/src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcation1.py +++ b/src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcation1.py @@ -4,7 +4,7 @@ from __future__ import division import math -from opencmiss.utils.maths.vectorops import cross, mult, normalize, sub +from opencmiss.maths.vectorops import cross, mult, normalize, sub from opencmiss.utils.zinc.field import findOrCreateFieldCoordinates from opencmiss.zinc.field import Field from opencmiss.zinc.node import Node diff --git a/src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcationtree1.py b/src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcationtree1.py index 7692b131..ed0f137b 100644 --- a/src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcationtree1.py +++ b/src/scaffoldmaker/meshtypes/meshtype_2d_tubebifurcationtree1.py @@ -4,7 +4,7 @@ from __future__ import division import math -from opencmiss.utils.maths.vectorops import cross, mult, normalize, sub +from opencmiss.maths.vectorops import cross, mult, normalize, sub from opencmiss.utils.zinc.field import findOrCreateFieldCoordinates from opencmiss.zinc.field import Field from opencmiss.zinc.node import Node diff --git a/src/scaffoldmaker/meshtypes/meshtype_3d_heartarterialvalve1.py b/src/scaffoldmaker/meshtypes/meshtype_3d_heartarterialvalve1.py index ad0bd526..3b6fa711 100644 --- a/src/scaffoldmaker/meshtypes/meshtype_3d_heartarterialvalve1.py +++ b/src/scaffoldmaker/meshtypes/meshtype_3d_heartarterialvalve1.py @@ -6,7 +6,7 @@ from __future__ import division import math -from opencmiss.utils.maths.vectorops import eulerToRotationMatrix3 +from opencmiss.maths.vectorops import eulerToRotationMatrix3 from opencmiss.utils.zinc.field import findOrCreateFieldCoordinates from opencmiss.utils.zinc.finiteelement import getMaximumElementIdentifier, getMaximumNodeIdentifier from opencmiss.utils.zinc.general import ChangeManager diff --git a/src/scaffoldmaker/scaffoldpackage.py b/src/scaffoldmaker/scaffoldpackage.py index ac67df1c..5b4c61c2 100644 --- a/src/scaffoldmaker/scaffoldpackage.py +++ b/src/scaffoldmaker/scaffoldpackage.py @@ -7,7 +7,7 @@ import math from opencmiss.utils.zinc.field import createFieldEulerAnglesRotationMatrix from opencmiss.utils.zinc.general import ChangeManager -from opencmiss.utils.maths.vectorops import euler_to_rotation_matrix +from opencmiss.maths.vectorops import euler_to_rotation_matrix from scaffoldmaker.annotation.annotationgroup import AnnotationGroup, findAnnotationGroupByName from scaffoldmaker.meshtypes.scaffold_base import Scaffold_base diff --git a/src/scaffoldmaker/utils/bifurcation.py b/src/scaffoldmaker/utils/bifurcation.py index a1199f3f..4ac03b44 100644 --- a/src/scaffoldmaker/utils/bifurcation.py +++ b/src/scaffoldmaker/utils/bifurcation.py @@ -3,7 +3,7 @@ """ from __future__ import division -from opencmiss.utils.maths.vectorops import add, cross, dot, magnitude, mult, normalize, sub +from opencmiss.maths.vectorops import add, cross, dot, magnitude, mult, normalize, sub from opencmiss.zinc.element import Element, Elementbasis from opencmiss.zinc.field import Field from opencmiss.zinc.node import Node diff --git a/src/scaffoldmaker/utils/derivativemoothing.py b/src/scaffoldmaker/utils/derivativemoothing.py index 4c365dda..90d372db 100644 --- a/src/scaffoldmaker/utils/derivativemoothing.py +++ b/src/scaffoldmaker/utils/derivativemoothing.py @@ -3,7 +3,7 @@ ''' from __future__ import division import math -from opencmiss.utils.maths.vectorops import add, magnitude +from opencmiss.maths.vectorops import add, magnitude from opencmiss.utils.zinc.field import findOrCreateFieldGroup from opencmiss.utils.zinc.general import ChangeManager from opencmiss.zinc.element import Element, Elementbasis diff --git a/tests/test_general.py b/tests/test_general.py index 723c82cc..c1a9d446 100644 --- a/tests/test_general.py +++ b/tests/test_general.py @@ -1,5 +1,5 @@ import unittest -from opencmiss.utils.maths.vectorops import magnitude +from opencmiss.maths.vectorops import magnitude from opencmiss.utils.zinc.finiteelement import evaluateFieldNodesetRange, findNodeWithName from opencmiss.zinc.context import Context from opencmiss.zinc.field import Field