diff --git a/PRIVATE b/PRIVATE index 3810987d6..1b31d1239 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 3810987d64d232a7fc9e709c036f7a19d6e4d027 +Subproject commit 1b31d1239393cfe3322a341df3b3b846328a6733 diff --git a/processing/post/addCurl.py b/processing/post/addCurl.py index 52a4ae438..66f185914 100755 --- a/processing/post/addCurl.py +++ b/processing/post/addCurl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addDisplacement.py b/processing/post/addDisplacement.py index 00132d7c6..807a3e9cb 100755 --- a/processing/post/addDisplacement.py +++ b/processing/post/addDisplacement.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addDivergence.py b/processing/post/addDivergence.py index 98916f56c..a601bd23f 100755 --- a/processing/post/addDivergence.py +++ b/processing/post/addDivergence.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/addGradient.py b/processing/post/addGradient.py index c788f5286..19481ea39 100755 --- a/processing/post/addGradient.py +++ b/processing/post/addGradient.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/post/perceptualUniformColorMap.py b/processing/post/perceptualUniformColorMap.py index 96e676337..e01b144af 100755 --- a/processing/post/perceptualUniformColorMap.py +++ b/processing/post/perceptualUniformColorMap.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import sys,os diff --git a/processing/post/postResults.py b/processing/post/postResults.py index 158fcb202..585e60d9c 100755 --- a/processing/post/postResults.py +++ b/processing/post/postResults.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math,re,time,struct diff --git a/processing/post/showTable.py b/processing/post/showTable.py index 918256af9..02946437b 100755 --- a/processing/post/showTable.py +++ b/processing/post/showTable.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index d8e9d857a..534d68af1 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math @@ -63,7 +63,7 @@ parser.set_defaults(center = (.0,.0,.0), if options.dimension is None: parser.error('no dimension specified.') if options.angleaxis is not None: - options.angleaxis = map(float,options.angleaxis) + options.angleaxis = list(map(float,options.angleaxis)) rotation = damask.Quaternion().fromAngleAxis(np.radians(options.angleaxis[0]) if options.degrees else options.angleaxis[0], options.angleaxis[1:4]) elif options.quaternion is not None: @@ -137,17 +137,17 @@ for name in filenames: indexing='ij') # Padding handling X = np.roll(np.roll(np.roll(X, - -grid[0]/2, axis=0), - -grid[1]/2, axis=1), - -grid[2]/2, axis=2) + -grid[0]//2, axis=0), + -grid[1]//2, axis=1), + -grid[2]//2, axis=2) Y = np.roll(np.roll(np.roll(Y, - -grid[0]/2, axis=0), - -grid[1]/2, axis=1), - -grid[2]/2, axis=2) + -grid[0]//2, axis=0), + -grid[1]//2, axis=1), + -grid[2]//2, axis=2) Z = np.roll(np.roll(np.roll(Z, - -grid[0]/2, axis=0), - -grid[1]/2, axis=1), - -grid[2]/2, axis=2) + -grid[0]//2, axis=0), + -grid[1]//2, axis=1), + -grid[2]//2, axis=2) else: # nonperiodic, much lighter on resources # change to coordinate space where the primitive is the unit sphere/cube/etc (X, Y, Z) = np.meshgrid(np.arange(0, grid[0], dtype=np.float32), diff --git a/processing/pre/geom_canvas.py b/processing/pre/geom_canvas.py index f72a77578..2d0ea3103 100755 --- a/processing/pre/geom_canvas.py +++ b/processing/pre/geom_canvas.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_mirror.py b/processing/pre/geom_mirror.py index b840b191b..65dbb648d 100755 --- a/processing/pre/geom_mirror.py +++ b/processing/pre/geom_mirror.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_pack.py b/processing/pre/geom_pack.py index 4932b8795..587dabb0b 100755 --- a/processing/pre/geom_pack.py +++ b/processing/pre/geom_pack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys diff --git a/processing/pre/geom_rotate.py b/processing/pre/geom_rotate.py index e816537db..8318b366c 100755 --- a/processing/pre/geom_rotate.py +++ b/processing/pre/geom_rotate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_translate.py b/processing/pre/geom_translate.py index 2f4918632..992e5ead5 100755 --- a/processing/pre/geom_translate.py +++ b/processing/pre/geom_translate.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math @@ -46,7 +46,7 @@ parser.set_defaults(origin = (0.0,0.0,0.0), datatype = 'f' if options.real else 'i' sub = {} -for i in range(len(options.substitute)/2): # split substitution list into "from" -> "to" +for i in range(len(options.substitute)//2): # split substitution list into "from" -> "to" sub[int(options.substitute[i*2])] = int(options.substitute[i*2+1]) # --- loop over input files ---------------------------------------------------------------------- diff --git a/processing/pre/geom_unpack.py b/processing/pre/geom_unpack.py index 530d3889e..85c60d6e5 100755 --- a/processing/pre/geom_unpack.py +++ b/processing/pre/geom_unpack.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math diff --git a/processing/pre/geom_vicinityOffset.py b/processing/pre/geom_vicinityOffset.py index c172171b7..001fa3930 100755 --- a/processing/pre/geom_vicinityOffset.py +++ b/processing/pre/geom_vicinityOffset.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.7 +#!/usr/bin/env python # -*- coding: UTF-8 no BOM -*- import os,sys,math