8faa5296a1
Merge remote-tracking branch 'origin/fiber_components_noalphabeta' into development
2022-04-27 17:25:13 +02:00
b06a272586
updated commits of original branch to suit current state of development
2022-04-27 16:26:33 +02:00
8f0240c67b
avoid option clash in Orientation.from_fiber_component
2022-04-27 08:59:55 -04:00
45fdd03ecd
main file at root
2022-04-27 06:05:06 +02:00
bb83d20fe9
Merge branch 'development' into structure-improvements
2022-04-27 05:55:19 +02:00
af8003525a
[skip ci] updated version information after successful test of 3.0.0-alpha6-258-gea7c8ef23
2022-04-27 01:01:01 +02:00
51996a707e
[skip ci] updated version information after successful test of 3.0.0-alpha6-252-g59668d291
2022-04-26 11:05:02 +02:00
59668d2910
removed zip_safe = false entry from setup.cfg
2022-04-26 08:32:18 +02:00
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
7a4097d52b
Marc code belongs to Marc subfolder
2022-04-24 19:03:22 +02:00
1b9c0713cb
symlink was broken
2022-04-24 17:47:26 +02:00
553e16ffa3
[skip ci] updated version information after successful test of v3.0.0-alpha6-249-gd2cf972b2
2022-04-23 20:36:11 +02:00
d2cf972b24
Merge branch 'missing-docstring' into development
2022-04-23 12:04:40 -04:00
6eb8ade40b
[skip ci] updated version information after successful test of v3.0.0-alpha6-236-g1f4ee0813
2022-04-23 08:05:31 +02:00
6ec543d086
merge development
2022-04-22 14:27:03 -04:00
61265ff994
make mypy happy...
2022-04-22 13:39:23 -04:00
1b1eb824c4
better readable
2022-04-22 18:26:52 +02:00
fb6160e7af
Merge remote-tracking branch 'origin/development' into result.incs
2022-04-22 18:24:18 +02:00
5d12ef5b9f
[skip ci] updated version information after successful test of v3.0.0-alpha6-228-g758ad6072
2022-04-22 18:07:42 +02:00
1733c121f3
allow scalar initial_conditions --> on-the-fly broadcasting
2022-04-22 11:29:47 -04:00
197e24ec0d
pass-through ICs when grid remains unaltered
2022-04-21 18:00:58 -04:00
fa58d69cbb
switched "master" property from incs to increments
2022-04-21 17:29:33 -04:00
8e668a565e
[skip ci] updated version information after successful test of v3.0.0-alpha6-223-gd916c7c6b
2022-04-21 21:58:03 +02:00
b5f9d524d7
optional start,end in times_in_range
2022-04-21 15:56:17 -04:00
730bd8ae34
globally defined prefix_inc --> "increment_"
2022-04-21 11:50:24 -04:00
d916c7c6b1
small polishing
2022-04-21 17:32:30 +02:00
d6f2b99199
[skip ci] updated version information after successful test of v3.0.0-alpha6-221-gdff78154a
2022-04-20 10:02:55 +02:00
9e2fcfc9df
[skip ci] updated version information after successful test of v3.0.0-alpha6-210-ge8c1f8453
2022-04-20 05:24:57 +02:00
5d99b152ee
[skip ci] updated version information after successful test of v3.0.0-alpha6-206-g51582b80f
2022-04-15 21:23:03 +02:00
03b9a7679f
[skip ci] updated version information after successful test of v3.0.0-alpha6-202-g87b5097ff
2022-04-13 18:17:32 +02:00
4622380134
[skip ci] updated version information after successful test of v3.0.0-alpha6-197-g39d79c23b
2022-04-12 23:19:28 +02:00
58b67007a9
fixed missing add_strain
2022-04-12 12:02:00 +02:00
8ebd234aaf
[skip ci] updated version information after successful test of v3.0.0-alpha6-194-ga4c396949
2022-04-10 15:18:41 +02:00
700f256b7c
[skip ci] updated version information after successful test of v3.0.0-alpha6-191-gf8d4e3cf5
2022-04-04 13:04:27 +02:00
3bf52d832f
[skip ci] updated version information after successful test of v3.0.0-alpha6-187-gbf7da2c71
2022-04-03 23:33:19 +02:00
84ac426606
additional property shows integer list
2022-04-01 18:04:50 -04:00
4f646f03ee
[skip ci] updated version information after successful test of v3.0.0-alpha6-184-g1f98b04d4
2022-03-27 21:30:58 +02:00
1f98b04d44
Merge branch 'util_open' into 'development'
...
centralize opening of text files
See merge request damask/DAMASK!555
2022-03-27 17:10:31 +00:00
7135b58b99
[skip ci] updated version information after successful test of v3.0.0-alpha6-180-g2dfde6997
2022-03-27 14:00:35 +02:00
0916922423
read Windows/Unix, write Unix line endings
2022-03-27 10:03:47 +02:00
f3cf67d3fa
avoid code duplication and inconsistencies
2022-03-27 09:55:20 +02:00
0d57a13c9b
run tests on Windows
...
XDMF does not work (not sure why, works locally)
2022-03-26 22:16:32 +01:00
bd56a3f2a5
tests might fail on windows
2022-03-26 22:13:54 +01:00
ff3d3afe9e
'/' is separator in h5py even on windows.
...
os.path assumes OS-dependent path separators
2022-03-26 22:09:45 +01:00
c11d38b2ec
avoid blocking pop-up
2022-03-26 22:08:09 +01:00
7f09bbeb08
int is 32 bit on Windows (cause trouble for hybrid_IA)
2022-03-26 22:06:03 +01:00
e9906864cf
ensure Unix line endings
2022-03-26 22:00:08 +01:00
7f23f7b5b6
added IC setter/getter; explicit init of returned Grids
2022-03-24 17:23:37 -04:00
46259d983d
Merge remote-tracking branch 'origin/development' into missing-docstring
2022-03-24 16:19:59 +01:00
ac49365e34
[skip ci] updated version information after successful test of v3.0.0-alpha6-170-gfab34d5c3
2022-03-24 14:46:59 +01:00
fab34d5c3a
Merge branch 'expanduser' into 'development'
...
allow to use '~' in filenames
See merge request damask/DAMASK!552
2022-03-24 11:28:08 +00:00
4b5cc2a7bc
[skip ci] updated version information after successful test of v3.0.0-alpha6-167-gae32d7398
2022-03-23 15:25:23 +01:00
9087d4305a
Merge remote-tracking branch 'origin/development' into missing-docstring
2022-03-20 14:50:43 +01:00
87608b6ed0
missing docstring
2022-03-20 11:55:15 +01:00
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
135f2e7add
allow to use '~' in filenames
...
no idea how to test, but seems to work
2022-03-19 11:10:22 +01:00
52d595ff62
numpy-compatible shape definition
...
can be scalar or sequence.
Try to avoid to use the term 'rotation' in the documentation and also
don't specify the return type because it will be used by
'damask.Orientation'.
2022-03-19 10:55:03 +01:00
b5d6f2dc83
[skip ci] updated version information after successful test of v3.0.0-alpha6-157-gecb33641d
2022-03-18 16:09:43 +01:00
4972c43b17
return scalar for None, not one-point array
2022-03-18 09:06:48 +01:00
a0b63c029b
Merge remote-tracking branch 'origin/development' into consistent-orientation-from
2022-03-18 08:58:13 +01:00
21e076b0f9
Table.save(with_labels=False) to properly store ANG
2022-03-17 21:23:57 -04:00
1147b5b742
[skip ci] updated version information after successful test of v3.0.0-alpha6-154-g9d134b87b
2022-03-15 17:30:19 +01:00
af4e8c4975
[skip ci] updated version information after successful test of v3.0.0-alpha6-151-g92bf10cad
2022-03-15 12:20:03 +01:00
4f09bbc715
documented return type for from_fiber/spherical_component
2022-03-14 16:32:52 -04:00
378b8b2396
use consistent "shape" keyword when shape not clear from input data
2022-03-14 16:24:05 -04:00
a925a99f43
[skip ci] updated version information after successful test of v3.0.0-alpha6-146-g3618e36ab
2022-03-13 10:05:54 +01:00
cf49310df7
[skip ci] updated version information after successful test of v3.0.0-alpha6-140-g527c1c222
2022-03-12 16:13:32 +01:00
527c1c2225
Merge remote-tracking branch 'origin/vtk-add-label-data-table' into development
2022-03-12 14:10:30 +01:00
746e02db6b
[skip ci] updated version information after successful test of v3.0.0-alpha6-137-g00ef0c6b6
2022-03-12 13:21:25 +01:00
56c33b8a5c
flipped VTK.add to use (label,data) to be consistent with other functionality
2022-03-11 20:07:18 -05:00
d5a0933978
[skip ci] updated version information after successful test of v3.0.0-alpha6-134-g0d22cfb83
2022-03-12 01:45:01 +01:00
0d22cfb83d
table.__init__ now has common order of arguments (label, data)
2022-03-11 22:31:35 +01:00
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
1d0d082075
[skip ci] updated version information after successful test of v3.0.0-alpha6-126-g8d9d13c15
2022-03-10 09:56:36 +01:00
d1c6434bb2
corner case: empty set
...
will be checked by extra test
2022-03-10 07:37:46 +01:00
4f6d9aa4b6
adjusted faulty test
2022-03-09 19:01:45 -05:00
f13a4c82da
grid.clean/vicinity now uses ball neighborhood; lots of polishing
2022-03-09 18:26:52 -05:00
3d9ac817bb
shorter code
2022-03-09 18:24:18 -05:00
98033e41dc
test only use modern Result.view API
2022-03-09 20:31:19 +01:00
b916712946
Merge remote-tracking branch 'origin/keyword-view' into polishing
2022-03-09 15:36:00 +01:00
4c941c608f
better names and description
2022-03-09 15:35:36 +01:00
c2453c56f1
Merge remote-tracking branch 'origin/development' into polishing
2022-03-09 15:22:22 +01:00
05541736a6
clearer message
2022-03-09 15:18:18 +01:00
2b27388c05
[skip ci] updated version information after successful test of v3.0.0-alpha6-88-g2162442e0
2022-03-09 12:08:17 +01:00
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
73f01c07d0
clarified colormap default; accept string as colormap name
2022-03-08 09:31:08 -05:00
20e056e26a
consistent interface also for internal functionality
...
allows to change multiple 'what's at the same time
2022-03-07 13:10:15 +01:00
fe8e55e470
KeyError more sensible here
2022-03-07 11:28:17 +01:00
bc020a9580
correct names
2022-03-07 10:40:28 +01:00
4e9e55f3ac
Merge remote-tracking branch 'origin/development' into separate-vtk
2022-03-07 10:33:28 +01:00
445d5ec720
propagate signals to running commands
...
otherwise, we have long running processes when GitLab terminates jobs in
a pipeline
2022-03-06 21:11:19 +01:00
425d148ea8
mypy-safe
2022-03-06 19:37:46 +01:00
01e777bc58
[skip ci] updated version information after successful test of v3.0.0-alpha6-73-g0b8adb2aa
2022-03-06 19:23:42 +01:00
f54849f495
enhance grid to store initial conditions
2022-03-06 00:54:42 +01:00
d7ba853859
use None for no selection, empty list is 'nothing'
2022-03-05 20:37:47 +01:00
a77b63718c
remove deprecated interface options
2022-03-04 20:27:32 +01:00
bafc45d259
guide users
2022-03-04 19:07:23 +01:00
161e4b6815
testing new functionality
2022-03-04 10:57:49 +01:00
03912b0a03
Merge remote-tracking branch 'origin/development' into polishing
2022-03-04 03:44:36 +01:00
48544641ca
[skip ci] updated version information after successful test of v3.0.0-alpha6-71-g3bc1a5eda
2022-03-01 21:45:28 +01:00
3bc1a5eda4
Merge branch 'python-vtk-improvements' into 'development'
...
Resolve issues in #149
See merge request damask/DAMASK!535
2022-03-01 08:10:39 +00:00
dd68aad83b
not used
2022-02-28 19:03:56 +01:00
f9e04bc4cb
unifying interface
...
same same for same functionality, allow user to specify single integer
for convenience
2022-02-28 16:14:40 +01:00
3c4faf972e
[skip ci] updated version information after successful test of v3.0.0-alpha6-40-gc4fdbf88c
2022-02-28 00:26:54 +01:00
c7b512a94e
support the user
2022-02-26 17:40:12 +01:00
a314e63ed2
homogenize: (material index, material ID) -> material ID
...
mutable describes meaning of parameter better
2022-02-26 14:22:00 +01:00
bee3f08d77
test __repr__ functionality with str()
2022-02-24 19:15:28 -05:00
fd52c18488
remove debug print statements in tests
2022-02-24 18:35:48 -05:00
6d50066a04
[skip ci] updated version information after successful test of v3.0.0-alpha6-27-gf4a15f579
2022-02-23 18:55:29 +01:00
320ab70270
Merge branch 'development' into 'python-vtk-improvements'
...
# Conflicts:
# python/damask/_vtk.py
2022-02-23 14:20:52 +00:00
08a96f64f5
make mypy happy...
2022-02-23 09:12:55 -05:00
f4a15f5796
Merge branch 'consistent-uppercase-in-exceptions' into 'development'
...
Consistent formatting of raised messages
See merge request damask/DAMASK!533
2022-02-23 13:55:14 +00:00
5882a8560c
shortened __repr__ code
2022-02-23 08:38:03 -05:00
77e57a268c
unified.
...
the default python description "Return repr(self)." is pretty useless,
so better agree on a DAMASK standard
2022-02-23 07:21:30 +01:00
ba4a99ebe6
[skip ci] updated version information after successful test of v3.0.0-alpha6-23-gf944975ac
2022-02-23 06:57:12 +01:00
59755c67ce
human-readable reporting
2022-02-23 06:49:38 +01:00
f944975ac5
Merge branch 'symops-in-crystal' into 'development'
...
symmetry_operations belong to Crystal
See merge request damask/DAMASK!534
2022-02-23 00:54:21 +00:00
a9d4e89250
Merge branch 'crystal-examples' into 'development'
...
some guidance for users
See merge request damask/DAMASK!532
2022-02-22 19:23:02 +00:00
ae2aa096fb
fixed flatten order=F; cividis default.
2022-02-22 12:23:29 -05:00
661b7fb602
slight polish
2022-02-22 10:56:12 -05:00
47dcd4bd41
follow Python exception message convention of lower-case
2022-02-22 10:42:05 -05:00
6a4ad7ff75
moved symmetry_operations from Orientation to Crystal
2022-02-22 10:12:03 -05:00
aeb0e527ec
Consistent formatting of raised messages
2022-02-22 09:46:12 -05:00
3d554e40b9
clarify real/reciprocal space coordinates
2022-02-22 09:15:32 -05:00
744f5755ff
[skip ci] updated version information after successful test of v3.0.0-alpha6-14-g3657b2316
2022-02-22 14:44:56 +01:00
be11da2284
testing new functionality
2022-02-22 14:00:36 +01:00
f6de182eb6
get information about dataset labels
2022-02-22 08:08:41 +01:00
e8a4f06634
out of place behavior for VTK
2022-02-22 07:49:44 +01:00
3a078db6f1
some guidance for users
2022-02-22 06:40:17 +01:00
d1620d9268
[skip ci] updated version information after successful test of v3.0.0-alpha6-4-gca6a3e786
2022-02-21 12:46:52 +01:00
c975a5b437
needed for out of place behavior
...
pickle/deepcopy does not work
2022-02-21 12:12:17 +01:00
22fa9c9772
add scalebar
2022-02-21 11:19:53 +01:00
45dc9cf7a6
show scalar data, use to show material of grid
2022-02-21 08:09:55 +01:00
9fe51686e5
allow to use '~' in path
...
not sure how to test, i.e. how to create a fixture to have a fake home
2022-02-21 07:19:05 +01:00
9ba0a4bd86
[skip ci] updated version information after successful test of v3.0.0-alpha6-1-g5cc64fc95
2022-02-19 14:56:41 +01:00
fe2ab947ec
somehow "Sequence" was missing from import
2022-02-18 14:50:28 -05:00
0adc827278
Merge branch 'development' into python-vtk-improvements
2022-02-18 14:46:40 -05:00
75f535b60c
welcome back rectilineargrid...
2022-02-18 11:45:49 -05:00
d8fab8cb07
v3.0.0-alpha6
2022-02-18 11:55:44 +01:00
76b9b414ab
[skip ci] updated version information after successful test of v3.0.0-alpha5-735-ga5699e05d
2022-02-18 10:25:37 +01:00
e602653b3b
remove obsolete grid_filter import
2022-02-17 18:50:53 -05:00
8e19e93b39
polishing of doc strings
2022-02-17 18:49:45 -05:00
38ac791b58
proper understanding of a rectiliniearGrid
2022-02-17 17:54:26 -05:00
41389963a7
Merge branch 'python-polishing' into 'development'
...
python polishing
See merge request damask/DAMASK!528
2022-02-17 20:23:54 +00:00
bdc269a185
[skip ci] updated version information after successful test of v3.0.0-alpha5-718-gb92ad3e31
2022-02-17 19:03:32 +01:00
91cb0f37c8
favor numpy intrinsic over list-comprehension
2022-02-17 12:16:53 -05:00
826611411f
"list_data" now returns list not str; deemph creator
2022-02-17 12:05:13 -05:00
9972a22043
precision is ok, but numpy.sum takes sum over all dimensions per default
2022-02-17 07:58:56 +01:00
9a5eb45212
helpful information when comparing files
2022-02-17 07:16:55 +01:00
89a914bbe7
correct reporting of units
2022-02-17 07:13:39 +01:00
ed50cd022b
shorter, potential for higher precision
...
np.sum has an better alogrithm but fails ...
2022-02-16 23:40:02 +01:00
9fc6469b13
Merge remote-tracking branch 'origin/development' into python-polishing
2022-02-16 23:13:46 +01:00
138b0e03f2
[skip ci] updated version information after successful test of v3.0.0-alpha5-696-g6fce27dee
2022-02-16 19:11:10 +01:00
0f579e44ab
[skip ci] updated version information after successful test of v3.0.0-alpha5-691-gfe0ff7cab
2022-02-16 07:51:02 +01:00
fe0ff7cab2
Merge branch 'typehints_orientation_rotation' into 'development'
...
04 First typehints for rotation and orientation modules
See merge request damask/DAMASK!479
2022-02-16 03:35:45 +00:00
4426172c14
Merge branch 'development' into python-vtk-improvements
2022-02-15 18:07:18 -05:00
c5f2865121
make apparent that vtk.get automatically "squeezes"
2022-02-15 18:04:21 -05:00
96133c68e9
Corrected documentation for Table.set/add/sort_by
2022-02-15 22:53:08 +00:00
a8898163ce
polishing of error message styles
2022-02-15 16:48:24 -05:00
e2d1ffe7b8
condensed add_table test
2022-02-15 16:42:17 -05:00
6916160ed1
implemented VTK.add(damask.Table)
2022-02-15 16:38:02 -05:00
35caed305f
consistently define allclose for own type only
2022-02-15 22:08:12 +01:00
00f44c9ed6
[skip ci] updated version information after successful test of v3.0.0-alpha5-651-gd4f711416
2022-02-15 17:06:48 +01:00
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
bdeb3e042e
[skip ci] updated version information after successful test of v3.0.0-alpha5-642-ge38786515
2022-02-15 01:20:38 +01:00
e387865153
Merge branch 'cm.from_table-with-constant' into 'development'
...
allow constant (non-label) value in cm.from_table() keys
See merge request damask/DAMASK!523
2022-02-14 20:59:57 +00:00
18f9ac7d44
outsource tail-repacking of characters into string (util.tail_repack)
2022-02-14 12:11:01 -05:00
7d015fbdc5
avoid confusion with existing table entry
2022-02-14 14:32:02 +00:00
2ce464c48e
vtk.comments as directly accessed property
2022-02-14 09:24:12 -05:00
1d5abc206a
[skip ci] updated version information after successful test of v3.0.0-alpha5-638-g1ecbeb692
2022-02-14 11:23:42 +01:00
1b08f90d6c
allow constant (non-label) value in cm.from_table() keys
2022-02-13 23:54:16 -05:00
0300912b30
Table.__eq__ for proper comparison; logical masks for slicing now work
2022-02-13 22:00:48 -05:00
e210a9873d
[skip ci] updated version information after successful test of v3.0.0-alpha5-624-g26979da58
2022-02-14 02:21:46 +01:00
b1922c9fc0
return most specific type
2022-02-13 11:03:53 +01:00
2907facfd3
polishing
...
classes should return 'MyType' for inheritance without hassle
2022-02-13 02:47:08 +01:00
bdc951c39b
Merge remote-tracking branch 'origin/development' into typehints_orientation_rotation
2022-02-12 22:39:28 +01:00
c6a188a1fe
added CrystalFamily, CrystalLattice, CrystalKinematics typehints
2022-02-11 15:41:30 -05:00
0a52ae3b6f
polishing of help and style; relax to FloatSequence type where appropriate but keep doc at np.ndarray
2022-02-11 14:50:55 -05:00
5f7a18c32d
[skip ci] updated version information after successful test of v3.0.0-alpha5-608-g3e8d1a60d
2022-02-11 01:09:25 +01:00
3ee98164fa
simplified
2022-02-10 23:55:05 +01:00
b81116f62a
not needed anymore
2022-02-10 23:13:37 +01:00
1364441703
better readable
2022-02-10 22:57:23 +01:00
1e3780b069
shortened
2022-02-10 21:31:52 +01:00
57e8fe2b8a
need bracket for correct evaluation
2022-02-10 21:28:48 +01:00
97d17ea50c
[skip ci] updated version information after successful test of v3.0.0-alpha5-603-ge0ed668ce
2022-02-09 19:45:43 +01:00
e0ed668ce0
Merge branch 'Fortran-polishing' into 'development'
...
a number of small improvements
See merge request damask/DAMASK!516
2022-02-09 16:01:00 +00:00
81c141e3d3
[skip ci] updated version information after successful test of v3.0.0-alpha5-574-g13783f87f
2022-02-08 17:58:03 +01:00
8c6225794d
adjusted return of Orientation.__ne__ function to return NotImplemented in case of wrong input type
2022-02-08 14:47:23 +01:00
171193d0d7
[skip ci] updated version information after successful test of v3.0.0-alpha5-571-g1edc8442d
2022-02-07 00:44:17 +01:00
a6e83c70ec
adjustments to follow de-facto standard in other parts of the python
...
library
2022-02-06 17:12:35 +01:00
72978df099
minor correction
2022-02-04 17:41:29 +01:00
c1c2336638
reverted __eq__ and __ne type verification to return NotImplemented constant
...
changed rotation.average input type to FloatSequence
minor adjustments
2022-02-04 16:57:25 +01:00
019ae1c536
adjusted typecheck in __eq__ and __ne__ functions
2022-02-04 11:43:35 +01:00
7a405125da
added type:ignore statements to Tuple Supportsindex addition in Orientation.disorientation function
2022-02-04 10:57:24 +01:00
9dad54304c
added generic types to remaining non-overwritten rotation functions (exception __mul__)
2022-02-04 09:57:42 +01:00
d1f9e98e3c
moved typecheck of __ne__ functions to __eq__
...
added initial empty runtimeerror to Schmid function
minor corrections
2022-02-03 16:11:09 +01:00
e940a02304
[skip ci] updated version information after successful test of v3.0.0-alpha5-568-g2cb3b2cc4
2022-02-03 13:47:57 +01:00
f80de7d0b3
added NumpyRngSeed type to rotation rng_seed objects
2022-02-03 12:04:31 +01:00
df54bf724c
Merge branch 'development' of git.damask.mpie.de:damask/DAMASK into typehints_orientation_rotation
2022-02-03 11:19:15 +01:00
a243e10641
Merge remote-tracking branch 'origin/development' into Fortran-polishing
2022-02-03 09:01:33 +01:00
Martin Diehl