Commit Graph

1983 Commits

Author SHA1 Message Date
Martin Diehl 4278ba32ae adopting to standard data layout 2020-04-20 22:07:49 +02:00
Martin Diehl 9a54c326e2 adopted to new data layout 2020-04-20 21:28:23 +02:00
Martin Diehl a8b75a23c5 simplified 2020-04-20 20:40:47 +02:00
Martin Diehl 8465c3ab1b adjusting to new data layout 2020-04-20 19:13:45 +02:00
Martin Diehl a367128436 not used anymore 2020-04-20 13:57: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 6254063b4b not used 2020-03-31 12:52:46 +02:00
Martin Diehl bcbdd87870 base substitution on original microstructure 2020-03-29 23:50:09 +02:00
Martin Diehl 396d428af7 bugfix: works for all cuboids, not just cubes 2020-03-29 23:09:43 +02:00
Martin Diehl f1b4d81fb4 simplified 2020-03-29 19:11:36 +02:00
Martin Diehl 04cb8111c6 only used for non-selective 2020-03-22 07:08:54 +01:00
Martin Diehl 3873a3d20d restoring working structure for config submodule 2020-03-21 22:17:07 +01:00
Martin Diehl b53288c0be distance already controls whether tesselation works
at least for sufficiently large d
2020-03-21 21:50:15 +01:00
Martin Diehl 2c1a654966 more conservative estimate 2020-03-21 21:10:14 +01:00
Martin Diehl 67f64b7a7a polishing 2020-03-21 18:01:26 +01:00
Martin Diehl f961f3590c tested
bugfix: correct coordinates for periodic Laguerre
performance: do not waste memory
2020-03-21 17:53:59 +01:00
Martin Diehl a2b92569d2 local functions cannot be pickled (required for multiprocessing) 2020-03-21 17:04:27 +01:00
Martin Diehl c31c9be628 fix for periodic copies
old version had huge memory consumption as was probably wrong
2020-03-21 16:41:52 +01:00
Martin Diehl ab1ab42e75 easier to specify size directly 2020-03-21 15:17:02 +01:00
Martin Diehl 42b9ccf99e less complicated 2020-03-21 11:36:34 +01:00
Martin Diehl d636b53e2b duplicated comment line 2020-03-20 10:27:46 +01:00
Martin Diehl 509f8cfcc9 cleaning 2020-03-20 06:42:13 +01:00
Martin Diehl 0f45559271 store microstructure as integers 2020-03-20 06:24:41 +01:00
Martin Diehl 3caad0bdf4 store microstructure indices as integers 2020-03-20 06:00:42 +01:00
Martin Diehl 064dabe34b Polishing
- keep microstructure as integer
- avoid constant reshape
- IMPORTANT: random order has changed!
2020-03-20 00:50:42 +01:00
Martin Diehl 0556827f29 less error prone 2020-03-19 20:19:47 +01:00
Martin Diehl 27532cfa4e small fixes 2020-03-19 12:03:55 +01:00
Martin Diehl 0f677ac3ec not needed anymore
except for the deprecated vtk file format support, vtk_addData can do
the job
2020-03-19 11:38:46 +01:00
Martin Diehl 1fb975dedf suitable for pointCloud and grid.
does not work for old vtk file format, use python library directly in
this case
2020-03-19 11:37:33 +01:00
Martin Diehl f01af70357 using central functionality 2020-03-19 09:02:50 +01:00
Martin Diehl 0871111c11 consistent and correct number of leading zeros 2020-03-19 08:45:25 +01:00
Martin Diehl d6f74daf53 cleaning
no DADF5 anymore
2020-03-19 08:13:13 +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 c40e607e08 standard-conforming and nice labels 2020-03-18 20:49:39 +01:00
Martin Diehl ab84ac1c24 polishing of some tests 2020-03-18 14:11:31 +01:00
Martin Diehl b5a1295cb9 ASCIItable -> Table 2020-03-18 13:47:09 +01:00
Martin Diehl 1c75198af5 do not document the obvious 2020-03-18 13:44:39 +01:00
Martin Diehl 45e3b8f7c6 no brackets for reshape required 2020-03-17 12:25:44 +01:00
Martin Diehl 6a1354f80f typo 2020-03-17 11:57:36 +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 49caa77bbd new class, less code 2020-03-17 11:24:15 +01:00
Martin Diehl b65c3959f1 simplified 2020-03-17 11:10:02 +01:00
Martin Diehl f46d79ec87 simplified 2020-03-17 10:52:44 +01:00
Martin Diehl ba8eab646b clearer structure and faster 2020-03-17 10:39:33 +01:00
Martin Diehl 233642ed08 using library function 2020-03-17 10:16:53 +01:00
Martin Diehl a2b21abcba easier with zip 2020-03-17 09:52:13 +01:00
Martin Diehl 17e7b32b31 update to changes in Result class 2020-03-17 08:55:44 +01:00
Martin Diehl 1e1fb35e14 new class is easier to use 2020-03-17 08:40:03 +01:00
Martin Diehl 8e0a91f948 typo 2020-03-17 00:51:21 +01:00
Martin Diehl 0695cc1829 simplified 2020-03-16 22:50:09 +01:00
Martin Diehl d87d13087c unmaintained python2.7 scripts 2020-03-16 22:50:09 +01:00
Martin Diehl a1beb80b54 double precision for vtkPoints
simplifies migration to new class
2020-03-16 22:50:09 +01:00
Martin Diehl 5a90982d85 do not add vertices to point cloud 2020-03-16 22:50:09 +01:00
Martin Diehl 8798dd1af3 new names consistently used 2020-03-02 23:47:29 +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 48604292e2 Merge remote-tracking branch 'origin/development' into MiscImprovements 2020-02-25 17:33:39 +01:00
Martin Diehl 071dc6f4a5 adjusted to new signature 2020-02-21 18:50:30 +01:00
Martin Diehl 75280b9fb4 correct conversion for python3 2020-02-21 11:02:31 +01:00
Martin Diehl f6c921e811 Merge branch 'development' into DADF5_point_calculations-2 2020-02-21 07:56:19 +01:00
Martin Diehl bc1d356d21 fixing prospector complaints
'except Exception': not really nice, but shell scripts will be remove
soon anyway
2020-02-20 15:27:37 +01:00
Martin Diehl e93f5c84ff 'buffered' has no effect any more 2020-02-20 15:05:38 +01:00
Martin Diehl e3753e9444 use central functionality 2020-02-15 16:11:57 +01:00
Martin Diehl ff41061759 no bare 'except' 2020-01-28 23:39:46 +01:00
Martin Diehl ea560ee167 typo 2020-01-26 15:14:16 +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
Martin Diehl d66b05134d less code, faster execution 2020-01-15 14:09:26 +01:00
Martin Diehl e2802ca640 Table replaces ASCIItable 2020-01-15 06:37:53 +01:00
Martin Diehl ff60cf0b67 use new table class 2020-01-13 03:47:41 +01:00
Martin Diehl f9772a3df8 more descriptive name 2020-01-13 02:51:49 +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 d4535dadb4 use American english 2020-01-11 20:33:29 +01:00
Martin Diehl a3664bbde1 need to reverse F->C flip 2020-01-02 17:46:14 +01:00
Martin Diehl a87e396b83 bugfix: need to addData to vtk
not really sure why 'SetScalars' was used for color. 'AddArray' seems to
work. Also, there seems to be no difference between 'data' and 'tensor'
2020-01-02 11:31:33 +01:00
Martin Diehl 05b2c80430 migrating ASCIItable to Table class 2019-12-26 14:34:22 +01:00
Martin Diehl 9e94955626 wrong coordinates for non-cubical grids 2019-12-24 15:58:37 +01:00
Martin Diehl 264afe00f9 using central functionality 2019-12-23 19:06:08 +01:00
Martin Diehl 27d6b91f18 using central funtionality 2019-12-23 10:19:38 +01:00
Martin Diehl d26005960c do not rely on singular value decomposition 2019-12-23 09:52:42 +01:00
Martin Diehl 93bc66d19f same order as in mechanics 2019-12-23 09:33:14 +01:00
Martin Diehl 3c4c364107 bugfix:
wrong results when calculating multiple strain tensors. Introduced in cd6a4d1cfd
2019-12-23 07:01:34 +01:00
Martin Diehl 3ed9126845 also not needed 2019-12-23 06:35:22 +01:00
Martin Diehl 149e4d6d73 not needed 2019-12-23 05:51:41 +01:00
Martin Diehl db14baec41 using central functionality 2019-12-22 22:23:48 +01:00
Martin Diehl c3c08b5b53 using new class/unifying style 2019-12-22 16:16:04 +01:00
Martin Diehl 70cb1f0764 copy of addGridData W/O functionality for meshes 2019-12-22 16:01:39 +01:00
Martin Diehl 48c21045d7 centralized functionality for ang import 2019-12-22 14:57:57 +01:00
Martin Diehl cde6853a20 do not repeat code 2019-12-22 07:20:23 +01:00
Martin Diehl fe463515d0 following prospector advice 2019-12-22 07:07:34 +01:00
Martin Diehl 343da2e54d Table class instead of ASCIItable 2019-12-21 21:45:00 +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 b293498864 fixing prospector complaints 2019-12-21 18:20:25 +01:00
Martin Diehl da33ba17bc using central (and tested) functionality 2019-12-21 18:17:04 +01:00
Martin Diehl dd318c8d1d Table class replaces ASCIItable class 2019-12-21 15:51:58 +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 6114f5c325 inplace option does not exist anymore 2019-12-19 18:04:24 +01:00
Martin Diehl 7ccf836379 not needed for python-based workflow 2019-12-18 20:06:44 +01:00
Vitesh Shah 4469f2f8f0 More general regex 2019-12-18 10:14:19 +01:00
Vitesh Shah 186605610d No phase name for generic datasets 2019-12-13 09:53:47 +01:00
Martin Diehl c46c18de6f taking care of prospector complaints 2019-12-10 16:23:06 +01:00
Martin Diehl 82c741d6bb crystallite not needed anymore 2019-12-09 05:32:38 +01:00
Martin Diehl 1fcbc35611 untested python2.7 code
complicated code. Easier to re-implement from scratch if really needed
2019-12-09 05:25:22 +01:00
Martin Diehl 1955d09d3f modernizing 2019-12-08 22:35:58 +01:00
Martin Diehl 0bf22fd03c using central functionality 2019-12-08 22:35:39 +01:00
Martin Diehl 7dc128ad12 polishing 2019-12-08 18:33:43 +01:00
Martin Diehl 3d09a82f41 fixing prospector complaints 2019-12-08 18:22:05 +01:00
Martin Diehl 828e82605e ensure that data is correctly ordered 2019-12-08 18:13:45 +01:00
Martin Diehl 75e93d9f0c relying on central functionality improves readability 2019-12-08 15:56:15 +01:00
Martin Diehl f19694f734 starting to use central functionality 2019-12-08 11:20:47 +01:00
Martin Diehl 0292e8fcc7 preparing transition to Geom and Table classes 2019-12-08 11:11:02 +01:00
Martin Diehl 871ff4c218 use geom class 2019-12-08 09:31:56 +01:00
Martin Diehl 12564557e6 using central functionality 2019-12-08 09:18:15 +01:00
Martin Diehl b92cfbbd5b do not use bare except 2019-12-07 20:15:50 +01:00
Martin Diehl c6c77b64d2 following renames in grid_filter 2019-12-07 20:08:31 +01:00
Martin Diehl e283acd606 correct way of importing for newer python versions 2019-12-07 20:07:46 +01:00
Martin Diehl 0b04f6a3bb Merge branch 'development' into grid-filters 2019-12-07 10:52:00 +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
Philip Eisenlohr a41871e2ac Merge branch 'new-ASCII' into 'development'
New table class

See merge request damask/DAMASK!104
2019-12-06 14:58:16 +01:00
Martin Diehl f2ac87eb2f follow changes in Table class 2019-12-06 04:22:18 +01:00
Martin Diehl f475d1a0d0 adjusted to changes in table class 2019-12-05 13:35:06 +01:00
Martin Diehl 0eddd8a5c2 Merge branch 'new-ASCII' into grid-filters 2019-12-05 13:28:18 +01:00
Martin Diehl 90fdb24faa forgotten variable rename 2019-12-05 13:26:33 +01: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 53a38e3a97 polishing 2019-12-05 10:37:13 +01:00
Martin Diehl 3af696995d did not work when piping 2019-12-05 08:36:32 +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 19c55990ab works again and uses DADF5 intrisic features 2019-12-04 18:30:08 +01:00
Martin Diehl 999321e588 Merge branch 'new-ASCII' into grid-filters 2019-12-04 07:45:01 +01:00
Martin Diehl 58a190ede8 Merge branch 'development' into incs-no-leading-zero 2019-12-04 05:19:38 +01:00
Martin Diehl 9ad8743396 using central functionality 2019-12-03 22:00:21 +01:00
Martin Diehl ff1778d149 Merge branch 'development' into new-ASCII 2019-12-03 15:56:49 +01:00
Martin Diehl 62ca2952fc polishing 2019-12-03 11:27:14 +01:00
Martin Diehl e2b13a5ca3 using de-facto standard naming 2019-11-29 19:32:18 +01:00
Martin Diehl 9b4252da68 smart handling of leading zeros 2019-11-29 16:58:11 +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 4c4ccfe72e not needed 2019-11-28 06:27:19 +01:00
Martin Diehl a8016d64bb simplified 2019-11-27 12:31:32 +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 9ad74745c1 missing import detected by prospector 2019-11-27 08:48:41 +01:00
Martin Diehl ab83dc2ebc use central facilities 2019-11-27 08:45:01 +01:00
Martin Diehl eb033e11b2 polishing 2019-11-27 08:44:38 +01:00
Martin Diehl 31d3958ca6 using fast new Table class
more a proof-of-concept since shell scripts are deprecated. The detailed
error handling of the former scripts is not implemented, i.e. the user
need to ensure that the files exist and the data has the correct shape
2019-11-26 22:59:42 +01:00