Commit Graph

1621 Commits

Author SHA1 Message Date
Philip Eisenlohr cfb2770b93 merged and added correction to FreeSurface.config example 2019-02-26 13:56:49 -05:00
Philip Eisenlohr cb9543dff7 more elaborate debug labelling 2019-02-26 13:47:46 -05:00
Martin Diehl 56e2c1264b Merge branch 'development' into New-Thermal 2019-02-26 07:54:45 +01:00
Martin Diehl 6fab99bca5 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2019-02-25 20:10:38 +01:00
Martin Diehl d83847446d Merge branch '32_NewStyleNonlocal-4' into development 2019-02-25 20:06:20 +01:00
Martin Diehl 7115382729 not used anymore 2019-02-24 10:08:09 +01:00
Martin Diehl 7903e2b65f dependencies got mixed up 2019-02-23 11:31:53 +01:00
Martin Diehl 93ae5cbd07 Merge remote-tracking branch 'origin/development' into 10-consistent-orientation-conversions-3 2019-02-22 23:05:36 +01:00
Martin Diehl b1bb68d523 cleaning 2019-02-22 21:07:00 +01:00
Martin Diehl ad0ed4fdec bugfix: wrong state was allocated 2019-02-22 21:06:37 +01:00
Martin Diehl 194824fd0f WIP: cleaned
no file reading
getting rid of a number of obsolete dependencies
2019-02-22 20:37:41 +01:00
Martin Diehl e7268ce109 simpler structure:
- do not read file
- use function for allocation
- do not constantly convert (3,3) <-> (6)
2019-02-22 15:37:42 +01:00
Martin Diehl af4ea76006 using central allocation facilities 2019-02-22 15:21:48 +01:00
Martin Diehl aa2bd4fc4c Merge branch 'development' into New-Thermal 2019-02-22 10:17:34 +01:00
Martin Diehl db9016d146 avoid repeated loops 2019-02-22 10:02:43 +01:00
Martin Diehl 4d45038358 better readable 2019-02-22 09:21:04 +01:00
Martin Diehl 5e369aa220 avoid use of new variables in deprecated code 2019-02-22 08:32:12 +01:00
Martin Diehl beb73c7882 not needed 2019-02-22 07:37:08 +01:00
Martin Diehl da8a1d5973 leaner interface 2019-02-21 21:32:22 +01:00
Martin Diehl 6938864c4b pointers allow easier access to state variables 2019-02-21 20:37:49 +01:00
Martin Diehl d686384d17 let lattice.f90 do the job 2019-02-21 19:18:06 +01:00
Martin Diehl 21d0ef2fb5 use microstructure/dependent state
introduced only partly, otherwise the uncommon calling sequence in nonlocal leads
to a change in behavior
2019-02-21 05:55:03 +01:00
Martin Diehl cb2d2b02dc re-ordered and cleaned 2019-02-21 00:24:35 +01:00
Martin Diehl 3fa699ad22 indices were mixed up 2019-02-20 20:17:55 +01:00
Martin Diehl 2d51c0595b don't parse material.config any more 2019-02-20 19:03:20 +01:00
Martin Diehl 6f135ea632 no random-multiplication anymore
from our current understanding, the implementation of random nucleation
was strongly dependent on the numerical method and the time stepping
2019-02-20 17:58:11 +01:00
Martin Diehl 871ba90654 initialization can be done internally 2019-02-20 17:50:26 +01:00
Martin Diehl eb394b3139 same name in all models 2019-02-20 14:54:26 +01:00
Martin Diehl 838faca819 using structure for output
avoids waste of memory in case of multiple instances
avoids explicit dependence on ip and el
2019-02-20 13:32:08 +01:00
Martin Diehl e6e019e48a transition to param structure 2019-02-20 09:13:50 +01:00
Martin Diehl d29b37f517 provide slip system components as functions 2019-02-20 07:53:34 +01:00
Martin Diehl a896ed91f8 simplified/not needed 2019-02-20 07:33:19 +01:00
Martin Diehl d0b0e3be3b simplified 2019-02-20 00:41:44 +01:00
Martin Diehl 649750a1c9 let lattice to the work 2019-02-19 23:55:59 +01:00
Martin Diehl e8ac2d0d97 limiting inter-module dependencies 2019-02-19 10:47:12 +01:00
Martin Diehl 41899f6d33 using more parameters from smart structure 2019-02-19 10:31:14 +01:00
Martin Diehl 6bcd4a77d2 complex pointer structure for state 2019-02-19 09:43:48 +01:00
Martin Diehl 1a5711e246 using more parameters from parameter structure 2019-02-18 22:55:31 +01:00
Martin Diehl ae9d8e4e8d cleaning 2019-02-18 10:28:08 +01:00
Martin Diehl 435dce220c move stress conversion one level up
should be totally avoided
2019-02-18 07:24:56 +01:00
Martin Diehl 8a30441a52 Merge branch 'development' into 32_NewStyleNonlocal-3 2019-02-18 07:14:11 +01:00
Martin Diehl 690fef6f06 avoid publicly avaialbe data, rather provide setters and getters 2019-02-17 20:38:57 +01:00
Martin Diehl 44e41465d0 use functions from lattice to calculate slip systems
don't rely on internal coding for collinear systems
2019-02-17 17:56:01 +01:00
Martin Diehl c4b3ac3afb slip system definition for bcc still needed 2019-02-17 17:04:26 +01:00
Martin Diehl d3e6430b94 only used internally 2019-02-17 14:30:58 +01:00
Martin Diehl 553b1c7743 stress tensor was accidentally still converted 2019-02-17 13:16:00 +01:00
Martin Diehl 7ad866b90f not needed any more 2019-02-17 12:16:12 +01:00
Martin Diehl cf32e7d1f5 use parameter structure and avoid conversion 33<->6 2019-02-17 12:15:46 +01:00
Franz Roters 530f4f2804 Merge branch 'New-Damage' into 'development'
New damage

See merge request damask/DAMASK!59
2019-02-17 10:09:46 +01:00
Franz Roters db9d5c898a [skip ci] typo 2019-02-17 10:08:02 +01:00
Martin Diehl 0f319e2cf6 fixed state size and output size 2019-02-16 23:18:53 +01:00
Martin Diehl c7abe55944 was not needed 2019-02-16 22:09:06 +01:00
Martin Diehl 2584f85760 parameters are stored in parameter structure 2019-02-16 18:38:13 +01:00
Martin Diehl 0ba8ebff1e Merge remote-tracking branch 'origin/development' into 32_NewStyleNonlocal-3 2019-02-16 18:12:38 +01:00
Martin Diehl 63e2ea7d8f was not use (anymore) 2019-02-16 12:49:28 +01:00
Martin Diehl 77d60be127 avoid superfluous reporting 2019-02-16 11:30:56 +01:00
Martin Diehl efe9823e62 clearer logic for preprocessor statements 2019-02-16 10:43:02 +01:00
Martin Diehl af83427e8c Merge branch 'development' into 53-separate-mesh-for-different-solvers-3 2019-02-16 10:25:42 +01:00
Martin Diehl 61032b5fd8 wrong jump position
probably a copy and paste error
2019-02-16 10:24:12 +01:00
Martin Diehl 9a3921ea84 ifdef statements grouped together
unless they belong to a group of functions, like opening files or
interpreting lines
2019-02-16 10:20:53 +01:00
Martin Diehl 0fd5476883 doxygen interprets comment as doc string 2019-02-16 06:42:08 +01:00
Martin Diehl afdaac47af avoid disturbing reporting 2019-02-15 22:54:38 +01:00
Martin Diehl d78bf18483 simplified output 2019-02-15 07:25:25 +01:00
Martin Diehl 1567b0ee94 was not used 2019-02-15 07:03:52 +01:00
Martin Diehl bc0bc06aea polishing 2019-02-13 10:16:06 +01:00
Martin Diehl 5b0cdf294d delta state is needed
not sure if the offset handling is correct
2019-02-13 10:11:25 +01:00
Martin Diehl dc6f18c3f8 cleaning 2019-02-13 10:03:28 +01:00
Martin Diehl d366651873 file reading not required anymore 2019-02-13 09:57:12 +01:00
Martin Diehl 47a9d88a15 read vector-parameters 2019-02-13 09:19:37 +01:00
Martin Diehl 3ca34c8f80 simplified 2019-02-13 09:09:30 +01:00
Martin Diehl a421525d15 preparing storage of output parameters 2019-02-13 08:06:22 +01:00
Martin Diehl f34c10a477 sdot_0 already available as parameter 2019-02-13 07:36:36 +01:00
Martin Diehl b3e705e628 polishing, fixed typo 2019-02-13 07:34:16 +01:00
Martin Diehl aa8d218ce7 was never used 2019-02-13 07:28:28 +01:00
Martin Diehl 6a0d739d48 use parameters from param structure 2019-02-13 07:24:48 +01:00
Martin Diehl 61baa66c38 avoid code duplication 2019-02-13 07:22:37 +01:00
Martin Diehl 9574dfae2d avoiding repeated reading of material.config 2019-02-13 07:04:13 +01:00
Martin Diehl 55cef533f1 conversion 3x3-matrix <-> 6-vector not helpful 2019-02-13 00:00:07 +01:00
Martin Diehl 01fe7a9731 Merge branch 'development' into New-Damage 2019-02-12 23:37:39 +01:00
Martin Diehl c9fc7ea982 cleaning
trying to find logic with less dependencies on the various
mappings
2019-02-12 23:35:22 +01:00
Martin Diehl 69d53ed869 determining output size was overly complicated
general cleaning
2019-02-12 23:20:24 +01:00
Martin Diehl be7f740e65 Merge branch 'development' into New-Thermal 2019-02-12 22:52:21 +01:00
Arko Jyoti Bhattacharjee 1a471bcd8a signal handling implemented
allows to trigger action in running simulation, i.e. writing restart or results
2019-02-11 18:46:14 +01:00
Martin Diehl 87f3e3f621 more flexible and user friendly 2019-02-11 10:08:34 +01:00
Martin Diehl af28e9cdd9 not needed anymore 2019-02-09 17:23:56 +01:00
Martin Diehl c4eef520fc initialize all variables 2019-02-09 17:21:11 +01:00
Martin Diehl 09859f1b12 wrong variable rename (was forgotten) 2019-02-09 16:53:05 +01:00
Martin Diehl de26e41684 some first steps to support debugging with the PGI compiler
norm2 and sum for initialization are not supported yet, need fixes
2019-02-09 15:02:07 +00:00
Martin Diehl 8167f09ec6 using functions as far as possible 2019-02-09 12:01:31 +01:00
Martin Diehl 5d9c3fcf27 finalize for write 2019-02-09 09:44:41 +01:00
Martin Diehl 73749dd788 merged also finalization 2019-02-09 09:38:49 +01:00
Martin Diehl d934f2b141 also modularize write 2019-02-09 09:03:31 +01:00
Martin Diehl c668260c37 avoiding code duplication 2019-02-09 08:05:29 +01:00
Martin Diehl 36662f8419 more generic formulation (works for all dimensions) 2019-02-09 07:50:33 +01:00
Martin Diehl 542ab946cc [skip ci] not needed 2019-02-04 19:05:02 +01:00
Martin Diehl 3f61c97ded don't support non-DAMASK materials 2019-02-04 18:58:36 +01:00
Martin Diehl 453f4556e5 bracket was missing 2019-02-04 00:12:27 +01:00
Martin Diehl 5320803842 bugfix: valid range for unit quaternion range is [-1,+1] 2019-02-04 00:06:38 +01:00
Martin Diehl a57aa7985a wrong name 2019-02-03 18:11:16 +01:00
Martin Diehl 59dd9b16e1 cleaning 2019-02-03 16:40:15 +01:00
Martin Diehl b0b1ea3b84 input argument not needed any more 2019-02-03 14:23:32 +01:00
Martin Diehl ec23fca057 it's a property of the element, not of the mesh 2019-02-03 14:22:06 +01:00
Martin Diehl 2d0c74d7d9 implicit dependencies made explicit 2019-02-03 14:22:06 +01:00
Martin Diehl 2aba6faf40 cleaning and making dependencies clear 2019-02-03 14:22:06 +01:00
Martin Diehl 91992debf2 Marc now works also with the module
reason, why it did NOT work earlier still not clear
2019-02-03 13:30:04 +01:00
Martin Diehl b9f93d5460 is now a subfunction 2019-02-03 11:22:23 +01:00
Martin Diehl d605adc92e avoid the use of global variables to make dependencies clear 2019-02-03 11:12:23 +01:00
Martin Diehl f45ba0ff5b functions specific for MSC.Marc and/or Abaqus
these functions are very specific for the input files and might be
better located in the respective mesh module
2019-02-03 08:27:20 +01:00
Martin Diehl 2c7553653b only used by MSC.Marc 2019-02-03 08:11:19 +01:00
Martin Diehl 40ad1aef2f was not used 2019-02-03 08:07:58 +01:00
Martin Diehl a92937a7e3 grid does reading in of geometry independently 2019-02-03 08:06:53 +01:00
Martin Diehl 1eb30f3ae7 re-ordered according to calling sequence 2019-02-02 20:49:15 +01:00
Martin Diehl bb135463c4 using data from theMesh instead of local variables 2019-02-02 20:45:19 +01:00
Martin Diehl 35c37ef9dc forgotten format specifier 2019-02-02 17:39:31 +01:00
Martin Diehl abedb5c3db ordered according to calling sequence 2019-02-02 17:24:18 +01:00
Martin Diehl 16cb9ebed9 no need to read homogenization info extra
but currently, it is not very elegant
2019-02-02 17:24:18 +01:00
Martin Diehl d51a379376 avoid jump labels 2019-02-02 17:24:18 +01:00
Martin Diehl 819ec40b44 clearer order:
1) parse file
2) set up element
3) set up mesh
2019-02-02 17:24:18 +01:00
Martin Diehl 07cca77fce left over jump marks 2019-02-02 17:19:12 +01:00
Martin Diehl 3edbfc1cb5 bugfix:
infinite loop for geom file without new line at end
also, a lot of cleaning
2019-02-02 15:10:35 +01:00
Martin Diehl 933136ec1e nNodes form element is used already 2019-02-02 13:10:21 +01:00
Martin Diehl b514bf78a5 avoiding duplicated variables 2019-02-02 12:31:07 +01:00
Martin Diehl 4f2a3d7f55 unused variables 2019-02-02 12:23:53 +01:00
Martin Diehl dcd16dda70 variables from mesh object 2019-02-02 12:15:05 +01:00
Martin Diehl 326cbd0398 Merge branch 'development' into 53-separate-mesh-for-different-solvers-3 2019-02-02 11:52:06 +01:00
Martin Diehl 8962635136 use new elem/mesh variables 2019-02-02 11:50:07 +01:00
Martin Diehl 94a24e45ee bugfixes:
theMesh%Nelems need to be set (using an intermediate function until a
routine does that)
spectral.geom file can have "N+n to N" (backwards counting)
2019-02-02 11:46:38 +01:00
Martin Diehl 3a5a50cb03 use variables from theMesh 2019-02-02 10:53:55 +01:00
Martin Diehl 7a8d98d135 using theMesh (object oriented mesh description) 2019-02-02 10:35:10 +01:00
Martin Diehl f0b5b9fd59 unused variable 2019-02-02 10:34:38 +01:00
Martin Diehl e17278a926 using new mesh structure (initial test) 2019-02-02 10:11:18 +01:00
Martin Diehl 9975048f29 better avoid jump marks: Abaqus, Part 2 2019-02-02 09:56:11 +01:00
Martin Diehl 5810dce618 better avoid jump marks 2019-02-02 09:29:58 +01:00
Martin Diehl 4a28284058 only parse geom file once 2019-02-02 09:18:01 +01:00
Martin Diehl 3d750e7933 overwriting of init did not work 2019-02-01 21:56:38 +01:00
Martin Diehl 9a4e9e62b6 using new rotation class 2019-02-01 20:28:51 +01:00
Martin Diehl 08009079ff avoiding numerical errors (if quaternion norm is > 1.)
use consistently "self" instead of "this"
function for misorientation
2019-02-01 20:27:29 +01:00
Martin Diehl feb87c7db8 same name as in the python module 2019-02-01 19:09:17 +01:00
Martin Diehl 407f94082f no need for orientation class at the moment
implement only if we need symmetry aware operations
2019-02-01 16:52:42 +01:00
Martin Diehl 8e0556fe3e [skip ci] nicer reporting 2019-02-01 12:43:14 +01:00
Martin Diehl 614a8d694c re-implement mesh reporting later on in mesh_base 2019-02-01 12:28:18 +01:00
Martin Diehl 5f8b110f63 initialize mesh and element 2019-02-01 12:24:23 +01:00
Martin Diehl b87a09a466 not needed 2019-02-01 11:22:06 +01:00
Martin Diehl 06f67ce500 orientations module was not compiled but is needed now 2019-02-01 10:24:10 +01:00
Martin Diehl 11a509970b some comments 2019-02-01 10:17:20 +01:00
Martin Diehl 9d25d677e6 using new orientation class
not sure if transpose is needed for initialization
2019-02-01 10:11:46 +01:00
Martin Diehl 53a95ea84f cleaned and documented 2019-02-01 10:01:54 +01:00
Martin Diehl 17a682e883 P/epsijk parameter has nothing to do with precision 2019-02-01 08:53:57 +01:00
Martin Diehl 8a2689da0a documentation was for a lot of things that are not in here
setting constants without truncation
2019-02-01 08:52:38 +01:00
Martin Diehl a260bd2d2b Merge branch 'development' into 10-consistent-orientation-conversions 2019-02-01 07:33:52 +01:00
Martin Diehl 721af0a9a9 plastic_nonlocal still has confusing state handling 2019-02-01 07:06:19 +01:00
Martin Diehl b9c834f86a missing use from IO 2019-01-31 17:01:26 +01:00
Martin Diehl ccb320fa6e central function for less depencies 2019-01-31 14:00:26 +01:00
Martin Diehl a3e61c82dc Merge branch 'development' into 32_NewStyleNonlocal-3 2019-01-31 12:42:35 +01:00
Martin Diehl bcd9908a88 all variables/functions were not used 2019-01-31 12:23:23 +01:00
Martin Diehl fbd8912237 Merge branch 'development' into 53-separate-mesh-for-different-solvers-3 2019-01-31 11:41:45 +01:00
Martin Diehl 6b66563be7 Merge branch '46-simplification-of-crystallite-f90-NEW5' into development 2019-01-31 11:40:23 +01:00
Martin Diehl 615b166992 removed unused stuff 2019-01-31 11:39:28 +01:00
Martin Diehl beb0ca01eb define functions where needed
only use solver specific element names
2019-01-31 11:29:56 +01:00
Martin Diehl aabd98bee9 no need to repeat the same code 2019-01-31 09:14:02 +01:00
Martin Diehl cbeb3dcff0 use the same formulation for convergence every where 2019-01-31 09:12:44 +01:00
Martin Diehl 5eaeb37ea4 just polishing 2019-01-31 06:04:49 +01:00
Martin Diehl 3b13a1af63 calculated convergence criteria wrongly 2019-01-30 17:04:58 +01:00
Martin Diehl e1c2747393 logic error for nonlocal 2019-01-30 16:06:14 +01:00
Martin Diehl fe88e5bf9c [skip ci] cleaning 2019-01-30 14:52:12 +01:00
Martin Diehl 1d88057ce4 avoid superflous variables 2019-01-30 13:24:35 +01:00
Martin Diehl 64b89484d2 logic better visible 2019-01-30 13:19:05 +01:00
Martin Diehl 39e766bba0 improved readability 2019-01-30 12:36:02 +01:00
Martin Diehl 3dd21177a0 no need to store relative residual pointwise 2019-01-30 11:28:41 +01:00
Martin Diehl fd069a96cd unifying name 2019-01-30 10:51:24 +01:00
Martin Diehl 4ec0fd70a2 only one variable needed 2019-01-30 10:48:59 +01:00
Martin Diehl 0876787e3c avoid loops 2019-01-30 10:46:53 +01:00
Martin Diehl 72c4f2b25f same names everywhere if possible 2019-01-30 10:37:18 +01:00
Martin Diehl 0745d7ebc2 convergence flag is set only later 2019-01-30 10:33:57 +01:00
Martin Diehl 46be595ea8 no need to store relative residual for all points 2019-01-30 10:28:47 +01:00
Martin Diehl 31906e3ebd no need for 2 loops 2019-01-30 09:21:50 +01:00
Martin Diehl df6ec59f76 use "s" for source 2019-01-30 09:21:50 +01:00
Martin Diehl ca7c105f36 only one loop needed 2019-01-30 09:21:50 +01:00
Martin Diehl 462b1b7c18 sorted according to importance 2019-01-30 06:47:36 +01:00
Martin Diehl 5908e3fd34 wrong tolerance selection 2019-01-30 06:44:26 +01:00
Martin Diehl 370b23d5da Merge branch '46-simplification-of-crystallite-f90-NEW5' into development 2019-01-30 06:29:41 +01:00
Martin Diehl 77f1f45c23 just figured out that RK4 integrator is totally broken
readable code helps ;)
2019-01-30 00:17:04 +01:00
Martin Diehl a09036ff48 on-the-fly initialization 2019-01-30 00:11:10 +01:00
Martin Diehl 1a66f976b7 common variable name 2019-01-30 00:01:40 +01:00
Martin Diehl 6a3dac1df2 still improving readability 2019-01-29 23:45:41 +01:00
Martin Diehl bdd193fbd7 now readable (kind of) 2019-01-29 23:31:26 +01:00
Martin Diehl eade54a68f consistent variable names 2019-01-29 23:04:50 +01:00
Martin Diehl 1408d66c0c s is used for source 2019-01-29 23:02:59 +01:00
Martin Diehl 0be05b3ee1 one variable is enough 2019-01-29 22:46:21 +01:00
Martin Diehl b4afc303be clearer logic 2019-01-29 22:40:18 +01:00
Martin Diehl 73f39136c4 taking over from old branch 2019-01-29 22:19:38 +01:00
Martin Diehl 38d8e429ff layout adjustments 2019-01-29 22:07:31 +01:00
Philip Eisenlohr 27b034eb76 fixed bug in recursiveRead that failed to properly {include} in the last line of a file 2019-01-29 12:32:11 -05:00
Martin Diehl 066c598203 wrong dot product in state damper 2019-01-29 10:52:00 +01:00
Martin Diehl 34f3c15552 no need for temp variables 2019-01-29 07:24:06 +01:00
Martin Diehl 41832fb554 no need for two variables
only resulted in confusing code
2019-01-29 07:24:06 +01:00
Martin Diehl a24d8b86bf convergence of plastic state can be done earlier 2019-01-29 07:24:06 +01:00
Martin Diehl 4a69032637 better readable 2019-01-29 07:24:06 +01:00
Martin Diehl 1e4da6fbdb nonlocal convergence check in function 2019-01-29 07:24:06 +01:00
Martin Diehl 3fdf8e19bb further simplifications 2019-01-29 07:24:06 +01:00