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
Martin Diehl
44015082a3
dead code (copy and paste error)
2020-08-24 00:34:07 +02:00
Martin Diehl
9867830d68
store history of geometry modifications
2020-08-23 23:52:48 +02:00
Martin Diehl
a1c78b778a
WIP: track history in VTK objects
2020-08-23 23:22:53 +02:00
Martin Diehl
7b50a3b364
material.config is not used anymore
2020-08-23 15:20:11 +02:00
Martin Diehl
d65371d42f
removed unused and untested functionality
...
PEP 20: Explicit is better than implicit.
2020-08-23 12:55:55 +02:00
Martin Diehl
6f79573140
more test coverage
2020-08-23 11:05:56 +02:00
Martin Diehl
07af7b2f98
geom is written to vtr exlcusively, not to general vtk
...
base tests on vtr
2020-08-23 10:50:15 +02:00
Martin Diehl
64e7582e8e
consistent interface to ndimage filters
...
Boolean 'periodic' sets mode to 'wrap' or 'nearest'
2020-08-23 10:02:22 +02:00
Martin Diehl
975db01f31
microstructure -> materialpoint
...
at least for new functionality
2020-08-23 09:38:08 +02:00
Martin Diehl
5fb2d30ee4
fast and for arbitrary type
2020-08-23 09:02:17 +02:00
Martin Diehl
b731b1e768
Geom.to_vtk improvements
...
- should be integer
- should have a test
2020-08-23 08:49:49 +02:00
Philip Eisenlohr
2b09a7d31d
fixed Geom.canvas bug, added Geom.from_vtk, added mode,selection options to Geom.clean
2020-08-22 21:36:11 -04:00
Philip Eisenlohr
499ce01748
added Geom.copy() method
2020-08-22 13:57:31 -04:00
Martin Diehl
ff7eed4477
(unified) type hints
2020-08-08 20:56:17 +02:00
Martin Diehl
55a620b378
migrating to library
2020-08-08 20:14:30 +02:00
Martin Diehl
a0e0f28e51
migrating shell scripts to library
2020-08-08 19:42:34 +02:00
Martin Diehl
5fcff876f9
replace selectively
...
useful for vicinity_offset and add_primitive
2020-08-08 18:41:47 +02:00
Martin Diehl
56eb57d253
homogenization will be removed soon, stop reporting it
2020-08-08 18:24:17 +02:00
Karo
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
Philip Eisenlohr
ce00371f52
fixed rounding bug and updated reference images
2020-08-05 10:44:10 -04:00
Philip Eisenlohr
e4103564a9
16bit color index; proper rounding of index values
2020-08-05 10:08:48 -04:00
Philip Eisenlohr
e73ffd6da9
fixed and condensed lo,hi range assignment
2020-08-04 20:29:27 +02:00
Martin Diehl
e07c00a592
polishing + simple test
...
autoscaling seems to be broken
2020-08-04 20:14:04 +02:00
Philip Eisenlohr
84551c9d1e
integrated former imageData functionality as "shade" method
2020-08-04 13:05:30 -04:00
Martin Diehl
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
Martin Diehl
a9f53f4822
non-vectorized formulas can be implemented in a user functionc
2020-07-31 17:04:14 +02:00
Martin Diehl
50d7842dbe
more tests
2020-07-31 16:50:01 +02:00
Martin Diehl
aadce1e554
Merge branch 'development' into user_defined_add_calculation
2020-07-31 16:15:31 +02:00
Martin Diehl
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
Martin Diehl
2bbd68d964
with_suffix strips .1 from 2019.1
2020-07-16 09:33:17 +02:00
Martin Diehl
199ec51bf8
typo
2020-07-15 21:59:43 +02:00
Martin Diehl
9225d439ab
object oriented path handling
2020-07-15 21:58:24 +02:00
Martin Diehl
fa7f7e6fa4
don't complain if ssh without -X/-Y
2020-07-15 21:19:09 +02:00
Martin Diehl
333e840b09
standard behavior
...
most modules have an __version__ attribute
2020-07-15 20:57:56 +02:00
Martin Diehl
6259984e93
simplified
...
complicated, but allows to use functions as properties
2020-07-15 20:54:37 +02:00
Martin Diehl
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
Francisco Jose Gallardo Basile
e1bbaac0d7
Merge branch 'Vectorize-Orientation' into 'development'
...
Vectorize orientation
See merge request damask/DAMASK!186
2020-07-03 12:22:04 +02:00
Martin Diehl
7b3d1204fa
easier to use
2020-07-03 07:29:31 +02:00
Philip Eisenlohr
d4f97f8346
Merge branch 'misc-improvements' into 'development'
...
Misc improvements
See merge request damask/DAMASK!184
2020-07-02 21:52:47 +02:00
Philip Eisenlohr
7b899f1ff1
fixed output number format width for single increment0
2020-07-02 11:33:09 -04:00
Philip Eisenlohr
5a96708f41
added __iadd__ method
2020-07-02 10:26:04 -04:00
Philip Eisenlohr
f3ff2e7412
added __iadd__ method
2020-07-02 10:25:04 -04:00
Philip Eisenlohr
3b72d0ec72
added __invert__ method to reverse colormap
2020-07-02 10:13:47 -04:00
Martin Diehl
b88becb9d0
don't go out of focus during initialization
2020-07-02 08:25:35 +02:00
Martin Diehl
208d5109d4
still needed ...
2020-07-02 08:14:13 +02:00
Martin Diehl
86dc7054a4
still needed
2020-07-01 22:11:16 +02:00
Martin Diehl
4abd77fccf
more test coverage
2020-07-01 17:31:16 +02:00
Martin Diehl
be1eb996e0
more tests and cleaning
2020-07-01 15:12:34 +02:00
Martin Diehl
a7e3dd5a56
Merge branch 'development' into Vectorize-Orientation
2020-07-01 13:30:39 +02:00
Martin Diehl
e18a5b8a1b
simplifications + more tests
2020-07-01 08:57:28 +02:00
Martin Diehl
de8e9b5fc1
fast reduced operation
2020-07-01 00:37:02 +02:00
Martin Diehl
23365660d8
polishing
2020-06-30 23:18:32 +02:00
Martin Diehl
ef0c78745a
fix for vectorized in_SST + test
2020-06-30 23:05:41 +02:00
Martin Diehl
49d448dced
vectorized and cleaned
2020-06-30 21:43:57 +02:00
Martin Diehl
be21d1289d
using slicing method
2020-06-30 16:33:04 +02:00
Martin Diehl
c86e3e292c
WIP: cleaning namespace
2020-06-30 14:07:10 +02:00
Martin Diehl
9d94b521ad
polishing
2020-06-30 13:31:58 +02:00
Martin Diehl
ce7018164f
WIP: more reasonable naming
2020-06-30 13:05:06 +02:00
Martin Diehl
b8b34080fe
enable array like slicing/iteration
2020-06-30 12:16:47 +02:00
Martin Diehl
c8adfae0fa
bugfix: wrong variables used
2020-06-30 07:16:49 +02:00
Philip Eisenlohr
decbe8074a
not using unassigned variable
2020-06-29 22:22:21 -04:00
Philip Eisenlohr
d3b3d628b2
PEP conformity...
2020-06-29 22:07:14 -04:00
Philip Eisenlohr
39aac76859
__add__, from_range, fixed missing np.array(colors), show peppered...
2020-06-29 22:04:03 -04:00
Philip Eisenlohr
97ca1b1a9b
try wxPython before tkinter, recent macOS otherwise fails
2020-06-29 22:02:12 -04:00
f.basile
d06daec4cb
reducec vectorized is improved
2020-06-29 18:25:45 +02:00
Martin Diehl
2d0c680daf
useful information
2020-06-29 07:30:42 +02:00
f.basile
4875191ffd
change if statement so github doesnt complain
2020-06-28 19:32:22 +02:00
f.basile
a99f016438
problem with if value is true / if value == True
2020-06-28 19:29:52 +02:00
Martin Diehl
37f7362cbe
Merge branch 'development' into misc-improvements
2020-06-28 19:23:17 +02:00
Martin Diehl
323f828606
Merge branch 'development' into modernize_colormap
2020-06-28 19:09:52 +02:00
f.basile
8484d2e6cc
fix github stuff
2020-06-28 19:05:10 +02:00
f.basile
352c4e95f1
more vectorized
2020-06-28 19:03:06 +02:00
Martin Diehl
b3f5ee022a
unified style
2020-06-28 11:40:19 +02:00
Martin Diehl
6a748d2edf
do not expand single strings into characters
2020-06-28 11:19:18 +02:00
Martin Diehl
ae4146f1c6
report version, write out 'modern' ASCII table style
2020-06-28 11:18:22 +02:00
Martin Diehl
e81b67e964
polishing
2020-06-28 10:32:59 +02:00
Martin Diehl
1c03bd157f
more testing
2020-06-28 10:25:28 +02:00
Martin Diehl
b78c809375
real output
2020-06-28 10:25:28 +02:00
Martin Diehl
3513754647
low/high instead of left/right
2020-06-28 10:25:28 +02:00
Martin Diehl
d965d66319
[skip ci] documenting
2020-06-28 09:34:10 +02:00
Martin Diehl
8a9a768a77
support pathlib.Path
2020-06-28 07:17:51 +02:00
Martin Diehl
8c8132bcd7
coordinates should not have random names
2020-06-27 23:37:09 +02:00
Martin Diehl
c929af12c0
testing/polishing
2020-06-27 19:44:12 +02:00
Martin Diehl
234699bd18
reverse should return DAMASK colormap
2020-06-27 16:25:10 +02:00
Martin Diehl
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
Martin Diehl
1f9b5280cb
forgotten debug statement
2020-06-26 11:47:04 +02:00
Martin Diehl
a69f82e7c3
speed up vtk out
...
- limit to single precision
- write in background
2020-06-26 11:45:54 +02:00
Martin Diehl
bfae88a364
numpy compatible
2020-06-26 11:45:30 +02:00
Martin Diehl
bddb514072
more systematic reporting
2020-06-26 11:45:06 +02:00
Martin Diehl
3290e2c585
handle even obscure directions
2020-06-25 08:29:36 +02:00
Martin Diehl
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
Martin Diehl
c9829f0f1f
only Chuck Norris can divide by zero
2020-06-25 08:18:39 +02:00
Martin Diehl
cd23937af5
Merge branch 'development' into f-strings
2020-06-25 07:46:24 +02:00
Philip Eisenlohr
e64d353865
condensed scale_to_coprime; added test of scale_to_coprime
2020-06-24 18:37:33 -04:00
Philip Eisenlohr
9999560247
easier understanding of from_ang data layout interpretation
2020-06-24 18:36:43 -04:00
Philip Eisenlohr
14d3b7e66d
more f-stringing
2020-06-24 16:59:55 -04:00
Philip Eisenlohr
966b6f8007
shapes init copes with integers instead of strict tuples; introduced f-strings
2020-06-24 14:18:06 -04:00
Philip Eisenlohr
f8f433e826
introduced f-strings
2020-06-24 14:13:56 -04:00
Philip Eisenlohr
ff858fd4c8
[skip ci] corrected help string for "srepr"
2020-06-24 20:13:09 +02:00
Philip Eisenlohr
4314ec1f37
[skip ci] started to replace .format() with f-strings
2020-06-24 11:02:37 -04:00
Anderson Wallace Paiva do Nascimento
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
Martin Diehl
6fa5ae6ebf
literature from Karo
2020-06-22 23:14:58 +02:00
Martin Diehl
e33895dd35
[skip ci] better logic
2020-06-21 10:37:09 +02:00
Martin Diehl
c6a5bb8a3b
is 2020
2020-06-21 10:04:45 +02:00
Martin Diehl
4c5939ef23
small polishing
2020-06-20 22:51:00 +02:00
Martin Diehl
15b43bcebf
from_directions is not general, removed
...
polishing
2020-06-20 19:57:49 +02:00
Martin Diehl
3f63a4fdbc
[skip ci] typo
2020-06-20 18:13:34 +02:00
Martin Diehl
4dae3643c9
vectorized IPF color working
...
results also uses the vectorized form.
Still needs careful checking
2020-06-20 17:15:13 +02:00
Martin Diehl
ebdb65d31f
standard broadcast_to behavior
2020-06-20 16:35:22 +02:00
Martin Diehl
262346ff5a
polishing
2020-06-20 16:34:19 +02:00
Martin Diehl
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
Martin Diehl
055fa64f5f
better readable
2020-06-19 12:25:46 +02:00
Martin Diehl
13bf7515ce
WIP (broken?): vectorized calculation of IPF color
2020-06-19 10:54:13 +02:00
Martin Diehl
1648963b57
vectorized equivalent orientation calculation
2020-06-18 22:53:04 +02:00
Martin Diehl
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
Martin Diehl
fe5e5babfe
more useful for vectorized calculations
2020-06-18 22:29:28 +02:00
Samad Vakili
694b7ec3c5
mechanics done
2020-06-09 21:27:08 +02:00
f.basile
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
f.basile
eae9698d22
equivalent,related and inFZ vectorized + pytest
2020-06-05 13:48:12 +02:00
f.basile
ac09a2912a
fix python/damask/_orientation.py contains invalid python3 code 2
2020-06-04 16:45:44 +02:00
f.basile
6a24aee171
fix python/damask/_orientation.py contains invalid python3 code
2020-06-04 16:44:57 +02:00
f.basile
3897136f85
avoid python/damask/_orientation.py exceeds line length limit (maximum line length 141 > 132)
2020-06-04 16:43:28 +02:00
f.basile
0c41e33434
orientation.equivalent takes several rotations at the same time + small test"
...
"
""
2020-06-04 16:39:24 +02:00
Martin Diehl
a9c61ede69
bugfix: should also work if DAMASK_NUM_THREADS is not set
2020-06-03 20:24:18 +02:00
Martin Diehl
bda555fd1c
we are looking for a path, not for a file
2020-06-03 16:47:03 +02:00
Martin Diehl
bb5485927e
names like 2020.2 cannot be converted to int
2020-06-03 15:18:46 +02:00
Martin Diehl
5da1aa49bc
string should be a Path object
2020-06-03 15:17:00 +02:00
Martin Diehl
9b04a45bbd
bugfix (wrong variable name)
2020-06-03 13:53:00 +02:00
Martin Diehl
3be1a33820
easier to read
2020-06-03 13:32:47 +02:00
Martin Diehl
c5d0c7e52e
easier to read, more flexible
2020-06-03 10:44:40 +02:00
Martin Diehl
ac9fddd9e9
Merge remote-tracking branch 'origin/development' into misc-improvements
2020-06-02 00:12:50 +02:00
Martin Diehl
a51cc39613
proper docstring
2020-06-01 22:13:01 +02:00
Martin Diehl
72a0b1fae5
testing and polishing
2020-06-01 11:33:22 +02:00
Martin Diehl
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
Martin Diehl
bcb0ce5e5e
typo
2020-05-31 18:51:12 +02:00
Martin Diehl
adb92de8cc
Merge branch 'development' into less-shell-scripts
2020-05-31 18:49:51 +02:00
Martin Diehl
421b8f4268
documented function interfaces
2020-05-30 17:31:50 +02:00
Martin Diehl
865a505186
fix for logarithmic strain
2020-05-27 22:32:35 +02:00
Martin Diehl
56afc03f3c
only vectorized version needed
...
use single point/simple versions only for testing
2020-05-27 18:05:08 +02:00
Martin Diehl
0fe450a033
Merge branch 'misc-improvements' into less-shell-scripts
2020-05-27 17:40:13 +02:00
Martin Diehl
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
Samad Vakili
f9c33d9210
mechanics checked for an array with arbitrary dimensions
2020-05-26 16:27:27 +02:00
Martin Diehl
908788271a
Merge branch 'misc-improvements' into less-shell-scripts
2020-05-26 07:24:03 +02:00
Martin Diehl
7f09c90c7d
different h5py versions seem to throw different errors
2020-05-26 06:39:11 +02:00
Martin Diehl
6f7c7005b0
bugfix:
...
- proper overwrite
- no out of bounds error for empty time selection (just pick nothin)
2020-05-25 23:54:06 +02:00
Martin Diehl
d6877da2b6
single source of truth
2020-05-25 20:15:45 +02:00
Martin Diehl
d9d089c359
avoid repetition and do correct encode/decode
2020-05-25 20:13:57 +02:00
Martin Diehl
5d0a2aac8f
polishing reporting
2020-05-25 20:13:57 +02:00
Martin Diehl
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
Martin Diehl
248f199a7b
track creation time
2020-05-25 18:51:10 +02:00
Martin Diehl
b1b8d02320
typo
2020-05-25 16:41:23 +02:00
Martin Diehl
9d7158b51a
Merge branch 'misc-improvements' of magit1.mpie.de:/damask/DAMASK into misc-improvements
2020-05-25 16:40:23 +02:00
Martin Diehl
f07eaf19d0
fixed broadcasting + corresponding test
2020-05-25 16:37:08 +02:00
Martin Diehl
784d6d09d9
cleaning
2020-05-25 15:55:38 +02:00
Martin Diehl
dad7c7a2a0
Merge branch 'vectorize_rotation' into misc-improvements
2020-05-25 15:50:03 +02:00
Martin Diehl
3e2cbef780
Merge remote-tracking branch 'origin/development' into vectorize_rotation
2020-05-25 15:46:27 +02:00
Martin Diehl
77b68ab86f
using rotation class for rotations
2020-05-25 09:39:39 +02:00
Martin Diehl
39505507f1
not needed anymore
2020-05-25 08:07:12 +02:00
Martin Diehl
17aa3c00dc
more tests
2020-05-24 22:52:00 +02:00
Martin Diehl
296308e11e
fix for rotation around 90 deg
...
more tests
2020-05-24 20:52:19 +02:00
Martin Diehl
34adefd4ca
simplified
2020-05-24 18:30:45 +02:00
Samad Vakili
987c4a9e8d
first commit mechanics
2020-05-24 18:30:44 +02:00
Martin Diehl
594fcb2b72
seems more appropriate
2020-05-24 15:10:53 +02:00
Martin Diehl
3231a49107
centralize functionality
2020-05-24 09:39:58 +02:00
Martin Diehl
a3d9520c4b
polishing
2020-05-23 15:54:28 +02:00
Martin Diehl
0549e33a00
vectorized/fast
2020-05-23 08:38:57 +02:00
Martin Diehl
7bd681a5ed
very simple test
2020-05-22 19:04:02 +02:00
Martin Diehl
b33de48528
testing broadcasting
2020-05-22 15:12:37 +02:00
Martin Diehl
23b1381eaf
give credit
2020-05-21 11:30:25 +02:00
Martin Diehl
16f30a10d0
polishing
2020-05-20 23:50:08 +02:00
Martin Diehl
353fd3ceb6
more tests
...
now 95% test coverage of Rotation class
2020-05-20 19:16:31 +02:00
Martin Diehl
128a96e7f6
vectorized formula is enough
2020-05-20 18:13:51 +02:00
Martin Diehl
bb419d49df
polishing
2020-05-20 16:19:12 +02:00
Martin Diehl
9240dd59b2
mark as internal
...
all functionality (+ sanity checks) can be done with the class
functionality
2020-05-20 11:11:07 +02:00
Martin Diehl
9694767997
all seems to work now
2020-05-20 09:01:38 +02:00
Martin Diehl
1d8903bb0c
transition code
2020-05-20 00:18:44 +02:00
Martin Diehl
1fa4a07bb8
for backward compatibility
2020-05-19 23:39:01 +02:00
Martin Diehl
3e00269179
again some more tests
2020-05-19 23:24:12 +02:00
Martin Diehl
1c53a37de4
more tests and adjustments to tolerances
2020-05-19 21:03:30 +02:00
Martin Diehl
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
Martin Diehl
de79a5af43
directly test the internal conversions
...
some work to do ...
2020-05-19 09:55:23 +02:00
Martin Diehl
065c624f94
fix for backward compatibility
2020-05-19 09:10:14 +02:00
Martin Diehl
ebf05a279e
standard name
2020-05-19 08:59:03 +02:00
Martin Diehl
1a3a4a800e
vectorized
2020-05-19 07:59:24 +02:00
Martin Diehl
b6eebcd704
small fixes (testing P=+1)
2020-05-19 07:57:40 +02:00
Martin Diehl
b200894a40
bugfix and further test
2020-05-19 07:57:40 +02:00
Martin Diehl
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
Martin Diehl
a25dd1c438
cleaning
2020-05-19 07:57:40 +02:00
Martin Diehl
743e91a78d
cleaning
2020-05-17 08:01:34 +02:00
Martin Diehl
652ece6bb3
fix: wrong capitalization
2020-05-17 07:25:17 +02:00
Martin Diehl
2550447169
Merge branch 'development' into docstring-sphinx-adjustments
2020-05-17 00:10:58 +02:00
Martin Diehl
a90865c877
non-vectorized versions not needed anymore
...
using them only for testing purposes
2020-05-17 00:10:18 +02:00
Martin Diehl
9ba419c2c3
Merge branch 'development' into vectorize_rotation
2020-05-16 20:58:06 +02:00
Martin Diehl
044f069437
bugfix: selected wrong data
2020-05-16 17:06:55 +02:00
Martin Diehl
a279785149
Merge branch 'development' into misc-improvements
2020-05-16 17:01:48 +02:00
Martin Diehl
19638168e6
more sensible type checking and errors
2020-05-16 13:23:32 +02:00
Martin Diehl
9fa1539163
using new names
2020-05-16 11:17:12 +02:00
Martin Diehl
235f3c0df7
bugfix: copy and paste error
2020-05-16 11:16:52 +02:00
Martin Diehl
e2ba294b75
bugfix: wrong variable
2020-05-16 09:40:32 +02:00
Martin Diehl
2dc46b783a
simplified and tested
2020-05-16 00:58:40 +02:00
Martin Diehl
dc508cdfce
Merge remote-tracking branch 'origin/misc-improvements' into vectorize_rotation
2020-05-15 23:25:42 +02:00
Martin Diehl
3fd868dc45
Merge branch 'development' into vectorize_rotation
2020-05-15 23:25:36 +02:00
Martin Diehl
b5b9bfaa99
need space at end of definition list
2020-05-13 11:36:16 +02:00
Martin Diehl
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
Martin Diehl
6f3b526811
Merge branch 'development' into docstring-sphinx-adjustments
2020-05-13 10:38:45 +02:00
Martin Diehl
b75e98ca3f
forgotten debug statements
...
+ polishing of XDMF output
2020-05-07 19:12:05 +02:00
Martin Diehl
c2b4f5516e
DADF5_postResults tries to combine datasets, this does not work
2020-05-07 00:14:14 +02:00
Martin Diehl
ef4a4dad4a
shape property and numpy-like broadcasting
...
this makes it easy to apply a single rotation to a field
2020-05-05 14:44:08 +02:00
Martin Diehl
eeb0df3a55
do not store absolute path
2020-05-05 10:42:54 +02:00
Martin Diehl
31c397255d
equivalent (for a valid DADF5 file) but faster
2020-05-05 10:18:48 +02:00
Martin Diehl
14cdc031e0
write XDMF files
...
the limitation to scalar, 3-vector and 3x3-tensor comes currently from
XDMF/vtk/paraview
extension to multiple constituents and unstructured meshes might be
possible
2020-05-05 09:57:22 +02:00
Martin Diehl
6e99956b58
Merge branch 'development' into misc-improvements
2020-05-05 09:22:53 +02:00
Martin Diehl
5f3f87cd68
vectorizing cubochoric conversions
2020-05-04 17:43:38 +02:00
Martin Diehl
7d1e0850ab
test + resulting bug fix
2020-05-03 17:04:03 +02:00
Martin Diehl
5d4b554b00
WIP: vectorizing
2020-05-03 07:48:13 +02:00
Martin Diehl
c241eaec15
rely on correct input data
2020-05-03 07:23:46 +02:00
Martin Diehl
f0bb50b97d
vectorized rotation function
2020-05-02 15:22:17 +02:00
Martin Diehl
c7a77ebc26
Merge branch 'development' into integrate-lambert
2020-05-02 09:21:42 +02:00
Martin Diehl
2df78e4e2f
vecorized pyramid function for lambert projection
2020-05-02 09:17:31 +02:00
Martin Diehl
ce9bdc50a4
common variable names
2020-04-29 14:46:58 +02:00
Martin Diehl
9e79935add
Merge branch 'development' into less-shell-scripts
2020-04-28 20:43:16 +02:00
Martin Diehl
6864b9525d
go back to original dir as soon as possible
2020-04-26 14:52:27 +02:00
Martin Diehl
f02c77b6d0
more reasonable tolerance
...
still relatively high because ctf files store position with constant
number of digits and floating dot. Hence, the precision is very low
2020-04-24 20:01:57 +02:00
Martin Diehl
1610d5a5d2
Merge branch 'development' into misc-improvements
2020-04-24 20:01:40 +02:00
Martin Diehl
707324887f
inform the user about planned functionality
2020-04-24 06:52:09 +02:00
Martin Diehl
042f64200c
Merge branch 'development' into vectorize_rotation
2020-04-24 06:31:14 +02:00
Francisco Jose Gallardo Basile
898cf42aca
Merge branch 'fix-grid-convention' into 'development'
...
Fix grid convention
See merge request damask/DAMASK!160
2020-04-23 19:02:23 +02:00
Martin Diehl
cc3fa156cf
support change of directory one object has been created
2020-04-23 16:29:20 +02:00
Martin Diehl
a0b7c51bec
less strict tolerances
...
grid position reported by EBSD has only a few decimal places, so
rounding errors occur
2020-04-22 23:32:34 +02:00
Martin Diehl
8ba547a1b5
no need for an extra file
2020-04-22 13:23:50 +02:00
Martin Diehl
a39e6b7af9
hide internal variables
2020-04-22 13:12:30 +02:00
Martin Diehl
a8c6fdd9ba
for the sake of completeness
2020-04-22 07:40:02 +02:00
Martin Diehl
7efe14be35
Merge branch 'development' into vectorize_rotation
2020-04-21 19:29:30 +02:00
Martin Diehl
97a5880d76
ensure correct shape
2020-04-21 13:22:55 +02:00
Martin Diehl
75d7238376
vectorized as_XXX
2020-04-21 12:27:50 +02:00
Martin Diehl
ae3eca5f98
fix for vectorized from_random
2020-04-21 12:08:16 +02:00
Martin Diehl
ac75b9e4ca
improved reporting + test
2020-04-21 11:17:15 +02:00
Martin Diehl
23fc58699f
vectorize Rotation.fromXXX functions
2020-04-21 10:55:45 +02:00
Martin Diehl
4a05cdbbbb
copy and paste error
2020-04-21 03:26:26 +02:00
Martin Diehl
528378eba2
polishing/bugfix
...
* HDF5 data has x fast, therefore reshape needs to be aware of 'F' order
* Datatype for True/False is 'bool' in python, not 'Boolean'
2020-04-20 22:51:51 +02:00
Martin Diehl
00cb17ccfa
commenting
2020-04-20 22:47:55 +02:00
Martin Diehl
93db1b37ca
some useful information
2020-04-20 22:32:13 +02:00
Martin Diehl
25d29bf438
no need for Fortran order forward/backward
2020-04-20 20:24:55 +02:00
Martin Diehl
1ccda22ae3
nothing to flatten here
2020-04-20 20:16:25 +02:00
Martin Diehl
4db91fff03
simplified
2020-04-20 20:14:27 +02:00
Martin Diehl
f519e62cd5
testing data layout checks
2020-04-20 13:56:33 +02:00
Martin Diehl
9979eb58f4
consistent layout for grid data
...
has now always the shape ([x,y,z,...]) with x fastest. For conversion from or
to linear layout ([x*y*z,...]), e.g. storage in ASCII table, reshape needs
to have the 'F' option.
Credits to Vitesh and Fran for pointing this out.
2020-04-20 13:09:59 +02:00
Martin Diehl
bce5ed62d5
polishing
2020-04-20 10:13:15 +02:00
Martin Diehl
e3958263e3
Merge branch 'development' into misc-improvements
2020-04-15 21:03:51 +02:00
Karo Sedighiani
03aa6f9c80
Merge branch 'vectorize_rotation' into development
2020-04-14 19:34:11 +02:00
Philip Eisenlohr
d3eba41519
[skip ci] fixed bug of double execution of np.degrees in asAxisAngle
2020-04-14 12:22:41 -04:00
Martin Diehl
69857176b2
search and replace error
2020-04-14 15:33:20 +02:00
Martin Diehl
93c75cada3
numpydoc style
2020-04-12 15:38:38 +02:00
Martin Diehl
aaeec16c66
proper indentation for sphinx
2020-04-12 15:34:29 +02:00
Martin Diehl
b6b98bd14f
more meaningful
2020-04-12 15:20:09 +02:00
Martin Diehl
c6c1878b13
asterisk is the emphasize sign for restructured text
...
not really needed here
2020-04-12 15:19:32 +02:00
Martin Diehl
3d10266fbc
similar style as for other conversions
2020-04-12 01:29:11 +02:00
Martin Diehl
04fbc38a4b
keep namespace clean and avoid overwriting in fromXXX functions
2020-04-12 01:19:11 +02:00
Martin Diehl
f41a47ce8b
polishing and slightly stricter tolerances
2020-04-11 23:27:25 +02:00
Martin Diehl
c0c37fe6a5
polishing
2020-04-11 20:42:46 +02:00
Martin Diehl
c57f96cd6e
also missing
2020-04-11 18:32:06 +02:00
Martin Diehl
8c61f67e34
cleaning
2020-04-11 18:24:54 +02:00
Martin Diehl
296a75d452
where not needed
2020-04-11 18:00:59 +02:00
Martin Diehl
fac33ec408
polishing
2020-04-11 17:23:54 +02:00
Martin Diehl
51104bfc13
do not transpose for the standard case
2020-04-11 17:19:12 +02:00
Martin Diehl
cb9daccdd7
homochoric representation vectorized
2020-04-11 16:14:40 +02:00
Martin Diehl
99655c9f61
more vectorized functions
2020-04-11 13:59:16 +02:00
Martin Diehl
4e759d6c98
more tests for orientation conversion
...
ensure that all parameters are within range and check if
multidimensional arrays at least run
2020-04-11 12:37:21 +02:00
Martin Diehl
3bfa2d679c
simpler/correct logic for eu2om
2020-04-11 11:36:37 +02:00
Martin Diehl
656c0199cf
sorted and make explicitly available what we need
2020-04-10 12:32:33 +02:00
Martin Diehl
9837390406
do not clutter namespace
...
we do not need damask.util.np etc
2020-04-10 12:30:39 +02:00
Martin Diehl
9c0ea13e4f
Merge branch 'development' into misc-improvements
2020-04-10 08:14:33 +02:00
Martin Diehl
bab3581b11
need to transpose eigenvectors to find the correct one
2020-04-09 15:01:01 +02:00
Martin Diehl
e502573e05
polishing
2020-04-09 14:20:43 +02:00
Martin Diehl
b025c1838e
simplified
2020-04-09 12:52:12 +02:00
Martin Diehl
cbfde73a29
more testing and related fixes
2020-04-09 07:40:20 +02:00
Martin Diehl
43e7639f77
WIP: implementing orientation matrix conversions
2020-04-09 00:47:43 +02:00
Martin Diehl
da30fb8396
qu(aternion) and eu(ler) vectorized and tested
2020-04-09 00:35:40 +02:00
Martin Diehl
464620b796
vectorized conversion from ax(is angle)
2020-04-08 21:24:59 +02:00
Martin Diehl
1ba01ba0db
adjusting tolerances
2020-04-08 18:15:50 +02:00
Martin Diehl
f365ae104d
adjusting tolerances
2020-04-08 17:55:05 +02:00
Martin Diehl
8f88480790
better readable error messages
2020-04-08 12:59:34 +02:00
Martin Diehl
b6f5548d8a
correct normalization at the corners
2020-04-08 12:23:28 +02:00
Martin Diehl
4e06e9a410
improved numerical stability for corner cases
2020-04-08 11:52:26 +02:00
Martin Diehl
ccf62ede52
bugfix for Cubochoric
...
forward and backward mappings are different
2020-04-08 11:41:42 +02:00
Martin Diehl
fbd61fda99
ignore comments
2020-04-02 11:54:34 +02:00
Martin Diehl
6ef7410e5a
testing VTK wrappers
2020-03-31 11:04:06 +02:00
Martin Diehl
396d428af7
bugfix: works for all cuboids, not just cubes
2020-03-29 23:09:43 +02:00
Martin Diehl
e61c1a027b
avoid detour via shell
2020-03-29 19:12:23 +02:00
Martin Diehl
bbce3456e8
advise from pylint
2020-03-22 22:30:38 +01:00
Martin Diehl
1dfdd264b7
small flaws detected by pylint
2020-03-22 16:31:14 +01:00
Martin Diehl
b6d50db177
do not use name of function
2020-03-22 16:21:49 +01:00
Martin Diehl
1e178287fe
4 space indentation
2020-03-22 16:13:35 +01:00
Martin Diehl
76caf422aa
bugfix: wrong indentation
...
strange that python has accepted that
2020-03-22 15:59:25 +01:00
Martin Diehl
3873a3d20d
restoring working structure for config submodule
2020-03-21 22:17:07 +01:00
Martin Diehl
4decae967a
nothing to inherit ..
2020-03-21 20:18:46 +01:00
Martin Diehl
c6025925ac
relative imports within damask package
2020-03-21 20:17:50 +01:00
Martin Diehl
c5e956f386
solver submodule structure working again
2020-03-21 20:14:15 +01:00
Martin Diehl
bcf3650211
slightly shorter.
...
w/o transpose, this seems to be more memory efficient
2020-03-21 19:40:49 +01:00
Martin Diehl
71da974bdc
quick prospector fixes for deprecated class
2020-03-21 18:29:42 +01:00
Martin Diehl
67f64b7a7a
polishing
2020-03-21 18:01:26 +01:00
Martin Diehl
20a06840b0
works also for arrays ...
2020-03-21 11:07:21 +01:00
Martin Diehl
2ad86e4202
shortened
2020-03-20 23:47:54 +01:00
Martin Diehl
eb66db9c36
Merge branch 'no-python-namespace-clutter' into MiscImprovements
2020-03-20 23:46:37 +01:00
Martin Diehl
76984a4dbd
more sensible check
...
works also for numpy arrays. Not sure why the old way is considered to
be "pythonic", I think it can just cause trouble
2020-03-20 23:42:23 +01:00
Martin Diehl
4d4f321872
following python convention
2020-03-20 08:49:33 +01:00
Martin Diehl
0556827f29
less error prone
2020-03-19 20:19:47 +01:00
Martin Diehl
892b7eee98
consistency check and new test
2020-03-19 17:34:49 +01:00
Martin Diehl
705694b97c
fix for test
2020-03-19 15:54:57 +01:00
Martin Diehl
e390982be7
clean first level structure
2020-03-19 15:19:11 +01:00
Martin Diehl
899cc913c4
python style names
2020-03-19 15:09:05 +01:00
Martin Diehl
327899890a
this works for internal
2020-03-19 15:06:25 +01:00
Martin Diehl
9bb0608187
maybe this is the cleaner way
2020-03-19 14:40:30 +01:00
Martin Diehl
c1d82197ad
cope with integers
2020-03-19 13:27:23 +01:00
Martin Diehl
0ebc5ab60e
no need to import modules, hide unwanted functions
2020-03-19 13:16:32 +01:00
Martin Diehl
27532cfa4e
small fixes
2020-03-19 12:03:55 +01:00
Martin Diehl
91e728d065
polishing
2020-03-19 11:30:36 +01:00
Martin Diehl
a80622292e
simplified (and working)
2020-03-19 10:59:53 +01:00
Martin Diehl
7093647af5
clearly show intention
2020-03-19 09:04:36 +01:00
Martin Diehl
0871111c11
consistent and correct number of leading zeros
2020-03-19 08:45:25 +01:00
Martin Diehl
b5899b51e1
do not show tk window on start(python) or exit(Ipython)
2020-03-19 08:31:24 +01:00
Martin Diehl
d6f74daf53
cleaning
...
no DADF5 anymore
2020-03-19 08:13:13 +01:00
Martin Diehl
fbd92599e8
also accept vtkRectilinearGrid etc as type
2020-03-19 08:04:15 +01:00
Martin Diehl
6d0c4b9765
typo
2020-03-19 08:00:13 +01:00
Martin Diehl
d28df815f0
Merge branch 'development' into MiscImprovements
2020-03-19 07:30:03 +01:00
Martin Diehl
7d47418381
migrating to new Table class ...
...
... and stripping old ASCIItable down
2020-03-19 07:27:11 +01:00
Martin Diehl
f7a6ac4a0e
migrating to new table class
2020-03-19 07:27:11 +01:00
Martin Diehl
cbe5944390
cleaning deprecated modules
2020-03-19 07:27:11 +01:00
Martin Diehl
2b777bbbea
use "None" to indicate missing data
...
True/False are user based decisions
2020-03-18 14:29:59 +01:00
Martin Diehl
ee0d80ce2a
following python standard + polishing
2020-03-18 13:49:53 +01:00
Martin Diehl
45e3b8f7c6
no brackets for reshape required
2020-03-17 12:25:44 +01:00
Martin Diehl
25b3fa4427
image data seems to work in general with python3 ...
...
... after fix for colormaps
imageDataDeformed is based on the core module, i.e. it has not been used
for years. Either update soon or remove
2020-03-17 11:53:59 +01:00
Martin Diehl
794d7e485e
bugfix: report again correctly
2020-03-16 22:50:09 +01:00
Martin Diehl
941a9fbff4
fixing prospector complaints
2020-03-14 22:56:13 +01:00
Martin Diehl
554631d554
whitespace adjustments
2020-03-14 22:31:36 +01:00
Martin Diehl
f9aea736cb
there is a function for that
2020-03-14 22:26:47 +01:00
Martin Diehl
6dcb5b0d0d
vectorize
2020-03-14 22:24:45 +01:00
Martin Diehl
0becd8c20b
not needed
2020-03-14 22:21:31 +01:00
Martin Diehl
b4679fabfc
whitespace cleaning and other polishing
2020-03-14 22:17:59 +01:00
Martin Diehl
5c4ddf5138
Merge branch 'development' into MiscImprovements
2020-03-14 12:52:30 +01:00
Martin Diehl
3d8e8cfe7a
tkinter might not work
2020-03-14 00:07:49 +01:00
Martin Diehl
771663c944
polishing
2020-03-13 00:30:49 +01:00
Martin Diehl
81e98055dd
polishing
2020-03-12 19:52:33 +01:00
Martin Diehl
6fbace8220
stub: show rendered geometry
2020-03-12 15:10:44 +01:00
Martin Diehl
827f354435
only store points, no vertices
...
visualize via 'Points Gaussian', not 'Points' in paraview.
+ adding displacements for points
2020-03-12 12:28:28 +01:00
Martin Diehl
4c915eddbc
inform the user
2020-03-12 08:30:33 +01:00
Martin Diehl
dafc48dcc7
polishing
2020-03-12 08:22:37 +01:00
Martin Diehl
a6a73cdc0f
polishing
...
grid is interpreted again in the DAMASK meaning, i.e it specifies the
number of cells, not the number of nodes
2020-03-12 06:54:40 +01:00
Martin Diehl
bb2019810a
centralizing functionality
2020-03-12 00:00:47 +01:00
Martin Diehl
575da581a9
support for point cloud
2020-03-11 22:35:58 +01:00
Martin Diehl
744e3bb50b
vectorized cell assignment + bugfix for writing out
2020-03-11 21:29:24 +01:00
Martin Diehl
f324e67f7b
fix: nodes need to be converted to vtk type
...
some stub definitions
2020-03-11 18:08:58 +01:00
Martin Diehl
c92a6ad459
simpler
...
and system independent
2020-03-11 07:50:11 +01:00
Martin Diehl
32734e7dce
using central functionality
2020-03-11 07:42:32 +01:00
Martin Diehl
b3e8a4405e
better use centralized functionality
2020-03-11 06:50:13 +01:00
Martin Diehl
a024ec378a
new class should be accesible as damask.VTK
2020-03-11 06:49:14 +01:00
Martin Diehl
9878ddc550
easier way to show data.
...
needs information on geometry (structured/unstructured) and probably we
should list not more than 5 incs
2020-03-11 06:28:13 +01:00
Martin Diehl
8a4bc3dda4
separating vtk from results
...
we should discuss the naming!
2020-03-10 23:53:37 +01:00
Martin Diehl
c43af6aac3
Merge branch 'development' into HDF5-results
2020-03-10 23:32:41 +01:00
Philip Eisenlohr
a7f5e42c2e
condensed if-else
2020-03-10 22:13:21 +01:00
Philip Eisenlohr
bffce1ab9c
use "nan" to represent np.nan in ASCIItable output
2020-03-09 18:50:27 -04:00
Philip Eisenlohr
b2abaef0b3
added placing of data within geometry
2020-03-09 18:31:00 -04:00
Martin Diehl
9bfaf4fbfb
it is RodriGues, not RodriQues
2020-03-09 13:58:10 +01:00
Martin Diehl
32378fa609
simpler use of progress bar
...
now written as class (avoids the managing of function attributes) which
is used as a small wrapper around a loop.
ETA is shown, based on datetime class which hast nice formatting
2020-03-09 13:44:08 +01:00
Philip Eisenlohr
20caa29b5d
corrected "Rodrigues"
2020-03-06 00:53:11 +01:00
Martin Diehl
7a0c20b6de
Merge branch 'development' into python-style
2020-03-05 22:00:58 +01:00
Martin Diehl
c06ef00fe2
[skip ci] N_threads is not correct, we use processes
2020-03-03 14:57:48 +01:00
Martin Diehl
16b4a63c58
clearly separating deprecated functions
...
still there since some test rely on them
2020-03-03 14:38:32 +01:00
Martin Diehl
946231cda5
indentation adjustment
2020-03-03 14:24:27 +01:00
Martin Diehl
903af10aa7
allow to iterate over times/increments
2020-03-03 14:07:02 +01:00
Martin Diehl
c33cca3351
polishing, takeover from dadf5-usability branch
2020-03-03 12:50:10 +01:00
Martin Diehl
1f3d5099cf
quote still needed
2020-03-03 12:32:38 +01:00
Martin Diehl
b1f21b189b
removing unused functionality
...
should simplify transition to new table class
2020-03-03 08:28:57 +01:00
Martin Diehl
edd143b423
bugfix for copy and paste error
...
introduced in 8798dd1af3
2020-03-03 07:00:14 +01:00
Martin Diehl
192f21df37
4 space indentation
2020-03-03 06:49:46 +01:00
Martin Diehl
88e8907031
deprecated and not used by any test
2020-03-02 23:52:40 +01:00
Martin Diehl
8798dd1af3
new names consistently used
2020-03-02 23:47:29 +01:00
Martin Diehl
00028724b8
type is float for empty element in prod, should always be int
2020-03-02 23:20:36 +01:00
Martin Diehl
0034289b1b
S is 2. PK stress, T_sym is clearer
2020-03-02 23:14:59 +01:00
Martin Diehl
15c3cab549
clearer names
2020-03-02 23:11:05 +01:00
Martin Diehl
4970f22e13
better name
...
damask.Result is more appropriate then damask.DADF5
2020-03-02 23:05:35 +01:00
Martin Diehl
08aef5531c
Merge remote-tracking branch 'origin/development' into MiscImprovements
2020-03-01 07:32:00 +01:00
Martin Diehl
ed2489de9a
not needed anymore
2020-02-29 19:57:37 +01:00
Martin Diehl
f431dd2092
geom class is better suited than asciitable class
...
removing unused functionality from deprecated asciitable
2020-02-29 19:31:27 +01:00
Martin Diehl
334eb93421
infere data type automatically
...
need for IPF color autput
2020-02-27 21:19:56 +01:00
Martin Diehl
75528064e9
Merge branch 'development' into DADF5-multiprocessing
2020-02-25 17:58:07 +01:00
Martin Diehl
1683e18c1f
keep order
...
mainly relevant for increments
2020-02-25 11:53:02 +01:00
Martin Diehl
f256493e79
fixed indentation
2020-02-22 01:05:02 +01:00
Martin Diehl
9d4cbe5168
4 space indentation
2020-02-22 00:19:27 +01:00
Martin Diehl
fd11f073f0
fixing prospector complaints
2020-02-22 00:11:00 +01:00
Martin Diehl
be45d62f53
polishing
2020-02-21 23:59:33 +01:00
Martin Diehl
dc9bfd1849
Merge branch 'DADF5_point_calculations-2' into DADF5-multiprocessing
2020-02-21 23:57:22 +01:00
Martin Diehl
12c69ed3ca
Merge branch 'DADF5_point_calculations-2' of magit1.mpie.de:/damask/DAMASK into DADF5_point_calculations-2
2020-02-21 23:56:56 +01:00
Martin Diehl
f20a82ce6d
migrate name: damask.Result better than damask.DADF5
2020-02-21 23:56:18 +01:00
Martin Diehl
1dddfa040e
adjusting indents
...
should be always 4 spaces
2020-02-21 23:25:22 +01:00
Martin Diehl
f604314207
polishing
2020-02-21 23:16:25 +01:00
Martin Diehl
e9bf02a52c
one underscore commonly denotes internal functions
2020-02-21 21:37:02 +01:00
Martin Diehl
0774e12169
report progress
2020-02-21 21:27:08 +01:00
Martin Diehl
c2ae657f5b
arguments should be documented
2020-02-21 21:04:23 +01:00
Martin Diehl
0358e7343b
polishing
2020-02-21 19:39:17 +01:00
Martin Diehl
05476ff85c
parallelize addition of datasets
...
threads does not work, muliprocessing shows good performance: Overhead
is small compared to the performance gain.
Especially useful for long running functions of the orientation class
2020-02-21 19:25:37 +01:00
Martin Diehl
b9966b95e0
consistently use small letters
2020-02-21 18:52:58 +01:00
Martin Diehl
ffb80981b1
use central functionality
2020-02-21 17:49:17 +01:00
Martin Diehl
6a0760a13c
documentation polishing
2020-02-21 17:42:01 +01:00
Martin Diehl
a433f7ef54
style unification
...
backport from dadf5-usability branch
2020-02-21 13:03:50 +01:00
Martin Diehl
16ddd9c5b2
better name
...
backport from dadf5-usability branch
2020-02-21 12:20:42 +01:00
Martin Diehl
58610e23a7
use 4 space for indentation
2020-02-21 10:53:44 +01:00
Martin Diehl
c84a6e90c9
no 'dangling' functions
...
@staticmethod is what we need here
2020-02-21 10:45:14 +01:00
Martin Diehl
c1caef4bc9
fixing prospector complaints
2020-02-21 08:13:10 +01:00
Martin Diehl
98f5c601a3
line too long
2020-02-21 07:58:10 +01:00
Martin Diehl
f6c921e811
Merge branch 'development' into DADF5_point_calculations-2
2020-02-21 07:56:19 +01:00
Martin Diehl
8ae3346bd4
constituents/components are not handled by "view" (active)
2020-02-21 07:46:55 +01:00
Martin Diehl
c3740b4ba0
follow 4 space indentation convention
2020-02-21 07:45:05 +01:00
Martin Diehl
effaef46db
simplified interface
2020-02-21 07:39:53 +01:00
Martin Diehl
9beca6488c
more verbose description
2020-02-21 07:21:45 +01:00
Martin Diehl
1e1cb3f151
avoid long modules
2020-02-20 23:29:12 +01:00
Martin Diehl
5ce143e36e
numpy is already imported
2020-02-20 23:17:54 +01:00
Martin Diehl
898c696ef7
avoid long modules
2020-02-20 23:16:35 +01:00
Martin Diehl
16ed0623af
4 space indentation (as suggested by PEP)
2020-02-20 23:10:38 +01:00
Martin Diehl
a670ab269f
proper spacing
2020-02-20 22:50:54 +01:00
Martin Diehl
a608310920
correct printing of error messages
...
'{}'.format(np.ones(3)) gives only '1', but we want to see '[1 1 1]'
2020-02-20 18:59:57 +01:00
Martin Diehl
251d55fe09
current thread pool is useless for performance
...
https://stackoverflow.com/questions/33969151
https://stackoverflow.com/questions/10789042
2020-02-16 11:00:09 +01:00
Martin Diehl
065fc9ffde
using DAMASK_NUM_THREADS controls # workers for add_XXX
2020-02-16 09:49:55 +01:00
Martin Diehl
a70721df53
write out proper Miller indices
2020-02-15 20:09:24 +01:00
Martin Diehl
5235c27ad0
making new mechanics functions available for DADF5
...
+ testing them
2020-02-15 17:56:20 +01:00
Martin Diehl
118c03c485
tests for new functionality
2020-02-15 16:59:30 +01:00
Martin Diehl
ad062ada6b
option (as in addSpectralDecomposition)
2020-02-15 16:26:56 +01:00
Martin Diehl
5822ad8b05
new functions (takeover from old branch)
2020-02-15 15:13:56 +01:00
Martin Diehl
e46395be41
sorted alphabetically
2020-02-15 14:21:23 +01:00
Martin Diehl
79533b075e
eigenvalues is more specific name than principal components
2020-02-15 13:56:15 +01:00
Martin Diehl
c2c84d698f
Merge remote-tracking branch 'origin/development' into MiscImprovements
2020-02-11 17:11:43 +01:00
Martin Diehl
57c70cd5d5
preparing removal
2020-02-04 00:12:08 +01:00
Martin Diehl
4999f5aa4d
first steps of removing deprecated
...
use faster, pandas-based alternative 'table'
2020-02-03 21:40:10 +01:00
Martin Diehl
4c28e7f626
better have tests
2020-02-01 09:44:21 +01:00
Martin Diehl
4d07ab7519
prospector complained
2020-01-29 16:31:05 +01:00
Martin Diehl
fa39a7423b
preparing for actual use
2020-01-29 13:20:16 +01:00
Martin Diehl
5d1f68bf93
Merge branch 'fix-elem-7-57' into noAbaqus
2020-01-27 19:27:53 +01:00
Martin Diehl
ed9347e9bd
more robust:
...
* split(maxsplit=1) will raise ValueError if split into two strings is not
possible
* int('a') will raise ValueError if 'a' cannot be interpreted as an
integer
2020-01-26 10:34:30 +01:00
Martin Diehl
6fed655500
fix for new style and test
2020-01-26 10:17:27 +01:00
Martin Diehl
13107abd39
not working and significat efforts needed to test it
2020-01-26 07:44:22 +01:00
Martin Diehl
bfe8585903
Merge branch 'development' into MiscImprovements
2020-01-24 20:08:14 +01:00
Martin Diehl
54d1c35c45
Merge branch 'development' into python-module
2020-01-24 08:42:28 +01:00
Martin Diehl
ce03d9f30a
play it safe
2020-01-21 17:38:08 +01:00
Martin Diehl
5b63779e5c
bugfix:
...
Wrong order of arguments resulted in wrong visualization
2020-01-21 14:37:42 +01:00
Martin Diehl
9f61b0d34a
not needed,
...
pd.DataFrame can handle that
2020-01-21 07:14:43 +01:00
Martin Diehl
74927d9622
np.prod(()) is 1.0 (float), casting is therefore needed
2020-01-20 16:05:07 +01:00
Martin Diehl
e3d35b41b4
bugfixes: invalid python code
2020-01-20 13:06:32 +01:00
Martin Diehl
b23479bfc9
Merge remote-tracking branch 'origin/development' into MiscImprovements
2020-01-20 12:51:41 +01:00
Martin Diehl
757dc4e234
new style table
...
no header, comments given by '#': Very standard format, we just take
care of multidimensional columns via special label notation
2020-01-20 12:51:09 +01:00
Franz Roters
701a9b18cc
Merge remote-tracking branch 'remotes/origin/marc-improvements' into development
2020-01-18 12:21:24 +01:00
Philip Eisenlohr
87767f0cc2
Merge branch 'no-python-quaternion' into 'development'
...
No python quaternion
See merge request damask/DAMASK!122
2020-01-15 22:52:55 +01:00
Martin Diehl
dd70b38d46
detour via numpy array unified datatype
2020-01-15 14:15:57 +01:00
Martin Diehl
ce47e18e5c
not needed for integer arrays
2020-01-15 13:45:05 +01:00
Martin Diehl
8a674d0279
2 bugfixes:
...
- mixed up other and me when removing quaternion class
- 1000 random orientations are enough for testing
2020-01-14 22:30:08 +01:00
Martin Diehl
9d1c1fdb92
enforce Re(q) > 0
2020-01-14 11:33:18 +01:00
Martin Diehl
3afc011a58
fix for untested functionality
...
thanks to prospector
2020-01-14 10:34:13 +01:00
Martin Diehl
06fc374359
avoid overhead
...
length of random quaternion is one, no need to go via fromQuaternion but
direct initialization and standardization suffices
2020-01-14 10:22:51 +01:00
Martin Diehl
8e5aa60f34
fixed (and polished) printing
2020-01-14 09:37:59 +01:00
Martin Diehl
9509f1bae1
default abaqus is used if version matches or is undefined
...
other changes do not alter behavior, just cleaning
2020-01-14 09:15:38 +01:00
Martin Diehl
26c242b997
not needed anymore
...
conceptually, having the quaternion class is nice but performance-wise
it is a nightmare and prevents vectorization
2020-01-14 09:03:50 +01:00
Martin Diehl
99684c3e86
Merge branch 'vectorized-orientation-conversion' into no-python-quaternion
2020-01-14 09:02:43 +01:00
Martin Diehl
3fc616bc7d
Merge branch 'development' into vectorized-orientation-conversion
2020-01-14 09:00:10 +01:00
Martin Diehl
af42eae9c1
Merge branch 'development' into python-module
2020-01-14 08:58:19 +01:00
Martin Diehl
c7e92c672d
avoid code duplication
2020-01-14 07:30:17 +01:00
Martin Diehl
ecb8510217
leaner (and hopefully faster) code
2020-01-14 05:32:42 +01:00
Philip Eisenlohr
86f27df0b2
damask.Environment reads from os.environ; python module is packaging-ready
2020-01-13 17:28:28 -05:00
Philip Eisenlohr
edbee3a419
Merge branch 'development' into python-module
2020-01-13 15:24:08 -05:00
Martin Diehl
47bcdfc22c
[skip sc] vtk output working and tested
...
need to check syntax check because ifort 17.0 has problems with new
mesh. Works, however, with Intel 17.8
2020-01-13 11:53:37 +01:00
Martin Diehl
76d0383c2f
Merge branch 'MoreImprovements' into marc-improvements
2020-01-13 10:04:27 +01:00
Martin Diehl
bd4db68a12
support for non QUAD cell type
2020-01-13 10:03:13 +01:00
Martin Diehl
f9772a3df8
more descriptive name
2020-01-13 02:51:49 +01:00
Martin Diehl
26442ee783
bugfixes
...
missing import/outdated test
2020-01-12 19:35:45 +01:00
Martin Diehl
70b73762ed
avoid warning due to change in default parameter
2020-01-12 19:21:16 +01:00
Martin Diehl
19e88df571
polishing
2020-01-12 07:53:41 +01:00
Martin Diehl
1315029196
do not clutter comments
2020-01-12 02:06:53 +01:00
Martin Diehl
1bb94f03b8
polishing (prospector was complaining)
2020-01-12 00:21:14 +01:00
Martin Diehl
3938f34978
Merge branch 'MiscImprovements' into MoreImprovements
2020-01-11 22:37:41 +01:00
Martin Diehl
2d9c25f8e5
Merge branch 'development' into MiscImprovements
2020-01-11 20:34:35 +01:00
Philip Eisenlohr
300f1b7015
added options to return "natural" versions of asQ, asRodrig, and asAxisAngle
2020-01-11 11:36:22 -05:00
Martin Diehl
09f42a3991
ang files might have more columns
2020-01-08 15:34:21 +01:00
Martin Diehl
385085de73
correct names for numpy (differ from math)
2020-01-04 01:05:40 +01:00
Martin Diehl
e692118ec5
easier to use for single output label
2020-01-03 15:41:15 +01:00
Martin Diehl
b5e4e42505
splitext includes leading dot
2020-01-03 14:44:31 +01:00
Martin Diehl
49f3de44b9
limit import statements (numpy already in use)
2020-01-02 18:02:13 +01:00
Martin Diehl
97e7f510e2
wrong time was reported in case of trailing inactive increments
2020-01-02 16:27:42 +01:00
Martin Diehl
f5c58517a7
enable one grid point along all directions
2019-12-24 15:59:09 +01:00
Martin Diehl
aec9c601d6
some insights from continuum mechanics formulated as test
2019-12-23 15:34:13 +01:00
Martin Diehl
60580cc45a
mixed up left/right stretch tensor
2019-12-23 07:16:50 +01:00
Martin Diehl
2cb3213e37
improvements to Table class
...
- string comparison should be '!=' not 'is not', latter compares
object, not value
- functions for common operations: append (vstack, growTable) and join
(hstack, addTable)
2019-12-22 22:21:32 +01:00
Martin Diehl
48c21045d7
centralized functionality for ang import
2019-12-22 14:57:57 +01:00
Martin Diehl
a7d60dc52a
not used anymore
...
geom class has own report function
2019-12-21 19:10:41 +01:00
Martin Diehl
5b7139dc22
using specialized class
2019-12-21 19:09:28 +01:00
Martin Diehl
6989679d3b
using central functionality
...
- Table class for table data
- grid_filters for grid related functions
2019-12-21 19:03:36 +01:00
Martin Diehl
2cd2d6f506
cell_2_node/node_2_cell work only for periodic data
...
hence, coordinates and displacements cannot be converted easily
2019-12-21 18:07:04 +01:00
Martin Diehl
3bf9a4deb5
Merge branch 'grid-filters' into MiscImprovements
2019-12-21 17:39:39 +01:00
Martin Diehl
503626473a
bugfix: wrong grid order
...
for x fast, z slow, the shape of the array needs to be reversed
2019-12-21 17:38:16 +01:00
Martin Diehl
0d1ff72c45
Merge branch 'grid-filters' into MiscImprovements
2019-12-21 06:57:38 +01:00
Martin Diehl
f0d3b29b82
Merge branch 'development' into MiscImprovements
2019-12-21 06:53:56 +01:00
Martin Diehl
2c5f7d3b5a
Merge branch 'development' into grid-filters
2019-12-20 14:32:20 +01:00
Franz Roters
034367fa6a
Merge remote-tracking branch 'remotes/origin/noPostResults' into development
2019-12-20 11:40:57 +01:00
Martin Diehl
2fe163be31
Merge branch 'development' into MiscImprovements
2019-12-18 19:57:00 +01:00
Francisco Jose Gallardo Basile
80b559dc00
Merge branch 'no_phase_name_for_genericoutput' into 'development'
...
No phase name for genericoutput
See merge request damask/DAMASK!113
2019-12-18 18:54:46 +01:00
Martin Diehl
3c42368f66
also use newer regex
2019-12-18 11:29:13 +01:00
Martin Diehl
6a8783bab8
these functions are static
...
class methods change are allowed to change the attributes of the class.
This is not what we do here
2019-12-13 15:46:40 +01:00
Martin Diehl
5b376712ef
bugfix: wrong coordinates
2019-12-13 14:39:10 +01:00
Martin Diehl
e5448fc381
avoid code duplication
2019-12-13 14:36:52 +01:00
Vitesh Shah
7d849b639b
Point based vtk file in DADF5 class
2019-12-13 14:20:18 +01:00
Martin Diehl
b14c15fd9e
directly output DADF5 to vtk from python
2019-12-13 12:15:45 +01:00
Martin Diehl
63fc125398
include origin do DADF5
...
requires updat of file version
2019-12-13 09:12:07 +01:00
Philip Eisenlohr
582f895d18
restored Solver module functionality
2019-12-12 16:58:37 -05:00
Philip Eisenlohr
e37daadaff
restored environment functionality
2019-12-12 14:57:07 -05:00
Philip Eisenlohr
41ed7ce462
"pip install damask" either locally or from PyPI after upload
2019-12-12 14:32:51 -05:00
Martin Diehl
1d7010778e
[skip ci] silence annoying warnings
2019-12-11 19:43:23 +01:00
Martin Diehl
37e52fd81f
polishing
2019-12-11 16:51:13 +01:00
Martin Diehl
4c1281b4fc
rename changed order in shapes dict.
...
This resulted in wrong column names when writing to ASCII file
two fixes (one would be enough):
1) keep order (build new directory)
2) write in order of labels in pandas dataframe, not in order in shapes
dict
2019-12-10 20:04:03 +01:00
f.basile
ca06c1d3a2
Fix bugs in relatedOperations for NW,GT and GTprime.
2019-12-10 13:49:33 +01:00
Martin Diehl
d1fa2a14dc
was used only for yield surface fitting
2019-12-09 05:28:00 +01:00
Martin Diehl
53cb59fc47
use pytest instead of hand-written test class
2019-12-08 21:29:26 +01:00
Martin Diehl
6dfe24290c
Merge remote-tracking branch 'origin/development' into fix-orientation-relationship-2
2019-12-08 21:10:50 +01:00
Martin Diehl
21431295fb
documenting
2019-12-08 20:20:13 +01:00
Martin Diehl
4e2e7d02f6
more sensible interface
2019-12-08 18:54:41 +01:00
Martin Diehl
7dc128ad12
polishing
2019-12-08 18:33:43 +01:00
Martin Diehl
828e82605e
ensure that data is correctly ordered
2019-12-08 18:13:45 +01:00
Martin Diehl
8d0c4310cf
improvements to grid generation
...
- handling of origin
- inverse functions: calculate grid,size,origin from regular coordinates
(cell or node). should replace corresponding functionality in util
2019-12-08 18:12:22 +01:00
Martin Diehl
9dc726ff53
polishing
2019-12-08 09:17:57 +01:00
Martin Diehl
ba69f5a631
polishing
2019-12-07 22:33:31 +01:00
Sharan Roongta
96710a238d
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into incs-no-leading-zero
2019-12-06 15:25:21 +01:00
Martin Diehl
4ddfd82304
better names
2019-12-05 18:32:21 +01:00
Martin Diehl
b1ff178109
Merge branch 'new-ASCII' into grid-filters
2019-12-05 18:06:56 +01:00
Philip Eisenlohr
2648a67dcd
fixed sort_by to respect updated index (upon subsequent adding of new data)
2019-12-05 12:02:10 -05:00
Philip Eisenlohr
3caf2c1296
condensing code
2019-12-05 09:05:50 -05:00
Martin Diehl
274aaa7359
Merge branch 'new-ASCII' into grid-filters
2019-12-05 10:50:56 +01:00
Martin Diehl
1018b89296
nice to have..
2019-12-05 10:48:42 +01:00
Martin Diehl
1bf4946e67
invalid escape sequence
2019-12-05 08:37:39 +01:00
Martin Diehl
469d638afb
making table class feature complete
2019-12-05 06:57:09 +01:00
Martin Diehl
ee8e3386f4
shorter but still descriptive names
2019-12-05 06:16:29 +01:00
Martin Diehl
e7a67262f8
clear enough
2019-12-05 06:00:49 +01:00
Martin Diehl
5fdf112f78
allow strings as data in ASCII file
2019-12-05 05:45:27 +01:00
Martin Diehl
1c83572589
more descriptive names
2019-12-05 05:11:58 +01:00
Martin Diehl
381c95bd1e
WIP: regrid functionality
2019-12-04 10:41:02 +01:00
Martin Diehl
999321e588
Merge branch 'new-ASCII' into grid-filters
2019-12-04 07:45:01 +01:00
Martin Diehl
285075bb6b
ordered alphabetically
2019-12-04 06:15:32 +01:00
Martin Diehl
fecd4632b4
correct reporting of time
2019-12-04 05:49:17 +01:00
Martin Diehl
1110affec2
Merge branch 'new-ASCII' of magit1.mpie.de:/damask/DAMASK into new-ASCII
2019-12-04 05:10:01 +01:00
Martin Diehl
9ad8743396
using central functionality
2019-12-03 22:00:21 +01:00
Martin Diehl
e006e0ebec
functions for spatial coordinates on regular grids
2019-12-03 18:59:59 +01:00
Martin Diehl
8f77843b0f
improved naming
...
- clearer variable names
- no '-' in attributes
- single source of truth
2019-11-30 09:01:37 +01:00
Martin Diehl
354c0123a1
backward compatibility
2019-11-30 08:40:59 +01:00
Martin Diehl
4185fcb4c3
adjust to new naming
2019-11-29 21:40:54 +01:00
Martin Diehl
dc3fc8f70c
do not clutter with leading zeros
2019-11-29 17:00:48 +01:00
Martin Diehl
76a1506893
small improvements
...
bugfix: writing correct labels (now consistent with readin)
error handling for inconsistent initialization
2019-11-28 20:18:54 +01:00
Martin Diehl
f2e722ed2e
polishing
2019-11-28 18:22:34 +01:00
Martin Diehl
3e65d44e07
centralized facilities for differential operations
...
note the need to reverse the grid shape in data from the ASCII table. If x is fastest,
z is slowest we require x to be the rightmost index
2019-11-28 15:46:22 +01:00
Martin Diehl
80b50f460e
cleaning
...
trying to get rid of strange re-ordering related to ASCII table data
layout
2019-11-28 10:09:22 +01:00
Martin Diehl
ca92400c2f
polishing
...
columns is the term used py pandas
2019-11-28 05:58:28 +01:00
Martin Diehl
b85049cb81
use brackets for line continuation with comments
2019-11-28 05:41:53 +01:00
Martin Diehl
98d5738fe6
Merge branch 'new-ASCII' into grid-filters
2019-11-28 05:12:36 +01:00
Martin Diehl
cee095b58e
better use centralized code
2019-11-27 12:22:28 +01:00
Martin Diehl
7d4b982c73
make information on modifications mandatory
2019-11-27 12:08:23 +01:00
Martin Diehl
76c3577378
pandas.DataFrame needs to be a 2nd order array
2019-11-27 12:03:35 +01:00
Martin Diehl
39734ef53c
alter data
...
allows to access multiple columns ('f') and individual components
('1_f')
2019-11-27 10:56:29 +01:00
Martin Diehl
96714089b1
documented and tested handling of multi-dimensional data
...
more precise regex expressions. get_array can handle individual
components
2019-11-27 09:58:58 +01:00
Martin Diehl
882a11c5f8
get labels without shape information
2019-11-27 08:43:20 +01:00
Martin Diehl
2d96136a0d
more general constructor for Table
...
reading from file is just one case (now handled by static method).
General constructor needs data and header information as dictionary.
Works only with python 3.7 where dict keeps the insertion order. Earlier
python versions/other implementations might fail.
2019-11-26 22:53:46 +01:00
Martin Diehl
5661f60552
fname seems to be the common name
2019-11-26 21:36:24 +01:00
Martin Diehl
925a4f73d6
staticmethod better suited than class method
...
a classmethod changes the class, i.e. it assigns attributes and gives
them specific values.
a staticmethod does not alter the class
https://www.geeksforgeeks.org/class-method-vs-static-method-python
2019-11-26 20:32:54 +01:00
Martin Diehl
845cfc34ec
similar logic as in geom class
...
- filename is not part of the object
- transparent handling of files, strings, and path-like objects for file
IO
2019-11-26 14:26:25 +01:00
Martin Diehl
81abc43920
Merge branch 'development' into new-ASCII
2019-11-26 10:29:05 +01:00
Martin Diehl
23f5e0fa58
filters for operations on regular grids (in fourier space)
2019-11-26 10:25:39 +01:00
Martin Diehl
476569390a
enable use of path objects, strings, and opened files
2019-11-25 13:47:14 +01:00
Martin Diehl
3e8518d861
following prospector guidelines
2019-11-24 19:30:00 +01:00
Martin Diehl
c9f9f7c681
pack causes trouble with tests ..
2019-11-24 19:02:19 +01:00
Martin Diehl
b2cdabd009
getting rid of shell scripts
2019-11-24 18:25:53 +01:00
Martin Diehl
816e86ae5f
phasing out python shell scripts
2019-11-24 15:13:26 +01:00
Martin Diehl
8186be6293
compress functionality should be part of the geom class
...
automated decision is base on heuristic whether compression is memory
efficient
2019-11-24 14:27:24 +01:00
Martin Diehl
02df55b9bd
bugfix
...
casting to plain array works only (and makes sense only) for a derived
type
2019-11-24 11:18:41 +01:00
Martin Diehl
6060abb375
cleaning
2019-11-24 09:10:47 +01:00
Martin Diehl
c9b1944493
handling of derived datatypes/structs
...
currently required for orientation
2019-11-24 08:50:27 +01:00
Martin Diehl
f30cbde99e
use first constituent as default
2019-11-24 08:04:40 +01:00
Martin Diehl
406ae29897
adopting rename in mechanics
2019-11-23 19:22:18 +01:00
Martin Diehl
834cd43b66
intention not clear
...
any ideas why __transforms__ was used?
2019-11-23 08:06:26 +01:00
Martin Diehl
dfb95df689
migrating shell scripts to python class
2019-11-22 21:48:41 +01:00
Martin Diehl
c00af5c402
4 space indents are common practice
2019-11-22 20:52:36 +01:00
Martin Diehl
fad679a9a5
need to catch IOError
2019-11-22 15:19:20 +01:00
Martin Diehl
6e0b2a4fab
following prospector rules
2019-11-22 13:16:53 +01:00
Martin Diehl
dac63f7d92
subfolders not needed
2019-11-22 12:55:56 +01:00
Martin Diehl
77e410d7d1
follow prospector rules
2019-11-22 12:17:44 +01:00
Martin Diehl
cf88c1f907
correct syntax for integer comparison
2019-11-21 19:49:46 +01:00
Martin Diehl
a5ae82fe90
handle deprecation warning in python 3.8
2019-11-21 19:47:27 +01:00
Martin Diehl
7a7eea47b5
correct handling of arrays
...
all strains measures except for logarithmic had wrong off-diagonal
components
2019-11-21 19:46:05 +01:00
Martin Diehl
fb286af354
[skip sc] first draft
2019-10-31 10:47:40 +01:00
Martin Diehl
1c10459a5a
also use fast operation order
2019-10-30 21:09:17 +01:00
Martin Diehl
8a85123abc
4 space indent is python standard
2019-10-30 18:05:44 +01:00
Martin Diehl
b733bd3038
polar decomposition
2019-10-28 11:18:26 +01:00
navyanthkusam
fca288ae8a
performance improvement
...
this mapping is faster for large volumes
2019-10-25 14:47:36 +02:00
Philip Eisenlohr
894b646283
corrected name of U,V; fixed Mises_strain factor from 3/2 to 2/3;
2019-10-23 15:03:24 +02:00
Martin Diehl
2d08eb68b1
bugfix for (3x3) version of Cauchy
2019-10-23 14:39:52 +02:00
Martin Diehl
5e7f9a223b
should be a passive rotation
2019-10-21 23:17:58 +02:00
Martin Diehl
9489c04ccb
less confusing
2019-10-21 23:02:31 +02:00
Martin Diehl
ecc51e34d3
rouding should affect color calculation
...
avoid NaN in math.power(x,0.5). math.power(-0.0,0.5) is ok
2019-10-21 22:44:12 +02:00
Martin Diehl
578cbf9bbf
bugfixes:
...
- vonMises calculation was wrong
- wrong type of data used in some add_XXX
2019-10-21 18:07:35 +02:00
Martin Diehl
78a2941436
avoid numerical issues
2019-10-21 16:59:49 +02:00
Martin Diehl
51ed4d68e6
more info
2019-10-20 13:13:48 +02:00
Martin Diehl
b593dfbfd9
better layout
2019-10-20 11:34:05 +02:00
Martin Diehl
f00f6952c0
selecting by increment is a common task
...
https://www.python.org/dev/peps/pep-0257/
The docstring is a phrase ending in a period. It prescribes the function or method's effect as
a command ("Do this", "Return that"), not as a description; e.g. don't write "Returns the pathname ...".
2019-10-20 11:00:10 +02:00
Martin Diehl
8f315836b0
easier to use if end time is included:
2019-10-20 10:42:45 +02:00
Martin Diehl
64731369e3
general definition for strain tensors
2019-10-19 16:05:53 +02:00
Martin Diehl
a665d5726d
polishing
2019-10-19 13:22:37 +02:00
Martin Diehl
b31de5d0f6
outsourcing tensor math to mechanics class
...
strain calculation is generalize to arbitrary order and simplified: No
need for svd, F^T F/F F^T does the job.
2019-10-19 12:54:16 +02:00
Martin Diehl
e51f6cee72
improved handling of string types for HDF5
...
- convert bytes to string when reading
- convert string to bytes when writing
2019-10-19 09:47:26 +02:00
Martin Diehl
5f0a48fae7
enhanced and documented
2019-10-19 08:51:51 +02:00
Martin Diehl
dc9aca5710
copy and paste error/invalid syntax
2019-10-18 20:57:36 +02:00
Martin Diehl
5858d03a6b
prospector complaints for stupid reasons
2019-10-18 20:55:39 +02:00
Martin Diehl
3336cfc3da
better have tensor functions available
...
allows in-memory evaluation of results
2019-10-18 20:50:03 +02:00
Martin Diehl
1a34a6f7b5
some useful tensor operations
2019-10-18 20:41:39 +02:00
Martin Diehl
47ba7d49b5
allow to use the same label twice in a function
2019-10-18 20:39:00 +02:00
Martin Diehl
de912c22b4
Merge branch 'development' into HDF5-spectral-displacements
2019-10-18 12:54:12 +02:00
Franz Roters
91691744c6
Merge branch 'Marc-No-nonlocal' into 'development'
...
Marc no nonlocal
See merge request damask/DAMASK!98
2019-10-15 10:35:37 +02:00
Martin Diehl
708bbd3cb9
mesh/grid type transparent handling of coordinates
2019-10-12 16:15:04 +02:00
Martin Diehl
b208fa6565
takeover from Vitesh's work with small adoptions to current DADF5
2019-10-12 08:02:57 +02:00
Martin Diehl
0eef73935e
handling of derived types (orientation for the moment)
2019-10-11 08:35:21 +02:00
Martin Diehl
b8a1a5bb7d
v 0.2 is ok, not sure what the future brings so better check
2019-10-03 20:23:49 +02:00
Martin Diehl
0b29d08109
bump to DADF5 v0.3
...
contains displacements (for grid solver)
2019-10-03 19:02:17 +02:00
Martin Diehl
62fb4d2ea9
polishing
2019-10-01 14:30:09 -07:00
Martin Diehl
e96eb55edd
calculate different strain tensors
2019-09-30 14:28:58 -07:00
Martin Diehl
0e3b09adc1
negative eigenvalues are not possible
...
left/right Cauchy-Green Deformation Tensors are positive definit
https://de.wikipedia.org/wiki/Deformationsgradient
2019-09-30 14:12:15 -07:00
Martin Diehl
d95a795e3b
Merge branch 'MiscImprovements' into HDF5-spectral-displacements
2019-09-30 13:53:24 -07:00
Martin Diehl
0dd14a0652
correct reporting of version
2019-09-30 09:07:56 -07:00
Martin Diehl
457f9aa4e3
prospector found duplicated key
2019-09-30 08:53:53 -07:00
Martin Diehl
3206ee04bc
nodal displacements for grid solver
...
currently for non-MPI only
2019-09-27 20:38:02 -07:00
Martin Diehl
970d172160
correct message
2019-09-27 17:52:01 -07:00
Martin Diehl
ad83c8541d
same names as in python
2019-09-20 17:18:09 -07:00
Martin Diehl
fb61899c5f
seems that testing has Marc 2018.1 already
2019-09-20 20:54:30 +02:00
Martin Diehl
0b6620bfb7
Merge branch 'development' into MiscImprovements
...
F***ing commits to development!
2019-09-20 07:40:52 -07:00
Martin Diehl
4b2263bebe
conversion to float causes issues
...
test only current version of MSC.Marc
2019-09-20 03:21:53 +02:00
Yang Su
6fdab024b6
ensure that integer inputs to Rotation.fromX() translate into float quantities
2019-09-19 17:03:31 -04:00
Martin Diehl
7fd4b8bff6
more prospector hints
2019-09-19 12:51:16 -07:00
Martin Diehl
f1f88610dd
documenting
2019-09-19 12:32:15 -07:00
Martin Diehl
2e25a03d13
adopting to new prospector
2019-09-19 11:56:58 -07:00
Martin Diehl
35a009f513
prospector complaind
...
help details were anyway pretty useless
2019-09-19 11:41:41 -07:00
Martin Diehl
32639caec2
better readable
2019-09-19 11:12:44 -07:00
Martin Diehl
bf7db26680
Merge branch 'even-more-HDF5-postprocessing' into MiscImprovements
2019-09-19 10:49:14 -07:00
Philip Eisenlohr
76b08e10bd
following stricter Python docstring standards
2019-09-18 21:43:43 -04:00
Martin Diehl
4994c86e67
bugfix: hard-wired keyword resulted in missing materialpoint results
2019-09-16 13:31:49 -07:00
Martin Diehl
ee1327c519
[skip ci] typo
2019-09-16 11:21:06 -07:00
Martin Diehl
28bb92021d
avoid code duplication
2019-09-16 11:04:05 -07:00
Martin Diehl
980c02b0c3
selected increments by simulation time
2019-09-15 20:19:14 -07:00
Martin Diehl
86fb0a7942
time info needed for filtering of increments
2019-09-15 20:04:52 -07:00
Martin Diehl
b3b710c848
polishing
2019-09-15 19:56:07 -07:00
Martin Diehl
4cedcee0b4
handling of increments follows handling of other 'visible'-items
2019-09-15 17:08:03 -07:00
Martin Diehl
f6ac8c995f
simplified and selected better names
2019-09-15 16:00:19 -07:00
Martin Diehl
c76d4d3f87
avoid unneeded arguments
2019-09-15 15:24:23 -07:00
Martin Diehl
88eba27cec
avoid name duplication + polishing
2019-09-15 15:10:32 -07:00
Martin Diehl
04aefa84bc
more appropriate names
2019-09-15 15:02:16 -07:00
Martin Diehl
d413aef7c3
functionality for general calculations on datasets
...
currently limited to vectorized expressions.
2019-09-14 12:00:23 -07:00
Martin Diehl
8251725bce
WIP: different norm types
2019-09-14 10:53:33 -07:00
Martin Diehl
e4e9c5f558
support glob matching
...
more flexibility in selecting active datasets and groups
2019-09-14 09:55:42 -07:00
Martin Diehl
b85ac11c49
implemented ideas from discussion with Philip
...
group matching unified and with wildcard support
time step handling should become more convenient (WIP)
add_norm can not compute abs of scalar, added function for that
general polishing here and there
2019-09-14 09:07:23 -07:00
Martin Diehl
c13db4b3ca
renaming
...
on_air/active are not clear. visible seems to be the most appropriate
name
2019-09-13 21:49:22 -07:00
Martin Diehl
898f53295d
iter functions for groups
...
restore original selection after iterating (i.e. temp setting of active)
polishing: correct names and more details for HDF5 meta data
2019-09-13 21:14:52 -07:00
Martin Diehl
69462f8190
polished
...
strain calculation agrees up to 1e-4 with results from addStrainTensors.
Not too exciting, but ok
2019-09-13 19:37:25 -07:00
Martin Diehl
38f6609ad7
high level functions for selecting output
...
tested Cauchy stress calculation (comparison with addCauchy.py)
2019-09-13 18:36:06 -07:00
Martin Diehl
c5006e264b
handling prospector complaints
2019-09-13 16:07:39 -07:00
Martin Diehl
002383afc2
solved problem with postprocessing
...
- to not 'try' with h5py library, it might have another 'try'. Check
explicitly for empty argument
also some polishing
2019-09-13 16:01:30 -07:00
Martin Diehl
b2b625af3e
notes from discussion with Philip
2019-09-13 15:17:46 -07:00
Martin Diehl
f83a167414
file mode for high level funtion not useful
2019-09-13 09:49:30 -07:00
Martin Diehl
6f008c5d5f
rewrite pointwise add function
...
- all vectorized: Much faster
- passing in all relevant information allows to do sanity checks and add
useful meta data in HDF5
- improved readability
2019-09-13 06:02:42 -07:00
Martin Diehl
3db3e9e762
preparing for use of optional arguments to function
2019-09-11 21:20:14 -07:00
Martin Diehl
de313269d9
bugfix
2019-09-11 18:54:54 -07:00
Martin Diehl
953ba53211
adjusting for strict prospector checking
2019-09-11 18:22:33 -07:00
Martin Diehl
a6c69a744b
do operations vectorized
2019-09-11 17:57:24 -07:00
Martin Diehl
462bb07efd
Merge branch 'development' into even-more-HDF5-postprocessing
2019-09-11 16:29:44 -07:00
Martin Diehl
bc893762ec
no need to inverse a rotation, transpose is faster
2019-09-11 07:29:34 -07:00
Martin Diehl
fa2c100d6a
need to update microstructure to get grid update
2019-09-04 20:20:55 -07:00
Martin Diehl
f415a8cad2
Merge branch 'PythonProspectorRules' into even-more-HDF5-postprocessing
2019-09-04 14:23:07 -07:00
Martin Diehl
28c11cc373
bugfix
...
-update function was resetting size if not given
-dim does not work an all terminals, therefore also emph new values in
addition to dim old ones
2019-09-04 11:14:44 -07:00
Martin Diehl
ef285b482f
more references + citation style correction
2019-09-04 08:55:05 -07:00
Martin Diehl
6f07a20919
not sure what this code was intended to do
2019-09-03 17:23:26 -07:00
Martin Diehl
3657f81c59
documenting (in accordance with new prospector rules)
2019-09-03 17:18:06 -07:00
Martin Diehl
a428a924eb
DAMASK default citation style
2019-09-03 16:34:02 -07:00
Martin Diehl
97fc8a4029
following python3 recommendations
2019-09-03 15:44:28 -07:00
Martin Diehl
234019bb4d
dummy stuff not needed
2019-09-03 15:41:16 -07:00
Martin Diehl
b0d3615d67
more detailed documentation
2019-09-03 15:32:01 -07:00
Martin Diehl
7d48764999
added documentation and references
2019-09-03 15:25:25 -07:00
Martin Diehl
a073f36471
update for solver wrappers
2019-09-03 09:48:42 -07:00
Martin Diehl
fea16327ac
now properly escaped
2019-09-02 23:42:34 -07:00
Martin Diehl
d84cef4fab
pep8: W605 / invalid escape sequence '\ ' seems to be a false positive
2019-09-02 23:37:52 -07:00
Martin Diehl
9cf4f9537e
documenting
2019-09-02 23:23:46 -07:00
Martin Diehl
ba395977db
adjusting to new prospector
2019-09-02 11:09:03 -07:00
Martin Diehl
34b3beda27
DefaultMap needed for newer paraview
2019-09-02 10:51:32 -07:00
Martin Diehl
c51cf8d506
transferring post processing capabilities
2019-07-15 13:55:14 -07:00
Martin Diehl
b6bb8a4650
simple strain calculation for DADF5
...
further enhancement requires to give optional arguments to
add_genericpontwise
2019-07-06 21:41:29 -07:00
Martin Diehl
b6830b3ac1
Merge branch 'development' into even-more-HDF5-postprocessing
2019-06-14 10:28:22 +02:00
Martin Diehl
cede188e76
enable to explicitly set the environment
...
required for running MPI processes when mpi4py is imported
2019-06-07 17:51:27 +02:00
Martin Diehl
1186bd16f5
Merge branch 'development' into even-more-HDF5-postprocessing
2019-06-04 22:39:10 +02:00
Philip Eisenlohr
dff690611e
fixed origin bug in VTK; VTK can be float; size defaults to 1 as longest dimension
2019-06-03 13:29:30 -04:00
Martin Diehl
bf27505faa
Merge branch 'development' into geometry-class
2019-05-31 16:21:50 +02:00
Martin Diehl
37de73535d
following PEP style guide
2019-05-30 20:08:39 +02:00
Martin Diehl
4cb0ba3803
not needed anymore
2019-05-30 19:26:41 +02:00
Martin Diehl
46f0ad052e
direct support for vtk output
...
- geom_check can now handle multiple files
- microstructure index is stored as integer in vtk file
2019-05-30 15:35:45 +02:00
Martin Diehl
b00581f1be
less picky on allowed datatypes
2019-05-30 13:29:29 +02:00
Martin Diehl
931fa9d36a
standardized and cleaned
...
-write to file if given
-type casting is done in the geom class
2019-05-30 10:20:07 +02:00
Martin Diehl
f30eda0267
no need to loop over files
...
will procude the same file over and over again
2019-05-30 09:32:37 +02:00
Philip Eisenlohr
17168525b6
use srepr in __repr__
2019-05-29 18:14:30 -06:00
Martin Diehl
6e790e845a
correct rescaling
2019-05-29 19:36:02 +02:00
Martin Diehl
669ca82ce1
formatted return message also on interactive shells
2019-05-28 09:05:10 +02:00
Philip Eisenlohr
1f56ac6a4a
streamlining and bugfixing of geom-class
2019-05-27 22:45:34 -06:00
Martin Diehl
b69f0efbbc
improved and simplified reporting
2019-05-27 22:00:26 +02:00
Martin Diehl
615a4ab40f
keep float datatype
...
based on the assumption, that no mixed float/int data is stored
2019-05-27 09:56:15 +02:00
Martin Diehl
6e06764e2d
using (enhanced) central functionality
2019-05-27 08:38:02 +02:00
Martin Diehl
b5cec797c0
cleaned
2019-05-26 23:03:31 +02:00
Martin Diehl
c8dfba89e5
using class
...
still a very complex script
2019-05-26 22:49:05 +02:00
Martin Diehl
0da39b0c69
copy and paste error
2019-05-26 22:08:42 +02:00
Martin Diehl
0039ac9551
always add comment at beginning
...
usually, comments are related to the file history
2019-05-26 21:32:48 +02:00
Martin Diehl
7a500e77b1
not needed (DADF5 is the modern alternative)
2019-05-26 20:53:59 +02:00
Martin Diehl
07c9b8b8f0
avoiding unwanted changes
2019-05-26 20:28:19 +02:00
Martin Diehl
feb2340935
self-reporting functionality for updating
2019-05-26 17:58:54 +02:00
Martin Diehl
dcb79afc84
more user friendly errors
2019-05-26 12:03:21 +02:00
Martin Diehl
be3513d1e0
polishing.
...
python imports follow PEP8
2019-05-26 09:49:56 +02:00
Martin Diehl
9f63d768de
do not keep whitespaces
2019-05-25 13:48:38 +02:00
Martin Diehl
875643c363
same style
2019-05-25 10:24:45 +02:00
Martin Diehl
4788fc6046
making use of new class
...
@philip: 1D arrangement needed?
2019-05-25 08:37:02 +02:00
Martin Diehl
cf374a04dc
using new class
2019-05-25 08:21:00 +02:00
Martin Diehl
7b6003fb32
no need for numpy.loadtxt (not compatible with 'to' and 'of' compression
2019-05-25 08:17:51 +02:00
Martin Diehl
420abfa162
use new class
2019-05-24 22:34:27 +02:00
Martin Diehl
f20c8fcffd
easier generation and modificaton of grid geometries
...
fits better than the general ASCII table class
2019-05-24 22:30:25 +02:00
Martin Diehl
a280f9a4a2
polishing
2019-05-23 17:26:38 +02:00
Martin Diehl
f6dda99bfb
more post processing functionality
2019-05-23 08:54:20 +02:00
Martin Diehl
e7ca371b14
routines to do pointwise operations
2019-05-20 19:56:45 +02:00
Martin Diehl
118c74a268
enable materialpoint output again
...
accidently lost during a former commit
2019-05-16 22:01:12 +02:00
Martin Diehl
339b86f784
bugfix + more verbose reporting
2019-05-16 11:44:03 +02:00
Martin Diehl
9f7fa5393a
fix for scalar datasets
2019-05-16 09:31:13 +02:00
Martin Diehl
3c0c0a2cd1
more flexible in selecting data
2019-05-16 00:27:06 +02:00
Martin Diehl
c6863a6124
also consider homogenization/materialpoint results
2019-05-15 23:38:24 +02:00
Philip Eisenlohr
4c7af713f1
added explicit method Rotation.fromBasis, which can treat real and reciprocal basis sets
2019-05-14 12:59:21 -04:00
Martin Diehl
f3c77cde87
Merge branch 'development' into MiscImprovements
2019-05-06 16:16:39 +02:00
Martin Diehl
9b0d3def1d
small changes suggested by Franz
2019-05-05 22:38:06 +02:00
Martin Diehl
39cc9e35ae
Merge branch 'development' into orientation_with_averaging
2019-05-05 22:12:09 +02:00
Martin Diehl
ebf01dee4f
store grid/size at geometry group
...
as outlined in the DAMASK results paper
2019-05-03 06:46:22 +02:00
Martin Diehl
b8bf329a74
Merge branch 'development' into MiscImprovements
2019-04-30 00:02:35 +02:00
Martin Diehl
c72518e52b
reflects current temp files
2019-04-28 07:22:12 +02:00
Martin Diehl
a5c620379b
tools to build a python wheel distribution
2019-04-26 20:54:58 +02:00
Martin Diehl
1ccc967544
enables auto include
2019-04-26 19:24:22 +02:00
Martin Diehl
1b9355327a
WIP: preparing for PIP package
2019-04-26 19:08:59 +02:00
Martin Diehl
009a47ad72
make python package independent from rest of DAMASK
...
https://packaging.python.org/guides/single-sourcing-package-version/
2019-04-25 20:05:42 +02:00
Martin Diehl
64c9a367c0
always install post processing scripts into {$DAMASK_ROOT}/bin
...
custom installation directions will be made available by more standard
approaches
2019-04-25 07:21:42 +02:00
Martin Diehl
53f6a4e030
too specific
...
- only works at MPIE
2019-04-25 06:00:56 +02:00
Martin Diehl
1330730717
inFZ needs 'proper' Rodriques--Franck vector
2019-04-19 09:04:54 +02:00
Martin Diehl
b97f10b6ff
forgotten changes in last commit + fromRandom
2019-04-19 08:17:02 +02:00
Martin Diehl
feca9fe0a0
Again changes to the return values.
...
A python function with no return value returns 'None'
2019-04-19 08:04:04 +02:00
Martin Diehl
9a43c2e4c5
fixed return values
...
- homomorph, standardize, etc. are silent in-place operations (return
None)
- homomorphed, standardized, etc. are out-of place operations that
report
2019-04-19 01:05:48 +02:00
Martin Diehl
25518df80c
fixes to quaternion class
...
- always store data as float (solves issues with truediv)
- fixed in-place multiplication and division
- consistent handling of "..ed()" functions
2019-04-19 00:44:12 +02:00
Philip Eisenlohr
4183eeaeca
[skip ci] disorientation may return full-fledged orientation obj and aux info, added rotation.standardize(d)
2019-04-18 18:06:00 -04:00
Martin Diehl
c4f56703a4
proper definition of homomorph
2019-04-18 17:11:51 +02:00
Martin Diehl
7570b187e7
do explicit homomorphing
...
only in cases when the underlying math cannot guarantee that the
resulting quaternion follows the convention
2019-04-18 16:26:05 +02:00
Martin Diehl
e8464814ae
explicit is better than implicit
...
- if the quaternion does not follow the convention, use
"fromQuaternion(acceptHomomorph=True)"
2019-04-18 14:46:12 +02:00
Martin Diehl
71b0036323
return rotation as misorientation
2019-04-18 14:26:53 +02:00
Martin Diehl
481aac7952
misorientation calculation did not always follow convention
...
- return homomorphed quaternion to ensure that real component is > 0
(equivalent to have axis angle limited to [0, pi]
2019-04-18 13:46:58 +02:00
Martin Diehl
b746b841f7
not needed
2019-04-18 12:04:36 +02:00
Martin Diehl
6b7fd6b7ea
visualizing data from DADF5: first prototype
2019-04-18 11:58:17 +02:00
Martin Diehl
7177813710
adding data to geometry
2019-04-17 19:57:16 +02:00
Martin Diehl
fdd5b93e7c
avoid FPE exceptions
2019-04-17 15:19:41 +02:00
Martin Diehl
a6e6db0559
more stable/robust conversions
2019-04-17 12:52:48 +02:00
Martin Diehl
079e683dd1
disorientation returns Orientation, not Rotation
2019-04-17 10:48:18 +02:00
Martin Diehl
3f8c16262e
fixed import statement
...
previous form only worked in python/damask folder
2019-04-17 09:45:18 +02:00
Martin Diehl
8609eb6eb7
improved names and layout
2019-04-17 09:34:49 +02:00
Martin Diehl
c7c6627dfb
don't try to figure out the input
2019-04-17 08:49:26 +02:00
Martin Diehl
fa18200447
quaternion is now in separate module
...
avoid long modules with multiple, only loosely related classes
2019-04-17 08:46:03 +02:00
Martin Diehl
d842902a76
consistent ordering
...
- qu, om, eu, ax, ro, ho, cu
2019-04-16 21:47:29 +02:00
Martin Diehl
8eb1a35dfb
first version of a library to parse HDF5
...
- preliminarly called DADF5 (DAMASK HDF5)
- script to write (empty undeformed) geometries is also added
2019-04-13 11:25:53 +02:00
Philip Eisenlohr
3a7408a213
averaging possible for rotations and orientations; Rodrigues 3Dvector output only at top-level; code reordering
2019-04-12 09:03:47 -04:00
Philip Eisenlohr
3d6eb76da3
equivalentOrientations accepts scalar argument to directly return single rotation object (not single element list)
2019-04-11 19:07:41 -04:00
Philip Eisenlohr
2190c3ef46
fixed serious disorientation bug; sorted transformation functions
2019-04-11 18:32:07 -04:00
Philip Eisenlohr
b8285d5749
restored orientation averaging capability
2019-04-11 17:23:04 -04:00
Martin Diehl
019d1a9c5c
[skip ci] reference was wrong
2019-04-08 22:23:40 +02:00
Martin Diehl
dd51945570
checking for input errors
2019-03-28 07:25:20 +01:00
Martin Diehl
85a535b99c
is not used anymore
2019-03-07 22:35:43 +01:00
Martin Diehl
12587be595
was not used anymore
...
status bar can be used as a replacement, it does to flood log files as
extensively as the background thread
2019-03-07 20:48:09 +01:00
Philip Eisenlohr
eada10548e
[skip ci] no blank line after progress bars
2019-02-27 08:38:06 -05:00
Martin Diehl
e88182b007
improved converte, now with test
...
still needs to figure out how +P is handled
2019-02-24 14:39:34 +01:00
Martin Diehl
56781dfa5b
fiber was never used here and will be remove anyway
...
more user friendly formatting
2019-02-24 10:32:28 +01:00
Martin Diehl
73f6cb7020
fixed datatype
2019-02-24 09:12:21 +01:00
Martin Diehl
d3ac3cc0f5
using new Orientation class
2019-02-24 08:34:20 +01:00
Martin Diehl
9dc8dff4b1
cleaning and adding compatibility layer
2019-02-23 22:35:04 +01:00
Martin Diehl
b3455c825e
transition to new orientation class
...
forward-backward conversion quite stable
2019-02-23 21:49:05 +01:00
Martin Diehl
93ae5cbd07
Merge remote-tracking branch 'origin/development' into 10-consistent-orientation-conversions-3
2019-02-22 23:05:36 +01:00
Martin Diehl
43376c39d8
addGrainID parses in quaternion
2019-02-22 11:25:39 +01:00
Martin Diehl
907f7ca560
transition to new class
2019-02-21 13:33:22 +01:00
Martin Diehl
88fc37d8a7
some more work on python3 compatible scripts
2019-02-15 16:22:52 +01:00
Martin Diehl
8b82941014
only Abaqus 2019 is available
2019-02-15 14:26:08 +01:00
Martin Diehl
c50078bafc
short version not needed any more
...
Abaqus version is year
2019-02-15 14:22:26 +01:00
Martin Diehl
608852df83
rotation paper has angle as last component
2019-02-12 10:58:38 +01:00
Martin Diehl
7da8980cc0
bugfixes: wrong shape, wrong conversion
2019-02-12 09:04:35 +01:00
Martin Diehl
336a80091f
rodrigues is 4-vector with rotation being the last component
...
established a single source of truth for length
2019-02-12 08:59:26 +01:00
Martin Diehl
97ac437686
more user friendly constructors
2019-02-12 08:14:27 +01:00
Martin Diehl
ef3fc0b58a
bugfix: wrong array indexing
...
rotation of meshgrid tuple implemented
2019-02-12 07:42:46 +01:00
Martin Diehl
4215ae3888
rotation of matrix is defined in class
2019-02-12 06:32:26 +01:00
Martin Diehl
e47c275e0c
unknown encoding caused problem (on python2?)
2019-02-12 06:18:21 +01:00
Martin Diehl
48b0307fab
using new rotation class
...
cannot rotate matrices (3,3) and (3,3,3,3) at the moment
2019-02-12 00:27:13 +01:00
Martin Diehl
7ee933b79d
Rotation class
...
uses (and hides) Quaternion2. Should replace Quaternion class.
Orientation class should inherit from Rotation and adds symmetry.
2019-02-11 23:50:02 +01:00
Martin Diehl
e931b716fd
conversion routines from Marc de Graefs 3D rotation repository
...
Python version available on https://github.com/MarDiehl/3Drotations
2019-02-11 23:15:19 +01:00
Martin Diehl
40740b831e
reverted code removal
...
was not "just commented out" but served as documentation. now easier to
see
2019-02-04 00:10:49 +01:00
Martin Diehl
9a4e9e62b6
using new rotation class
2019-02-01 20:28:51 +01:00
Martin Diehl
878331e5e9
this code was never used and is quite old
2019-02-01 19:29:19 +01:00
Philip Eisenlohr
e6fe312f85
Corrected documented value for P (= -1!). Instead of repeating the assignment P=-1 in multiple internal functions, it might be advisable to define a class-wide parameter?
2019-02-01 14:04:55 +01:00
Martin Diehl
11a509970b
some comments
2019-02-01 10:17:20 +01:00
Martin Diehl
45d11f81b0
python cleaning
2019-01-05 10:55:28 +01:00
Martin Diehl
02ab55d4b3
python reflects content better than lib
2019-01-05 10:52:39 +01:00