Commit Graph

1723 Commits

Author SHA1 Message Date
Philip Eisenlohr 6bd23715b8 added multiplication as color repeat functionality 2022-01-24 11:56:33 +01:00
Martin Diehl e320623a40 simplified
dict keeps order since Python 3.6
2022-01-23 14:22:36 +01:00
Martin Diehl 3e584570b2 polishing 2022-01-23 14:15:25 +01:00
Martin Diehl 803c85c2ef Merge remote-tracking branch 'origin/development' into typehints_table 2022-01-23 12:45:06 +01:00
Test User efd9b37235 [skip ci] updated version information after successful test of v3.0.0-alpha5-475-g160eb1c60 2022-01-23 12:43:29 +01:00
Philip Eisenlohr 160eb1c600 Merge branch 'typehints_vtk_util' into 'development'
02 Typehints vtk util

See merge request damask/DAMASK!502
2022-01-23 09:31:47 +00:00
Martin Diehl 2bbc4c4e46 polishing 2022-01-22 09:04:14 +01:00
Martin Diehl a35a01d41b iterable can be any Iterable, not just a Sequence
need to give N_iter only in cases when iterable is not a Sequence
2022-01-22 07:50:52 +01:00
Martin Diehl 7e9ce682e7 correcting types
Not really sure if srepr and friends take really 'Any'. They take
everything that can be casted (piecewise) to a string. So keep it open
at the moment and leave out a typehint
2022-01-22 06:56:42 +01:00
Test User beb62e1c0a [skip ci] updated version information after successful test of v3.0.0-alpha5-460-gfc7c165af 2022-01-22 02:46:29 +01:00
Daniel Otto de Mentock 76ccd4aaaa replaced typehint in shapeshifter function 2022-01-21 11:45:14 +01:00
Daniel Otto de Mentock c2fa17e903 Merge branch 'development' of git.damask.mpie.de:damask/DAMASK into typehints_vtk_util 2022-01-21 06:19:28 +01:00
Test User 4b601a38e7 [skip ci] updated version information after successful test of v3.0.0-alpha5-457-g75040047c 2022-01-21 03:05:10 +01:00
Daniel Otto de Mentock bfa7fd6ecc Merge branch 'development' into 'typehints_vtk_util'
# Conflicts:
#   python/damask/_grid.py
2022-01-20 16:54:23 +00:00
Test User 48f38e74d7 [skip ci] updated version information after successful test of v3.0.0-alpha5-454-gb64a603ef 2022-01-20 15:11:14 +01:00
Daniel Otto de Mentock 77f22318a8 Typehint improvements 2022-01-20 11:52:56 +00:00
Test User 6fb4320fc2 [skip ci] updated version information after successful test of v3.0.0-alpha5-451-g3fbf1459d 2022-01-19 17:02:22 +01:00
Daniel Otto de Mentock f9f0972e3e added FloatSequence type to vtk.from_rectilinear_gridfunction 2022-01-19 10:58:33 +01:00
Daniel Otto de Mentock 5d8fff423e replaced vtk.init argument type with vtkDataSet 2022-01-19 10:40:29 +01:00
Daniel Otto de Mentock 23743c73d4 adjusted util.hybrid_IA function argument 2022-01-19 10:37:22 +01:00
Martin Diehl 632180d67e not needed 2022-01-18 14:27:47 +01:00
Martin Diehl 869fdc847a Merge branch 'development' into misc-improvements 2022-01-18 11:02:18 +01:00
Test User 4cd260881a [skip ci] updated version information after successful test of v3.0.0-alpha5-441-g8b5122f52 2022-01-17 23:52:17 +01:00
Daniel Otto de Mentock 4d3e0e6a51 Merge branch 'development' of git.damask.mpie.de:damask/DAMASK into typehints_table 2022-01-17 16:07:19 +01:00
Daniel Otto de Mentock 777f2e7868 Merge branch 'development' of git.damask.mpie.de:damask/DAMASK into typehints_orientation_rotation 2022-01-17 15:38:45 +01:00
Daniel Otto de Mentock 7b158ba108 added typehints for vtk module 2022-01-17 15:00:25 +01:00
Daniel Otto de Mentock adf7abbda6 added typehints for util module 2022-01-17 14:58:08 +01:00
Martin Diehl a545baebbf VTK polishing
avoid segmentation fault (also allows testing)
2022-01-16 19:23:12 +01:00
Martin Diehl 6657e5c4eb testing a few corner cases
behavior for __eq__ is now following python standard, comparing to wrong
class gives False
2022-01-15 13:22:15 +01:00
Martin Diehl b796bc0697 simplified 2022-01-14 20:44:34 +01:00
Daniel Otto de Mentock 01cc6ffd2c added minor grid adjustments after initial merge of typehints_grid branch 2022-01-14 17:56:58 +01:00
Daniel Otto de Mentock dd82c3c8f0 rewrote table module adjustments to not make use of _io module 2022-01-14 15:08:40 +01:00
Daniel Otto de Mentock 25513d572b minor type adjustment to rotation module removed superfluous Sequence type from orientation module 2022-01-14 14:55:08 +01:00
Daniel Otto de Mentock aabeee9de1 Replaced relevant Sequences with FloatSequence and IntSequence types 2022-01-14 14:37:48 +01:00
Test User 6da3f0fa51 [skip ci] updated version information after successful test of v3.0.0-alpha5-389-ga000e477c 2022-01-14 07:24:12 +01:00
Daniel Otto de Mentock 4ba9935ccc Merge branch 'development' of git.damask.mpie.de:damask/DAMASK into typehints_orientation_rotation 2022-01-13 17:23:24 +01:00
Daniel Otto de Mentock a000e477cf Merge branch 'typehints_grid' into 'development'
added fist typehints for _grid module

See merge request damask/DAMASK!474
2022-01-13 16:21:19 +00:00
Daniel Otto de Mentock db21e82fe3 adjusted data.column retrieval in save method 2022-01-13 17:15:54 +01:00
Daniel Otto de Mentock b4088b666e adjusted filehandle conditional type 2022-01-13 13:27:50 +01:00
Martin Diehl 3acabcdc7f docstring adjustments 2022-01-12 23:57:21 +01:00
Test User 7410463067 [skip ci] updated version information after successful test of v3.0.0-alpha5-379-g731222d09 2022-01-12 23:41:05 +01:00
Martin Diehl 2c1231a806 using best practices from grid_filters 2022-01-12 23:06:48 +01:00
Martin Diehl 9a8e7c8445 Merge branch 'development' into typehints_grid 2022-01-12 19:53:35 +01:00
Daniel Otto de Mentock ffa80f6bef added typehints for table module 2022-01-12 17:10:13 +01:00
Daniel Otto de Mentock 731222d099 Merge branch 'grid_filter-flexible-typehints' into 'development'
allow flexible arguments for 1D arguments

See merge request damask/DAMASK!494
2022-01-12 13:18:40 +00:00
Martin Diehl 410a515afc allow flexible arguments for 1D arguments 2022-01-12 13:18:38 +00:00
Test User f27efb6074 [skip ci] updated version information after successful test of v3.0.0-alpha5-375-g76fe2d2b3 2022-01-11 23:56:22 +01:00
Franz Roters 76fe2d2b36 Merge branch 'misc-improvements' into 'development'
polishing

See merge request damask/DAMASK!497
2022-01-11 15:45:09 +00:00
Martin Diehl 19f4f2eaec nice example
too simple for full-flegded ipython notebook
2022-01-11 00:36:49 +01:00
Test User c065e2b2f1 [skip ci] updated version information after successful test of v3.0.0-alpha5-360-gdd6e9a016 2022-01-08 18:03:24 +01:00
Test User e3a233a681 [skip ci] updated version information after successful test of v3.0.0-alpha5-358-g81a7c32a5 2022-01-07 21:38:12 +01:00
Daniel Otto de Mentock f404fea105 Merge branch 'development' into 'typehints_grid'
# Conflicts:
#   python/damask/_grid.py
2022-01-07 15:04:41 +00:00
Test User a2f6475baa [skip ci] updated version information after successful test of v3.0.0-alpha5-355-gc29428a60 2022-01-07 07:23:43 +01:00
Daniel Otto de Mentock 0a31ff0980 added type:ignore statement to broken line 2022-01-06 14:33:41 +01:00
Martin Diehl d18ec3eae1 Merge remote-tracking branch 'origin/improved-reporting' into misc-improvements 2022-01-05 14:54:20 +01:00
Daniel Otto de Mentock e60d41d5e4 merge with current development branch 2022-01-05 14:06:06 +01:00
Martin Diehl 100565c79b slip systems for tI (bct)
simple test. Not the best, but allows easy comparison with
- grep NTWINSYSTEM\ = src/lattice.f90
- grep NSLIPSYSTEM\ = src/lattice.f90
2022-01-05 08:08:10 +01:00
Martin Diehl 0f26da0ec1 nicer reporting 2022-01-04 17:25:01 +01:00
Daniel Otto de Mentock 9a9ec11c29 added generator typehint to from_random function 2022-01-03 16:44:27 +01:00
Test User e8b69c7871 [skip ci] Merge branch 'master' into development 2022-01-03 15:48:22 +01:00
Test User c51976e2a9 [skip ci] updated version information after successful test of v3.0.0-alpha5-340-g510a26ded 2022-01-03 15:47:34 +01:00
Daniel Otto de Mentock 5702614c4f expanded rng_seed typehint to array_like type
adjusted alpha and beta types for from_fiber_component to also accept 
lists
removed superfluous kwargs argument in from_ODF and from_parallel 
functions
2022-01-03 15:35:28 +01:00
Daniel Otto de Mentock a177e32ff2 Merge branch 'simplified-colormap' into 'development'
simplified

See merge request damask/DAMASK!487
2022-01-03 13:15:00 +00:00
Test User 3dd37cdf22 [skip ci] updated version information after successful test of v3.0.0-alpha5-338-g4a0a1f7ac 2022-01-03 02:19:10 +01:00
Test User e19c17c2bc [skip ci] updated version information after successful test of v3.0.0-alpha5-336-g6871eb302 2021-12-28 14:19:37 +01:00
Franz Roters 6871eb3026 Merge branch 'util-project_homochoric' into 'development'
Lambert azimuthal equal-area (laea) projection

See merge request damask/DAMASK!476
2021-12-28 10:19:18 +00:00
Philip Eisenlohr b2d0fd8ff5 Lambert azimuthal equal-area (laea) projection 2021-12-28 10:19:17 +00:00
Test User 2d347e1be1 [skip ci] updated version information after successful test of v3.0.0-alpha5-333-g01cd92755 2021-12-26 21:05:58 +01:00
Test User 53c81e4af1 [skip ci] Merge branch 'master' into development 2021-12-25 07:15:46 +01:00
Test User 68b34f6022 [skip ci] updated version information after successful test of v3.0.0-alpha5-316-gd8ef23fc9 2021-12-25 07:15:40 +01:00
Philip Eisenlohr 2ea2930638 Merge branch 'keyword-view' into 'development'
using keywords instead of strings to control view

Closes #133

See merge request damask/DAMASK!484
2021-12-24 23:07:10 +00:00
Test User 368f4ac985 [skip ci] updated version information after successful test of v3.0.0-alpha5-313-g8c2266bc5 2021-12-23 22:35:44 +01:00
Test User 6e833d2327 [skip ci] updated version information after successful test of v3.0.0-alpha5-311-g38d497819 2021-12-22 12:56:07 +01:00
Martin Diehl 508083082d simplified 2021-12-21 23:50:43 +01:00
Test User 3e01f72daa [skip ci] updated version information after successful test of v3.0.0-alpha5-308-gb4f3ac457 2021-12-21 22:19:29 +01:00
Martin Diehl 25ab62402a Merge remote-tracking branch 'origin/development' into keyword-view 2021-12-19 22:58:38 +01:00
Test User f106e1bcb1 [skip ci] Merge branch 'master' into development 2021-12-18 22:45:01 +01:00
Test User 28449393bf [skip ci] updated version information after successful test of v3.0.0-alpha5-297-g5ecfba1e5 2021-12-18 22:44:25 +01:00
Martin Diehl 0468bfd3e1 Use ArrayLike for numpy >= 1.20 2021-12-18 17:21:46 +00:00
Martin Diehl 2fc25c6fa9 correct reporting 2021-12-17 14:31:51 +01:00
Martin Diehl a1e42af860 easier to understand 2021-12-17 10:44:41 +01:00
Martin Diehl c1eabc3384 simplified interface 2021-12-17 10:31:41 +01:00
Martin Diehl 0b6af19e54 use of keywords is more intuitive
code needs cleaning after revoming of 'what' and 'datasets'. For the
moment, keep the old style for compatibility with existing evaluation
scripts
2021-12-17 09:48:33 +01:00
Martin Diehl 501465dfd1 more alpha releases than expected
hopefully, all DAMASK 2 users have been migrated once 3.0 is released
2021-12-17 09:42:10 +01:00
Test User 74b0699156 [skip ci] Merge branch 'master' into development 2021-12-15 12:04:06 +01:00
Test User 67cc36daf3 [skip ci] updated version information after successful test of v3.0.0-alpha5-283-gdacd08f39 2021-12-15 12:04:02 +01:00
Sharan Roongta 6eccc6a4a8 Merge branch 'colormap-at' into 'development'
Colormap fractional interpolation

See merge request damask/DAMASK!477
2021-12-15 10:17:10 +00:00
Test User d30d3b2128 [skip ci] updated version information after successful test of v3.0.0-alpha5-275-g3b9822ad6 2021-12-14 20:21:48 +01:00
Daniel Otto de Mentock 65633ee6b1 added typehints for rotation.average function [skip ci] 2021-12-14 17:19:00 +01:00
Daniel Otto de Mentock cef885cfde added first typehints for rotation and orientation modules 2021-12-14 17:05:00 +01:00
Daniel Otto de Mentock 3b9822ad67 Revert "added first typehints for rotation and orientation modules"
This reverts commit 4235c70aea
2021-12-14 16:04:18 +00:00
Daniel Otto de Mentock 4235c70aea added first typehints for rotation and orientation modules 2021-12-14 17:01:40 +01:00
Philip Eisenlohr 32595299c9 minimal clean API for Colormap.at 2021-12-13 17:44:24 -05:00
Test User a89eff2991 [skip ci] updated version information after successful test of v3.0.0-alpha5-272-g3192a31e1 2021-12-12 02:03:10 +01:00
Test User ad5262a7a8 [skip ci] updated version information after successful test of v3.0.0-alpha5-270-g6e36c4c30 2021-12-11 22:21:22 +01:00
Eureka Pai 2b6283bbe3 flexibility to return with alpha channel and/or as string 2021-12-10 12:53:01 -05:00
Franz Roters 7bb6707b0e [skip ci] Web page was moved 2021-12-10 18:07:04 +01:00
Eureka Pai 947bf946e1 added Colormap.at(fraction) to interpolate 2021-12-10 11:31:26 -05:00
Test User 63c76abed8 [skip ci] updated version information after successful test of v3.0.0-alpha5-263-gfbbe5ec00 2021-12-09 00:09:39 +01:00
Philip Eisenlohr fbbe5ec006 fixed typo 2021-12-08 21:04:22 +00:00
Test User 811879788a [skip ci] updated version information after successful test of v3.0.0-alpha5-261-g722c9828a 2021-12-07 11:37:02 +01:00
Martin Diehl cf9f770866 Merge branch 'typehints_crystal' into 'development'
Typehints for crystal

See merge request damask/DAMASK!464
2021-12-06 23:49:13 +00:00
Daniel Otto de Mentock be95f9a98a Typehints for crystal 2021-12-06 23:49:12 +00:00
Test User 992f848296 [skip ci] Merge branch 'master' into development 2021-12-06 18:34:35 +01:00
Test User 596a8ecd11 [skip ci] updated version information after successful test of v3.0.0-alpha5-251-g65c4417a2 2021-12-06 18:34:14 +01:00
Sheng Zhang a4cd663fc0 Merge branch 'no-2prism-hex' into development 2021-12-06 16:45:01 +01:00
Daniel Otto de Mentock 7c7c3926b7 added array conversion to ambiguous types in grid_filters.coordinates0_point function 2021-12-06 15:48:57 +01:00
Daniel Otto de Mentock 1de12bb402 removed direct attribute assignments for size and origin 2021-12-06 15:48:19 +01:00
Daniel Otto de Mentock 5558c301fa added fist typehints for _grid module 2021-12-06 14:22:52 +01:00
Martin Diehl fe2123bae4 2. order prismatic systems are not needed
not clear for which material they have been introduced, according to
T.R. Bieler and P. Eisenlohr they are typicall not active in any
material of interest
2021-12-06 12:23:24 +01:00
Martin Diehl 7b187eb370 new convention 2021-12-06 07:55:05 +01:00
Test User cef8b06dc0 [skip ci] updated version information after successful test of v3.0.0-alpha5-244-gb57351045 2021-12-04 05:43:51 +01:00
Philip Eisenlohr b57351045b follow new convention for "shape" and "len" in docstrings 2021-12-04 03:39:33 +01:00
Martin Diehl 2a6b37a0e5 eq. according to mypy recommendation
note that raising 'NotImplemented' means that __eq__ of the 'other' is
evaluated
https://stackoverflow.com/questions/54801832
https://newbedev.com/why-does-defining-the-argument-types-for-eq-throw-a-mypy-type-error
2021-12-03 12:35:25 +01:00
Martin Diehl 99166a7ce2 Merge remote-tracking branch 'origin/colormap-docstrings' into development 2021-12-03 12:18:24 +01:00
Test User 389d08bdcc [skip ci] updated version information after successful test of v3.0.0-alpha5-234-g66fddda0b 2021-12-03 10:08:09 +01:00
Test User 55b8ea9db9 [skip ci] updated version information after successful test of v3.0.0-alpha5-230-g7a78a25e5 2021-12-03 07:39:56 +01:00
Martin Diehl 7a78a25e5c Merge branch 'config-init-yaml' into 'development'
extend config init to allow YAML string and key=value pairs

See merge request damask/DAMASK!470
2021-12-03 04:37:23 +00:00
Philip Eisenlohr dc3db90ce0 fixed typo: colormodel --> color model 2021-12-02 18:59:31 -05:00
Philip Eisenlohr d5da47bf71 extend config init to allow YAML string and key=value pairs 2021-12-02 18:20:27 -05:00
Test User 88de2720d2 [skip ci] updated version information after successful test of v3.0.0-alpha5-227-g727dd8936 2021-12-02 16:24:54 +01:00
Franz Roters 727dd8936d use latest Marc version 2021-12-02 08:50:59 +01:00
Martin Diehl 5abfe3c214 Merge remote-tracking branch 'origin/development' into MSC-Version 2021-12-01 15:35:49 +01:00
Martin Diehl 3a51e1119b text files on Unix should end with a new line character 2021-11-30 13:11:40 +01:00
Test User 51b7a00734 [skip ci] updated version information after successful test of v3.0.0-alpha5-210-g7e7098baf 2021-11-29 21:14:49 +01:00
Test User 77bced998f [skip ci] updated version information after successful test of v3.0.0-alpha5-202-g96e4cb591 2021-11-29 10:35:09 +01:00
Test User a0e0f329fd [skip ci] updated version information after successful test of v3.0.0-alpha5-197-g1fc876358 2021-11-28 03:10:26 +01:00
Test User 98b699359f [skip ci] updated version information after successful test of v3.0.0-alpha5-191-gf32a78861 2021-11-27 00:46:28 +01:00
Philip Eisenlohr f32a788614 Merge branch 'dynamic-C' into 'development'
temperature dependend elastic constants.

See merge request damask/DAMASK!465
2021-11-26 21:41:36 +00:00
Philip Eisenlohr 4d63da6aee get_file_handle suffix is optional 2021-11-26 11:34:43 -05:00
Test User d52a14f74f [skip ci] updated version information after successful test of v3.0.0-alpha5-172-g41d78e2c6 2021-11-26 13:28:55 +01:00
Martin Diehl 4ba7c9e670 polishing
casting numpy.bool_ to bool is a little bit annoying. Mabye using Union[bool, np.bool_] is the better
solution, it does not require any changes to the actual code and there is some
hope that it will get fixed in mypy https://github.com/numpy/numpy/issues/18876
2021-11-25 21:29:34 +01:00
Philip Eisenlohr bd908dc425 test __eq__; polish help strings 2021-11-25 13:14:34 -05:00
Franz Roters 9132ce96f1 corrected python error 2021-11-25 17:36:41 +01:00
Franz Roters f435062a1d support for Marc2021.3.1 2021-11-25 17:30:22 +01:00
Martin Diehl fb8c515a98 capitalize constants
not sure whether we should make exceptions for k_B and T_room
2021-11-25 11:52:52 +01:00
Test User 0cf78da46d [skip ci] updated version information after successful test of v3.0.0-alpha5-164-gdc993bc6f 2021-11-25 04:21:18 +01:00
Philip Eisenlohr dc993bc6f9 Merge branch 'typehints_colormap' into 'development'
Typehints colormap

See merge request damask/DAMASK!460
2021-11-24 23:15:30 +00:00
Martin Diehl 3cae915e47 not needed
a = [] is already a list
2021-11-24 21:12:13 +01:00
Martin Diehl adb1d4ccf9 version numbers are no floating point numbers 2021-11-24 17:29:07 +01:00
Martin Diehl 757ba4dba2 in-line with pathlib.Path 2021-11-24 17:28:00 +01:00
Philip Eisenlohr 3bf10127b8 added __eq__ and test 2021-11-23 17:46:38 -05:00
Philip Eisenlohr 3e1a6dcab7 polished help; streamlined from_range() 2021-11-23 17:20:07 -05:00
Test User 2ae8b4a9f5 [skip ci] updated version information after successful test of v3.0.0-alpha5-155-gbf76d9f3a 2021-11-23 21:31:17 +01:00
Martin Diehl 889ab87914 simplified and corrected
- Optional not needed for 'None' argument
- Use TextIO for typehints, TextIOWrapper seems to cause problems
- Test for tuple/list input for public functions
- internal functions that are always called with np.ndarray don't need
  to offer flexibility. They might work, but we don't guarantee
  anything.
2021-11-23 17:59:56 +01:00
Martin Diehl 3410a8d4cb follow order of imports
- python standard library
- third party
- DAMASK internal
2021-11-23 16:34:50 +01:00
Daniel Otto de Mentock 8797282d37 added typehints for colormap module 2021-11-22 17:15:22 +01:00
Test User 1396ec6f56 [skip ci] updated version information after successful test of v3.0.0-alpha5-140-g202af3242 2021-11-18 23:13:16 +01:00
Test User 52d0ba4a74 [skip ci] updated version information after successful test of v3.0.0-alpha5-135-ga3f74994b 2021-11-17 19:56:38 +01:00
Test User b2fd78b639 [skip ci] updated version information after successful test of v3.0.0-alpha5-128-g5a901a42f 2021-11-17 13:45:27 +01:00