Philip Eisenlohr
eaceb16203
added +1 to nanmax(material) as auto offset, now consistent with help and intention...
2020-11-03 17:43:57 -05:00
Sharan Roongta
11f1f4f555
Merge branch 'modernize-testing' into development
2020-11-03 12:49:19 +01:00
Philip Eisenlohr
4d4278e6dd
shortened tainted_neighborhood logic
2020-11-02 18:20:52 -05:00
Martin Diehl
cf958d32b4
Merge branch 'development' into vector-mechanics
2020-11-02 15:23:11 +01:00
Martin Diehl
be47c744d8
Merge branch 'development' into geom-sort
2020-11-02 12:26:31 +01:00
Martin Diehl
212ed62b19
pytest-based tests
...
removed unused functionality from deprecated python library modules
2020-11-02 12:07:16 +01:00
Martin Diehl
086b215d94
Merge branch 'test-new-dir' into development
2020-11-01 19:29:52 +01:00
Martin Diehl
cf18954db9
hint for future improvement
2020-11-01 19:20:52 +01:00
Martin Diehl
7059e6af6e
might not be in the last line
2020-11-01 18:34:52 +01:00
Martin Diehl
946da2379b
Merge remote-tracking branch 'origin/development' into modernize-testing
2020-11-01 10:06:52 +01:00
Martin Diehl
0a3598c338
Merge branch 'simplify-from_table' into development
2020-10-31 22:34:17 +01:00
Martin Diehl
0ebb9b611d
functionality to sort material id
...
convenient for layered materials
2020-10-31 20:46:21 +01:00
Martin Diehl
67f69fc8a5
data is consecutive
2020-10-31 17:23:58 +01:00
Martin Diehl
8224122bb9
more user friendly error handling
2020-10-31 13:16:25 +01:00
Martin Diehl
aecf2f539e
allow one homogenization
...
quite useless ...
2020-10-30 22:26:02 +01:00
Martin Diehl
c29e3650f3
don't squeeze into scalar
2020-10-30 22:24:27 +01:00
Franz Roters
392803e47d
Merge remote-tracking branch 'origin/Marc_version_names' into development
2020-10-30 17:49:18 +01:00
Philip Eisenlohr
46e5023f8b
Merge branch 'geom-improvements' into 'development'
...
Geom improvements
See merge request damask/DAMASK!264
2020-10-29 23:53:33 +01:00
Martin Diehl
b2289e80b2
simplified
2020-10-29 20:09:13 +01:00
Martin Diehl
4b700d367e
improved test
2020-10-29 17:59:44 +01:00
Vitesh Shah
904c338b13
Reflect version underscore of installation files
2020-10-29 15:21:40 +01:00
Martin Diehl
999cf53c07
tests+fixes
2020-10-29 07:42:41 +01:00
Martin Diehl
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
Martin Diehl
1b2cd6caf6
documentation was misleading
2020-10-28 21:53:46 +01:00
Martin Diehl
4ff99a7af4
more logical layout
2020-10-28 21:51:20 +01:00
Martin Diehl
855bf124d3
faster
...
https://stackoverflow.com/questions/16992713
2020-10-28 16:53:16 +01:00
Sharan Roongta
21f095c9d8
Merge branch 'flexible-yaml-dump' into development
2020-10-28 16:19:17 +01:00
Martin Diehl
98e0ef3881
no loops
...
taken from https://stackoverflow.com/questions/3403973
2020-10-28 13:38:20 +01:00
Martin Diehl
d72343c865
keep order of unique values found in table
2020-10-28 11:56:28 +01:00
Martin Diehl
b38a498197
fast
2020-10-28 09:43:20 +01:00
Martin Diehl
5f03e8cf8f
0-based material indices
2020-10-28 09:31:55 +01:00
Martin Diehl
0804e6ee74
pythonic names
2020-10-27 13:50:47 +01:00
Martin Diehl
fa67a2ddf8
cell_coordinates is now a property
2020-10-27 13:35:14 +01:00
Martin Diehl
201a62d7c9
easier visualization if verts have a point-cell
2020-10-27 13:19:53 +01:00
Martin Diehl
4dd387d7f5
compatibility with old pyyaml + test for numpy
2020-10-27 06:39:58 +01:00
Martin Diehl
4159ae5f3d
keep order of keys
2020-10-26 21:44:38 +01:00
Martin Diehl
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
f.basile
802e09be4f
python/damask/_geom.py exceeds line length limit (maximum line length 143 > 132)
2020-10-26 15:11:06 +01:00
f.basile
2715e7b1a7
a bit more vectorized
2020-10-26 15:09:32 +01:00
f.basile
1cbfa866d2
get rid of scalar variables
2020-10-23 16:23:36 +02:00
Vitesh Shah
bd67296e8d
MARC_VERSION as MSCVERSION
2020-10-22 11:50:13 +02:00
f.basile
7fa31a8a1b
solving imported but unused pyflake
2020-10-19 12:55:35 +02:00
f.basile
4c22efc6ce
added show GB
2020-10-19 12:52:10 +02:00
Martin Diehl
bac7ace413
Merge remote-tracking branch 'origin/general-N_constituents' into vtr-only
2020-10-13 17:39:19 +02:00
Martin Diehl
86d91baf90
0-offset for geom
2020-10-10 10:36:15 +02:00
Martin Diehl
ffabeacbcb
removing functionality related to deprecated 'geom' format
2020-10-10 09:41:11 +02:00
Martin Diehl
06d11a72da
better fitting name
...
load implies a more direct takeover.
2020-10-09 19:19:05 +02:00
Martin Diehl
57180952ec
typo
2020-10-09 19:05:05 +02:00
Martin Diehl
347c88cbb6
documented
2020-10-09 14:24:29 +02:00
Martin Diehl
75401dd280
generate configuration from table
2020-10-09 07:45:20 +02:00
Martin Diehl
6ecaaa31c9
fairly general function to generate material configuration
2020-10-08 22:07:26 +02:00
Martin Diehl
952ad4f8fe
functionality for geom generation in python lib
2020-10-08 18:39:05 +02:00
Martin Diehl
3050471a2d
avoid circular inclusion
2020-10-08 18:05:03 +02:00
Martin Diehl
3d49678e93
new names part 2
2020-10-02 17:51:33 +02:00
Martin Diehl
a04966582a
Merge remote-tracking branch 'origin/development' into general-config
2020-10-02 14:54:16 +02:00
Martin Diehl
b29f22f513
documenting the actually available TMPS
2020-10-01 09:25:32 +02:00
Philip Eisenlohr
a59e64a8e4
renamed TPMS and added more from additional references
2020-09-30 17:28:25 -04:00
Martin Diehl
33685bc493
allow user do control output style
...
(numerics.yaml looks strange otherwise)
2020-09-30 12:32:37 +02:00
Martin Diehl
5ad46ae021
completely tested
2020-09-30 09:05:23 +02:00
Martin Diehl
fdfcb16d15
not needed
2020-09-30 08:16:12 +02:00
Martin Diehl
b383a4530e
better name, subclassing for easy extension to load
2020-09-30 07:53:25 +02:00
Martin Diehl
54e4943353
get rid of shell scripts
2020-09-30 07:11:33 +02:00
Philip Eisenlohr
350f5eb66a
improved from_ODF documentation
2020-09-29 12:55:00 -04:00
Philip Eisenlohr
31f86c28f4
[skip ci] added parameter description; shortened hybrid_IA pre-loop logic
2020-09-29 11:15:10 -04:00
Martin Diehl
d2cfcdaca0
reference Data for ODF sampling (hybridIA) + skeleton of a test
2020-09-28 16:14:27 +02:00
Martin Diehl
95b85626d8
general hybridIA functionality
2020-09-28 07:40:43 +02:00
Martin Diehl
8ec1014134
Merge remote-tracking branch 'origin/development' into cleaning
2020-09-27 18:11:43 +02:00
Vitesh Shah
e8e1960391
Consistency for docstrings
2020-09-26 18:02:25 +02:00
Vitesh Shah
d0028b2eea
Merge branch 'development' into fix-docstrings-for-sphinx
2020-09-26 17:56:42 +02:00
Martin Diehl
9e3506b8ef
thorougly testing seeding functionality
2020-09-25 07:41:58 +02:00
Philip Eisenlohr
e58cc4bfa0
removed substitute call for direct mapping; added seed from averaging of material ID cloud
2020-09-24 22:06:43 -04:00
Martin Diehl
4960cf43d4
documented and tested
2020-09-24 21:43:04 +02:00
Martin Diehl
e5b414419a
Poisson disc for periodic situation
2020-09-24 21:26:16 +02:00
Martin Diehl
b5ea04424b
Merge remote-tracking branch 'origin/development' into seeds-module
2020-09-24 20:58:53 +02:00
Philip Eisenlohr
8c8db5b99f
switched "Geom.materials" to "Geom.material"
2020-09-23 17:27:15 -04:00
Martin Diehl
b995f34834
Merge branch 'development' into geom-fully-out-of-place
2020-09-23 22:50:20 +02:00
Martin Diehl
8c83566b71
suppress warning
...
we already handle the invalid FPE
2020-09-23 21:10:39 +02:00
Martin Diehl
9bce1ddc29
simplified
2020-09-23 20:48:34 +02:00
Franz Roters
3612b17295
corrected Sphinx warnings
2020-09-23 16:21:20 +02:00
Martin Diehl
c85d27baec
functionality for seed creation
2020-09-23 09:45:36 +02:00
Martin Diehl
ae579d8baa
allow to specify seed IDs explicitly
2020-09-23 09:28:00 +02:00
Sharan Roongta
5a64dd30e1
Merge branch 'development' into modernize-testing
2020-09-23 00:05:59 +02:00
Philip Eisenlohr
683161d479
Merge branch 'development' into geom-fully-out-of-place
2020-09-22 15:22:58 -04:00
Philip Eisenlohr
05835bacd3
removed set_X(), duplicate(), and .homogenization; renamed ".microstructure" to ".materials"
2020-09-22 14:49:28 -04:00
Martin Diehl
716a406361
Merge remote-tracking branch 'origin/master' into modernize-testing
2020-09-22 16:51:36 +02:00
Franz Roters
7801f527f2
Merge remote-tracking branch 'origin/load-save-X-no-suffix' into development
2020-09-22 14:57:39 +02:00
Martin Diehl
5ef761fb98
inform the user about missing items in material.yaml
2020-09-21 19:10:20 +02:00
Philip Eisenlohr
188905766f
removed Geom.get_X() methods in favor of direct property access
2020-09-21 11:13:53 -04:00
Philip Eisenlohr
ca2f3f9493
set_X and add_comments methods now default to out-of-place
2020-09-21 10:29:07 -04:00
Martin Diehl
7bdd44a3d9
consistent names:
...
default file operations: save/load, non-default save_xx/load_xx
2020-09-20 22:04:28 +02:00
Martin Diehl
6ab88aad2b
default format for Table is ASCII
...
hence, renamed load_ASCII/save_ASCII to load/save
2020-09-20 20:45:06 +02:00
Philip Eisenlohr
7cbd422ae3
fixed coprime error when encountering NaN
2020-09-19 13:38:32 -04:00
Martin Diehl
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
Martin Diehl
0746a2f3a4
give visual feedback
...
in most tests, this is done manually
2020-09-19 08:33:15 +02:00
Martin Diehl
c42511f101
small polishing
2020-09-18 16:32:59 +02:00
Martin Diehl
f23b89f055
get rid of annoying warning during test
2020-09-18 16:30:22 +02:00
Martin Diehl
c935ba1215
user friendly self reporting
2020-09-18 16:23:23 +02:00
Martin Diehl
1849ff0330
polishing
2020-09-18 15:03:51 +02:00
Martin Diehl
cdf3323774
Merge remote-tracking branch 'origin/development' into load-save-X
2020-09-18 14:21:43 +02:00
Franz Roters
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
Vitesh
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
Martin Diehl
c71768a37a
polishing
2020-09-16 06:33:17 +02:00
Philip Eisenlohr
ed006d1a89
streamlined fiber/spherical component sampling
2020-09-15 19:12:30 -04:00
Philip Eisenlohr
c6be6fe87f
fixed spherical component sampling and testing
2020-09-15 18:40:05 -04:00
Philip Eisenlohr
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
Philip Eisenlohr
0a34e342e4
fixed fiber component sampling and testing
2020-09-15 18:14:15 -04:00
Philip Eisenlohr
d6378ec9bc
shortened from_fiber_component algorithm
2020-09-15 16:34:19 -04:00
Martin Diehl
ad2badd3be
[skip ci] vectorized and simplified
...
based on Philips ideas. Test requires from_axis_angle fix
2020-09-15 22:13:28 +02:00
Philip Eisenlohr
d02617c961
fixed normalization of multidimensional axes (from_Rodrigues, from_axis_angle)
2020-09-15 13:09:24 -04:00
Martin Diehl
18c38f1284
polishing
2020-09-15 13:49:44 +02:00
Martin Diehl
2a082b7983
methods for texture component calculations
2020-09-15 12:11:46 +02:00
Martin Diehl
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
Philip Eisenlohr
2114c51098
revert mistakenly made header length change in array-comparison
2020-09-15 01:47:26 -04:00
Philip Eisenlohr
96ad358f83
modified file reading/writing methods to load_X, save_X formalism
2020-09-15 01:14:05 -04:00
Martin Diehl
b298962101
Merge branch 'development' into table-out-of-place-only
2020-09-14 08:06:44 +02:00
Martin Diehl
f6758ecc28
table class operates out of place
2020-09-14 07:04:01 +02:00
Martin Diehl
a5d5638e4a
allow uncompressed files
2020-09-12 13:46:55 +02:00
Philip Eisenlohr
865c90d00b
first check data type, then determine length of data...
2020-09-09 19:10:03 -04:00
Philip Eisenlohr
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
Philip Eisenlohr
9fb3fef4b0
changed British "normalise" to US "normalize" as we (should) follow US English everywhere else.
2020-09-08 10:39:31 -04:00
Philip Eisenlohr
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
Philip Eisenlohr
6785062a10
Merge branch 'development' into 'vtk-to-file-method'
...
# Conflicts:
# python/tests/test_VTK.py
2020-08-31 21:10:29 +02:00
Franz Roters
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
Martin Diehl
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
Franz Roters
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
Martin Diehl
94797f8325
ignore all kinds of FPE
2020-08-27 09:32:49 +02:00
Martin Diehl
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
Philip Eisenlohr
c2191fd930
Make logic to mask (outside of) primitive more apparent (hopefully).
2020-08-27 00:06:52 +02:00
Martin Diehl
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
Philip Eisenlohr
b9f1421c6b
[skip ci] removed unnecessary line continuations "\"
2020-08-26 17:27:08 -04:00
Philip Eisenlohr
3f24d16603
renamed VTK.write() to VTK.to_file()
2020-08-26 16:15:15 -04:00
Philip Eisenlohr
da46e5ea9a
cannot use np.linalg.norm when dealing with exponent triple
2020-08-26 15:49:25 -04:00
Philip Eisenlohr
06b524d13e
added 'iso' as possible lattice (with no symmetry)
2020-08-26 21:39:20 +02:00
Sharan Roongta
68c2908ba8
Merge branch 'rename-hdf5-output' into development
2020-08-26 12:34:56 +02:00
Martin Diehl
bf401e56cf
avoid name clash with damask.Geom
2020-08-25 09:56:24 +02:00
Martin Diehl
800dac5d01
correct type handling
...
no reason to calculate fill twice
2020-08-25 08:47:24 +02:00
Martin Diehl
96d4975fc4
using numpy functionality
2020-08-25 08:34:04 +02:00
Martin Diehl
51da632108
aiming at testing each individual statement
2020-08-25 07:49:56 +02:00
Martin Diehl
2d98325fa4
increasing test coverage
2020-08-25 01:21:17 +02:00
Martin Diehl
2751cdb6af
support comments also in vtr
2020-08-25 00:40:14 +02:00
Martin Diehl
9a2ac31545
explicit is better then implicit
2020-08-24 23:35:46 +02:00
Martin Diehl
0ceba2a6d3
use central functionality
2020-08-24 23:28:26 +02:00
Martin Diehl
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
Philip Eisenlohr
2560f014a3
Merge remote-tracking branch 'origin/increase-geom-test-coverage' into geom-out-of-place
2020-08-24 17:17:31 -04:00
Martin Diehl
55443a3ff5
reflect change of variable names in file layout version
2020-08-24 22:54:09 +02:00
Martin Diehl
279d43ccc6
include version info + date in comments (Table class)
2020-08-24 19:04:59 +02:00
Martin Diehl
9d505c8518
better readable
...
- more explicit reporting
- always relative import for DAMASK
2020-08-24 09:58:24 +02:00
Martin Diehl
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
Martin Diehl
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
Philip Eisenlohr
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