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
6f467ea14e
Marc with optimization works if offloading to accelerators is disabled
2020-01-29 11:05:35 +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
ff41061759
no bare 'except'
2020-01-28 23:39:46 +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
Test User
8344e23c65
[skip ci] updated version information after successful test of v2.0.3-1601-gc433e244
2020-01-27 16:54:01 +01:00
Vitesh Shah
c433e2448a
Merge branch 'MiscImprovements' into development
2020-01-27 14:30:50 +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
ea560ee167
typo
2020-01-26 15:14:16 +01:00
Martin Diehl
7e9ce183a4
better readable
2020-01-26 15:10:27 +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
ed9347e9bd
more robust:
...
* split(maxsplit=1) will raise ValueError if split into two strings is not
possible
* int('a') will raise ValueError if 'a' cannot be interpreted as an
integer
2020-01-26 10:34:30 +01:00
Martin Diehl
6fed655500
fix for new style and test
2020-01-26 10:17:27 +01:00
Martin Diehl
7f92418fc4
shapes should also match
2020-01-26 10:01:00 +01:00
Martin Diehl
e6cf75ca79
current status of PRIVATE
2020-01-26 09:41:41 +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
3232e04171
ensure correct connectivity for MSC.Marc
2020-01-25 16:29: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