Commit Graph

2349 Commits

Author SHA1 Message Date
Martin Diehl 92ae86b636 Merge branch 'fix-mypy-no-implicit-optional' into 'development'
PEP 484 compatibility (no-implicit-optional in mypy)

See merge request damask/DAMASK!664
2022-11-25 21:25:33 +00:00
Martin Diehl 77be2c0d4c standard way to report 2022-11-25 07:00:15 +01:00
Martin Diehl e10f9fa299 not useful here
not a general convention, is documented for the affected from_/as_
methods
2022-11-25 01:25:36 +01:00
Martin Diehl f8844285d7 putting understanding of hybridIA into code 2022-11-25 01:15:39 +01:00
Martin Diehl eea0c4c44c return was missing 2022-11-24 10:15:23 +01:00
Philip Eisenlohr 6315f97f4a added explicit Optional type hint 2022-11-22 16:26:15 -05:00
Franz Roters 4a49523720 Merge branch 'mypy-etc-polish' into 'development'
Collection of small polishing steps

See merge request damask/DAMASK!659
2022-11-22 14:39:52 +00:00
Philip Eisenlohr cbe2e74cdd Collection of small polishing steps 2022-11-22 14:39:51 +00:00
Martin Diehl 815d825fac Merge branch 'material_add' into 'development'
configMaterial functionality

See merge request damask/DAMASK!651
2022-11-20 12:59:01 +00:00
Philip Eisenlohr 6907ca60b3 adjustments to make mypy happy 2022-11-19 20:55:23 -05:00
Daniel Otto de Mentock 5017aabcea util.extend_docstring: proper layout for extended class (incl. current return type) 2022-11-19 08:10:00 +00:00
Philip Eisenlohr 7e5a3a12ab proper dealing with default/mandatory items in material_add 2022-11-18 16:30:26 -05:00
Philip Eisenlohr d374f6a02c revert, since not working in python3.8... 2022-11-18 11:01:01 -05:00
Philip Eisenlohr 822a098659 cleaner way to specify default dict entries 2022-11-18 10:06:15 -05:00
Philip Eisenlohr ce4b373f9c Merge branch 'development' into '225-tolerate-non-unit-quaternion'
# Conflicts:
#   python/damask/_rotation.py
2022-11-18 00:48:45 +00:00
Philip Eisenlohr 87579dff11 extensive style polish; no functional changes 2022-11-17 18:39:32 -05:00
Martin Diehl 05974fb300 Merge branch 'polish-rotation-error-determination' into 'development'
cleaner and more efficient determination of ValueErrors

See merge request damask/DAMASK!656
2022-11-17 17:52:14 +00:00
Franz Roters bdd85a414c support for MSC.Marc 2022.2 2022-11-17 07:12:27 +00:00
Philip Eisenlohr 1f947245bb Merge branch 'development' into '225-tolerate-non-unit-quaternion'
# Conflicts:
#   python/damask/_rotation.py
#   python/tests/test_Rotation.py
2022-11-16 20:27:02 +00:00
Martin Diehl d887f0a9d8 better group if/if-elif cases
one line if only when no elif follows to avoid confusion
2022-11-16 21:13:13 +01:00
Philip Eisenlohr 25979fcd77 Merge branch 'development' into 'polish-rotation-error-determination'
# Conflicts:
#   python/damask/_rotation.py
2022-11-16 18:05:36 +00:00
Martin Diehl 5d656d9c76 Merge branch 'rotation-test-coverage' into 'development'
increase test coverage to 100%

See merge request damask/DAMASK!655
2022-11-16 14:31:43 +00:00
Philip Eisenlohr 740965df7c cleaner and more efficient determination of ValueErrors 2022-11-15 17:03:57 -05:00
Philip Eisenlohr 23d2337fb2 add option to normalize quaternions 2022-11-15 16:11:29 -05:00
Philip Eisenlohr 1dbf9ae9bc increase test coverage to 100% 2022-11-15 11:46:52 -05:00
Philip Eisenlohr 584d5b4213 Merge branch 'simplify-grid-scale' into 'development'
less repetition

See merge request damask/DAMASK!654
2022-11-15 14:44:53 +00:00
Philip Eisenlohr 045f1d39a1 add shorthand function for formatting 2022-11-14 14:52:07 -05:00
Philip Eisenlohr fa69a1876b unify X or list/seq/collection of X --> (A/B/C of) X in docstrings 2022-11-14 09:09:45 -05:00
Martin Diehl ba4ac5c108 less repetition 2022-11-14 12:42:13 +01:00
Philip Eisenlohr 2e7d59ab43 brief but comprehensive "is_complete" reporting 2022-11-11 18:07:48 -05:00
Sharan Roongta 4fc5ba54df dummy phase dict need to be added for any new material added (similar to dream3D) 2022-11-11 18:47:01 +01:00
Philip Eisenlohr 349a39609e Robust translation for view.times 2022-11-11 06:03:14 +00:00
Sharan 13df12be1b initialising dummy arguments with None, making few changes on what is_complete should do 2022-11-11 01:54:59 +01:00
Martin Diehl 26284ba2df accidentally added 2022-11-10 09:37:16 +01:00
Philip Eisenlohr 02d785f8f1 comprehensive simulation_setup tests 2022-11-09 17:32:14 -05:00
Philip Eisenlohr 5c6d21e9cf only create subdir when dataset 2022-11-09 17:32:14 -05:00
Philip Eisenlohr 4f6a1720cc recursive list of setup files; no printing but PermissionError 2022-11-09 17:32:14 -05:00
Sharan Roongta 443d796643 phase and homogenization dict to be updated when new material added 2022-11-09 23:13:45 +01:00
Martin Diehl 75cf446654 including restart information
needed updated tests after generating new HDF5 file
2022-11-09 22:50:32 +01:00
Martin Diehl b2db825fca newest file format 2022-11-09 22:06:20 +01:00
Philip Eisenlohr 1a748ec5aa shorter function name; setup_files is property 2022-11-09 09:39:47 -05:00
Daniel Otto de Mentock 836feaa5f4 polishing 2022-11-09 12:48:48 +01:00
Daniel Otto de Mentock 1cdb7ef09f function to list available setup files can be useful 2022-11-09 12:48:37 +01:00
Daniel Otto de Mentock ce7d2af6e3 simulation setup export function naming and description was inaccurate 2022-11-09 12:47:47 +01:00
Philip Eisenlohr b5b861afdd Merge branch 'result-export-DADF5' into 'development'
export to new DADF5 file

See merge request damask/DAMASK!644
2022-11-08 19:01:48 +00:00
Martin Diehl 4f0db64e15 grid assemble + corrected grid.scale 2022-11-08 18:52:08 +00:00
Martin Diehl 59150b791f support the user 2022-11-08 12:39:38 +01:00
Philip Eisenlohr 868a4dda96 remove numpy where unnecessary 2022-11-07 14:56:38 -05:00
Sharan Roongta 88206d307b default was incorrect and some useful examples added 2022-11-07 18:30:46 +01:00
Philip Eisenlohr 13d0f3ae8a more precise description of `times_in_range` 2022-11-07 12:21:26 -05:00
Philip Eisenlohr f88ac18c8a consistent "optional" in parameter description 2022-11-07 12:18:00 -05:00
Martin Diehl 015f1ec741 possibility to export into new DADF5 file 2022-11-07 10:10:13 +01:00
Martin Diehl 0fa9631675 testing output of export_result 2022-11-06 23:16:30 +01:00
Daniel Otto de Mentock 2c3da9c1bf added custom path export option to Result.export_* functions 2022-11-06 18:10:23 +00:00
Martin Diehl 8caf09aff7 correct inclusion of dependencies 2022-10-12 08:01:33 +02:00
Martin Diehl 14c46d4c2e typo 2022-10-11 07:43:05 +02:00
Daniel Otto de Mentock 580e01bd1c fix grid add primitive bug 2022-08-29 11:44:50 +00:00
Martin Diehl 31fe894c78 Merge branch 'docstring-polishing' into 'development'
increasing consistency

See merge request damask/DAMASK!616
2022-08-17 04:41:11 +00:00
Martin Diehl 7530d457a2 documenting new behavior 2022-08-15 08:04:02 +02:00
Philip Eisenlohr ef8891797a Merge branch 'development' into empty-table-init 2022-08-12 16:15:33 -04:00
Daniel Otto de Mentock 400323a9aa Modified shapeshifter function 2022-08-12 18:45:40 +00:00
Martin Diehl b7cd0c1d51 increasing consistency 2022-08-10 20:51:50 +02:00
Daniel Otto de Mentock 66f129273c Merge branch 'magic_methods_default_docstrings' into 'development'
Added standard magic method descriptions to magic methods

Closes #112

See merge request damask/DAMASK!606
2022-08-10 15:35:56 +00:00
Philip Eisenlohr 009320c9fc polishing of doc-strings 2022-08-09 09:29:22 -04:00
Martin Diehl fb38340184 glitch in example 2022-07-27 12:56:37 +02:00
Martin Diehl 44d9663ff0 standard name 2022-07-26 21:55:17 +02:00
d.mentock 3492dfcd3b Adding consistency to docstring structure 2022-07-08 18:07:07 +02:00
d.mentock df1f362ed3 it's useful for users to see standard docstrings in magic methods 2022-07-08 18:06:41 +02:00
Philip Eisenlohr 7082eab366 small test to demonstrate alternative Table init 2022-07-08 18:01:36 +02:00
d.mentock 77fa2a1d93 adjustments to patchfile required for marc2021/2022 spack packages 2022-06-15 15:48:34 +02:00
Daniel Otto de Mentock 1328235192 Merge branch 'util_module_import_style' into 'development'
util: module visibility

Closes #150

See merge request damask/DAMASK!603
2022-06-13 09:06:04 +00:00
Martin Diehl 1a44b6e692 white space adjustments 2022-06-10 14:03:43 +02:00
d.mentock d88a139a41 pyflakes bug causes error without comment 2022-06-10 12:03:50 +02:00
d.mentock afbafd1d98 util imports need prefix instead of __all__ definition to prevent namespace pollution 2022-06-10 12:00:54 +02:00
Martin Diehl bcd3d00960 fixed test
this tests should ensure that each Orientation has exactly one symmetrically
equivalent representation. It was not fully correct before and works as expected
after 8fefc46f38
2022-06-10 09:26:15 +02:00
Martin Diehl cdd3b44519 using more precise coefficients also in test
changes in _rotation.py are just cosmetic
2022-06-09 23:54:56 +02:00
Philip Eisenlohr d10516e0b6 fixed typo 2022-06-09 17:23:16 -04:00
Philip Eisenlohr 8fefc46f38 fixed FZ conditions and tightened tolerance to accommodate higher precision "tfit" 2022-06-09 16:38:13 -04:00
Daniel Otto de Mentock 49e40923e5 Merge branch 'numpy_dtype_int_to_int64' into 'development'
Prevent windows overflow error when using numpy dtype=int instead of int64

Closes #175

See merge request damask/DAMASK!598
2022-06-07 10:46:50 +00:00
Philip Eisenlohr 40658a6645 fixed typo in Result.view example 2022-06-05 21:39:06 +00:00
d.mentock b9214fcc6c Prevent windows overflow error when using numpy dtype=int instead of int64 2022-06-02 19:40:18 +02:00
Philip Eisenlohr b7d807db01 re-added default arguments that got lost in last commit 2022-05-25 09:45:37 -04:00
Philip Eisenlohr 4746ac890b Merge branch 'development' into 'empty-table-init'
# Conflicts:
#   python/damask/_table.py
2022-05-25 13:29:23 +00:00
Philip Eisenlohr 1dc5e353c4 Merge branch 'sequence-not-iterable' into 'development'
Need sequence not iterable

See merge request damask/DAMASK!587
2022-05-25 13:25:25 +00:00
Martin Diehl b9cea941cc simplified 2022-05-23 10:37:57 +02:00
Martin Diehl 4b4b455b85 mypy does not understand the setter 2022-05-22 10:08:32 +02:00
Martin Diehl 8039e56882 Merge remote-tracking branch 'origin/development' into typehints_results 2022-05-21 17:46:59 +02:00
d.mentock 570ba8d626 added type: ignore to unrecognized one line if statement 2022-05-20 12:04:34 +02:00
Philip Eisenlohr 92a4883344 consistent and correct type hinting/documentation for comments 2022-05-19 12:19:55 -04:00
Martin Diehl 6b6c2548c5 Merge branch 'development' into initial-V_e 2022-05-19 17:03:09 +02:00
Martin Diehl 556d9d840e specifying V_e is more natural than F_i 2022-05-19 01:15:17 +02:00
Philip Eisenlohr b1b845cb5c allow init of empty table 2022-05-18 18:30:18 -04:00
Philip Eisenlohr 164c7b4bc3 clarified sequence of sequences argument type 2022-05-18 09:31:19 -04:00
Philip Eisenlohr 254524fa38 clarified sequence and iterable argument types 2022-05-18 09:21:32 -04:00
Philip Eisenlohr 18d862cdb0 Merge branch 'table-vtk-help' into 'development'
consistent interface and description

See merge request damask/DAMASK!584
2022-05-17 22:46:58 +00:00
Philip Eisenlohr 8442f0cdd3 accumulate comments 2022-05-17 16:12:00 -04:00
Martin Diehl 6c7f2344da Merge branch 'normalize-to_pole' into 'development'
normalize to_pole output by default

See merge request damask/DAMASK!578
2022-05-15 21:46:27 +00:00
Franz Roters d83f0acf7f Merge branch 'rotation-help-polish' into 'development'
Rotation help improvements

See merge request damask/DAMASK!575
2022-05-13 09:18:35 +00:00
Martin Diehl 90c3b3170d propagate 'normalize' option 2022-05-13 09:54:32 +02:00
Martin Diehl 12cd19554f consistent interface and description 2022-05-13 06:28:52 +02:00
Martin Diehl c8d48d6eb9 Merge branch 'universal-VTK.set' into 'development'
Universal VTK.set

See merge request damask/DAMASK!577
2022-05-13 03:44:11 +00:00
Martin Diehl 6f7e8491bc Merge branch 'Marc2022.1' into 'development'
Marc2022.1

See merge request damask/DAMASK!579
2022-05-12 20:38:25 +00:00
Philip Eisenlohr d18e36ecf0 fixed leftover .add --> .set 2022-05-11 18:54:03 -04:00
Martin Diehl 236a009e2b Merge branch 'universal-table.set' into 'development'
universal Table.set

See merge request damask/DAMASK!576
2022-05-11 22:30:42 +00:00
Philip Eisenlohr 648d17d381 renamed .add to .set to be consistent with Table.set 2022-05-11 18:19:10 -04:00
Philip Eisenlohr 35aa8a9bc6 combine table.add and .set 2022-05-11 09:19:48 -04:00
Franz Roters 53c345f4f1 Merge branch 'from_fiber-improvements' into 'development'
From fiber improvements

See merge request damask/DAMASK!573
2022-05-11 13:13:31 +00:00
Philip Eisenlohr b080e414ae normalize to_pole output by default 2022-05-11 08:55:55 -04:00
Martin Diehl 302f020f63 looks better
at least on Linux
2022-05-11 09:22:05 +02:00
Philip Eisenlohr 75272163cd slight polish of help messages 2022-05-10 15:45:19 -04:00
Philip Eisenlohr c9f344758a use symmetry-aware Miller brackets in Result.add_pole 2022-05-10 15:26:33 -04:00
Martin Diehl 13f4d77791 polishing 2022-05-10 19:17:59 +02:00
Franz Roters 087302a2a4 chnage Marc default version to 2022.1 2022-05-10 09:00:55 +02:00
Daniel Otto de Mentock 7e1d44cd63 Merge branch 'fast-YAML-load' into 'development'
use libyaml-based loader

See merge request damask/DAMASK!570
2022-05-09 10:58:31 +00:00
Martin Diehl f27969caf9 documenting and testing 2022-05-08 23:22:03 +02:00
Martin Diehl d7e7750400 Merge remote-tracking branch 'origin/development' into from_fiber-improvements 2022-05-08 22:21:53 +02:00
Franz Roters 4d131ec7ba Merge branch 'structure-improvements' into 'development'
Directory layout and filename improvements

See merge request damask/DAMASK!567
2022-05-06 07:33:51 +00:00
d.mentock 60190e8992 modified setup.cfg to automatically detect main package and subpackages 2022-05-02 18:00:21 +02:00
Daniel Otto de Mentock 57177303b3 changed string using format in _add_eigenvalue to f-string 2022-05-02 16:40:51 +02:00
d.mentock a0f019a0cf result typehints revision 2022-05-02 11:18:35 +02:00
d.mentock 0a42dba453 modified setup.cfg to include solver dir 2022-05-02 10:25:11 +02:00
Martin Diehl 575de4b89b mypy does not like an import that can result in two types 2022-04-30 23:15:21 +02:00
Martin Diehl 8168d43553 use libyaml-based loader
factor 10 faster on my laptop
2022-04-30 19:44:50 +02:00
Martin Diehl 412884ea82 Merge remote-tracking branch 'origin/development' into typehints_results 2022-04-30 00:25:58 +02:00
Martin Diehl ec6ecc7ed4 default order 2022-04-30 00:25:49 +02:00
Martin Diehl 06cef42927 use physical/ISO convention 2022-04-28 15:57:04 +02:00
Martin Diehl a0455cadf3 consistently have input in radians 2022-04-28 15:46:19 +02:00
1a2a34v 482db1ac3b [skip ci] renamed _add_generic_pointwise provided_func argument to callback 2022-04-28 09:45:10 +02:00
Martin Diehl 5c4d481155 common order is theta,phi 2022-04-28 01:33:33 +02:00
Daniel Otto de Mentock 793f4e22ba renamed func argument to _job_pointwise function to provided_func to avoid overlap with func argument of functools.partial function 2022-04-27 17:29:19 +02:00
Martin Diehl e0d2859202 better test coverage 2022-04-27 17:25:39 +02:00
Martin Diehl 8faa5296a1 Merge remote-tracking branch 'origin/fiber_components_noalphabeta' into development 2022-04-27 17:25:13 +02:00
Daniel Otto de Mentock b06a272586 updated commits of original branch to suit current state of development 2022-04-27 16:26:33 +02:00
Philip Eisenlohr 8f0240c67b avoid option clash in Orientation.from_fiber_component 2022-04-27 08:59:55 -04:00
Martin Diehl 45fdd03ecd main file at root 2022-04-27 06:05:06 +02:00
Martin Diehl bb83d20fe9 Merge branch 'development' into structure-improvements 2022-04-27 05:55:19 +02:00
Test User af8003525a [skip ci] updated version information after successful test of 3.0.0-alpha6-258-gea7c8ef23 2022-04-27 01:01:01 +02:00
Test User 51996a707e [skip ci] updated version information after successful test of 3.0.0-alpha6-252-g59668d291 2022-04-26 11:05:02 +02:00
Daniel Otto de Mentock 59668d2910 removed zip_safe = false entry from setup.cfg 2022-04-26 08:32:18 +02:00
Daniel Otto de Mentock b4c6ca64fc replaced setup.py with setup.cfg file
modified .gitlab-ci.yml file to strip away "v" from git describe 
<commit> result
2022-04-25 12:00:54 +02:00
Martin Diehl 7a4097d52b Marc code belongs to Marc subfolder 2022-04-24 19:03:22 +02:00
Martin Diehl 1b9c0713cb symlink was broken 2022-04-24 17:47:26 +02:00
Test User 553e16ffa3 [skip ci] updated version information after successful test of v3.0.0-alpha6-249-gd2cf972b2 2022-04-23 20:36:11 +02:00
Philip Eisenlohr d2cf972b24 Merge branch 'missing-docstring' into development 2022-04-23 12:04:40 -04:00
Test User 6eb8ade40b [skip ci] updated version information after successful test of v3.0.0-alpha6-236-g1f4ee0813 2022-04-23 08:05:31 +02:00
Philip Eisenlohr 6ec543d086 merge development 2022-04-22 14:27:03 -04:00
Philip Eisenlohr 61265ff994 make mypy happy... 2022-04-22 13:39:23 -04:00
Martin Diehl 1b1eb824c4 better readable 2022-04-22 18:26:52 +02:00
Martin Diehl fb6160e7af Merge remote-tracking branch 'origin/development' into result.incs 2022-04-22 18:24:18 +02:00
Test User 5d12ef5b9f [skip ci] updated version information after successful test of v3.0.0-alpha6-228-g758ad6072 2022-04-22 18:07:42 +02:00