From 4cb27b76dfef39dfdddb42d46ab7fb55310f672d Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 12 Sep 2016 16:40:50 +0200 Subject: [PATCH 1/3] updated version information after successful test of v2.0.1-120-g6941004 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e68f28719..62d5dc773 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-113-g77729f3 +v2.0.1-120-g6941004 From 804931db9ecb20c171059e69bae1d72c5f86d5e7 Mon Sep 17 00:00:00 2001 From: chen Date: Mon, 12 Sep 2016 19:09:48 -0400 Subject: [PATCH 2/3] force type cast index to int for numpy array Force type casting indices into int array to avoid warning: VisibleDeprecationWarning: using a non-integer number instead of an integer will result in an error in the future For more info, see http://stackoverflow.com/questions/20084218/deprecation-warning-in-scikit-learn-svmlight-format-loader --- processing/pre/geom_addPrimitive.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index 952ba0c4b..8d934368f 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -82,7 +82,7 @@ for name in filenames: table.head_read() info,extra_header = table.head_getGeom() - + damask.util.croak(['grid a b c: %s'%(' x '.join(map(str,info['grid']))), 'size x y z: %s'%(' x '.join(map(str,info['size']))), 'origin x y z: %s'%(' : '.join(map(str,info['origin']))), @@ -126,9 +126,9 @@ for name in filenames: primPos = invRotation*gridpos # rotate back to primitive coordinate system if np.dot(mask*primPos/dim,mask*primPos/dim) <= 0.25 and \ np.all(abs((1.-mask)*primPos/dim) <= 0.5): # inside ellipsoid and inside box - microstructure[(gridpos[0]+options.center[0])%info['grid'][0], - (gridpos[1]+options.center[1])%info['grid'][1], - (gridpos[2]+options.center[2])%info['grid'][2]] = options.fill # assign microstructure index + microstructure[int((gridpos[0]+options.center[0])%info['grid'][0]), + int((gridpos[1]+options.center[1])%info['grid'][1]), + int((gridpos[2]+options.center[2])%info['grid'][2])] = options.fill # assign microstructure index newInfo['microstructures'] = microstructure.max() @@ -153,7 +153,7 @@ for name in filenames: table.labels_clear() table.head_write() table.output_flush() - + # --- write microstructure information ------------------------------------------------------------ formatwidth = int(math.floor(math.log10(microstructure.max())+1)) From 67a5edc93b153ad285745b065538177c7b25c0e7 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 13 Sep 2016 16:41:17 +0200 Subject: [PATCH 3/3] updated version information after successful test of v2.0.1-122-g804931d --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 62d5dc773..5923dbca4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-120-g6941004 +v2.0.1-122-g804931d