46d67f63d8
added test for converter from Ricardo's files
2014-10-10 08:54:48 +00:00
57e522566a
updated python style
2014-10-09 17:03:06 +00:00
47c8bfeacb
commented code
2014-10-09 11:01:07 +00:00
d86f091026
some small fixes, reporting still needs update
2014-10-06 12:47:52 +00:00
2836b2fb35
work in progress, extending to more criteria
2014-10-03 09:27:20 +00:00
033a275d82
a bunch of small changes. deleted compiled FFTW libraries
2014-10-02 21:27:03 +00:00
23ee538dcb
shortened syntax. fixed undefined file['croak']
2014-10-02 04:49:46 +00:00
bfe20a3af8
added $Id$ property and LF line endings.
2014-09-29 15:57:31 +00:00
f2d9d66129
improved readibility, fixed negative coordinates, improved output
2014-09-29 15:55:17 +00:00
ff475f1459
first draft of a constraint voronoi tessellation to match grain distribution
2014-09-29 10:19:49 +00:00
496c3d4bc8
added line breaks identifier and $Id$ flag
2014-09-25 21:54:42 +00:00
b85797c109
significant speed improvement for large grids.
...
polished messages and fixed error reporting bug.
2014-09-24 23:47:52 +00:00
78ab14806f
fixed bug in parser option type definition
2014-09-21 17:59:06 +00:00
14530b0a76
fixed bug 'the table' instead of 'table'
2014-09-19 15:24:59 +00:00
d07a098724
fixed wrong help introduced with last change on 3Dvisualize
2014-09-19 09:50:26 +00:00
a7d831de06
forgot to import python module
2014-09-15 10:07:52 +00:00
5657119b11
updated post processing test: rotateData is doing something, corrected addDeviator defauls
2014-09-12 14:49:26 +00:00
f2c4db0bb5
correcting help and default, some comments
2014-09-12 14:46:12 +00:00
afb9a2186b
removed explicit default setting: type='string' and action='store'
2014-09-12 14:14:55 +00:00
9ba7851c14
fixed bug in calculation of spherical part. Variables in python functions are intent(inout) in Fortran language!
2014-09-12 13:13:05 +00:00
5f986f3d54
updated to contain latest python improvements
2014-09-10 16:14:37 +00:00
5a159dcdfa
script to add scalar data and/or RGB color tuples to rectilinear VTK file (*.vtr)
2014-09-05 20:28:39 +00:00
e286cf4c74
fixed bug "theTable" instead of "table"
2014-09-03 14:53:12 +00:00
b566eed5a8
fixed error in last commit
2014-08-28 18:50:48 +00:00
5d96f62b44
fixed bug "theTable" instead of "table"
2014-08-28 17:37:27 +00:00
6cdcdecdfa
post processing scripts are working again.
...
@Philip: definining one offset for shiftData and one factor for scaleData for tensor/vector/special>1 seems to be more reasonable than per component
2014-08-25 21:13:39 +00:00
d93c40a3dd
fixed small bug ('theTable' instead of 'table') and simplified
2014-08-25 12:53:11 +00:00
1ba7cbb046
fixed small bug ('theTable' instead of 'table') and simplified
2014-08-25 12:39:12 +00:00
c7837e1f66
changed manual input/output close to class method
2014-08-22 16:58:53 +00:00
99e3c9a397
fixed (potentially) buggy rotation of tensors. convention is:
...
with A v = b
v' = R v
A' = R A R^T
such that
A' v' = R A R^T R v = R A v (= R b = b', i.e. old result transformed into other coordinate basis)
2014-08-22 15:32:48 +00:00
df27115472
extended "scalar" capabilities to "special" having arbitrary dimension (defaults to 1, i.e. former scalar case). Breaks backward compatibility since "--scalar" is now "--special". However, "-s" still works as before...
2014-08-22 15:25:51 +00:00
9d26bfa375
try to go on despite crappy data (containing dead ends in the segment network)
2014-08-21 17:23:16 +00:00
77df55c998
extended "scalar" capabilities to "special" having arbitrary dimension (defaults to 1, i.e. former scalar case). Breaks backward compatibility since "--scalar" is now "--special". However, "-s" still works as before...
2014-08-21 17:16:43 +00:00
9aa22d4a08
simplified column key generation
2014-08-21 16:17:23 +00:00
96b16dd97b
reshape "matrix" input data from (currently wrong) 9x1 to 3x3 layout.
...
simplified input validity check.
2014-08-21 16:14:06 +00:00
0bcd508298
added new option "no-data" to omit output of microstructure data field, i.e. generates plain mesh only
2014-08-21 16:01:11 +00:00
b573d06c3f
fixed bug where initial microstructure array was allocated (factor 2) too large in anticipation of later 2D tiling.
2014-08-18 21:32:53 +00:00
c6eab9dab7
fixed wrong order in linear interpolation for stress
2014-08-18 20:09:09 +00:00
e637f6344c
added possibility to fit to more than one yield point, now using linear interpolation between around given threshold value
2014-08-18 18:21:36 +00:00
ad7fe1ecbc
fixed bug (wrong index in stress tensor for Hill48) and possible deadlock
2014-08-10 21:22:22 +00:00
15a6015bc2
added some more post processing tests
...
DAMASK env now reports in MiB (GiB is too big for small machines)
2014-08-07 16:51:26 +00:00
df50707445
fixed some small flaws
2014-08-07 16:16:02 +00:00
c8f16f16fa
fixed bug in hill criterion
2014-08-06 20:07:47 +00:00
649e637561
added some more post processing tests and improved output
2014-08-06 19:06:33 +00:00
938352d43a
fixed calculation of size and dimension in case of 2D (was limited to third dim only)
...
plus polishing
2014-08-06 15:25:18 +00:00
cbafad50d0
some more work on the postprocessing scripts, decreased test tolerance because spectral decomposition has rounding errors (depending on machine/python/numpy version)
2014-08-06 13:27:09 +00:00
96fe818f5d
added more options to command line
2014-08-05 14:29:36 +00:00
b4b9835d18
some work on the yield surface generator
2014-08-04 21:15:56 +00:00
a0f9865133
updated to state-of-the art file handling etc
2014-08-04 20:07:20 +00:00
0874ebe096
new script to name abaqus output like in for marc.
...
written by B Bode from University of Kassel
2014-08-04 18:41:44 +00:00
7df8f04f65
updated test for postprocessing and improve some of the scripts
2014-08-04 17:53:41 +00:00
5556dad13f
updated to latest ASCII table handling style
2014-07-28 15:34:11 +00:00
0b93e7c5a5
corrected addDivergence script. Restarting still not working for new state, needs further investigations: tightend tolerances again
2014-07-27 09:43:00 +00:00
e01630e073
fixed bug in tuple assignment
2014-07-25 17:49:22 +00:00
bee6e0b09b
added optional weighting column
2014-07-25 16:38:04 +00:00
a804b23b7a
bugfixing
2014-07-24 22:02:10 +00:00
d0ecc0943c
added addPK2 script to test
2014-07-24 21:42:13 +00:00
7954c9a4a3
more and improved tests for add...
2014-07-24 20:21:18 +00:00
38048a09f2
introduced use of choice for argparse where applicable
2014-07-24 18:47:09 +00:00
42032cbc25
started to restructure fitting to criterion
2014-07-22 21:59:58 +00:00
e5dc9e79cc
some more changes improving the post processing scripts
2014-07-22 14:21:49 +00:00
e8d2e787bc
updated first 9 post processing scripts to latest ASCII table handling style
2014-07-21 19:55:05 +00:00
c8cd775747
added spectral solver grid location and index function to util library
2014-07-21 17:49:45 +00:00
2f0ecdf7e8
improved file handling etc. to follow newest style
2014-07-16 16:41:04 +00:00
e7c282a02d
some further improvements on ASCII table handling
2014-07-10 09:27:51 +00:00
f72a87f94b
polished scripts (option parser, numpy)
2014-07-09 10:07:24 +00:00
fd2164b391
von Mises fitting seems to work, still needs polishing (adding options etc)
2014-07-09 09:31:26 +00:00
5f638a059a
corrected string substitution
2014-07-09 07:17:58 +00:00
fdb4f2ffea
now the program flow is working
2014-07-08 16:09:02 +00:00
826f3d4dc7
added possibility to rotate primitives.
...
better help text.
2014-07-07 17:32:37 +00:00
7a478d646a
added call to DAMASK spectral
2014-07-07 14:17:44 +00:00
a48b4cfc95
improved dummy yield surface generator
2014-07-04 13:40:15 +00:00
a68fe7c77b
first draft of a script to compute yield surfaces with the spectral solver
2014-07-02 10:42:51 +00:00
1ff38b98af
fixed error in file handling
2014-06-18 09:00:57 +00:00
51b92f3ef9
simplified option parsing (so far, only for addCalculation and addMises)
2014-06-17 07:10:10 +00:00
596ee18da9
improved the regex for header reading
2014-06-08 14:43:32 +00:00
31aded8311
no scaling of the output by size (seeds files are within 0..1)
...
plus some polishing here and there
2014-06-08 12:48:32 +00:00
b0ab048d7b
now aware of "origin" keyword in seeds-file
2014-06-07 18:15:08 +00:00
e3c4e0ecfc
added option to override bounding box calculation from data with own geometry.
2014-06-07 18:14:30 +00:00
72e9c512bd
polishing of variable names, comments, and some of the programming structure.
2014-06-07 18:13:29 +00:00
2f249773c9
fixed missing Python module
2014-06-06 15:11:15 +00:00
32b315487c
removed debug printing
2014-06-06 14:46:41 +00:00
59e8cd1d7e
new script: Add data in column(s) of second ASCIItable selected from row that is given by the value in a mapping column
2014-06-06 14:35:37 +00:00
63c1a0a212
updated to croaking, scriptID, IO-piping.
2014-06-06 09:43:28 +00:00
522efaac92
added immutable option
2014-06-05 17:18:52 +00:00
9834c8466c
scripts to scale, shift, and rotate scalar, vector, or tensor quantities of ASCIItables (in-place!)
2014-05-27 08:08:10 +00:00
3ec323e564
Create seed file by taking microstructure indices from given ASCIItable column.
2014-05-26 14:57:39 +00:00
f81c6f6890
changed ASCIItable reading from _asArray (deprecated) to _readArray.
...
observe physical box size.
added compatibility to VTK > version 5.
2014-05-26 14:35:25 +00:00
65f1f55a87
added option to pre-rotate orientation (change lab frame)
2014-05-26 14:31:42 +00:00
51e7f9eed9
added --reverse option. corrected help hint regarding sorting order
2014-05-23 14:05:58 +00:00
06715dc99f
added "no data check" and updated script backbone to be consistent with other scripts (croak).
2014-05-19 13:43:26 +00:00
89c896678b
added printing of cli arguments to seeds_fromRandom, fixed regression in compile_CoreModule and DAMASK_spectral_doxygen
2014-05-15 09:58:31 +00:00
8a80f5ec7a
fixed typo that prevented selection of "Moore" neighborhood.
...
made "boundary" and "biplane" synonyms.
adopted more modern treatment of geom-files.
introduced scale for voxel size (independent of physical size and resolution given in geom-file).
2014-05-14 15:26:06 +00:00
8b9ed55928
small "beautification"
2014-05-13 15:03:55 +00:00
13f1607e15
changed default behavior to (system-provided) random seed instead of fixed "0"
2014-05-03 02:36:23 +00:00
0885ea8023
changed variable interpolation to be useable in connection with dictionary definitions for formulas. Slightly less efficient but now much more powerful...
2014-05-02 19:56:56 +00:00
a8a9c8eef5
added possibility to not sort (--sort none) output by its --separation such that the output can be used in conjunction with the VTK files produced by DAMASK.
2014-04-14 21:45:24 +00:00
a85ea307f1
changed (with backward compatibility) option "origin" to more suitable name of "center" since it specifies the position of the primitive's center, while "origin" could be mistaken for the lower left corner or such...
2014-04-09 14:22:27 +00:00
babde13c6a
capture missing --vtk option
2014-04-03 01:00:00 +00:00
33af5af8cb
some small changes on the header/shebang
2014-04-01 19:29:14 +00:00
342ca0be47
tested new scripts to update shebang, all files got same shebang (and for python files encoding)
2014-04-01 18:41:14 +00:00
782b54a430
more LF, Id, and executable status changes
2014-04-01 17:52:31 +00:00
559f14ca35
prepended *draw_manual for faster processing in "new" Mentat, thx Christoph
2014-04-01 17:06:10 +00:00
188002f16e
more LF, Id, and executable status changes
2014-04-01 16:58:54 +00:00
c254f87814
now assuming periodic microstructures (was not fully correct before, assuming non-periodicity)
2014-04-01 16:43:39 +00:00
16743f8631
explicitly state unbuffered ASCIIoutput
2014-03-28 18:15:37 +00:00
f19955c84a
added options to specify the columns for the grain IDs and segments
...
improved error handling
2014-03-12 14:26:44 +00:00
0363b1fb04
updated reporting (according to addCauchy)
2014-03-10 14:01:39 +00:00
e10f8f1b5e
corrected typo
2014-03-04 16:43:22 +00:00
943349fdbb
bunch of new scripts:
...
gwyddion_filter tries to smoothen out Gwyddion data sets.
vtk_fromGwyddion produces vtk mesh from Gwyddion data set.
geom_addPrimitive allows to add box, cylinder, or ellipsoidal blobs to geom file.
2014-03-04 03:34:34 +00:00
6fd8407d6e
moved "predefined" to colormap init
...
cleaned interpolate to not change color model
fixed color range cropping issue
2014-02-28 16:09:01 +00:00
63569b19b6
added use of "defaultdict" from collections
2014-02-28 15:56:28 +00:00
fdbde250dc
deleted obsolete table.data_rewind to be pipe-safe
2014-02-28 15:55:48 +00:00
27c83f60a6
fixed typo
2014-02-26 15:05:34 +00:00
7f08c976c3
skip file if mandatory column not found in ASCIItable
2014-02-26 14:56:06 +00:00
98a8b47a09
can now read legacy VTK files with unstructured grid data
2014-02-24 19:23:08 +00:00
9d402022aa
fixed small bug when using renumber option
2014-02-15 10:37:50 +00:00
371a027de9
added option '--renumber' to geom_rescale and geom_grainGrowth to renumber microstructures from 1 to N (without gaps), off by default.
...
added metavar information to some scripts
2014-02-14 13:17:29 +00:00
a659d071a9
added '--degrees' option to indicate Euler angles unit
2014-02-10 18:01:21 +00:00
85e4896478
"--degrees" option to specify Euler angles in degrees (instead of radians)
2014-02-09 20:36:42 +00:00
ccb950f3d8
checked Unix command piping conformity -- seems to now work:
...
seeds_fromRandom |
geom_fromVoronoiTessellation |
geom_grainGrowth |
geom_unpack |
geom_pack
However, grainGrowth functionality seems broken...
2014-02-03 23:44:29 +00:00
f66c0727d0
fixed wrong type for arguments introduced last time (must be string to have multiples)
2014-02-03 20:23:49 +00:00
7a9fa061de
added --compress option: for ang files filtered to have single orientation in grain (OIM filter), microstructure and texture in material.config are compressed
2014-01-30 12:00:20 +00:00
3c2af8e7a6
fixed dropped file handle when flushing closed output...
2014-01-29 21:16:44 +00:00
24d7f55f55
check whether output is already stopped (in command piping for instance)
2014-01-29 21:13:36 +00:00
cd18ec2abf
removed unneccesary table.data_rewind, which breaks command piping
2014-01-29 21:03:56 +00:00
ee99216edc
polishing compile_CoreModule, bug fix for Makefile
2014-01-28 07:34:13 +00:00
1bd456aa22
corrected options.error --> parser.error
2014-01-27 14:30:37 +00:00
a1cfc85d74
produce VTK unstructured grid with voxels around all points given in an ASCIItable.
2014-01-27 14:10:29 +00:00
13fed38a2f
add scalar and RGB tuples from ASCIItable to existing VTK voxel cloud (*.vtu)
2014-01-27 14:05:03 +00:00
c9c6588f7c
renamed seeds file related scripts in a (hopefully) consistent manner
2014-01-23 20:48:33 +00:00
eda9076157
use existing geom file and produce seed points from each voxel (filtering possible)
2014-01-23 20:43:42 +00:00
8b4af554ba
added verbosity on help messages
2014-01-20 14:41:56 +00:00
649b8b91fe
fixed reporting of arguments
2014-01-15 15:10:13 +00:00
db18b3c77f
added missing script arguments in documentation part of the header
2014-01-14 10:53:45 +00:00
0f101c8dbf
adopted to improved HDF5 format
2014-01-13 16:22:01 +00:00
aab0208c65
more modifications, only configure needs modifications
2014-01-12 17:29:00 +00:00
a614e76968
first post processing script for HDF5 output
2014-01-07 20:42:51 +00:00
4f30a6e05b
now compatible with new table.data_readArray method
2013-12-31 21:06:32 +00:00
2f1db8f69a
introduced delimiter option (default = tab) for ascii table output, use space for geometry files
2013-12-17 08:16:29 +00:00
e20ffb379d
changed numpy.readtxt logic from "data_asArray" returning a copy to inplace "data_readArray" now directly storing into self.data
2013-12-14 03:51:22 +00:00
600389ac44
new script to sort ASCIItable according to (multiple) columns
2013-12-14 03:48:50 +00:00
37046cd2ea
changed Fortran standard to 2008
2013-12-12 22:30:22 +00:00
0f8790c148
clarified help string
2013-12-12 08:48:57 +00:00
10c8a1a3ce
corrected typo in usage hint
2013-12-12 02:35:01 +00:00
894776ca67
fixed stupid bug addressing a dict by dict{key} instead of dict[key]
2013-12-11 14:30:27 +00:00
44b3687e7c
added option to invert output data range (1.0 -- 0.0 instead of 0.0 -- 1.0)
2013-12-10 00:27:22 +00:00
e4cea31a9d
small bug fix: options.error --> parser.error
2013-12-09 15:58:35 +00:00
e2d4cc8b3d
fixed former nonsense definition of lab frame direction
2013-12-09 15:57:21 +00:00
26690859bb
deal more gracefully with problematic user input.
2013-12-09 15:54:47 +00:00
7fb1a3130a
now VTK 6 compatible
2013-12-09 15:41:29 +00:00
c7ac903dc7
fixed missing comma in script list...
2013-12-09 15:37:36 +00:00
090fca8683
deleted left-over debug statement
2013-11-26 20:24:40 +00:00
d498eca242
deleted left-over debug statement
2013-11-26 20:22:52 +00:00
b63d2eafe8
new scripts for:
...
-generating vtk point cloud from x,y,z ASCIItable data
-adding scalar values and color tuples from ASCIItable to vtk point cloud
-permuting data in ASCIItable columns (used to shuffle ordered grain indices)
2013-11-26 20:19:27 +00:00
a45c7dbb62
new ASCIItable scripts to add
...
- quaternion and/or Euler representation of lattice orientation (given in rotation matrix, etc.)
- RGB color code of crystal direction in laboratory frame (matching closely the TSL-OIM scheme of inverse pole figures).
2013-11-25 19:11:02 +00:00
0337b4f319
added script to produce VTK point cloud from seed file coordinates
2013-11-20 17:33:05 +00:00
feaccae652
set threshold for values treated as zero to 1.e-12 (was 1.e-15) to avoid flip in strain direction
2013-11-19 19:39:14 +00:00
e1e76cb257
fixed bug in OIMang_hex2cub.py, added test for correct number of microstructures (should be equal to header info)
2013-11-14 17:37:42 +00:00
d2cbca35b2
fixed syntax error in last commit
2013-11-13 12:51:48 +00:00
9b7007b937
added accidently deleted output of texturei again
2013-11-13 12:46:20 +00:00
103ae3cd0d
introduced on the fly copying for 2D microstructures in 3 dimension
2013-11-12 17:04:36 +00:00
fc8811c07d
switched to faster algorithm and removed buggy multi-threading
2013-11-11 13:00:31 +00:00
9ac8846e41
compiling with hdf5 is now working for DAMASK (if HDF5=ON) and for playground example in private
2013-11-07 12:52:36 +00:00
463ecfd296
switched to damask.ASCIItable parsing, now aware of synonyms in geometry header, and speed-up by some orders of magnitude due to scipy.ndimage.filters use...
2013-11-04 14:12:10 +00:00
1ff98296b3
added output of default values, still does not run for my geometry
2013-10-25 11:58:03 +00:00
5c1c0028e0
throw error if RCB segment list is not properly connected, i.e., complain about "dead ends" along the segment chain.
2013-10-24 18:55:16 +00:00
705d23a5ed
fixed bug for non-present "microstructure" info in header.
2013-10-15 12:36:52 +00:00
47577e3d11
introduced synonym "grains" for deprecated "grains" to ensure backward compatibility
2013-10-15 09:50:20 +00:00
6f467c0789
added "-fPIC" flag to make sure (independent of local f2py settings) that position independent code will be generated for the shared "code" object in DAMASK's python lib
2013-09-23 19:07:12 +00:00
9280b0a4e2
fixed bug where configuration wrote floating point numbers for grain IDs and texture IDs.
2013-09-23 18:35:30 +00:00
1915215c6f
commented out not working use of vtk class
2013-09-20 11:27:11 +00:00
3eb8aa1362
checked for python3 compatibility:
...
use "print('foo')" instead of "print 'foo'"
and "except(error) as e" instead of "except error,e"
2013-09-14 10:52:02 +00:00
a17b85cba8
deleted wrong colormap script, was there twice. correct one (modified recently by Philip) is called perceptualUniformColormap
2013-09-11 08:15:05 +00:00
022696c8f3
fixed output to screen
2013-09-11 07:45:42 +00:00
538a471246
updated $Id$ handling.
...
added (colored) my script's name reporting.
2013-09-09 14:12:00 +00:00
ec6587e7f5
corrected help message
2013-09-09 14:11:16 +00:00
f02ee16b3d
fixed missing comma in "pre" symlinking list.
2013-09-09 14:09:38 +00:00
b3463b2ed6
added intel openmp library to linking list. (-liomp5 was necessary when using IMKL...)
2013-09-09 14:08:44 +00:00
7bbee3fe60
write size as exponential not float, otherwise small numbers get rounded (to zero)
2013-08-21 15:25:27 +00:00
4f7cd76b29
renamed texture_rotation into texture_transformation
...
changed keyword for material.config to axes in line with geom_fromAng.py
former keyword rotation is still recognized for compatibility
2013-07-24 11:09:39 +00:00
d2ccc06aee
added line break between rotation and euler angle information for correct parsing of config file
2013-07-23 14:33:30 +00:00
c8cc397bf4
small bug fix
2013-07-23 12:40:26 +00:00
26df077c2a
translating scalar data that contain vector components to vector data
2013-07-22 08:24:04 +00:00
69b3359047
forgot in last commit
2013-07-18 13:31:40 +00:00
2201a73a46
added (?correct and working?) rotation for conversion from ANG and updated bold verbosity of all other scripts
2013-07-18 13:28:54 +00:00
a39005ef1c
added possibility to specify formula with array return type
...
added support for numpy
2013-07-16 21:48:23 +00:00
7d5f1270d5
fixed nasty bug that prevented proper grid rescaling
2013-07-16 21:11:44 +00:00
cb09c17fa2
simplified $Id treatment.
...
now reports own name in bold during runtime.
2013-07-10 09:15:42 +00:00
31e0469b34
changed key "grains" to "microstructures" to be consistent with .geom description later.
2013-07-10 09:14:53 +00:00
f75604c235
fixed bug in output of origin (reported size instead)
2013-07-10 09:13:21 +00:00
fafa69b846
added possibility to have microstructure indices for seed points. Hence, multiple seed points can belong to the same final grain.
2013-07-10 09:12:00 +00:00
0fa9f7dc22
can now show data for tables lacking column labels (use option --nolabels)
2013-07-08 11:56:16 +00:00
930e605afc
bug fixes and more optimizations
2013-07-03 00:48:21 +00:00
34ef7b0f34
now fully anisotropic grain growth possible by setting up the function "interfacialEnergy"
2013-07-02 04:32:32 +00:00
5ff8a7067e
fixed bug and re-reverted to faster version. added python multiprocessing functionality. polishing and renaming
2013-07-01 17:15:24 +00:00
89cea68bc5
now using ASCIItable object and numpy array.repeat --> about 50x faster for large geoms (i.e. several mio voxels).
2013-06-30 19:11:16 +00:00
39758f5c53
removed twoD option remnants
2013-06-30 19:09:01 +00:00
1f891c544d
now using ASCIItable object (much faster file writing).
...
(temporarily) switched back to rev2496 logic...
changed to diffusion distance as command line argument (instead of taking sqrt(time))
2013-06-30 13:51:21 +00:00
dd3d53e238
simplified grid/size synonyms treatment
2013-06-30 13:47:01 +00:00
Martin Diehl