From e47c275e0c8af0ff5e0307430d558e740adb7c24 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 12 Feb 2019 06:18:21 +0100 Subject: [PATCH] unknown encoding caused problem (on python2?) --- python/damask/Lambert.py | 9 ++++++--- python/damask/orientation.py | 8 ++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/python/damask/Lambert.py b/python/damask/Lambert.py index 9972b7965..5d07f73f4 100644 --- a/python/damask/Lambert.py +++ b/python/damask/Lambert.py @@ -1,7 +1,9 @@ +# -*- coding: UTF-8 no BOM -*- + #################################################################################################### -# Code below available according to below conditions on https://github.com/MarDiehl/3Drotations +# Code below available according to the followin conditions on https://github.com/MarDiehl/3Drotations #################################################################################################### -# Copyright (c) 2017-2019, Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH +# Copyright (c) 2017-2019, Martin Diehl/Max-Planck-Institut für Eisenforschung GmbH # Copyright (c) 2013-2014, Marc De Graef/Carnegie Mellon University # All rights reserved. # @@ -28,6 +30,7 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #################################################################################################### + import numpy as np sc = np.pi**(1./6.)/6.**(1./6.) @@ -104,7 +107,7 @@ def BallToCube(ball): # inverse M_1 cube = np.array([ Tinv[0], Tinv[1], (-1.0 if xyz3[2] < 0.0 else 1.0) * rs / np.sqrt(6.0/np.pi) ]) /sc - # reverst the coordinates back to the regular order according to the original pyramid number + # reverse the coordinates back to the regular order according to the original pyramid number cube = cube[p] return cube diff --git a/python/damask/orientation.py b/python/damask/orientation.py index bba13eb8a..5316b2026 100644 --- a/python/damask/orientation.py +++ b/python/damask/orientation.py @@ -1,9 +1,5 @@ # -*- coding: UTF-8 no BOM -*- -################################################### -# NOTE: everything here needs to be a np array # -################################################### - import math,os import numpy as np from . import Lambert @@ -1470,9 +1466,9 @@ class Orientation: return Orientation(matrix=np.dot(rot,self.asMatrix()),symmetry=targetSymmetry) #################################################################################################### -# Code below available according to below conditions on https://github.com/MarDiehl/3Drotations +# Code below available according to the followin conditions on https://github.com/MarDiehl/3Drotations #################################################################################################### -# Copyright (c) 2017-2019, Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH +# Copyright (c) 2017-2019, Martin Diehl/Max-Planck-Institut für Eisenforschung GmbH # Copyright (c) 2013-2014, Marc De Graef/Carnegie Mellon University # All rights reserved. #