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