From 25a80723c0c5b477779bb82beec4d47311b1c175 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 20 Dec 2018 17:09:53 -0500 Subject: [PATCH 1/4] numpy interface changed to be strict about 2D array shape in histogram --- processing/post/binXY.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processing/post/binXY.py b/processing/post/binXY.py index 726fca39f..ea73d13b9 100755 --- a/processing/post/binXY.py +++ b/processing/post/binXY.py @@ -120,7 +120,7 @@ for name in filenames: delta = minmax[:,1]-minmax[:,0] (grid,xedges,yedges) = np.histogram2d(table.data[:,0],table.data[:,1], bins=options.bins, - range=minmax[0:2,0:2], + range=minmax[:2], weights=None if options.weight is None else table.data[:,2]) if options.normCol: From a1ff380ef4b6cecdf89e17950a0fec624a022627 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 20 Dec 2018 17:10:43 -0500 Subject: [PATCH 2/4] slightly better aligned debug output --- src/config.f90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/config.f90 b/src/config.f90 index 7ae800f30..441dd953c 100644 --- a/src/config.f90 +++ b/src/config.f90 @@ -142,7 +142,7 @@ subroutine config_init() case (trim(material_partPhase)) call parseFile(phase_name,config_phase,line,fileContent(i+1:)) - if (iand(myDebug,debug_levelBasic) /= 0_pInt) write(6,'(a)') ' Phase parsed'; flush(6) + if (iand(myDebug,debug_levelBasic) /= 0_pInt) write(6,'(a)') ' Phase parsed'; flush(6) case (trim(material_partMicrostructure)) call parseFile(microstructure_name,config_microstructure,line,fileContent(i+1:)) @@ -150,7 +150,7 @@ subroutine config_init() case (trim(material_partCrystallite)) call parseFile(crystallite_name,config_crystallite,line,fileContent(i+1:)) - if (iand(myDebug,debug_levelBasic) /= 0_pInt) write(6,'(a)') ' Crystallite parsed'; flush(6) + if (iand(myDebug,debug_levelBasic) /= 0_pInt) write(6,'(a)') ' Crystallite parsed'; flush(6) case (trim(material_partHomogenization)) call parseFile(homogenization_name,config_homogenization,line,fileContent(i+1:)) @@ -158,7 +158,7 @@ subroutine config_init() case (trim(material_partTexture)) call parseFile(texture_name,config_texture,line,fileContent(i+1:)) - if (iand(myDebug,debug_levelBasic) /= 0_pInt) write(6,'(a)') ' Texture parsed'; flush(6) + if (iand(myDebug,debug_levelBasic) /= 0_pInt) write(6,'(a)') ' Texture parsed'; flush(6) end select From 9bdd4d1d684fc026832127a794aab5547da799a1 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Thu, 20 Dec 2018 17:12:05 -0500 Subject: [PATCH 3/4] added line to stop config parser from trying to interpret rest of geom description---huge speedup!! --- processing/pre/geom_fromVoronoiTessellation.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/processing/pre/geom_fromVoronoiTessellation.py b/processing/pre/geom_fromVoronoiTessellation.py index 359acb366..5610c939a 100755 --- a/processing/pre/geom_fromVoronoiTessellation.py +++ b/processing/pre/geom_fromVoronoiTessellation.py @@ -323,12 +323,13 @@ for name in filenames: ] if hasEulers: config_header += [''] + theAxes = [] if options.axes is None else ['axes\t{} {} {}'.format(*options.axes)] for ID in grainIDs: eulerID = np.nonzero(grains == ID)[0][0] # find first occurrence of this grain id config_header += ['[Grain{}]'.format(str(ID).zfill(formatwidth)), '(gauss)\tphi1 {:g}\tPhi {:g}\tphi2 {:g}\tscatter 0.0\tfraction 1.0'.format(*eulers[eulerID]) - ] - if options.axes is not None: config_header.append('axes\t{} {} {}'.format(*options.axes)) + ] + theAxes + config_header += [''] table.labels_clear() table.info_clear() From 0541cceb2cec4475a73e42919a9c7ad4405b9849 Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 21 Dec 2018 12:26:41 +0100 Subject: [PATCH 4/4] [skip ci] updated version information after successful test of v2.0.2-1239-g9bdd4d1d --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4fd318a98..d161a8ad6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-1187-gcd8ee450 +v2.0.2-1239-g9bdd4d1d