From bb5070b52fc968686f012fa83a139aa27cc575a3 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Mon, 18 Jul 2016 10:20:39 -0400 Subject: [PATCH 1/6] util.report without mandatory arguments reporting can now omit either "who" or "what". cleaner output in case of no "who"... --- lib/damask/util.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/damask/util.py b/lib/damask/util.py index ef2de48eb..cfc44f26c 100644 --- a/lib/damask/util.py +++ b/lib/damask/util.py @@ -49,9 +49,10 @@ def croak(what, newline = True): sys.stderr.flush() # ----------------------------- -def report(who,what): +def report(who = None, + what = None): """reports script and file name""" - croak( (emph(who) if who else '') + (': '+what if what else '') ) + croak( (emph(who)+': ' if who else '') + (what if what else '') ) # ----------------------------- From ef2c8479a7098d66f3bc438880dea03b7d24c58b Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 19 Jul 2016 04:19:09 +0200 Subject: [PATCH 2/6] updated version information after successful test of v2.0.0-396-g03bb0b8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9b8617d3b..355497657 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-385-g1b30b18 +v2.0.0-396-g03bb0b8 From 6f527b2af831b0c3bba613d0aee4e5ee5e3b8d77 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Sun, 24 Jul 2016 19:18:48 -0400 Subject: [PATCH 3/6] fixed upperCase typo in vtk_addPointcloudData call --- processing/pre/seeds_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processing/pre/seeds_check.sh b/processing/pre/seeds_check.sh index a7d7f76ce..f24cd1c64 100755 --- a/processing/pre/seeds_check.sh +++ b/processing/pre/seeds_check.sh @@ -4,7 +4,7 @@ for seeds in "$@" do vtk_pointcloud $seeds - vtk_addPointCloudData $seeds \ + vtk_addPointcloudData $seeds \ --scalar microstructure,weight \ --inplace \ --vtk ${seeds%.*}.vtp \ From 4d01e826c5888a602daf8541425136d260dddc38 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Mon, 25 Jul 2016 00:46:11 -0400 Subject: [PATCH 4/6] fixed typo in usage msg --- examples/SpectralMethod/Makefile | 12 ++++++++++++ processing/post/addDisplacement.py | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 examples/SpectralMethod/Makefile diff --git a/examples/SpectralMethod/Makefile b/examples/SpectralMethod/Makefile new file mode 100644 index 000000000..3abb88f89 --- /dev/null +++ b/examples/SpectralMethod/Makefile @@ -0,0 +1,12 @@ +include ${PETSC_DIR}/${PETSC_ARCH}/lib/petsc/conf/variables +include ${PETSC_DIR}/${PETSC_ARCH}/lib/petsc/conf/rules + + +run16x16x16: + -@${MPIEXEC} -n 2 DAMASK_spectral -l tensionX.load -g 20grains16x16x16.geom + +run32x32x32: + -@${MPIEXEC} -n 4 DAMASK_spectral -l tensionX.load -g 20grains32x32x32.geom + +run64x64x64: + -@${MPIEXEC} -n 8 DAMASK_spectral -l tensionX.load -g 20grains64x64x64.geom diff --git a/processing/post/addDisplacement.py b/processing/post/addDisplacement.py index 2be5dcc21..a791a0e84 100755 --- a/processing/post/addDisplacement.py +++ b/processing/post/addDisplacement.py @@ -107,7 +107,7 @@ parser.add_option('-p', parser.add_option('--nodal', dest = 'nodal', action = 'store_true', - help = 'output nodal (instad of cell-centered) displacements') + help = 'output nodal (instead of cell-centered) displacements') parser.set_defaults(defgrad = 'f', pos = 'pos', From 9b6b32692d14536a2a9cac2ea8a1ddc6c6b0478e Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 25 Jul 2016 14:26:39 +0200 Subject: [PATCH 5/6] updated version information after successful test of v2.0.0-401-g4d01e82 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 355497657..dd087b4dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-396-g03bb0b8 +v2.0.0-401-g4d01e82 From 8235bf34227040b1e0f9a346f658b96904377667 Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Mon, 25 Jul 2016 15:54:48 +0200 Subject: [PATCH 6/6] updated version to 2.0.1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index dd087b4dd..0ac852dde 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-401-g4d01e82 +v2.0.1