3791c50468
better readable
2020-01-31 06:55:26 +01:00
f5f397cb70
better readable
2020-01-31 06:52:11 +01:00
6ce4ce523a
Merge branch 'MiscImprovements' of magit1.mpie.de:/damask/DAMASK into MiscImprovements
2020-01-31 00:13:25 +01:00
269d65005b
use nomenclature from the DAMASK paper
2020-01-31 00:07:23 +01:00
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
d54b8714e1
avoid invalid error access
2020-01-29 23:42:50 +01:00
c2cdcb17f7
wrong string
2020-01-29 23:04:15 +01:00
59fe9d06b0
shortening
2020-01-29 22:53:19 +01:00
9690f170e1
4 space indentation
2020-01-29 22:44:42 +01:00
f5bd544b36
[skip ci] was too general
2020-01-29 18:15:49 +01:00
9c138c87f0
not needed
2020-01-29 14:57:12 +01:00
64be6a277d
it's the surface, not the edge
2020-01-29 14:48:15 +01:00
b938f1a98d
polishing
...
* constants in CAPITALS
* more tests
* 'forall' is deprecated in Fortran 2018
2020-01-29 14:01:14 +01:00
348a91d503
Merge branch 'MiscImprovements' of magit1.mpie.de:/damask/DAMASK into MiscImprovements
2020-01-29 13:17:58 +01:00
3f96c12e06
avoid code duplication
2020-01-29 11:09:57 +01:00
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
b8263519ca
ignore empty lines
2020-01-29 08:00:28 +01:00
7b0850f929
only read relevant lines
2020-01-29 00:10:05 +01:00
57db134c6d
polishing
2020-01-28 23:44:07 +01:00
5d1f68bf93
Merge branch 'fix-elem-7-57' into noAbaqus
2020-01-27 19:27:53 +01:00
6636f56cab
Merge remote-tracking branch 'origin/development' into fix-elem-7-57
2020-01-27 19:23:35 +01:00
fb5e57aa1a
WIP: implementing static map for Marc->DAMASK (elem/nodes)
2020-01-26 23:12:48 +01:00
d2a3fd3ac8
not needed to parse in nElem
2020-01-26 22:51:06 +01:00
f044b8c42f
explain data layout
2020-01-26 21:58:36 +01:00
0a1bac6787
flush helps to detect errors
2020-01-26 21:50:43 +01:00
f546ffb3be
polishing
2020-01-26 21:22:55 +01:00
79aeea052f
does not exist anymore (is not needed)
2020-01-26 21:07:21 +01:00
f8c5dbea71
typo (MSC.Marc did not compile)
2020-01-26 21:02:32 +01:00
cda1f4acab
more tests
...
failed unitTests report consistently with "internal error"
2020-01-26 20:53:13 +01:00
a4134b4552
doing some internal checks
...
trivial, but better safe then sorry
2020-01-26 20:24:09 +01:00
830b05005f
read file only once
2020-01-26 19:56:30 +01:00
62865e779d
polishing
2020-01-26 18:31:56 +01:00
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
0eba4e39cc
trying to make the whole procedure understandable
2020-01-26 14:18:16 +01:00
81fba131f6
variable string length
2020-01-26 13:28:12 +01:00
decf9371ea
avoid issues with unsufficient length of strings
2020-01-26 13:18:29 +01:00
3b8dd17e5b
avoiding hard-coded constants
2020-01-26 12:25:45 +01:00
fe22b84d5c
maximum path length is 4096
2020-01-26 12:19:36 +01:00
9c7f6811a2
use default string length
2020-01-26 12:17:59 +01:00
1be37de993
not used (defaults are given in the respective modules)
2020-01-26 11:46:14 +01:00
24a8d7ed29
256 (pStringLen) might not be sufficient for file operations
2020-01-26 11:40:25 +01:00
9a0d8db23e
[skip ci] replacement is done
2020-01-26 10:53:24 +01:00
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
b16f4155d4
cell definition follows correct order for 11/12 (7/57 in MSC.Marc)
2020-01-26 09:06:45 +01:00
7671e257bd
reorder elem 11 (Marc 7) to match 12 (Marc 57)
2020-01-26 08:17:59 +01:00
2100742a31
better have no support then untested support
2020-01-26 08:17:25 +01:00
13107abd39
not working and significat efforts needed to test it
2020-01-26 07:44:22 +01:00
8a2a9d3861
avoid direct file operations
2020-01-25 13:30:42 +01:00
a2e4160e61
read file only once
2020-01-25 10:58:04 +01:00
ddeebc189a
[skip ci] documenting further use
2020-01-25 09:31:27 +01:00
e532641015
dependency on element not needed for homogeneous meshes
2020-01-25 09:24:42 +01:00
624ede8177
clear separation between solver and DAMASK
2020-01-25 09:12:09 +01:00
bdae2a40cc
independent of IO
2020-01-25 08:56:39 +01:00
bfe8585903
Merge branch 'development' into MiscImprovements
2020-01-24 20:08:14 +01:00
5fae924e88
Merge branch 'MiscImprovements' of magit1.mpie.de:/damask/DAMASK into MiscImprovements
2020-01-24 19:58:57 +01:00
3d6ec6955f
Merge branch 'PGI-support' into development
2020-01-24 12:24:38 +01:00
b807406a70
avoid public variables
2020-01-23 14:08:14 +01:00
f0ad18102d
preparing to clean FEsolving
...
should not have solver dependent functionality
2020-01-23 13:49:12 +01:00
bd67d2bb6a
new mappings have clear name, not (1,2)
2020-01-23 13:16:45 +01:00
7f66d4e975
avoid fixed string length
...
solved issues with wrong trim and is more robust
2020-01-23 11:21:42 +01:00
7273f1461c
avoid fixed string length where possible
2020-01-23 09:35:41 +01:00
1bfd8a8c21
continuousIntValues is very specific for Marc
...
define where it is used
2020-01-23 08:37:03 +01:00
246187865e
more flexibility
2020-01-23 08:19:21 +01:00
cc67b1bd3b
automatic length determination for more flexibility
2020-01-23 07:29:38 +01:00
d28b18267b
polishing
2020-01-23 07:19:44 +01:00
2c942de45d
do no rely on IO functions
...
should become part of the marc specific code
2020-01-22 08:55:39 +01:00
0c4790d468
solver specific, should not be reported here
2020-01-22 08:24:55 +01:00
d27aac0970
clearer structure
2020-01-21 19:33:22 +01:00
0ef0db586f
Merge branch 'MiscImprovements' of magit1.mpie.de:/damask/DAMASK into MiscImprovements
2020-01-21 19:24:30 +01:00
91d25ec897
rename in PETSc function
2020-01-21 18:18:27 +01:00
ad2520bec1
compiles with PETSc > 3.10
...
but does not run
2020-01-21 15:27:11 +01:00
8ef3985da7
debug info
2020-01-21 14:58:35 +01:00
1857a5e58a
skip empty lines (i.e. blank line at the end)
2020-01-21 11:45:11 +01:00
9b4f773a0b
work around for bug in Intel
2020-01-21 08:43:16 +01:00
1a31ff82bb
avoid code duplication
2020-01-21 07:46:32 +01:00
a18057ba4d
use central functionality for file IO
2020-01-21 07:37:04 +01:00
2e38582824
no need for additional variables
2020-01-21 07:08:02 +01:00
47e5b0077a
fixed typo
2020-01-21 06:53:32 +01:00
843676fb10
grouping variables for better readability
2020-01-21 06:10:19 +01:00
db96ee0fc2
cleaning
2020-01-20 23:46:48 +01:00
80ae2f5f6b
no need for public variables
2020-01-20 23:39:24 +01:00
4d673866b8
bugfix: copy and paste error
2020-01-20 23:31:51 +01:00
b98ecccf73
better readable
2020-01-20 21:06:08 +01:00
56ab4f723d
polishing
2020-01-20 20:36:21 +01:00
701a9b18cc
Merge remote-tracking branch 'remotes/origin/marc-improvements' into development
2020-01-18 12:21:24 +01:00
d722c6db4a
clear separation between OO and imperative arguments
2020-01-14 11:52:22 +01:00
9d1c1fdb92
enforce Re(q) > 0
2020-01-14 11:33:18 +01:00
27bc23c2e1
missing renames
...
wondering how this has passed the syntax check earlier
2020-01-14 07:55:18 +01:00
e70c56701f
not needed
2020-01-13 21:09:25 +01:00
cad6fc7843
Merge branch 'development' into plasticity-submodule
2020-01-13 20:57:12 +01:00
544ff9b6ee
gfortran rejects (Intel seems fine)
...
assume a bug, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=93251
2020-01-13 16:11:36 +01:00
bd4db68a12
support for non QUAD cell type
2020-01-13 10:03:13 +01:00
0cf27a8229
indicate parameters and report vtk type
2020-01-13 10:02:23 +01:00
a025edd09f
Merge branch 'MoreImprovements' into PGI-support
2020-01-13 01:44:45 +01:00
2d294aba23
need to store cell nodes, not elem nodes
2020-01-12 18:32:20 +01:00
ac0fa2fce9
no need for separate allocation
2020-01-12 16:50:36 +01:00
eb7bd41acd
no need for special functions
2020-01-12 16:08:38 +01:00
fb8494e2b8
write out nodal displacements
...
does not work: Not updated and wrong size
2020-01-12 15:42:08 +01:00
9d1543c9cc
functionality was used only once
2020-01-12 01:54:38 +01:00
8aa13a55ce
enable handling of connectivity that spreads over multiple lines
...
same code works also for old style tables, probably some flexibility
regarding non-CP elements is lacking ..
2020-01-12 00:58:12 +01:00
Martin Diehl