Commit Graph

1626 Commits

Author SHA1 Message Date
Martin Diehl 3f9d2c6c99 Merge remote-tracking branch 'origin/development' into preparing-alpha4-2 2021-06-30 17:55:51 +02:00
Martin Diehl b9944bfc4e preparing fourth 3.0 series alpha release 2021-06-30 12:44:24 +02:00
Test User 1050428e27 [skip ci] updated version information after successful test of v3.0.0-alpha3-302-gb69bae272 2021-06-29 17:44:24 +02:00
Martin Diehl 9dca7d8055 not needed 2021-06-29 10:44:13 +02:00
Martin Diehl 7745640393 consistently use prefix as modifier 2021-06-28 23:41:50 +02:00
Test User b9f273099d [skip ci] updated version information after successful test of v3.0.0-alpha3-278-g23b9361bf 2021-06-24 08:24:27 +02:00
Martin Diehl 172b4fb5d1 Merge remote-tracking branch 'origin/development' into pyproject.toml
annoying conflicts to to change of type (symlink switch)
2021-06-22 22:48:50 +02:00
Martin Diehl 78b54517db pip has problem with symlinked VERSION
https://github.com/pypa/pip/issues/3500
Not the nicest solution, but works and keeps single source of truth
2021-06-22 11:11:23 +02:00
Martin Diehl 223934a406 https://snarky.ca/what-the-heck-is-pyproject-toml
https://www.python.org/dev/peps/pep-0518
https://www.python.org/dev/peps/pep-0517
2021-06-22 11:10:03 +02:00
Martin Diehl 0a22916aba not a double subscript 2021-06-19 15:13:27 +02:00
Martin Diehl abd660e62d Merge remote-tracking branch 'origin/development' into polishing 2021-06-19 13:28:56 +02:00
Martin Diehl 71634f6ce9 split into two tests, one will fail on Ubuntu 2021-06-19 08:12:49 +02:00
Martin Diehl 56b011aa54 better have tests 2021-06-18 21:11:01 +02:00
Martin Diehl 32b5e4dece update time estimate for long running processes 2021-06-18 18:14:52 +02:00
Philip Eisenlohr 0805445ea8 exchanged x/z dimension in XDMF writing 2021-06-18 10:17:39 -04:00
Martin Diehl db1882e4de polishing 2021-06-17 18:26:37 +02:00
Martin Diehl f19dc27246 transition compatibility 2021-06-16 14:35:54 +02:00
Martin Diehl 9b1f5c7783 testing new functionality for Neper / vti 2021-06-15 23:19:08 +02:00
Martin Diehl 01a32ea236 import from Neper 2021-06-15 22:29:28 +02:00
Martin Diehl 1bfbd30ae2 polishing 2021-06-15 19:53:05 +02:00
Martin Diehl 218e6a79a8 VTK image data is the appropriate type, not VTK rectilinear grid
FFTs require constant spacing in all three directions, this is
guaranteed by the vtkImageData but not by vtkRectilinearGrid
2021-06-15 19:02:26 +02:00
Martin Diehl 5202da13ea better not have a "Lattice" object with "lattice" parameter 2021-06-07 21:49:04 +02:00
Martin Diehl 41e5f0c06c re-introduced multiple inheritance 2021-06-06 22:25:42 +02:00
Martin Diehl 0722f4f754 disable if not possible 2021-06-03 11:22:28 +02:00
Martin Diehl 3c8d06b6f1 encapsulating all lattice(-family) related data 2021-06-03 11:18:00 +02:00
Martin Diehl 4701eea10f decoupling Orientation and Lattice/LatticeFamily 2021-06-03 10:02:49 +02:00
Martin Diehl 03d3f362e6 equality checks
note: doing this type of comparison means:
- LatticeFamily('cubic') == Lattice('cF')
- Lattice('cF') != LatticeFamily('cubic')

we have the same behavior for comparison between Orientation and
Rotation
2021-06-03 09:38:43 +02:00
Martin Diehl 3b150ddbea simplified/separated 2021-06-03 09:22:54 +02:00
Martin Diehl 87e94b6cf4 sorting
most functions require only lattice family, functions that require full
lattice details are at the end
2021-06-03 08:43:56 +02:00
Martin Diehl 302da1f76a separating functionality 2021-06-02 17:11:37 +02:00
Martin Diehl b55d51491d separating functionality 2021-06-02 08:48:45 +02:00
Martin Diehl e281d8384f distinguish 'family' and 'lattice'
this requires the user to specify a keyword ('*' notation in __init__).
Since all 'from_xxx' methods anyway require a keyword, it does not
causes much more work (one explicit keyword in case of cube orientation
when using __init__ directly).
2021-06-01 21:51:28 +02:00
Martin Diehl 684016f3e3 utility function without connection to an object 2021-06-01 21:29:35 +02:00
Martin Diehl 6f9e521cdb Merge branch 'HDFgeometryupdate' into 'development'
HDF geometry update

See merge request damask/DAMASK!395
2021-06-01 08:01:53 +00:00
Martin Diehl bd10ee033e dealing with user errors/incomplete files 2021-06-01 06:51:44 +02:00
Philip Eisenlohr 02256be8dc Merge branch 'rotation-couple-kinematics' into 'development'
avoid static methods

See merge request damask/DAMASK!393
2021-05-31 15:55:36 +00:00
Francisco Jose Gallardo Basile 0ef5825d35 Merge branch 'Results.add_grid_filters' into 'development'
Result.add_xxx for functions on regular grids

See merge request damask/DAMASK!394
2021-05-31 05:46:06 +00:00
Sharan Roongta d1a6607782 Merge branch 'load2Dtensor' into 'development'
support for 2D tensor in load case

See merge request damask/DAMASK!391
2021-05-29 13:21:47 +00:00
Martin Diehl 94b6be4e83 preferred way to say that something needs to be implemented 2021-05-29 10:54:34 +02:00
Martin Diehl f435a1bea4 include in documentation 2021-05-28 21:06:02 +02:00
Martin Diehl 46dc6b4dab functionality to add field data on regular grids
allows to add curl, divergence, and gradient to results from the grid
solver
2021-05-28 15:38:00 +02:00
Martin Diehl e431d89957 polishing 2021-05-28 13:20:56 +02:00
Martin Diehl dd4612dd9b support singular names
e.g. self.iterate('phase')
2021-05-28 08:06:58 +02:00
Martin Diehl 89fc2f05cf no need to attach static data
if needed, a 'kinematics' function that provides slip direction and
plane normal rotated according to the orientation would be helpful
2021-05-27 20:23:22 +02:00
Martin Diehl bfc3fe410f no direct connection to Orientation object 2021-05-27 19:10:23 +02:00
Martin Diehl f7e1aad147 single source of truth 2021-05-27 18:44:20 +02:00
Martin Diehl 545a085c93 no need to hide, just add suffix to avoid clash with string argument 2021-05-27 18:41:42 +02:00
Martin Diehl adb1e51e24 support for 2D tensor in load case
currently optional, but should become mandatory after a transition
period
2021-05-26 08:04:14 +02:00
Martin Diehl 40698740aa fixed symmetry handling
- ort not tested, no examples, no documentation => removed
- aP is the opposite of isotropic => removed

isostropic materials can be easily specified as cI or cF, using C_44 =
1/2 * (C_11 - C_12). Acceptable extra effort for special use case

orthorhombic can be easily implemented if needed, but needs test,
documentation, and examples
2021-05-24 15:45:25 +02:00
Martin Diehl 0b80252d97 Merge remote-tracking branch 'origin/123_bccSlipSystem' into development 2021-05-22 22:40:33 +02:00
Sharan Roongta fa3b077b72 Merge remote-tracking branch 'origin/development' into internal-restructure 2021-05-21 12:32:59 +02:00
f.basile 10c6070873 added {123} slips systems of bcc 2021-05-20 18:45:15 +02:00
Sharan Roongta 125e8fb9e2 Merge remote-tracking branch 'origin/development' into internal-restructure 2021-05-20 10:41:59 +02:00
Sharan Roongta edb7834404 typo 2021-05-20 10:30:00 +02:00
Martin Diehl 2648464525 relax tolerances for quaternion initialization
we read in ASCII/YAML files, 1e-8 must be enough
2021-05-19 09:46:02 +02:00
Martin Diehl 85ecb68b8f Merge remote-tracking branch 'origin/development' into MatrixInteraction_clean 2021-05-11 06:00:16 +02:00
Philip Eisenlohr d6e69d5d4b [skip ci] polishing of doc string 2021-05-10 14:44:58 -04:00
Martin Diehl 053c427509 adjusting to new interaction matrices 2021-05-09 14:50:55 +02:00
Martin Diehl bc8a03b392 Merge branch 'python-polishing' into lattice-into-orientation 2021-05-07 22:04:25 +02:00
Martin Diehl 9c9286a4be no connection to the class 2021-05-07 21:51:11 +02:00
Martin Diehl cb8dbf6eda simplified 2021-05-07 21:33:48 +02:00
Martin Diehl a48fa5d797 better readable and documented 2021-05-07 20:07:59 +02:00
Martin Diehl 8626f6c047 hide imported modules in autocompletion 2021-05-06 15:00:03 +02:00
Martin Diehl b1ad8197f2 object oriented approach
Orientation (of special lattice) should not have generic attributes
Also, import at the beginning of the file
2021-04-29 20:59:54 +02:00
Martin Diehl b061b4911d compatible with older scipy versions 2021-04-29 08:58:32 +02:00
Martin Diehl 3c41cd609f Merge branch 'development' into env-reporting 2021-04-29 08:40:29 +02:00
Martin Diehl 00bc6a9031 4 threads as default. Reasonable for modern computers
hardcoded + and as shell variable
2021-04-28 20:26:25 +02:00
Martin Diehl ff8ce3840b handle infinite loop 2021-04-28 08:03:22 +02:00
Philip Eisenlohr e9cfb2f968 Merge branch 'drop-old-DADF5-support' into 'development'
Improvements to damask.Result

See merge request damask/DAMASK!373
2021-04-27 00:33:41 +00:00
Philip Eisenlohr ba938f1746 need to check for isinstance(int) 2021-04-26 17:56:15 -04:00
Philip Eisenlohr 5567512f73 removed unnecessary f-strings; added any -x to increments view 2021-04-26 14:26:16 -04:00
Philip Eisenlohr b1bbe5528b [skip ci] fixed mistake (R --> Q) in example 2021-04-26 17:09:11 +00:00
Franz Roters 55333f7e3e Merge branch 'no-shell-variables' into 'development'
KISS: no shell variables

See merge request damask/DAMASK!370
2021-04-26 15:48:58 +00:00
Martin Diehl de79d2d897 test handling of Marc results 2021-04-26 00:28:39 +02:00
Martin Diehl 62c987badf add tracer to vtk files 2021-04-25 23:54:33 +02:00
Martin Diehl 68a839ed97 typo + improved help 2021-04-25 22:14:13 +02:00
Martin Diehl d4a46b9be8 Merge remote-tracking branch 'origin/development' into drop-old-DADF5-support 2021-04-25 17:34:14 +02:00
Martin Diehl 0459f17f58 improved usability 2021-04-25 07:58:15 +02:00
Martin Diehl 18aa6f7f12 support for string arrays
allows to add phase label from mapping. Only scalar string arrays are
allowed (no real restriction)
2021-04-24 22:50:59 +02:00
Martin Diehl 6e1fe712c7 Merge branch 'python-documentation' into drop-old-DADF5-support 2021-04-24 19:39:28 +02:00
Philip Eisenlohr 690b478013 [skip ci] language polishing 2021-04-24 13:12:44 -04:00
Martin Diehl 24046ef683 support the user 2021-04-24 18:00:57 +02:00
Martin Diehl 95831e53f6 using improved documentation 2021-04-24 16:23:34 +02:00
Martin Diehl 3977e230b3 documenting and ensuring consistent argument names
'name' for a dataset matches the analogy to a file name
2021-04-24 14:47:45 +02:00
Martin Diehl 4d67c85a33 clarify out-of-place behavior and document return values 2021-04-23 23:32:09 +02:00
Martin Diehl 26f37d822d state return value
not for Rotation as its docstring is extended by Orientation
2021-04-23 19:15:11 +02:00
Martin Diehl 6699f2ee5f don't use shell variables
Marc solver can be controlled in python, installation can be tuned with
CLI arguments
2021-04-22 12:02:53 +02:00
Martin Diehl 3f8bd645d8 handle the case that MSC-related variables are not set 2021-04-22 07:55:41 +02:00
Martin Diehl 190ddafa44 don't support old file formats 2021-04-14 23:23:32 +02:00
Martin Diehl 0e6cb127df damage can be defined in parts of the domain ... 2021-04-14 19:24:45 +02:00
Sharan Roongta 1be1a72a09 Merge branch 'Fortran-cleaning' into 'development'
Clarifying structure

See merge request damask/DAMASK!368
2021-04-13 11:08:18 +00:00
Martin Diehl cfbb2d416f better example 2021-04-10 23:58:53 +02:00
Martin Diehl 1133090b6c logfile does not contain much valuable information
Marc automatically creates .out
2021-04-10 23:50:20 +02:00
Martin Diehl 37df78a8e0 don't show progress bar for empty iterations 2021-04-10 15:01:50 +02:00
Martin Diehl d304654972 allow easy detection of empty view/get/place 2021-04-10 09:33:45 +02:00
Martin Diehl 07d573a56d more helpful dataset descriptors
phase label for single phase material not helpful
2021-04-10 09:32:21 +02:00
Martin Diehl 44331c504b __class__ is unknown (says prospector) 2021-04-10 08:29:42 +02:00
Martin Diehl 63b343ad87 Merge branch 'development' into allclose-rotation-orientation 2021-04-10 08:05:25 +02:00
Martin Diehl e89236b14d bugfix:
don't overwrite data when doing a 'place-like' operation to merge
datasets
2021-04-08 17:36:33 +02:00
Martin Diehl 2d8658822d report return value 2021-04-08 14:58:22 +02:00
Martin Diehl 00aed99419 naming of tests should follow naming in class 2021-04-08 13:39:48 +02:00
Martin Diehl bc1454970c mandatory symmetry
if symmetry is not of interest, damask.Rotation should be used
2021-04-06 22:49:08 +02:00
Philip Eisenlohr bf2515c4c1 removed `Grid.diff` in lieu of `__eq__` 2021-04-06 12:10:35 -04:00
Philip Eisenlohr bf4c88a39e renamed result.read to get; polishing 2021-04-06 11:39:44 -04:00
Martin Diehl 02277fb820 consistently return masked array 2021-04-05 22:18:18 +02:00
Martin Diehl d5806075d4 distinguish isclose/allclose and __eq__ 2021-04-05 22:15:03 +02:00
Martin Diehl 115e3dd4c7 simplified 2021-04-05 17:18:12 +02:00
Martin Diehl faa9e6aa6a open file only once 2021-04-05 15:58:10 +02:00
Martin Diehl c3a7a85f7a avoid repetition 2021-04-05 15:41:28 +02:00
Martin Diehl 9db1ef9ed7 polishing 2021-04-05 13:41:49 +02:00
Martin Diehl 65b03aeb2d Merge remote-tracking branch 'origin/development' into Results.read-.place 2021-04-05 10:22:49 +02:00
Martin Diehl 62c85db745 out of place behavior 2021-04-05 08:03:00 +02:00
Martin Diehl fc409fcf08 'join' is always linear in time, '+' not 2021-04-04 22:12:28 +02:00
Martin Diehl 1d6b56346a use 'view' and standardized calling signature 2021-04-04 20:56:30 +02:00
Martin Diehl 0e5f693fea untangling 2021-04-04 19:44:06 +02:00
Martin Diehl e1d57f176d simplifying
[] has a special meaning for glob, use () to indicate direction for IPF
color. It is anyways the sample direction, not a crystallographic
direction
2021-04-04 19:05:58 +02:00
Martin Diehl d78e0085fc simplified 2021-04-04 18:32:17 +02:00
Martin Diehl a962777d24 avoid code duplication 2021-04-04 13:38:40 +02:00
Martin Diehl 6fef46539e standard names 2021-04-04 13:16:14 +02:00
Martin Diehl 6f3dc80079 simplified/using new functionality 2021-04-03 16:32:48 +02:00
Martin Diehl 27f2e3b26e avoid random order when using sets 2021-04-03 12:21:06 +02:00
Martin Diehl 885aeb62e5 geometry0 itself is useful
can be combined with 'place' if in-memory VTK is required for spatial
operations
2021-04-03 08:58:22 +02:00
Martin Diehl 39c0bc9de6 polishing 2021-04-03 08:19:16 +02:00
Martin Diehl 1b2d892b42 keep reference folder clean 2021-04-03 07:31:31 +02:00
Martin Diehl 20d0242d59 using new logic 2021-04-02 12:21:27 +02:00
Martin Diehl e8ff509502 output all datasets per default
respect 'field' selection
2021-04-02 11:29:58 +02:00
Martin Diehl 18afa217fe easier to understand
limit to same fields for homogenization and fields results in a little
less flexibility (requires two views) but should be acceptable for such
a little used feature
2021-04-02 08:24:49 +02:00
Martin Diehl cf1ce6a1fe support for masked array
masked arrays are the outcome of Result.place
2021-04-02 08:07:22 +02:00
Martin Diehl 58ac99831c polishing 2021-04-02 07:47:03 +02:00
Martin Diehl 9459fea929 support for pandas not planned any more
damask.Table supports multidimensional data, numpy.ma supports masked
arrays
2021-04-02 07:42:54 +02:00
Philip Eisenlohr f6d6aefe1d function renaming; rewording of help messages 2021-04-01 18:41:28 -04:00
Martin Diehl 84e117c6b3 polished and added tests 2021-04-01 17:26:51 +02:00
Martin Diehl 71d1a341e4 simplified 2021-04-01 15:08:48 +02:00
Martin Diehl 4b9fcf2f77 testing new read functionality 2021-04-01 14:55:50 +02:00
Martin Diehl 85aaaa96f3 new tests 2021-04-01 10:47:45 +02:00
Martin Diehl 2397df88f9 documenting 2021-04-01 07:21:34 +02:00
Martin Diehl c1f7ea750b legacy access not needed anymore 2021-04-01 06:55:47 +02:00
Martin Diehl 8a3af87e3e Merge remote-tracking branch 'origin/development' into spring-cleaning 2021-04-01 00:09:51 +02:00
Philip Eisenlohr 07c9cf5f1a - improved reporting and slicing of table.
- implemented numpy-like `allclose` and `isclose`
2021-03-31 18:30:07 +00:00
Martin Diehl 8a8a28adc4 support multi-constituents 2021-03-31 20:02:25 +02:00
Martin Diehl be444b69ca include homogenization 2021-03-31 15:44:27 +02:00
Martin Diehl 97e6c397d9 cleaned 2021-03-31 15:10:39 +02:00
Martin Diehl 7b678af1b4 float and int are different 2021-03-31 12:40:53 +02:00
Martin Diehl 8c7ee5e796 simplified 2021-03-31 12:05:51 +02:00
Martin Diehl e9c65dee73 documenting and testing 2021-03-31 10:59:21 +02:00
Martin Diehl 7b846efe4a arguments can be int, bool, str 2021-03-31 08:12:57 +02:00
Martin Diehl eebb050a64 simplified
place seems to work
2021-03-31 07:56:42 +02:00
Martin Diehl 60119c1300 return minimal unique dictionaries per default 2021-03-30 21:39:14 +02:00
Martin Diehl 989992004d cleaning dicts 2021-03-30 19:41:36 +02:00
Martin Diehl 7865092b82 not needed 2021-03-30 17:24:19 +02:00