From f2ea325638eef3a2cbca3a21aa202d4925b3757b Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 19 Mar 2020 09:40:56 +0100 Subject: [PATCH 1/2] [skip ci] updated version information after successful test of v2.0.3-1942-g3d8e8cfe --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0ae0c6c28..6a0c24200 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.3-1920-ge8c16e7f +v2.0.3-1942-g3d8e8cfe From 04cb8111c6b5440cdafa0eb5504eb532484e5197 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 22 Mar 2020 07:08:54 +0100 Subject: [PATCH 2/2] only used for non-selective --- processing/pre/seeds_fromRandom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/processing/pre/seeds_fromRandom.py b/processing/pre/seeds_fromRandom.py index f8ded554a..2de513c2c 100755 --- a/processing/pre/seeds_fromRandom.py +++ b/processing/pre/seeds_fromRandom.py @@ -126,10 +126,10 @@ for name in filenames: eulers[:,1] = np.degrees(np.arccos(2*eulers[:,1]-1.0)) # cos(Phi) is uniformly distributed eulers[:,2] *= 360.0 # phi_2 is uniformly distributed - coords = damask.grid_filters.cell_coord0(grid,size).reshape(-1,3) if not options.selective: - seeds = coords[np.random.choice(coords.shape[0], options.N, replace=False)] \ + coords = damask.grid_filters.cell_coord0(grid,size).reshape(-1,3) + seeds = coords[np.random.choice(np.prod(grid), options.N, replace=False)] \ + np.broadcast_to(size/grid,(options.N,3))*(np.random.rand(options.N,3)*.5-.25) # wobble without leaving grid else: seeds = np.empty((options.N,3))