diff --git a/python/damask/lattice.py b/python/damask/lattice.py index fe3965547..1887bae7c 100644 --- a/python/damask/lattice.py +++ b/python/damask/lattice.py @@ -1,7 +1,6 @@ import numpy as np from .rotation import Rotation -from . import Lambert P = -1 diff --git a/python/damask/rotation.py b/python/damask/rotation.py index 08ec7c564..084e4bf38 100644 --- a/python/damask/rotation.py +++ b/python/damask/rotation.py @@ -219,8 +219,7 @@ class Rotation: def asRodrigues(self, vector = False): """ - Rodrigues-Frank vector representation [n_1, n_2, n_3, tan(ω/2)] unless vector == True: - [n_1, n_2, n_3] * tan(ω/2). + Rodrigues-Frank vector representation [n_1, n_2, n_3, tan(ω/2)] unless vector == True: [n_1, n_2, n_3] * tan(ω/2). Parameters ---------- @@ -634,7 +633,7 @@ class Rotation: @staticmethod def eu2ro(eu): """Bunge-Euler angles to Rodriques-Frank vector.""" - ro = eu2ax(eu) # convert to axis angle pair representation + ro = Rotation.eu2ax(eu) # convert to axis angle pair representation if ro[3] >= np.pi: # Differs from original implementation. check convention 5 ro[3] = np.inf elif iszero(ro[3]): @@ -754,7 +753,7 @@ class Rotation: @staticmethod def ro2cu(ro): """Rodriques-Frank vector to cubochoric vector.""" - return ho2cu(ro2ho(ro)) + return Rotation.ho2cu(Rotation.ro2ho(ro)) #---------- Homochoric vector---------- diff --git a/python/damask/util.py b/python/damask/util.py index 3d17ddd06..553ae0c6e 100644 --- a/python/damask/util.py +++ b/python/damask/util.py @@ -39,7 +39,7 @@ class bcolors: def srepr(arg,glue = '\n'): - """ + r""" Join arguments as individual lines. Parameters @@ -110,7 +110,6 @@ def execute(cmd, env = None): """ Execute command. - Parameters ---------- @@ -179,6 +178,7 @@ def progressBar(iteration, total, prefix='', bar_length=50): Prefix string. bar_length : int, optional Character length of bar. Defaults to 50. + """ fraction = iteration / float(total) if not hasattr(progressBar, "last_fraction"): # first call to function diff --git a/python/tests/test_Rotation.py b/python/tests/test_Rotation.py index dd9e20363..c545a7172 100644 --- a/python/tests/test_Rotation.py +++ b/python/tests/test_Rotation.py @@ -1,10 +1,8 @@ import os -from itertools import permutations import pytest import numpy as np -import damask from damask import Rotation n = 1000