Commit Graph

791 Commits

Author SHA1 Message Date
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 02dde3c255 test also invalid operations 2020-04-20 13:10:13 +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 59b0a6e825 tuples not needed/avoid eval 2020-04-10 13:07:05 +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 2a063b3bb5 relaxed tolerance not needed 2020-04-08 20:23:05 +02:00
Martin Diehl 59e0041fd7 more scatter, slightly reduced tolerance 2020-04-08 19:30:50 +02:00
Martin Diehl 3cd8f3d9a0 testing special orientations with scatter 2020-04-08 18:38:57 +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 10d5b2e791 testing some special cases 2020-04-08 13:41:46 +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 01818cba80 tuples not needed for single arguments 2020-03-31 12:44:39 +02:00
Martin Diehl 6ef7410e5a testing VTK wrappers 2020-03-31 11:04:06 +02:00
Martin Diehl 2f52165e0a for test coverage reports using pytest 2020-03-30 22:14:45 +02:00
Martin Diehl 396d428af7 bugfix: works for all cuboids, not just cubes 2020-03-29 23:09:43 +02:00
Martin Diehl e334674a06 test bycristal tessellation 2020-03-29 20:28:54 +02:00
Martin Diehl 9c90aa5acb polishing 2020-03-29 20:07:09 +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 bb90539f7c only ignore temporary files in the respective folders 2020-03-16 22:50:09 +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 c360785217 single source of truth 2020-03-03 08:04:14 +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 a6279c8284 use separate test definitions per class 2020-02-22 00:03:54 +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