Merge branch 'development' of magit1.mpie.de:damask/DAMASK into miscImprovements

This commit is contained in:
Martin Diehl 2016-07-27 08:57:13 +02:00
commit 2a0be6d232
5 changed files with 18 additions and 5 deletions

View File

@ -1 +1 @@
v2.0.0-385-g1b30b18 v2.0.1

View File

@ -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

View File

@ -49,9 +49,10 @@ def croak(what, newline = True):
sys.stderr.flush() sys.stderr.flush()
# ----------------------------- # -----------------------------
def report(who,what): def report(who = None,
what = None):
"""reports script and file name""" """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 '') )
# ----------------------------- # -----------------------------

View File

@ -107,7 +107,7 @@ parser.add_option('-p',
parser.add_option('--nodal', parser.add_option('--nodal',
dest = 'nodal', dest = 'nodal',
action = 'store_true', action = 'store_true',
help = 'output nodal (instad of cell-centered) displacements') help = 'output nodal (instead of cell-centered) displacements')
parser.set_defaults(defgrad = 'f', parser.set_defaults(defgrad = 'f',
pos = 'pos', pos = 'pos',

View File

@ -4,7 +4,7 @@ for seeds in "$@"
do do
vtk_pointcloud $seeds vtk_pointcloud $seeds
vtk_addPointCloudData $seeds \ vtk_addPointcloudData $seeds \
--scalar microstructure,weight \ --scalar microstructure,weight \
--inplace \ --inplace \
--vtk ${seeds%.*}.vtp \ --vtk ${seeds%.*}.vtp \