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
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