Commit Graph

2274 Commits

Author SHA1 Message Date
Martin Diehl b19ec4f8ae first ideas for more user friendly usage 2021-03-30 07:24:47 +02:00
Martin Diehl 3fe1accf18 not used anymore 2021-03-28 19:48:44 +02:00
Martin Diehl 5ea2fa97a0 untested and unused code 2021-03-28 12:46:26 +02:00
Martin Diehl a587e70704 split into small sections and test damage 2021-03-28 12:08:08 +02:00
Martin Diehl a3ab890315 bugfix for ConfigMaterial
don't use mutable variables in python initializers, they get updated
2021-03-28 11:35:40 +02:00
Martin Diehl 480b8315a7 cleaning + testing 2021-03-27 15:54:29 +01:00
Martin Diehl 8a99306aed old table not needed anymore 2021-03-27 14:34:18 +01:00
Martin Diehl c742f7c9d0 need to cope with _asciitable.py and _test.py 2021-03-27 12:47:58 +01:00
Martin Diehl be9e00347b cleaning
dropped support for legacy table
2021-03-27 10:11:31 +01:00
Martin Diehl 111a1a76c6 cleaning 2021-03-27 07:35:49 +01:00
Martin Diehl 9fd244d8a0 cleaning 2021-03-26 20:59:49 +01:00
Martin Diehl 3e8bcd3225 cleaning examples, using consistent names
- examples in repository should only show the most basic steps
- MSC.Marc, marc => Marc
2021-03-26 09:27:49 +01:00
Martin Diehl 9e9eb391ba handle floating point errors 2021-03-25 22:33:14 +01:00
Martin Diehl a72e2db678 Merge branch 'development' into output-rename 2021-03-25 21:03:20 +01:00
Philip Eisenlohr 3d4590a522 Merge branch 'citation-style' into development 2021-03-25 14:39:44 -04:00
Philip Eisenlohr 0e57135239 [skip ci] dx.doi.org --> doi.org 2021-03-25 14:33:08 -04:00
Martin Diehl 3b392281e4 consistent naming in HDF5 output 2021-03-25 19:22:59 +01:00
Martin Diehl fe0cd8e5e2 transparently handle orientations/rotations 2021-03-25 15:30:31 +01:00
Martin Diehl 1ff6a09746 tests/specifications 2021-03-23 18:51:21 +01:00
Martin Diehl 572c3204d0 let the computer do the work 2021-03-23 14:28:56 +01:00
Martin Diehl e0e088eaa8 EBSD dataset for testing
use only non-segmented data. Automatically fall back to numeric phase
names if cell_ensemble_data is not found
2021-03-23 13:42:04 +01:00
Martin Diehl 549b849730 better readable 2021-03-23 12:05:08 +01:00
Martin Diehl 926b5c657d material_add can do expansion 2021-03-23 12:01:35 +01:00
Vitesh Shah 005fde2504 homogenization in material was missing 2021-03-23 11:48:35 +01:00
Martin Diehl 7012099d0c substituted broken link 2021-03-20 14:34:14 +01:00
Martin Diehl 1c3d1ee0f2 documented 2021-03-20 13:37:06 +01:00
Martin Diehl 394fda5f37 improving import from DREAM.3D
- no duplicated entries even for non-segmented data
- using phase labels from file
- material.yaml: Dummy homogenization and phase
- tests to ensure correct order and match between Grid and
  ConfigMaterial
2021-03-20 12:56:18 +01:00
Martin Diehl cdcedd0d44 autodetect base group 2021-03-20 07:26:07 +01:00
Martin Diehl 35c5bfcc45 reference files for DREAM.3D operations
will be used for the configuration of material.yaml and grid (using
symbolic links)
2021-03-19 11:45:04 +01:00
Sharan Roongta fc172921fb unified citation style continued 2021-03-19 10:41:47 +01:00
Martin Diehl 07d79ef4ba unifying style 2021-03-17 11:25:21 +01:00
Martin Diehl ec28fd8a73 polishing 2021-03-12 09:23:05 +01:00
Martin Diehl 3b27c64709 Merge remote-tracking branch 'origin/development' into config_from_dream3D 2021-03-12 08:11:54 +01:00
Philip Eisenlohr e2d4ab427e explicit path joining with "/" in _result; updated cpTi CRSS 2021-03-09 22:02:49 -05:00
Philip Eisenlohr a26e586b14 More general 'delete' (accepts iterables) and backports of '|' and '|=' for union/add.
'|=' would work for python 3.9 without extra code, but '|' unfortunately casts 'damask.Config' (subclass of 'dict') to a 'dict'.
2021-03-09 19:15:15 +00:00
Philip Eisenlohr 4208c4e713 adapted to Table.add being out-of-place 2021-03-08 11:04:49 -05:00
Philip Eisenlohr 7cbc69a4ca added "Returns" to help 2021-03-08 11:02:27 -05:00
Philip Eisenlohr 109ad378c2 corrected help text of as_Rodrigues_vector 2021-03-02 16:26:18 +01:00
Franz Roters 7b89cb41f9 Merge branch 'dislotwin-correction' into 'development'
dislotwin-correction

See merge request damask/DAMASK!347
2021-02-28 19:45:34 +00:00
Philip Eisenlohr 464c62e7e7 abandoned integer aliases for projection directions 2021-02-28 12:47:13 +01:00
Philip Eisenlohr 175d724ded added keepdims=False option to project_stereographic 2021-02-27 18:38:40 -05:00
Philip Eisenlohr ea763fd941 generalized stereographic projection to cope with all three directions (x,y,Z) 2021-02-27 11:15:01 -05:00
Martin Diehl bf223e8e00 helpful reporting in case of errors 2021-02-26 06:35:42 +01:00
Philip Eisenlohr 1d62341811 Fixed missing second-to-last entry in representation list. Polished help texts. 2021-02-26 03:20:28 +01:00
Sharan Roongta c0e488881e converted two examples to yaml 2021-02-24 20:13:55 +01:00
Philip Eisenlohr 2549d7a05a [skip ci] removed debug print statement 2021-02-24 15:50:06 +01:00
Philip Eisenlohr 2dea705fa9 polishing/shortening 2021-02-23 19:01:10 -05:00
Philip Eisenlohr 0b08b3d233 expanded help texts 2021-02-23 18:54:55 -05:00
Philip Eisenlohr dcc42204ec expanded help on material_add 2021-02-23 18:40:32 -05:00
Philip Eisenlohr 69316f186b fixed ConfigMaterial.from_table; 2D grid.from_table now acceptable 2021-02-23 11:50:13 -05:00
Philip Eisenlohr 4a00254dba shortened material_add and allow for multi-constituent; broken from_table... 2021-02-22 22:47:08 -05:00
Martin Diehl 0461c404f7 numpy uses __array__ for casting
avoids infinite loop of __init__, __getitem__, and shape. Found on
8cf07f6113
2021-02-22 18:52:06 +01:00
Martin Diehl 5517be5078 warn the caller of deprecated functions 2021-02-22 08:49:44 +01:00
Martin Diehl 67f0ab2ce8 silence deprecation warning 2021-02-22 08:46:28 +01:00
Martin Diehl b00b4bb0ad more general handling of precision
Anaconda on windows does not have np.float128 defined, but aliases
should work
https://numpy.org/devdocs/user/basics.types.html
2021-02-19 17:03:41 +01:00
Martin Diehl f5f993435b make intention clear 2021-02-19 16:34:28 +01:00
Martin Diehl ab9661d951 don't see how ':=' should help here 2021-02-19 07:04:34 +01:00
Martin Diehl 7c6ce525a3 ask for minimum version 2021-02-19 06:51:32 +01:00
Philip Eisenlohr f609b61157 Merge branch 'development' into account-for-floating-point-precision-in-orientation 2021-02-15 16:26:25 -05:00
Philip Eisenlohr 6bbd55d967 exchanged c for x in from_cubochoric 2021-02-15 16:25:36 -05:00
Philip Eisenlohr 002cfbd085 Merge branch 'account-for-floating-point-precision-in-orientation' into 'development'
ensures that at least one orientation in the FZ is found

See merge request damask/DAMASK!337
2021-02-15 20:53:37 +00:00
Philip Eisenlohr 89e8ca4535 renamed and shortened _separate_arguments() 2021-02-15 11:22:42 -05:00
Sharan Roongta 099cd90890 Merge remote-tracking branch 'origin/development' into python-improvements 2021-02-13 16:51:29 +01:00
Martin Diehl fe63adcca4 mimic python error message and ensure that error is raised 2021-02-12 18:20:39 +01:00
Sharan Roongta 9e8a243d6f avoid name conflict with lattice parameter 'c' 2021-02-12 12:15:08 +01:00
Sharan Roongta f1b8978e21 accept variables that will be used
**kwargs allowed the use of extraneous arguments
2021-02-12 11:24:12 +01:00
Martin Diehl 958936c449 Merge branch 'development' into polishing-for-release 2021-02-11 21:59:59 +01:00
Martin Diehl e8fae6b2a7 simplified 2021-02-11 21:56:53 +01:00
Martin Diehl 4e31862f0f avoid repetition 2021-02-10 18:35:13 +01:00
Martin Diehl 6895ef6b18 always write LF line endings
small pitfall: I windows users use a filehandle that results from a call
to open() without the newline option, they get still CRLF line endings
2021-02-10 10:03:35 +01:00
Martin Diehl 4bcbcb34d0 ensures that at least one orientation in the FZ is found 2021-02-09 23:58:00 +01:00
Martin Diehl 869307c5ec temperature not needed for pure mechanics
would also require to define thermal homogenization
2021-02-08 22:56:37 +01:00
Sharan Roongta cab5a5cec7 homogenization 'none' name misleading. 2021-02-04 15:37:40 +01:00
Sharan Roongta 14ce127dc4 fraction --> v 2021-02-04 13:46:01 +01:00
Martin Diehl 051e3ed0ae not needed anymore 2021-02-02 12:26:08 +01:00
Martin Diehl 0f6094890a simplified
damask.environment does not offer any advantage over os.environ for
variables. After 'root_dir' was removed, the whole module became
obsolete
2021-01-15 12:14:05 +01:00
Martin Diehl 37de561938 shell variables are more robust
they will also work if Fortran and python code are installed in
different locations.
2021-01-13 18:53:16 +01:00
Martin Diehl d76543f759 better name 2021-01-13 14:57:58 +01:00
Martin Diehl a7d998dd48 standard name 2021-01-13 14:53:50 +01:00
Martin Diehl 4c35da8627 simplified 2021-01-13 11:33:28 +01:00
Martin Diehl 196902948f simplified 2021-01-13 09:54:04 +01:00
Martin Diehl f4247e0f35 simpler (and scipy compatible) 2021-01-13 09:35:42 +01:00
Philip Eisenlohr 2d6e6a2370 Rotation composition uses "*"; application of Rotation to object uses "@"; "apply()" works on both 2021-01-12 18:57:33 -05:00
Vitesh Shah c3c4b05c01 handling point based data enabled 2021-01-12 13:01:11 +01:00
Vitesh Shah 6bffb91951 Added example 2021-01-11 15:16:46 +01:00
Vitesh Shah 6c367ec010 conform to docstring conventions 2021-01-11 15:05:48 +01:00
Vitesh Shah 2951617e28 able to take phaseID into account 2021-01-11 15:02:15 +01:00
Vitesh Shah dbab3c3a83 dream3D has an extra row at start for grain based data 2021-01-11 14:21:56 +01:00
Vitesh Shah 028d47034d conversion from dream3D for single phase materials 2021-01-11 13:31:08 +01:00
Philip Eisenlohr f0351e403a removed duplicate test 2021-01-07 11:01:15 -05:00
Philip Eisenlohr bde66d85fc Merge branch 'development' into python-improvements 2021-01-07 10:58:33 -05:00
Philip Eisenlohr 94cfe28128 polishing help; Rotation.apply(Rotation) now acceptable. 2021-01-06 18:03:10 -05:00
Martin Diehl acbb564afc restored functionalitity for adding list.
got accidently lost
2021-01-04 07:23:14 +01:00
Martin Diehl d8b4b7e0f5 != and == work componentwise 2021-01-03 21:52:19 +01:00
Martin Diehl f48a446353 compatible with scipy.spatial.transform.Rotation
also introduced inplace variants and '/' as multiplicative inverse of
'*'
2021-01-03 16:08:22 +01:00
Martin Diehl 98723cb0ed need to handle special case of Re() = 0
ensuring that the real part is positive seems to be a good idea on first
sight, but it would be easier to simply acknowledge that qu = -qu
2021-01-03 15:50:15 +01:00
Martin Diehl 80b8693a66 avoid adding to existing data, i.e. when reading a file 2021-01-03 12:10:39 +01:00
Martin Diehl 5f1399acc3 consistent behavior with other classes
python dictionary operates in-place, so wrappers for out-of-place
behavior let it use like the other DAMASK classes
2021-01-03 12:09:21 +01:00
Martin Diehl 9a278daa3f copy not needed
YAML writer does not write out references anymore
2021-01-03 12:07:02 +01:00
Martin Diehl 35ca1ffb0a consistent copy functionality 2021-01-03 12:03:40 +01:00
Martin Diehl 6fe1ff8e39 fixed test for rodrigues parametrization
for angle close to 180deg, the sign of the axis does not matter
2021-01-03 11:50:45 +01:00
Philip Eisenlohr da62daf15d added test for appending rotation lists; better check for type==list 2020-12-28 12:26:09 -05:00
Philip Eisenlohr 4796afdd92 fix for broken representation of no-rotation orientations and averaging weights 2020-12-28 12:10:21 -05:00
Philip Eisenlohr d8b57680ec raise NotImplemented when using R*b instead of R@b 2020-12-21 15:47:18 -05:00
Sharan Roongta 6cc78cb41e Merge branch 'misc-improvements' into 'development'
Misc improvements

See merge request damask/DAMASK!302
2020-12-18 15:19:04 +01:00
Martin Diehl 35f9861818 Fortran standard is 2018
will not work for older compilers
2020-12-18 15:19:04 +01:00
Martin Diehl 5fb0e4908b Examples reflect actual behavior 2020-12-18 07:09:05 +01:00
Philip Eisenlohr 403ac693da need to pass init argument to dict superclass 2020-12-17 18:08:55 -05:00
Philip Eisenlohr e11be7e600 preinitialize a ConfigMaterial object with 'constituents','homogenization','phase' keys 2020-12-17 10:49:33 -05:00
Martin Diehl 2dd520b4a2 P_aim should be independent from P_av
P_av is not defined after restart or cutback. Restart with change of
load case is probably still an issue
2020-12-15 08:06:50 +01:00
Martin Diehl aad123f41b Merge branch 'table-getitem' into development 2020-12-12 19:58:42 +01:00
Philip Eisenlohr 36e4042f0b removed "where" method from Table class 2020-12-11 19:31:19 -05:00
Martin Diehl 2e28bc127a better message in case that GUI is not possible 2020-12-10 23:44:54 +01:00
Martin Diehl a881e6e57a Merge remote-tracking branch 'origin/development' into misc-improvements 2020-12-10 23:41:59 +01:00
Martin Diehl 32c2de6b91 Ensuring regular spacing for grid 2020-12-10 22:47:30 +01:00
Martin Diehl 4286fc3b82 Merge branch 'development' into misc-improvements 2020-12-10 20:21:00 +01:00
Martin Diehl 9b6f5ba9c6 Merge branch 'development' into compressed-hdf5 2020-12-10 00:23:22 +01:00
Martin Diehl de1708b20a missing renames + better help 2020-12-08 00:36:41 +01:00
Martin Diehl 78192ef3fd clearer naming + better comments, thanks to @p.eisenlohr 2020-12-07 17:49:37 +01:00
Martin Diehl 429b84004d more filters
- shuffle: significanlty better compression
- Fletcher32: checksum to detect errors

computational overhead is very small
2020-12-06 19:57:00 +01:00
Martin Diehl 52e3fb50bc compress.
Datasets are chunked along first timension. Chunk size (1MB for real) is
probably not optimal
2020-12-06 11:44:52 +01:00
Martin Diehl 000de75617 write orientation as plain array, not derived type 2020-12-06 08:36:16 +01:00
Martin Diehl c80e1c5420 less confusing in the standard case, more helpful in the special case 2020-12-05 10:47:42 +01:00
Martin Diehl ed286ee09f Merge branch 'rename-grid-2' into misc-improvements 2020-12-05 09:50:46 +01:00
Martin Diehl 171d642dbd rename: Geom -> Grid 2020-12-04 07:50:47 +01:00
Martin Diehl 0fdefa5e78 renames:
after the rename of "grid" to "cell", the name cell should not be used
for the coordinates of the cell centers. In agreement with the names
x_p/u_p for point positions/displacements, now the "point" is used to
refer to the materialpoints (i.e. cell centers)

Additionally, "_node"/"_point" are now suffixes to
"coordinates"/"displacements".

Finally, "coords" is renamed to "coordinates"
2020-12-03 23:59:37 +01:00
Martin Diehl ac0a20696c rename: grid -> cells 2020-12-03 22:16:34 +01:00
Philip Eisenlohr ccf1a849fa Merge branch 'ShowGrainBoundaries' into 'development'
Show grain boundaries

See merge request damask/DAMASK!297
2020-12-03 17:13:15 +01:00
Philip Eisenlohr 4877334986 added getitem and where functionality to Table 2020-12-02 19:25:54 -05:00
Philip Eisenlohr 97df1ab9b3 reinstated write functionality 2020-12-02 13:04:56 -05:00
Martin Diehl d3a5979d25 meaningful result 2020-12-02 14:45:47 +01:00
Martin Diehl c880052250 avoid evil eval 2020-12-02 14:37:44 +01:00
Martin Diehl aa8f30d746 Merge branch 'development' into ShowGrainBoundaries 2020-12-02 12:50:04 +01:00
Martin Diehl 1c2cdbd5a1 support of all standard numpy types
+ tests
2020-11-30 12:33:21 +01:00
Martin Diehl 813ef927c4 consistent with "save_XDMF" (capitalized) 2020-11-30 09:28:46 +01:00
Martin Diehl 4d2bf37193 Merge branch 'lattice-structure-rename' into ShowGrainBoundaries 2020-11-29 20:53:58 +01:00
Martin Diehl 1d05edd7b3 fixes:
- need to get crystal structure as attribute in test (generic function
  was removed, because the crystal structure is in general not the same
  over the whole domain)
- consistent sorting of attributes
2020-11-29 09:06:47 +01:00
Martin Diehl f48f5cb0e8 bugfix/better readable 2020-11-29 08:58:48 +01:00
Martin Diehl c712332e87 using consistent names for Bravais lattice in Fortran and Python 2020-11-28 22:38:12 +01:00
Martin Diehl a8da1e5ed9 Paraview 5.9 supports datasets of arbitrary length in XDMF 2020-11-27 22:57:15 +01:00
Martin Diehl 3c1f1af009 more then one direction in file 2020-11-27 20:16:06 +01:00
f.basile c2be41b9f6 remove import vtk because unused 2020-11-25 12:53:29 +01:00
f.basile 31df4c04c8 added test 2020-11-25 12:51:52 +01:00
f.basile eb085958f8 polishing 2020-11-25 11:32:07 +01:00
f.basile cd58278a01 returns vtk object 2020-11-25 10:39:58 +01:00
f.basile 7abc32b09c alternative for if d_s== , not sure it improves the previous 2020-11-24 19:59:46 +01:00
f.basile c8b1f8d9f1 shortest possible way i found to include directions in an elegant way 2020-11-24 17:49:58 +01:00
Francisco Jose Gallardo Basile 030062d293 Merge branch 'unit-in-vtk' into 'development'
Unit in vtk

See merge request damask/DAMASK!288
2020-11-24 16:21:01 +01:00
Martin Diehl 7fa98ef084 DEcode bytes into str 2020-11-23 20:17:04 +01:00
Martin Diehl 5ab2847b36 polishing 2020-11-23 20:06:34 +01:00
Martin Diehl cbe8160e13 Merge remote-tracking branch 'origin/development' into vector-mechanics 2020-11-23 19:55:34 +01:00
Martin Diehl f85dba2835 small polishing 2020-11-23 19:43:19 +01:00
Martin Diehl 287d44c5df Merge remote-tracking branch 'origin/development' into unit-in-vtk 2020-11-23 19:19:02 +01:00
Franz Roters 7356330cf6 Merge remote-tracking branch 'origin/new_names_result' into development 2020-11-23 11:49:15 +01:00
Sharan Roongta c58f9f23a1 read old version while resolving merge conflicts 2020-11-22 14:32:32 +01:00
Sharan Roongta 24fabdec22 Merge branch 'development' into vector-mechanics 2020-11-22 12:02:29 +01:00
Martin Diehl 2de3a6a205 fits better to stretch_left/right 2020-11-19 22:46:52 +01:00
Martin Diehl a87596cefc return rotation type (ensures proper rotation) 2020-11-19 22:36:19 +01:00
Philip Eisenlohr 662a033d91 adapted to VTR geom files 2020-11-19 14:26:15 -05:00
Philip Eisenlohr a82b1adc14 Merge branch 'geom-load-ASCII-autoshift' of magit1.mpie.de:damask/DAMASK into geom-load-ASCII-autoshift 2020-11-19 12:24:09 -05:00
Martin Diehl a4b5c2a537 shorter (but still self-explanatory) name 2020-11-19 15:20:44 +01:00
Martin Diehl 6e5cb60132 general tensor functionality 2020-11-19 15:16:01 +01:00
Martin Diehl 894a8de9f9 avoid name clash: as_Rodrigues_vector(vector = ...) 2020-11-19 14:31:14 +01:00
Martin Diehl 1c07152b96 sorted alphabetically 2020-11-19 14:05:59 +01:00
Martin Diehl 20d0732b2e output unit to XDMF/vtk 2020-11-19 13:45:40 +01:00
Martin Diehl af3a87b197 adjust to new auto-convert of 1-based geom files 2020-11-19 11:34:55 +01:00
Martin Diehl 5a5dd24687 removed aliases 2020-11-19 10:50:14 +01:00
Martin Diehl 903c185ee6 distinguish 'file not found' and 'invalid file' 2020-11-19 10:39:41 +01:00
Martin Diehl c74e57f225 vtk error handling is not very helpful 2020-11-19 09:59:39 +01:00
Martin Diehl 96826dca73 Geom.load_ASCII now auto-shifts material indices 2020-11-19 09:40:19 +01:00
Philip Eisenlohr cb22c34db2 Geom.load_ASCII now auto-shifts material indices 2020-11-18 18:25:25 -05:00
Martin Diehl b9b26cb2cc output results for all constituents 2020-11-18 23:36:02 +01:00
Martin Diehl 5359e05fd3 always merge homogenization results 2020-11-18 23:17:12 +01:00
Martin Diehl b885e38b3f better readable 2020-11-18 22:12:23 +01:00
Martin Diehl 4bf802a28e fixed documentation 2020-11-18 21:51:37 +01:00
Martin Diehl 843d7d8cac Merge remote-tracking branch 'origin/development' into new_names_result 2020-11-18 21:37:52 +01:00
Martin Diehl 7352431143 vectorized 2020-11-18 20:10:04 +01:00
Martin Diehl 564ee6c96a make uvw/hkl keyword-only arguments
avoid to prefer one over the other, since they are mutually exclusive
2020-11-18 16:45:53 +01:00
Martin Diehl c60d9cde2a merge 'mechanics' datasets
was like that for 'generic'. Needs detailed discussion in future
2020-11-18 15:52:55 +01:00
Martin Diehl 838a4ea592 [skip ci] fix for scalar values 2020-11-18 14:57:32 +01:00
Martin Diehl 870c0f7aca removed aliases
required bump of DADF5 version
2020-11-18 14:53:11 +01:00
Martin Diehl 1c9028d0b1 simplified 2020-11-18 14:01:52 +01:00
Martin Diehl 89c748fdf1 Merge remote-tracking branch 'origin/development' into vector-mechanics 2020-11-18 13:55:05 +01:00
Martin Diehl 9a1e8e3c38 for the transition period 2020-11-18 13:28:53 +01:00
f.basile 7291b95055 avoid pyflake for blank line 6 final 2020-11-18 12:29:10 +01:00
f.basile ee5822b721 avoid pyflake for blank line 5 2020-11-18 12:25:08 +01:00
f.basile 4dbfad74cb avoid pyflake for blank line 4 2020-11-18 12:24:17 +01:00
f.basile eda3837874 avoid pyflake for blank line 3 2020-11-18 12:21:09 +01:00
f.basile c681101136 avoid pyflake for blank line 2 2020-11-18 12:19:47 +01:00
f.basile 33aa888fc7 avoid pyflake for blank line 2020-11-18 12:17:05 +01:00
f.basile e8f82d52cc fix bug 2020-11-18 12:16:08 +01:00
f.basile be206d28b3 vectorized and more options 2020-11-18 12:14:12 +01:00
Martin Diehl 6bedd84759 self-explanatory names 2020-11-18 08:15:04 +01:00
Martin Diehl cd8434b991 Merge remote-tracking branch 'origin/development' into python-improvements 2020-11-16 22:57:49 +01:00
Sharan Roongta c16ad845bc Merge branch 'modernize-testing' into 'development'
Modernize testing

See merge request damask/DAMASK!280
2020-11-16 20:10:38 +01:00
Martin Diehl a8fec922d5 show name in title 2020-11-16 17:25:13 +01:00
Philip Eisenlohr 5a53f8743b added to docstring 2020-11-16 10:44:33 -05:00
Philip Eisenlohr fa25a13264 fixed typo 2020-11-16 10:34:49 -05:00
Philip Eisenlohr de20e6b35d code shortening; list_predefined() --> property "predefined" 2020-11-16 10:23:26 -05:00
Martin Diehl 5ebde607a2 einsum simplifications 2020-11-16 07:43:20 +01:00
Martin Diehl 9b9d83d93c adding '_tensor' not needed 2020-11-16 01:15:39 +01:00
Martin Diehl b893967b68 more systematic names and extended docstrings 2020-11-16 01:02:36 +01:00
Martin Diehl 6f81f5278d separating general tensor math from mechanics operations 2020-11-16 00:13:34 +01:00
Martin Diehl b3955573f6 using new tests 2020-11-15 22:39:47 +01:00
Martin Diehl fd8743af5e clearly distinguish seeds for tessellation and seeds for RNG 2020-11-15 13:49:17 +01:00
Martin Diehl 1541ac0add more intuitive use 2020-11-15 12:38:54 +01:00
Martin Diehl 01d84c1477 testing also functions with graphical output 2020-11-15 11:49:52 +01:00
Martin Diehl 15af12bbb4 __ne__ is automatically set to !__eq__, __neq__ has no special meaning 2020-11-15 11:38:26 +01:00
Martin Diehl 51e5dda702 documentation + consistent string formatting 2020-11-15 10:54:20 +01:00
Martin Diehl 05c1007add documentation improvments + acceptance of lists
example code at respective function, no space in 'or' variable names
(sphinx cannot handle this)
2020-11-15 10:31:01 +01:00
Martin Diehl 1eb9d494c7 not specific to Orientation class 2020-11-14 19:51:15 +01:00
Martin Diehl 149fce0a7e increase test coverage 2020-11-14 19:42:52 +01:00
Martin Diehl 764aacf2a1 increasing test coverage 2020-11-14 17:54:47 +01:00
Martin Diehl 9eb4e2d0de corrected handling of scalar/array arguments
+ more tests
+ corrected handling of numpy types
2020-11-14 17:26:38 +01:00
Martin Diehl 6529613726 Merge remote-tracking branch 'origin/development' into vector-mechanics 2020-11-14 15:10:52 +01:00
Martin Diehl bacfe9f462 Merge branch 'fix-add_primitive-rotation' into 'development'
Avoids coordinate normalization _before_ rotation

See merge request damask/DAMASK!276
2020-11-13 14:11:54 +01:00
Martin Diehl 7b7b449877 testing fixed behavior 2020-11-13 06:50:57 +01:00
Philip Eisenlohr b3e8b85d25 normalizing coordinates _before_ rotation causes wrong primitive shape for non-cubic VEs 2020-11-12 18:34:29 -05:00
Martin Diehl e15678e7a4 consistent handling of comments 2020-11-12 21:31:09 +01:00
Martin Diehl 8429a9d695 Merge remote-tracking branch 'origin/development' into modularize-mech 2020-11-11 07:04:23 +01:00
Martin Diehl e90c20ccd6 Merge remote-tracking branch 'origin/geom-attributes-as-checked-properties' into development 2020-11-10 14:54:40 +01:00
Martin Diehl 5926f84851 WIP: refactoring Orientation=Symmetry+Rotation, Lattice=subclass of Sym, and Crystal=Lattice+Rotation 2020-11-09 21:20:56 +01:00
Philip Eisenlohr f105631015 redefined attributes material,size,origin,comments as properties; enhanced help/descriptions 2020-11-08 12:11:30 -05:00
Sharan Roongta 287d56fc3d consistent with new output names 2020-11-08 16:01:11 +01:00
Sharan Roongta 7d4163e8a9 new format of material.yaml 2020-11-08 15:57:06 +01:00
Martin Diehl 03a68248b5 polishing 2020-11-06 13:25:00 +01:00
Martin Diehl bbaeeb02da Merge remote-tracking branch 'origin/misc-improvements' into h5py3 2020-11-06 13:19:47 +01:00
Martin Diehl 58a5d2666c ensure correct Mises mode 2020-11-06 00:10:46 +01:00
Martin Diehl 4ccd068d3b catch error in case of exisiting dataset 2020-11-05 23:00:56 +01:00
Martin Diehl e649fb195f update to use variable-length strings 2020-11-05 22:34:41 +01:00
Martin Diehl 30938a8278 correct order (brackets) 2020-11-05 21:38:00 +01:00
Martin Diehl e26bb962c8 encode from str to bytes 2020-11-05 21:19:49 +01:00
Martin Diehl 68d384bbdd bugfix: missing rename 2020-11-05 21:14:02 +01:00
Martin Diehl a416f5ed5b encode/decode for h5py3 not needed anymore
attribute values with variable-length strings will be interpreted as
str, not bytes
2020-11-05 16:13:29 +01:00
Martin Diehl 708c83dcf1 polishing 2020-11-05 07:15:59 +01:00
Martin Diehl 1fcf9cb721 don't compute silently the wrong von Mises kind
and allow the user to set it explicitly
2020-11-05 05:48:12 +01:00
Martin Diehl 7341b9830a h5py v 3.x handles strings differently 2020-11-05 05:39:45 +01:00
Martin Diehl 01af348cd9 symmetric behavior load/save
default name reflects fact that material.yaml has a fixed name
2020-11-04 21:14:08 +01:00
Martin Diehl ae959b9cc2 allow '.' in filenames 2020-11-04 18:08:04 +01:00
Philip Eisenlohr eaceb16203 added +1 to nanmax(material) as auto offset, now consistent with help and intention... 2020-11-03 17:43:57 -05:00
Sharan Roongta 11f1f4f555 Merge branch 'modernize-testing' into development 2020-11-03 12:49:19 +01:00
Philip Eisenlohr 2867050397 corrected shortened test logic 2020-11-02 18:31:37 -05:00
Philip Eisenlohr 4fa44d388d shortened test for monotonous increase of material index after sorting 2020-11-02 18:21:51 -05:00
Philip Eisenlohr 4d4278e6dd shortened tainted_neighborhood logic 2020-11-02 18:20:52 -05:00
Martin Diehl cf958d32b4 Merge branch 'development' into vector-mechanics 2020-11-02 15:23:11 +01:00
Martin Diehl be47c744d8 Merge branch 'development' into geom-sort 2020-11-02 12:26:31 +01:00
Martin Diehl 212ed62b19 pytest-based tests
removed unused functionality from deprecated python library modules
2020-11-02 12:07:16 +01:00
Martin Diehl 086b215d94 Merge branch 'test-new-dir' into development 2020-11-01 19:29:52 +01:00
Martin Diehl cf18954db9 hint for future improvement 2020-11-01 19:20:52 +01:00
Martin Diehl 7059e6af6e might not be in the last line 2020-11-01 18:34:52 +01:00
Martin Diehl 946da2379b Merge remote-tracking branch 'origin/development' into modernize-testing 2020-11-01 10:06:52 +01:00
Martin Diehl 0a3598c338 Merge branch 'simplify-from_table' into development 2020-10-31 22:34:17 +01:00
Martin Diehl 0ebb9b611d functionality to sort material id
convenient for layered materials
2020-10-31 20:46:21 +01:00
Martin Diehl 67f69fc8a5 data is consecutive 2020-10-31 17:23:58 +01:00
Martin Diehl 8224122bb9 more user friendly error handling 2020-10-31 13:16:25 +01:00
Martin Diehl cf740a279e combine constant with varying data 2020-10-31 09:56:43 +01:00
Martin Diehl aecf2f539e allow one homogenization
quite useless ...
2020-10-30 22:26:02 +01:00
Martin Diehl c29e3650f3 don't squeeze into scalar 2020-10-30 22:24:27 +01:00
Franz Roters 392803e47d Merge remote-tracking branch 'origin/Marc_version_names' into development 2020-10-30 17:49:18 +01:00
Philip Eisenlohr 46e5023f8b Merge branch 'geom-improvements' into 'development'
Geom improvements

See merge request damask/DAMASK!264
2020-10-29 23:53:33 +01:00
Martin Diehl b2289e80b2 simplified 2020-10-29 20:09:13 +01:00
Martin Diehl 0e499eedf3 correct rounding/clearer logic 2020-10-29 18:35:22 +01:00
Martin Diehl 4b700d367e improved test 2020-10-29 17:59:44 +01:00
Vitesh Shah 904c338b13 Reflect version underscore of installation files 2020-10-29 15:21:40 +01:00
Martin Diehl 999cf53c07 tests+fixes 2020-10-29 07:42:41 +01:00
Martin Diehl 3be0c462a8 explicit is better then implicit:
user should sort Table according to coordinates to create geometry. This
allows to have consistent behavior for from_table in Geom and
ConfigMaterial. We always ensure to keep the order
2020-10-29 07:25:16 +01:00
Martin Diehl 1b2cd6caf6 documentation was misleading 2020-10-28 21:53:46 +01:00
Martin Diehl 4ff99a7af4 more logical layout 2020-10-28 21:51:20 +01:00
Martin Diehl 855bf124d3 faster
https://stackoverflow.com/questions/16992713
2020-10-28 16:53:16 +01:00
Sharan Roongta 21f095c9d8 Merge branch 'flexible-yaml-dump' into development 2020-10-28 16:19:17 +01:00
Martin Diehl 98e0ef3881 no loops
taken from https://stackoverflow.com/questions/3403973
2020-10-28 13:38:20 +01:00
Martin Diehl d72343c865 keep order of unique values found in table 2020-10-28 11:56:28 +01:00
Martin Diehl b38a498197 fast 2020-10-28 09:43:20 +01:00
Martin Diehl 5f03e8cf8f 0-based material indices 2020-10-28 09:31:55 +01:00
Martin Diehl a5a127b787 new tests+ updated results 2020-10-27 16:46:08 +01:00
Martin Diehl 0804e6ee74 pythonic names 2020-10-27 13:50:47 +01:00
Martin Diehl fa67a2ddf8 cell_coordinates is now a property 2020-10-27 13:35:14 +01:00
Martin Diehl 201a62d7c9 easier visualization if verts have a point-cell 2020-10-27 13:19:53 +01:00
Martin Diehl 4dd387d7f5 compatibility with old pyyaml + test for numpy 2020-10-27 06:39:58 +01:00
Martin Diehl 4159ae5f3d keep order of keys 2020-10-26 21:44:38 +01:00
Martin Diehl 5834d95012 support for more types
- allow to directly use Config and its sublasses (cast to dict)
- convert numpy arrays
2020-10-26 21:38:24 +01:00
f.basile 802e09be4f python/damask/_geom.py exceeds line length limit (maximum line length 143 > 132) 2020-10-26 15:11:06 +01:00
f.basile 2715e7b1a7 a bit more vectorized 2020-10-26 15:09:32 +01:00
f.basile 1cbfa866d2 get rid of scalar variables 2020-10-23 16:23:36 +02:00
Vitesh Shah bd67296e8d MARC_VERSION as MSCVERSION 2020-10-22 11:50:13 +02:00
f.basile 7fa31a8a1b solving imported but unused pyflake 2020-10-19 12:55:35 +02:00
f.basile 4c22efc6ce added show GB 2020-10-19 12:52:10 +02:00
Martin Diehl bac7ace413 Merge remote-tracking branch 'origin/general-N_constituents' into vtr-only 2020-10-13 17:39:19 +02:00
Martin Diehl 86d91baf90 0-offset for geom 2020-10-10 10:36:15 +02:00
Martin Diehl ffabeacbcb removing functionality related to deprecated 'geom' format 2020-10-10 09:41:11 +02:00
Martin Diehl 00e2128e03 don't test ASCII functionality
vtr writing in Geom class is alwas serial, no need to wait
2020-10-10 09:02:25 +02:00
Martin Diehl 06d11a72da better fitting name
load implies a more direct takeover.
2020-10-09 19:19:05 +02:00
Martin Diehl 57180952ec typo 2020-10-09 19:05:05 +02:00
Martin Diehl 347c88cbb6 documented 2020-10-09 14:24:29 +02:00
Martin Diehl 75401dd280 generate configuration from table 2020-10-09 07:45:20 +02:00
Martin Diehl 0c68d293b6 N_constituents is now a general homog property 2020-10-09 07:44:05 +02:00
Martin Diehl 6ecaaa31c9 fairly general function to generate material configuration 2020-10-08 22:07:26 +02:00
Martin Diehl 952ad4f8fe functionality for geom generation in python lib 2020-10-08 18:39:05 +02:00
Martin Diehl 3050471a2d avoid circular inclusion 2020-10-08 18:05:03 +02:00
Philip Eisenlohr 846cbdd2e4 Merge branch 'general-config' into 'development'
General config

See merge request damask/DAMASK!245
2020-10-08 00:48:16 +02:00
Martin Diehl 8d4adebea2 pyaml is now needed 2020-10-06 17:46:34 +02:00
Martin Diehl 3d49678e93 new names part 2 2020-10-02 17:51:33 +02:00
Martin Diehl 1b18cae46b adjusted to new names 2020-10-02 17:49:52 +02:00
Martin Diehl a04966582a Merge remote-tracking branch 'origin/development' into general-config 2020-10-02 14:54:16 +02:00
Martin Diehl 58229b8851 relaxed test conditions
even threshold between -.5 and +.5 can result in a single material.
2020-10-02 13:26:11 +02:00
Martin Diehl b29f22f513 documenting the actually available TMPS 2020-10-01 09:25:32 +02:00
Philip Eisenlohr a59e64a8e4 renamed TPMS and added more from additional references 2020-09-30 17:28:25 -04:00
Martin Diehl 33685bc493 allow user do control output style
(numerics.yaml looks strange otherwise)
2020-09-30 12:32:37 +02:00
Martin Diehl 5ad46ae021 completely tested 2020-09-30 09:05:23 +02:00
Martin Diehl fdfcb16d15 not needed 2020-09-30 08:16:12 +02:00
Martin Diehl bbed4f9c6e nice formatting
will be checked by pre-receive hook
2020-09-30 08:15:02 +02:00
Martin Diehl b383a4530e better name, subclassing for easy extension to load 2020-09-30 07:53:25 +02:00
Martin Diehl 54e4943353 get rid of shell scripts 2020-09-30 07:11:33 +02:00
Martin Diehl 76f07e4c1e tmp_path is preferred over tmpdir 2020-09-29 19:25:50 +02:00
Philip Eisenlohr 350f5eb66a improved from_ODF documentation 2020-09-29 12:55:00 -04:00
Philip Eisenlohr 31f86c28f4 [skip ci] added parameter description; shortened hybrid_IA pre-loop logic 2020-09-29 11:15:10 -04:00
Martin Diehl 8d204ea445 [skip ci] small simplification 2020-09-28 16:17:43 +02:00
Martin Diehl d2cfcdaca0 reference Data for ODF sampling (hybridIA) + skeleton of a test 2020-09-28 16:14:27 +02:00
Martin Diehl 95b85626d8 general hybridIA functionality 2020-09-28 07:40:43 +02:00
Martin Diehl 8ec1014134 Merge remote-tracking branch 'origin/development' into cleaning 2020-09-27 18:11:43 +02:00
Vitesh Shah e8e1960391 Consistency for docstrings 2020-09-26 18:02:25 +02:00
Vitesh Shah d0028b2eea Merge branch 'development' into fix-docstrings-for-sphinx 2020-09-26 17:56:42 +02:00
Martin Diehl 9e3506b8ef thorougly testing seeding functionality 2020-09-25 07:41:58 +02:00
Philip Eisenlohr e58cc4bfa0 removed substitute call for direct mapping; added seed from averaging of material ID cloud 2020-09-24 22:06:43 -04:00
Martin Diehl e8454c40c7 more tests 2020-09-24 22:59:31 +02:00
Martin Diehl 4960cf43d4 documented and tested 2020-09-24 21:43:04 +02:00
Martin Diehl e5b414419a Poisson disc for periodic situation 2020-09-24 21:26:16 +02:00
Martin Diehl ec23ab8b61 basic test for seeding 2020-09-24 21:06:26 +02:00
Martin Diehl b5ea04424b Merge remote-tracking branch 'origin/development' into seeds-module 2020-09-24 20:58:53 +02:00
Philip Eisenlohr 8c8db5b99f switched "Geom.materials" to "Geom.material" 2020-09-23 17:27:15 -04:00
Martin Diehl b995f34834 Merge branch 'development' into geom-fully-out-of-place 2020-09-23 22:50:20 +02:00
Martin Diehl 8c83566b71 suppress warning
we already handle the invalid FPE
2020-09-23 21:10:39 +02:00
Martin Diehl 9bce1ddc29 simplified 2020-09-23 20:48:34 +02:00
Franz Roters 3612b17295 corrected Sphinx warnings 2020-09-23 16:21:20 +02:00
Martin Diehl c85d27baec functionality for seed creation 2020-09-23 09:45:36 +02:00
Martin Diehl ae579d8baa allow to specify seed IDs explicitly 2020-09-23 09:28:00 +02:00
Sharan Roongta 5a64dd30e1 Merge branch 'development' into modernize-testing 2020-09-23 00:05:59 +02:00
Philip Eisenlohr 683161d479 Merge branch 'development' into geom-fully-out-of-place 2020-09-22 15:22:58 -04:00
Philip Eisenlohr 05835bacd3 removed set_X(), duplicate(), and .homogenization; renamed ".microstructure" to ".materials" 2020-09-22 14:49:28 -04:00
Martin Diehl 716a406361 Merge remote-tracking branch 'origin/master' into modernize-testing 2020-09-22 16:51:36 +02:00
Franz Roters 7801f527f2 Merge remote-tracking branch 'origin/load-save-X-no-suffix' into development 2020-09-22 14:57:39 +02:00
Martin Diehl 5ef761fb98 inform the user about missing items in material.yaml 2020-09-21 19:10:20 +02:00
Philip Eisenlohr 188905766f removed Geom.get_X() methods in favor of direct property access 2020-09-21 11:13:53 -04:00
Philip Eisenlohr ca2f3f9493 set_X and add_comments methods now default to out-of-place 2020-09-21 10:29:07 -04:00
Martin Diehl 7bdd44a3d9 consistent names:
default file operations: save/load, non-default save_xx/load_xx
2020-09-20 22:04:28 +02:00
Martin Diehl d33507866d statistically more valid test 2020-09-20 21:50:52 +02:00
Martin Diehl 6ab88aad2b default format for Table is ASCII
hence, renamed load_ASCII/save_ASCII to load/save
2020-09-20 20:45:06 +02:00
Martin Diehl 5895e74029 p is never above 1
1e-4 is quite low, usually we are far above. 1e-3 from https://docs.scipy.org/doc/scipy/reference/generated/scipy.stats.normaltest.html
is not too far away.
2020-09-20 19:13:54 +02:00
Philip Eisenlohr 5b0b0de6b4 assertion reports offense; fixed seeds for spherical and fiber 2020-09-20 12:22:41 -04:00
Philip Eisenlohr 3cc319ef08 removed debug print statement in test_util 2020-09-19 14:30:58 -04:00
Philip Eisenlohr 7cbd422ae3 fixed coprime error when encountering NaN 2020-09-19 13:38:32 -04:00
Martin Diehl 6f45203c98 first version of a pyaml based class for material configuration
pyaml is (again) actively maintained and the ruamel.pyaml API is
instable
2020-09-19 13:01:19 +02:00
Martin Diehl 0746a2f3a4 give visual feedback
in most tests, this is done manually
2020-09-19 08:33:15 +02:00
Martin Diehl c42511f101 small polishing 2020-09-18 16:32:59 +02:00
Martin Diehl f23b89f055 get rid of annoying warning during test 2020-09-18 16:30:22 +02:00
Martin Diehl c935ba1215 user friendly self reporting 2020-09-18 16:23:23 +02:00
Martin Diehl 1849ff0330 polishing 2020-09-18 15:03:51 +02:00
Martin Diehl e2cd3da295 remaning to_xx 2020-09-18 14:29:27 +02:00
Martin Diehl cdf3323774 Merge remote-tracking branch 'origin/development' into load-save-X 2020-09-18 14:21:43 +02:00
Martin Diehl ec7dbb4c9a do not store temp files 2020-09-18 14:21:30 +02:00
Franz Roters 190f8a82d4 Merge branch 'texture-components-in-rotation-class2' into 'development'
Texture components in rotation class2

See merge request damask/DAMASK!225
2020-09-18 13:31:42 +02:00
Vitesh ca689193f6 Merge branch 'new-random-style' into 'development'
new style for numpy random numbers

See merge request damask/DAMASK!224
2020-09-16 11:12:55 +02:00
Martin Diehl 70911b64ea Merge branch 'development' into texture-components-in-rotation-class2 2020-09-16 09:57:50 +02:00
Martin Diehl c71768a37a polishing 2020-09-16 06:33:17 +02:00
Philip Eisenlohr ed006d1a89 streamlined fiber/spherical component sampling 2020-09-15 19:12:30 -04:00
Philip Eisenlohr c6be6fe87f fixed spherical component sampling and testing 2020-09-15 18:40:05 -04:00
Philip Eisenlohr 82ed546ff7 Merge branch 'texture-components-in-rotation-class2' of magit1.mpie.de:damask/DAMASK into texture-components-in-rotation-class2 2020-09-15 18:14:19 -04:00
Philip Eisenlohr 0a34e342e4 fixed fiber component sampling and testing 2020-09-15 18:14:15 -04:00
Philip Eisenlohr d6378ec9bc shortened from_fiber_component algorithm 2020-09-15 16:34:19 -04:00
Martin Diehl ad2badd3be [skip ci] vectorized and simplified
based on Philips ideas. Test requires from_axis_angle fix
2020-09-15 22:13:28 +02:00
Martin Diehl 9e93e8b710 test for last commit 2020-09-15 19:59:03 +02:00
Philip Eisenlohr d02617c961 fixed normalization of multidimensional axes (from_Rodrigues, from_axis_angle) 2020-09-15 13:09:24 -04:00
Martin Diehl 3f823ca717 testing general case 2020-09-15 14:39:05 +02:00
Martin Diehl 18c38f1284 polishing 2020-09-15 13:49:44 +02:00
Martin Diehl 2a082b7983 methods for texture component calculations 2020-09-15 12:11:46 +02:00
Martin Diehl 82e41d92ce new style for numpy random numbers
https://numpy.org/doc/stable/reference/random/index.html?highlight=random#quick-start
https://albertcthomas.github.io/good-practices-random-number-generators/
2020-09-15 08:12:02 +02:00
Philip Eisenlohr 2114c51098 revert mistakenly made header length change in array-comparison 2020-09-15 01:47:26 -04:00
Philip Eisenlohr 96ad358f83 modified file reading/writing methods to load_X, save_X formalism 2020-09-15 01:14:05 -04:00
Martin Diehl b298962101 Merge branch 'development' into table-out-of-place-only 2020-09-14 08:06:44 +02:00
Martin Diehl f6758ecc28 table class operates out of place 2020-09-14 07:04:01 +02:00
Martin Diehl a5d5638e4a allow uncompressed files 2020-09-12 13:46:55 +02:00
Philip Eisenlohr 865c90d00b first check data type, then determine length of data... 2020-09-09 19:10:03 -04:00
Philip Eisenlohr 7d9a4c08ce Do not strictly require np.ndarrays for grid, size, or origin when not essential for functionality. 2020-09-10 00:59:40 +02:00
Philip Eisenlohr 9fb3fef4b0 changed British "normalise" to US "normalize" as we (should) follow US English everywhere else. 2020-09-08 10:39:31 -04:00
Philip Eisenlohr a4785ba562 modified file writing of geom and table to a general to_file() that takes a "format=" argument 2020-09-03 10:53:16 -04:00
Philip Eisenlohr d645849baf fixed remnant occurrences of .write() --> .to_file() 2020-09-02 11:32:40 -04:00
Philip Eisenlohr 6785062a10 Merge branch 'development' into 'vtk-to-file-method'
# Conflicts:
#   python/tests/test_VTK.py
2020-08-31 21:10:29 +02:00
Franz Roters 6986d20b32 Merge branch 'geom-out-of-place' into 'development'
Geom methods are now out-of-place, i.e. return an updated duplicate

See merge request damask/DAMASK!203
2020-08-31 12:39:01 +02:00
Martin Diehl 03b02ad641 typos/sentence 2020-08-29 16:06:10 +02:00
Martin Diehl c58693328e don't try to access folders that don't exist
this happened in the case when different types of output exist in
different phases, e.g.

Aluminum: generic, plastic, sources
Steel: generic, plastic

We are a little bit inconsistent because 'generic' and 'plastic' are
always created (even if empty) but 'sources' will only exist if it
contains output. In future, we should have only folders that actually
contain data
2020-08-28 12:45:41 +02:00
Franz Roters 9457435612 Merge branch 'polishing-for-release' into 'development'
Polishing for release

See merge request damask/DAMASK!206
2020-08-27 17:01:43 +02:00
Martin Diehl 0d5279863d avoid rounding errors related to rotation 2020-08-27 09:33:09 +02:00
Martin Diehl 94797f8325 ignore all kinds of FPE 2020-08-27 09:32:49 +02:00
Martin Diehl c5761831e2 more meaningful message
if add_xxx (Results) does not find matching datasets, inform the user
about this fact instead of saying
TypeError: object of type 'IMapUnorderedIterator' has no len()
2020-08-27 00:14:37 +02:00
Philip Eisenlohr c2191fd930 Make logic to mask (outside of) primitive more apparent (hopefully). 2020-08-27 00:06:52 +02:00
Martin Diehl 248ef8ef97 more tests
- invalid files
- scalar/array size,center,exponent for add_primitive
- rotation invariance for add primitive
2020-08-26 23:56:20 +02:00
Martin Diehl 229f6139c8 better user experience
- no meaningless warnings regarding floating point precision
- meaningful error message for invalid header
2020-08-26 23:54:56 +02:00
Philip Eisenlohr b9f1421c6b [skip ci] removed unnecessary line continuations "\" 2020-08-26 17:27:08 -04:00
Philip Eisenlohr 3f24d16603 renamed VTK.write() to VTK.to_file() 2020-08-26 16:15:15 -04:00
Philip Eisenlohr da46e5ea9a cannot use np.linalg.norm when dealing with exponent triple 2020-08-26 15:49:25 -04:00
Philip Eisenlohr 06b524d13e added 'iso' as possible lattice (with no symmetry) 2020-08-26 21:39:20 +02:00
Sharan Roongta 68c2908ba8 Merge branch 'rename-hdf5-output' into development 2020-08-26 12:34:56 +02:00
Martin Diehl fee21cbd9c more sensible tests 2020-08-25 17:17:49 +02:00
Martin Diehl bf401e56cf avoid name clash with damask.Geom 2020-08-25 09:56:24 +02:00
Martin Diehl 800dac5d01 correct type handling
no reason to calculate fill twice
2020-08-25 08:47:24 +02:00
Martin Diehl 96d4975fc4 using numpy functionality 2020-08-25 08:34:04 +02:00
Martin Diehl 51da632108 aiming at testing each individual statement 2020-08-25 07:49:56 +02:00
Martin Diehl 2d98325fa4 increasing test coverage 2020-08-25 01:21:17 +02:00
Martin Diehl 453f5a14c5 duplicated test (w/o wait for parallel out) 2020-08-25 00:53:05 +02:00
Martin Diehl 2751cdb6af support comments also in vtr 2020-08-25 00:40:14 +02:00
Martin Diehl 9a2ac31545 explicit is better then implicit 2020-08-24 23:35:46 +02:00
Martin Diehl 0ceba2a6d3 use central functionality 2020-08-24 23:28:26 +02:00
Martin Diehl 71e08ea66a small fixes:
- numpy has multiple float variants
- start renaming microstructure -> materialpoint where it does not hurt
- no need for type check if comparing against set of valid directions
  (or I miss some corner cases)
2020-08-24 23:23:47 +02:00
Philip Eisenlohr 2560f014a3 Merge remote-tracking branch 'origin/increase-geom-test-coverage' into geom-out-of-place 2020-08-24 17:17:31 -04:00
Martin Diehl 55443a3ff5 reflect change of variable names in file layout version 2020-08-24 22:54:09 +02:00
Martin Diehl 279d43ccc6 include version info + date in comments (Table class) 2020-08-24 19:04:59 +02:00
Martin Diehl 9d505c8518 better readable
- more explicit reporting
- always relative import for DAMASK
2020-08-24 09:58:24 +02:00
Martin Diehl b393da4955 relative imports
... it's all about damask.XXX
2020-08-24 07:28:10 +02:00
Martin Diehl 0d3ef29554 more logical encapsulation
- getting data out of VTK is a functionality of the VTK class. Need to
  discuss whether the VTK class should also provide grid and size (works
  only for rectilinear grid, so hiding VTK type is not possible
  anymore), but the current situation requires the Geom class to rely on
  'internals' of the VTK class
- header is specific to *.geom format, not to Geom objects.
2020-08-24 06:46:22 +02:00
Martin Diehl 507a165733 functionality for getting data
- handy for Geom class, but could be of general interest
- add/set/get comments: follows same functions as for Geom class
2020-08-24 06:40:36 +02:00
Philip Eisenlohr 3738002e4a forgot the new reference files... 2020-08-23 22:27:53 -04:00
Philip Eisenlohr 446ac03b07 All geom methods are now out-of-place, i.e. return an updated duplicate (to allow for daisy chaining).
* Added comments when methods acted.
* Added diff method
* Added flip method
* Fixed add_primitive inversion bug (again...)
* Fixed cell centering bug in add_primitive

* Added missing tests
2020-08-23 19:43:46 -04:00
Martin Diehl 22da3af92e cleaning (prospector complaint) 2020-08-24 00:44:18 +02:00
Martin Diehl 44015082a3 dead code (copy and paste error) 2020-08-24 00:34:07 +02:00
Martin Diehl c7cbd961a1 more systematic monkeypatching
allows comparison of reference files (log/history does not contain
information about damask.version and datetime.datetime.now)
2020-08-24 00:31:38 +02:00
Martin Diehl 9867830d68 store history of geometry modifications 2020-08-23 23:52:48 +02:00
Martin Diehl a1c78b778a WIP: track history in VTK objects 2020-08-23 23:22:53 +02:00
Martin Diehl 7b50a3b364 material.config is not used anymore 2020-08-23 15:20:11 +02:00
Martin Diehl d65371d42f removed unused and untested functionality
PEP 20: Explicit is better than implicit.
2020-08-23 12:55:55 +02:00
Martin Diehl 6f79573140 more test coverage 2020-08-23 11:05:56 +02:00
Martin Diehl 07af7b2f98 geom is written to vtr exlcusively, not to general vtk
base tests on vtr
2020-08-23 10:50:15 +02:00
Martin Diehl 64e7582e8e consistent interface to ndimage filters
Boolean 'periodic' sets mode to 'wrap' or 'nearest'
2020-08-23 10:02:22 +02:00
Martin Diehl 975db01f31 microstructure -> materialpoint
at least for new functionality
2020-08-23 09:38:08 +02:00
Martin Diehl 5fb2d30ee4 fast and for arbitrary type 2020-08-23 09:02:17 +02:00
Martin Diehl b731b1e768 Geom.to_vtk improvements
- should be integer
- should have a test
2020-08-23 08:49:49 +02:00
Philip Eisenlohr 2b09a7d31d fixed Geom.canvas bug, added Geom.from_vtk, added mode,selection options to Geom.clean 2020-08-22 21:36:11 -04:00
Martin Diehl bd4fb562bc make use of inhereted dependencies 2020-08-22 20:57:42 +02:00
Philip Eisenlohr 499ce01748 added Geom.copy() method 2020-08-22 13:57:31 -04:00
Martin Diehl 34a08bd8b8 pip package is pillow, not PIL 2020-08-22 17:04:21 +02:00
Philip Eisenlohr 752d6f773b corrected add_primitive test 2020-08-09 23:14:32 +02:00
Martin Diehl ff7eed4477 (unified) type hints 2020-08-08 20:56:17 +02:00
Martin Diehl 0c6ce390b5 simple IO tests
can be improved ...
2020-08-08 20:35:50 +02:00
Martin Diehl 6a5471d243 have microstructure with 'to' and 'of' 2020-08-08 20:24:36 +02:00
Martin Diehl 55a620b378 migrating to library 2020-08-08 20:14:30 +02:00
Martin Diehl a0e0f28e51 migrating shell scripts to library 2020-08-08 19:42:34 +02:00
Martin Diehl 5fcff876f9 replace selectively
useful for vicinity_offset and add_primitive
2020-08-08 18:41:47 +02:00
Martin Diehl 56eb57d253 homogenization will be removed soon, stop reporting it 2020-08-08 18:24:17 +02:00
Karo 7824a61f2e Merge branch 'user_defined_add_calculation' into 'development'
User defined add calculation

See merge request damask/DAMASK!195
2020-08-06 00:53:16 +02:00
Philip Eisenlohr ce00371f52 fixed rounding bug and updated reference images 2020-08-05 10:44:10 -04:00
Philip Eisenlohr e4103564a9 16bit color index; proper rounding of index values 2020-08-05 10:08:48 -04:00
Martin Diehl 0aaba487d7 required packages 2020-08-05 06:20:05 +02:00
Martin Diehl 856dc22eab Merge branch 'imageData-as-colormap.apply' of magit1.mpie.de:/damask/DAMASK into imageData-as-colormap.apply 2020-08-04 20:38:02 +02:00
Martin Diehl 7d49606597 restored correct bound calculation
test different bounds options
2020-08-04 20:34:40 +02:00
Philip Eisenlohr e73ffd6da9 fixed and condensed lo,hi range assignment 2020-08-04 20:29:27 +02:00
Martin Diehl e07c00a592 polishing + simple test
autoscaling seems to be broken
2020-08-04 20:14:04 +02:00
Philip Eisenlohr 84551c9d1e integrated former imageData functionality as "shade" method 2020-08-04 13:05:30 -04:00
Martin Diehl ae20f5ffe6 attempt to fix parallel writing on MacOS
should resolve TypeError: cannot pickle
'vtkmodules.vtkIOXML.vtkXMLRectilinearGridWriter' object error
2020-08-03 18:19:38 +02:00
Martin Diehl 3f2e63977d not needed anymore 2020-07-31 19:46:44 +02:00
Martin Diehl 72ea9a5cec non-vectorized formulas can be implemented in a user function 2020-07-31 19:42:44 +02:00
Martin Diehl a9f53f4822 non-vectorized formulas can be implemented in a user functionc 2020-07-31 17:04:14 +02:00
Martin Diehl 50d7842dbe more tests 2020-07-31 16:50:01 +02:00
Martin Diehl aadce1e554 Merge branch 'development' into user_defined_add_calculation 2020-07-31 16:15:31 +02:00
Martin Diehl daab5a8952 polishing 2020-07-24 22:42:16 +02:00
Martin Diehl 326b82b3aa symmetric scatter around nominal value 2020-07-24 22:41:41 +02:00
Martin Diehl 4860f9c9ce drop support for parallel marc versions
can still be handled by the user, but is a niche use case
2020-07-18 09:51:53 +02:00
Martin Diehl 2bbd68d964 with_suffix strips .1 from 2019.1 2020-07-16 09:33:17 +02:00
Martin Diehl 199ec51bf8 typo 2020-07-15 21:59:43 +02:00
Martin Diehl 9225d439ab object oriented path handling 2020-07-15 21:58:24 +02:00
Martin Diehl fa7f7e6fa4 don't complain if ssh without -X/-Y 2020-07-15 21:19:09 +02:00
Martin Diehl 333e840b09 standard behavior
most modules have an __version__ attribute
2020-07-15 20:57:56 +02:00
Martin Diehl 6259984e93 simplified
complicated, but allows to use functions as properties
2020-07-15 20:54:37 +02:00
Martin Diehl b0e06f180a reading numpy manual ...
https://numpy.org/doc/stable/reference/generated/numpy.isclose.html
rtol=1.e-8, b=1 gives atol+btol=1.e-8+1e-9, simplified to 1e-8
2020-07-13 22:48:29 +02:00
Francisco Jose Gallardo Basile e1bbaac0d7 Merge branch 'Vectorize-Orientation' into 'development'
Vectorize orientation

See merge request damask/DAMASK!186
2020-07-03 12:22:04 +02:00
Martin Diehl 7b3d1204fa easier to use 2020-07-03 07:29:31 +02:00
Philip Eisenlohr d4f97f8346 Merge branch 'misc-improvements' into 'development'
Misc improvements

See merge request damask/DAMASK!184
2020-07-02 21:52:47 +02:00
Philip Eisenlohr 7b899f1ff1 fixed output number format width for single increment0 2020-07-02 11:33:09 -04:00
Philip Eisenlohr 81b3c10305 removed ambiguous variable "l" 2020-07-02 10:37:57 -04:00
Philip Eisenlohr 368a241931 added testing of __iadd__ and __invert__ 2020-07-02 10:27:52 -04:00
Philip Eisenlohr 5a96708f41 added __iadd__ method 2020-07-02 10:26:04 -04:00
Philip Eisenlohr f3ff2e7412 added __iadd__ method 2020-07-02 10:25:04 -04:00
Philip Eisenlohr 3b72d0ec72 added __invert__ method to reverse colormap 2020-07-02 10:13:47 -04:00
Martin Diehl b88becb9d0 don't go out of focus during initialization 2020-07-02 08:25:35 +02:00
Martin Diehl 208d5109d4 still needed ... 2020-07-02 08:14:13 +02:00
Martin Diehl 86dc7054a4 still needed 2020-07-01 22:11:16 +02:00
Martin Diehl 4abd77fccf more test coverage 2020-07-01 17:31:16 +02:00
Martin Diehl be1eb996e0 more tests and cleaning 2020-07-01 15:12:34 +02:00
Martin Diehl a7e3dd5a56 Merge branch 'development' into Vectorize-Orientation 2020-07-01 13:30:39 +02:00
Martin Diehl e18a5b8a1b simplifications + more tests 2020-07-01 08:57:28 +02:00
Martin Diehl de8e9b5fc1 fast reduced operation 2020-07-01 00:37:02 +02:00
Martin Diehl 23365660d8 polishing 2020-06-30 23:18:32 +02:00
Martin Diehl ef0c78745a fix for vectorized in_SST + test 2020-06-30 23:05:41 +02:00
Martin Diehl 49d448dced vectorized and cleaned 2020-06-30 21:43:57 +02:00
Martin Diehl 9a83b11a99 testing IPF color (vectorization) 2020-06-30 18:41:59 +02:00
Martin Diehl bdb461a553 more flexible and independent 2020-06-30 18:12:39 +02:00
Martin Diehl 6e27a140f6 better split 2020-06-30 17:35:52 +02:00
Martin Diehl 3d6afff27a clearer name 2020-06-30 17:30:29 +02:00
Martin Diehl be21d1289d using slicing method 2020-06-30 16:33:04 +02:00
Martin Diehl c86e3e292c WIP: cleaning namespace 2020-06-30 14:07:10 +02:00
Martin Diehl 9d94b521ad polishing 2020-06-30 13:31:58 +02:00
Martin Diehl ce7018164f WIP: more reasonable naming 2020-06-30 13:05:06 +02:00
Martin Diehl b8b34080fe enable array like slicing/iteration 2020-06-30 12:16:47 +02:00
Martin Diehl c8adfae0fa bugfix: wrong variables used 2020-06-30 07:16:49 +02:00
Philip Eisenlohr 8dc87023d1 test from_range; update ASCII colormap labels (i_RGBA) 2020-06-29 22:23:24 -04:00
Philip Eisenlohr decbe8074a not using unassigned variable 2020-06-29 22:22:21 -04:00
Philip Eisenlohr d3b3d628b2 PEP conformity... 2020-06-29 22:07:14 -04:00
Philip Eisenlohr 39aac76859 __add__, from_range, fixed missing np.array(colors), show peppered... 2020-06-29 22:04:03 -04:00
Philip Eisenlohr 97ca1b1a9b try wxPython before tkinter, recent macOS otherwise fails 2020-06-29 22:02:12 -04:00
f.basile d06daec4cb reducec vectorized is improved 2020-06-29 18:25:45 +02:00
Martin Diehl 2d0c680daf useful information 2020-06-29 07:30:42 +02:00
f.basile 4875191ffd change if statement so github doesnt complain 2020-06-28 19:32:22 +02:00
Martin Diehl a657125840 standard version string 2020-06-28 19:30:23 +02:00
f.basile a99f016438 problem with if value is true / if value == True 2020-06-28 19:29:52 +02:00
Martin Diehl c7eb56a63d single precision reference files 2020-06-28 19:25:58 +02:00
Martin Diehl 37f7362cbe Merge branch 'development' into misc-improvements 2020-06-28 19:23:17 +02:00
Martin Diehl 323f828606 Merge branch 'development' into modernize_colormap 2020-06-28 19:09:52 +02:00
f.basile 8484d2e6cc fix github stuff 2020-06-28 19:05:10 +02:00
f.basile 352c4e95f1 more vectorized 2020-06-28 19:03:06 +02:00
Martin Diehl 1cfa6d44d9 dummy version could be useful for other tests
note that monkey patching requires direct access to damask.version in
the respective modules.
'from xx import yy' creates a copy (at least for the version string).
2020-06-28 11:51:30 +02:00
Martin Diehl b3f5ee022a unified style 2020-06-28 11:40:19 +02:00
Martin Diehl e6a87da37c compare to reference results
need to patch damask.version to be independent of version strings (in
json and ASCII table)
2020-06-28 11:20:09 +02:00
Martin Diehl 6a748d2edf do not expand single strings into characters 2020-06-28 11:19:18 +02:00
Martin Diehl ae4146f1c6 report version, write out 'modern' ASCII table style 2020-06-28 11:18:22 +02:00
Martin Diehl e81b67e964 polishing 2020-06-28 10:32:59 +02:00
Martin Diehl 1c03bd157f more testing 2020-06-28 10:25:28 +02:00
Martin Diehl b78c809375 real output 2020-06-28 10:25:28 +02:00
Martin Diehl 3513754647 low/high instead of left/right 2020-06-28 10:25:28 +02:00
Martin Diehl f4d13bc810 binary representation depends on vtk lib version 2020-06-28 10:07:31 +02:00
Martin Diehl d965d66319 [skip ci] documenting 2020-06-28 09:34:10 +02:00
Martin Diehl 8a9a768a77 support pathlib.Path 2020-06-28 07:17:51 +02:00
Martin Diehl 8d5a72e936 more test, swich to pathlib 2020-06-27 23:38:58 +02:00
Martin Diehl 8c8132bcd7 coordinates should not have random names 2020-06-27 23:37:09 +02:00
Martin Diehl c929af12c0 testing/polishing 2020-06-27 19:44:12 +02:00
Martin Diehl cf63226721 testing all conversions 2020-06-27 18:55:27 +02:00
Martin Diehl 234699bd18 reverse should return DAMASK colormap 2020-06-27 16:25:10 +02:00
Martin Diehl e779e190ea new colormap class for use in python
- based on matplotlib "ListedColormap"
- constructors
  - Array of RGB values (inherited),
  - 'from_bounds': perceptual uniform colormap within given bounds
  - 'from_predefined': from matplotlib or DAMASK templates
- export to files (WIP)
- preview on screen
2020-06-27 16:12:40 +02:00
Martin Diehl 1f9b5280cb forgotten debug statement 2020-06-26 11:47:04 +02:00
Martin Diehl a69f82e7c3 speed up vtk out
- limit to single precision
- write in background
2020-06-26 11:45:54 +02:00
Martin Diehl bfae88a364 numpy compatible 2020-06-26 11:45:30 +02:00
Martin Diehl bddb514072 more systematic reporting 2020-06-26 11:45:06 +02:00
Martin Diehl 27220a03bc not invalid anymore 2020-06-25 09:23:43 +02:00
Martin Diehl 3290e2c585 handle even obscure directions 2020-06-25 08:29:36 +02:00
Martin Diehl 5d7213b062 restore reminder to document changes
causes conflicts with outdated tests and is not urgent: postpone until
release.
2020-06-25 08:19:07 +02:00
Martin Diehl c9829f0f1f only Chuck Norris can divide by zero 2020-06-25 08:18:39 +02:00
Martin Diehl cd23937af5 Merge branch 'development' into f-strings 2020-06-25 07:46:24 +02:00
Philip Eisenlohr e64d353865 condensed scale_to_coprime; added test of scale_to_coprime 2020-06-24 18:37:33 -04:00
Philip Eisenlohr 9999560247 easier understanding of from_ang data layout interpretation 2020-06-24 18:36:43 -04:00
Philip Eisenlohr 14d3b7e66d more f-stringing 2020-06-24 16:59:55 -04:00
Philip Eisenlohr 966b6f8007 shapes init copes with integers instead of strict tuples; introduced f-strings 2020-06-24 14:18:06 -04:00
Philip Eisenlohr f8f433e826 introduced f-strings 2020-06-24 14:13:56 -04:00
Philip Eisenlohr ff858fd4c8 [skip ci] corrected help string for "srepr" 2020-06-24 20:13:09 +02:00
Philip Eisenlohr 4314ec1f37 [skip ci] started to replace .format() with f-strings 2020-06-24 11:02:37 -04:00
Anderson Wallace Paiva do Nascimento 3d93a5ff00 Merge branch 'migrate-to-pathlib' into 'development'
Migrate to pathlib

See merge request damask/DAMASK!177
2020-06-24 14:54:36 +02:00
Martin Diehl 6fa5ae6ebf literature from Karo 2020-06-22 23:14:58 +02:00
Martin Diehl e33895dd35 [skip ci] better logic 2020-06-21 10:37:09 +02:00
Martin Diehl c6a5bb8a3b is 2020 2020-06-21 10:04:45 +02:00
Martin Diehl 4c5939ef23 small polishing 2020-06-20 22:51:00 +02:00
Martin Diehl 15b43bcebf from_directions is not general, removed
polishing
2020-06-20 19:57:49 +02:00
Martin Diehl 3f63a4fdbc [skip ci] typo 2020-06-20 18:13:34 +02:00
Martin Diehl 4dae3643c9 vectorized IPF color working
results also uses the vectorized form.
Still needs careful checking
2020-06-20 17:15:13 +02:00
Martin Diehl ebdb65d31f standard broadcast_to behavior 2020-06-20 16:35:22 +02:00
Martin Diehl 262346ff5a polishing 2020-06-20 16:34:19 +02:00
Martin Diehl d93ed2bc5c several improvements:
- vectorized from_directions
- more tests (96% coverage, only random functionality is untested)
- updated documentation, folloing numpy standard
- inverse operator '~' introduced
2020-06-20 12:20:43 +02:00
Martin Diehl 055fa64f5f better readable 2020-06-19 12:25:46 +02:00
Martin Diehl 13bf7515ce WIP (broken?): vectorized calculation of IPF color 2020-06-19 10:54:13 +02:00
Martin Diehl 1648963b57 vectorized equivalent orientation calculation 2020-06-18 22:53:04 +02:00
Martin Diehl cdda556e18 small improvements
- hack for reporting multiple rotation
- bugfix for vectorized Rodrigues vector
- more general broadcasting (even more powerfull then np.broadcast_to)
2020-06-18 22:30:22 +02:00
Martin Diehl fe5e5babfe more useful for vectorized calculations 2020-06-18 22:29:28 +02:00
Martin Diehl d0d9245707 clearer intention 2020-06-16 23:35:50 +02:00
Samad Vakili 0f42ff6b5d reshaped F transpose error3 2020-06-10 14:02:52 +02:00
Samad Vakili 4f4d8d8c92 reshaped F transpose error2 2020-06-10 13:27:36 +02:00
Samad Vakili 7d7927e821 reshaped F transpose error 2020-06-10 13:22:57 +02:00
Samad Vakili f3d59ddfe5 F reshaped error 2020-06-10 12:00:33 +02:00
Samad Vakili 36f04309b4 issue in test_mechanics 2020-06-09 21:33:13 +02:00
Samad Vakili 694b7ec3c5 mechanics done 2020-06-09 21:27:08 +02:00
Samad Vakili d365cc9e12 typo 2020-06-09 14:39:17 +02:00
Samad Vakili 2978cf72f7 check for test_mechanics 2020-06-09 14:31:20 +02:00
Samad Vakili 824682d236 checked for typo 2020-06-09 14:26:22 +02:00
Samad Vakili 627e62439b the single case is included in test file 2020-06-09 14:17:31 +02:00
f.basile a76b5233be fix pyflakes imported but unused in pytest 2 2020-06-05 13:54:38 +02:00
f.basile 54c20cdd3c fix pyflakes imported but unused in pytest 2020-06-05 13:53:47 +02:00
f.basile cb1779ef9a fix pep257: D415 / First line should end with a period, question mark, or exclamation point (not e) 2020-06-05 13:49:30 +02:00
f.basile eae9698d22 equivalent,related and inFZ vectorized + pytest 2020-06-05 13:48:12 +02:00
f.basile ac09a2912a fix python/damask/_orientation.py contains invalid python3 code 2 2020-06-04 16:45:44 +02:00
f.basile 6a24aee171 fix python/damask/_orientation.py contains invalid python3 code 2020-06-04 16:44:57 +02:00
f.basile 3897136f85 avoid python/damask/_orientation.py exceeds line length limit (maximum line length 141 > 132) 2020-06-04 16:43:28 +02:00
f.basile 0c41e33434 orientation.equivalent takes several rotations at the same time + small test"
"

""
2020-06-04 16:39:24 +02:00
Martin Diehl a9c61ede69 bugfix: should also work if DAMASK_NUM_THREADS is not set 2020-06-03 20:24:18 +02:00
Martin Diehl bda555fd1c we are looking for a path, not for a file 2020-06-03 16:47:03 +02:00
Martin Diehl bb5485927e names like 2020.2 cannot be converted to int 2020-06-03 15:18:46 +02:00
Martin Diehl 5da1aa49bc string should be a Path object 2020-06-03 15:17:00 +02:00
Martin Diehl 9b04a45bbd bugfix (wrong variable name) 2020-06-03 13:53:00 +02:00
Martin Diehl 3be1a33820 easier to read 2020-06-03 13:32:47 +02:00
Martin Diehl c67fbacfc7 higher test coverage
- invalid operations
- legacy output
2020-06-03 11:03:31 +02:00
Martin Diehl c5d0c7e52e easier to read, more flexible 2020-06-03 10:44:40 +02:00
Martin Diehl ac9fddd9e9 Merge remote-tracking branch 'origin/development' into misc-improvements 2020-06-02 00:12:50 +02:00
Martin Diehl a51cc39613 proper docstring 2020-06-01 22:13:01 +02:00
Martin Diehl 72a0b1fae5 testing and polishing 2020-06-01 11:33:22 +02:00
Martin Diehl 7a193639fb also show datasets without unit
currently, this is only the orientation dataset
Also enable renames. Since this alters the history, the user need to
enable this
2020-05-31 23:50:06 +02:00
Martin Diehl bcb0ce5e5e typo 2020-05-31 18:51:12 +02:00
Martin Diehl adb92de8cc Merge branch 'development' into less-shell-scripts 2020-05-31 18:49:51 +02:00
Martin Diehl 421b8f4268 documented function interfaces 2020-05-30 17:31:50 +02:00
Martin Diehl 1afa00a19c testing systematically all possibilities 2020-05-28 08:05:16 +02:00
Martin Diehl 865a505186 fix for logarithmic strain 2020-05-27 22:32:35 +02:00
Martin Diehl 00168a5939 testing 2-dim array of tensors 2020-05-27 21:07:48 +02:00
Martin Diehl 56afc03f3c only vectorized version needed
use single point/simple versions only for testing
2020-05-27 18:05:08 +02:00
Martin Diehl 0fe450a033 Merge branch 'misc-improvements' into less-shell-scripts 2020-05-27 17:40:13 +02:00
Martin Diehl 31f72aa912 handle min/mid/max eigenvalues/vectors separately
storing as matrix/vector is not favorable for paraview and in many
cases, either min or max are of interest only
2020-05-27 17:39:46 +02:00
Samad Vakili f9c33d9210 mechanics checked for an array with arbitrary dimensions 2020-05-26 16:27:27 +02:00
Martin Diehl addc4c36d1 test for XDMF writer
just ensure that it does not throw an exception
2020-05-26 08:06:39 +02:00
Martin Diehl 520dfe216a cleaning 2020-05-26 07:57:32 +02:00
Martin Diehl 908788271a Merge branch 'misc-improvements' into less-shell-scripts 2020-05-26 07:24:03 +02:00
Martin Diehl 5ad7fe04d0 bugfix:
used wrong type
2020-05-26 07:15:27 +02:00
Martin Diehl 670e08468b reorder
tests depend on other functionality that should be tested first
2020-05-26 06:49:29 +02:00
Martin Diehl 88c49fc4f4 also check values 2020-05-26 06:48:52 +02:00
Martin Diehl 7f09c90c7d different h5py versions seem to throw different errors 2020-05-26 06:39:11 +02:00
Martin Diehl 6f7c7005b0 bugfix:
- proper overwrite
- no out of bounds error for empty time selection (just pick nothin)
2020-05-25 23:54:06 +02:00
Martin Diehl 9855c61747 store vtk file in tmp directory 2020-05-25 23:39:19 +02:00
Martin Diehl 9076fbe525 testing overwrite functionality 2020-05-25 23:05:31 +02:00
Martin Diehl d6877da2b6 single source of truth 2020-05-25 20:15:45 +02:00
Martin Diehl d9d089c359 avoid repetition and do correct encode/decode 2020-05-25 20:13:57 +02:00
Martin Diehl 5d0a2aac8f polishing reporting 2020-05-25 20:13:57 +02:00
Martin Diehl b9e16ea951 overwriting datasets makes sense in special cases
but prevent user from accidently doing that and store the information
2020-05-25 20:13:57 +02:00
Martin Diehl 248f199a7b track creation time 2020-05-25 18:51:10 +02:00
Martin Diehl b1b8d02320 typo 2020-05-25 16:41:23 +02:00
Martin Diehl 9d7158b51a Merge branch 'misc-improvements' of magit1.mpie.de:/damask/DAMASK into misc-improvements 2020-05-25 16:40:23 +02:00
Martin Diehl f07eaf19d0 fixed broadcasting + corresponding test 2020-05-25 16:37:08 +02:00
Martin Diehl 784d6d09d9 cleaning 2020-05-25 15:55:38 +02:00
Martin Diehl dad7c7a2a0 Merge branch 'vectorize_rotation' into misc-improvements 2020-05-25 15:50:03 +02:00
Martin Diehl 3e2cbef780 Merge remote-tracking branch 'origin/development' into vectorize_rotation 2020-05-25 15:46:27 +02:00
Martin Diehl 77b68ab86f using rotation class for rotations 2020-05-25 09:39:39 +02:00
Martin Diehl 39505507f1 not needed anymore 2020-05-25 08:07:12 +02:00
Martin Diehl 17aa3c00dc more tests 2020-05-24 22:52:00 +02:00
Martin Diehl 296308e11e fix for rotation around 90 deg
more tests
2020-05-24 20:52:19 +02:00
Martin Diehl 34adefd4ca simplified 2020-05-24 18:30:45 +02:00
Samad Vakili 987c4a9e8d first commit mechanics 2020-05-24 18:30:44 +02:00
Martin Diehl 594fcb2b72 seems more appropriate 2020-05-24 15:10:53 +02:00
Martin Diehl 3231a49107 centralize functionality 2020-05-24 09:39:58 +02:00
Martin Diehl a26cba1457 calling a few missing statements 2020-05-24 09:06:11 +02:00
Martin Diehl a3d9520c4b polishing 2020-05-23 15:54:28 +02:00
Martin Diehl 82419f8649 testing selection 2020-05-23 10:38:25 +02:00
Martin Diehl 8a848979aa missing test for IPF color 2020-05-23 09:13:45 +02:00
Martin Diehl 0549e33a00 vectorized/fast 2020-05-23 08:38:57 +02:00
Martin Diehl e2cf527dfb add missing test 2020-05-23 08:19:08 +02:00
Martin Diehl b8e83cd263 do not overwrite 2020-05-22 20:42:13 +02:00
Martin Diehl 7bd681a5ed very simple test 2020-05-22 19:04:02 +02:00
Martin Diehl 11eda510aa testing functionality of Lattice separately 2020-05-22 18:45:27 +02:00
Martin Diehl b33de48528 testing broadcasting 2020-05-22 15:12:37 +02:00
Martin Diehl 23b1381eaf give credit 2020-05-21 11:30:25 +02:00
Martin Diehl 16f30a10d0 polishing 2020-05-20 23:50:08 +02:00
Martin Diehl 353fd3ceb6 more tests
now 95% test coverage of Rotation class
2020-05-20 19:16:31 +02:00
Martin Diehl 128a96e7f6 vectorized formula is enough 2020-05-20 18:13:51 +02:00
Martin Diehl bb419d49df polishing 2020-05-20 16:19:12 +02:00
Martin Diehl b59d773689 store all test data together 2020-05-20 15:26:49 +02:00
Martin Diehl 9240dd59b2 mark as internal
all functionality (+ sanity checks) can be done with the class
functionality
2020-05-20 11:11:07 +02:00
Martin Diehl 9694767997 all seems to work now 2020-05-20 09:01:38 +02:00
Martin Diehl 1d8903bb0c transition code 2020-05-20 00:18:44 +02:00
Martin Diehl 1fa4a07bb8 for backward compatibility 2020-05-19 23:39:01 +02:00
Martin Diehl 3e00269179 again some more tests 2020-05-19 23:24:12 +02:00
Martin Diehl 1c53a37de4 more tests and adjustments to tolerances 2020-05-19 21:03:30 +02:00
Martin Diehl a6b0aaffba more tests
Hotfix needed for axis angle to matrix (not used in DAMASK, needs
further investigation)
2020-05-19 19:41:50 +02:00
Martin Diehl de79a5af43 directly test the internal conversions
some work to do ...
2020-05-19 09:55:23 +02:00
Martin Diehl 065c624f94 fix for backward compatibility 2020-05-19 09:10:14 +02:00
Martin Diehl ebf05a279e standard name 2020-05-19 08:59:03 +02:00
Martin Diehl 1a3a4a800e vectorized 2020-05-19 07:59:24 +02:00
Martin Diehl b6eebcd704 small fixes (testing P=+1) 2020-05-19 07:57:40 +02:00
Martin Diehl b200894a40 bugfix and further test 2020-05-19 07:57:40 +02:00
Martin Diehl 3dc90ddb94 use the formula from the paper, not from the reference implementation
a few multiplications should be faster than a transpose
2020-05-19 07:57:40 +02:00
Martin Diehl a25dd1c438 cleaning 2020-05-19 07:57:40 +02:00
Martin Diehl 743e91a78d cleaning 2020-05-17 08:01:34 +02:00
Martin Diehl 652ece6bb3 fix: wrong capitalization 2020-05-17 07:25:17 +02:00
Martin Diehl 2550447169 Merge branch 'development' into docstring-sphinx-adjustments 2020-05-17 00:10:58 +02:00
Martin Diehl a90865c877 non-vectorized versions not needed anymore
using them only for testing purposes
2020-05-17 00:10:18 +02:00
Martin Diehl 9ba419c2c3 Merge branch 'development' into vectorize_rotation 2020-05-16 20:58:06 +02:00
Martin Diehl a4dfd7fc74 missing tests 2020-05-16 17:23:05 +02:00
Martin Diehl 044f069437 bugfix: selected wrong data 2020-05-16 17:06:55 +02:00
Martin Diehl a279785149 Merge branch 'development' into misc-improvements 2020-05-16 17:01:48 +02:00
Martin Diehl 61ac40c259 more tests 2020-05-16 13:54:53 +02:00
Martin Diehl 19638168e6 more sensible type checking and errors 2020-05-16 13:23:32 +02:00
Martin Diehl 9fa1539163 using new names 2020-05-16 11:17:12 +02:00
Martin Diehl 235f3c0df7 bugfix: copy and paste error 2020-05-16 11:16:52 +02:00
Martin Diehl e2ba294b75 bugfix: wrong variable 2020-05-16 09:40:32 +02:00
Martin Diehl 2dc46b783a simplified and tested 2020-05-16 00:58:40 +02:00
Martin Diehl dc508cdfce Merge remote-tracking branch 'origin/misc-improvements' into vectorize_rotation 2020-05-15 23:25:42 +02:00
Martin Diehl 3fd868dc45 Merge branch 'development' into vectorize_rotation 2020-05-15 23:25:36 +02:00
Martin Diehl b5b9bfaa99 need space at end of definition list 2020-05-13 11:36:16 +02:00
Martin Diehl 66b928c5af using doctest style
https://docs.python.org/3/library/doctest.html
https://numpy.org/doc/stable/docs/howto_document.html#sections (section
15)
2020-05-13 10:47:49 +02:00
Martin Diehl 6f3b526811 Merge branch 'development' into docstring-sphinx-adjustments 2020-05-13 10:38:45 +02:00
Karo 90f93d2399 Merge branch 'integrate-lambert' into 'development'
Integrate lambert

See merge request damask/DAMASK!166
2020-05-12 23:36:08 +02:00
Martin Diehl 6928a8290f less whitespace,
alingment only within one vector/tensor
2020-05-10 13:02:26 +02:00
Vitesh Shah c8701a4665 Cleanup/better readability 2020-05-08 12:15:10 +02:00
Martin Diehl b75e98ca3f forgotten debug statements
+ polishing of XDMF output
2020-05-07 19:12:05 +02:00
Martin Diehl c2b4f5516e DADF5_postResults tries to combine datasets, this does not work 2020-05-07 00:14:14 +02:00
f.basile fcd0028b83 avoid line length limit (maximum line length 182 > 132 2020-05-06 14:33:04 +02:00
f.basile d977f2ad25 already merged 2020-05-06 14:26:54 +02:00
f.basile 26f55781ae merge test into gridFilters 2020-05-06 14:26:15 +02:00
f.basile a122a307b9 div test done 2020-05-06 14:14:18 +02:00
f.basile d4091a21a8 grad test done 2020-05-06 13:05:53 +02:00
f.basile 8b4baecdee better looking test fields 2020-05-06 12:54:24 +02:00
f.basile bd518b2806 test_curl done 2020-05-06 12:44:56 +02:00
Martin Diehl 9626833339 Merge branch 'development' into pytest-curl-div-grad-2 2020-05-05 22:45:30 +02:00
Martin Diehl ef4a4dad4a shape property and numpy-like broadcasting
this makes it easy to apply a single rotation to a field
2020-05-05 14:44:08 +02:00
Martin Diehl eeb0df3a55 do not store absolute path 2020-05-05 10:42:54 +02:00
Vitesh Shah 307debebd4 Correct shapes for gradient calculations 2020-05-05 10:22:23 +02:00
Martin Diehl 31c397255d equivalent (for a valid DADF5 file) but faster 2020-05-05 10:18:48 +02:00
Vitesh Shah 0650f46ab1 Tests for gradient 2020-05-05 10:13:30 +02:00
Martin Diehl 14cdc031e0 write XDMF files
the limitation to scalar, 3-vector and 3x3-tensor comes currently from
XDMF/vtk/paraview

extension to multiple constituents and unstructured meshes might be
possible
2020-05-05 09:57:22 +02:00
Martin Diehl 6e99956b58 Merge branch 'development' into misc-improvements 2020-05-05 09:22:53 +02:00
Martin Diehl 5f3f87cd68 vectorizing cubochoric conversions 2020-05-04 17:43:38 +02:00
Martin Diehl 7d1e0850ab test + resulting bug fix 2020-05-03 17:04:03 +02:00
Martin Diehl 5d4b554b00 WIP: vectorizing 2020-05-03 07:48:13 +02:00
Martin Diehl c241eaec15 rely on correct input data 2020-05-03 07:23:46 +02:00
Martin Diehl f0bb50b97d vectorized rotation function 2020-05-02 15:22:17 +02:00
Martin Diehl c7a77ebc26 Merge branch 'development' into integrate-lambert 2020-05-02 09:21:42 +02:00
Martin Diehl 2df78e4e2f vecorized pyramid function for lambert projection 2020-05-02 09:17:31 +02:00
Martin Diehl b88f5ec0c8 clean up 2020-05-01 14:53:40 +02:00
Martin Diehl ce9bdc50a4 common variable names 2020-04-29 14:46:58 +02:00
Martin Diehl 9e79935add Merge branch 'development' into less-shell-scripts 2020-04-28 20:43:16 +02:00
Martin Diehl 9273c88782 [skip ci] WIP: migrating from PRIVATE repo 2020-04-28 09:42:27 +02:00
Martin Diehl 2d14790863 the result of a differential operator operating on a constant field is 0 2020-04-27 05:08:47 +02:00
Martin Diehl 6864b9525d go back to original dir as soon as possible 2020-04-26 14:52:27 +02:00
Martin Diehl f02c77b6d0 more reasonable tolerance
still relatively high because ctf files store position with constant
number of digits and floating dot. Hence, the precision is very low
2020-04-24 20:01:57 +02:00
Martin Diehl 1610d5a5d2 Merge branch 'development' into misc-improvements 2020-04-24 20:01:40 +02:00
Martin Diehl 707324887f inform the user about planned functionality 2020-04-24 06:52:09 +02:00
Martin Diehl 042f64200c Merge branch 'development' into vectorize_rotation 2020-04-24 06:31:14 +02:00
Francisco Jose Gallardo Basile 898cf42aca Merge branch 'fix-grid-convention' into 'development'
Fix grid convention

See merge request damask/DAMASK!160
2020-04-23 19:02:23 +02:00
Martin Diehl cc3fa156cf support change of directory one object has been created 2020-04-23 16:29:20 +02:00
Martin Diehl a0b7c51bec less strict tolerances
grid position reported by EBSD has only a few decimal places, so
rounding errors occur
2020-04-22 23:32:34 +02:00
Martin Diehl 8ba547a1b5 no need for an extra file 2020-04-22 13:23:50 +02:00
Martin Diehl a39e6b7af9 hide internal variables 2020-04-22 13:12:30 +02:00
Martin Diehl 3621dddd66 test deviatoric part for known analytic solution 2020-04-22 09:16:53 +02:00
Martin Diehl 53b8c1c893 simplified 2020-04-22 08:58:43 +02:00
Martin Diehl a8c6fdd9ba for the sake of completeness 2020-04-22 07:40:02 +02:00
Martin Diehl 7efe14be35 Merge branch 'development' into vectorize_rotation 2020-04-21 19:29:30 +02:00
Martin Diehl 97a5880d76 ensure correct shape 2020-04-21 13:22:55 +02:00
Martin Diehl 75d7238376 vectorized as_XXX 2020-04-21 12:27:50 +02:00
Martin Diehl ae3eca5f98 fix for vectorized from_random 2020-04-21 12:08:16 +02:00
Martin Diehl ac75b9e4ca improved reporting + test 2020-04-21 11:17:15 +02:00
Martin Diehl 23fc58699f vectorize Rotation.fromXXX functions 2020-04-21 10:55:45 +02:00
Martin Diehl 4a05cdbbbb copy and paste error 2020-04-21 03:26:26 +02:00
Martin Diehl 528378eba2 polishing/bugfix
* HDF5 data has x fast, therefore reshape needs to be aware of 'F' order
* Datatype for True/False is 'bool' in python, not 'Boolean'
2020-04-20 22:51:51 +02:00
Martin Diehl 00cb17ccfa commenting 2020-04-20 22:47:55 +02:00
Martin Diehl 93db1b37ca some useful information 2020-04-20 22:32:13 +02:00
Martin Diehl 25d29bf438 no need for Fortran order forward/backward 2020-04-20 20:24:55 +02:00
Martin Diehl 1ccda22ae3 nothing to flatten here 2020-04-20 20:16:25 +02:00
Martin Diehl 4db91fff03 simplified 2020-04-20 20:14:27 +02:00
Martin Diehl f519e62cd5 testing data layout checks 2020-04-20 13:56:33 +02:00
Martin Diehl 02dde3c255 test also invalid operations 2020-04-20 13:10:13 +02:00
Martin Diehl 9979eb58f4 consistent layout for grid data
has now always the shape ([x,y,z,...]) with x fastest. For conversion from or
to linear layout ([x*y*z,...]), e.g. storage in ASCII table, reshape needs
to have the 'F' option.
Credits to Vitesh and Fran for pointing this out.
2020-04-20 13:09:59 +02:00
Martin Diehl bce5ed62d5 polishing 2020-04-20 10:13:15 +02:00
Martin Diehl e3958263e3 Merge branch 'development' into misc-improvements 2020-04-15 21:03:51 +02:00
Karo Sedighiani 03aa6f9c80 Merge branch 'vectorize_rotation' into development 2020-04-14 19:34:11 +02:00
Philip Eisenlohr d3eba41519 [skip ci] fixed bug of double execution of np.degrees in asAxisAngle 2020-04-14 12:22:41 -04:00
Martin Diehl 69857176b2 search and replace error 2020-04-14 15:33:20 +02:00
Martin Diehl 93c75cada3 numpydoc style 2020-04-12 15:38:38 +02:00
Martin Diehl aaeec16c66 proper indentation for sphinx 2020-04-12 15:34:29 +02:00
Martin Diehl b6b98bd14f more meaningful 2020-04-12 15:20:09 +02:00
Martin Diehl c6c1878b13 asterisk is the emphasize sign for restructured text
not really needed here
2020-04-12 15:19:32 +02:00
Martin Diehl 3d10266fbc similar style as for other conversions 2020-04-12 01:29:11 +02:00
Martin Diehl 04fbc38a4b keep namespace clean and avoid overwriting in fromXXX functions 2020-04-12 01:19:11 +02:00
Martin Diehl f41a47ce8b polishing and slightly stricter tolerances 2020-04-11 23:27:25 +02:00
Martin Diehl c0c37fe6a5 polishing 2020-04-11 20:42:46 +02:00
Martin Diehl c57f96cd6e also missing 2020-04-11 18:32:06 +02:00
Martin Diehl 8c61f67e34 cleaning 2020-04-11 18:24:54 +02:00
Martin Diehl 296a75d452 where not needed 2020-04-11 18:00:59 +02:00
Martin Diehl fac33ec408 polishing 2020-04-11 17:23:54 +02:00
Martin Diehl 51104bfc13 do not transpose for the standard case 2020-04-11 17:19:12 +02:00
Martin Diehl cb9daccdd7 homochoric representation vectorized 2020-04-11 16:14:40 +02:00
Martin Diehl 99655c9f61 more vectorized functions 2020-04-11 13:59:16 +02:00
Martin Diehl 4e759d6c98 more tests for orientation conversion
ensure that all parameters are within range and check if
multidimensional arrays at least run
2020-04-11 12:37:21 +02:00
Martin Diehl 3bfa2d679c simpler/correct logic for eu2om 2020-04-11 11:36:37 +02:00
Martin Diehl 59b0a6e825 tuples not needed/avoid eval 2020-04-10 13:07:05 +02:00
Martin Diehl 656c0199cf sorted and make explicitly available what we need 2020-04-10 12:32:33 +02:00
Martin Diehl 9837390406 do not clutter namespace
we do not need damask.util.np etc
2020-04-10 12:30:39 +02:00
Martin Diehl 9c0ea13e4f Merge branch 'development' into misc-improvements 2020-04-10 08:14:33 +02:00
Martin Diehl bab3581b11 need to transpose eigenvectors to find the correct one 2020-04-09 15:01:01 +02:00
Martin Diehl e502573e05 polishing 2020-04-09 14:20:43 +02:00
Martin Diehl b025c1838e simplified 2020-04-09 12:52:12 +02:00
Martin Diehl cbfde73a29 more testing and related fixes 2020-04-09 07:40:20 +02:00
Martin Diehl 43e7639f77 WIP: implementing orientation matrix conversions 2020-04-09 00:47:43 +02:00
Martin Diehl da30fb8396 qu(aternion) and eu(ler) vectorized and tested 2020-04-09 00:35:40 +02:00
Martin Diehl 464620b796 vectorized conversion from ax(is angle) 2020-04-08 21:24:59 +02:00
Martin Diehl 2a063b3bb5 relaxed tolerance not needed 2020-04-08 20:23:05 +02:00
Martin Diehl 59e0041fd7 more scatter, slightly reduced tolerance 2020-04-08 19:30:50 +02:00
Martin Diehl 3cd8f3d9a0 testing special orientations with scatter 2020-04-08 18:38:57 +02:00
Martin Diehl 1ba01ba0db adjusting tolerances 2020-04-08 18:15:50 +02:00
Martin Diehl f365ae104d adjusting tolerances 2020-04-08 17:55:05 +02:00
Martin Diehl 10d5b2e791 testing some special cases 2020-04-08 13:41:46 +02:00
Martin Diehl 8f88480790 better readable error messages 2020-04-08 12:59:34 +02:00
Martin Diehl b6f5548d8a correct normalization at the corners 2020-04-08 12:23:28 +02:00
Martin Diehl 4e06e9a410 improved numerical stability for corner cases 2020-04-08 11:52:26 +02:00
Martin Diehl ccf62ede52 bugfix for Cubochoric
forward and backward mappings are different
2020-04-08 11:41:42 +02:00
Martin Diehl fbd61fda99 ignore comments 2020-04-02 11:54:34 +02:00
Martin Diehl 01818cba80 tuples not needed for single arguments 2020-03-31 12:44:39 +02:00
Martin Diehl 6ef7410e5a testing VTK wrappers 2020-03-31 11:04:06 +02:00
Martin Diehl 2f52165e0a for test coverage reports using pytest 2020-03-30 22:14:45 +02:00
Martin Diehl 396d428af7 bugfix: works for all cuboids, not just cubes 2020-03-29 23:09:43 +02:00
Martin Diehl e334674a06 test bycristal tessellation 2020-03-29 20:28:54 +02:00
Martin Diehl 9c90aa5acb polishing 2020-03-29 20:07:09 +02:00
Martin Diehl e61c1a027b avoid detour via shell 2020-03-29 19:12:23 +02:00
Martin Diehl bbce3456e8 advise from pylint 2020-03-22 22:30:38 +01:00
Martin Diehl 1dfdd264b7 small flaws detected by pylint 2020-03-22 16:31:14 +01:00
Martin Diehl b6d50db177 do not use name of function 2020-03-22 16:21:49 +01:00
Martin Diehl 1e178287fe 4 space indentation 2020-03-22 16:13:35 +01:00
Martin Diehl 76caf422aa bugfix: wrong indentation
strange that python has accepted that
2020-03-22 15:59:25 +01:00
Martin Diehl 3873a3d20d restoring working structure for config submodule 2020-03-21 22:17:07 +01:00
Martin Diehl 4decae967a nothing to inherit .. 2020-03-21 20:18:46 +01:00
Martin Diehl c6025925ac relative imports within damask package 2020-03-21 20:17:50 +01:00
Martin Diehl c5e956f386 solver submodule structure working again 2020-03-21 20:14:15 +01:00
Martin Diehl bcf3650211 slightly shorter.
w/o transpose, this seems to be more memory efficient
2020-03-21 19:40:49 +01:00
Martin Diehl 71da974bdc quick prospector fixes for deprecated class 2020-03-21 18:29:42 +01:00
Martin Diehl 67f64b7a7a polishing 2020-03-21 18:01:26 +01:00
Martin Diehl 20a06840b0 works also for arrays ... 2020-03-21 11:07:21 +01:00
Martin Diehl 2ad86e4202 shortened 2020-03-20 23:47:54 +01:00
Martin Diehl eb66db9c36 Merge branch 'no-python-namespace-clutter' into MiscImprovements 2020-03-20 23:46:37 +01:00
Martin Diehl 76984a4dbd more sensible check
works also for numpy arrays. Not sure why the old way is considered to
be "pythonic", I think it can just cause trouble
2020-03-20 23:42:23 +01:00
Martin Diehl 4d4f321872 following python convention 2020-03-20 08:49:33 +01:00
Martin Diehl 0556827f29 less error prone 2020-03-19 20:19:47 +01:00
Martin Diehl 892b7eee98 consistency check and new test 2020-03-19 17:34:49 +01:00
Martin Diehl 705694b97c fix for test 2020-03-19 15:54:57 +01:00
Martin Diehl e390982be7 clean first level structure 2020-03-19 15:19:11 +01:00
Martin Diehl 899cc913c4 python style names 2020-03-19 15:09:05 +01:00
Martin Diehl 327899890a this works for internal 2020-03-19 15:06:25 +01:00
Martin Diehl 9bb0608187 maybe this is the cleaner way 2020-03-19 14:40:30 +01:00
Martin Diehl c1d82197ad cope with integers 2020-03-19 13:27:23 +01:00
Martin Diehl 0ebc5ab60e no need to import modules, hide unwanted functions 2020-03-19 13:16:32 +01:00
Martin Diehl 27532cfa4e small fixes 2020-03-19 12:03:55 +01:00
Martin Diehl 91e728d065 polishing 2020-03-19 11:30:36 +01:00
Martin Diehl a80622292e simplified (and working) 2020-03-19 10:59:53 +01:00
Martin Diehl 7093647af5 clearly show intention 2020-03-19 09:04:36 +01:00
Martin Diehl 0871111c11 consistent and correct number of leading zeros 2020-03-19 08:45:25 +01:00
Martin Diehl b5899b51e1 do not show tk window on start(python) or exit(Ipython) 2020-03-19 08:31:24 +01:00
Martin Diehl d6f74daf53 cleaning
no DADF5 anymore
2020-03-19 08:13:13 +01:00
Martin Diehl fbd92599e8 also accept vtkRectilinearGrid etc as type 2020-03-19 08:04:15 +01:00
Martin Diehl 6d0c4b9765 typo 2020-03-19 08:00:13 +01:00
Martin Diehl d28df815f0 Merge branch 'development' into MiscImprovements 2020-03-19 07:30:03 +01:00
Martin Diehl 7d47418381 migrating to new Table class ...
... and stripping old ASCIItable down
2020-03-19 07:27:11 +01:00
Martin Diehl f7a6ac4a0e migrating to new table class 2020-03-19 07:27:11 +01:00
Martin Diehl cbe5944390 cleaning deprecated modules 2020-03-19 07:27:11 +01:00
Martin Diehl 2b777bbbea use "None" to indicate missing data
True/False are user based decisions
2020-03-18 14:29:59 +01:00
Martin Diehl ee0d80ce2a following python standard + polishing 2020-03-18 13:49:53 +01:00
Martin Diehl 45e3b8f7c6 no brackets for reshape required 2020-03-17 12:25:44 +01:00
Martin Diehl 25b3fa4427 image data seems to work in general with python3 ...
... after fix for colormaps
imageDataDeformed is based on the core module, i.e. it has not been used
for years. Either update soon or remove
2020-03-17 11:53:59 +01:00
Martin Diehl bb90539f7c only ignore temporary files in the respective folders 2020-03-16 22:50:09 +01:00
Martin Diehl 794d7e485e bugfix: report again correctly 2020-03-16 22:50:09 +01:00
Martin Diehl 941a9fbff4 fixing prospector complaints 2020-03-14 22:56:13 +01:00
Martin Diehl 554631d554 whitespace adjustments 2020-03-14 22:31:36 +01:00
Martin Diehl f9aea736cb there is a function for that 2020-03-14 22:26:47 +01:00
Martin Diehl 6dcb5b0d0d vectorize 2020-03-14 22:24:45 +01:00
Martin Diehl 0becd8c20b not needed 2020-03-14 22:21:31 +01:00
Martin Diehl b4679fabfc whitespace cleaning and other polishing 2020-03-14 22:17:59 +01:00
Martin Diehl 5c4ddf5138 Merge branch 'development' into MiscImprovements 2020-03-14 12:52:30 +01:00
Martin Diehl 3d8e8cfe7a tkinter might not work 2020-03-14 00:07:49 +01:00
Martin Diehl 771663c944 polishing 2020-03-13 00:30:49 +01:00
Martin Diehl 81e98055dd polishing 2020-03-12 19:52:33 +01:00
Martin Diehl 6fbace8220 stub: show rendered geometry 2020-03-12 15:10:44 +01:00
Martin Diehl 827f354435 only store points, no vertices
visualize via 'Points Gaussian', not 'Points' in paraview.
+ adding displacements for points
2020-03-12 12:28:28 +01:00
Martin Diehl 4c915eddbc inform the user 2020-03-12 08:30:33 +01:00
Martin Diehl dafc48dcc7 polishing 2020-03-12 08:22:37 +01:00
Martin Diehl a6a73cdc0f polishing
grid is interpreted again in the DAMASK meaning, i.e it specifies the
number of cells, not the number of nodes
2020-03-12 06:54:40 +01:00
Martin Diehl bb2019810a centralizing functionality 2020-03-12 00:00:47 +01:00
Martin Diehl 575da581a9 support for point cloud 2020-03-11 22:35:58 +01:00
Martin Diehl 744e3bb50b vectorized cell assignment + bugfix for writing out 2020-03-11 21:29:24 +01:00
Martin Diehl f324e67f7b fix: nodes need to be converted to vtk type
some stub definitions
2020-03-11 18:08:58 +01:00
Martin Diehl c92a6ad459 simpler
and system independent
2020-03-11 07:50:11 +01:00
Martin Diehl 32734e7dce using central functionality 2020-03-11 07:42:32 +01:00
Martin Diehl b3e8a4405e better use centralized functionality 2020-03-11 06:50:13 +01:00
Martin Diehl a024ec378a new class should be accesible as damask.VTK 2020-03-11 06:49:14 +01:00
Martin Diehl 9878ddc550 easier way to show data.
needs information on geometry (structured/unstructured) and probably we
should list not more than 5 incs
2020-03-11 06:28:13 +01:00
Martin Diehl 8a4bc3dda4 separating vtk from results
we should discuss the naming!
2020-03-10 23:53:37 +01:00
Martin Diehl c43af6aac3 Merge branch 'development' into HDF5-results 2020-03-10 23:32:41 +01:00
Philip Eisenlohr a7f5e42c2e condensed if-else 2020-03-10 22:13:21 +01:00
Philip Eisenlohr bffce1ab9c use "nan" to represent np.nan in ASCIItable output 2020-03-09 18:50:27 -04:00
Philip Eisenlohr b2abaef0b3 added placing of data within geometry 2020-03-09 18:31:00 -04:00
Martin Diehl 9bfaf4fbfb it is RodriGues, not RodriQues 2020-03-09 13:58:10 +01:00
Martin Diehl 32378fa609 simpler use of progress bar
now written as class (avoids the managing of function attributes) which
is used as a small wrapper around a loop.
ETA is shown, based on datetime class which hast nice formatting
2020-03-09 13:44:08 +01:00
Philip Eisenlohr 20caa29b5d corrected "Rodrigues" 2020-03-06 00:53:11 +01:00
Martin Diehl 7a0c20b6de Merge branch 'development' into python-style 2020-03-05 22:00:58 +01:00
Martin Diehl c06ef00fe2 [skip ci] N_threads is not correct, we use processes 2020-03-03 14:57:48 +01:00
Martin Diehl 16b4a63c58 clearly separating deprecated functions
still there since some test rely on them
2020-03-03 14:38:32 +01:00
Martin Diehl 946231cda5 indentation adjustment 2020-03-03 14:24:27 +01:00
Martin Diehl 903af10aa7 allow to iterate over times/increments 2020-03-03 14:07:02 +01:00
Martin Diehl c33cca3351 polishing, takeover from dadf5-usability branch 2020-03-03 12:50:10 +01:00
Martin Diehl 1f3d5099cf quote still needed 2020-03-03 12:32:38 +01:00
Martin Diehl b1f21b189b removing unused functionality
should simplify transition to new table class
2020-03-03 08:28:57 +01:00
Martin Diehl c360785217 single source of truth 2020-03-03 08:04:14 +01:00
Martin Diehl edd143b423 bugfix for copy and paste error
introduced in 8798dd1af3
2020-03-03 07:00:14 +01:00
Martin Diehl 192f21df37 4 space indentation 2020-03-03 06:49:46 +01:00
Martin Diehl 88e8907031 deprecated and not used by any test 2020-03-02 23:52:40 +01:00
Martin Diehl 8798dd1af3 new names consistently used 2020-03-02 23:47:29 +01:00
Martin Diehl 00028724b8 type is float for empty element in prod, should always be int 2020-03-02 23:20:36 +01:00
Martin Diehl 0034289b1b S is 2. PK stress, T_sym is clearer 2020-03-02 23:14:59 +01:00
Martin Diehl 15c3cab549 clearer names 2020-03-02 23:11:05 +01:00
Martin Diehl 4970f22e13 better name
damask.Result is more appropriate then damask.DADF5
2020-03-02 23:05:35 +01:00
Martin Diehl 08aef5531c Merge remote-tracking branch 'origin/development' into MiscImprovements 2020-03-01 07:32:00 +01:00
Martin Diehl ed2489de9a not needed anymore 2020-02-29 19:57:37 +01:00
Martin Diehl f431dd2092 geom class is better suited than asciitable class
removing unused functionality from deprecated asciitable
2020-02-29 19:31:27 +01:00
Martin Diehl 334eb93421 infere data type automatically
need for IPF color autput
2020-02-27 21:19:56 +01:00
Martin Diehl 75528064e9 Merge branch 'development' into DADF5-multiprocessing 2020-02-25 17:58:07 +01:00
Martin Diehl 1683e18c1f keep order
mainly relevant for increments
2020-02-25 11:53:02 +01:00
Martin Diehl f256493e79 fixed indentation 2020-02-22 01:05:02 +01:00
Martin Diehl 9d4cbe5168 4 space indentation 2020-02-22 00:19:27 +01:00
Martin Diehl fd11f073f0 fixing prospector complaints 2020-02-22 00:11:00 +01:00
Martin Diehl a6279c8284 use separate test definitions per class 2020-02-22 00:03:54 +01:00
Martin Diehl be45d62f53 polishing 2020-02-21 23:59:33 +01:00
Martin Diehl dc9bfd1849 Merge branch 'DADF5_point_calculations-2' into DADF5-multiprocessing 2020-02-21 23:57:22 +01:00
Martin Diehl 12c69ed3ca Merge branch 'DADF5_point_calculations-2' of magit1.mpie.de:/damask/DAMASK into DADF5_point_calculations-2 2020-02-21 23:56:56 +01:00
Martin Diehl f20a82ce6d migrate name: damask.Result better than damask.DADF5 2020-02-21 23:56:18 +01:00
Martin Diehl 1dddfa040e adjusting indents
should be always 4 spaces
2020-02-21 23:25:22 +01:00
Martin Diehl f604314207 polishing 2020-02-21 23:16:25 +01:00
Martin Diehl e9bf02a52c one underscore commonly denotes internal functions 2020-02-21 21:37:02 +01:00
Martin Diehl 0774e12169 report progress 2020-02-21 21:27:08 +01:00
Martin Diehl c2ae657f5b arguments should be documented 2020-02-21 21:04:23 +01:00
Martin Diehl 0358e7343b polishing 2020-02-21 19:39:17 +01:00
Martin Diehl 05476ff85c parallelize addition of datasets
threads does not work, muliprocessing shows good performance: Overhead
is small compared to the performance gain.
Especially useful for long running functions of the orientation class
2020-02-21 19:25:37 +01:00
Martin Diehl b9966b95e0 consistently use small letters 2020-02-21 18:52:58 +01:00
Martin Diehl ffb80981b1 use central functionality 2020-02-21 17:49:17 +01:00
Martin Diehl 6a0760a13c documentation polishing 2020-02-21 17:42:01 +01:00
Martin Diehl a433f7ef54 style unification
backport from dadf5-usability branch
2020-02-21 13:03:50 +01:00
Martin Diehl 16ddd9c5b2 better name
backport from dadf5-usability branch
2020-02-21 12:20:42 +01:00
Martin Diehl 58610e23a7 use 4 space for indentation 2020-02-21 10:53:44 +01:00
Martin Diehl c84a6e90c9 no 'dangling' functions
@staticmethod is what we need here
2020-02-21 10:45:14 +01:00
Martin Diehl c1caef4bc9 fixing prospector complaints 2020-02-21 08:13:10 +01:00
Martin Diehl 98f5c601a3 line too long 2020-02-21 07:58:10 +01:00
Martin Diehl f6c921e811 Merge branch 'development' into DADF5_point_calculations-2 2020-02-21 07:56:19 +01:00
Martin Diehl 8ae3346bd4 constituents/components are not handled by "view" (active) 2020-02-21 07:46:55 +01:00
Martin Diehl c3740b4ba0 follow 4 space indentation convention 2020-02-21 07:45:05 +01:00
Martin Diehl effaef46db simplified interface 2020-02-21 07:39:53 +01:00
Martin Diehl 9beca6488c more verbose description 2020-02-21 07:21:45 +01:00
Martin Diehl 1e1cb3f151 avoid long modules 2020-02-20 23:29:12 +01:00
Martin Diehl 5ce143e36e numpy is already imported 2020-02-20 23:17:54 +01:00
Martin Diehl 898c696ef7 avoid long modules 2020-02-20 23:16:35 +01:00
Martin Diehl 16ed0623af 4 space indentation (as suggested by PEP) 2020-02-20 23:10:38 +01:00
Martin Diehl a670ab269f proper spacing 2020-02-20 22:50:54 +01:00
Martin Diehl a608310920 correct printing of error messages
'{}'.format(np.ones(3)) gives only '1', but we want to see '[1 1 1]'
2020-02-20 18:59:57 +01:00
Martin Diehl 251d55fe09 current thread pool is useless for performance
https://stackoverflow.com/questions/33969151
https://stackoverflow.com/questions/10789042
2020-02-16 11:00:09 +01:00
Martin Diehl 95cfa3f173 more tests... 2020-02-16 10:04:33 +01:00
Martin Diehl 065fc9ffde using DAMASK_NUM_THREADS controls # workers for add_XXX 2020-02-16 09:49:55 +01:00
Martin Diehl 36c1744a59 proper indentation 2020-02-16 09:21:21 +01:00
Martin Diehl a70721df53 write out proper Miller indices 2020-02-15 20:09:24 +01:00
Martin Diehl 5235c27ad0 making new mechanics functions available for DADF5
+ testing them
2020-02-15 17:56:20 +01:00
Martin Diehl 118c03c485 tests for new functionality 2020-02-15 16:59:30 +01:00
Martin Diehl ad062ada6b option (as in addSpectralDecomposition) 2020-02-15 16:26:56 +01:00
Martin Diehl 5822ad8b05 new functions (takeover from old branch) 2020-02-15 15:13:56 +01:00
Martin Diehl e46395be41 sorted alphabetically 2020-02-15 14:21:23 +01:00
Martin Diehl 79533b075e eigenvalues is more specific name than principal components 2020-02-15 13:56:15 +01:00
Martin Diehl c2c84d698f Merge remote-tracking branch 'origin/development' into MiscImprovements 2020-02-11 17:11:43 +01:00
Martin Diehl 57c70cd5d5 preparing removal 2020-02-04 00:12:08 +01:00
Martin Diehl 4999f5aa4d first steps of removing deprecated
use faster, pandas-based alternative 'table'
2020-02-03 21:40:10 +01:00
Martin Diehl 4c28e7f626 better have tests 2020-02-01 09:44:21 +01:00
Martin Diehl 4d07ab7519 prospector complained 2020-01-29 16:31:05 +01:00