diff --git a/VERSION b/VERSION index 9b8617d3b..0ac852dde 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-385-g1b30b18 +v2.0.1 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/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 '') ) # ----------------------------- 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', 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 \