Commit Graph

2549 Commits

Author SHA1 Message Date
Martin Diehl ab475b7c6b need 'error return'
revert from change in 5b72110d
2020-02-12 06:02:37 +01:00
Martin Diehl 08174a119f consistent name 2020-02-11 17:50:07 +01:00
Martin Diehl 5b72110d0a simplified 2020-02-11 17:47:48 +01:00
Martin Diehl e212f91fac print statements prevents reading code
first re-structure and clean, than re-implement where useful
2020-02-11 17:41:30 +01:00
Martin Diehl 6463fcdabd consistent names 2020-02-11 17:36:43 +01:00
Martin Diehl c2c84d698f Merge remote-tracking branch 'origin/development' into MiscImprovements 2020-02-11 17:11:43 +01:00
Franz Roters 81ae66860a Merge remote-tracking branch 'remotes/origin/explicitNonlocal' into development 2020-02-11 10:32:53 +01:00
Martin Diehl a306e473ef use rhoSgl0 (converged situation) 2020-02-11 05:41:10 +01:00
Martin Diehl cd76172d74 debugging PETSc 2020-02-08 09:17:44 +01:00
Martin Diehl 187b3603d3 using new names 2020-02-08 09:08:52 +01:00
Martin Diehl 8f2e345ab4 polishing 2020-02-08 08:19:06 +01:00
Martin Diehl 4c4c052e73 slowly getting newer PETSc versions to work 2020-02-08 07:03:18 +01:00
Martin Diehl 5456ee98f4 still needed (new section was created) 2020-02-08 06:59:37 +01:00
Martin Diehl 984370d7d1 not needed 2020-02-07 18:34:00 +01:00
Martin Diehl e932b386b9 Merge branch 'development' into MiscImprovements 2020-02-07 17:11:01 +01:00
Martin Diehl 5d4d1dcf9a all nonlocal parts are fully explicit
i.e. they are based on converged (partioned0) states
2020-02-07 12:41:01 +01:00
Martin Diehl f854dc27e9 explicit dotState for nonlocal
all flux related quantities are calculated based on the converged
quantities
2020-02-07 12:23:22 +01:00
Martin Diehl 4f4c6c5949 using converged dislocation velocity (from last subinc) 2020-02-07 12:01:54 +01:00
Martin Diehl c7e3ac28f6 preparing data handling for explicit forward of flux 2020-02-07 11:44:03 +01:00
Martin Diehl 1ceba73d31 adopting to PETSc >3.10
thanks to Matthew Knepley from the PETSc team
2020-02-07 09:10:08 +01:00
Martin Diehl 98e5713ce5 Merge branch 'development' into noAbaqus 2020-02-06 18:33:13 +01:00
Franz Roters 47109b903b Merge branch 'plasticity-submodule' into 'development'
Plasticity submodule

See merge request damask/DAMASK!120
2020-02-06 10:13:48 +01:00
Martin Diehl cab000f4b4 not used 2020-02-04 23:52:10 +01:00
Martin Diehl 13ce372684 not used 2020-02-04 23:45:34 +01:00
Martin Diehl 2d74a83dad cleaning 2020-02-03 23:48:09 +01:00
Martin Diehl 9e131c0110 rank 0 takes care of statistics file 2020-02-03 23:09:46 +01:00
Martin Diehl e9dad64f2b use central functionality 2020-02-03 23:01:08 +01:00
Martin Diehl 7bdfd05749 simplified 2020-02-03 22:44:57 +01:00
Martin Diehl c6579f8890 [skip ci] unified 2020-02-03 22:41:52 +01:00
Martin Diehl 1ad79883b4 not needed 2020-02-03 22:33:56 +01:00
Martin Diehl 0ce0bb2d85 better understandable 2020-02-03 21:39:00 +01:00
Martin Diehl 54589a9c56 crystallite does not exist any more 2020-02-02 20:37:05 +01:00
Martin Diehl 588525611b also report correctly negative seeds 2020-02-01 09:04:02 +01:00
Martin Diehl 796fd9a774 natural order 2020-01-31 21:43:45 +01:00
Martin Diehl 042d09a730 names from paper 2020-01-31 21:43:12 +01:00
Martin Diehl 55e53536f2 fixing indentation
always 2 spaces, not 1 for the first level
2020-01-31 21:37:18 +01:00
Martin Diehl 26496976c8 not used anymore 2020-01-31 21:19:15 +01:00
Martin Diehl 0d96c728fe better readable 2020-01-31 07:02:24 +01:00
Martin Diehl 3791c50468 better readable 2020-01-31 06:55:26 +01:00
Martin Diehl f5f397cb70 better readable 2020-01-31 06:52:11 +01:00
Martin Diehl 6ce4ce523a Merge branch 'MiscImprovements' of magit1.mpie.de:/damask/DAMASK into MiscImprovements 2020-01-31 00:13:25 +01:00
Martin Diehl 269d65005b use nomenclature from the DAMASK paper 2020-01-31 00:07:23 +01:00
Martin Diehl 0b8ff64884 store mapping MARC/FEM2DAMASK mapping
do not calculate the mapping for elements and nodes per call on
the fly, rather store it. Not memory efficient in the case that numbers
are not consequtive (order does not matter, but missing nodes/elements
would waste some 2 integers per missing number). However, this seem to cause
problems anyway when range indicators like '1 to 10' are used.
2020-01-30 23:39:59 +01:00
Martin Diehl d54b8714e1 avoid invalid error access 2020-01-29 23:42:50 +01:00
Martin Diehl c2cdcb17f7 wrong string 2020-01-29 23:04:15 +01:00
Martin Diehl 59fe9d06b0 shortening 2020-01-29 22:53:19 +01:00
Martin Diehl 9690f170e1 4 space indentation 2020-01-29 22:44:42 +01:00
Martin Diehl f5bd544b36 [skip ci] was too general 2020-01-29 18:15:49 +01:00
Martin Diehl 9c138c87f0 not needed 2020-01-29 14:57:12 +01:00
Martin Diehl 64be6a277d it's the surface, not the edge 2020-01-29 14:48:15 +01:00
Martin Diehl b938f1a98d polishing
* constants in CAPITALS
* more tests
* 'forall' is deprecated in Fortran 2018
2020-01-29 14:01:14 +01:00
Martin Diehl 348a91d503 Merge branch 'MiscImprovements' of magit1.mpie.de:/damask/DAMASK into MiscImprovements 2020-01-29 13:17:58 +01:00
Martin Diehl 3f96c12e06 avoid code duplication 2020-01-29 11:09:57 +01:00
Martin Diehl 49bfdcecab avoid accessing non-existing chunks
note that Fortran does not shortcut logical expressions, hence the new
function
2020-01-29 09:13:55 +01:00
Martin Diehl b8263519ca ignore empty lines 2020-01-29 08:00:28 +01:00
Martin Diehl 7b0850f929 only read relevant lines 2020-01-29 00:10:05 +01:00
Martin Diehl 57db134c6d polishing 2020-01-28 23:44:07 +01:00
Martin Diehl 5d1f68bf93 Merge branch 'fix-elem-7-57' into noAbaqus 2020-01-27 19:27:53 +01:00
Martin Diehl 6636f56cab Merge remote-tracking branch 'origin/development' into fix-elem-7-57 2020-01-27 19:23:35 +01:00
Martin Diehl fb5e57aa1a WIP: implementing static map for Marc->DAMASK (elem/nodes) 2020-01-26 23:12:48 +01:00
Martin Diehl d2a3fd3ac8 not needed to parse in nElem 2020-01-26 22:51:06 +01:00
Martin Diehl f044b8c42f explain data layout 2020-01-26 21:58:36 +01:00
Martin Diehl 0a1bac6787 flush helps to detect errors 2020-01-26 21:50:43 +01:00
Martin Diehl f546ffb3be polishing 2020-01-26 21:22:55 +01:00
Martin Diehl 79aeea052f does not exist anymore (is not needed) 2020-01-26 21:07:21 +01:00
Martin Diehl f8c5dbea71 typo (MSC.Marc did not compile) 2020-01-26 21:02:32 +01:00
Martin Diehl cda1f4acab more tests
failed unitTests report consistently with "internal error"
2020-01-26 20:53:13 +01:00
Martin Diehl a4134b4552 doing some internal checks
trivial, but better safe then sorry
2020-01-26 20:24:09 +01:00
Martin Diehl 830b05005f read file only once 2020-01-26 19:56:30 +01:00
Martin Diehl 62865e779d polishing 2020-01-26 18:31:56 +01:00
Martin Diehl a6e979ae1f simplified parsing of strings, floats, and ints
invalid characters for interpretation as float and int now raise error,
no warning
requesting invalid chunk now raises error, no warning
2020-01-26 18:23:23 +01:00
Martin Diehl 0eba4e39cc trying to make the whole procedure understandable 2020-01-26 14:18:16 +01:00
Martin Diehl 81fba131f6 variable string length 2020-01-26 13:28:12 +01:00
Martin Diehl decf9371ea avoid issues with unsufficient length of strings 2020-01-26 13:18:29 +01:00
Martin Diehl 3b8dd17e5b avoiding hard-coded constants 2020-01-26 12:25:45 +01:00
Martin Diehl fe22b84d5c maximum path length is 4096 2020-01-26 12:19:36 +01:00
Martin Diehl 9c7f6811a2 use default string length 2020-01-26 12:17:59 +01:00
Martin Diehl 1be37de993 not used (defaults are given in the respective modules) 2020-01-26 11:46:14 +01:00
Martin Diehl 24a8d7ed29 256 (pStringLen) might not be sufficient for file operations 2020-01-26 11:40:25 +01:00
Martin Diehl 9a0d8db23e [skip ci] replacement is done 2020-01-26 10:53:24 +01:00
Martin Diehl ffea69955e polishing and testing
element 11/12 (7/57 for MSC.Marc) have the same geometry type, i.e. both
are a hexahedral with 8 integration points/cells
Type 11 is linear (8 nodes), type 12 quadradic with reduced integration (20 nodes).
The modified definition ensures that the cell nodes 9-20 of element 11
are in the same order as the real nodes 9-20 of element 12. Real nodes
1-8 (corners) and 21-27 needed no modification.

Notes:
 * Documentation on https://damask.mpie.de/Documentation/ElementType is now outdated.
 * Element defition in MSC.Marc manual volume B (2001 version) is
   confusing because element numbering is sometimes clowise and
   sometimes counterclockwise. The latter one seems to be correct
2020-01-26 09:24:32 +01:00
Martin Diehl b16f4155d4 cell definition follows correct order for 11/12 (7/57 in MSC.Marc) 2020-01-26 09:06:45 +01:00
Martin Diehl 7671e257bd reorder elem 11 (Marc 7) to match 12 (Marc 57) 2020-01-26 08:17:59 +01:00
Martin Diehl 2100742a31 better have no support then untested support 2020-01-26 08:17:25 +01:00
Martin Diehl 13107abd39 not working and significat efforts needed to test it 2020-01-26 07:44:22 +01:00
Martin Diehl 8a2a9d3861 avoid direct file operations 2020-01-25 13:30:42 +01:00
Martin Diehl a2e4160e61 read file only once 2020-01-25 10:58:04 +01:00
Martin Diehl ddeebc189a [skip ci] documenting further use 2020-01-25 09:31:27 +01:00
Martin Diehl e532641015 dependency on element not needed for homogeneous meshes 2020-01-25 09:24:42 +01:00
Martin Diehl 624ede8177 clear separation between solver and DAMASK 2020-01-25 09:12:09 +01:00
Martin Diehl bdae2a40cc independent of IO 2020-01-25 08:56:39 +01:00
Martin Diehl bfe8585903 Merge branch 'development' into MiscImprovements 2020-01-24 20:08:14 +01:00
Martin Diehl 5fae924e88 Merge branch 'MiscImprovements' of magit1.mpie.de:/damask/DAMASK into MiscImprovements 2020-01-24 19:58:57 +01:00
Sharan Roongta 3d6ec6955f Merge branch 'PGI-support' into development 2020-01-24 12:24:38 +01:00
Martin Diehl b807406a70 avoid public variables 2020-01-23 14:08:14 +01:00
Martin Diehl f0ad18102d preparing to clean FEsolving
should not have solver dependent functionality
2020-01-23 13:49:12 +01:00
Martin Diehl bd67d2bb6a new mappings have clear name, not (1,2) 2020-01-23 13:16:45 +01:00
Martin Diehl 7f66d4e975 avoid fixed string length
solved issues with wrong trim and is more robust
2020-01-23 11:21:42 +01:00
Martin Diehl 7273f1461c avoid fixed string length where possible 2020-01-23 09:35:41 +01:00
Martin Diehl 1bfd8a8c21 continuousIntValues is very specific for Marc
define where it is used
2020-01-23 08:37:03 +01:00