7059e6af6e
might not be in the last line
2020-11-01 18:34:52 +01:00
946da2379b
Merge remote-tracking branch 'origin/development' into modernize-testing
2020-11-01 10:06:52 +01:00
0a3598c338
Merge branch 'simplify-from_table' into development
2020-10-31 22:34:17 +01:00
0ebb9b611d
functionality to sort material id
...
convenient for layered materials
2020-10-31 20:46:21 +01:00
67f69fc8a5
data is consecutive
2020-10-31 17:23:58 +01:00
8224122bb9
more user friendly error handling
2020-10-31 13:16:25 +01:00
cf740a279e
combine constant with varying data
2020-10-31 09:56:43 +01:00
aecf2f539e
allow one homogenization
...
quite useless ...
2020-10-30 22:26:02 +01:00
c29e3650f3
don't squeeze into scalar
2020-10-30 22:24:27 +01:00
392803e47d
Merge remote-tracking branch 'origin/Marc_version_names' into development
2020-10-30 17:49:18 +01:00
46e5023f8b
Merge branch 'geom-improvements' into 'development'
...
Geom improvements
See merge request damask/DAMASK!264
2020-10-29 23:53:33 +01:00
b2289e80b2
simplified
2020-10-29 20:09:13 +01:00
0e499eedf3
correct rounding/clearer logic
2020-10-29 18:35:22 +01:00
4b700d367e
improved test
2020-10-29 17:59:44 +01:00
904c338b13
Reflect version underscore of installation files
2020-10-29 15:21:40 +01:00
999cf53c07
tests+fixes
2020-10-29 07:42:41 +01:00
3be0c462a8
explicit is better then implicit:
...
user should sort Table according to coordinates to create geometry. This
allows to have consistent behavior for from_table in Geom and
ConfigMaterial. We always ensure to keep the order
2020-10-29 07:25:16 +01:00
1b2cd6caf6
documentation was misleading
2020-10-28 21:53:46 +01:00
4ff99a7af4
more logical layout
2020-10-28 21:51:20 +01:00
855bf124d3
faster
...
https://stackoverflow.com/questions/16992713
2020-10-28 16:53:16 +01:00
21f095c9d8
Merge branch 'flexible-yaml-dump' into development
2020-10-28 16:19:17 +01:00
98e0ef3881
no loops
...
taken from https://stackoverflow.com/questions/3403973
2020-10-28 13:38:20 +01:00
d72343c865
keep order of unique values found in table
2020-10-28 11:56:28 +01:00
b38a498197
fast
2020-10-28 09:43:20 +01:00
5f03e8cf8f
0-based material indices
2020-10-28 09:31:55 +01:00
a5a127b787
new tests+ updated results
2020-10-27 16:46:08 +01:00
0804e6ee74
pythonic names
2020-10-27 13:50:47 +01:00
fa67a2ddf8
cell_coordinates is now a property
2020-10-27 13:35:14 +01:00
201a62d7c9
easier visualization if verts have a point-cell
2020-10-27 13:19:53 +01:00
4dd387d7f5
compatibility with old pyyaml + test for numpy
2020-10-27 06:39:58 +01:00
4159ae5f3d
keep order of keys
2020-10-26 21:44:38 +01:00
5834d95012
support for more types
...
- allow to directly use Config and its sublasses (cast to dict)
- convert numpy arrays
2020-10-26 21:38:24 +01:00
802e09be4f
python/damask/_geom.py exceeds line length limit (maximum line length 143 > 132)
2020-10-26 15:11:06 +01:00
2715e7b1a7
a bit more vectorized
2020-10-26 15:09:32 +01:00
1cbfa866d2
get rid of scalar variables
2020-10-23 16:23:36 +02:00
bd67296e8d
MARC_VERSION as MSCVERSION
2020-10-22 11:50:13 +02:00
7fa31a8a1b
solving imported but unused pyflake
2020-10-19 12:55:35 +02:00
4c22efc6ce
added show GB
2020-10-19 12:52:10 +02:00
bac7ace413
Merge remote-tracking branch 'origin/general-N_constituents' into vtr-only
2020-10-13 17:39:19 +02:00
86d91baf90
0-offset for geom
2020-10-10 10:36:15 +02:00
ffabeacbcb
removing functionality related to deprecated 'geom' format
2020-10-10 09:41:11 +02:00
00e2128e03
don't test ASCII functionality
...
vtr writing in Geom class is alwas serial, no need to wait
2020-10-10 09:02:25 +02:00
06d11a72da
better fitting name
...
load implies a more direct takeover.
2020-10-09 19:19:05 +02:00
57180952ec
typo
2020-10-09 19:05:05 +02:00
347c88cbb6
documented
2020-10-09 14:24:29 +02:00
75401dd280
generate configuration from table
2020-10-09 07:45:20 +02:00
0c68d293b6
N_constituents is now a general homog property
2020-10-09 07:44:05 +02:00
6ecaaa31c9
fairly general function to generate material configuration
2020-10-08 22:07:26 +02:00
952ad4f8fe
functionality for geom generation in python lib
2020-10-08 18:39:05 +02:00
3050471a2d
avoid circular inclusion
2020-10-08 18:05:03 +02:00
846cbdd2e4
Merge branch 'general-config' into 'development'
...
General config
See merge request damask/DAMASK!245
2020-10-08 00:48:16 +02:00
8d4adebea2
pyaml is now needed
2020-10-06 17:46:34 +02:00
3d49678e93
new names part 2
2020-10-02 17:51:33 +02:00
1b18cae46b
adjusted to new names
2020-10-02 17:49:52 +02:00
a04966582a
Merge remote-tracking branch 'origin/development' into general-config
2020-10-02 14:54:16 +02:00
58229b8851
relaxed test conditions
...
even threshold between -.5 and +.5 can result in a single material.
2020-10-02 13:26:11 +02:00
b29f22f513
documenting the actually available TMPS
2020-10-01 09:25:32 +02:00
a59e64a8e4
renamed TPMS and added more from additional references
2020-09-30 17:28:25 -04:00
33685bc493
allow user do control output style
...
(numerics.yaml looks strange otherwise)
2020-09-30 12:32:37 +02:00
5ad46ae021
completely tested
2020-09-30 09:05:23 +02:00
fdfcb16d15
not needed
2020-09-30 08:16:12 +02:00
bbed4f9c6e
nice formatting
...
will be checked by pre-receive hook
2020-09-30 08:15:02 +02:00
b383a4530e
better name, subclassing for easy extension to load
2020-09-30 07:53:25 +02:00
54e4943353
get rid of shell scripts
2020-09-30 07:11:33 +02:00
76f07e4c1e
tmp_path is preferred over tmpdir
2020-09-29 19:25:50 +02:00
350f5eb66a
improved from_ODF documentation
2020-09-29 12:55:00 -04:00
31f86c28f4
[skip ci] added parameter description; shortened hybrid_IA pre-loop logic
2020-09-29 11:15:10 -04:00
8d204ea445
[skip ci] small simplification
2020-09-28 16:17:43 +02:00
d2cfcdaca0
reference Data for ODF sampling (hybridIA) + skeleton of a test
2020-09-28 16:14:27 +02:00
95b85626d8
general hybridIA functionality
2020-09-28 07:40:43 +02:00
8ec1014134
Merge remote-tracking branch 'origin/development' into cleaning
2020-09-27 18:11:43 +02:00
e8e1960391
Consistency for docstrings
2020-09-26 18:02:25 +02:00
d0028b2eea
Merge branch 'development' into fix-docstrings-for-sphinx
2020-09-26 17:56:42 +02:00
9e3506b8ef
thorougly testing seeding functionality
2020-09-25 07:41:58 +02:00
e58cc4bfa0
removed substitute call for direct mapping; added seed from averaging of material ID cloud
2020-09-24 22:06:43 -04:00
e8454c40c7
more tests
2020-09-24 22:59:31 +02:00
4960cf43d4
documented and tested
2020-09-24 21:43:04 +02:00
e5b414419a
Poisson disc for periodic situation
2020-09-24 21:26:16 +02:00
ec23ab8b61
basic test for seeding
2020-09-24 21:06:26 +02:00
b5ea04424b
Merge remote-tracking branch 'origin/development' into seeds-module
2020-09-24 20:58:53 +02:00
8c8db5b99f
switched "Geom.materials" to "Geom.material"
2020-09-23 17:27:15 -04:00
b995f34834
Merge branch 'development' into geom-fully-out-of-place
2020-09-23 22:50:20 +02:00
8c83566b71
suppress warning
...
we already handle the invalid FPE
2020-09-23 21:10:39 +02:00
9bce1ddc29
simplified
2020-09-23 20:48:34 +02:00
3612b17295
corrected Sphinx warnings
2020-09-23 16:21:20 +02:00
c85d27baec
functionality for seed creation
2020-09-23 09:45:36 +02:00
ae579d8baa
allow to specify seed IDs explicitly
2020-09-23 09:28:00 +02:00
5a64dd30e1
Merge branch 'development' into modernize-testing
2020-09-23 00:05:59 +02:00
683161d479
Merge branch 'development' into geom-fully-out-of-place
2020-09-22 15:22:58 -04:00
05835bacd3
removed set_X(), duplicate(), and .homogenization; renamed ".microstructure" to ".materials"
2020-09-22 14:49:28 -04:00
716a406361
Merge remote-tracking branch 'origin/master' into modernize-testing
2020-09-22 16:51:36 +02:00
7801f527f2
Merge remote-tracking branch 'origin/load-save-X-no-suffix' into development
2020-09-22 14:57:39 +02:00
5ef761fb98
inform the user about missing items in material.yaml
2020-09-21 19:10:20 +02:00
188905766f
removed Geom.get_X() methods in favor of direct property access
2020-09-21 11:13:53 -04:00
ca2f3f9493
set_X and add_comments methods now default to out-of-place
2020-09-21 10:29:07 -04:00
7bdd44a3d9
consistent names:
...
default file operations: save/load, non-default save_xx/load_xx
2020-09-20 22:04:28 +02:00
d33507866d
statistically more valid test
2020-09-20 21:50:52 +02:00
6ab88aad2b
default format for Table is ASCII
...
hence, renamed load_ASCII/save_ASCII to load/save
2020-09-20 20:45:06 +02:00
5895e74029
p is never above 1
...
1e-4 is quite low, usually we are far above. 1e-3 from https://docs.scipy.org/doc/scipy/reference/generated/scipy.stats.normaltest.html
is not too far away.
2020-09-20 19:13:54 +02:00
5b0b0de6b4
assertion reports offense; fixed seeds for spherical and fiber
2020-09-20 12:22:41 -04:00
3cc319ef08
removed debug print statement in test_util
2020-09-19 14:30:58 -04:00
7cbd422ae3
fixed coprime error when encountering NaN
2020-09-19 13:38:32 -04:00
6f45203c98
first version of a pyaml based class for material configuration
...
pyaml is (again) actively maintained and the ruamel.pyaml API is
instable
2020-09-19 13:01:19 +02:00
0746a2f3a4
give visual feedback
...
in most tests, this is done manually
2020-09-19 08:33:15 +02:00
c42511f101
small polishing
2020-09-18 16:32:59 +02:00
f23b89f055
get rid of annoying warning during test
2020-09-18 16:30:22 +02:00
c935ba1215
user friendly self reporting
2020-09-18 16:23:23 +02:00
1849ff0330
polishing
2020-09-18 15:03:51 +02:00
e2cd3da295
remaning to_xx
2020-09-18 14:29:27 +02:00
cdf3323774
Merge remote-tracking branch 'origin/development' into load-save-X
2020-09-18 14:21:43 +02:00
ec7dbb4c9a
do not store temp files
2020-09-18 14:21:30 +02:00
190f8a82d4
Merge branch 'texture-components-in-rotation-class2' into 'development'
...
Texture components in rotation class2
See merge request damask/DAMASK!225
2020-09-18 13:31:42 +02:00
ca689193f6
Merge branch 'new-random-style' into 'development'
...
new style for numpy random numbers
See merge request damask/DAMASK!224
2020-09-16 11:12:55 +02:00
70911b64ea
Merge branch 'development' into texture-components-in-rotation-class2
2020-09-16 09:57:50 +02:00
c71768a37a
polishing
2020-09-16 06:33:17 +02:00
ed006d1a89
streamlined fiber/spherical component sampling
2020-09-15 19:12:30 -04:00
c6be6fe87f
fixed spherical component sampling and testing
2020-09-15 18:40:05 -04:00
82ed546ff7
Merge branch 'texture-components-in-rotation-class2' of magit1.mpie.de:damask/DAMASK into texture-components-in-rotation-class2
2020-09-15 18:14:19 -04:00
0a34e342e4
fixed fiber component sampling and testing
2020-09-15 18:14:15 -04:00
d6378ec9bc
shortened from_fiber_component algorithm
2020-09-15 16:34:19 -04:00
ad2badd3be
[skip ci] vectorized and simplified
...
based on Philips ideas. Test requires from_axis_angle fix
2020-09-15 22:13:28 +02:00
9e93e8b710
test for last commit
2020-09-15 19:59:03 +02:00
d02617c961
fixed normalization of multidimensional axes (from_Rodrigues, from_axis_angle)
2020-09-15 13:09:24 -04:00
3f823ca717
testing general case
2020-09-15 14:39:05 +02:00
18c38f1284
polishing
2020-09-15 13:49:44 +02:00
2a082b7983
methods for texture component calculations
2020-09-15 12:11:46 +02:00
82e41d92ce
new style for numpy random numbers
...
https://numpy.org/doc/stable/reference/random/index.html?highlight=random#quick-start
https://albertcthomas.github.io/good-practices-random-number-generators/
2020-09-15 08:12:02 +02:00
2114c51098
revert mistakenly made header length change in array-comparison
2020-09-15 01:47:26 -04:00
96ad358f83
modified file reading/writing methods to load_X, save_X formalism
2020-09-15 01:14:05 -04:00
b298962101
Merge branch 'development' into table-out-of-place-only
2020-09-14 08:06:44 +02:00
f6758ecc28
table class operates out of place
2020-09-14 07:04:01 +02:00
a5d5638e4a
allow uncompressed files
2020-09-12 13:46:55 +02:00
865c90d00b
first check data type, then determine length of data...
2020-09-09 19:10:03 -04:00
7d9a4c08ce
Do not strictly require np.ndarrays for grid, size, or origin when not essential for functionality.
2020-09-10 00:59:40 +02:00
9fb3fef4b0
changed British "normalise" to US "normalize" as we (should) follow US English everywhere else.
2020-09-08 10:39:31 -04:00
a4785ba562
modified file writing of geom and table to a general to_file() that takes a "format=" argument
2020-09-03 10:53:16 -04:00
d645849baf
fixed remnant occurrences of .write() --> .to_file()
2020-09-02 11:32:40 -04:00
6785062a10
Merge branch 'development' into 'vtk-to-file-method'
...
# Conflicts:
# python/tests/test_VTK.py
2020-08-31 21:10:29 +02:00
6986d20b32
Merge branch 'geom-out-of-place' into 'development'
...
Geom methods are now out-of-place, i.e. return an updated duplicate
See merge request damask/DAMASK!203
2020-08-31 12:39:01 +02:00
03b02ad641
typos/sentence
2020-08-29 16:06:10 +02:00
c58693328e
don't try to access folders that don't exist
...
this happened in the case when different types of output exist in
different phases, e.g.
Aluminum: generic, plastic, sources
Steel: generic, plastic
We are a little bit inconsistent because 'generic' and 'plastic' are
always created (even if empty) but 'sources' will only exist if it
contains output. In future, we should have only folders that actually
contain data
2020-08-28 12:45:41 +02:00
9457435612
Merge branch 'polishing-for-release' into 'development'
...
Polishing for release
See merge request damask/DAMASK!206
2020-08-27 17:01:43 +02:00
0d5279863d
avoid rounding errors related to rotation
2020-08-27 09:33:09 +02:00
94797f8325
ignore all kinds of FPE
2020-08-27 09:32:49 +02:00
c5761831e2
more meaningful message
...
if add_xxx (Results) does not find matching datasets, inform the user
about this fact instead of saying
TypeError: object of type 'IMapUnorderedIterator' has no len()
2020-08-27 00:14:37 +02:00
c2191fd930
Make logic to mask (outside of) primitive more apparent (hopefully).
2020-08-27 00:06:52 +02:00
248ef8ef97
more tests
...
- invalid files
- scalar/array size,center,exponent for add_primitive
- rotation invariance for add primitive
2020-08-26 23:56:20 +02:00
229f6139c8
better user experience
...
- no meaningless warnings regarding floating point precision
- meaningful error message for invalid header
2020-08-26 23:54:56 +02:00
b9f1421c6b
[skip ci] removed unnecessary line continuations "\"
2020-08-26 17:27:08 -04:00
3f24d16603
renamed VTK.write() to VTK.to_file()
2020-08-26 16:15:15 -04:00
da46e5ea9a
cannot use np.linalg.norm when dealing with exponent triple
2020-08-26 15:49:25 -04:00
06b524d13e
added 'iso' as possible lattice (with no symmetry)
2020-08-26 21:39:20 +02:00
68c2908ba8
Merge branch 'rename-hdf5-output' into development
2020-08-26 12:34:56 +02:00
fee21cbd9c
more sensible tests
2020-08-25 17:17:49 +02:00
bf401e56cf
avoid name clash with damask.Geom
2020-08-25 09:56:24 +02:00
800dac5d01
correct type handling
...
no reason to calculate fill twice
2020-08-25 08:47:24 +02:00
96d4975fc4
using numpy functionality
2020-08-25 08:34:04 +02:00
51da632108
aiming at testing each individual statement
2020-08-25 07:49:56 +02:00
2d98325fa4
increasing test coverage
2020-08-25 01:21:17 +02:00
453f5a14c5
duplicated test (w/o wait for parallel out)
2020-08-25 00:53:05 +02:00
2751cdb6af
support comments also in vtr
2020-08-25 00:40:14 +02:00
9a2ac31545
explicit is better then implicit
2020-08-24 23:35:46 +02:00
0ceba2a6d3
use central functionality
2020-08-24 23:28:26 +02:00
71e08ea66a
small fixes:
...
- numpy has multiple float variants
- start renaming microstructure -> materialpoint where it does not hurt
- no need for type check if comparing against set of valid directions
(or I miss some corner cases)
2020-08-24 23:23:47 +02:00
2560f014a3
Merge remote-tracking branch 'origin/increase-geom-test-coverage' into geom-out-of-place
2020-08-24 17:17:31 -04:00
55443a3ff5
reflect change of variable names in file layout version
2020-08-24 22:54:09 +02:00
279d43ccc6
include version info + date in comments (Table class)
2020-08-24 19:04:59 +02:00
9d505c8518
better readable
...
- more explicit reporting
- always relative import for DAMASK
2020-08-24 09:58:24 +02:00
b393da4955
relative imports
...
... it's all about damask.XXX
2020-08-24 07:28:10 +02:00
0d3ef29554
more logical encapsulation
...
- getting data out of VTK is a functionality of the VTK class. Need to
discuss whether the VTK class should also provide grid and size (works
only for rectilinear grid, so hiding VTK type is not possible
anymore), but the current situation requires the Geom class to rely on
'internals' of the VTK class
- header is specific to *.geom format, not to Geom objects.
2020-08-24 06:46:22 +02:00
507a165733
functionality for getting data
...
- handy for Geom class, but could be of general interest
- add/set/get comments: follows same functions as for Geom class
2020-08-24 06:40:36 +02:00
3738002e4a
forgot the new reference files...
2020-08-23 22:27:53 -04:00
446ac03b07
All geom methods are now out-of-place, i.e. return an updated duplicate (to allow for daisy chaining).
...
* Added comments when methods acted.
* Added diff method
* Added flip method
* Fixed add_primitive inversion bug (again...)
* Fixed cell centering bug in add_primitive
* Added missing tests
2020-08-23 19:43:46 -04:00
22da3af92e
cleaning (prospector complaint)
2020-08-24 00:44:18 +02:00
44015082a3
dead code (copy and paste error)
2020-08-24 00:34:07 +02:00
c7cbd961a1
more systematic monkeypatching
...
allows comparison of reference files (log/history does not contain
information about damask.version and datetime.datetime.now)
2020-08-24 00:31:38 +02:00
9867830d68
store history of geometry modifications
2020-08-23 23:52:48 +02:00
a1c78b778a
WIP: track history in VTK objects
2020-08-23 23:22:53 +02:00
7b50a3b364
material.config is not used anymore
2020-08-23 15:20:11 +02:00
d65371d42f
removed unused and untested functionality
...
PEP 20: Explicit is better than implicit.
2020-08-23 12:55:55 +02:00
6f79573140
more test coverage
2020-08-23 11:05:56 +02:00
07af7b2f98
geom is written to vtr exlcusively, not to general vtk
...
base tests on vtr
2020-08-23 10:50:15 +02:00
64e7582e8e
consistent interface to ndimage filters
...
Boolean 'periodic' sets mode to 'wrap' or 'nearest'
2020-08-23 10:02:22 +02:00
975db01f31
microstructure -> materialpoint
...
at least for new functionality
2020-08-23 09:38:08 +02:00
5fb2d30ee4
fast and for arbitrary type
2020-08-23 09:02:17 +02:00
b731b1e768
Geom.to_vtk improvements
...
- should be integer
- should have a test
2020-08-23 08:49:49 +02:00
2b09a7d31d
fixed Geom.canvas bug, added Geom.from_vtk, added mode,selection options to Geom.clean
2020-08-22 21:36:11 -04:00
bd4fb562bc
make use of inhereted dependencies
2020-08-22 20:57:42 +02:00
499ce01748
added Geom.copy() method
2020-08-22 13:57:31 -04:00
34a08bd8b8
pip package is pillow, not PIL
2020-08-22 17:04:21 +02:00
752d6f773b
corrected add_primitive test
2020-08-09 23:14:32 +02:00
ff7eed4477
(unified) type hints
2020-08-08 20:56:17 +02:00
0c6ce390b5
simple IO tests
...
can be improved ...
2020-08-08 20:35:50 +02:00
6a5471d243
have microstructure with 'to' and 'of'
2020-08-08 20:24:36 +02:00
55a620b378
migrating to library
2020-08-08 20:14:30 +02:00
a0e0f28e51
migrating shell scripts to library
2020-08-08 19:42:34 +02:00
5fcff876f9
replace selectively
...
useful for vicinity_offset and add_primitive
2020-08-08 18:41:47 +02:00
56eb57d253
homogenization will be removed soon, stop reporting it
2020-08-08 18:24:17 +02:00
7824a61f2e
Merge branch 'user_defined_add_calculation' into 'development'
...
User defined add calculation
See merge request damask/DAMASK!195
2020-08-06 00:53:16 +02:00
ce00371f52
fixed rounding bug and updated reference images
2020-08-05 10:44:10 -04:00
e4103564a9
16bit color index; proper rounding of index values
2020-08-05 10:08:48 -04:00
0aaba487d7
required packages
2020-08-05 06:20:05 +02:00
856dc22eab
Merge branch 'imageData-as-colormap.apply' of magit1.mpie.de:/damask/DAMASK into imageData-as-colormap.apply
2020-08-04 20:38:02 +02:00
7d49606597
restored correct bound calculation
...
test different bounds options
2020-08-04 20:34:40 +02:00
e73ffd6da9
fixed and condensed lo,hi range assignment
2020-08-04 20:29:27 +02:00
e07c00a592
polishing + simple test
...
autoscaling seems to be broken
2020-08-04 20:14:04 +02:00
84551c9d1e
integrated former imageData functionality as "shade" method
2020-08-04 13:05:30 -04:00
ae20f5ffe6
attempt to fix parallel writing on MacOS
...
should resolve TypeError: cannot pickle
'vtkmodules.vtkIOXML.vtkXMLRectilinearGridWriter' object error
2020-08-03 18:19:38 +02:00
3f2e63977d
not needed anymore
2020-07-31 19:46:44 +02:00
72ea9a5cec
non-vectorized formulas can be implemented in a user function
2020-07-31 19:42:44 +02:00
a9f53f4822
non-vectorized formulas can be implemented in a user functionc
2020-07-31 17:04:14 +02:00
50d7842dbe
more tests
2020-07-31 16:50:01 +02:00
aadce1e554
Merge branch 'development' into user_defined_add_calculation
2020-07-31 16:15:31 +02:00
daab5a8952
polishing
2020-07-24 22:42:16 +02:00
326b82b3aa
symmetric scatter around nominal value
2020-07-24 22:41:41 +02:00
4860f9c9ce
drop support for parallel marc versions
...
can still be handled by the user, but is a niche use case
2020-07-18 09:51:53 +02:00
2bbd68d964
with_suffix strips .1 from 2019.1
2020-07-16 09:33:17 +02:00
199ec51bf8
typo
2020-07-15 21:59:43 +02:00
9225d439ab
object oriented path handling
2020-07-15 21:58:24 +02:00
fa7f7e6fa4
don't complain if ssh without -X/-Y
2020-07-15 21:19:09 +02:00
333e840b09
standard behavior
...
most modules have an __version__ attribute
2020-07-15 20:57:56 +02:00
6259984e93
simplified
...
complicated, but allows to use functions as properties
2020-07-15 20:54:37 +02:00
b0e06f180a
reading numpy manual ...
...
https://numpy.org/doc/stable/reference/generated/numpy.isclose.html
rtol=1.e-8, b=1 gives atol+btol=1.e-8+1e-9, simplified to 1e-8
2020-07-13 22:48:29 +02:00
e1bbaac0d7
Merge branch 'Vectorize-Orientation' into 'development'
...
Vectorize orientation
See merge request damask/DAMASK!186
2020-07-03 12:22:04 +02:00
7b3d1204fa
easier to use
2020-07-03 07:29:31 +02:00
d4f97f8346
Merge branch 'misc-improvements' into 'development'
...
Misc improvements
See merge request damask/DAMASK!184
2020-07-02 21:52:47 +02:00
7b899f1ff1
fixed output number format width for single increment0
2020-07-02 11:33:09 -04:00
81b3c10305
removed ambiguous variable "l"
2020-07-02 10:37:57 -04:00
368a241931
added testing of __iadd__ and __invert__
2020-07-02 10:27:52 -04:00
5a96708f41
added __iadd__ method
2020-07-02 10:26:04 -04:00
f3ff2e7412
added __iadd__ method
2020-07-02 10:25:04 -04:00
3b72d0ec72
added __invert__ method to reverse colormap
2020-07-02 10:13:47 -04:00
b88becb9d0
don't go out of focus during initialization
2020-07-02 08:25:35 +02:00
208d5109d4
still needed ...
2020-07-02 08:14:13 +02:00
86dc7054a4
still needed
2020-07-01 22:11:16 +02:00
4abd77fccf
more test coverage
2020-07-01 17:31:16 +02:00
be1eb996e0
more tests and cleaning
2020-07-01 15:12:34 +02:00
a7e3dd5a56
Merge branch 'development' into Vectorize-Orientation
2020-07-01 13:30:39 +02:00
e18a5b8a1b
simplifications + more tests
2020-07-01 08:57:28 +02:00
de8e9b5fc1
fast reduced operation
2020-07-01 00:37:02 +02:00
23365660d8
polishing
2020-06-30 23:18:32 +02:00
ef0c78745a
fix for vectorized in_SST + test
2020-06-30 23:05:41 +02:00
49d448dced
vectorized and cleaned
2020-06-30 21:43:57 +02:00
9a83b11a99
testing IPF color (vectorization)
2020-06-30 18:41:59 +02:00
bdb461a553
more flexible and independent
2020-06-30 18:12:39 +02:00
6e27a140f6
better split
2020-06-30 17:35:52 +02:00
3d6afff27a
clearer name
2020-06-30 17:30:29 +02:00
be21d1289d
using slicing method
2020-06-30 16:33:04 +02:00
c86e3e292c
WIP: cleaning namespace
2020-06-30 14:07:10 +02:00
9d94b521ad
polishing
2020-06-30 13:31:58 +02:00
ce7018164f
WIP: more reasonable naming
2020-06-30 13:05:06 +02:00
b8b34080fe
enable array like slicing/iteration
2020-06-30 12:16:47 +02:00
c8adfae0fa
bugfix: wrong variables used
2020-06-30 07:16:49 +02:00
8dc87023d1
test from_range; update ASCII colormap labels (i_RGBA)
2020-06-29 22:23:24 -04:00
decbe8074a
not using unassigned variable
2020-06-29 22:22:21 -04:00
d3b3d628b2
PEP conformity...
2020-06-29 22:07:14 -04:00
39aac76859
__add__, from_range, fixed missing np.array(colors), show peppered...
2020-06-29 22:04:03 -04:00
97ca1b1a9b
try wxPython before tkinter, recent macOS otherwise fails
2020-06-29 22:02:12 -04:00
d06daec4cb
reducec vectorized is improved
2020-06-29 18:25:45 +02:00
2d0c680daf
useful information
2020-06-29 07:30:42 +02:00
4875191ffd
change if statement so github doesnt complain
2020-06-28 19:32:22 +02:00
a657125840
standard version string
2020-06-28 19:30:23 +02:00
a99f016438
problem with if value is true / if value == True
2020-06-28 19:29:52 +02:00
c7eb56a63d
single precision reference files
2020-06-28 19:25:58 +02:00
37f7362cbe
Merge branch 'development' into misc-improvements
2020-06-28 19:23:17 +02:00
323f828606
Merge branch 'development' into modernize_colormap
2020-06-28 19:09:52 +02:00
8484d2e6cc
fix github stuff
2020-06-28 19:05:10 +02:00
352c4e95f1
more vectorized
2020-06-28 19:03:06 +02:00
1cfa6d44d9
dummy version could be useful for other tests
...
note that monkey patching requires direct access to damask.version in
the respective modules.
'from xx import yy' creates a copy (at least for the version string).
2020-06-28 11:51:30 +02:00
b3f5ee022a
unified style
2020-06-28 11:40:19 +02:00
e6a87da37c
compare to reference results
...
need to patch damask.version to be independent of version strings (in
json and ASCII table)
2020-06-28 11:20:09 +02:00
6a748d2edf
do not expand single strings into characters
2020-06-28 11:19:18 +02:00
ae4146f1c6
report version, write out 'modern' ASCII table style
2020-06-28 11:18:22 +02:00
e81b67e964
polishing
2020-06-28 10:32:59 +02:00
1c03bd157f
more testing
2020-06-28 10:25:28 +02:00
b78c809375
real output
2020-06-28 10:25:28 +02:00
3513754647
low/high instead of left/right
2020-06-28 10:25:28 +02:00
f4d13bc810
binary representation depends on vtk lib version
2020-06-28 10:07:31 +02:00
d965d66319
[skip ci] documenting
2020-06-28 09:34:10 +02:00
8a9a768a77
support pathlib.Path
2020-06-28 07:17:51 +02:00
8d5a72e936
more test, swich to pathlib
2020-06-27 23:38:58 +02:00
8c8132bcd7
coordinates should not have random names
2020-06-27 23:37:09 +02:00
c929af12c0
testing/polishing
2020-06-27 19:44:12 +02:00
cf63226721
testing all conversions
2020-06-27 18:55:27 +02:00
234699bd18
reverse should return DAMASK colormap
2020-06-27 16:25:10 +02:00
e779e190ea
new colormap class for use in python
...
- based on matplotlib "ListedColormap"
- constructors
- Array of RGB values (inherited),
- 'from_bounds': perceptual uniform colormap within given bounds
- 'from_predefined': from matplotlib or DAMASK templates
- export to files (WIP)
- preview on screen
2020-06-27 16:12:40 +02:00
1f9b5280cb
forgotten debug statement
2020-06-26 11:47:04 +02:00
a69f82e7c3
speed up vtk out
...
- limit to single precision
- write in background
2020-06-26 11:45:54 +02:00
bfae88a364
numpy compatible
2020-06-26 11:45:30 +02:00
bddb514072
more systematic reporting
2020-06-26 11:45:06 +02:00
27220a03bc
not invalid anymore
2020-06-25 09:23:43 +02:00
3290e2c585
handle even obscure directions
2020-06-25 08:29:36 +02:00
5d7213b062
restore reminder to document changes
...
causes conflicts with outdated tests and is not urgent: postpone until
release.
2020-06-25 08:19:07 +02:00
c9829f0f1f
only Chuck Norris can divide by zero
2020-06-25 08:18:39 +02:00
cd23937af5
Merge branch 'development' into f-strings
2020-06-25 07:46:24 +02:00
e64d353865
condensed scale_to_coprime; added test of scale_to_coprime
2020-06-24 18:37:33 -04:00
9999560247
easier understanding of from_ang data layout interpretation
2020-06-24 18:36:43 -04:00
14d3b7e66d
more f-stringing
2020-06-24 16:59:55 -04:00
966b6f8007
shapes init copes with integers instead of strict tuples; introduced f-strings
2020-06-24 14:18:06 -04:00
f8f433e826
introduced f-strings
2020-06-24 14:13:56 -04:00
ff858fd4c8
[skip ci] corrected help string for "srepr"
2020-06-24 20:13:09 +02:00
4314ec1f37
[skip ci] started to replace .format() with f-strings
2020-06-24 11:02:37 -04:00
3d93a5ff00
Merge branch 'migrate-to-pathlib' into 'development'
...
Migrate to pathlib
See merge request damask/DAMASK!177
2020-06-24 14:54:36 +02:00
6fa5ae6ebf
literature from Karo
2020-06-22 23:14:58 +02:00
e33895dd35
[skip ci] better logic
2020-06-21 10:37:09 +02:00
c6a5bb8a3b
is 2020
2020-06-21 10:04:45 +02:00
4c5939ef23
small polishing
2020-06-20 22:51:00 +02:00
15b43bcebf
from_directions is not general, removed
...
polishing
2020-06-20 19:57:49 +02:00
3f63a4fdbc
[skip ci] typo
2020-06-20 18:13:34 +02:00
4dae3643c9
vectorized IPF color working
...
results also uses the vectorized form.
Still needs careful checking
2020-06-20 17:15:13 +02:00
ebdb65d31f
standard broadcast_to behavior
2020-06-20 16:35:22 +02:00
262346ff5a
polishing
2020-06-20 16:34:19 +02:00
d93ed2bc5c
several improvements:
...
- vectorized from_directions
- more tests (96% coverage, only random functionality is untested)
- updated documentation, folloing numpy standard
- inverse operator '~' introduced
2020-06-20 12:20:43 +02:00
055fa64f5f
better readable
2020-06-19 12:25:46 +02:00
13bf7515ce
WIP (broken?): vectorized calculation of IPF color
2020-06-19 10:54:13 +02:00
1648963b57
vectorized equivalent orientation calculation
2020-06-18 22:53:04 +02:00
cdda556e18
small improvements
...
- hack for reporting multiple rotation
- bugfix for vectorized Rodrigues vector
- more general broadcasting (even more powerfull then np.broadcast_to)
2020-06-18 22:30:22 +02:00
fe5e5babfe
more useful for vectorized calculations
2020-06-18 22:29:28 +02:00
d0d9245707
clearer intention
2020-06-16 23:35:50 +02:00
0f42ff6b5d
reshaped F transpose error3
2020-06-10 14:02:52 +02:00
4f4d8d8c92
reshaped F transpose error2
2020-06-10 13:27:36 +02:00
7d7927e821
reshaped F transpose error
2020-06-10 13:22:57 +02:00
f3d59ddfe5
F reshaped error
2020-06-10 12:00:33 +02:00
36f04309b4
issue in test_mechanics
2020-06-09 21:33:13 +02:00
694b7ec3c5
mechanics done
2020-06-09 21:27:08 +02:00
d365cc9e12
typo
2020-06-09 14:39:17 +02:00
2978cf72f7
check for test_mechanics
2020-06-09 14:31:20 +02:00
824682d236
checked for typo
2020-06-09 14:26:22 +02:00
627e62439b
the single case is included in test file
2020-06-09 14:17:31 +02:00
a76b5233be
fix pyflakes imported but unused in pytest 2
2020-06-05 13:54:38 +02:00
54c20cdd3c
fix pyflakes imported but unused in pytest
2020-06-05 13:53:47 +02:00
cb1779ef9a
fix pep257: D415 / First line should end with a period, question mark, or exclamation point (not e)
2020-06-05 13:49:30 +02:00
eae9698d22
equivalent,related and inFZ vectorized + pytest
2020-06-05 13:48:12 +02:00
ac09a2912a
fix python/damask/_orientation.py contains invalid python3 code 2
2020-06-04 16:45:44 +02:00
6a24aee171
fix python/damask/_orientation.py contains invalid python3 code
2020-06-04 16:44:57 +02:00
3897136f85
avoid python/damask/_orientation.py exceeds line length limit (maximum line length 141 > 132)
2020-06-04 16:43:28 +02:00
0c41e33434
orientation.equivalent takes several rotations at the same time + small test"
...
"
""
2020-06-04 16:39:24 +02:00
a9c61ede69
bugfix: should also work if DAMASK_NUM_THREADS is not set
2020-06-03 20:24:18 +02:00
bda555fd1c
we are looking for a path, not for a file
2020-06-03 16:47:03 +02:00
bb5485927e
names like 2020.2 cannot be converted to int
2020-06-03 15:18:46 +02:00
5da1aa49bc
string should be a Path object
2020-06-03 15:17:00 +02:00
9b04a45bbd
bugfix (wrong variable name)
2020-06-03 13:53:00 +02:00
3be1a33820
easier to read
2020-06-03 13:32:47 +02:00
c67fbacfc7
higher test coverage
...
- invalid operations
- legacy output
2020-06-03 11:03:31 +02:00
c5d0c7e52e
easier to read, more flexible
2020-06-03 10:44:40 +02:00
ac9fddd9e9
Merge remote-tracking branch 'origin/development' into misc-improvements
2020-06-02 00:12:50 +02:00
a51cc39613
proper docstring
2020-06-01 22:13:01 +02:00
72a0b1fae5
testing and polishing
2020-06-01 11:33:22 +02:00
7a193639fb
also show datasets without unit
...
currently, this is only the orientation dataset
Also enable renames. Since this alters the history, the user need to
enable this
2020-05-31 23:50:06 +02:00
bcb0ce5e5e
typo
2020-05-31 18:51:12 +02:00
adb92de8cc
Merge branch 'development' into less-shell-scripts
2020-05-31 18:49:51 +02:00
421b8f4268
documented function interfaces
2020-05-30 17:31:50 +02:00
1afa00a19c
testing systematically all possibilities
2020-05-28 08:05:16 +02:00
865a505186
fix for logarithmic strain
2020-05-27 22:32:35 +02:00
00168a5939
testing 2-dim array of tensors
2020-05-27 21:07:48 +02:00
56afc03f3c
only vectorized version needed
...
use single point/simple versions only for testing
2020-05-27 18:05:08 +02:00
0fe450a033
Merge branch 'misc-improvements' into less-shell-scripts
2020-05-27 17:40:13 +02:00
31f72aa912
handle min/mid/max eigenvalues/vectors separately
...
storing as matrix/vector is not favorable for paraview and in many
cases, either min or max are of interest only
2020-05-27 17:39:46 +02:00
f9c33d9210
mechanics checked for an array with arbitrary dimensions
2020-05-26 16:27:27 +02:00
addc4c36d1
test for XDMF writer
...
just ensure that it does not throw an exception
2020-05-26 08:06:39 +02:00
520dfe216a
cleaning
2020-05-26 07:57:32 +02:00
908788271a
Merge branch 'misc-improvements' into less-shell-scripts
2020-05-26 07:24:03 +02:00
5ad7fe04d0
bugfix:
...
used wrong type
2020-05-26 07:15:27 +02:00
670e08468b
reorder
...
tests depend on other functionality that should be tested first
2020-05-26 06:49:29 +02:00
88c49fc4f4
also check values
2020-05-26 06:48:52 +02:00
7f09c90c7d
different h5py versions seem to throw different errors
2020-05-26 06:39:11 +02:00
6f7c7005b0
bugfix:
...
- proper overwrite
- no out of bounds error for empty time selection (just pick nothin)
2020-05-25 23:54:06 +02:00
9855c61747
store vtk file in tmp directory
2020-05-25 23:39:19 +02:00
9076fbe525
testing overwrite functionality
2020-05-25 23:05:31 +02:00
d6877da2b6
single source of truth
2020-05-25 20:15:45 +02:00
d9d089c359
avoid repetition and do correct encode/decode
2020-05-25 20:13:57 +02:00
5d0a2aac8f
polishing reporting
2020-05-25 20:13:57 +02:00
b9e16ea951
overwriting datasets makes sense in special cases
...
but prevent user from accidently doing that and store the information
2020-05-25 20:13:57 +02:00
248f199a7b
track creation time
2020-05-25 18:51:10 +02:00
b1b8d02320
typo
2020-05-25 16:41:23 +02:00
9d7158b51a
Merge branch 'misc-improvements' of magit1.mpie.de:/damask/DAMASK into misc-improvements
2020-05-25 16:40:23 +02:00
f07eaf19d0
fixed broadcasting + corresponding test
2020-05-25 16:37:08 +02:00
784d6d09d9
cleaning
2020-05-25 15:55:38 +02:00
dad7c7a2a0
Merge branch 'vectorize_rotation' into misc-improvements
2020-05-25 15:50:03 +02:00
3e2cbef780
Merge remote-tracking branch 'origin/development' into vectorize_rotation
2020-05-25 15:46:27 +02:00
77b68ab86f
using rotation class for rotations
2020-05-25 09:39:39 +02:00
39505507f1
not needed anymore
2020-05-25 08:07:12 +02:00
17aa3c00dc
more tests
2020-05-24 22:52:00 +02:00
296308e11e
fix for rotation around 90 deg
...
more tests
2020-05-24 20:52:19 +02:00
34adefd4ca
simplified
2020-05-24 18:30:45 +02:00
987c4a9e8d
first commit mechanics
2020-05-24 18:30:44 +02:00
594fcb2b72
seems more appropriate
2020-05-24 15:10:53 +02:00
3231a49107
centralize functionality
2020-05-24 09:39:58 +02:00
a26cba1457
calling a few missing statements
2020-05-24 09:06:11 +02:00
a3d9520c4b
polishing
2020-05-23 15:54:28 +02:00
82419f8649
testing selection
2020-05-23 10:38:25 +02:00
8a848979aa
missing test for IPF color
2020-05-23 09:13:45 +02:00
0549e33a00
vectorized/fast
2020-05-23 08:38:57 +02:00
e2cf527dfb
add missing test
2020-05-23 08:19:08 +02:00
b8e83cd263
do not overwrite
2020-05-22 20:42:13 +02:00
7bd681a5ed
very simple test
2020-05-22 19:04:02 +02:00
11eda510aa
testing functionality of Lattice separately
2020-05-22 18:45:27 +02:00
b33de48528
testing broadcasting
2020-05-22 15:12:37 +02:00
23b1381eaf
give credit
2020-05-21 11:30:25 +02:00
16f30a10d0
polishing
2020-05-20 23:50:08 +02:00
353fd3ceb6
more tests
...
now 95% test coverage of Rotation class
2020-05-20 19:16:31 +02:00
128a96e7f6
vectorized formula is enough
2020-05-20 18:13:51 +02:00
bb419d49df
polishing
2020-05-20 16:19:12 +02:00
b59d773689
store all test data together
2020-05-20 15:26:49 +02:00
9240dd59b2
mark as internal
...
all functionality (+ sanity checks) can be done with the class
functionality
2020-05-20 11:11:07 +02:00
9694767997
all seems to work now
2020-05-20 09:01:38 +02:00
1d8903bb0c
transition code
2020-05-20 00:18:44 +02:00
1fa4a07bb8
for backward compatibility
2020-05-19 23:39:01 +02:00
3e00269179
again some more tests
2020-05-19 23:24:12 +02:00
1c53a37de4
more tests and adjustments to tolerances
2020-05-19 21:03:30 +02:00
a6b0aaffba
more tests
...
Hotfix needed for axis angle to matrix (not used in DAMASK, needs
further investigation)
2020-05-19 19:41:50 +02:00
de79a5af43
directly test the internal conversions
...
some work to do ...
2020-05-19 09:55:23 +02:00
065c624f94
fix for backward compatibility
2020-05-19 09:10:14 +02:00
ebf05a279e
standard name
2020-05-19 08:59:03 +02:00
1a3a4a800e
vectorized
2020-05-19 07:59:24 +02:00
b6eebcd704
small fixes (testing P=+1)
2020-05-19 07:57:40 +02:00
b200894a40
bugfix and further test
2020-05-19 07:57:40 +02:00
3dc90ddb94
use the formula from the paper, not from the reference implementation
...
a few multiplications should be faster than a transpose
2020-05-19 07:57:40 +02:00
a25dd1c438
cleaning
2020-05-19 07:57:40 +02:00
743e91a78d
cleaning
2020-05-17 08:01:34 +02:00
652ece6bb3
fix: wrong capitalization
2020-05-17 07:25:17 +02:00
2550447169
Merge branch 'development' into docstring-sphinx-adjustments
2020-05-17 00:10:58 +02:00
a90865c877
non-vectorized versions not needed anymore
...
using them only for testing purposes
2020-05-17 00:10:18 +02:00
9ba419c2c3
Merge branch 'development' into vectorize_rotation
2020-05-16 20:58:06 +02:00
a4dfd7fc74
missing tests
2020-05-16 17:23:05 +02:00
044f069437
bugfix: selected wrong data
2020-05-16 17:06:55 +02:00
a279785149
Merge branch 'development' into misc-improvements
2020-05-16 17:01:48 +02:00
61ac40c259
more tests
2020-05-16 13:54:53 +02:00
19638168e6
more sensible type checking and errors
2020-05-16 13:23:32 +02:00
9fa1539163
using new names
2020-05-16 11:17:12 +02:00
235f3c0df7
bugfix: copy and paste error
2020-05-16 11:16:52 +02:00
e2ba294b75
bugfix: wrong variable
2020-05-16 09:40:32 +02:00
2dc46b783a
simplified and tested
2020-05-16 00:58:40 +02:00
dc508cdfce
Merge remote-tracking branch 'origin/misc-improvements' into vectorize_rotation
2020-05-15 23:25:42 +02:00
3fd868dc45
Merge branch 'development' into vectorize_rotation
2020-05-15 23:25:36 +02:00
b5b9bfaa99
need space at end of definition list
2020-05-13 11:36:16 +02:00
66b928c5af
using doctest style
...
https://docs.python.org/3/library/doctest.html
https://numpy.org/doc/stable/docs/howto_document.html#sections (section
15)
2020-05-13 10:47:49 +02:00
6f3b526811
Merge branch 'development' into docstring-sphinx-adjustments
2020-05-13 10:38:45 +02:00
90f93d2399
Merge branch 'integrate-lambert' into 'development'
...
Integrate lambert
See merge request damask/DAMASK!166
2020-05-12 23:36:08 +02:00
6928a8290f
less whitespace,
...
alingment only within one vector/tensor
2020-05-10 13:02:26 +02:00
c8701a4665
Cleanup/better readability
2020-05-08 12:15:10 +02:00
b75e98ca3f
forgotten debug statements
...
+ polishing of XDMF output
2020-05-07 19:12:05 +02:00
c2b4f5516e
DADF5_postResults tries to combine datasets, this does not work
2020-05-07 00:14:14 +02:00
fcd0028b83
avoid line length limit (maximum line length 182 > 132
2020-05-06 14:33:04 +02:00
d977f2ad25
already merged
2020-05-06 14:26:54 +02:00
26f55781ae
merge test into gridFilters
2020-05-06 14:26:15 +02:00
a122a307b9
div test done
2020-05-06 14:14:18 +02:00
d4091a21a8
grad test done
2020-05-06 13:05:53 +02:00
8b4baecdee
better looking test fields
2020-05-06 12:54:24 +02:00
bd518b2806
test_curl done
2020-05-06 12:44:56 +02:00
Martin Diehl