Commit Graph

707 Commits

Author SHA1 Message Date
Martin Diehl bd56a3f2a5 tests might fail on windows 2022-03-26 22:13:54 +01:00
Martin Diehl ff3d3afe9e '/' is separator in h5py even on windows.
os.path assumes OS-dependent path separators
2022-03-26 22:09:45 +01:00
Martin Diehl c11d38b2ec avoid blocking pop-up 2022-03-26 22:08:09 +01:00
Philip Eisenlohr 5b87fafcae Merge branch 'consistent-orientation-from' into 'development'
consistent "shape" keyword in from_X

Closes #165

See merge request damask/DAMASK!546
2022-03-20 00:00:25 +00:00
Philip Eisenlohr 21e076b0f9 Table.save(with_labels=False) to properly store ANG 2022-03-17 21:23:57 -04:00
Philip Eisenlohr 378b8b2396 use consistent "shape" keyword when shape not clear from input data 2022-03-14 16:24:05 -04:00
Philip Eisenlohr 56c33b8a5c flipped VTK.add to use (label,data) to be consistent with other functionality 2022-03-11 20:07:18 -05:00
Martin Diehl 0d22cfb83d table.__init__ now has common order of arguments (label, data) 2022-03-11 22:31:35 +01:00
Martin Diehl c5c2763e1f several improvements
- DataFrame.append is deprecated
- restored special case `None` for Grid.vicinity_offset and Grid.clean
- sorted procedures of Grid according to functionality
2022-03-11 22:22:12 +01:00
Martin Diehl d1c6434bb2 corner case: empty set
will be checked by extra test
2022-03-10 07:37:46 +01:00
Philip Eisenlohr 4f6d9aa4b6 adjusted faulty test 2022-03-09 19:01:45 -05:00
Philip Eisenlohr f13a4c82da grid.clean/vicinity now uses ball neighborhood; lots of polishing 2022-03-09 18:26:52 -05:00
Martin Diehl b916712946 Merge remote-tracking branch 'origin/keyword-view' into polishing 2022-03-09 15:36:00 +01:00
Martin Diehl c2453c56f1 Merge remote-tracking branch 'origin/development' into polishing 2022-03-09 15:22:22 +01:00
Martin Diehl c4a7c0096a give default directly
only Colormap object caused problem (tab completion triggered '__repr__'
which means showing colormap in maplotlib window
2022-03-08 22:43:54 +01:00
Philip Eisenlohr 73f01c07d0 clarified colormap default; accept string as colormap name 2022-03-08 09:31:08 -05:00
Martin Diehl fe8e55e470 KeyError more sensible here 2022-03-07 11:28:17 +01:00
Martin Diehl d7ba853859 use None for no selection, empty list is 'nothing' 2022-03-05 20:37:47 +01:00
Martin Diehl a77b63718c remove deprecated interface options 2022-03-04 20:27:32 +01:00
Martin Diehl 161e4b6815 testing new functionality 2022-03-04 10:57:49 +01:00
Martin Diehl 03912b0a03 Merge remote-tracking branch 'origin/development' into polishing 2022-03-04 03:44:36 +01:00
Martin Diehl f9e04bc4cb unifying interface
same same for same functionality, allow user to specify single integer
for convenience
2022-02-28 16:14:40 +01:00
Martin Diehl c7b512a94e support the user 2022-02-26 17:40:12 +01:00
Philip Eisenlohr bee3f08d77 test __repr__ functionality with str() 2022-02-24 19:15:28 -05:00
Philip Eisenlohr fd52c18488 remove debug print statements in tests 2022-02-24 18:35:48 -05:00
Martin Diehl 59755c67ce human-readable reporting 2022-02-23 06:49:38 +01:00
Philip Eisenlohr 661b7fb602 slight polish 2022-02-22 10:56:12 -05:00
Martin Diehl be11da2284 testing new functionality 2022-02-22 14:00:36 +01:00
Martin Diehl e8a4f06634 out of place behavior for VTK 2022-02-22 07:49:44 +01:00
Philip Eisenlohr 0adc827278 Merge branch 'development' into python-vtk-improvements 2022-02-18 14:46:40 -05:00
Philip Eisenlohr e602653b3b remove obsolete grid_filter import 2022-02-17 18:50:53 -05:00
Philip Eisenlohr 38ac791b58 proper understanding of a rectiliniearGrid 2022-02-17 17:54:26 -05:00
Martin Diehl ed50cd022b shorter, potential for higher precision
np.sum has an better alogrithm but fails ...
2022-02-16 23:40:02 +01:00
Philip Eisenlohr 4426172c14 Merge branch 'development' into python-vtk-improvements 2022-02-15 18:07:18 -05:00
Philip Eisenlohr c5f2865121 make apparent that vtk.get automatically "squeezes" 2022-02-15 18:04:21 -05:00
Philip Eisenlohr e2d1ffe7b8 condensed add_table test 2022-02-15 16:42:17 -05:00
Philip Eisenlohr 6916160ed1 implemented VTK.add(damask.Table) 2022-02-15 16:38:02 -05:00
Franz Roters d4f7114164 Merge branch 'improved-table-slicing' into 'development'
Extended slicing functionality of Table

See merge request damask/DAMASK!522
2022-02-15 12:48:39 +00:00
Philip Eisenlohr 2ce464c48e vtk.comments as directly accessed property 2022-02-14 09:24:12 -05:00
Philip Eisenlohr 1b08f90d6c allow constant (non-label) value in cm.from_table() keys 2022-02-13 23:54:16 -05:00
Philip Eisenlohr 0300912b30 Table.__eq__ for proper comparison; logical masks for slicing now work 2022-02-13 22:00:48 -05:00
Sharan d72347fe25 Merge remote-tracking branch 'origin/development' into thermal-restart 2022-02-02 23:07:32 +01:00
Martin Diehl 6dcf6b972c complaints from prospector (PEP8) 2022-02-02 09:14:41 +01:00
Sharan 1bd654781b tests updated 2022-02-02 00:20:14 +01:00
Philip Eisenlohr 6bd23715b8 added multiplication as color repeat functionality 2022-01-24 11:56:33 +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 3acabcdc7f docstring adjustments 2022-01-12 23:57:21 +01:00
Martin Diehl 2c1231a806 using best practices from grid_filters 2022-01-12 23:06:48 +01:00
Martin Diehl 8de4829d0f testing non-trivial situation 2022-01-10 08:03:37 +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
Philip Eisenlohr b2d0fd8ff5 Lambert azimuthal equal-area (laea) projection 2021-12-28 10:19:17 +00: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
Martin Diehl dc5172ce63 don't use deprecated functions 2021-12-22 12:41:16 +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
Philip Eisenlohr 2b4487f426 forgot to update test 2021-12-13 19:07:18 -05:00
Eureka Pai 2b6283bbe3 flexibility to return with alpha channel and/or as string 2021-12-10 12:53:01 -05:00
Eureka Pai 947bf946e1 added Colormap.at(fraction) to interpolate 2021-12-10 11:31:26 -05: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 99166a7ce2 Merge remote-tracking branch 'origin/colormap-docstrings' into development 2021-12-03 12:18:24 +01:00
Philip Eisenlohr d5da47bf71 extend config init to allow YAML string and key=value pairs 2021-12-02 18:20:27 -05: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
Philip Eisenlohr bd908dc425 test __eq__; polish help strings 2021-11-25 13:14:34 -05:00
Martin Diehl c23e9fb126 __eq__ not implemented
probably also not very much used outside tests
2021-11-23 20:34:19 +01:00
Martin Diehl 3393d32d9f more sensible test vor sequence arguments 2021-11-23 19:42:10 +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 59b6b4bb2b Merge branch 'clean-CI' into development 2021-11-16 23:38:14 +01:00
Martin Diehl e2e80b9706 cleaning tests 2021-11-16 11:24:04 +01:00
Martin Diehl ec24af2403 testing new functionality 2021-11-14 11:45:13 +01:00
Philip Eisenlohr ddb25ad0e5 remove duplicate lattice_symmetries dictionary 2021-10-29 20:04:09 -04:00
Philip Eisenlohr b11a14999b simplified lattice point data; added test 2021-09-30 11:01:42 -04:00
Sharan c7039e19b0 testing new functionality 2021-09-13 15:04:09 +02:00
Martin Diehl 0653d0c481 shortened thanks to lazy evaluation 2021-09-02 14:35:16 +02:00
Martin Diehl 727cc9da12 ready for production 2021-09-02 08:56:11 +02:00
Martin Diehl 2b9d416734 fixes for old VTK and/or old numpy 2021-09-02 08:45:20 +02:00
Philip Eisenlohr 56c62f257a more robust RuntimeError test; corrected name of double-defined test 2021-08-19 06:10:08 +02:00
Philip Eisenlohr 5dbb60d338 add_pole now has option "with_symmetry" 2021-08-19 06:10:08 +02:00
Philip Eisenlohr b754617c76 to_pole now blends; corrected help texts 2021-08-19 06:10:08 +02:00
Martin Diehl f3d8d78879 does not work on MacOS 2021-08-18 11:22:16 +02:00
Martin Diehl 041d3ffdd7 test more 2021-08-18 11:17:13 +02:00
Martin Diehl 5a2cd83186 recalculated with new DADF5 version 2021-08-18 10:52:47 +02:00
Martin Diehl c5f284cd8d increased test coverage 2021-08-18 10:44:04 +02:00
Martin Diehl 4a5e5d8451 avoid DAMASK_grid version dependency 2021-08-18 10:24:24 +02:00
Martin Diehl 81bac268f7 increasing test coverage 2021-08-18 09:36:28 +02:00
Martin Diehl ef4e4ec772 needs to be a 2D array 2021-08-18 09:17:06 +02:00
Martin Diehl b13e7e174b avoid invalid DADF5 2021-08-16 21:31:17 +02:00
Martin Diehl b1dab5f398 tests working now 2021-08-08 10:44:38 +02:00
Martin Diehl b5be4c3fa5 compatible with material.yaml 2021-08-04 17:45:25 +02:00
Martin Diehl dd2d569482 ensure that vectorization works 2021-07-25 21:28:35 +02:00
Martin Diehl de428efca5 add_pole is working again 2021-07-18 18:58:05 +02:00
Martin Diehl 212a4ed63c don't test implementation details 2021-07-18 15:57:51 +02:00
Martin Diehl e54f032f1e Merge remote-tracking branch 'origin/development' into restructure-Orientation-2 2021-07-18 15:09:40 +02:00
Martin Diehl 7745640393 consistently use prefix as modifier 2021-06-28 23:41:50 +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 db1882e4de polishing 2021-06-17 18:26:37 +02:00
Martin Diehl 9b1f5c7783 testing new functionality for Neper / vti 2021-06-15 23:19:08 +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 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 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
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
Martin Diehl 94b6be4e83 preferred way to say that something needs to be implemented 2021-05-29 10:54:34 +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 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 545a085c93 no need to hide, just add suffix to avoid clash with string argument 2021-05-27 18:41:42 +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
f.basile 10c6070873 added {123} slips systems of bcc 2021-05-20 18:45:15 +02:00
Martin Diehl 85ecb68b8f Merge remote-tracking branch 'origin/development' into MatrixInteraction_clean 2021-05-11 06:00:16 +02:00
Martin Diehl 053c427509 adjusting to new interaction matrices 2021-05-09 14:50:55 +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 ff8ce3840b handle infinite loop 2021-04-28 08:03:22 +02: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 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 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 37df78a8e0 don't show progress bar for empty iterations 2021-04-10 15:01:50 +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 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 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 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 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 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 6f3dc80079 simplified/using new functionality 2021-04-03 16:32:48 +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 cf1ce6a1fe support for masked array
masked arrays are the outcome of Result.place
2021-04-02 08:07:22 +02:00
Philip Eisenlohr f6d6aefe1d function renaming; rewording of help messages 2021-04-01 18:41:28 -04:00