Compare commits

..

1269 Commits

Author SHA1 Message Date
achalhp 82e6cff42e ph_mech without current state update 2024-05-07 17:23:10 +05:30
achalhp fe34aef061 Discrete twinning flag applied globally 2024-04-14 16:33:09 +05:30
achalhp eee852fe38 Created a flag to turn off discrete twin model 2024-04-08 09:34:55 +05:30
achalhp 5f0ff71236 Growth criteria 2024-03-17 09:13:32 +05:30
achalhp 117135de08 Grain boundary elements for nucleation code 2024-03-16 15:52:41 +05:30
achalhp 46da81c77d Deltas updated in deltastate subroutine 2024-03-15 16:20:11 +05:30
achalhp 45f4f56764 updated phase_mechanical_plastic 2024-03-11 11:49:57 +05:30
achalhp 2a4dc6f65d Updated Readme 2024-03-04 12:25:10 +05:30
achalhp 508c7148fe Correspondence Matrix applied 2024-03-04 11:50:03 +05:30
Test User 23a9db6f09 [skip ci] updated version information after successful test of v3.0.0-beta-45-gbd2fba288 2024-03-02 13:31:24 +05:30
Martin Diehl 89bb790be8 revert use of container for oneAPI to save space
still need to remove many packages from the Ubuntu installation.
2024-03-02 13:31:24 +05:30
Test User d2b9524c8f [skip ci] updated version information after successful test of v3.0.0-beta-42-g665abb805 2024-03-02 13:31:24 +05:30
Philip Eisenlohr 80c31ac20e Add period to sentences. 2024-03-02 13:31:24 +05:30
Martin Diehl 1d19d4242c more robust implementation
use abs() for situations with negative numbers, allow to explicitly
specify precision.
max_denominator and default N_significant are determined empirical
2024-03-02 13:31:24 +05:30
Test User 044e97cbd5 [skip ci] updated version information after successful test of v3.0.0-beta-38-gff1e8b733 2024-03-02 13:31:24 +05:30
Martin Diehl 94365b3160 is available on website 2024-03-02 13:31:24 +05:30
Test User b94b29acd6 [skip ci] updated version information after successful test of v3.0.0-beta-35-gfea5ffd41 2024-03-02 13:31:24 +05:30
Martin Diehl d6b1423c20 enable type hints for Colormap
custom constructor ensures that type of color is always an np.ndarray
2024-03-02 13:31:24 +05:30
Test User 74413859ab [skip ci] updated version information after successful test of v3.0.0-beta-32-g71cd72949 2024-03-02 13:31:24 +05:30
Philip Eisenlohr e3f27a7eb3 reversed operator order to allow for proper blending in misorientation 2024-03-02 13:31:24 +05:30
Philip Eisenlohr 608063a8e5 suggested renaming of rmComment 2024-03-02 13:31:24 +05:30
Martin Diehl 2e5f00ffbc adjust description to variable names 2024-03-02 13:31:24 +05:30
Martin Diehl e6f48b7ca7 only needed by MSC.Marc
if related functionality is need, an approach using F23s "tokenize"
should be implemented
2024-03-02 13:31:24 +05:30
Martin Diehl 12d7ee165b legacy read function, only needed by MSC.Marc 2024-03-02 13:31:24 +05:30
Martin Diehl d153925973 helpful error message in case of non-matching length 2024-03-02 13:31:24 +05:30
Martin Diehl f3884d9291 better name 2024-03-02 13:31:24 +05:30
Martin Diehl 8b24fd6b70 broadcast scalars when getting list with known size
this makes old material configurations backward compatible and allows to
shorten configurations in case that the same value is used for multiple
families
2024-03-02 13:31:24 +05:30
Martin Diehl 5dbe3f109c not used
comment signs depend on file format, so better implement specific
variants if needed instead of relying on central functionality
2024-03-02 13:31:24 +05:30
Martin Diehl 4f60ded80d unexpected and undocument functionality 2024-03-02 13:31:24 +05:30
Martin Diehl 0eb37fa4c0 make clear that functionality is YAML specific
'#' as comment sign is not universal
2024-03-02 13:31:24 +05:30
Martin Diehl 883aed9092 naming scheme as in Python library 2024-03-02 13:31:24 +05:30
Martin Diehl 30ca657706 more appropriate name (conceptually not coupled to YAML) 2024-03-02 13:31:24 +05:30
Test User 2f5a2f4bef [skip ci] updated version information after successful test of v3.0.0-beta-17-g62cdc1a53 2024-03-02 13:31:24 +05:30
Daniel Otto de Mentock 6a91c2855e not needed 2024-03-02 13:31:24 +05:30
Daniel Otto de Mentock 76912da8bf standard batch multiplication can be done with @ 2024-03-02 13:31:24 +05:30
Daniel Otto de Mentock dffc567ba0 requested can be str 2024-03-02 13:31:24 +05:30
Martin Diehl 28a83d6b69 use scipy.linalg.polar
unfortunately, it does not support arbitrary dimensions, so use it as
reference in testing only
2024-03-02 13:31:24 +05:30
Test User dccecf6753 [skip ci] updated version information after successful test of v3.0.0-beta-11-g094e18396 2024-03-02 13:31:24 +05:30
Martin Diehl b749beaa6c adjusting tolerance
1e-10 led to failing tests on GitHub Actions
2024-03-02 13:31:24 +05:30
Martin Diehl 8d93079801 restrict test to reasonable values 2024-03-02 13:31:24 +05:30
Test User a0e6742197 [skip ci] updated version information after successful test of v3.0.0-beta-7-gb8cc4af9c 2024-03-02 13:31:24 +05:30
Martin Diehl ce7bf418bc include latest tests, removed old code 2024-03-02 13:31:24 +05:30
Test User 640dbea274 [skip ci] updated version information after successful test of v3.0.0-beta-4-gc5ebeb85f 2024-03-02 13:31:24 +05:30
Martin Diehl 7f0c782602 avoid repeated allocation of a_nS
leads to segmentation fault
2024-03-02 13:31:24 +05:30
Test User 2b547e2048 [skip ci] updated version information after successful test of v3.0.0-beta-1-g300a57d5f 2024-01-24 15:55:19 +01:00
Martin Diehl 300a57d5f2
restored working test 2024-01-23 19:54:50 +01:00
Martin Diehl 6bed86488d
v3.0.0-beta 2024-01-23 15:17:28 +01:00
Martin Diehl 2e2e44dbc1
preparing for release 2024-01-23 15:14:16 +01:00
Test User 710a6efead [skip ci] updated version information after successful test of v3.0.0-alpha8-294-g7d8a6d054 2024-01-22 16:44:39 +01:00
Philip Eisenlohr 7d8a6d054b Merge branch 'sophisticated-return-type' into 'development'
Sophisticated return type

See merge request damask/DAMASK!898
2024-01-22 13:47:12 +00:00
Test User 9d1b96d3bb [skip ci] updated version information after successful test of v3.0.0-alpha8-277-ge139a68d8 2024-01-17 18:52:44 +01:00
Martin Diehl e139a68d81 Merge branch 'fix-Mg-interaction-parameters' into 'development'
marked wrong entries as unused

See merge request damask/DAMASK!899
2024-01-17 14:55:47 +00:00
Martin Diehl f68f4c6edf
marked wrong entries as unused 2024-01-17 12:45:17 +01:00
Martin Diehl db263c3af7
consistent naming 2024-01-17 09:42:44 +01:00
Martin Diehl 27a8b63a3d
safer reduction
MPI_SUM can lead to invalid/undefined values for enum
2024-01-15 23:59:02 +01:00
Martin Diehl 712b22b678
only needed for older (broken) ifort 2024-01-13 17:31:21 +01:00
Martin Diehl 1d60ce29c6
systematic naming of status code enums 2024-01-13 08:27:17 +01:00
Martin Diehl 9d3b4a270f
reasonable order 2024-01-12 07:30:37 +01:00
Martin Diehl 7ca02b3f3d
consistently use status code as return value 2024-01-11 14:59:30 +01:00
Martin Diehl 0384f93d46
propagate non-binary status information 2024-01-10 00:36:22 +01:00
Philip Eisenlohr 89ebad19d5 consistent ordering of status logical tests 2024-01-09 10:00:42 -05:00
Martin Diehl 48a38f3cf5
harmonize status reporting 2024-01-09 14:45:41 +01:00
Martin Diehl 5e7565f99f
status needs to be passed 2024-01-09 14:45:11 +01:00
Martin Diehl 62bce163cd
better status propagation 2024-01-09 13:52:57 +01:00
Martin Diehl 845d3eed33
harmonize status reporting 2024-01-09 13:52:39 +01:00
Martin Diehl 70e720c032
better to understand and more flexible 2024-01-09 07:26:28 +01:00
Martin Diehl 0ad1a14e3f
sophisticasted error handling 2024-01-08 23:35:06 +01:00
Martin Diehl 5343aecd6f
non-binary status allows to transfer more information 2024-01-08 23:34:56 +01:00
Test User 3cfcf44f9a [skip ci] updated version information after successful test of v3.0.0-alpha8-274-g9c796001e 2024-01-08 18:20:15 +01:00
Philip Eisenlohr 9c796001e7 Merge branch 'less-terminallyIll' into 'development'
removed terminallyIll as global variable

See merge request damask/DAMASK!895
2024-01-08 15:22:21 +00:00
Martin Diehl 1f9a372aa7 removed terminallyIll as global variable 2024-01-08 15:22:21 +00:00
Test User fdcea09133 [skip ci] updated version information after successful test of v3.0.0-alpha8-271-g460c660c3 2024-01-08 13:18:10 +01:00
Yi Hu 460c660c37 Merge branch 'numerics-config' into 'development'
PETSc options can be defined for every field solver

See merge request damask/DAMASK!894
2024-01-08 10:23:43 +00:00
Test User 4b21fb0b87 [skip ci] updated version information after successful test of v3.0.0-alpha8-268-g364a98258 2024-01-06 15:57:41 +01:00
Martin Diehl 364a982582 Merge branch 'Marc2023.4-clean' into 'development'
support Marc2023.4

See merge request damask/DAMASK!897
2024-01-06 12:59:59 +00:00
Franz Roters c4e450fe34 make Marc2023.4 default and unse it for testing 2024-01-04 15:23:50 +01:00
Franz Roters 725158970a add support for Marc2023.4 2024-01-04 15:22:09 +01:00
Test User 5fc006e212 [skip ci] updated version information after successful test of v3.0.0-alpha8-264-gee007b376 2024-01-04 13:02:13 +01:00
Martin Diehl ee007b3765 Merge branch 'github-actions-update' into 'development'
Github actions update

See merge request damask/DAMASK!896
2024-01-04 09:13:10 +00:00
Martin Diehl 9f6464319e
use LLVM compiler wrappers 2024-01-04 07:44:06 +01:00
Martin Diehl 24eee8d14c
run mesh test 2024-01-04 07:22:13 +01:00
Martin Diehl ae0e2a805b
most recent PETSc 2024-01-04 06:47:09 +01:00
Test User e8a3fee221 [skip ci] updated version information after successful test of v3.0.0-alpha8-259-g303061fb9 2024-01-03 19:10:00 +01:00
Philip Eisenlohr 303061fb96 Merge branch '285-attributes-of-damask-result-should-depend-on-view' into 'development'
attributes should depend on view

Closes #285

See merge request damask/DAMASK!877
2024-01-03 15:59:50 +00:00
Philip Eisenlohr 877dc43ffe use updated PRIVATE 2024-01-02 11:44:36 -05:00
Philip Eisenlohr 5da7ff56b9 Merge branch 'development' into 285-attributes-of-damask-result-should-depend-on-view 2024-01-02 09:37:59 -05:00
Sharan Roongta 68d5acc645 PETSc options can be defined for every field solver 2024-01-02 14:46:35 +01:00
Test User 53a04bcb70 [skip ci] updated version information after successful test of v3.0.0-alpha8-246-g112b5be1a 2024-01-02 13:31:04 +01:00
Sharan Roongta 112b5be1ad Merge branch 'nonlocal-compatibility-in-dependent-state' into 'development'
Nonlocal compatibility in dependent state

See merge request damask/DAMASK!891
2024-01-02 10:35:01 +00:00
Test User 2b74365b44 [skip ci] updated version information after successful test of v3.0.0-alpha8-236-gf57924e9f 2024-01-01 21:39:44 +01:00
Javier Velo f57924e9fe Merge branch 'mesh-clean' into 'development'
Mesh clean

See merge request damask/DAMASK!889
2024-01-01 18:43:09 +00:00
Martin Diehl c6dae711c5
Merge remote-tracking branch 'origin/development' into nonlocal-compatibility-in-dependent-state 2023-12-31 19:06:33 +01:00
Test User 14bafc62db [skip ci] updated version information after successful test of v3.0.0-alpha8-228-g10a2b58f8 2023-12-31 01:16:00 +01:00
Sharan 42dd33d14c not needed 2023-12-30 23:46:09 +01:00
Martin Diehl 10a2b58f86 Merge branch 'use-central-MPIerror-check' into 'development'
use central functionality

See merge request damask/DAMASK!893
2023-12-30 22:15:34 +00:00
Test User fb1852e6fa [skip ci] updated version information after successful test of v3.0.0-alpha8-225-g714b161de 2023-12-30 21:01:17 +01:00
Martin Diehl 714b161def Merge branch 'CMake-Programming' into 'development'
avoid hardcoding (requires/ensures systematic naming)

See merge request damask/DAMASK!892
2023-12-30 17:49:43 +00:00
Martin Diehl ebb2e3ca85
avoid hardcoding (requires/ensures systematic naming) 2023-12-30 16:02:00 +01:00
Martin Diehl 20fdcb91d9
use central functionality 2023-12-30 15:48:04 +01:00
Test User e39a9610d8 [skip ci] updated version information after successful test of v3.0.0-alpha8-222-g19eaf4a27 2023-12-30 05:56:52 +01:00
Sharan Roongta 19eaf4a27f Merge branch 'solver-cleanup' into 'development'
separate mechanics and thermal

See merge request damask/DAMASK!890
2023-12-30 00:23:26 +00:00
Martin Diehl ce7182dd6d
unused variables 2023-12-30 00:46:18 +01:00
Martin Diehl 0d2ff12894
compatibility is a dependent state of nonlocal 2023-12-29 23:17:24 +01:00
Martin Diehl e042f0311a
more favorable arguments 2023-12-29 22:48:29 +01:00
Martin Diehl 305c6e1b83
easier access pattern 2023-12-29 22:41:51 +01:00
Martin Diehl 62d5b45788
use modern access pattern 2023-12-29 22:33:42 +01:00
Martin Diehl f697182971
only mobile dislocations (t=1,2,3,4) are used 2023-12-29 22:30:04 +01:00
Martin Diehl 3b57143662
nonlocal works only with single constituents 2023-12-29 22:10:47 +01:00
Martin Diehl 1f1baa8b48
more systematic naming 2023-12-29 22:05:11 +01:00
Test User 47868c5829 [skip ci] updated version information after successful test of v3.0.0-alpha8-219-gb07c2a319 2023-12-29 18:43:19 +01:00
Martin Diehl c5d71168be
separate mechanics and thermal 2023-12-29 18:29:56 +01:00
Sharan Roongta 977cb83ef6 better name 2023-12-29 17:52:58 +01:00
Sharan Roongta 2368200138 not used 2023-12-29 17:38:41 +01:00
Sharan Roongta 2179530d5f Merge remote-tracking branch 'origin/development' into mesh-clean 2023-12-29 17:36:31 +01:00
Sharan Roongta b07c2a3191 Merge branch 'solver-cleanup' into 'development'
Solver cleanup

See merge request damask/DAMASK!888
2023-12-29 15:30:36 +00:00
Test User 8797af49ae [skip ci] updated version information after successful test of v3.0.0-alpha8-211-gccf4867e0 2023-12-29 11:19:04 +01:00
Martin Diehl 936328ae8b
re-enabled support for older CMake 2023-12-29 08:32:52 +01:00
Martin Diehl 376d3f6986
Merge remote-tracking branch 'origin/development' into solver-cleanup 2023-12-29 08:13:21 +01:00
Martin Diehl ccf4867e0c Merge branch 'modern-CMake-preprocessing' into 'development'
Modern CMake preprocessing

See merge request damask/DAMASK!887
2023-12-29 07:05:37 +00:00
Test User 9ebb2d4ddd [skip ci] updated version information after successful test of v3.0.0-alpha8-207-ga80fce410 2023-12-29 00:04:44 +01:00
Martin Diehl b2b3a3f3f0
loop over cells, not (element, IP) 2023-12-28 21:28:57 +01:00
Philip Eisenlohr a80fce4108 Merge branch 'modernize-nonlocal' into 'development'
Modernize nonlocal

See merge request damask/DAMASK!883
2023-12-28 18:57:49 +00:00
Martin Diehl 04fdac6556
standard access pattern 2023-12-28 19:51:22 +01:00
Martin Diehl f89e33a726 Merge branch 'solver-cleanup' into 'development'
Solver cleanup

See merge request damask/DAMASK!886
2023-12-28 18:34:15 +00:00
Martin Diehl aae99156b4
not needed 2023-12-28 19:18:25 +01:00
Martin Diehl 77e1c5a8a7
standard indexing: ce(ll) instead of element and integration point 2023-12-28 19:15:26 +01:00
Martin Diehl e4e0840479
simplified 2023-12-28 09:28:04 +01:00
Martin Diehl af7f73f379
CMake knows compiler flags 2023-12-27 15:07:04 +01:00
Martin Diehl 0d747ae5e4
(incomplete) split: spectral/FFT vs mech functionality 2023-12-24 13:26:32 +01:00
Martin Diehl 395b6b5438
don't rely on data stored in homogenization 2023-12-24 13:26:29 +01:00
Test User e1ca6bbed6 [skip ci] updated version information after successful test of v3.0.0-alpha8-199-g0f69eff16 2023-12-24 12:39:38 +01:00
Sharan Roongta 0f69eff160 Merge branch 'solver-cleanup' into 'development'
was a 'write-only' variable

See merge request damask/DAMASK!885
2023-12-24 09:42:39 +00:00
Martin Diehl 169bc977d7
was a 'write-only' variable 2023-12-23 22:39:23 +01:00
Test User 1bf16951ee [skip ci] updated version information after successful test of v3.0.0-alpha8-196-gaed2643af 2023-12-23 21:38:33 +01:00
Franz Roters aed2643af7 Merge branch 'F2023-tokenize' into 'development'
F2023 tokenize

See merge request damask/DAMASK!879
2023-12-23 18:14:49 +00:00
Philip Eisenlohr b22251a2b9 Merge branch 'properly-close-files' into 'development'
use context manager to ensure that opened files are closed

See merge request damask/DAMASK!884
2023-12-23 17:49:54 +00:00
Test User 14d73fc528 [skip ci] updated version information after successful test of v3.0.0-alpha8-189-g598b0b238 2023-12-23 18:20:44 +01:00
Franz Roters 598b0b2386 Merge branch 'fix-DREAM3Dtest-Windows' into 'development'
use OS-independent separators

See merge request damask/DAMASK!882
2023-12-23 15:12:11 +00:00
Martin Diehl a8e979e904
ensure that files are closed automatically
reported by Karo Sedighiani
2023-12-23 07:07:12 +01:00
Martin Diehl e7543fd715
can be stored as dependent state 2023-12-22 23:45:34 +01:00
Martin Diehl a603e153db
simplified 2023-12-22 23:29:46 +01:00
Martin Diehl 696cccaa66
rho_forest is a dependent state 2023-12-22 22:54:20 +01:00
Martin Diehl 0c56711032
use OS-independent separators
fix tests on Windows
2023-12-22 19:06:02 +01:00
Test User 0e4c20a430 [skip ci] updated version information after successful test of v3.0.0-alpha8-186-gaf5bbed00 2023-12-21 22:10:08 +01:00
Martin Diehl af5bbed003 Merge branch 'mesh-load-YAML' into 'development'
Mesh load yaml

See merge request damask/DAMASK!876
2023-12-21 18:38:36 +00:00
Test User 1933c896b2 [skip ci] updated version information after successful test of v3.0.0-alpha8-179-gb9d166652 2023-12-21 12:41:31 +01:00
Martin Diehl b9d1666524 Merge branch 'experimental-Flang' into 'development'
starting to support new LLVM compiler

See merge request damask/DAMASK!881
2023-12-21 09:44:13 +00:00
Martin Diehl 0518cc6730
slighly polished yaml files 2023-12-21 07:54:20 +01:00
Martin Diehl bdb30118fb
starting to support new LLVM compiler
does not work yet, but good to have for testing once in a while.
Current version is 17, require minimum 19 to make clear that it does not
work
2023-12-21 06:30:46 +01:00
Test User 808ab09053 [skip ci] updated version information after successful test of v3.0.0-alpha8-175-g5c71238bc 2023-12-21 00:13:10 +01:00
Philip Eisenlohr 5c71238bc4 Merge branch '367-string-to-real-integer-conversion' into 'development'
simplified string conversion and related error handling

Closes #367

See merge request damask/DAMASK!880
2023-12-20 20:34:51 +00:00
Philip Eisenlohr 42a752aa6b Merge branch 'development' into '285-attributes-of-damask-result-should-depend-on-view'
# Conflicts:
#   python/damask/_result.py
2023-12-20 19:14:40 +00:00
Martin Diehl 8458ea5ecf
simplified string conversion and related error handling
checking for valid characters is not sufficient because signs and
exponents are allowed to appear only at specific locations. Since
Fortrans internal file read will anyways complain about invalid
characters, the check doesn't even have a value.

reduced number of error codes by grouping all conversion related errors
2023-12-20 18:44:21 +01:00
Martin Diehl c0b9280218
variables in stop code not supported by older compilers 2023-12-20 18:41:16 +01:00
Test User 4e3b9e6586 [skip ci] updated version information after successful test of v3.0.0-alpha8-172-gec624a86a 2023-12-20 16:58:04 +01:00
Daniel Otto de Mentock ec624a86ad Merge branch '362-damask-result-hide-invalid-functionality' into 'development'
hide impossible operations

Closes #362

See merge request damask/DAMASK!875
2023-12-20 13:58:09 +00:00
Martin Diehl 51bccd98d5
check is already done centrally 2023-12-20 11:27:57 +01:00
Martin Diehl ace7d8f003
use tokenize (F2023) 2023-12-19 21:19:57 +01:00
Martin Diehl c4d061ba0a
F2023 tokenize (second form) 2023-12-19 21:19:22 +01:00
Martin Diehl 7245aa24d4
use NotImplementedError to indicate non-implemented combinations 2023-12-19 18:39:47 +01:00
Philip Eisenlohr e93618bc89 Correct docstring 2023-12-18 23:02:02 +00:00
Martin Diehl 809f5f455b
test new functionality 2023-12-18 23:30:05 +01:00
Sharan Roongta bd0eb0f154 load -> yaml 2023-12-18 17:23:05 +01:00
Martin Diehl 939d5070b3
matching name
and leave write protection status unchanged
2023-12-17 15:45:34 +01:00
Martin Diehl 95e45ab073
avoid inconsistencies 2023-12-17 13:18:21 +01:00
Martin Diehl db09ca37e6
convenient shortcut 2023-12-17 13:17:52 +01:00
Martin Diehl 7544e81349
dictionary of visible items should not be exposed to users
getters for individual items are easier to understand
Note: increments_in_range and times_in_range operate now only on the
visible increments
2023-12-17 13:16:48 +01:00
Martin Diehl 8def54c862
fixed getters for visible entities
storing time information as dictionary simplifies many operations
2023-12-17 06:55:14 +01:00
Sharan Roongta 0798548f0f this structure seems cleaner, i.e., BC per face 2023-12-17 00:04:55 +01:00
Sharan Roongta e4ad5a94a5 better names 2023-12-16 18:28:17 +01:00
Martin Diehl 38f9c1977c
attributes should depend on view
hidden attributes contain the view-independent variables, getter for
currently visible quantities
2023-12-16 16:06:35 +01:00
Amrit Jena 8828783bd4 run updated tests 2023-12-15 18:24:10 +01:00
Sharan Roongta 9a1cf1a04e first changes for YAML mesh load case, and simplification of code 2023-12-15 16:03:39 +01:00
Test User 84af516cdb [skip ci] updated version information after successful test of v3.0.0-alpha8-169-g85191cd02 2023-12-14 15:02:08 +01:00
Sharan Roongta 85191cd021 Merge branch 'CLI-improvements' into 'development'
Cli improvements

See merge request damask/DAMASK!873
2023-12-14 12:03:12 +00:00
Martin Diehl 55d08fdd6f Cli improvements 2023-12-14 12:03:11 +00:00
Test User 0ede07614d [skip ci] updated version information after successful test of v3.0.0-alpha8-166-gcc0f2d477 2023-12-13 17:54:34 +01:00
Philip Eisenlohr cc0f2d477e Merge branch 'export_DAMASK_to_DREAM3D' into 'development'
Export Dream3D output

See merge request damask/DAMASK!835
2023-12-13 14:55:47 +00:00
Test User 89c98dce67 [skip ci] updated version information after successful test of v3.0.0-alpha8-107-g5a994a522 2023-12-12 20:58:33 +01:00
Sharan Roongta 5a994a5223 Merge branch 'flexible-YAML-1Dget' into 'development'
flexible YAML get 1D

See merge request damask/DAMASK!872
2023-12-12 17:36:41 +00:00
Sharan Roongta 02acab1b5c Merge branch 'working-mesh-examples' into 'development'
Working mesh examples

See merge request damask/DAMASK!867
2023-12-12 17:10:51 +00:00
Test User cd41c6b7fc [skip ci] updated version information after successful test of v3.0.0-alpha8-98-g419e6f8f5 2023-12-12 00:14:17 +01:00
Philip Eisenlohr 419e6f8f51 Merge branch '359-io_color' into 'development'
Resolve "IO_color"

Closes #359

See merge request damask/DAMASK!870
2023-12-11 21:17:09 +00:00
Martin Diehl 127ff97a24
make internals visible 2023-12-11 15:18:43 +01:00
Martin Diehl 4320e9847d
more systematic handling of colored output
isatty for Fortran needs to translate the units/file descriptors
2023-12-11 06:58:37 +01:00
Test User 223790862b [skip ci] updated version information after successful test of v3.0.0-alpha8-90-gc277dce81 2023-12-11 00:35:45 +01:00
Martin Diehl 1b60bc14e8
more flexibility for setting default values 2023-12-10 22:22:19 +01:00
Philip Eisenlohr c277dce816 Merge branch '353-testing-euler-angles' into 'development'
correctly handling ambiguity if Phi approx pi

Closes #353

See merge request damask/DAMASK!866
2023-12-10 20:28:51 +00:00
Martin Diehl bfb207d34d
use original DREAM.3D file as reference
current loop runs over all datasets (except those that should be
ignored).
2023-12-10 19:46:09 +01:00
Martin Diehl c6ecd6d977
avoid internal compiler error for ifort/ifx 2023-12-10 12:50:22 +01:00
Martin Diehl d02c74cdd6
get flattened array from scalar or potentially ragged nested list
rather special case, but handy for flexible definition of values per
slip system
2023-12-10 12:14:57 +01:00
Philip Eisenlohr afa80bab68 use numpy intrinsics 2023-12-09 12:03:24 -05:00
Philip Eisenlohr efc76f1f19 shortened code 2023-12-09 12:03:05 -05:00
Martin Diehl f3e7f51bb4 centralized functionality for handling of colors 2023-12-09 16:56:09 +01:00
Martin Diehl 65c0a2d5ca more logical split 2023-12-09 15:19:27 +01:00
Martin Diehl 456b3fb76d functionality to check whether STDERR/STDOUT are redirected 2023-12-09 15:17:52 +01:00
Martin Diehl 5d07851d60 use stdout but do nothing if redirected 2023-12-09 14:43:29 +01:00
Martin Diehl 7063c59b6a consistent capitalization 2023-12-09 14:22:14 +01:00
Test User cd1b0a62b8 [skip ci] updated version information after successful test of v3.0.0-alpha8-85-gcacbeea03 2023-12-07 19:04:33 +01:00
Philip Eisenlohr cacbeea03f Merge branch '357-lattice-basis-disagrees-with-initialization' into 'development'
lowered tolerance

Closes #357

See merge request damask/DAMASK!868
2023-12-07 15:12:32 +00:00
Sharan Roongta 78de3e6bde Merge branch 'no-defaults-phenopowerlaw' into 'development'
No defaults phenopowerlaw

See merge request damask/DAMASK!863
2023-12-07 13:19:00 +00:00
Martin Diehl 7fc09d3413 adjusted to current situation 2023-12-07 13:30:20 +01:00
Martin Diehl 5c87435f1a small examples for testing purposes 2023-12-07 13:29:10 +01:00
Martin Diehl 255017d5be examples are too large and don't compile 2023-12-07 13:06:41 +01:00
Martin Diehl c350009479 lowered tolerance
avoid failing tests
2023-12-07 12:49:59 +01:00
Sharan Roongta b5f71d2328 Merge branch 'early-PetscOptionsClear' into 'development'
Early petsc options clear

See merge request damask/DAMASK!862
2023-12-07 11:13:29 +00:00
Martin Diehl beb58b76f2 correctly handling ambiguity if Phi approx pi 2023-12-06 22:07:57 +01:00
Test User 224ee5afdc [skip ci] updated version information after successful test of v3.0.0-alpha8-73-g34efdc56e 2023-12-06 12:12:31 +01:00
Daniel Otto de Mentock 34efdc56ec Merge branch 'SPPARKS-real-data' into 'development'
enforce little endian

See merge request damask/DAMASK!864
2023-12-06 08:38:32 +00:00
Daniel Otto de Mentock 75e9d6823f Merge branch '352-systematic-naming-of-pre-processing-modules' into 'development'
more systematic naming

Closes #352

See merge request damask/DAMASK!865
2023-12-06 08:37:27 +00:00
Martin Diehl 8ace3411b4 restore correct behavior 2023-12-05 15:58:06 +01:00
Martin Diehl 7bfb081106 more systematic naming
YAML is the base class for ConfigMaterial and LoadcaseGrid
2023-12-05 10:34:05 +01:00
Martin Diehl 8e5f5cc124 simplifying tests 2023-12-05 07:14:14 +01:00
Martin Diehl 660b472747 centralized function for ones/zeros 2023-12-04 23:38:58 +01:00
Martin Diehl 1995934371 improved handling of phases without orientation
inactive phases and phases without orientation will get 999 numerical
values
2023-12-04 23:16:24 +01:00
Martin Diehl 5923aa2493 ensure closing of file 2023-12-04 22:53:35 +01:00
Martin Diehl b5e34e7949 Merge remote-tracking branch 'origin/development' into export_DAMASK_to_DREAM3D 2023-12-04 22:37:05 +01:00
Martin Diehl ecf68db814 handle missing orientation data 2023-12-04 22:35:44 +01:00
Martin Diehl 1245ec7d94 grouped 2023-12-04 22:25:28 +01:00
Martin Diehl ffd3cfe951 simplified 2023-12-04 22:16:31 +01:00
Martin Diehl 213e8aa4be avoid monkey patching 2023-12-04 21:50:02 +01:00
Martin Diehl 7a5e08c14d consistent name 2023-12-04 19:59:01 +01:00
Martin Diehl faedb49a20 simplified 2023-12-04 19:33:40 +01:00
Martin Diehl ab24d444fc limit to structures available in DAMASK 2023-12-04 19:25:41 +01:00
Martin Diehl a5b5972e9a already documented 2023-12-04 16:48:09 +01:00
Martin Diehl 1621473d99 should not have default values 2023-12-04 16:44:57 +01:00
Martin Diehl 731057f7e0 consistent with other plasticity laws 2023-12-04 16:25:31 +01:00
Vitesh Shah 9e51ab160c ditching the patched copy approach
Further details or things to look at:
2a48bf504e (note_12028)
2023-12-01 12:34:59 +01:00
Test User ad60193502 [skip ci] updated version information after successful test of v3.0.0-alpha8-67-g9f8ecd44b 2023-11-30 09:28:19 +01:00
Martin Diehl 4d436f7ed9 realistic SPPARKS file
should not matter because reading is delegated to VTK, but better safe
than sorry
2023-11-30 07:05:09 +01:00
Martin Diehl 5ffe9ce943 enforce little endian
default on common systems, but the only format the Fortran parser
understands
2023-11-30 07:04:33 +01:00
Daniel Otto de Mentock 9f8ecd44b0 Merge branch '351-damask-grid-load_spparks' into 'development'
load data from SPPARKS

Closes #351

See merge request damask/DAMASK!861
2023-11-29 14:01:14 +00:00
Test User 59793168be [skip ci] updated version information after successful test of v3.0.0-alpha8-58-gd8900558c 2023-11-29 03:35:55 +01:00
Cathy Bing d8900558cd Merge branch 'climb_stress_free' into 'development'
edge dipole annihilation via climb is not disabled anymore when stress is zero

See merge request damask/DAMASK!860
2023-11-29 00:38:41 +00:00
Cathy Bing 4542d97725 merged the newest development 2023-11-28 17:28:58 -05:00
Martin Diehl 89ba785938 using correct name (confirmed by user with original request) 2023-11-28 21:08:53 +01:00
Martin Diehl 38c7e6a8e4 consistent code 2023-11-28 20:57:24 +01:00
Philip Eisenlohr 118247111b slightly shorter code 2023-11-28 12:31:47 -05:00
Philip Eisenlohr 7e56abf41c language polish 2023-11-28 17:21:06 +00:00
Martin Diehl 59765ab0df typo: do not overwrite 'label' 2023-11-28 14:40:14 +01:00
Vitesh Shah 338fce8b5d nested methods and attributes need to added individually 2023-11-28 12:52:57 +01:00
Test User 33b1d7902d [skip ci] updated version information after successful test of v3.0.0-alpha8-53-g05c4fcbea 2023-11-28 12:31:38 +01:00
Martin Diehl 9aa68e83a2 new delete function for VTK
follows 'damask.Table' and makes GeomGrid.load_SPPARKS easier
2023-11-28 11:51:14 +01:00
Martin Diehl 9710ec11f0 load data from SPPARKS
https://spparks.github.io/
2023-11-28 10:29:45 +01:00
Vitesh Shah 05da811afe adding ._hl method to modified h5py class
Simple loading of module from importlib misses the extra methods and
attributes associated with h5py.
For h5py._hl is missing which is needed for nullterm strings in
attributes.
2023-11-28 09:45:51 +01:00
Sharan Roongta 05c4fcbeaf Merge branch 'Grid2GeomGrid' into 'development'
more systematic name

See merge request damask/DAMASK!859
2023-11-28 07:23:50 +00:00
Cathy Bing b0ba1e78b7 two-step math_clip 2023-11-28 01:09:20 -05:00
Cathy Bing 779a6e7a05 edge dipole annihilation via climb is not disabled anymore when stress is zero 2023-11-28 00:15:18 -05:00
Test User 8427adcaec [skip ci] updated version information after successful test of v3.0.0-alpha8-50-gf02c1dc44 2023-11-28 01:40:16 +01:00
Martin Diehl 4c5f980d00 more systematic name 2023-11-27 23:14:23 +01:00
Sharan Roongta f02c1dc44a Merge branch 'no-lc-for-parameters' into 'development'
use consistently case-sensitive parameters

See merge request damask/DAMASK!858
2023-11-27 22:09:35 +00:00
Test User 558ab1c98b [skip ci] updated version information after successful test of v3.0.0-alpha8-47-gf86d4be18 2023-11-27 15:53:09 +01:00
Vitesh Shah 1cf8696cbb correct crystal structure array shape 2023-11-27 15:51:02 +01:00
Vitesh Shah 986d6a5973 compare the bytes types better 2023-11-27 15:34:02 +01:00
Vitesh Shah e3d85e09c8 even with patched copy the class needs to called 2023-11-27 14:00:17 +01:00
Daniel Otto de Mentock f86d4be18a Merge branch 'more-tests' into 'development'
More tests

See merge request damask/DAMASK!857
2023-11-27 12:53:54 +00:00
Vitesh Shah b1c2e51528 name correction 2023-11-27 11:10:37 +01:00
Martin Diehl 1fb5e159ad larger tolerance (test failed on Intel) 2023-11-27 06:41:13 +01:00
Martin Diehl 2018b623ce wrong capitalization 2023-11-26 19:09:34 +01:00
Martin Diehl a38ec385c7 test simple tensor operations 2023-11-26 19:03:17 +01:00
Martin Diehl 246e708e5b systematic testing of read/write 2023-11-26 13:05:39 +01:00
Martin Diehl 8bc5b30e54 dim 6 and 7 are not used
trivial do add if needed
2023-11-26 12:49:34 +01:00
Martin Diehl 1cf1f9df31 test more dimensions 2023-11-26 12:38:35 +01:00
Martin Diehl 4749b36ae9 simplified 2023-11-26 12:23:37 +01:00
Martin Diehl 3c62af3fe5 test 2D arrays and read-only file opening 2023-11-26 08:16:24 +01:00
Martin Diehl d1432e5bd8 allow MPI parallel execution 2023-11-26 08:15:40 +01:00
Martin Diehl 57ee7e86e4 better name 2023-11-26 07:50:22 +01:00
Martin Diehl 690d63734a avoid message about unused parameters 2023-11-25 20:39:39 +01:00
Martin Diehl 4d525c35bc use consistently case-sensitive parameters 2023-11-25 16:21:00 +01:00
Martin Diehl febbddd36a starting to test system_routines 2023-11-25 16:12:37 +01:00
Test User 4fa292ad20 [skip ci] updated version information after successful test of v3.0.0-alpha8-34-g24864f2f2 2023-11-25 15:44:30 +01:00
Martin Diehl 665e2d5b38 test IO_read and IO_readlines 2023-11-25 15:26:41 +01:00
Martin Diehl 24864f2f22 Merge branch 'github-actions-PETSc-3.20.1' into 'development'
PETSc 3.20.1

See merge request damask/DAMASK!856
2023-11-25 11:37:27 +00:00
Martin Diehl c21afafce5 PETSc 3.20.1 2023-11-25 10:27:08 +01:00
Test User 0ec8317202 [skip ci] updated version information after successful test of v3.0.0-alpha8-31-gbfa1cf677 2023-11-24 12:14:27 +01:00
Daniel Otto de Mentock bfa1cf6773 Merge branch 'char-twin-simplification2' into 'development'
Char twin simplification2

See merge request damask/DAMASK!855
2023-11-24 09:16:04 +00:00
Vitesh Shah 30b546f2dd message in case of unstructured grids and more constituents 2023-11-24 08:03:16 +01:00
Vitesh Shah fb823c81e7 not needed since patched copy of module is used 2023-11-24 07:55:41 +01:00
Vitesh Shah 2a48bf504e attempting patched copy of h5py
https://stackoverflow.com/questions/11170949/how-to-make-a-copy-of-a-python-module-at-runtime
2023-11-24 07:55:41 +01:00
Vitesh Shah 597175d8fd tests for PhaseName and CrystalStructure datasets and their attributes 2023-11-24 07:55:41 +01:00
Vitesh Shah 66dc5af5e0 needs specific datatype to write string arrays 2023-11-24 07:55:40 +01:00
Vitesh Shah 5dd9445f58 polishing 2023-11-24 07:55:03 +01:00
Martin Diehl b9e41732d4 documented 2023-11-23 11:29:18 +01:00
Martin Diehl f9c34e799e indicator not needed 2023-11-22 20:32:28 +01:00
Martin Diehl eaf65e5665 loop not needed 2023-11-22 20:31:35 +01:00
Martin Diehl 34db73b068 more logical order 2023-11-22 20:22:05 +01:00
Test User f6c463d2a6 [skip ci] updated version information after successful test of v3.0.0-alpha8-25-g0a73cd886 2023-11-22 18:40:02 +01:00
Sharan Roongta 0a73cd8869 Merge branch 'no-restart-for-mesh' into 'development'
restart (currently) not supported for mesh solver

See merge request damask/DAMASK!850
2023-11-22 15:05:14 +00:00
Daniel Otto de Mentock 0e626490df Merge branch 'char-twin-simplification' into 'development'
no need to expand, is a property of the family

See merge request damask/DAMASK!851
2023-11-22 15:02:52 +00:00
Test User 46a087e9ed [skip ci] updated version information after successful test of v3.0.0-alpha8-20-g1aa698c46 2023-11-22 13:06:13 +01:00
Martin Diehl 1aa698c46a Merge branch 'improve-github-actions' into 'development'
Improve github actions

See merge request damask/DAMASK!854
2023-11-22 10:08:49 +00:00
Martin Diehl 40c0fbf9aa was fixed 2023-11-22 08:02:31 +01:00
Martin Diehl 19005faa9d include most recent GNU compiler 2023-11-22 08:01:30 +01:00
Test User e3e6aa2fc8 [skip ci] updated version information after successful test of v3.0.0-alpha8-16-g1be424b69 2023-11-21 17:18:39 +01:00
Martin Diehl 1be424b697 Merge branch 'pyton3.12-github' into 'development'
include most recent Python version

See merge request damask/DAMASK!853
2023-11-21 13:17:08 +00:00
Test User d2b80c350e [skip ci] updated version information after successful test of v3.0.0-alpha8-13-gb85a754ae 2023-11-21 08:55:48 +01:00
Martin Diehl b85a754aec Merge branch 'oneapi-image-github' into 'development'
use container with oneapi installation

See merge request damask/DAMASK!852
2023-11-21 05:57:58 +00:00
Martin Diehl 693f3cf07e include most recent Python version 2023-11-21 00:05:40 +01:00
Test User 71a7d8e3d6 [skip ci] updated version information after successful test of v3.0.0-alpha8-10-gb63dd758d 2023-11-21 00:03:21 +01:00
Martin Diehl eddeb8b695 use container with oneapi installation
avoids long installation
2023-11-20 23:58:34 +01:00
Martin Diehl b63dd758dd Merge branch 'no-Intel-classic' into 'development'
icc does not exist anymore

See merge request damask/DAMASK!849
2023-11-20 20:07:13 +00:00
Martin Diehl b77a4145d0 no need to expand, is a property of the family 2023-11-20 19:31:56 +01:00
Philip Eisenlohr 56ae726f05 Merge branch 'fix-C66-twin' into 'development'
bugfix: used wrong definition

See merge request damask/DAMASK!848
2023-11-20 17:57:54 +00:00
Martin Diehl 5d6fcd497b icc does not exist anymore 2023-11-20 16:47:39 +01:00
Martin Diehl 5db4c3ecf6 document 2023-11-20 16:19:20 +01:00
Philip Eisenlohr 873ca78b8c Merge branch 'avoid-nan-cast-warning' into 'development'
Silence Runtime warning when casting (masking) NaN values to color

See merge request damask/DAMASK!847
2023-11-20 14:51:31 +00:00
Martin Diehl fbdab24f4b bugfix: used wrong definition
looks like a copy and paste error
2023-11-20 13:27:34 +01:00
Martin Diehl c0a97a93fe do not overwrite input, use specialized function 2023-11-20 12:27:23 +01:00
Martin Diehl 39dacbc972 easier to understand 2023-11-20 11:49:59 +01:00
Martin Diehl 57fab5db1c restart (currently) not supported for mesh solver 2023-11-20 09:39:59 +01:00
Philip Eisenlohr d8baf3c754 reset field to average of bounds avoiding casting masked NaNs 2023-11-18 20:06:15 -05:00
Test User 9a12bf5ee7 [skip ci] updated version information after successful test of v3.0.0-alpha8 2023-11-14 21:15:45 +01:00
Martin Diehl b642c9cf00 v3.0.0-alpha8 2023-11-14 16:54:25 +01:00
Test User 2f66a86830 [skip ci] updated version information after successful test of v3.0.0-alpha7-924-g66b36d471 2023-11-14 14:52:26 +01:00
Daniel Otto de Mentock 66b36d4711 Merge branch 'new-elastic-constants' into 'development'
new temperature-dependent elastic constants

See merge request damask/DAMASK!845
2023-11-14 11:17:33 +00:00
Martin Diehl cc6f2250d3 Merge branch 'corrected-legacy-script' into 'development'
corrected and adapted script for Marc2023.x

See merge request damask/DAMASK!846
2023-11-14 10:16:55 +00:00
Vitesh Shah 56a9dd843c polishing 2023-11-10 12:56:18 +01:00
Vitesh Shah 562e2ea932 updated the files 2023-11-10 12:45:02 +01:00
Vitesh Shah df697981ee avoid file duplication 2023-11-10 12:45:02 +01:00
Vitesh Shah a257fe3e1f updated the resource files 2023-11-10 12:45:02 +01:00
Vitesh Shah 27168f2234 get crystal structure info from DADF5 2023-11-10 12:45:01 +01:00
Vitesh Shah 796e1ae2d5 increment number with leading zeroes 2023-11-10 12:45:01 +01:00
Test User f8f8e3b441 [skip ci] updated version information after successful test of v3.0.0-alpha7-919-g5877eafa6 2023-11-07 21:23:41 +01:00
Martin Diehl 5877eafa61 Merge branch 'fix-relationship-operations' into 'development'
proper bi-directional orientation relationships

Closes #333 and #322

See merge request damask/DAMASK!841
2023-11-07 18:23:57 +00:00
Martin Diehl b332fd2b30 restored type hints
for some strange reason, ignore is needed for damask.Crystal.__eq__
2023-11-07 11:32:40 +01:00
Martin Diehl fbfe2affb7 Merge remote-tracking branch 'origin/master' into fix-relationship-operations 2023-11-07 10:27:29 +01:00
Martin Diehl 1855bafd6a additional, self-explanatory tests 2023-11-07 01:09:25 +01:00
Martin Diehl f687e0a433 helpful error message 2023-11-06 23:42:11 +01:00
Test User 7ea8f5a7da [skip ci] updated version information after successful test of v3.0.0-alpha7-908-g8ff6e28c9 2023-11-06 23:29:17 +01:00
Daniel Otto de Mentock 8ff6e28c91 Merge branch 'fix-mesh-for-new-PETSc' into 'development'
mesh works again for PETSc >= 3.19

Closes #320

See merge request damask/DAMASK!843
2023-11-06 20:30:56 +00:00
Philip Eisenlohr 50d47908fb clearer help 2023-11-06 10:00:07 -05:00
Philip Eisenlohr d38ab0e07a signed direction as in KS paper; added Pitsch and Burgers references 2023-11-03 18:51:57 -04:00
Martin Diehl bb234938cc whitespace polishing 2023-11-02 15:43:11 +01:00
Martin Diehl 5a5f1cfc5b mesh works again for PETSc >= 3.19
needs also bugfix in PETSc: https://gitlab.com/petsc/petsc/-/merge_requests/6986
2023-11-02 15:41:20 +01:00
Martin Diehl 80c6823777 new temperature-dependent elastic constants 2023-10-30 00:40:41 +01:00
Test User 51526b6ae4 [skip ci] updated version information after successful test of v3.0.0-alpha7-904-g2a00de5fb 2023-10-27 19:56:50 +02:00
Franz Roters f67660902c corrected and adapted script for Marc2023.x 2023-10-27 17:18:02 +02:00
Franz Roters 2a00de5fbb Merge branch '344-readme-md-outlining-different-repositories' into 'development'
Update README.md with repository locations

Closes #344

See merge request damask/DAMASK!842
2023-10-27 15:09:00 +00:00
Philip Eisenlohr 80061fafd6 Update README.md with repository locations 2023-10-27 15:09:00 +00:00
Philip Eisenlohr 934835f93c proper return value when lacking lattice information 2023-10-24 15:00:19 -04:00
Philip Eisenlohr 926d86935f added typehinting 2023-10-24 14:39:17 -04:00
Philip Eisenlohr 199b84d096 proper bi-directional orientation relationships 2023-10-23 22:53:27 -04:00
Test User ff2c66f8f0 [skip ci] updated version information after successful test of v3.0.0-alpha7-901-ga25d1b1b9 2023-10-21 08:43:41 +02:00
Martin Diehl a25d1b1b94 Merge branch 'libfyaml0.9-compatibility' into 'development'
Libfyaml0.9 compatibility

See merge request damask/DAMASK!839
2023-10-21 04:45:56 +00:00
Test User 3268ed2eb0 [skip ci] updated version information after successful test of v3.0.0-alpha7-898-g7d3692317 2023-10-21 03:24:36 +02:00
Martin Diehl 7d36923178 Merge branch 'new-Marc-versions' into 'development'
New marc versions

See merge request damask/DAMASK!838
2023-10-20 23:26:18 +00:00
Martin Diehl 2cfcac67ce updated to 2023.3 2023-10-20 23:29:09 +02:00
Test User 15cfeff898 [skip ci] updated version information after successful test of v3.0.0-alpha7-891-g72fa02f58 2023-10-20 20:04:54 +02:00
Martin Diehl d1807b1860 libfyaml 0.9 has a list of libraries 2023-10-20 17:30:28 +02:00
Philip Eisenlohr 72fa02f586 Merge branch 'fix-seeds-from_grid' into 'development'
correct calculation for origin

See merge request damask/DAMASK!837
2023-10-20 15:16:42 +00:00
Franz Roters 755fa7e5d8 make Marc 2023.3 the default version and use it for testing 2023-10-18 16:21:29 +02:00
Franz Roters ab41273df7 make Marc 2023.2 and use it for testing with new reference results 2023-10-18 13:56:27 +02:00
Franz Roters 7eb16ddc75 add support for Marc2023.3 2023-10-18 13:54:15 +02:00
Franz Roters e5864efb8a add support for Marc2023.2 2023-10-18 13:53:23 +02:00
Test User 0bcea6d9b0 [skip ci] updated version information after successful test of v3.0.0-alpha7-888-g5bb7e54df 2023-10-16 18:59:38 +02:00
Martin Diehl 467638e952 do not include origin into calculation 2023-10-16 15:33:57 +02:00
Daniel Otto de Mentock 5bb7e54dfc Merge branch '308-fortran-type-for-result-and-hdf5_utilities-not-found-when-using-classic-intel-compiler' into 'development'
fix issues with compilation

Closes #308

See merge request damask/DAMASK!822
2023-10-16 12:59:20 +00:00
Martin Diehl 134e640ffe Merge branch '336-performance-degradation-for-new-non-schmid-formulation' into 'development'
no merge in hot loop

See merge request damask/DAMASK!833
2023-10-16 12:53:40 +00:00
Test User 2e153086c9 [skip ci] updated version information after successful test of v3.0.0-alpha7-883-g3517c7dee 2023-10-13 16:41:08 +02:00
Vitesh f71b1c4dc3 Merge branch 'development' into 'export_DAMASK_to_DREAM3D'
# Conflicts:
#   python/damask/_result.py
2023-10-13 12:21:46 +00:00
Daniel Otto de Mentock 3517c7dee3 Merge branch 'petsc-3.20' into 'development'
PETSc 3.20

See merge request damask/DAMASK!834
2023-10-13 11:14:57 +00:00
Vitesh Shah 556ac6bfed legacy code not needed anymore 2023-10-13 11:27:35 +02:00
Vitesh Shah 8bb193cc70 reset the attribute manager to default 2023-10-09 20:20:34 +02:00
Martin Diehl 57e02bb991 PETSc 3.20 2023-10-09 20:10:05 +02:00
Test User c48cee1af2 [skip ci] updated version information after successful test of v3.0.0-alpha7-880-g3644fe586 2023-10-09 17:09:09 +02:00
Philip Eisenlohr 3644fe586a Merge branch 'test_YAML_types' into 'development'
testing YAML_types

See merge request damask/DAMASK!832
2023-10-09 13:04:59 +00:00
Test User 0c7384b95d [skip ci] updated version information after successful test of v3.0.0-alpha7-877-g5fc3b23cc 2023-10-07 02:22:05 +02:00
Martin Diehl 5fc3b23cc4 Merge branch 'smart-blend' into 'development'
robust Rotation/Orientation blending

See merge request damask/DAMASK!831
2023-10-06 22:14:31 +00:00
Philip Eisenlohr 51a35dd17c correct in_disorientation_FZ 2023-10-06 09:41:36 -04:00
Test User 23ec58fb4a [skip ci] updated version information after successful test of v3.0.0-alpha7-871-g4f2c726b9 2023-10-06 14:10:11 +02:00
Daniel Otto de Mentock 4f2c726b95 Merge branch 'result-typehints' into 'development'
more specific typehints

See merge request damask/DAMASK!825
2023-10-06 08:43:37 +00:00
Martin Diehl b26398319b testing YAML_types 2023-10-05 22:58:31 +02:00
Martin Diehl 0e353d9feb no merge in hot loop
results in measureable run time decrease for Intel and GNU compilers
2023-10-05 17:13:46 +02:00
Philip Eisenlohr 634f9fd1f5 extended slicing types, but have to ignore..! 2023-10-04 10:38:03 -04:00
Philip Eisenlohr afe2094c65 remove debug print 2023-10-04 10:29:55 -04:00
Philip Eisenlohr 550c757cdc overall smart blending; more robust disFZ 2023-10-04 09:42:09 -04:00
Philip Eisenlohr 983a376f45 bugfix; serial string use 2023-10-04 09:10:11 -04:00
Martin Diehl a0dc25c16e more specific typehints 2023-10-03 23:02:12 +02:00
Vitesh Shah 85010a8d6d the monkey patch should be used only for export Dream3D
Initially  it got activated at the start of _result.py
This led to failure of other tests.
Use the patch only when needed.
2023-10-02 15:11:02 +02:00
Test User 05e675bbdb [skip ci] updated version information after successful test of v3.0.0-alpha7-867-g026dd3c14 2023-09-29 18:53:37 +02:00
Franz Roters 026dd3c14b Merge branch 'large-tmp' into 'development'
TMPDIR controls the behavior of mktemp

See merge request damask/DAMASK!829
2023-09-29 14:50:40 +00:00
Vitesh Shah fc44112109 change of variable name after merge 2023-09-29 09:23:58 +02:00
Vitesh Shah 5ba83fd05b Merge branch 'development' into export_DAMASK_to_DREAM3D 2023-09-29 08:00:23 +02:00
Test User 77675e5890 [skip ci] updated version information after successful test of v3.0.0-alpha7-864-g9cf37c493 2023-09-28 15:32:49 +02:00
Martin Diehl baf04ad5eb TMPDIR controls the behavior of mktemp 2023-09-28 11:52:34 +02:00
Martin Diehl 9cf37c4939 Merge branch 'test-polynomials' into 'development'
add polynomials to DAMASK_test

See merge request damask/DAMASK!827
2023-09-28 09:36:44 +00:00
Martin Diehl f1b0f68000 do not report "self coverage" 2023-09-28 07:20:09 +02:00
Philip Eisenlohr dab5ba1e60 call polynomials_selfTest in DAMASK_test 2023-09-28 07:07:49 +02:00
Martin Diehl 8489658cb4 avoid use of unitialized variable (x_ref)
further polishing for better readability
2023-09-27 20:56:49 +02:00
Franz Roters a5a4ba0a54 Merge branch 'small-dislotwin-fix' into 'development'
fix erroneous check for N_tr

See merge request damask/DAMASK!826
2023-09-27 12:23:44 +00:00
Philip Eisenlohr f8cead9e0a Merge branch 'no-FMA' into 'development'
let the compiler do the work

See merge request damask/DAMASK!824
2023-09-27 12:06:35 +00:00
Test User 03259c8895 [skip ci] updated version information after successful test of v3.0.0-alpha7-854-g44916cfc4 2023-09-27 12:52:14 +02:00
Daniel Otto de Mentock 44916cfc45 Merge branch 'better-gfortran-debug' into 'development'
simplify debugging

See merge request damask/DAMASK!799
2023-09-27 08:12:36 +00:00
Franz Roters 68ed6937cb Merge branch 'nonSchmid-adaptation' into 'development'
Non-Schmid adaptation

Closes #324

See merge request damask/DAMASK!817
2023-09-27 07:05:34 +00:00
Philip Eisenlohr 836ddb4ba5 easier to understand (and maybe failsafe against empty coef) 2023-09-26 22:27:28 +00:00
Philip Eisenlohr f7e06660b1 Merge branch 'development' into nonSchmid-adaptation 2023-09-26 17:57:30 -04:00
Philip Eisenlohr 5f2b73f815 use merged PRIVATE 2023-09-26 09:44:48 -04:00
Philip Eisenlohr 3621f0e8a1 check for N_tr, not twice N_tw 2023-09-26 09:17:25 -04:00
Test User 96ee2af279 [skip ci] updated version information after successful test of v3.0.0-alpha7-837-gc3d3ea658 2023-09-25 21:01:01 +02:00
Daniel Otto de Mentock c3d3ea6588 Merge branch '272-parallel-post-processing' into 'development'
no multiprocessing for adding datasets

Closes #272

See merge request damask/DAMASK!820
2023-09-25 15:31:43 +00:00
Daniel Otto de Mentock 1750e5cc30 Merge branch 'nicer-assert-allclose' into 'development'
Nicer assert allclose

See merge request damask/DAMASK!818
2023-09-25 14:14:42 +00:00
Martin Diehl 28cb72ced0 simplified 2023-09-25 13:58:17 +02:00
Test User eff54f9566 [skip ci] updated version information after successful test of v3.0.0-alpha7-824-g5b6aeaf4b 2023-09-24 23:43:25 +02:00
Martin Diehl 5b6aeaf4b3 Merge branch 'shaped-rotation-application' into 'development'
Shaped rotation application

See merge request damask/DAMASK!819
2023-09-24 18:49:41 +00:00
Martin Diehl c619bed975 let the compiler do the work
compilers are aware of the FMA instruction and use it
2023-09-24 06:31:36 +02:00
Test User a99daf5e14 [skip ci] updated version information after successful test of v3.0.0-alpha7-817-g57d8a6c43 2023-09-24 03:16:13 +02:00
Philip Eisenlohr 57d8a6c438 Merge branch 'load-DREAM3d-improvements' into 'development'
Load dream3d improvements

See merge request damask/DAMASK!821
2023-09-23 23:14:03 +00:00
Martin Diehl 8b421ba7a7 simplified 2023-09-23 06:20:25 +02:00
Martin Diehl ac898be888 fix issues with compilation
preprocessor statement or unsupported private/public statemens for
modules seem to confuse CMake
2023-09-22 20:24:58 +02:00
Martin Diehl 4a943ff844 ensure closed file 2023-09-22 15:18:29 +02:00
Martin Diehl 36d2ae1c2a avoid repeated opening of files 2023-09-22 15:17:58 +02:00
Martin Diehl d832d4cf17 improved documentation 2023-09-22 15:17:28 +02:00
Martin Diehl ee4cfe4b24 new name
'prod' was introduced in numpy 1.7, 'product' will be removed in 2.0
2023-09-22 11:46:39 +02:00
Martin Diehl 36c13d2e58 no need to have this as class method
definition as class method was needed to be visible in multiprocessing
2023-09-22 10:58:25 +02:00
Martin Diehl b0bb904c89 no multiprocessing for adding datasets
multiprocessing was not reliable on different platform and caused all
kinds of weird behavior
2023-09-22 08:36:34 +02:00
Martin Diehl d7a9b76ba9 better debug for Intel LLVM compiler 2023-09-22 07:17:57 +02:00
Martin Diehl 7c2e870d17 polishing 2023-09-22 07:10:08 +02:00
Philip Eisenlohr 23c6270d4a added examples 2023-09-21 17:27:38 -04:00
Martin Diehl eeb5de0531 easier to understand 2023-09-21 22:32:38 +02:00
Philip Eisenlohr 177da6e2cb use clean PRIVATE 2023-09-21 08:15:56 -04:00
Philip Eisenlohr 108ef2a954 reflect updated shape blending 2023-09-19 18:05:12 -04:00
Philip Eisenlohr 4c4c1fbcc8 small polish 2023-09-19 18:03:55 -04:00
Philip Eisenlohr 0704f1122e result (and object interpretation) "flows" from rotation and data shapes 2023-09-19 17:50:28 -04:00
Philip Eisenlohr b3f98ab877 more flexible shapeblending 2023-09-19 17:43:27 -04:00
Philip Eisenlohr 4b6f66b254 new PRIVATE content 2023-09-19 09:17:06 -04:00
Philip Eisenlohr 16b029cf39 bug fix: used wrong index for slip family-dependent coeffs 2023-09-18 09:44:52 -04:00
Philip Eisenlohr 6a75a1ad23 avoid uninitialized mem access 2023-09-18 14:49:53 +02:00
Philip Eisenlohr 4d34c40733 use correct plastic_detect_changes test 2023-09-16 15:04:05 -04:00
Philip Eisenlohr e4fee4aba4 updated PRIVATE 2023-09-16 14:30:24 -04:00
Philip Eisenlohr fbeb5a15f0 include updated conftest.py in PRIVATE 2023-09-15 21:53:42 -04:00
Philip Eisenlohr 6d2b175018 removed obsolete function 2023-09-15 21:41:37 -04:00
Philip Eisenlohr ee058c53ec extended math_expand docstring 2023-09-15 21:21:50 -04:00
Philip Eisenlohr dd3d5483d6 adapted dislotungsten; does not converge with large(r) coefficients... 2023-09-15 21:20:55 -04:00
Test User 0604e510ec [skip ci] updated version information after successful test of v3.0.0-alpha7-812-g96699f994 2023-09-15 22:52:14 +02:00
Philip Eisenlohr 715bc1bb83 adapted nonlocal 2023-09-15 13:15:55 -04:00
Martin Diehl 96699f994f Merge branch 'nonSchmid-fix' into 'development'
corrected sign definition of <111>{110} slip systems

See merge request damask/DAMASK!816
2023-09-15 16:56:32 +00:00
Philip Eisenlohr 7ac552ee49 adapted kinehardening 2023-09-15 11:13:58 -04:00
Philip Eisenlohr 2a88285088 adapted phenopowerlaw 2023-09-15 10:50:41 -04:00
Martin Diehl 4de21b5f86 more systematic name 2023-09-15 00:28:40 +02:00
Philip Eisenlohr a2b571c1fc corrected sign definition of <111>{110} slip systems
Breaking change: Sign of shear differs
2023-09-15 00:21:04 +02:00
Martin Diehl 0396332b7b needed for fixed non-Schmid behavior 2023-09-14 22:46:12 +02:00
Test User f08b4db7b8 [skip ci] updated version information after successful test of v3.0.0-alpha7-807-g104efaed5 2023-09-12 11:29:45 +02:00
Franz Roters 104efaed5c use general server name, i.e. damsk.mpie.de 2023-09-12 09:28:16 +02:00
Test User 49051a7b52 [skip ci] updated version information after successful test of v3.0.0-alpha7-805-g0051bacaa 2023-09-11 18:45:07 +02:00
Franz Roters 0051bacaa7 Merge branch 'improved-PRIVATE-error-reporting' into 'development'
improved reporting of assert_allclose in PRIVATE/testing

See merge request damask/DAMASK!815
2023-09-11 13:34:00 +00:00
Test User 60b6e59272 [skip ci] updated version information after successful test of v3.0.0-alpha7-799-g2f8680e04 2023-09-07 19:33:34 +02:00
Philip Eisenlohr ef55df6c40 Merge branch 'development' into improved-PRIVATE-error-reporting 2023-09-07 10:49:31 -04:00
Philip Eisenlohr 2f8680e045 Merge branch 'restructure-numerics' into 'development'
Restructure numerics

Closes #271 and #63

See merge request damask/DAMASK!790
2023-09-07 14:30:33 +00:00
Philip Eisenlohr 7c907fb05d modified PRIVATE 2023-09-06 16:08:28 -04:00
Philip Eisenlohr af955df891 added phi_min back to example; more consistency in code syntax 2023-09-06 15:11:48 -04:00
Sharan 925da8aad4 Merge remote-tracking branch 'origin/numerics-comment-format' into restructure-numerics 2023-09-06 20:14:58 +02:00
Sharan 9c4fa16c7d new mech dict 2023-09-06 19:57:40 +02:00
Sharan eacdf38482 Merge remote-tracking branch 'origin/development' into restructure-numerics 2023-09-06 12:17:13 +02:00
Sharan 252128a863 updated private repo 2023-09-06 12:16:58 +02:00
Sharan e101b5cca8 correct pointer 2023-09-06 11:17:39 +02:00
Philip Eisenlohr 1de0b62eab use corrected conftest.py in PRIVATE 2023-09-05 23:34:27 -04:00
Philip Eisenlohr 2434c322ca more sensible sorting of sections; additional polish 2023-09-05 13:14:20 -04:00
Philip Eisenlohr 68218672fe use updated PRIVATE 2023-09-05 11:44:45 -04:00
Test User a0335aa0c4 [skip ci] updated version information after successful test of v3.0.0-alpha7-784-g69239661c 2023-09-04 22:38:03 +02:00
Franz Roters 69239661cf Merge branch 'sanity-check-rho' into 'development'
thermal sanity checks

See merge request damask/DAMASK!813
2023-09-04 17:39:11 +00:00
Philip Eisenlohr 8399a11703 more extensive numerics.yaml documentation 2023-09-04 11:39:45 -04:00
Cathy Bing 288aa73047 added sanity check for positive rho,C_p,K in thermal 2023-09-01 17:30:37 -04:00
Test User 30464c2d9b [skip ci] updated version information after successful test of v3.0.0-alpha7-781-gbe87d9eed 2023-09-01 18:04:50 +02:00
Martin Diehl be87d9eed8 Merge branch '326-faster-euler-to-quaternion' into 'development'
adopt faster quaternion-to-Euler algorithm

Closes #326

See merge request damask/DAMASK!812
2023-09-01 14:04:54 +00:00
Martin Diehl 9b0a051737 standardized citation 2023-09-01 13:05:28 +02:00
Test User 8728491988 [skip ci] updated version information after successful test of v3.0.0-alpha7-777-g76f7f2d2b 2023-08-31 21:32:40 +02:00
Philip Eisenlohr 96137f6768 use 30% faster algorithm 2023-08-31 15:29:48 -04:00
Philip Eisenlohr 76f7f2d2bc Merge branch 'improved-large-strain-thermal-test' into 'development'
better test for thermal large strain grid

See merge request damask/DAMASK!811
2023-08-31 17:32:14 +00:00
Philip Eisenlohr dab72465bd use updated PRIVATE 2023-08-31 11:31:41 -04:00
Test User 7eabc17dc9 [skip ci] updated version information after successful test of v3.0.0-alpha7-773-g8748af5dc 2023-08-30 20:42:03 +02:00
Martin Diehl 8e8fe810a4 better test for thermal large strain grid 2023-08-30 20:41:44 +02:00
Franz Roters 8748af5dc5 Merge branch 'reporting-references-before-phases' into 'development'
report references before phase count

See merge request damask/DAMASK!808
2023-08-30 14:58:54 +00:00
Franz Roters a765074a1f Merge branch 'fix-bct-slip-systems' into 'development'
bugfix: wrong definition of bct slip systems

See merge request damask/DAMASK!806
2023-08-30 13:16:09 +00:00
Daniel Otto de Mentock 0520c10c27 Merge branch 'custom-allclose-in-testing' into 'development'
switch to symmetric allclose in testing

See merge request damask/DAMASK!810
2023-08-30 13:02:14 +00:00
Philip Eisenlohr 82c96c9573 use corresponding PRIVATE 2023-08-29 15:47:10 -04:00
Martin Diehl 3f8a561465 testing tI slip systems 2023-08-29 14:18:16 +02:00
Test User bc1d7f850c [skip ci] updated version information after successful test of v3.0.0-alpha7-765-gb11807486 2023-08-29 09:21:10 +02:00
Martin Diehl b118074864 Merge branch 'remove-obsolete-kinematics-active2' into 'development'
Delete obsolete kinematics_active2

See merge request damask/DAMASK!807
2023-08-29 05:13:36 +00:00
Philip Eisenlohr aa651e04ae reverse order of printing 2023-08-28 21:43:21 -04:00
Philip Eisenlohr b0809a8afe function is obsolete 2023-08-28 17:59:37 -04:00
Martin Diehl 6958829343 might help during debugging 2023-08-28 22:05:51 +02:00
Test User edd71a0908 [skip ci] updated version information after successful test of v3.0.0-alpha7-762-g0cda7af7e 2023-08-28 18:00:44 +02:00
Philip Eisenlohr 0cda7af7ed Merge branch 'documenting-symmetry' into 'development'
document source of symmetry operations

See merge request damask/DAMASK!803
2023-08-28 12:50:10 +00:00
Martin Diehl ea8359ddc8 Merge branch 'compose-broadcasted-rotations' into 'development'
Numpy-intrinsic broadcasting for "outer" rotation compositions

See merge request damask/DAMASK!804
2023-08-28 12:49:45 +00:00
Martin Diehl 854211a71f bugfix: wrong definition of bct slip systems 2023-08-18 21:46:44 +02:00
Test User f80a8e7f49 [skip ci] updated version information after successful test of v3.0.0-alpha7-756-g32c1711b4 2023-08-18 17:59:32 +02:00
Philip Eisenlohr 32c1711b44 Merge branch 'lattice-naming' into 'development'
there is no "crystal lattice", what we define are the 14 Bravais lattices

See merge request damask/DAMASK!802
2023-08-18 13:52:07 +00:00
Philip Eisenlohr 0393bdb214 added broadcasting test for composite rotations 2023-08-17 21:21:16 +00:00
Philip Eisenlohr fb2d49741a self.shape does not equal broadcastable shape 2023-08-17 21:10:26 +00:00
Martin Diehl e944ece5ec document source of symmetry operations 2023-08-17 14:41:46 +02:00
Sharan 09f3b2063d Merge remote-tracking branch 'origin/development' into restructure-numerics 2023-08-17 12:09:10 +02:00
Martin Diehl cc8790908c there is no "crystal lattice", what we define are the 14 Bravais
lattices
2023-08-16 22:01:20 +02:00
Test User 71b5b95450 [skip ci] updated version information after successful test of v3.0.0-alpha7-753-gaa28fe677 2023-08-14 21:18:44 +02:00
Daniel Otto de Mentock aa28fe677e Merge branch 'no-line-length-limit' into 'development'
avoid issues with long lines

See merge request damask/DAMASK!796
2023-08-14 17:08:51 +00:00
Test User 214376c102 [skip ci] updated version information after successful test of v3.0.0-alpha7-749-g92a500797 2023-08-14 13:49:15 +02:00
Franz Roters 92a5007975 Merge branch '318-per-family-parameters-in-kinehardening' into 'development'
per-family parameters for kinehardening

Closes #318

See merge request damask/DAMASK!800
2023-08-14 09:35:30 +00:00
Test User fc3c4c0be7 [skip ci] updated version information after successful test of v3.0.0-alpha7-746-gc93309ed0 2023-08-11 17:48:55 +02:00
Philip Eisenlohr e161ef40b3 per-family parameters for kinehardening 2023-08-11 10:36:03 -04:00
Philip Eisenlohr c93309ed06 Merge branch 'use-IO-in-CLI' into 'development'
Use IO in CLI

See merge request damask/DAMASK!798
2023-08-11 13:30:19 +00:00
Test User 0bd826bf4d [skip ci] updated version information after successful test of v3.0.0-alpha7-742-ge8534d6ff 2023-08-11 12:09:01 +02:00
Franz Roters e8534d6ff6 Merge branch 'math-improvements' into 'development'
Math improvements

See merge request damask/DAMASK!794
2023-08-11 08:01:55 +00:00
Martin Diehl a1eb7829ee Math improvements 2023-08-11 08:01:55 +00:00
Test User 5cff94c370 [skip ci] updated version information after successful test of v3.0.0-alpha7-739-g81066f22c 2023-08-11 00:54:06 +02:00
Martin Diehl 7d08286192 clearer error message 2023-08-10 23:49:20 +02:00
Martin Diehl fe2cf94d70 use central functionality 2023-08-10 23:06:31 +02:00
Martin Diehl 81066f22cf Merge branch 'CLI-report-numerics' into 'development'
Report optional numerics config file

See merge request damask/DAMASK!797
2023-08-10 20:21:43 +00:00
Philip Eisenlohr 82a55ee28d report optional numerics config file 2023-08-10 12:52:27 -04:00
Test User 651d0d989b [skip ci] updated version information after successful test of v3.0.0-alpha7-736-g91bb315d3 2023-08-10 18:24:08 +02:00
Franz Roters 91bb315d3c Merge branch 'phenopower-parameters-per-family' into 'development'
phenopowerlaw slip family-dependent

See merge request damask/DAMASK!793
2023-08-10 14:16:33 +00:00
Martin Diehl 26ad83a29b unused 2023-08-08 09:22:07 +02:00
Martin Diehl 98fe38a505 avoid issues with long lines
line length <= 132 is already enforced in pre-receive hook
2023-08-08 07:20:45 +02:00
Test User 05e7ca3ebe [skip ci] updated version information after successful test of v3.0.0-alpha7-730-g0e7b05799 2023-08-07 18:14:58 +02:00
Franz Roters 0e7b057990 Merge branch 'test-output-polish' into 'development'
DAMASK_test output polish

See merge request damask/DAMASK!795
2023-08-07 14:08:07 +00:00
Philip Eisenlohr aa2a20ba1d DAMASK_test output polish 2023-08-07 14:08:07 +00:00
Philip Eisenlohr 2e27236d35 use updated PRIVATE 2023-08-05 22:30:17 -04:00
Philip Eisenlohr 9d3de05816 corrected test resource; more informative error 2023-08-05 14:56:02 -04:00
Philip Eisenlohr 81d0002a49 corrected remaining instances of phenopowerlaw configuration 2023-08-05 11:50:03 -04:00
Test User 57b2816d31 [skip ci] updated version information after successful test of v3.0.0-alpha7-727-g7d1adebde 2023-08-05 00:15:11 +02:00
Martin Diehl 7d1adebde9 Merge branch 'mesh_compile' into 'development'
Petsc Destroy interfaces are not included in version<=3.16.x yet

See merge request damask/DAMASK!792
2023-08-04 19:58:16 +00:00
Daniel Otto de Mentock cc77d5c69b interfaces are not included in petsc version<=3.16.x yet 2023-08-04 19:16:47 +02:00
Philip Eisenlohr ffdf478b62 all parameters as slip family-dependent 2023-08-04 13:07:42 -04:00
Test User d428024d4d [skip ci] updated version information after successful test of v3.0.0-alpha7-724-ga2c9cfbbe 2023-08-04 17:56:57 +02:00
Franz Roters a2c9cfbbea Merge branch 'avoid-race-condition' into 'development'
avoid race conditions

See merge request damask/DAMASK!791
2023-08-04 13:38:30 +00:00
Martin Diehl fe3b58e501 avoid race conditions 2023-08-04 09:54:59 +02:00
Test User ab2711390b [skip ci] updated version information after successful test of v3.0.0-alpha7-721-g1d0cd6826 2023-08-03 16:44:57 +02:00
Franz Roters 1d0cd6826e during update revision update development first then master to minimize critical time frame 2023-08-03 14:35:07 +02:00
Franz Roters b789d7ec14 Merge branch 'master' into development 2023-08-03 14:29:29 +02:00
Test User e25db6830f [skip ci] updated version information after successful test of v3.0.0-alpha7-716-g23cd3fc1f 2023-08-02 18:31:49 +02:00
Sharan Roongta 99292c5081 prefix not required 2023-08-02 16:02:51 +02:00
Daniel Otto de Mentock 23cd3fc1fb Merge branch 'more-Fortran-test' into 'development'
include more unit tests for Fortran

See merge request damask/DAMASK!789
2023-08-02 13:35:34 +00:00
Sharan Roongta c960f8ed58 space needed to add new option + marc changes 2023-08-02 14:21:47 +02:00
Sharan Roongta ac63ee3600 marc and other minor changes 2023-08-02 14:18:54 +02:00
Sharan Roongta 482ba98b18 mesh numerics changes 2023-08-02 13:28:50 +02:00
Test User 72845dce07 [skip ci] updated version information after successful test of v3.0.0-alpha7-713-gd73f76901 2023-08-01 22:30:08 +02:00
Philip Eisenlohr d73f769013 Merge branch 'restructure-numerics' into 'development'
Restructure numerical parameters RGC

See merge request damask/DAMASK!788
2023-08-01 18:23:31 +00:00
Sharan Roongta 485839b651 consistent names 2023-08-01 18:03:00 +02:00
Sharan Roongta 4191762a41 seems redundant 2023-08-01 11:07:07 +02:00
Sharan Roongta 6b85ee47d4 new names 2023-08-01 10:49:43 +02:00
Franz Roters 649a520b33 [skip ci] Merge branch 'development' 2023-08-01 09:35:58 +02:00
Test User 4d03d1ab89 [skip ci] updated version information after successful test of v3.0.0-alpha7-706-g43b58c93e 2023-07-31 17:54:55 +02:00
Test User 1b5f4000bd [skip ci] updated version information after successful test of v3.0.0-alpha7-702-g39f4bc44e 2023-07-31 15:05:14 +02:00
Philip Eisenlohr 43b58c93ee Merge branch 'Marc2023.1' into 'development'
Marc2023.1

See merge request damask/DAMASK!786
2023-07-31 13:04:50 +00:00
Martin Diehl efeed13d8f include more unit tests for Fortran 2023-07-31 11:04:58 +02:00
Martin Diehl 39f4bc44e1 Merge branch '282-setup-for-fortran-unit-testing' into 'development'
Resolve "setup for Fortran unit testing"

Closes #282

See merge request damask/DAMASK!783
2023-07-31 08:51:15 +00:00
Martin Diehl dbad2a7413 hints from gfortran 2023-07-30 23:17:21 +02:00
Sharan Roongta a113492600 example file updated 2023-07-28 11:21:27 +02:00
Sharan Roongta 7923f48fa0 update RGC numerical parameters 2023-07-28 11:07:45 +02:00
Test User e9eb34692c [skip ci] updated version information after successful test of v3.0.0-alpha7-696-gd2e279da1 2023-07-27 01:43:03 +02:00
Philip Eisenlohr d2e279da16 Merge branch 'restructure-numerics' into 'development'
numerical parameters related to phase state and stress integration

See merge request damask/DAMASK!785
2023-07-26 21:37:22 +00:00
Philip Eisenlohr 776d75379c use modified numerics in test 2023-07-26 12:59:33 -04:00
Sharan Roongta af2a4c6e72 more readable 2023-07-26 16:32:47 +02:00
Sharan Roongta 2547d4a25c clear names 2023-07-25 23:04:29 +02:00
Test User d4019ec0ef [skip ci] updated version information after successful test of v3.0.0-alpha7-687-gee8876abd 2023-07-25 15:09:59 +02:00
Sharan Roongta 4f59fac81d Merge remote-tracking branch 'origin/development' into restructure-numerics 2023-07-25 11:05:22 +02:00
Sharan Roongta c4134f2358 updated examples 2023-07-25 11:04:38 +02:00
Philip Eisenlohr ee8876abdb Merge branch 'grid-solver-polishing' into 'development'
Grid solver polishing

See merge request damask/DAMASK!781
2023-07-25 08:51:15 +00:00
Franz Roters 94cd462c84 safe_cray_pointer is deprecheated 2023-07-25 10:42:35 +02:00
Sharan Roongta 33e0048010 subStep ---> step 2023-07-24 21:03:35 +02:00
Martin Diehl 039d5e0fce improved comments and naming 2023-07-24 18:46:06 +02:00
Martin Diehl d953e6bedf unified style 2023-07-24 18:29:36 +02:00
Franz Roters d8a1d28797 actually use new version 2023-07-24 17:06:07 +02:00
Sharan Roongta 59ae287564 numerical parameters related to phase state and stress integration 2023-07-24 10:04:22 +02:00
Franz Roters 96871350e4 add files to support Marc2023.1 2023-07-24 09:34:11 +02:00
Test User 040b58f795 [skip ci] updated version information after successful test of v3.0.0-alpha7-671-g0cace1ef8 2023-07-22 22:27:09 +02:00
Philip Eisenlohr dafd39566d can only have one instance per thermal source 2023-07-22 15:30:09 -04:00
Philip Eisenlohr 2d0b64e00d better variable names 2023-07-22 15:30:09 -04:00
Philip Eisenlohr 4086f40a16 pull "constants" out of inner loops 2023-07-22 14:01:53 -04:00
Philip Eisenlohr 0cace1ef86 Merge branch 'improved_CI' into 'development'
ensure performance plots are updated only when performance test is (successfully) completetd

See merge request damask/DAMASK!782
2023-07-22 17:20:01 +00:00
Martin Diehl 289dceb584 simple coverage report 2023-07-21 11:46:21 +02:00
Martin Diehl 1fdc5443b2 avoid code (loop) duplication 2023-07-21 08:39:46 +02:00
Martin Diehl 8da3736d42 extending test suite 2023-07-20 21:16:31 +02:00
Martin Diehl 5c2cc1d91d include Fortran test suite 2023-07-20 21:13:57 +02:00
Franz Roters 808960104e ensure performance plots are updated only when performance test is (successfully) completetd 2023-07-20 09:14:11 +02:00
Test User d104f4810e [skip ci] updated version information after successful test of v3.0.0-alpha7-668-gbfc2a76a0 2023-07-19 11:20:03 +02:00
Franz Roters bfc2a76a0e Merge branch 'Marc-use-IO' into 'development'
avoid duplicate lc function

See merge request damask/DAMASK!780
2023-07-19 07:13:15 +00:00
Martin Diehl 535ccf1378 clearer name 2023-07-19 04:19:57 +02:00
Martin Diehl ef5fe61ff6 limit scope length 2023-07-19 02:58:08 +02:00
Martin Diehl 5b56b13c64 report information on staggered iterations 2023-07-19 02:34:37 +02:00
Martin Diehl 5e9162b073 Merge remote-tracking branch 'origin/development' into untangle-homog-phase 2023-07-18 21:15:46 +02:00
Martin Diehl dc9d4bb5a9 centralized ID handling to enable cross-talking 2023-07-18 21:15:34 +02:00
Martin Diehl 26014aec1f 'true' kinematics first 2023-07-18 21:15:34 +02:00
Martin Diehl 2ae1f1f829 simplified 2023-07-18 21:15:34 +02:00
Martin Diehl d85ad0b554 improved naming 2023-07-18 21:13:23 +02:00
Test User 5bd9531577 [skip ci] updated version information after successful test of v3.0.0-alpha7-665-g341119d70 2023-07-18 20:27:34 +02:00
Philip Eisenlohr 341119d706 Merge branch 'solver-simplification' into 'development'
simplified thermal and damage solvers

See merge request damask/DAMASK!778
2023-07-18 16:05:43 +00:00
Martin Diehl d88b2e713d avoid duplicate lc function 2023-07-18 15:33:33 +02:00
Test User a5a533d2dc [skip ci] updated version information after successful test of v3.0.0-alpha7-659-gaab541218 2023-07-18 07:32:13 +02:00
Martin Diehl aab5412180 Merge branch 'restructure-numerics' into 'development'
grid solver related changes

See merge request damask/DAMASK!775
2023-07-18 02:23:31 +00:00
Martin Diehl a8f222f4a2 Merge branch 'performance-to-statistics' into 'development'
rename performance.git to statistics.git

See merge request damask/DAMASK!779
2023-07-17 23:37:29 +00:00
Martin Diehl 37c0b59afd clearer name for (non-general) postfix 2023-07-18 01:36:52 +02:00
Sharan Roongta 8117e9f54c correct hierarchy 2023-07-17 19:07:03 +02:00
Martin Diehl 497974ccbb adjusted tests 2023-07-17 18:48:56 +02:00
Martin Diehl 9651f3e486 examples follow current implementation
small polishing/consistent capitalization
2023-07-17 18:03:31 +02:00
Martin Diehl 0479db85ae indicate constant with CAPITALS 2023-07-17 17:51:34 +02:00
Martin Diehl 6f3b409a25 enable FFTW planner flags in CAPITALS 2023-07-17 17:48:47 +02:00
Philip Eisenlohr 223d321a94 concatenated error reporting 2023-07-17 11:37:52 -04:00
Sharan Roongta 2bd216ab3a avoid confusion with config module 2023-07-17 17:28:03 +02:00
Sharan Roongta 78431783ba capitalisation indicate constants 2023-07-17 17:26:11 +02:00
Philip Eisenlohr 3d9e637f6e rename performance.git to statistics.git 2023-07-17 13:39:22 +00:00
Martin Diehl ddeb218728 unified naming scheme with damage/thermal 2023-07-17 05:56:06 +02:00
Martin Diehl 8682df0e86 avoiding double storage of phi
general adjustments of damage solver to follow thermal solver
2023-07-17 02:38:16 +02:00
Sharan a1f797de3e consistency 2023-07-16 22:43:10 +02:00
Sharan 45dd387527 polarisation --> polarization 2023-07-16 22:04:18 +02:00
Martin Diehl b54cf03d6d allgather instead of allreduce+sum with contribution from 1 proc 2023-07-16 19:29:45 +02:00
Test User 4cd1587f71 [skip ci] updated version information after successful test of v3.0.0-alpha7-640-g6770bedb7 2023-07-16 18:43:37 +02:00
Sharan Roongta 054f548f4c Merge remote-tracking branch 'origin/development' into restructure-numerics 2023-07-16 15:41:37 +02:00
Sharan Roongta 915d03f2bf updated tests 2023-07-16 15:41:32 +02:00
Sharan Roongta 6770bedb7d point to development in PRIVATE 2023-07-16 15:38:37 +02:00
Sharan Roongta 85ba5414c0 Merge branch 'rename-lattice-to-crystal' into 'development'
consistent naming with Python module

See merge request damask/DAMASK!777
2023-07-16 09:20:28 +00:00
Sharan Roongta 5882d4210d Merge branch 'universal-error+warning-formatting' into 'development'
CLI errors with IO_error

See merge request damask/DAMASK!774
2023-07-16 09:17:33 +00:00
Martin Diehl 09b0cc3101 avoid duplicated storage of solution vector/T
polished variable names and simplified expressions
2023-07-16 05:22:16 +02:00
Martin Diehl e1630e4057 consistent naming with Python module 2023-07-15 23:10:29 +02:00
Test User 15b490fd87 [skip ci] updated version information after successful test of v3.0.0-alpha7-630-ga63fe8d02 2023-07-15 23:05:01 +02:00
Martin Diehl a63fe8d027 Merge branch 'untangle-reporting' into 'development'
Use universal Performance repository

See merge request damask/DAMASK!776
2023-07-15 18:53:12 +00:00
Philip Eisenlohr 7427b9b2d0 Use universal Performance repository 2023-07-15 18:53:12 +00:00
Philip Eisenlohr b235742472 clearer error messages 2023-07-14 10:23:23 -04:00
Daniel Otto de Mentock b578859ec9 Merge branch '302-dimension-mismatch-when-passing-a-flattened-f-array-to-utilities_updatecoords' into 'development'
reshape to expected shape

Closes #302

See merge request damask/DAMASK!771
2023-07-14 08:55:05 +00:00
Sharan Roongta 35b8d5fc7f missing parameters of grid added to the current structure 2023-07-13 22:03:29 +02:00
Sharan Roongta 12cb043d6d grid solver related changes 2023-07-12 23:14:46 +02:00
Test User 159506b5e3 [skip ci] updated version information after successful test of v3.0.0-alpha7-624-g61f1cdf70 2023-07-12 18:27:26 +02:00
Philip Eisenlohr 7c875371a6 Merge branch 'development' into universal-error+warning-formatting 2023-07-12 09:31:37 -04:00
Philip Eisenlohr 61f1cdf70d Merge branch '300-further-command-line-arguments' into 'development'
option to specify numerics configuration file and jobname

Closes #300

See merge request damask/DAMASK!772
2023-07-12 13:24:00 +00:00
Martin Diehl d9cf3983b4 more generic error codes
allow label without ID in IO_error
2023-07-12 12:47:52 +02:00
Philip Eisenlohr d452a9ce3f use IO_error in CLI 2023-07-11 17:15:03 -04:00
Philip Eisenlohr 4d8fc08a2f shorter logic for addSetupFile 2023-07-11 16:11:59 -04:00
Martin Diehl 0e7c9f101c avoid file name clashes 2023-07-11 20:45:20 +02:00
Philip Eisenlohr 83db176e1b specific error per missing mandatory argument 2023-07-11 13:19:31 -04:00
Philip Eisenlohr 32810cbe8b error formatting through function 2023-07-11 13:16:00 -04:00
Philip Eisenlohr 70817606db shorter logic for missing arguments 2023-07-11 12:35:23 -04:00
Martin Diehl 295b5348f3 update tests (could fail due to random input) 2023-07-11 17:32:04 +02:00
Test User 3dafb26bb1 [skip ci] updated version information after successful test of v3.0.0-alpha7-614-gad6220c26 2023-07-11 15:13:06 +02:00
Martin Diehl 162a009aa9 helpful error messages 2023-07-11 15:11:17 +02:00
Sharan Roongta 9b349bb912 Merge remote-tracking branch 'origin/development' into 302-dimension-mismatch-when-passing-a-flattened-f-array-to-utilities_updatecoords 2023-07-11 14:27:39 +02:00
Sharan Roongta ad6220c263 Merge branch 'simplify-PETSc-access' into 'development'
Simplify pet sc access

See merge request damask/DAMASK!773
2023-07-11 10:42:13 +00:00
Martin Diehl 15e5bce7e4 indicate read-only access 2023-07-10 20:50:24 +02:00
Martin Diehl cf74a687c5 not needed 2023-07-10 20:40:22 +02:00
Martin Diehl 4a1c6e7b4f unified code 2023-07-10 20:34:06 +02:00
Martin Diehl 3af61233c9 option to specify numerics configuration file and jobname
default jobname now includes all CLI arguments (for mesh/grid only)
2023-07-10 20:24:03 +02:00
Martin Diehl 40b4062b83 reshape to expected shape 2023-07-06 14:39:36 +02:00
Test User bb49289b76 [skip ci] updated version information after successful test of v3.0.0-alpha7-610-g716600299 2023-07-05 18:47:49 +02:00
Martin Diehl 716600299f Merge branch '284-more-friendly-output-name-of-add_strain-or-a-better-presentation-in-documentation-webpage' into 'development'
Resolve "more friendly output name of `add_strain()` or a better presentation in documentation webpage"

Closes #284

See merge request damask/DAMASK!770
2023-07-05 14:40:35 +00:00
Vitesh Shah 2729e3f4a0 complying with yaml standards 2023-07-05 15:21:39 +02:00
Vitesh Shah e4b793cf77 Merge branch 'development' into export_DAMASK_to_DREAM3D 2023-07-05 15:04:08 +02:00
Yi Hu bd0a35a946 upd PRIVATE 2023-07-04 18:30:06 +02:00
Yi Hu 09858317d8 add m=0 (default) case in docstring 2023-07-04 16:44:31 +02:00
Yi Hu 0e9e37bfb3 Merge branch 'development' into 284-more-friendly-output-name-of-add_strain-or-a-better-presentation-in-documentation-webpage 2023-07-04 16:07:48 +02:00
Test User 5c08794bbf [skip ci] updated version information after successful test of v3.0.0-alpha7-604-g65fa62b3f 2023-06-30 12:04:27 +02:00
Franz Roters 65fa62b3f1 Merge branch 'PR3-plot-commit-history-ignores-n-option' into 'development'
Iterative API calls for commit history

See merge request damask/DAMASK!769
2023-06-30 07:55:42 +00:00
Philip Eisenlohr 75042e918b Iterative API calls for commit history 2023-06-30 07:55:41 +00:00
Test User b0c2701a4f [skip ci] updated version information after successful test of v3.0.0-alpha7-601-g1abd03bbf 2023-06-28 22:01:20 +02:00
Philip Eisenlohr 1abd03bbf9 restore accidental PRIVATE advance 2023-06-28 13:11:51 -04:00
Philip Eisenlohr 37e89c8692 use updated PRIVATE with corrected plot_commithistory 2023-06-28 09:55:21 -04:00
Test User 8c52eb7212 [skip ci] updated version information after successful test of v3.0.0-alpha7-598-ga8875677c 2023-06-28 14:31:24 +02:00
Franz Roters a8875677cd Merge branch 'language-polish' into 'development'
Additional language polish

See merge request damask/DAMASK!765
2023-06-28 10:23:00 +00:00
Philip Eisenlohr d2c374624e Additional language polish 2023-06-28 10:23:00 +00:00
Test User 18913b498b [skip ci] updated version information after successful test of v3.0.0-alpha7-595-g4cf3aca52 2023-06-28 01:28:37 +02:00
Martin Diehl 4cf3aca527 include material.yaml argument 2023-06-27 20:10:51 +02:00
Test User 4ace99cbda [skip ci] updated version information after successful test of v3.0.0-alpha7-593-g5f82e975c 2023-06-27 19:41:48 +02:00
Franz Roters 5f82e975c8 Merge branch '298-forest-projections' into 'development'
Resolve "Forest projections"

Closes #298

See merge request damask/DAMASK!768
2023-06-27 15:33:57 +00:00
Test User 55af0b7e1b [skip ci] updated version information after successful test of v3.0.0-alpha7-586-gb9062c942 2023-06-26 16:07:47 +02:00
Daniel Otto de Mentock b9062c9425 github actions has issues with interpretation of function calls inside assert statements 2023-06-26 14:00:01 +02:00
Philip Eisenlohr 6e8c819da7 including CLI changes in PRIVATE 2023-06-24 00:39:03 -04:00
Philip Eisenlohr 453f0cdd7e Merge branch 'development' into 298-forest-projections 2023-06-23 23:31:11 -04:00
Test User 4cb3d9cd6b [skip ci] updated version information after successful test of v3.0.0-alpha7-584-gaf7452edd 2023-06-24 00:42:23 +02:00
Franz Roters af7452edde Merge branch 'Thompson-fcc-labels' into 'development'
Thompson tetrahedron notation for fcc slip systems

See merge request damask/DAMASK!767
2023-06-23 13:45:47 +00:00
Test User f29e136108 [skip ci] updated version information after successful test of v3.0.0-alpha7-580-g3bb5319f7 2023-06-23 13:31:07 +02:00
Sharan Roongta 3bb5319f79 Merge branch 'CLI-material' into 'development'
CLI-material

See merge request damask/DAMASK!763
2023-06-23 09:22:18 +00:00
Martin Diehl e34ee25597 avoid access to unused variable, no need for nested function 2023-06-23 08:56:34 +02:00
Philip Eisenlohr 4e7d953fe9 indent by format string; provide full commandline call 2023-06-22 22:59:44 -04:00
Philip Eisenlohr 86e0a8c2a5 updated reference results for dislotungsten/twin 2023-06-22 22:11:15 -04:00
Test User 6ebff3ecda [skip ci] updated version information after successful test of v3.0.0-alpha7-562-g04f9b3d16 2023-06-23 01:26:04 +02:00
Martin Diehl efc9391ca7 simplified 2023-06-23 00:06:44 +02:00
Martin Diehl a38a860783 fixed tests (for people having a user name that starts with m) 2023-06-22 23:56:44 +02:00
Martin Diehl e197e45566 use existing functionality 2023-06-22 23:25:25 +02:00
Martin Diehl a4c52fb119 no CamelCasing 2023-06-22 23:19:36 +02:00
Martin Diehl fff811edd9 following Python (os.path.normpath, os.path.relpath) 2023-06-22 23:13:45 +02:00
Martin Diehl 04f9b3d161 Merge branch 'phenopower-inline-expansion' into 'development'
Single-step parameter expansion over slip systems

See merge request damask/DAMASK!766
2023-06-22 21:13:35 +00:00
Martin Diehl 5053c53ee4 don't rely on upper bound estimates for string length 2023-06-22 22:49:25 +02:00
Philip Eisenlohr a35d445294 consistent phase name reporting 2023-06-22 15:05:54 -04:00
Philip Eisenlohr 28ebc8ef1a inline math_expand for other constitutive laws 2023-06-22 14:50:18 -04:00
Philip Eisenlohr 96de1abc04 forest projection of both edge and screw character with adjustment parameter f_edge 2023-06-22 14:16:27 -04:00
Philip Eisenlohr d4d3178717 Corrected labeling of {111} planes 2023-06-22 15:27:46 +00:00
Philip Eisenlohr 0842bd503a immediate parameter expansion over slip systems 2023-06-21 16:21:52 -04:00
Philip Eisenlohr e4a0b07225 removed confusing Schmid-Boas in favor of cleaner Thompson tetrahedron notation 2023-06-21 11:21:44 -04:00
Test User 379c8550d0 [skip ci] updated version information after successful test of v3.0.0-alpha7-558-gf6c7fd280 2023-06-21 13:45:40 +02:00
Franz Roters f6c7fd2809 Merge branch 'language-polish' into 'development'
Reporting language polishing

See merge request damask/DAMASK!764
2023-06-21 09:37:01 +00:00
Philip Eisenlohr da51fa5fdc Reporting language polishing 2023-06-21 09:37:00 +00:00
Philip Eisenlohr cb6b1b30f5 shortened CLI reporting; condensed repeated CLI functions 2023-06-16 12:09:53 -04:00
Sharan Roongta 342b33c17f Merge remote-tracking branch 'origin/development' into CLI-material 2023-06-13 12:59:39 +02:00
Sharan Roongta 21c958c427 adjusted test 2023-06-13 12:59:23 +02:00
Test User f824ed360e [skip ci] updated version information after successful test of v3.0.0-alpha7-555-gf424d54f5 2023-06-13 12:56:45 +02:00
Sharan Roongta f424d54f5e Merge branch '256-grid-geometry-displacement-reconstruction' into 'development'
Resolve "grid geometry/displacement reconstruction"

Closes #256

See merge request damask/DAMASK!762
2023-06-13 08:48:35 +00:00
Martin Diehl 137c4e3b03 easier to understand 2023-06-12 20:38:14 +02:00
Sharan Roongta 1d8939efad adjusted tests 2023-06-12 17:35:08 +02:00
Sharan Roongta d00bf2d3d5 causes problem for MARC
to be removed later
2023-06-09 14:10:31 +02:00
Sharan Roongta a767008444 gtid and mesh tests updated with new command line argument 2023-06-07 15:43:01 +02:00
Sharan Roongta 582f72377a Merge remote-tracking branch 'origin/development' into CLI-material 2023-06-07 12:53:20 +02:00
Test User bafbba4b58 [skip ci] updated version information after successful test of v3.0.0-alpha7-544-g58ee3312c 2023-06-06 23:45:19 +02:00
Philip Eisenlohr 58ee3312c7 Merge branch '289-consistent-name-for-base-datatypes-in-fortran' into 'development'
Resolve "consistent name for base datatypes in Fortran"

Closes #289

See merge request damask/DAMASK!761
2023-06-06 17:32:19 +00:00
Martin Diehl 1a4c171109 checking correctness of displacements for 1D strain 2023-06-06 19:25:44 +02:00
Martin Diehl d42318cafc new test for grid displacements 2023-06-06 19:00:32 +02:00
Sharan Roongta 2d0c7b2335 reading material.yaml from command line 2023-06-06 10:53:53 +02:00
Martin Diehl 11530c19bb Merge remote-tracking branch 'origin/development' into 289-consistent-name-for-base-datatypes-in-fortran 2023-06-05 15:02:50 +02:00
Martin Diehl 947cb15260 Merge remote-tracking branch 'origin/development' into 256-grid-geometry-displacement-reconstruction 2023-06-05 11:04:19 +02:00
Test User fd55fe2b9f [skip ci] updated version information after successful test of v3.0.0-alpha7-537-g1eee3d3ee 2023-06-05 10:24:19 +02:00
Yi Hu 1eee3d3ee3 Merge branch '258-damage-driving-force-and-damage-tests-need-update' into 'development'
f_phi factor corrected

Closes #258

See merge request damask/DAMASK!760
2023-06-05 06:15:12 +00:00
Martin Diehl 898aaf1068 shortened 2023-06-04 23:46:35 +02:00
Martin Diehl 11c4be008f analytic solution for displacement calculation 2023-06-04 22:54:31 +02:00
Martin Diehl d64b64ed05 bugfix: fluct displacement were wrongly scaled 2023-06-04 22:20:44 +02:00
Martin Diehl 5b8194d8eb Merge remote-tracking branch 'origin/development' into 256-grid-geometry-displacement-reconstruction 2023-06-04 14:26:31 +02:00
Martin Diehl 0324e7ece1 parameters should be spelled in capitals 2023-06-04 13:52:31 +02:00
Martin Diehl 319489fad8 consistent with usage in other modules 2023-06-04 13:52:23 +02:00
Martin Diehl ca1c22874b consistent and short 2023-06-04 13:51:05 +02:00
Martin Diehl d00a530d2d f_phi factor corrected 2023-06-04 13:42:00 +02:00
Martin Diehl d0b832e6f1 consistent with naming in HDF5_utilities 2023-06-03 17:06:32 +02:00
Test User a5a391688e [skip ci] updated version information after successful test of v3.0.0-alpha7-534-g51210a05e 2023-06-01 21:15:18 +02:00
Sharan Roongta 51210a05e0 Merge branch 'load_neper_fix' into 'development'
don't change Neper material ID definition

See merge request damask/DAMASK!759
2023-06-01 17:07:06 +00:00
Test User 98068ba57a [skip ci] updated version information after successful test of v3.0.0-alpha7-531-ga5ce0f9b1 2023-05-31 15:23:00 +02:00
Martin Diehl a5ce0f9b1e self test failed once, relaxing tolerances 2023-05-31 13:13:26 +02:00
Martin Diehl cfdf33e4b1 don't change Neper material ID definition
Neper material ID start at 0 if a buffer layer is added
(run "neper -T -n 100 -tesrsize 320:320:320 -domain "cylinder(20,10)"  -format vtk"),
otherwise at 1.

Hence, leave the IDs untouched and let the user change the
numbering (either by a constant offset or by re-numbering): "explicit is better than implicit"
2023-05-22 17:32:39 +02:00
Vitesh Shah 2c6e8a56d0 remove unnecessary modules 2023-05-04 13:39:07 +02:00
Vitesh Shah 7ec3d1da8a fixing invalid yaml
Strange that material.yaml made by ConfigMaterial class is creating
problems
2023-05-04 13:36:33 +02:00
Vitesh Shah b5b6c2d695 fixed typos and other python warnings 2023-05-04 12:59:56 +02:00
Vitesh Shah 8de19f0c3b better checks for values 2023-05-04 11:03:19 +02:00
Vitesh Shah c4baca0cb6 fixed typo 2023-05-04 10:49:11 +02:00
Test User 85a06c3ed7 [skip ci] updated version information after successful test of v3.0.0-alpha7-529-g4eb557765 2023-05-01 17:24:59 +02:00
Philip Eisenlohr 4eb5577652 Merge branch '254-testing-resources-folder-name' into 'development'
more reasonable name

Closes #254

See merge request damask/DAMASK!758
2023-05-01 12:35:56 +00:00
Philip Eisenlohr da9b3c5bcd Merge branch 'drop-old-DADF5-support' into 'development'
drop support for older DADF5 versions

See merge request damask/DAMASK!757
2023-05-01 12:31:30 +00:00
Vitesh Shah 9193085913 added more reference files 2023-04-28 13:11:18 +02:00
Test User 45bd58f6d8 [skip ci] updated version information after successful test of v3.0.0-alpha7-522-g289765cae 2023-04-28 02:48:45 +02:00
Martin Diehl 289765cae3 better values and documentation 2023-04-28 00:39:52 +02:00
Martin Diehl e62d1ac693 new directory layout for testing 2023-04-26 20:17:53 +02:00
Vitesh Shah 767ba5a421 test for export_DREAM3D 2023-04-26 13:01:18 +02:00
Vitesh Shah 3462d41d8e consistent dataset naming eases testing 2023-04-26 12:56:34 +02:00
Vitesh Shah 45cebe3aee better variable naming and splitext 2023-04-26 10:28:17 +02:00
Martin Diehl f36a175867 binary VTK file
does not need EOL@EOF
2023-04-24 07:17:34 +02:00
Martin Diehl 17ce0b9aec more reasonable name
folder contains all test resources, not just reference results
2023-04-24 07:16:45 +02:00
Vitesh Shah 66df416891 added input dream3D file for 2 phase microstructure 2023-04-21 12:18:43 +02:00
Test User b5770cf797 [skip ci] updated version information after successful test of v3.0.0-alpha7-520-g3071d5bf1 2023-04-21 00:38:04 +02:00
Martin Diehl 62eda982fd drop support for older DADF5 versions
simplifies code a little and 0.14 was already used in alpha5
2023-04-20 19:32:23 +02:00
Martin Diehl 3071d5bf10 small change in PRIVATE 2023-04-20 17:12:31 +02:00
Test User a9b6b65b57 [skip ci] updated version information after successful test of v3.0.0-alpha7-518-gf1f6b0aff 2023-04-20 15:33:09 +02:00
Franz Roters f1f6b0affd Merge branch '281-python-vtk-supported-versions' into 'development'
vtk7 is no longer supported

Closes #281

See merge request damask/DAMASK!755
2023-04-20 11:25:25 +00:00
Vitesh Shah 5dddf792e1 pathlib can give name of the file directly 2023-04-20 10:52:08 +02:00
Test User 5935cc3a8c [skip ci] updated version information after successful test of v3.0.0-alpha7-515-g6addc5eb9 2023-04-19 14:53:20 +02:00
Daniel Otto de Mentock 6addc5eb98 Merge branch 'spectral-utilities-cleaning' into 'development'
Spectral utilities cleaning

See merge request damask/DAMASK!754
2023-04-19 10:45:35 +00:00
Martin Diehl 7caf483dd9 standard documentation style (following numpy doc) 2023-04-19 07:51:54 +02:00
Martin Diehl f8875db044 unused leftover 2023-04-19 06:58:33 +02:00
Test User 7cd169b542 [skip ci] updated version information after successful test of v3.0.0-alpha7-511-gf6c254403 2023-04-19 00:22:38 +02:00
Martin Diehl f6c254403b Merge branch 'hdf5-error-check' into 'development'
positive values are ok

See merge request damask/DAMASK!753
2023-04-18 20:14:06 +00:00
Martin Diehl d32d088ed7 positive values are ok
from the description:
Returns a non-negative value if successful; otherwise returns a negative value.
2023-04-18 12:01:03 +02:00
Vitesh Shah 029b830156 corrected the looping and target dir 2023-04-17 08:03:44 +02:00
Test User b8518e2875 [skip ci] updated version information after successful test of v3.0.0-alpha7-508-g7b158f5ec 2023-04-15 00:13:32 +02:00
Sharan Roongta 7b158f5ec4 Merge branch 'regrid-result' into 'development'
regrid/map when exporting DADF5

See merge request damask/DAMASK!748
2023-04-14 20:05:30 +00:00
Test User ac6d754a87 [skip ci] updated version information after successful test of v3.0.0-alpha7-505-g4acf5e10f 2023-04-14 18:20:34 +02:00
Franz Roters 4acf5e10f1 Merge branch '288-tests-for-misc' into 'development'
testing misc functionality

Closes #288

See merge request damask/DAMASK!752
2023-04-14 14:01:08 +00:00
Philip Eisenlohr b827b26278 Merge branch 'support-pandas-2.0' into 'development'
support for pandas >= 2.0

See merge request damask/DAMASK!751
2023-04-14 12:07:29 +00:00
Martin Diehl 563f908d0c testing misc functionality 2023-04-14 11:17:29 +02:00
Martin Diehl 29a968b3a8 support for pandas >= 2.0 2023-04-14 08:37:40 +02:00
Test User c8476cebf6 [skip ci] updated version information after successful test of v3.0.0-alpha7-500-ga42cf6199 2023-04-14 00:28:28 +02:00
Martin Diehl a42cf61998 Merge branch 'PETSc-3.19' into 'development'
PETSc 3.19 is out

See merge request damask/DAMASK!750
2023-04-13 20:20:03 +00:00
Martin Diehl 7d1433875d PETSc 3.19 is out 2023-04-13 20:13:01 +02:00
Test User ea818b6a8d [skip ci] updated version information after successful test of v3.0.0-alpha7-497-gd9d611b5a 2023-04-13 18:37:23 +02:00
Franz Roters d9d611b5a0 Merge branch 'optional-not-needed' into 'development'
optional propagates

See merge request damask/DAMASK!749
2023-04-13 14:30:02 +00:00
Martin Diehl 58141210a2 optional propagates 2023-04-12 05:56:11 +02:00
Vitesh Shah 2ae1a20443 seems to read the data correctly 2023-04-06 21:42:34 +02:00
Vitesh Shah f619cf4ff2 making export DREAM3D compatible with results class 2023-04-06 20:56:42 +02:00
Test User a8c508276f [skip ci] updated version information after successful test of v3.0.0-alpha7-494-ge087cd439 2023-03-31 22:03:09 +02:00
Martin Diehl e087cd4399 Merge branch 'polish-kinehardening' into 'development'
Polish kinehardening

See merge request damask/DAMASK!732
2023-03-31 17:54:25 +00:00
Philip Eisenlohr eeb0825e63 adjusting to original publication
Our implementation is using synonymous names for parameters compared to the paper by J.A. Wollmershauser, B. Clausen, and S.R. Agnew.

'xi_inf' and 'chi_inf' are not strictly "asymptotic values", but stresses that correspond to the back-extrapolation from the terminal linear hardening stage (characterized by 'h_inf_xi/chi').

All parameters are referenced back to their counterparts in the paper by J.A. Wollmershauser, B. Clausen, and S.R. Agnew.
2023-03-31 17:54:25 +00:00
Test User 62c1fe3584 [skip ci] updated version information after successful test of v3.0.0-alpha7-491-g344372511 2023-03-27 21:41:10 +02:00
Philip Eisenlohr 3443725114 Merge branch 'grid-load' into 'development'
Grid loadcase

See merge request damask/DAMASK!734
2023-03-27 17:33:12 +00:00
Martin Diehl 03768e14dc Grid loadcase 2023-03-27 17:33:11 +00:00
Martin Diehl d2e85ef15b regrid/map when exporting DADF5 2023-03-25 07:40:21 +01:00
Martin Diehl b11ad8c774 helpful information on strain calculation 2023-03-24 12:34:51 +01:00
Test User 1955d98474 [skip ci] updated version information after successful test of v3.0.0-alpha7-488-gf6c761980 2023-03-22 13:48:39 +01:00
Yi Hu f6c761980d Merge branch 'anisobrittle-unit' into 'development'
correct unit

See merge request damask/DAMASK!747
2023-03-22 10:02:49 +00:00
Martin Diehl 043d48d4d3 correct unit 2023-03-21 22:41:52 +01:00
Test User 69e4d17be2 [skip ci] updated version information after successful test of v3.0.0-alpha7-485-g19f5b3351 2023-03-14 11:32:51 +01:00
Yi Hu 19f5b33515 Merge branch '268-name-of-output-label-of-damage-model' into 'development'
notation following paper

Closes #268

See merge request damask/DAMASK!746
2023-03-14 08:09:22 +00:00
Martin Diehl 13630325c3 notation following paper
https://doi.org/10.1016/j.jmps.2016.10.012
DAMASK paper
2023-03-13 17:23:28 +01:00
Vitesh Shah 12c39c0977 [skip sc][skip ci] using pathlib and reduced the number of args 2023-03-13 13:00:29 +01:00
Martin Diehl c1cb6a72c1 loops instead of code duplication 2023-03-12 13:40:45 +01:00
Martin Diehl 132640eed5 simplified 2023-03-12 13:40:45 +01:00
Test User 73206ae2b5 [skip ci] updated version information after successful test of v3.0.0-alpha7-479-g8ce51dc4d 2023-03-10 17:29:18 +01:00
Franz Roters 8ce51dc4d8 Merge branch 'unit-test-Fortran' into 'development'
Unit test fortran

See merge request damask/DAMASK!744
2023-03-10 14:20:46 +00:00
Martin Diehl b0427584cb label and description were wrong 2023-03-10 06:34:59 +01:00
Test User 9df178b8cc [skip ci] updated version information after successful test of v3.0.0-alpha7-475-gc7f8647cf 2023-03-08 21:11:30 +01:00
Martin Diehl fdafe19355 vtk7 is no longer supported 2023-03-08 20:13:49 +01:00
Martin Diehl c7f8647cfd Merge branch '277-python-vtkmodules-import' into 'development'
Resolve "python vtk: import"

Closes #277

See merge request damask/DAMASK!742
2023-03-08 18:03:23 +00:00
Philip Eisenlohr 782a593bf2 separate import of vtk modules
vtk is a collection of modules. Some are missing in some installations, so it is recommended to import only the functionality that is needed.
2023-03-08 18:03:22 +00:00
Test User c879fb933c [skip ci] updated version information after successful test of v3.0.0-alpha7-472-gaa678c8a5 2023-03-04 15:22:56 +01:00
Martin Diehl aa678c8a5b Merge branch 'oneAPI-debug' into 'development'
causes internal compiler error on oneAPI

See merge request damask/DAMASK!743
2023-03-04 12:14:41 +00:00
Martin Diehl 6d3e3a580f causes internal compiler error on oneAPI
anyways not recommended according to Steve Lionel
2023-03-04 10:42:25 +01:00
Test User ec7535d91e [skip ci] updated version information after successful test of v3.0.0-alpha7-469-gcb590381e 2023-03-02 22:16:19 +01:00
Martin Diehl cb590381e6 Merge branch 'docstringer_improvements' into 'development'
Docstringer improvements

See merge request damask/DAMASK!738
2023-03-02 18:46:00 +00:00
Daniel Otto de Mentock ad39577ea4 improvements to docstrings (in `damask.Rotation`) 2023-03-02 18:46:00 +00:00
Test User 293d994e30 [skip ci] updated version information after successful test of v3.0.0-alpha7-466-g4e53061b6 2023-03-02 12:39:42 +01:00
Daniel Otto de Mentock 4e53061b69 Merge branch '95-report-origin-of-configuration-file' into 'development'
Resolve "Report origin of configuration file"

Closes #95

See merge request damask/DAMASK!736
2023-03-02 09:31:04 +00:00
Philip Eisenlohr f3da19a8e2 drop little-used variables 2023-02-28 15:09:23 -05:00
Philip Eisenlohr a40524da02 rename to wrapLines; additional formatting options; whitespace trimming 2023-02-28 14:59:30 -05:00
Test User 4e3dc69762 [skip ci] updated version information after successful test of v3.0.0-alpha7-457-gae8e1c179 2023-02-28 19:30:08 +01:00
Martin Diehl ae8e1c1791 Merge branch '276-ang-file-inflexibility' into 'development'
Resolve "ANG file inflexibility"

Closes #276

See merge request damask/DAMASK!739
2023-02-28 15:35:31 +00:00
Philip Eisenlohr b15096c2f6 flexibility for non-standard ANG headers. 2023-02-28 15:35:31 +00:00
Martin Diehl fc543629f5 Merge branch 'oneAPIfix' into 'development'
restore caching, ifx problem seems to be related to openMP

See merge request damask/DAMASK!740
2023-02-28 15:11:48 +00:00
Martin Diehl 95a953d25b more reasonable name 2023-02-28 07:58:10 +01:00
Martin Diehl 4f18b21111 Merge remote-tracking branch 'origin/development' into 95-report-origin-of-configuration-file 2023-02-28 07:36:36 +01:00
Martin Diehl 949bc39173 polishing 2023-02-28 07:34:11 +01:00
Martin Diehl 4df794e06c restore caching, ifx problem seems to be related to openMP 2023-02-28 07:13:22 +01:00
Shah Vitesh f15d1da169 [skip sc][skip ci] newer code structure to create DREAM3d files 2023-02-27 14:51:37 +01:00
Test User 12f7d055f6 [skip ci] updated version information after successful test of v3.0.0-alpha7-452-g11b83a5ec 2023-02-27 14:42:15 +01:00
Martin Diehl 11b83a5ec9 Merge branch 'deallocate-numerics' into 'development'
Deallocate numerics

See merge request damask/DAMASK!737
2023-02-27 11:34:03 +00:00
Martin Diehl f4f2176561 Deallocate numerics configuration 2023-02-27 11:34:03 +00:00
Martin Diehl 9418664604 report origin of configuration if given 2023-02-25 15:17:13 +01:00
Test User fbbd21a1ca [skip ci] updated version information after successful test of v3.0.0-alpha7-449-g87e74ef79 2023-02-25 12:41:46 +01:00
Martin Diehl 04db45f5c0 functionality to report references in material.yaml 2023-02-25 12:13:27 +01:00
Martin Diehl 87e74ef792 docstring polishing 2023-02-25 10:07:38 +01:00
Martin Diehl 6e23ddcfbf also test new Python version 2023-02-25 10:07:08 +01:00
Martin Diehl d3b4226c74 LLVM test failed, could be related to caching 2023-02-25 10:06:50 +01:00
Martin Diehl 7dcfb036f9 more complicated test setup 2023-02-25 08:39:22 +01:00
Martin Diehl 2147ac3a12 base framework for unit testing in Fortran 2023-02-24 22:27:56 +01:00
Test User 0a8b1040e1 [skip ci] updated version information after successful test of v3.0.0-alpha7-445-g8e32e8c0e 2023-02-24 19:32:24 +01:00
Martin Diehl 8e32e8c0ea Merge branch 'example-typo' into 'development'
typo in example

See merge request damask/DAMASK!735
2023-02-24 16:13:35 +00:00
Martin Diehl 32e9b7ed77 make ifx work again 2023-02-24 14:48:16 +01:00
Sharan Roongta 95017b252f typo in example 2023-02-24 14:16:16 +01:00
Test User 6d0d066eb0 [skip ci] updated version information after successful test of v3.0.0-alpha7-441-g5bf53d98f 2023-02-23 21:56:32 +01:00
Martin Diehl 5bf53d98f3 Merge branch '263-keyword-arguments-for-orientation' into 'development'
Resolve "keyword arguments for Orientation"

Closes #263

See merge request damask/DAMASK!733
2023-02-23 18:49:08 +00:00
Martin Diehl c40b446854 add keywords to signature of Orientation functions that inherit from Rotation 2023-02-23 18:49:08 +00:00
Shah Vitesh d70a41a059 starting to maintain DAMASK to Dream3D code 2023-02-23 14:59:24 +01:00
Test User 133dae2cce [skip ci] updated version information after successful test of v3.0.0-alpha7-438-g9530a7b93 2023-02-22 23:25:47 +01:00
Martin Diehl 9530a7b931 Merge branch 'error-stop-macros' into 'development'
Shorthand subroutines for standard HDF/MPI error checking

See merge request damask/DAMASK!726
2023-02-22 15:50:11 +00:00
Philip Eisenlohr dd4390fb75 Shorthand subroutines for standard HDF/MPI error checking to avoid code duplication 2023-02-22 15:50:10 +00:00
Test User 01df331632 [skip ci] updated version information after successful test of v3.0.0-alpha7-435-gf7b0ae204 2023-02-22 14:42:30 +01:00
Sharan Roongta f7b0ae2041 Merge branch 'long-YAML-files' into 'development'
strlen returns 'size_t'

See merge request damask/DAMASK!723
2023-02-22 11:34:24 +00:00
Test User 06bd74e43b [skip ci] updated version information after successful test of v3.0.0-alpha7-425-g538770278 2023-02-21 20:12:36 +01:00
Franz Roters 538770278f Merge branch 'improved-docstrings' into 'development'
Improvements to Python docstrings

See merge request damask/DAMASK!729
2023-02-21 15:27:08 +00:00
Philip Eisenlohr 06201da5e2 Improvements to Python docstrings 2023-02-21 15:27:06 +00:00
Franz Roters 045352b8d2 Merge branch 'consistent-subroutine-calls' into 'development'
Consistent use of () in subroutine calling

See merge request damask/DAMASK!730
2023-02-21 15:18:17 +00:00
Philip Eisenlohr dde60ec53f Consistent use of () in subroutine calling 2023-02-21 15:18:17 +00:00
Test User a344b6058a [skip ci] updated version information after successful test of v3.0.0-alpha7-420-g71e383bfc 2023-02-21 10:33:40 +01:00
Philip Eisenlohr 71e383bfc8 test for ValueError 2023-02-20 14:44:40 -05:00
Philip Eisenlohr 6aa566760f shorter calculation of Seth–Hill strains 2023-02-20 14:42:31 -05:00
Test User bcab153b94 [skip ci] updated version information after successful test of v3.0.0-alpha7-417-g64b133e67 2023-02-20 03:21:47 +01:00
Martin Diehl 64b133e679 Merge branch 'fix-thermal-dissipation' into 'development'
calculate plastic dissipation based on M_p not S

See merge request damask/DAMASK!719
2023-02-20 00:13:45 +00:00
Martin Diehl ca2d184007 Merge remote-tracking branch 'origin/development' into long-YAML-files 2023-02-19 16:04:30 +01:00
Test User cae1395df5 [skip ci] updated version information after successful test of v3.0.0-alpha7-414-g23f896631 2023-02-18 23:39:56 +01:00
Philip Eisenlohr 23f896631e Merge branch '219-function-to-handle-default-of-optional-arguments' into 'development'
Resolve "function to handle default of optional arguments"

Closes #219

See merge request damask/DAMASK!721
2023-02-18 20:30:57 +00:00
Martin Diehl 8f3d9a9183 Resolve "function to handle default of optional arguments" 2023-02-18 20:30:57 +00:00
Test User f3aafb0911 [skip ci] updated version information after successful test of v3.0.0-alpha7-411-ga335e2db6 2023-02-18 07:38:36 +01:00
Philip Eisenlohr a335e2db6d Merge branch 'fix-ravel-docstring' into 'development'
sphinx does not handle white spaces properly

See merge request damask/DAMASK!727
2023-02-18 03:26:50 +00:00
Test User 5b4e93e070 [skip ci] updated version information after successful test of v3.0.0-alpha7-408-g6fd30dd26 2023-02-17 16:09:12 +01:00
Daniel Otto de Mentock 6fd30dd266 Merge branch 'extra-documentation' into 'development'
improved docstrings

See merge request damask/DAMASK!722
2023-02-17 12:58:09 +00:00
Philip Eisenlohr 4485e1045c proper indication of transpose; polish 2023-02-16 15:12:10 -05:00
Martin Diehl e501e76d84 sphinx does not handle white spaces properly 2023-02-16 19:40:09 +01:00
Martin Diehl eefa2c29a2 more details 2023-02-16 19:32:15 +01:00
Philip Eisenlohr 61f2ae295b switch to physics macros 2023-02-16 11:59:19 -05:00
Test User be3138cf39 [skip ci] updated version information after successful test of v3.0.0-alpha7-401-g15f15c1d7 2023-02-16 04:31:38 +01:00
Martin Diehl 15f15c1d78 Merge branch 'LFCR-check' into 'development'
one more CRLF check

See merge request damask/DAMASK!725
2023-02-15 23:51:56 +00:00
Philip Eisenlohr 01719874ea one more CRLF check 2023-02-15 16:36:20 -05:00
Test User 58ffe960a8 [skip ci] updated version information after successful test of v3.0.0-alpha7-398-g1fd479556 2023-02-15 12:32:17 +01:00
Daniel Otto de Mentock 1fd4795560 Merge branch 'no-setuptools' into 'development'
should not be in here

See merge request damask/DAMASK!720
2023-02-15 09:16:04 +00:00
Martin Diehl 0698c17ff2 improved documentation 2023-02-14 17:37:43 +01:00
Martin Diehl 3eb9545573 Merge branch 'development' into long-YAML-files 2023-02-14 17:33:48 +01:00
Martin Diehl 66b0b2e9dc using latex to improve documentation 2023-02-14 17:11:52 +01:00
Martin Diehl 4cd84ab8ce return was missing 2023-02-14 12:54:51 +01:00
Test User d89850adc9 [skip ci] updated version information after successful test of v3.0.0-alpha7-395-gb4e706f09 2023-02-14 11:29:21 +01:00
Franz Roters b4e706f099 Merge branch '260-remove-debug-yaml-assocciated-code-tests' into 'development'
debug.yaml causes more work than it saves

Closes #260

See merge request damask/DAMASK!717
2023-02-14 08:12:59 +00:00
Martin Diehl e5b7ad335f debug.yaml causes more work than it saves 2023-02-13 22:26:58 +01:00
Test User 59512cf5c6 [skip ci] updated version information after successful test of v3.0.0-alpha7-392-gc9bd2c88a 2023-02-13 18:45:16 +01:00
Franz Roters 4c65047612 calculate plastic dissipation based on M_p not S 2023-02-13 17:59:22 +01:00
Martin Diehl 24ebc465c4 should not be in here
https://stackoverflow.com/questions/58521386
2023-02-12 09:20:46 +01:00
Philip Eisenlohr c9bd2c88a9 Merge branch 'orthography_checks' into 'development'
minor orthography adjustments

See merge request damask/DAMASK!718
2023-02-11 14:30:12 +00:00
Daniel Otto de Mentock 335f61eec3 minor orthography adjustments 2023-02-11 14:30:12 +00:00
Martin Diehl 9e4db451d9 enable to write large strings
SIZE_T is the correct type (and 64bit instead of 32bit as for HSIZE_T)
for H5Tset_size_f
2023-02-11 08:11:35 +01:00
Martin Diehl 3e439503fe enable strings > 2Gb 2023-02-10 22:37:11 +01:00
Martin Diehl a2bde4a0f0 correct check for CRLF
old attempt tried to look only at forst occurence of LF but reported
CRLF also for LF endings.
2023-02-09 23:32:39 +01:00
Martin Diehl 4e57df9576 handle strings/YAML files > 2Gb (32 bit limit) 2023-02-08 08:49:08 +01:00
Martin Diehl 58c905d318 strlen returns 'size_t'
this is unsinged and on 64bit Linux (LP64) 64bit
2023-02-08 08:37:10 +01:00
Test User 4389ba25f2 [skip ci] updated version information after successful test of v3.0.0-alpha7-389-g4ae3274ac 2023-02-06 20:37:20 +01:00
Daniel Otto de Mentock 4ae3274ac4 Merge branch '250-configmaterial-material_add-simplifications' into 'development'
several improvements to ConfigMaterial and Config

Closes #250

See merge request damask/DAMASK!714
2023-02-06 16:52:14 +00:00
Test User 5b720c3536 [skip ci] updated version information after successful test of v3.0.0-alpha7-380-g430084cf3 2023-02-06 16:29:00 +01:00
Daniel Otto de Mentock 430084cf35 Merge branch '249-mark-dadf5-file-format-as-stable' into 'development'
DADF5 v1.0

Closes #249

See merge request damask/DAMASK!715
2023-02-06 11:36:05 +00:00
Daniel Otto de Mentock 354232ab09 Merge branch '264-termination-of-jobs-with-signal-testing' into 'development'
avoid long running zombie processes on test server

Closes #264

See merge request damask/DAMASK!716
2023-02-06 09:46:35 +00:00
Martin Diehl ec2171a91a avoid long running zombie processes on test server 2023-02-05 00:16:09 +01:00
Martin Diehl f401c51e22 update to DADF5 v1.0 2023-02-04 15:22:39 +01:00
Martin Diehl 12d1e9be65 pipeline was failing with decode error
I could not reproduce it, maybe this helps
2023-02-04 12:42:56 +01:00
Martin Diehl b818ec6885 include more files 2023-02-04 11:47:54 +01:00
Martin Diehl 29933a6618 includes unit of 'O', which was corrected 2023-02-04 11:44:12 +01:00
Martin Diehl e49090b26b update to DADF5 v1.0 2023-02-04 11:14:03 +01:00
Martin Diehl 89817d1bc1 not needed 2023-02-04 11:09:27 +01:00
Martin Diehl 780fc8a050 new/correct unit for quaternions 2023-02-04 10:23:01 +01:00
Martin Diehl 42495942b1 updated to DADF5 v1.0 2023-02-04 10:22:19 +01:00
Martin Diehl 8002f982c2 unused variable (leftover from stroring *.C_ref) 2023-02-04 09:58:58 +01:00
Martin Diehl a45a86cfbf mark DADF5 file layout as stable 2023-02-04 09:55:23 +01:00
Test User d2ac306d2b [skip ci] updated version information after successful test of v3.0.0-alpha7-366-g805fd06a8 2023-02-03 14:41:03 +01:00
Daniel Otto de Mentock 805fd06a8a Merge branch 'systematic-name' into 'development'
more systematic name

See merge request damask/DAMASK!708
2023-02-03 10:36:25 +00:00
Martin Diehl 7420c779d7 checking for invalid volume fractions 2023-02-02 22:13:17 +01:00
Martin Diehl aa11e1aca3 easier to understand 2023-02-02 08:59:44 +01:00
Martin Diehl 6682f58f86 explicit arguments to guide the user 2023-02-02 08:38:50 +01:00
Martin Diehl 008d3cca6f limits hold for sum and individual 2023-02-02 08:35:46 +01:00
Martin Diehl 46ad436d76 check for invalid materialpoint configuration 2023-02-01 22:48:43 +01:00
Test User 197284afcb [skip ci] updated version information after successful test of v3.0.0-alpha7-363-g13081dd65 2023-02-01 22:46:26 +01:00
Martin Diehl 13081dd655 relaxed tolerances needed on maws05 2023-02-01 19:27:04 +01:00
Martin Diehl fd84406903 guide the user with explicit keywords 2023-02-01 15:03:30 +01:00
Martin Diehl 8895e7a36f more logical behavior
explicit keywords are more important than existing one
2023-02-01 14:59:00 +01:00
Test User 7334772f74 [skip ci] updated version information after successful test of v3.0.0-alpha7-361-g750a0443a 2023-01-31 20:57:17 +01:00
Daniel Otto de Mentock 750a0443ad Merge branch 'YAML-class-improvements' into 'development'
some improvements to the YAML-related classes in Python

See merge request damask/DAMASK!710
2023-01-31 17:42:34 +00:00
Test User 1326303b70 [skip ci] updated version information after successful test of v3.0.0-alpha7-358-g6c0f605e8 2023-01-27 15:59:29 +01:00
Franz Roters 6c0f605e89 Merge branch 'autodoc_adjustments' into 'development'
small modifications for autodoc feature

See merge request damask/DAMASK!713
2023-01-27 11:33:30 +00:00
Daniel Otto de Mentock 786127af10 add some descriptions and correct wrong uppercase 2023-01-27 10:25:41 +01:00
Test User 176ce8106e [skip ci] updated version information after successful test of v3.0.0-alpha7-355-g19d856759 2023-01-27 00:29:01 +01:00
Martin Diehl 19d8567593 include most recent version of PRIVATE 2023-01-26 22:21:32 +01:00
Test User a6b131190c [skip ci] updated version information after successful test of v3.0.0-alpha7-353-g5e0377aac 2023-01-25 19:33:29 +01:00
Yi Hu 5e0377aac4 Merge branch 'development' of git.damask.mpie.de:damask/DAMASK into 258-damage-driving-force-and-damage-tests-need-update 2023-01-25 13:08:06 +01:00
Test User 02766bc510 [skip ci] updated version information after successful test of v3.0.0-alpha7-349-g02221da3e 2023-01-24 17:56:26 +01:00
Yi Hu b1ffef55e7 add missed test param change for isobrittle rW corr 2023-01-24 15:08:57 +01:00
Franz Roters 02221da3e8 Merge branch 're-fit-phenopowerlaw' into 'development'
re-fit phenopowerlaw example data

Closes #224

See merge request damask/DAMASK!709
2023-01-24 13:44:24 +00:00
Martin Diehl ce6c86dd6d essentially same behavior as before,
but better documentation, a few simplifications, and typehints
2023-01-24 11:26:14 +01:00
Martin Diehl 532ec2d26f Merge remote-tracking branch 'origin/development' into re-fit-phenopowerlaw 2023-01-23 21:57:32 +01:00
Martin Diehl f427b85967 re-fit for new phenopowerlaw formulation 2023-01-23 21:51:08 +01:00
Martin Diehl 9b7a827d3f use common notation 2023-01-23 21:43:45 +01:00
Martin Diehl 83ef5ad0e0 consistent indexing 2023-01-23 21:43:45 +01:00
Martin Diehl acbc5e090e better to understand 2023-01-23 21:43:45 +01:00
Test User 183a2f7671 [skip ci] updated version information after successful test of v3.0.0-alpha7-316-g8a7655a9e 2023-01-23 21:43:45 +01:00
Martin Diehl 461bf53320 macos installation of PETSc does not work 2023-01-23 21:43:45 +01:00
Martin Diehl 2662bec55f only valid/needed for GNU 2023-01-23 21:43:45 +01:00
Martin Diehl eff2789bc2 not needed 2023-01-23 21:43:45 +01:00
Martin Diehl 4f801259ca ensure recent compiler 2023-01-23 21:43:45 +01:00
Philip Eisenlohr c5a0103246 Resolve "naming for classes" 2023-01-23 21:43:45 +01:00
Test User daea65e12a [skip ci] updated version information after successful test of v3.0.0-alpha7-307-g6ee31e2ab 2023-01-23 21:43:45 +01:00
Test User 6e139a8941 [skip ci] updated version information after successful test of v3.0.0-alpha7-302-g56ff8c769 2023-01-23 21:43:45 +01:00
Philip Eisenlohr 4c2fa82436 Option to normalize rotation matrix 2023-01-23 21:43:45 +01:00
Test User 6cf4bfe384 [skip ci] updated version information after successful test of v3.0.0-alpha7-299-g1b8f3292f 2023-01-23 21:43:45 +01:00
Daniel Otto de Mentock b101af7152 test was not using parametrized values 2023-01-23 21:43:45 +01:00
Test User a79339d13e [skip ci] updated version information after successful test of v3.0.0-alpha7-297-g22de899aa 2023-01-23 21:43:45 +01:00
Martin Diehl 80943ec188 white space and style adjustments 2023-01-23 21:43:44 +01:00
Martin Diehl fa9feda3a4 string length is not know, avoid overflow 2023-01-23 21:43:44 +01:00
Test User d5a2173ba3 [skip ci] updated version information after successful test of v3.0.0-alpha7-326-g510f59b4b 2023-01-23 17:29:58 +01:00
Yi Hu dd74fa2d1d corr rW (use 0.5 prefactor) in isobrittle and related test upd 2023-01-23 15:27:44 +01:00
Daniel Otto de Mentock 510f59b4b5 Merge branch 'clean-MPI-exit' into 'development'
Clean MPI exit

See merge request damask/DAMASK!707
2023-01-23 13:10:33 +00:00
Martin Diehl 210dd8b497 report errors to STDERR 2023-01-23 11:45:03 +01:00
Daniel Otto de Mentock d11aca5fd4 Merge branch 'polish-grid' into 'development'
Polished grid code

See merge request damask/DAMASK!706
2023-01-23 09:56:52 +00:00
Martin Diehl 0880649dd9 more systematic name 2023-01-23 08:31:59 +01:00
Martin Diehl 68b583e4da Merge branch 'development' into clean-MPI-exit 2023-01-20 07:08:38 +01:00
Test User 7049137654 [skip ci] updated version information after successful test of v3.0.0-alpha7-316-g8a7655a9e 2023-01-19 23:17:35 +01:00
Daniel Otto de Mentock 8a7655a9e3 Merge branch 'fix-github-actions' into 'development'
Fix github actions

See merge request damask/DAMASK!703
2023-01-19 17:29:55 +00:00
Sharan Roongta 4af29d0393 Merge branch '247-naming-for-classes' into 'development'
Resolve "naming for classes"

Closes #247

See merge request damask/DAMASK!699
2023-01-19 16:37:45 +00:00
Philip Eisenlohr b4a500a194 Resolve "naming for classes" 2023-01-19 16:37:45 +00:00
Test User ae7709584e [skip ci] updated version information after successful test of v3.0.0-alpha7-307-g6ee31e2ab 2023-01-19 12:08:28 +01:00
Franz Roters 6ee31e2ab3 Merge branch 'allocatable-strings' into 'development'
string length is not known, avoid overflow

See merge request damask/DAMASK!701
2023-01-19 08:06:00 +00:00
Martin Diehl 923ce05802 Merge remote-tracking branch 'origin/development' into allocatable-strings 2023-01-19 05:37:12 +01:00
Martin Diehl 327992871b white space and style adjustments 2023-01-18 18:50:01 +01:00
Test User 19f27e51cc [skip ci] updated version information after successful test of v3.0.0-alpha7-302-g56ff8c769 2023-01-17 04:07:43 +01:00
Sharan Roongta 56ff8c769b Merge branch 'from_basis-normalize' into 'development'
Option to normalize rotation matrix

See merge request damask/DAMASK!705
2023-01-16 23:53:49 +00:00
Philip Eisenlohr 5edd001d4c Option to normalize rotation matrix 2023-01-16 23:53:49 +00:00
Test User bdf5faf40a [skip ci] updated version information after successful test of v3.0.0-alpha7-299-g1b8f3292f 2023-01-16 17:31:38 +01:00
Daniel Otto de Mentock 1b8f3292f0 test was not using parametrized values 2023-01-16 11:45:09 +01:00
Martin Diehl 907b01e9f3 simple test setup 2023-01-15 13:45:39 +01:00
Test User 1924df6c3e [skip ci] updated version information after successful test of v3.0.0-alpha7-297-g22de899aa 2023-01-15 05:31:39 +01:00
Martin Diehl 1174e94486 re-fit
- new phenopowerlaw formulation for hardening
- physics-based interactions (scaled DDD results such that
  self-hardening is 1.0)
2023-01-15 01:34:30 +01:00
Martin Diehl 6c1edaeaac new data for Aluminum 2023-01-15 01:33:50 +01:00
Martin Diehl e91c52f518 use common notation 2023-01-14 22:55:33 +01:00
Martin Diehl 1643fdf9fa consistent indexing 2023-01-14 22:46:00 +01:00
Martin Diehl 9464279eb5 better to understand 2023-01-14 22:34:05 +01:00
Martin Diehl 22de899aaa Merge remote-tracking branch 'origin/229-improved-handling-of-reference-stiffness' into development 2023-01-14 15:06:43 +01:00
Test User b83a545401 [skip ci] updated version information after successful test of v3.0.0-alpha7-294-g1330a4cfc 2023-01-11 21:53:20 +01:00
Martin Diehl f6be4e11e8 Merge remote-tracking branch 'github-md/fix-github-actions' into development 2023-01-11 21:31:34 +01:00
Sharan Roongta 1330a4cfc4 Merge branch '253-fix-lattice-test' into 'development'
avoid failing tests

Closes #253

See merge request damask/DAMASK!702
2023-01-11 16:50:22 +00:00
Martin Diehl da0a15f63a string length is not know, avoid overflow 2023-01-10 11:54:13 +01:00
Test User e9eda1fb18 [skip ci] updated version information after successful test of v3.0.0-alpha7-291-gd2ad37e7f 2023-01-10 06:20:57 +01:00
Sharan 7b6abafbb7 store data directly in HDF5 2023-01-10 02:03:32 +01:00
Martin Diehl 102d1b7995 avoid failing tests
stiffness matrices should have non-zero diagonal entries, for this
situation the implemented functionality works as expected
2023-01-09 23:38:51 +01:00
Martin Diehl d2ad37e7ff Merge branch 'clean-author-list' into 'development'
Clean author list

See merge request damask/DAMASK!698
2023-01-09 22:18:25 +00:00
Franz Roters 235cbd3158 Clean author list 2023-01-09 22:18:25 +00:00
Test User ac11e9d99f [skip ci] updated version information after successful test of v3.0.0-alpha7-288-g214ee7b2f 2023-01-09 16:47:02 +01:00
Sharan Roongta 214ee7b2f8 Merge branch 'material_add-no-kwargs' into 'development'
kwargs flexibility not needed

See merge request damask/DAMASK!694
2023-01-09 11:27:14 +00:00
Franz Roters 545b813ec3 Merge branch 're-fit-temperature-dependent-parameters' into 'development'
re-fit temperature dependend parameters

See merge request damask/DAMASK!696
2023-01-09 11:19:36 +00:00
Test User f882ee5a9b [skip ci] updated version information after successful test of v3.0.0-alpha7-274-g46b640826 2023-01-09 02:04:02 +01:00
Martin Diehl 46b640826b Merge branch 'update-year' into 'development'
Update year

See merge request damask/DAMASK!697
2023-01-08 22:27:11 +00:00
Martin Diehl 93e05aed29 should always point to the most recent version 2023-01-08 20:46:07 +01:00
Martin Diehl 444303a000 the year of DAMASK 3.0 2023-01-08 20:45:15 +01:00
Test User 1a717390da [skip ci] updated version information after successful test of v3.0.0-alpha7-270-gdf9983782 2023-01-08 20:33:31 +01:00
Yi Hu df99837820 Merge branch '200-correct-strain-calculation' into 'development'
correct calculation of strain

Closes #200

See merge request damask/DAMASK!695
2023-01-08 17:03:08 +00:00
Martin Diehl 695d78eb35 have EOL and EOF 2023-01-08 14:32:13 +01:00
Martin Diehl 384bb8a262 avoid failing tests cause by limited floating point precision 2023-01-08 14:31:58 +01:00
Martin Diehl 47e29f47fb re-fit
using higher order polynomial where appropriate. Code for fitting in
"parameters" repository
2023-01-08 14:31:54 +01:00
Martin Diehl 976cfd501a thermal expansion coefficients for SiC
this material was the initial motivation for adding fourth order
polynomials, but I could not find a reliable source for the graphs send
to damask@mpie.de. It seems that the CTE levels off for even higher
temperature which calls for a higher order polynomial
2023-01-08 14:31:43 +01:00
Martin Diehl eb74d5a097 polishing 2023-01-08 11:54:42 +01:00
Martin Diehl 64fbfbb206 re-fit with correct conversion between Celsius and Kelvin
procedure is documented in the 'parameters' repository
2023-01-08 10:58:01 +01:00
Martin Diehl b9195a121f commonly used scaling 2023-01-08 10:57:36 +01:00
Martin Diehl 1711bf3220 re-fit using correct scaling
code is in 'parameters' repository
2023-01-08 10:57:06 +01:00
Martin Diehl 81870a6111 re-fit data
some small adjustments, procedure is now reproducible using "parameters"
repository
2023-01-08 00:25:43 +01:00
Martin Diehl 8d9df30090 legacy example
- undocumented
- not atomic
2023-01-07 22:01:03 +01:00
Martin Diehl cdaddf8e6f kwargs flexibility not needed
the number of supported entries is rather limited, so guide the user
using explicit arguments
2023-01-07 14:32:05 +01:00
Martin Diehl 0185eda888 correct calculation of strain
was introduced when changing to Voigt notation in fa8218124a
2023-01-07 13:03:12 +01:00
Test User 3fd34c6e05 [skip ci] updated version information after successful test of v3.0.0-alpha7-267-g09c8632eb 2023-01-03 16:53:07 +01:00
Franz Roters 09c8632eb5 updated access token in PRIVAT 2023-01-03 12:02:11 +01:00
Yi Hu 12c0919566 Merge branch '245-no-need-for-multiple-damage-mechanisms' into 'development'
competing damage models are not implemented

Closes #245

See merge request damask/DAMASK!689
2023-01-02 15:43:53 +00:00
Franz Roters 45811ba838 Merge branch '246-result-add_strain' into 'development'
guide choice of strain measure that makes sense

Closes #246

See merge request damask/DAMASK!692
2023-01-02 10:40:39 +00:00
Martin Diehl d3d904955a Merge branch 'Marc2022.4' into 'development'
Marc2022.4

See merge request damask/DAMASK!690
2022-12-31 08:08:04 +00:00
Franz Roters 71bd8efaa8 Marc2022.4 2022-12-31 08:08:04 +00:00
Test User 4b0fcc5140 [skip ci] updated version information after successful test of v3.0.0-alpha7-259-g28ba8bb4a 2022-12-30 04:48:29 +01:00
Martin Diehl e658f3126b guide choice of strain measure that makes sense 2022-12-29 20:29:13 +01:00
Martin Diehl 28ba8bb4ae Merge branch '141-solver-should-not-solve-for-field-if-homogenization-is-missing' into 'development'
solver should not solve for field if homogenization description is absent

Closes #141

See merge request damask/DAMASK!680
2022-12-29 19:08:05 +00:00
Sharan Roongta 5c221e16e1 solver should not solve for field if homogenization description is absent 2022-12-29 19:08:05 +00:00
Test User 13b1a610b2 [skip ci] updated version information after successful test of v3.0.0-alpha7-256-ga2a4054a3 2022-12-25 19:48:27 +01:00
Martin Diehl a2a4054a37 give explanation of unexpected code 2022-12-25 16:36:01 +01:00
Test User 8fabf58f26 [skip ci] updated version information after successful test of v3.0.0-alpha7-254-g53d6c7746 2022-12-22 21:57:54 +01:00
Franz Roters 53d6c7746c use correct Marc version in patches 2022-12-22 16:07:28 +01:00
Test User e1f6195276 [skip ci] updated version information after successful test of v3.0.0-alpha7-252-g38e6f4b49 2022-12-20 19:39:04 +01:00
Martin Diehl 38e6f4b49b Merge remote-tracking branch 'origin/select-mu' into development 2022-12-20 00:47:24 +01:00
Martin Diehl c2d63532df macos installation of PETSc does not work 2022-12-18 09:45:33 +01:00
Martin Diehl 4f69c7630d competing damage models are not implemented
while there might be the chance that we need this, we better focus on
today's capabilities and don't make the material.yaml syntax more
complicated in anticipation of potential changes
2022-12-18 09:34:25 +01:00
Martin Diehl 3a643d04c4 only valid/needed for GNU 2022-12-17 16:13:35 +01:00
Martin Diehl 548857c6a6 not needed 2022-12-17 16:10:25 +01:00
Martin Diehl 42329a4ca4 ensure recent compiler 2022-12-17 14:52:41 +01:00
Test User 902f9d2e97 [skip ci] updated version information after successful test of v3.0.0-alpha7-242-g5f8ef4ac7 2022-12-16 21:27:46 +01:00
Martin Diehl 5f8ef4ac71 Merge branch 'grid-FEM-simplifications' into 'development'
style polishing

See merge request damask/DAMASK!686
2022-12-16 12:32:21 +00:00
Test User fd42f810d0 [skip ci] updated version information after successful test of v3.0.0-alpha7-239-g9bacd2ed5 2022-12-16 12:41:30 +01:00
Franz Roters 9bacd2ed5e Merge branch '233-unit-testing-for-yaml' into 'development'
a few more tests

Closes #233 and #239

See merge request damask/DAMASK!679
2022-12-16 08:40:31 +00:00
Test User 32d78d38a2 [skip ci] updated version information after successful test of v3.0.0-alpha7-236-g5d2d61189 2022-12-13 23:06:46 +01:00
Philip Eisenlohr 5d2d611898 Merge branch '238-tail_repack-behavior-and-use' into 'development'
simplifications of Python code

Closes #238

See merge request damask/DAMASK!684
2022-12-13 18:32:19 +00:00
Martin Diehl dcdc4acbd5 Unified object.comments as list[str]; simplifications of Python code 2022-12-13 18:32:19 +00:00
Martin Diehl 42a6014614 Merge branch 'axis-angle-rename' into 'development'
consistent naming

See merge request damask/DAMASK!685
2022-12-13 15:09:46 +00:00
Philip Eisenlohr 213d082fce Merge branch '209-small-improve-CLI-for-restart' into 'development'
minor change in CLI help for restart

Closes #209

See merge request damask/DAMASK!688
2022-12-13 13:43:26 +00:00
Yi Hu 0c989ef03e add short text for better understanding in CLI help for restart 2022-12-12 16:40:42 +01:00
Martin Diehl ede04c0264 style polishing 2022-12-11 18:16:13 +01:00
Martin Diehl 0e48f04d0f consistent naming 2022-12-11 16:09:54 +01:00
Test User c4883e2557 [skip ci] updated version information after successful test of v3.0.0-alpha7-229-g99b2a509d 2022-12-10 21:33:49 +01:00
Martin Diehl 99b2a509d9 Merge branch '231-no-petscscalar-and-_range' into 'development'
Resolve "no PetscScalar and ?_RANGE"

Closes #231

See merge request damask/DAMASK!668
2022-12-10 18:06:16 +00:00
Martin Diehl e6c2e73e03 Merge remote-tracking branch 'origin/development' into 231-no-petscscalar-and-_range 2022-12-10 14:54:02 +01:00
Test User 353d55c9a7 [skip ci] updated version information after successful test of v3.0.0-alpha7-220-g85115d12f 2022-12-10 10:48:29 +01:00
Martin Diehl 85115d12ff Merge branch 'scipy_performance_improvements_numba' into 'development'
Improving grid.vicinity_offset performance with numba

See merge request damask/DAMASK!677
2022-12-10 07:22:22 +00:00
Daniel Otto de Mentock e03ad0db11 Improving grid.vicinity_offset performance optionally with numba 2022-12-10 07:22:22 +00:00
Test User 219ca8d14e [skip ci] updated version information after successful test of v3.0.0-alpha7-217-g265572ffd 2022-12-10 02:04:31 +01:00
Philip Eisenlohr 265572ffde Merge branch 'Marc2022.3' into 'development'
Marc2022.3

See merge request damask/DAMASK!670
2022-12-09 20:04:36 +00:00
Philip Eisenlohr 45fe1e48a7 Merge branch '201-external-heat-syntax' into 'development'
Resolve "external heat: Syntax"

Closes #201 and #107

See merge request damask/DAMASK!683
2022-12-09 19:59:30 +00:00
Philip Eisenlohr 4830ea19c9 bug fix;more elaborate self test 2022-12-09 10:00:00 -05:00
Martin Diehl a9cb81b1cb functions are meant for proper files (ending with EOL) 2022-12-09 06:48:38 +01:00
Martin Diehl a3128d4021 avoid failing tests 2022-12-09 06:48:29 +01:00
Martin Diehl cca5d6d495 impoved naming 2022-12-09 06:48:16 +01:00
Test User 4400c83da3 [skip ci] updated version information after successful test of v3.0.0-alpha7-203-g8c6593985 2022-12-09 00:02:14 +01:00
Daniel Otto de Mentock 8c6593985c Merge branch 'yaml-emit-numpy-scalar' into 'development'
single elements of numpy arrays are not of native type

See merge request damask/DAMASK!681
2022-12-08 12:03:54 +00:00
Test User 3509d7c9bf [skip ci] updated version information after successful test of v3.0.0-alpha7-200-ga4e2702af 2022-12-08 06:06:53 +01:00
Martin Diehl 7b986f6f77 using new table functionality 2022-12-07 21:55:20 +01:00
Martin Diehl 06f8697bd1 manage tabulated data with linear interpolation in-between points 2022-12-07 21:44:44 +01:00
Martin Diehl a4e2702afb Merge branch 'fortran-style-adjustments' into 'development'
Fortran style adjustments

See merge request damask/DAMASK!682
2022-12-07 17:29:04 +00:00
Martin Diehl aaae8a701b Fortran style adjustments 2022-12-07 17:29:03 +00:00
Daniel Otto de Mentock e8aeb4435d polishing 2022-12-07 14:33:33 +01:00
Martin Diehl b6610f4499 a few more tests 2022-12-07 13:03:42 +01:00
Sharan Roongta dc54f5935c lattice is an optional parameter;
argument order changed to reflect that
2022-12-07 12:53:22 +01:00
Test User 0b24a17a4b [skip ci] updated version information after successful test of v3.0.0-alpha7-197-g418e2f022 2022-12-07 01:50:56 +01:00
Martin Diehl 418e2f022b Merge branch '242-optional-numba-for-yaml-emitter' into 'development'
yaml.CSafeDumper can be subclassed

Closes #242

See merge request damask/DAMASK!678
2022-12-06 20:17:24 +00:00
Daniel Otto de Mentock ba2062e4ed CSafeDumper is significantly faster and can be subclassed for custom extensions. 2022-12-06 20:17:23 +00:00
Test User 9cb1d75d05 [skip ci] updated version information after successful test of v3.0.0-alpha7-194-g4717536f1 2022-12-06 18:52:28 +01:00
Sharan Roongta 4717536f1a Merge branch '241-same-quaternion-but-different-ipfs-calculated-by-damask-and-orix-python-package' into 'development'
lower exponent gives smoother gradients

Closes #241

See merge request damask/DAMASK!675
2022-12-06 14:15:35 +00:00
Test User e295ea5c75 [skip ci] updated version information after successful test of v3.0.0-alpha7-190-g65cb9d599 2022-12-06 06:48:40 +01:00
Philip Eisenlohr 7b8fce8db0 help polish 2022-12-05 18:29:03 -05:00
Martin Diehl ce2e0a01f5 single elements of numpy arrays are not of native type 2022-12-05 20:29:08 +01:00
Philip Eisenlohr 65cb9d5997 Merge branch 'development' into 228-unit-tests-for-spectral-functionality 2022-12-05 11:07:43 -05:00
Philip Eisenlohr 71a75f1cc2 more informative error stop messages 2022-12-05 11:01:06 -05:00
Philip Eisenlohr f8ec873e54 == syntax consistency 2022-12-05 11:00:23 -05:00
Martin Diehl 1b4f12887f PRIVATE including merge commit for damage testing 2022-12-05 14:02:05 +01:00
Martin Diehl bcded82787 Merge branch 'damage_restart_yi_clean' into 'development'
add back and clean damage restart functionality with checked tests

See merge request damask/DAMASK!629
2022-12-05 10:52:59 +00:00
Yi Hu b9ee401ff5 add damage restart functionality and associated tests 2022-12-05 10:52:59 +00:00
Daniel Otto de Mentock 7c6c46c2db return value of fftw function is defined as cdouble 2022-12-05 10:39:42 +01:00
Daniel Otto de Mentock c2e78158c8 petsc macros can be omitted with use of preal 2022-12-05 10:38:36 +01:00
Test User f585160e12 [skip ci] updated version information after successful test of v3.0.0-alpha7-177-g30998d667 2022-12-05 07:20:16 +01:00
Martin Diehl 30998d6670 Merge branch 'test-rotation-multidim' into 'development'
Increase uniformity in from_X(as_X) tests

See merge request damask/DAMASK!676
2022-12-05 02:08:31 +00:00
Philip Eisenlohr 5127dfe90b from/as tests use rotation-array; separate bounds checks 2022-12-05 02:08:31 +00:00
Martin Diehl c7cb56fc18 lower exponent gives smoother gradients 2022-12-02 22:55:22 +01:00
Martin Diehl f61273c062 standard style 2022-12-02 20:41:47 +01:00
Test User 1f624ddbf5 [skip ci] updated version information after successful test of v3.0.0-alpha7-174-g934147d80 2022-12-02 18:58:56 +01:00
Daniel Otto de Mentock 934147d803 Merge branch 'fortran-rename' into 'development'
following style guide

See merge request damask/DAMASK!674
2022-12-02 14:19:24 +00:00
Martin Diehl 411c86b5ef following style guide 2022-12-01 19:52:53 +01:00
Martin Diehl 8493170419 testing equivalence of different code branches for imposed cubic
symmetry
2022-12-01 19:17:11 +01:00
Daniel Otto de Mentock a2f898a94c correcting function return type, indentation 2022-12-01 17:27:30 +01:00
Daniel Otto de Mentock b96576ce93 standardizing double definition across modules 2022-12-01 17:27:30 +01:00
Daniel Otto de Mentock 8fd4a0c084 petscscalar and pReal need to be equivalent 2022-12-01 17:26:25 +01:00
Sharan Roongta 07bbbdb380 avoid fixed length character arrays 2022-11-30 13:33:04 +01:00
Sharan Roongta 71fe8edd4c Merge remote-tracking branch 'origin/development' into select-mu 2022-11-30 11:11:34 +01:00
Philip Eisenlohr 3a3be7cdc8 have isostrain/stress replace voigt/reuss 2022-11-30 11:09:51 +01:00
Test User fd2b892f3e [skip ci] updated version information after successful test of v3.0.0-alpha7-171-g26ff1b895 2022-11-30 04:36:32 +01:00
Sharan Roongta 26ff1b8956 Merge branch '220-array-dimensions-in-restart-file-hdf5-chunking-fails-for-large-simulations' into 'development'
flatten solver data layout

Closes #220

See merge request damask/DAMASK!671
2022-11-29 21:45:10 +00:00
Martin Diehl 18ad14708f stay consistent 2022-11-29 22:01:14 +01:00
Philip Eisenlohr 8ba9bb02c7 slight reduction of code doubling 2022-11-29 15:47:11 -05:00
Martin Diehl d364808c82 extending test to MPI parallel runs 2022-11-29 18:12:38 +01:00
Sharan Roongta 599e4472e8 Merge remote-tracking branch 'origin/development' into select-mu 2022-11-29 12:12:02 +01:00
Test User afa0a644ed [skip ci] updated version information after successful test of v3.0.0-alpha7-168-g741aeab1d 2022-11-29 08:43:36 +01:00
Martin Diehl 741aeab1d3 Merge branch '235-docstring-of-orientation-from_axis_angle' into development 2022-11-29 06:06:31 +01:00
Test User 88878c50c6 [skip ci] updated version information after successful test of v3.0.0-alpha7-163-g3505fdee9 2022-11-29 00:45:34 +01:00
Sharan Roongta 8b5fa37428 calculation of shear modulus for cubic crystals can be simplifieid, tests added for different crystal symmetries 2022-11-28 23:28:36 +01:00
Philip Eisenlohr 3505fdee9a Merge branch '149-python-vtk-improvements' into 'development'
don't add empty strings

Closes #149

See merge request damask/DAMASK!673
2022-11-28 20:05:40 +00:00
Martin Diehl d668f8a56d don't add empty strings 2022-11-28 20:05:39 +00:00
Daniel Otto de Mentock 8112f87d39 parameter names can contain underscores 2022-11-28 10:33:07 +01:00
Martin Diehl 03a81b81e8 adopting to Python standards 2022-11-28 09:30:08 +01:00
Martin Diehl 20f984fc87 adopt to new location 2022-11-28 09:12:34 +01:00
Martin Diehl cfcb16be43 easier to find in flat layout 2022-11-28 09:11:34 +01:00
Martin Diehl 0508fa9ec2 flatten solver data layout
avoid problem with chunking/compression (only relevant for large
simulations when this feature is used).
In addition, use a unified variable naming: no "_current" for
thermal and damage to follow example of mech.
2022-11-27 17:07:25 +01:00
Martin Diehl 39157b75b7 plane waves have known solutions 2022-11-27 16:53:53 +01:00
Martin Diehl 6be1d43dc6 gradient/curl/div of constant fields are zero 2022-11-26 10:37:54 +01:00
Test User bfdd072d06 [skip ci] updated version information after successful test of v3.0.0-alpha7-160-g92ae86b63 2022-11-26 02:15:10 +01:00
Martin Diehl 92ae86b636 Merge branch 'fix-mypy-no-implicit-optional' into 'development'
PEP 484 compatibility (no-implicit-optional in mypy)

See merge request damask/DAMASK!664
2022-11-25 21:25:33 +00:00
Philip Eisenlohr 8993b5caac Merge branch '232-residualstiffness-residualphi' into 'development'
better naming

Closes #232

See merge request damask/DAMASK!666
2022-11-25 15:12:54 +00:00
Franz Roters 73508ca4b7 Merge branch 'test-hybridIA' into 'development'
putting understanding of hybridIA into code

See merge request damask/DAMASK!667
2022-11-25 14:21:39 +00:00
Test User aca6ae928d [skip ci] updated version information after successful test of v3.0.0-alpha7-152-g36f050a08 2022-11-25 13:16:48 +01:00
Franz Roters 36f050a085 Merge branch 'polish-YAML-parsing' into 'development'
Shorter YAML code

See merge request damask/DAMASK!663
2022-11-25 07:55:31 +00:00
Philip Eisenlohr af24d47b9a Shorter YAML code 2022-11-25 07:55:31 +00:00
Martin Diehl 77be2c0d4c standard way to report 2022-11-25 07:00:15 +01:00
Martin Diehl e10f9fa299 not useful here
not a general convention, is documented for the affected from_/as_
methods
2022-11-25 01:25:36 +01:00
Martin Diehl f8844285d7 putting understanding of hybridIA into code 2022-11-25 01:15:39 +01:00
Test User df4c0fbc33 [skip ci] updated version information after successful test of v3.0.0-alpha7-149-g99673bb86 2022-11-25 00:56:42 +01:00
Sharan Roongta 99673bb865 Merge branch '162-error-stress-bc-grid' into 'development'
avoid confusion during reporting

Closes #162

See merge request damask/DAMASK!662
2022-11-24 12:50:39 +00:00
Test User 2884c3c2c9 [skip ci] updated version information after successful test of v3.0.0-alpha7-146-g19fbfb096 2022-11-24 13:08:58 +01:00
Franz Roters 42e0bf8689 use Marc2022.3 for testing 2022-11-24 12:16:06 +01:00
Sharan Roongta 9d71ffa3ee better naming 2022-11-24 11:23:10 +01:00
Martin Diehl eea0c4c44c return was missing 2022-11-24 10:15:23 +01:00
Martin Diehl deb8ebeb5b avoid confusion during reporting
polarization needs to ensure BC for F and P
2022-11-24 09:47:48 +01:00
Martin Diehl 19fbfb0968 Merge branch '230-polynomial-get' into 'development'
removed superfluous asDict specification for polynomials arguments

Closes #230

See merge request damask/DAMASK!665
2022-11-24 06:58:17 +00:00
Franz Roters 6a701db211 support Marc 2022.3 2022-11-23 17:20:35 +01:00
Test User 3334d0845c [skip ci] updated version information after successful test of v3.0.0-alpha7-143-gb2fcd1ec1 2022-11-23 09:23:04 +01:00
Philip Eisenlohr 6315f97f4a added explicit Optional type hint 2022-11-22 16:26:15 -05:00
Daniel Otto de Mentock b2fcd1ec1b Merge branch 'grid-spectral-simplifications' into 'development'
FFTW-related changes

Closes #206 and #216

See merge request damask/DAMASK!661
2022-11-22 18:24:03 +00:00
Franz Roters 4a49523720 Merge branch 'mypy-etc-polish' into 'development'
Collection of small polishing steps

See merge request damask/DAMASK!659
2022-11-22 14:39:52 +00:00
Philip Eisenlohr cbe2e74cdd Collection of small polishing steps 2022-11-22 14:39:51 +00:00
Daniel Otto de Mentock 3fb0b5d099 removed superfluous asDict specification for polynomials arguments 2022-11-22 14:20:19 +01:00
Test User 6f6e143f5f [skip ci] updated version information after successful test of v3.0.0-alpha7-125-g762a5de6c 2022-11-21 05:14:06 +01:00
Philip Eisenlohr 762a5de6c9 Merge branch '205-name-for-coefficient-of-thermal-expansion' into 'development'
commonly used variable name

Closes #205

See merge request damask/DAMASK!660
2022-11-20 23:56:59 +00:00
Martin Diehl cad4cbc5d2 circument bug in gfortran
associate to strided pointer seems to cause trouble
2022-11-20 23:35:54 +01:00
Test User c73f777b5c [skip ci] updated version information after successful test of v3.0.0-alpha7-122-g815d825fa 2022-11-20 17:10:14 +01:00
Martin Diehl 815d825fac Merge branch 'material_add' into 'development'
configMaterial functionality

See merge request damask/DAMASK!651
2022-11-20 12:59:01 +00:00
Martin Diehl 2173c9e499 undo weighting needed for restart 2022-11-20 13:36:03 +01:00
Martin Diehl 34fb7e921a use self-documenting code
the comments did not anything that was not clear from the
variable/function names
2022-11-20 12:58:50 +01:00
Martin Diehl ef435ee7d1 commonly used variable name 2022-11-20 09:40:15 +01:00
Philip Eisenlohr 6907ca60b3 adjustments to make mypy happy 2022-11-19 20:55:23 -05:00
Martin Diehl 9b80ff623b faster operation
explicit weighting not needed
2022-11-19 13:39:43 +01:00
Martin Diehl eb226d237f better readable 2022-11-19 13:27:32 +01:00
Martin Diehl 6db3b72c89 avoid global variables
extra memory (one vector field) required
2022-11-19 13:05:12 +01:00
Martin Diehl f22ff8fa25 avoid state-changing functions
requires explicit padding, i.e. a little bit of code duplication
2022-11-19 12:36:56 +01:00
Martin Diehl ad3c18b29b avoid use of global variables 2022-11-19 12:24:16 +01:00
Martin Diehl 7de3da50e7 include weighting operation into Gamma operator
avoids point-wise multiplication.
2022-11-19 12:05:31 +01:00
Martin Diehl cb6df618fe avoid global variables 2022-11-19 11:47:44 +01:00
Test User 9160c63adf [skip ci] updated version information after successful test of v3.0.0-alpha7-111-g30b23df2d 2022-11-19 11:31:43 +01:00
Martin Diehl 18b8923929 centralize FFTs 2022-11-19 09:37:26 +01:00
Martin Diehl 30b23df2d2 Merge branch 'extend_docstring_layout' into 'development'
util.extend_docstring: fix broken layout

Closes #212 and #169

See merge request damask/DAMASK!658
2022-11-19 08:10:00 +00:00
Daniel Otto de Mentock 5017aabcea util.extend_docstring: proper layout for extended class (incl. current return type) 2022-11-19 08:10:00 +00:00
Martin Diehl cd2a21509a avoid depenencies on global state
requires on extra forward FFT pre iteration for basic scheme
2022-11-19 09:01:57 +01:00
Martin Diehl 20da5663c0 simplified, avoid intermediate writes 2022-11-19 08:14:38 +01:00
Martin Diehl ce98cfdd5e padding is handled centrally in the FFT forward routines 2022-11-19 07:58:45 +01:00
Philip Eisenlohr 7e5a3a12ab proper dealing with default/mandatory items in material_add 2022-11-18 16:30:26 -05:00
Test User dff8a5a7f9 [skip ci] updated version information after successful test of v3.0.0-alpha7-108-gd596de7a3 2022-11-18 17:34:11 +01:00
Philip Eisenlohr d374f6a02c revert, since not working in python3.8... 2022-11-18 11:01:01 -05:00
Philip Eisenlohr 822a098659 cleaner way to specify default dict entries 2022-11-18 10:06:15 -05:00
Martin Diehl d596de7a32 Merge branch '225-tolerate-non-unit-quaternion' into 'development'
add option to normalize quaternions

Closes #225

See merge request damask/DAMASK!657
2022-11-18 09:32:18 +00:00
Test User 4e13a28ecf [skip ci] updated version information after successful test of v3.0.0-alpha7-102-g05974fb30 2022-11-18 05:17:34 +01:00
Philip Eisenlohr ce4b373f9c Merge branch 'development' into '225-tolerate-non-unit-quaternion'
# Conflicts:
#   python/damask/_rotation.py
2022-11-18 00:48:45 +00:00
Philip Eisenlohr 87579dff11 extensive style polish; no functional changes 2022-11-17 18:39:32 -05:00
Martin Diehl 05974fb300 Merge branch 'polish-rotation-error-determination' into 'development'
cleaner and more efficient determination of ValueErrors

See merge request damask/DAMASK!656
2022-11-17 17:52:14 +00:00
Test User 70248c44cb [skip ci] updated version information after successful test of v3.0.0-alpha7-97-g41226b195 2022-11-17 15:39:53 +01:00
Martin Diehl 41226b1950 Merge branch 'Marc2022.2' into 'development'
Marc2022.2

See merge request damask/DAMASK!622
2022-11-17 07:12:28 +00:00
Franz Roters bdd85a414c support for MSC.Marc 2022.2 2022-11-17 07:12:27 +00:00
Philip Eisenlohr 1f947245bb Merge branch 'development' into '225-tolerate-non-unit-quaternion'
# Conflicts:
#   python/damask/_rotation.py
#   python/tests/test_Rotation.py
2022-11-16 20:27:02 +00:00
Martin Diehl d887f0a9d8 better group if/if-elif cases
one line if only when no elif follows to avoid confusion
2022-11-16 21:13:13 +01:00
Test User 3c76eb3069 [skip ci] updated version information after successful test of v3.0.0-alpha7-94-g5d656d9c7 2022-11-16 20:34:42 +01:00
Philip Eisenlohr 25979fcd77 Merge branch 'development' into 'polish-rotation-error-determination'
# Conflicts:
#   python/damask/_rotation.py
2022-11-16 18:05:36 +00:00
Martin Diehl 5d656d9c76 Merge branch 'rotation-test-coverage' into 'development'
increase test coverage to 100%

See merge request damask/DAMASK!655
2022-11-16 14:31:43 +00:00
Test User aedeab7ef8 [skip ci] updated version information after successful test of v3.0.0-alpha7-91-g584d5b421 2022-11-16 11:56:45 +01:00
Philip Eisenlohr 740965df7c cleaner and more efficient determination of ValueErrors 2022-11-15 17:03:57 -05:00
Philip Eisenlohr 23d2337fb2 add option to normalize quaternions 2022-11-15 16:11:29 -05:00
Philip Eisenlohr 1dbf9ae9bc increase test coverage to 100% 2022-11-15 11:46:52 -05:00
Philip Eisenlohr 584d5b4213 Merge branch 'simplify-grid-scale' into 'development'
less repetition

See merge request damask/DAMASK!654
2022-11-15 14:44:53 +00:00
Franz Roters 465ee7c5e5 Merge branch '221-docstring-unification' into 'development'
unify X or list/seq/collection of X --> (A/B/C of) X in docstrings

Closes #221

See merge request damask/DAMASK!653
2022-11-15 13:47:00 +00:00
Philip Eisenlohr 045f1d39a1 add shorthand function for formatting 2022-11-14 14:52:07 -05:00
Philip Eisenlohr fa69a1876b unify X or list/seq/collection of X --> (A/B/C of) X in docstrings 2022-11-14 09:09:45 -05:00
Martin Diehl ba4ac5c108 less repetition 2022-11-14 12:42:13 +01:00
Philip Eisenlohr 2e7d59ab43 brief but comprehensive "is_complete" reporting 2022-11-11 18:07:48 -05:00
Sharan Roongta 1264d8dfc1 allow selection of modulus 2022-11-11 19:36:55 +01:00
Sharan Roongta 4fc5ba54df dummy phase dict need to be added for any new material added (similar to dream3D) 2022-11-11 18:47:01 +01:00
Test User c8e5e9e34a [skip ci] updated version information after successful test of v3.0.0-alpha7-86-g72408f389 2022-11-11 14:40:58 +01:00
Philip Eisenlohr 72408f3892 Merge branch 'result-hit-approx-times' into 'development'
Robust translation for view.times

See merge request damask/DAMASK!649
2022-11-11 06:03:14 +00:00
Philip Eisenlohr 349a39609e Robust translation for view.times 2022-11-11 06:03:14 +00:00
Sharan 13df12be1b initialising dummy arguments with None, making few changes on what is_complete should do 2022-11-11 01:54:59 +01:00
Test User e9fe32b9ea [skip ci] updated version information after successful test of v3.0.0-alpha7-83-g5bb31dd4d 2022-11-10 23:59:26 +01:00
Philip Eisenlohr 5bb31dd4d2 Merge branch 'coverage-report' into 'development'
improved coverage report

See merge request damask/DAMASK!648
2022-11-10 17:58:33 +00:00
Martin Diehl a98c1b3cc5 show coverage details 2022-11-10 11:04:19 +01:00
Martin Diehl 26284ba2df accidentally added 2022-11-10 09:37:16 +01:00
Test User 0e28c7c380 [skip ci] updated version information after successful test of v3.0.0-alpha7-79-g2397d0706 2022-11-10 04:53:18 +01:00
Philip Eisenlohr 2397d07066 Merge branch 'result_improvements' into 'development'
Result class improvements

See merge request damask/DAMASK!646
2022-11-10 01:12:00 +00:00
Philip Eisenlohr 02d785f8f1 comprehensive simulation_setup tests 2022-11-09 17:32:14 -05:00
Philip Eisenlohr 5c6d21e9cf only create subdir when dataset 2022-11-09 17:32:14 -05:00
Philip Eisenlohr 4f6a1720cc recursive list of setup files; no printing but PermissionError 2022-11-09 17:32:14 -05:00
Sharan Roongta 443d796643 phase and homogenization dict to be updated when new material added 2022-11-09 23:13:45 +01:00
Martin Diehl 75cf446654 including restart information
needed updated tests after generating new HDF5 file
2022-11-09 22:50:32 +01:00
Test User d0658907a9 [skip ci] updated version information after successful test of v3.0.0-alpha7-68-g5d28260d2 2022-11-09 22:07:20 +01:00
Martin Diehl b2db825fca newest file format 2022-11-09 22:06:20 +01:00
Philip Eisenlohr 5d28260d2d Merge branch 'fix-O-unit' into 'development'
correct unit for quaternion output O

See merge request damask/DAMASK!647
2022-11-09 17:32:10 +00:00
Philip Eisenlohr 1a748ec5aa shorter function name; setup_files is property 2022-11-09 09:39:47 -05:00
Daniel Otto de Mentock 836feaa5f4 polishing 2022-11-09 12:48:48 +01:00
Daniel Otto de Mentock 1cdb7ef09f function to list available setup files can be useful 2022-11-09 12:48:37 +01:00
Daniel Otto de Mentock ce7d2af6e3 simulation setup export function naming and description was inaccurate 2022-11-09 12:47:47 +01:00
Test User 8d59750b93 [skip ci] updated version information after successful test of v3.0.0-alpha7-65-gb5b861afd 2022-11-09 05:33:17 +01:00
Philip Eisenlohr b5b861afdd Merge branch 'result-export-DADF5' into 'development'
export to new DADF5 file

See merge request damask/DAMASK!644
2022-11-08 19:01:48 +00:00
Philip Eisenlohr 953d5769a0 Merge branch 'RegularGridInterpolator' into 'development'
grid assemble + corrected grid.scale

See merge request damask/DAMASK!643
2022-11-08 18:52:08 +00:00
Martin Diehl 4f0db64e15 grid assemble + corrected grid.scale 2022-11-08 18:52:08 +00:00
Philip Eisenlohr 46e2bbf80c correct unit for quaternion output O 2022-11-08 13:10:37 -05:00
Philip Eisenlohr 507e1a2f05 Merge branch 'rotation-example' into 'development'
Rotation-example

See merge request damask/DAMASK!645
2022-11-08 14:25:35 +00:00
Martin Diehl 59150b791f support the user 2022-11-08 12:39:38 +01:00
Philip Eisenlohr 868a4dda96 remove numpy where unnecessary 2022-11-07 14:56:38 -05:00
Sharan Roongta 88206d307b default was incorrect and some useful examples added 2022-11-07 18:30:46 +01:00
Philip Eisenlohr 13d0f3ae8a more precise description of `times_in_range` 2022-11-07 12:21:26 -05:00
Philip Eisenlohr f88ac18c8a consistent "optional" in parameter description 2022-11-07 12:18:00 -05:00
Martin Diehl 015f1ec741 possibility to export into new DADF5 file 2022-11-07 10:10:13 +01:00
Martin Diehl 0fa9631675 testing output of export_result 2022-11-06 23:16:30 +01:00
Test User 8bfe9269fd [skip ci] updated version information after successful test of v3.0.0-alpha7-53-g1fae90b9b 2022-11-06 23:04:24 +01:00
Philip Eisenlohr 1fae90b9b5 Merge branch 'result_custom_path_export' into 'development'
added custom path export option to Result.export_* functions

Closes #172

See merge request damask/DAMASK!599
2022-11-06 18:10:23 +00:00
Daniel Otto de Mentock 2c3da9c1bf added custom path export option to Result.export_* functions 2022-11-06 18:10:23 +00:00
Test User 92f6d7e68d [skip ci] updated version information after successful test of v3.0.0-alpha7-50-g5c4674104 2022-11-03 16:36:45 +01:00
Martin Diehl 5c4674104a Merge branch 'github-actions-improvements' into development 2022-11-03 09:50:06 +01:00
Martin Diehl 51da27c853 line too long 2022-11-03 09:20:14 +01:00
Test User 5df741c9c2 [skip ci] updated version information after successful test of v3.0.0-alpha7-44-g8e88b2423 2022-11-03 01:22:11 +01:00
Franz Roters 8e88b2423c Merge branch 'fix-Kichhoff-typos' into 'development'
fix Kichhoff typos

See merge request damask/DAMASK!641
2022-11-02 20:23:56 +00:00
Philip Eisenlohr 0ab9adcb5e fix Kichhoff typos 2022-11-02 20:23:56 +00:00
Martin Diehl bfea213594 old versions are deprecated 2022-11-02 20:57:53 +01:00
Martin Diehl 4b73188857 include Python 3.10 (approx a year old) 2022-11-02 17:12:19 +01:00
Martin Diehl 2dd76d0eab fix for HDF5 1.12.2 and Intel ifx
https://www.intel.com/content/www/us/en/developer/articles/release-notes/oneapi-fortran-compiler-release-notes.html#inpage-nav-10-2-9
2022-11-02 11:54:52 +01:00
Test User 11676fe782 [skip ci] updated version information after successful test of v3.0.0-alpha7-41-ga1b91e5fc 2022-10-31 16:58:24 +01:00
Daniel Otto de Mentock a1b91e5fcf Merge branch '202_MPI-random-seed' into 'development'
avoid repeated random sequences on different processes

Closes #202

See merge request damask/DAMASK!639
2022-10-31 11:29:50 +00:00
Test User 8774b94d2a [skip ci] updated version information after successful test of v3.0.0-alpha7-38-gc507e2d3b 2022-10-29 06:33:26 +02:00
Philip Eisenlohr c507e2d3b6 avoid potenttial out-of-bounds memory access 2022-10-27 15:56:59 -04:00
Philip Eisenlohr 5c688345ed more verbose and specific messaging in self-test and errors 2022-10-27 15:39:48 -04:00
Martin Diehl ae3b049d30 avoid repeated random sequences on different processes
we don't use random numbers a lot and there are no reported problems
yet.
Still, this is safer.
2022-10-27 09:21:37 +02:00
Test User 94849d9c38 [skip ci] updated version information after successful test of v3.0.0-alpha7-35-g9149e760f 2022-10-26 16:11:48 +02:00
Franz Roters 9149e760f6 Merge branch 'dislotwin-parameters' into 'development'
example files for TWIP/TRIP

See merge request damask/DAMASK!636
2022-10-26 06:59:59 +00:00
Test User 54a9b1e60f [skip ci] updated version information after successful test of v3.0.0-alpha7-29-g4e5567fce 2022-10-26 00:48:54 +02:00
Martin Diehl 28ea09050d polishing 2022-10-25 23:18:22 +02:00
Daniel Otto de Mentock 4e5567fce1 Merge branch 'cleaning-YAML' into 'development'
Re-written YAML types

See merge request damask/DAMASK!637
2022-10-25 16:09:36 +00:00
Martin Diehl df5487e1a9 Re-written YAML types
Strict typing for YAML

New access pattern requires to specify the expected type, i.e. 'scalar', 'list', or 'dict'. This ensures that the node offers the expected functionality instead of polluting 'tNode' with dummy functions which throw error messages if not overwritten.

The restructuring of the code allows to hierarchically construct methods without much code duplication.

Some aspects of the error messaging system have been improved.
2022-10-25 16:09:36 +00:00
Martin Diehl ff3e08531e including test 2022-10-23 12:42:17 +02:00
Martin Diehl 7831aa5ce8 Merge remote-tracking branch 'origin/development' into dislotwin-parameters 2022-10-23 12:31:30 +02:00
Test User 71c686b508 [skip ci] updated version information after successful test of v3.0.0-alpha7-26-gb9f354a49 2022-10-20 17:18:35 +02:00
Sharan Roongta b9f354a495 Merge branch '218_HDF5read-dim0' into 'development'
avoid HDF5 error in case of empty dataset

See merge request damask/DAMASK!635
2022-10-20 09:57:39 +00:00
Daniel Otto de Mentock d4bd555551 Merge branch '215_dependencies-in-setup.cfg' into 'development'
215 dependencies in setup.cfg

See merge request damask/DAMASK!634
2022-10-20 09:01:32 +00:00
Martin Diehl bf0113a737 avoid HDF5 error in case of empty dataset 2022-10-20 01:09:03 +02:00
Martin Diehl 21230613c0 should work on Windows 2022-10-19 20:12:13 +02:00
Martin Diehl ec09e72408 Merge remote-tracking branch 'origin/development' into 215_dependencies-in-setup.cfg 2022-10-19 20:09:08 +02:00
Test User 51f0ac5d01 [skip ci] updated version information after successful test of v3.0.0-alpha7-16-g027d77e9f 2022-10-19 15:10:32 +02:00
Franz Roters 027d77e9f7 Merge branch 'long-PETSc-lines' into 'development'
length of macro seems to depend on PETSc location

See merge request damask/DAMASK!632
2022-10-19 10:32:15 +00:00
Test User 57b69e2041 [skip ci] updated version information after successful test of v3.0.0-alpha7-13-g53123d6c2 2022-10-17 01:52:06 +02:00
Martin Diehl 53123d6c27 using current PRIVATE
includes chances slightly less strict tolerance to avoid failing tests
when using GCC and improved handling of output directory for commit
history statistics
2022-10-16 20:56:40 +02:00
Test User bdb1e97890 [skip ci] updated version information after successful test of v3.0.0-alpha7-11-g11e91c0ef 2022-10-16 13:32:07 +02:00
Martin Diehl 11e91c0ef0 Merge branch 'grid_thermal_spectral_fix' into 'development'
missing allocation statement was causing gnu and intel debug compiler to fail in testsuite

See merge request damask/DAMASK!633
2022-10-16 09:01:05 +00:00
Martin Diehl d315aac163 use sourced allocation 2022-10-15 21:54:03 +02:00
Daniel Otto de Mentock 592936f21f missing allocation statement was causing gnu and intel debug compiler to fail 2022-10-14 11:44:42 +02:00
Test User 1b31c93834 [skip ci] updated version information after successful test of v3.0.0-alpha7-7-gb2a600b07 2022-10-13 17:00:58 +02:00
Martin Diehl 8937967067 length of macro seems to depend on PETSc location 2022-10-13 13:08:13 +02:00
Daniel Otto de Mentock 351d81cfe5 python package needs to be built after every push to development/master 2022-10-13 13:01:42 +02:00
Daniel Otto de Mentock a0cb7dced4 damask version needs to comply to PEP440 standards 2022-10-13 13:00:05 +02:00
Daniel Otto de Mentock 3650553fdf venv not required for build 2022-10-13 12:55:40 +02:00
Martin Diehl b2a600b07d new PETSc, new compilers 2022-10-13 12:17:30 +02:00
Test User 6324dac1c2 [skip ci] updated version information after successful test of v3.0.0-alpha7-5-g2e24ce477 2022-10-13 12:12:42 +02:00
Martin Diehl 2e24ce4770 Merge branch 'phenopowerlaw_fix_clean' into 'development'
asymptotic hardening respects own (not other) saturation

See merge request damask/DAMASK!631
2022-10-13 07:54:47 +00:00
Martin Diehl 8caf09aff7 correct inclusion of dependencies 2022-10-12 08:01:33 +02:00
Test User 5337822fff [skip ci] updated version information after successful test of v3.0.0-alpha7-2-g14c46d4c2 2022-10-11 09:51:49 +02:00
Martin Diehl 14c46d4c2e typo 2022-10-11 07:43:05 +02:00
Test User 0cfeb5fd9e [skip ci] updated version information after successful test of v3.0.0-alpha7 2022-10-10 14:18:47 +02:00
Sharan Roongta 759c95471c asymptotic hardening respects own (not other) saturation
from @p.eisenlohr
2022-10-07 19:00:09 +02:00
Martin Diehl 0c83245d4b example files for TWIP/TRIP
I'm not able to reproduce the results from https://doi.org/10.1016/j.actamat.2016.07.032,
but these parameters give results that are qualitatively ok
2022-09-22 16:39:23 +02:00
Martin Diehl 784cd3405e clean termination in case of MPI runs (no deadlock) 2022-09-10 23:53:59 +02:00
Martin Diehl 1add486115 don't rely on PETSc for MPI init 2022-09-10 23:37:39 +02:00
584 changed files with 208321 additions and 391983 deletions

4
.gitattributes vendored
View File

@ -14,10 +14,10 @@
# ignore files from MSC.Marc in language statistics # ignore files from MSC.Marc in language statistics
install/MarcMentat/** linguist-vendored install/MarcMentat/** linguist-vendored
src/Marc/include/* linguist-vendored src/Marc/include/* linguist-vendored
install/MarcMentat/apply_DAMASK_modifications.py linguist-vendored=false install/MarcMentat/MSC_modifications.py linguist-vendored=false
# ignore reference files for tests in language statistics # ignore reference files for tests in language statistics
python/tests/reference/** linguist-vendored python/tests/resources/** linguist-vendored
# ignore deprecated scripts # ignore deprecated scripts
processing/legacy/** linguist-vendored processing/legacy/** linguist-vendored

View File

@ -2,7 +2,7 @@ name: Grid and Mesh Solver
on: [push] on: [push]
env: env:
PETSC_VERSION: '3.17.4' PETSC_VERSION: '3.20.5'
HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker
HOMEBREW_NO_AUTO_UPDATE: 'ON' HOMEBREW_NO_AUTO_UPDATE: 'ON'
HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON' HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON'
@ -11,24 +11,23 @@ env:
jobs: jobs:
gcc: gcc_ubuntu:
runs-on: ${{ matrix.os }} runs-on: ubuntu-22.04
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest, macos-latest] gcc_v: [9, 10, 11, 12, 13]
gcc_v: [9, 10, 11] # Version of GCC compilers fail-fast: false
env: env:
GCC_V: ${{ matrix.gcc_v }} GCC_V: ${{ matrix.gcc_v }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: GCC - Install (Linux) - name: GCC - Install
if: contains( matrix.os, 'ubuntu')
run: | run: |
sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo add-apt-repository ppa:ubuntu-toolchain-r/test
sudo apt-get update sudo apt-get update
@ -38,15 +37,9 @@ jobs:
--slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} \ --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_V} \
--slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V} --slave /usr/bin/gcov gcov /usr/bin/gcov-${GCC_V}
- name: GCC - Install (macOS)
if: contains( matrix.os, 'macos')
run: |
brew install gcc@${GCC_V} || brew upgrade gcc@${GCC_V} || true
brew link gcc@${GCC_V}
- name: PETSc - Cache download - name: PETSc - Cache download
id: petsc-download id: petsc-download
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: download path: download
key: petsc-${{ env.PETSC_VERSION }}.tar.gz key: petsc-${{ env.PETSC_VERSION }}.tar.gz
@ -54,7 +47,7 @@ jobs:
- name: PETSc - Download - name: PETSc - Download
if: steps.petsc-download.outputs.cache-hit != 'true' if: steps.petsc-download.outputs.cache-hit != 'true'
run: | run: |
wget -q https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${PETSC_VERSION}.tar.gz -P download wget -q https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${PETSC_VERSION}.tar.gz -P download
- name: PETSc - Prepare - name: PETSc - Prepare
run: | run: |
@ -63,28 +56,19 @@ jobs:
export PETSC_ARCH=gcc${GCC_V} export PETSC_ARCH=gcc${GCC_V}
printenv >> $GITHUB_ENV printenv >> $GITHUB_ENV
- name: PETSc - Cache installation - name: PETSc - Cache Installation
id: petsc-install id: petsc-install
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: petsc-${{ env.PETSC_VERSION }} path: petsc-${{ env.PETSC_VERSION }}
key: petsc-${{ env.PETSC_VERSION }}-${{ matrix.os }}-gcc${{ matrix.gcc_v }}-${{ hashFiles('**/petscversion.h') }} key: petsc-${{ env.PETSC_VERSION }}-gcc${{ matrix.gcc_v }}-${{ hashFiles('**/petscversion.h') }}
- name: PETSc - Install (Linux) - name: PETSc - Installation
if: contains( matrix.os, 'ubuntu')
run: | run: |
cd petsc-${PETSC_VERSION} cd petsc-${PETSC_VERSION}
./configure --with-fc=gfortran --with-cc=gcc --with-cxx=g++ \ ./configure --with-fc=gfortran --with-cc=gcc --with-cxx=g++ \
--download-mpich --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib \ --download-openmpi --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib \
--with-mpi-f90module-visibility=0 --with-mpi-f90module-visibility=1
make all
- name: PETSc - Install (macOS)
if: contains( matrix.os, 'macos')
run: |
cd petsc-${PETSC_VERSION}
./configure --with-fc=gfortran-${GCC_V} --with-cc=gcc-${GCC_V} --with-cxx=g++-${GCC_V} \
--download-openmpi --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib
make all make all
- name: DAMASK - Compile - name: DAMASK - Compile
@ -98,28 +82,29 @@ jobs:
- name: DAMASK - Run - name: DAMASK - Run
run: | run: |
./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -w examples/grid ./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -m material.yaml -w examples/grid
./bin/DAMASK_mesh -l tensionZ_3g.yaml -g cube_3grains.msh -m material.yaml -w examples/mesh
intel: intel:
runs-on: [ubuntu-latest] runs-on: ubuntu-22.04
strategy: strategy:
matrix: fail-fast: false
intel_v: [classic, llvm] # Variant of Intel compilers
env:
INTEL_V: ${{ matrix.intel_v }}
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Intel - Install - name: Intel - Install
run: | run: |
wget -q https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB sudo apt-get remove -y \
sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB '^aspnetcore-runtime.*' '^clang.*' '^dotnet.*' '^gfortran.*' '^mono.*' '^llvm.*' '^ruby.*' '^r-cran.*' '^r-base.*' '^dotnet.*' '^apache2.*'
rm GPG-PUB-KEY-INTEL-SW-PRODUCTS-2023.PUB sudo apt-get autoremove -y
echo "deb https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB \
| gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" \
| sudo tee /etc/apt/sources.list.d/oneAPI.list
sudo apt-get update sudo apt-get update
sudo apt-get install \ sudo apt-get install \
intel-basekit \ intel-basekit \
@ -130,7 +115,7 @@ jobs:
- name: PETSc - Cache download - name: PETSc - Cache download
id: petsc-download id: petsc-download
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: download path: download
key: petsc-${{ env.PETSC_VERSION }}.tar.gz key: petsc-${{ env.PETSC_VERSION }}.tar.gz
@ -138,35 +123,31 @@ jobs:
- name: PETSc - Download - name: PETSc - Download
if: steps.petsc-download.outputs.cache-hit != 'true' if: steps.petsc-download.outputs.cache-hit != 'true'
run: | run: |
wget -q https://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${PETSC_VERSION}.tar.gz -P download wget -q https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${PETSC_VERSION}.tar.gz -P download
- name: PETSc - Prepare - name: PETSc - Prepare
run: | run: |
tar -xf download/petsc-${PETSC_VERSION}.tar.gz -C . tar -xf download/petsc-${PETSC_VERSION}.tar.gz -C .
sed -i "1800s/if not os.path.isfile(os.path.join(self.packageDir,self.configureName)):/if True:/g" \
./petsc-${PETSC_VERSION}/config/BuildSystem/config/package.py
export PETSC_DIR=${PWD}/petsc-${PETSC_VERSION} export PETSC_DIR=${PWD}/petsc-${PETSC_VERSION}
export PETSC_ARCH=intel-${INTEL_V} export PETSC_ARCH=intel
printenv >> $GITHUB_ENV printenv >> $GITHUB_ENV
- name: PETSc - Cache installation - name: PETSc - Cache installation
id: petsc-install id: petsc-install
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: petsc-${{ env.PETSC_VERSION }} path: petsc-${{ env.PETSC_VERSION }}
key: petsc-${{ env.PETSC_VERSION }}-intel-${{ matrix.intel_v }}-${{ hashFiles('**/petscversion.h') }} key: petsc-${{ env.PETSC_VERSION }}-intel-${{ hashFiles('**/petscversion.h') }}
- name: PETSc - Install (classic) - name: PETSc - Install
if: contains( matrix.intel_v, 'classic')
run: | run: |
cd petsc-${PETSC_VERSION} cd petsc-${PETSC_VERSION}
./configure --with-fc=mpiifort --with-cc="mpiicc -cc=icc" --with-cxx="mpiicpc -cxx=icpc" \ ./configure \
--download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib --with-fc=mpiifx \
make all --with-cc=mpiicx \
--with-cxx=mpiicpx \
- name: PETSc - Install (LLVM)
if: contains( matrix.intel_v, 'llvm')
run: |
cd petsc-${PETSC_VERSION}
./configure --with-fc=mpiifort --with-cc="mpiicc -cc=icx" --with-cxx="mpiicpc -cxx=icpx" \
--download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib
make all make all
@ -181,4 +162,5 @@ jobs:
- name: DAMASK - Run - name: DAMASK - Run
run: | run: |
./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -w examples/grid ./bin/DAMASK_grid -l tensionX.yaml -g 20grains16x16x16.vti -m material.yaml -w examples/grid
./bin/DAMASK_mesh -l tensionZ_3g.yaml -g cube_3grains.msh -m material.yaml -w examples/mesh

View File

@ -9,22 +9,22 @@ jobs:
strategy: strategy:
matrix: matrix:
python-version: ['3.8', '3.9'] #, '3.10'] python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
os: [ubuntu-latest, macos-latest, windows-latest] os: [ubuntu-latest, macos-latest, windows-latest]
fail-fast: false fail-fast: false
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }} - name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2 uses: actions/setup-python@v4
with: with:
python-version: ${{ matrix.python-version }} python-version: ${{ matrix.python-version }}
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install pytest pandas scipy h5py vtk matplotlib pyyaml pip install pytest pandas scipy h5py vtk matplotlib pyyaml build
- name: Strip git hash (Unix) - name: Strip git hash (Unix)
if: runner.os != 'Windows' if: runner.os != 'Windows'
@ -39,6 +39,13 @@ jobs:
$VERSION,$_ = $VERSION -Split '-g',2,"simplematch" $VERSION,$_ = $VERSION -Split '-g',2,"simplematch"
$VERSION | Out-File VERSION $VERSION | Out-File VERSION
- name: Build and Install
run: |
cd python
python -m build
python -m pip install dist/*.whl
python -c 'import damask;print(damask.__version__)'
- name: Install and run unit tests (Unix) - name: Install and run unit tests (Unix)
if: runner.os != 'Windows' if: runner.os != 'Windows'
run: | run: |
@ -56,7 +63,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Install pytest - name: Install pytest
run: | run: |
@ -68,7 +75,7 @@ jobs:
run: > run: >
sudo apt-get update && sudo apt-get update &&
sudo apt-get remove mysql* && sudo apt-get remove mysql* &&
sudo apt-get install python3-pandas python3-scipy python3-h5py python3-vtk7 python3-matplotlib python3-yaml -y sudo apt-get install python3-pandas python3-scipy python3-h5py python3-vtk9 python3-matplotlib python3-yaml -y
- name: Run unit tests - name: Run unit tests
run: | run: |

1
.gitignore vendored
View File

@ -2,6 +2,5 @@
*~ *~
.DS_Store .DS_Store
bin bin
PRIVATE
build build
system_report.txt system_report.txt

View File

@ -47,9 +47,9 @@ variables:
PETSC_INTELLLVM: "Libraries/PETSc/3.16.3/oneAPI-2022.0.1-IntelMPI-2021.5.0" PETSC_INTELLLVM: "Libraries/PETSc/3.16.3/oneAPI-2022.0.1-IntelMPI-2021.5.0"
PETSC_INTEL: "Libraries/PETSc/3.16.5/Intel-2022.0.1-IntelMPI-2021.5.0" PETSC_INTEL: "Libraries/PETSc/3.16.5/Intel-2022.0.1-IntelMPI-2021.5.0"
# ++++++++++++ MSC Marc +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ # ++++++++++++ MSC Marc +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
MSC: "FEM/MSC/2022.1" MSC: "FEM/MSC/2023.4"
IntelMarc: "Compiler/Intel/19.1.2 Libraries/IMKL/2020" IntelMarc: "Compiler/Intel/19.1.2 Libraries/IMKL/2020"
HDF5Marc: "HDF5/1.12.1/Intel-19.1.2" HDF5Marc: "HDF5/1.12.2/Intel-19.1.2"
################################################################################################### ###################################################################################################
@ -63,12 +63,19 @@ create_testroot:
################################################################################################### ###################################################################################################
setuptools:
stage: python
script:
- sed -i 's/-[[:digit:]]*-.*//' VERSION
- cd python
- python3 -m build --wheel --no-isolation
pytest: pytest:
stage: python stage: python
script: script:
- cd python - cd python
- pytest --basetemp ${TESTROOT}/python -v --cov --cov-report=term - pytest --basetemp ${TESTROOT}/python -v --cov
- coverage report --fail-under=90 - coverage report --fail-under=90 --show-missing
mypy: mypy:
stage: python stage: python
@ -78,6 +85,40 @@ mypy:
################################################################################################### ###################################################################################################
unittest_GNU_DEBUG:
stage: compile
script:
- module load ${COMPILER_GNU} ${MPI_GNU} ${PETSC_GNU}
- TEMPDIR=$(mktemp -d)
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=RELEASE -DBUILDCMD_POST=-coverage
- cmake --build ${TEMPDIR} --target install
- cd ${TEMPDIR}
- ./bin/DAMASK_test
- find -name \*.gcda -not -path "**/test/*" | xargs gcov
unittest_GNU_RELEASE:
stage: compile
script:
- module load ${COMPILER_GNU} ${MPI_GNU} ${PETSC_GNU}
- TEMPDIR=$(mktemp -d)
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=RELEASE -DBUILDCMD_POST=-coverage
- cmake --build ${TEMPDIR} --target install
- cd ${TEMPDIR}
- ./bin/DAMASK_test
- find -name \*.gcda -not -path "**/test/*" | xargs gcov
unittest_GNU_PERFORMANCE:
stage: compile
script:
- module load ${COMPILER_GNU} ${MPI_GNU} ${PETSC_GNU}
- TEMPDIR=$(mktemp -d)
- cmake -B ${TEMPDIR} -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${TEMPDIR} -DCMAKE_BUILD_TYPE=PERFORMANCE -DBUILDCMD_POST=-coverage
- cmake --build ${TEMPDIR} --target install
- cd ${TEMPDIR}
- ./bin/DAMASK_test
- find -name \*.gcda -not -path "**/test/*" | xargs gcov
grid_GNU: grid_GNU:
stage: compile stage: compile
script: script:
@ -174,13 +215,13 @@ open-source:
script: script:
- module load ${COMPILER_INTEL} ${MPI_INTEL} ${PETSC_INTEL} - module load ${COMPILER_INTEL} ${MPI_INTEL} ${PETSC_INTEL}
- cd PRIVATE/testing/pytest - cd PRIVATE/testing/pytest
- pytest -k 'not compile and not Marc' --basetemp ${TESTROOT}/open-source -v - pytest -k 'not compile and not Marc' -m 'not cifail' --basetemp ${TESTROOT}/open-source -v
Marc: Marc:
stage: fortran stage: fortran
script: script:
- cd PRIVATE/testing/pytest - cd PRIVATE/testing/pytest
- pytest -k 'not compile and Marc' --damask-root=${TESTROOT} --basetemp ${TESTROOT}/Marc -v - pytest -k 'not compile and Marc' -m 'not cifail' --damask-root=${TESTROOT} --basetemp ${TESTROOT}/Marc -v
# Needs closer look # Needs closer look
# Phenopowerlaw_singleSlip: # Phenopowerlaw_singleSlip:
@ -189,7 +230,7 @@ Marc:
################################################################################################### ###################################################################################################
grid_runtime: grid_performance:
stage: statistics stage: statistics
before_script: before_script:
- ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} --blocking - ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} --blocking
@ -202,28 +243,33 @@ grid_runtime:
- make -j2 all install - make -j2 all install
- export PATH=${PWD}/bin:${PATH} - export PATH=${PWD}/bin:${PATH}
- cd $(mktemp -d) - cd $(mktemp -d)
- git clone -q git@git.damask.mpie.de:damask/performance.git . - git clone -q git@git.damask.mpie.de:damask/statistics.git .
- ./measure_performance.py --input_dir ${CI_PROJECT_DIR}/examples/grid --tag ${CI_COMMIT_SHA}
- > - >
${CI_PROJECT_DIR}/PRIVATE/testing/runtime.py if [ ${CI_COMMIT_BRANCH} == development ]; then
--input_dir ${CI_PROJECT_DIR}/examples/grid git add performance.txt
--output_dir ./ git commit -m ${CI_PIPELINE_ID}_${CI_COMMIT_SHA}
--tag ${CI_COMMIT_SHA} git push
- if [ ${CI_COMMIT_BRANCH} == development ]; then git commit -am ${CI_PIPELINE_ID}_${CI_COMMIT_SHA}; git push; fi fi
commit_history:
stage: statistics
script:
- cd $(mktemp -d)
- ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 100
- ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 1000
- ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 10000
- scp -r ./commits_*.html damask3.mpie.de:~/
- ssh damask3.mpie.de "./update_statistics.sh"
only:
- development
################################################################################################### ###################################################################################################
update_plots:
stage: finalize
script:
- cd $(mktemp -d)
- git clone -q git@git.damask.mpie.de:damask/statistics.git .
- ./plot_commithistory.py --color green -n 5 -N 100
- ./plot_commithistory.py --color green -n 5 -N 1000
- ./plot_commithistory.py --color green -n 5 -N 10000
- scp -r ./commits_*.html damask.mpie.de:~/
- ssh damask.mpie.de "./update_statistics_commits.sh"
- ./plot_performance.py --template=xgridoff
- scp -r ./runtime.html ./memory.html damask.mpie.de:~/
- ssh damask.mpie.de "./update_statistics_performance.sh"
only:
- development
update_revision: update_revision:
stage: finalize stage: finalize
before_script: before_script:
@ -238,6 +284,6 @@ update_revision:
- > - >
git diff-index --quiet HEAD || git diff-index --quiet HEAD ||
git commit VERSION -m "[skip ci] updated version information after successful test of $VERSION" git commit VERSION -m "[skip ci] updated version information after successful test of $VERSION"
- if [ ${CI_COMMIT_SHA} == $(git rev-parse HEAD^) ]; then git push origin HEAD:master HEAD:development; fi - if [ ${CI_COMMIT_SHA} == $(git rev-parse HEAD^) ]; then git push --atomic --no-verify origin HEAD:development HEAD:master; fi
only: only:
- development - development

View File

@ -11,21 +11,22 @@ endif()
project(Prerequisites LANGUAGES) project(Prerequisites LANGUAGES)
set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}") set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}")
pkg_check_modules(PETSC_MIN REQUIRED PETSc>=3.12.0 QUIET) #CMake does not support version range pkg_check_modules(PETSC_MIN REQUIRED PETSc>=3.12.0 QUIET) #CMake does not support version range
pkg_check_modules(PETSC REQUIRED PETSc<3.19.0) pkg_check_modules(PETSC REQUIRED PETSc<3.21.0)
pkg_get_variable(CMAKE_Fortran_COMPILER PETSc fcompiler) pkg_get_variable(CMAKE_Fortran_COMPILER PETSc fcompiler)
pkg_get_variable(CMAKE_C_COMPILER PETSc ccompiler) pkg_get_variable(CMAKE_C_COMPILER PETSc ccompiler)
# Solver determines name of project # Solver determines name of project
string(TOUPPER "${DAMASK_SOLVER}" DAMASK_SOLVER) string(TOUPPER "${DAMASK_SOLVER}" DAMASK_SOLVER_UPPER)
if(DAMASK_SOLVER STREQUAL "GRID") string(TOLOWER "${DAMASK_SOLVER}" DAMASK_SOLVER_LOWER)
project(damask-grid HOMEPAGE_URL https://damask.mpie.de LANGUAGES Fortran C) if("${DAMASK_SOLVER_UPPER}" MATCHES "^(GRID|MESH|TEST)$")
elseif(DAMASK_SOLVER STREQUAL "MESH") project("damask-${DAMASK_SOLVER_LOWER}" HOMEPAGE_URL https://damask.mpie.de LANGUAGES Fortran C)
project(damask-mesh HOMEPAGE_URL https://damask.mpie.de LANGUAGES Fortran C)
else() else()
message(FATAL_ERROR "Invalid solver: DAMASK_SOLVER=${DAMASK_SOLVER}") message(FATAL_ERROR "Invalid solver: DAMASK_SOLVER=${DAMASK_SOLVER}")
endif() endif()
add_definitions("-D${DAMASK_SOLVER}") add_definitions("-D${DAMASK_SOLVER_UPPER}")
set(CMAKE_Fortran_PREPROCESS "ON") # works only for CMake >= 3.18
# EXPERIMENTAL: This might help to detect HDF5 and FFTW3 in the future if PETSc is not aware of them # EXPERIMENTAL: This might help to detect HDF5 and FFTW3 in the future if PETSc is not aware of them
set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/externalpackages:$ENV{PKG_CONFIG_PATH}") set(ENV{PKG_CONFIG_PATH} "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/externalpackages:$ENV{PKG_CONFIG_PATH}")
@ -89,16 +90,23 @@ if(CMAKE_BUILD_TYPE STREQUAL "SYNTAXONLY")
endif() endif()
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
if (CMAKE_Fortran_COMPILER_ID STREQUAL "Intel") set(Fortran_COMPILER_VERSION_MIN 9.1)
include(Compiler-Intel) elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") set(Fortran_COMPILER_VERSION_MIN 19)
include(Compiler-GNU)
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM") elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "IntelLLVM")
include(Compiler-IntelLLVM) set(Fortran_COMPILER_VERSION_MIN 19)
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "LLVMFlang")
set(Fortran_COMPILER_VERSION_MIN 19)
else() else()
message(FATAL_ERROR "Compiler type(CMAKE_Fortran_COMPILER_ID) not recognized") message(FATAL_ERROR "Compiler '${CMAKE_Fortran_COMPILER_ID}' not supported")
endif() endif()
if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS Fortran_COMPILER_VERSION_MIN)
message(FATAL_ERROR "Version '${CMAKE_Fortran_COMPILER_VERSION}' of '${CMAKE_Fortran_COMPILER_ID}' is not supported")
endif()
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
include("Compiler-${CMAKE_Fortran_COMPILER_ID}")
file(STRINGS "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/petsc/conf/petscvariables" PETSC_EXTERNAL_LIB REGEX "PETSC_EXTERNAL_LIB_BASIC = .*$?") file(STRINGS "$ENV{PETSC_DIR}/$ENV{PETSC_ARCH}/lib/petsc/conf/petscvariables" PETSC_EXTERNAL_LIB REGEX "PETSC_EXTERNAL_LIB_BASIC = .*$?")
string(REPLACE "PETSC_EXTERNAL_LIB_BASIC = " "" PETSC_EXTERNAL_LIB "${PETSC_EXTERNAL_LIB}") string(REPLACE "PETSC_EXTERNAL_LIB_BASIC = " "" PETSC_EXTERNAL_LIB "${PETSC_EXTERNAL_LIB}")
@ -121,7 +129,10 @@ set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_Fortran_FLAGS_${CMAKE_BUILD
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -L${PETSC_LIBRARY_DIRS} -lpetsc ${PETSC_EXTERNAL_LIB} -lz") set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -L${PETSC_LIBRARY_DIRS} -lpetsc ${PETSC_EXTERNAL_LIB} -lz")
if(fYAML_FOUND STREQUAL "1") if(fYAML_FOUND STREQUAL "1")
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -L${fYAML_LIBRARY_DIRS} -l${fYAML_LIBRARIES}") set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -L${fYAML_LIBRARY_DIRS}")
foreach(fYAML_LIBRARY ${fYAML_LIBRARIES})
set(CMAKE_Fortran_LINK_EXECUTABLE "${CMAKE_Fortran_LINK_EXECUTABLE} -L${fYAML_LIBRARY_DIRS} -l${fYAML_LIBRARY}")
endforeach()
add_definitions(-DFYAML) add_definitions(-DFYAML)
pkg_get_variable(fYAML_INCLUDE_DIR libfyaml includedir) # fYAML_INCLUDE_DIRS and fYAML_CFLAGS are not working pkg_get_variable(fYAML_INCLUDE_DIR libfyaml includedir) # fYAML_INCLUDE_DIRS and fYAML_CFLAGS are not working
set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} -I${fYAML_INCLUDE_DIR}") set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE} "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}} -I${fYAML_INCLUDE_DIR}")

View File

@ -1,128 +0,0 @@
#!/usr/bin/env bash
#==================================================================================================
# Execute this script (type './DAMASK_prerequisites.sh')
# and send system_report.txt to damask@mpie.de for support
#==================================================================================================
OUTFILE="system_report.txt"
echo ===========================================
echo + Generating $OUTFILE
echo + Send to damask@mpie.de for support
echo + view with \'cat $OUTFILE\'
echo ===========================================
function firstLevel {
echo -e '\n\n=============================================================================================='
echo $1
echo ==============================================================================================
}
function secondLevel {
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
echo $1
echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
}
function thirdLevel {
echo -e '\n----------------------------------------------------------------------------------------------'
echo $1
echo ----------------------------------------------------------------------------------------------
}
function getDetails {
if which $1 &> /dev/null; then
secondLevel $1:
echo + location:
which $1
echo + $1 $2:
$1 $2
else
echo $1 not found
fi
echo
}
# redirect STDOUT and STDERR to logfile
# https://stackoverflow.com/questions/11229385/redirect-all-output-in-a-bash-script-when-using-set-x^
exec > $OUTFILE 2>&1
# directory, file is not a symlink by definition
# https://stackoverflow.com/questions/59895/getting-the-source-directory-of-a-bash-script-from-within
DAMASK_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
echo System report for \'$(hostname)\' created on $(date '+%Y-%m-%d %H:%M:%S') by \'$(whoami)\'
echo XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
firstLevel "DAMASK"
secondLevel "DAMASK_ROOT"
echo $DAMASK_ROOT
echo
secondLevel "Version"
cat VERSION
firstLevel "System"
uname -a
echo
echo PATH: $PATH
echo LD_LIBRARY_PATH: $LD_LIBRARY_PATH
echo PYTHONPATH: $PYTHONPATH
echo SHELL: $SHELL
echo PETSC_ARCH: $PETSC_ARCH
echo PETSC_DIR: $PETSC_DIR
echo
echo $PETSC_DIR/$PETSC_ARCH/lib:
ls $PETSC_DIR/$PETSC_ARCH/lib
echo
echo $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/petscvariables:
cat $PETSC_DIR/$PETSC_ARCH/lib/petsc/conf/petscvariables
firstLevel "Python"
DEFAULT_PYTHON=python3
for EXECUTABLE in python python3; do
getDetails $EXECUTABLE '--version'
done
secondLevel "Details on $DEFAULT_PYTHON:"
echo $(ls -la $(which $DEFAULT_PYTHON))
for MODULE in numpy scipy pandas matplotlib yaml h5py;do
thirdLevel $module
$DEFAULT_PYTHON -c "import $MODULE; \
print('Version: {}'.format($MODULE.__version__)); \
print('Location: {}'.format($MODULE.__file__))"
done
thirdLevel vtk
$DEFAULT_PYTHON -c "import vtk; \
print('Version: {}'.format(vtk.vtkVersion.GetVTKVersion())); \
print('Location: {}'.format(vtk.__file__))"
firstLevel "GNU Compiler Collection"
for EXECUTABLE in gcc g++ gfortran ;do
getDetails $EXECUTABLE '--version'
done
firstLevel "Intel Compiler Suite (classic)"
for EXECUTABLE in icc icpc ifort ;do
getDetails $EXECUTABLE '--version'
done
firstLevel "Intel Compiler Suite (LLVM)"
for EXECUTABLE in icx icpx ifx ;do
getDetails $EXECUTABLE '--version'
done
firstLevel "MPI Wrappers"
for EXECUTABLE in mpicc mpiCC mpiicc mpic++ mpiicpc mpicxx mpifort mpiifort mpif90 mpif77; do
getDetails $EXECUTABLE '-show'
done
firstLevel "MPI Launchers"
for EXECUTABLE in mpirun mpiexec; do
getDetails $EXECUTABLE '--version'
done
firstLevel "CMake"
getDetails cmake --version

View File

@ -1,4 +1,4 @@
Copyright 2011-2022 Max-Planck-Institut für Eisenforschung GmbH Copyright 2011-2024 Max-Planck-Institut für Eisenforschung GmbH
DAMASK is free software: you can redistribute it and/or modify DAMASK is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as it under the terms of the GNU Affero General Public License as

View File

@ -17,6 +17,11 @@ mesh:
@cmake -B build/mesh -DDAMASK_SOLVER=mesh -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP} @cmake -B build/mesh -DDAMASK_SOLVER=mesh -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP}
@cmake --build build/mesh --parallel --target install @cmake --build build/mesh --parallel --target install
.PHONY: test
test:
@cmake -B build/test -DDAMASK_SOLVER=test -DCMAKE_INSTALL_PREFIX=${PWD} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILDCMD_POST=${BUILDCMD_POST} -DBUILDCMD_PRE=${BUILDCMD_PRE} -DOPTIMIZATION=${OPTIMIZATION} -DOPENMP=${OPENMP}
@cmake --build build/test --parallel --target install
.PHONY: clean .PHONY: clean
clean: clean:
@rm -rf build @rm -rf build

@ -1 +1 @@
Subproject commit 8c0a24006f355ce8d7602daa77a33348183a2bc7 Subproject commit 63bc14bfd7dee73978615cfd939bad69c50cca3a

View File

@ -1,15 +1,44 @@
# DAMASK - The Düsseldorf Advanced Material Simulation Kit # DAMASK - The Düsseldorf Advanced Material Simulation Kit
Visit [damask.mpie.de](https://damask.mpie.de) for installation and usage instructions - Usage, installation, and support: https://damask.mpie.de
- Code development: https://git.damask.mpie.de
- General inquiries: damask@mpie.de
## DAMASK_EICMD
This is a DAMASK fork with implementation of the "Discrete Deformation Twinning Model" based on work done by Dr. Satyapriya Gupta and Dr. Philip Eisenlohr at MSU.
### The Discrete Deformation Twinning Model
The aim of this model is to accurately match experimental observations of deformation twinning while remaining computationally efficient compared to physics-based phase field models.
* We introduce stochasticity for the nucleation and growth events of twinning through random sampling, similar to Monte Carlo Methods.
* The ease or difficulty of a twinning event is controlled by adjusting the frequency of sampling.
* At each voxel, the state of twinning is treated as a discrete quantity, unlike the approach based on diffused volume fraction method.
* The kinetics of twinning occur in the form of a “jump,” rather than following a rate equation as in the “pseudo-slip” approach.
* The jumped state is evaluated using the correspondence matrix from Niewczas, Acta Materialia, 2010.
## Repository Locations
### [git.damask.mpie.de](https://git.damask.mpie.de)
All code development is centralized in the principal DAMASK code repository hosted at [git.damask.mpie.de](https://git.damask.mpie.de).
Access to this GitLab instance requires registration and is granted to anyone with an interest in actively supporting the development of DAMASK.
### [github.com](https://github.com)
GitHub hosts the publicly accessible, but read-only, mirror of the principal DAMASK code repository and replicates its three top-level branches from [git.damask.mpie.de](https://git.damask.mpie.de).
The site is primarily meant to provide a forum for [Discussions](https://github.com/eisenforschung/DAMASK/discussions) and [Issues](https://github.com/eisenforschung/DAMASK/issues).
## Contact Information ## Contact Information
(
EICMD Team, IIT Dharwad
https://sites.google.com/view/eicmd/home
)
Max-Planck-Institut für Eisenforschung GmbH Max-Planck-Institut für Eisenforschung GmbH
Max-Planck-Str. 1 Max-Planck-Str. 1
40237 Düsseldorf 40237 Düsseldorf
Germany Germany
damask@mpie.de
https://damask.mpie.de
https://git.damask.mpie.de

View File

@ -1 +1 @@
v3.0.0-alpha7 3.0.0-beta.45

View File

@ -1,10 +1,6 @@
################################################################################################### ###################################################################################################
# GNU Compiler # GNU Compiler
################################################################################################### ###################################################################################################
if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0)
message (FATAL_ERROR "GCC Compiler version: ${CMAKE_Fortran_COMPILER_VERSION} not supported")
endif ()
if (OPENMP) if (OPENMP)
set (OPENMP_FLAGS "-fopenmp") set (OPENMP_FLAGS "-fopenmp")
endif () endif ()
@ -23,14 +19,13 @@ set (STANDARD_CHECK "-std=f2018 -pedantic-errors" )
#------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------
# Fine tuning compilation options # Fine tuning compilation options
set (COMPILE_FLAGS "${COMPILE_FLAGS} -cpp") set (COMPILE_FLAGS "${COMPILE_FLAGS} -cpp") # preprocessor, needed for CMake < 3.18
# preprocessor
set (COMPILE_FLAGS "${COMPILE_FLAGS} -fPIE") set (COMPILE_FLAGS "${COMPILE_FLAGS} -fPIE")
# position independent code # position independent code
set (COMPILE_FLAGS "${COMPILE_FLAGS} -ffree-line-length-132") set (COMPILE_FLAGS "${COMPILE_FLAGS} -ffree-line-length-none")
# restrict line length to the standard 132 characters (lattice.f90 require more characters) # PETSc macros are long, line length is enforced in pre-receive hook
set (COMPILE_FLAGS "${COMPILE_FLAGS} -fimplicit-none") set (COMPILE_FLAGS "${COMPILE_FLAGS} -fimplicit-none")
# assume "implicit none" even if not present in source # assume "implicit none" even if not present in source
@ -131,6 +126,9 @@ set (DEBUG_FLAGS "${DEBUG_FLAGS} -fcheck=all")
set (DEBUG_FLAGS "${DEBUG_FLAGS} -fstack-protector-all") set (DEBUG_FLAGS "${DEBUG_FLAGS} -fstack-protector-all")
# Inserts a guard variable onto the stack frame for all functions # Inserts a guard variable onto the stack frame for all functions
set (DEBUG_FLAGS "${DEBUG_FLAGS} -finit-real=snan -finit-integer=-2147483648")
# "strange" values to simplify debugging
set (DEBUG_FLAGS "${DEBUG_FLAGS} -fsanitize=undefined") set (DEBUG_FLAGS "${DEBUG_FLAGS} -fsanitize=undefined")
# detect undefined behavior # detect undefined behavior
# Additional options # Additional options

View File

@ -1,10 +1,6 @@
################################################################################################### ###################################################################################################
# Intel Compiler # Intel Compiler
################################################################################################### ###################################################################################################
if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 18.0)
message (FATAL_ERROR "Intel Compiler version: ${CMAKE_Fortran_COMPILER_VERSION} not supported")
endif ()
if (OPENMP) if (OPENMP)
set (OPENMP_FLAGS "-qopenmp -parallel") set (OPENMP_FLAGS "-qopenmp -parallel")
endif () endif ()
@ -26,8 +22,7 @@ set (LINKER_FLAGS "${LINKER_FLAGS} -shared-intel")
#------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------
# Fine tuning compilation options # Fine tuning compilation options
set (COMPILE_FLAGS "${COMPILE_FLAGS} -fpp") set (COMPILE_FLAGS "${COMPILE_FLAGS} -fpp") # preprocessor, needed for CMake < 3.18
# preprocessor
set (COMPILE_FLAGS "${COMPILE_FLAGS} -no-ftz") set (COMPILE_FLAGS "${COMPILE_FLAGS} -no-ftz")
# disable flush underflow to zero, will be set if -O[1,2,3] # disable flush underflow to zero, will be set if -O[1,2,3]
@ -35,7 +30,7 @@ set (COMPILE_FLAGS "${COMPILE_FLAGS} -no-ftz")
set (COMPILE_FLAGS "${COMPILE_FLAGS} -diag-disable") set (COMPILE_FLAGS "${COMPILE_FLAGS} -diag-disable")
# disables warnings ... # disables warnings ...
set (COMPILE_FLAGS "${COMPILE_FLAGS} 5268") set (COMPILE_FLAGS "${COMPILE_FLAGS} 5268")
# ... the text exceeds right hand column allowed on the line (we have only comments there) # ... the text exceeds right hand column allowed on the line (enforced by pre-receive hook)
set (COMPILE_FLAGS "${COMPILE_FLAGS},7624") set (COMPILE_FLAGS "${COMPILE_FLAGS},7624")
# ... about deprecated forall (has nice syntax and most likely a performance advantage) # ... about deprecated forall (has nice syntax and most likely a performance advantage)
@ -93,8 +88,6 @@ set (DEBUG_FLAGS "${DEBUG_FLAGS},pointers")
# ... for certain disassociated or uninitialized pointers or unallocated allocatable objects. # ... for certain disassociated or uninitialized pointers or unallocated allocatable objects.
set (DEBUG_FLAGS "${DEBUG_FLAGS},uninit") set (DEBUG_FLAGS "${DEBUG_FLAGS},uninit")
# ... for uninitialized variables. # ... for uninitialized variables.
set (DEBUG_FLAGS "${DEBUG_FLAGS} -ftrapuv")
# ... initializes stack local variables to an unusual value to aid error detection
set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0 -ftz") set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0 -ftz")
# ... capture all floating-point exceptions, need to overwrite -no-ftz # ... capture all floating-point exceptions, need to overwrite -no-ftz

View File

@ -1,12 +1,8 @@
################################################################################################### ###################################################################################################
# Intel Compiler # IntelLLVM Compiler
################################################################################################### ###################################################################################################
if (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 18.0)
message (FATAL_ERROR "Intel Compiler version: ${CMAKE_Fortran_COMPILER_VERSION} not supported")
endif ()
if (OPENMP) if (OPENMP)
set (OPENMP_FLAGS "-qopenmp") set (OPENMP_FLAGS "-fiopenmp")
endif () endif ()
if (OPTIMIZATION STREQUAL "OFF" OR OPTIMIZATION STREQUAL "DEBUG") if (OPTIMIZATION STREQUAL "OFF" OR OPTIMIZATION STREQUAL "DEBUG")
@ -14,8 +10,8 @@ if (OPTIMIZATION STREQUAL "OFF" OR OPTIMIZATION STREQUAL "DEBUG")
elseif (OPTIMIZATION STREQUAL "DEFENSIVE") elseif (OPTIMIZATION STREQUAL "DEFENSIVE")
set (OPTIMIZATION_FLAGS "-O2") set (OPTIMIZATION_FLAGS "-O2")
elseif (OPTIMIZATION STREQUAL "AGGRESSIVE") elseif (OPTIMIZATION STREQUAL "AGGRESSIVE")
set (OPTIMIZATION_FLAGS "-ipo -O3 -fp-model fast=2 -xHost") #set (OPTIMIZATION_FLAGS "-ipo -O3 -fp-model fast=2 -xHost") # ifx 2022.0 has problems with YAML types and IPO
# -fast = -ipo, -O3, -no-prec-div, -static, -fp-model fast=2, and -xHost" set (OPTIMIZATION_FLAGS "-O3 -fp-model fast=2 -xHost")
endif () endif ()
# -assume std_mod_proc_name (included in -standard-semantics) causes problems if other modules # -assume std_mod_proc_name (included in -standard-semantics) causes problems if other modules
@ -23,11 +19,12 @@ endif ()
set (STANDARD_CHECK "-stand f18 -assume nostd_mod_proc_name") set (STANDARD_CHECK "-stand f18 -assume nostd_mod_proc_name")
set (LINKER_FLAGS "${LINKER_FLAGS} -shared-intel") set (LINKER_FLAGS "${LINKER_FLAGS} -shared-intel")
# Link against shared Intel libraries instead of static ones # Link against shared Intel libraries instead of static ones
set (LINKER_FLAGS "${LINKER_FLAGS} -shared-intel -fc=ifx")
# enforce use of ifx for MPI wrapper
#------------------------------------------------------------------------------------------------ #------------------------------------------------------------------------------------------------
# Fine tuning compilation options # Fine tuning compilation options
set (COMPILE_FLAGS "${COMPILE_FLAGS} -fpp") set (COMPILE_FLAGS "${COMPILE_FLAGS} -fpp") # preprocessor, needed for CMake < 3.18
# preprocessor
set (COMPILE_FLAGS "${COMPILE_FLAGS} -no-ftz") set (COMPILE_FLAGS "${COMPILE_FLAGS} -no-ftz")
# disable flush underflow to zero, will be set if -O[1,2,3] # disable flush underflow to zero, will be set if -O[1,2,3]
@ -35,7 +32,7 @@ set (COMPILE_FLAGS "${COMPILE_FLAGS} -no-ftz")
set (COMPILE_FLAGS "${COMPILE_FLAGS} -diag-disable") set (COMPILE_FLAGS "${COMPILE_FLAGS} -diag-disable")
# disables warnings ... # disables warnings ...
set (COMPILE_FLAGS "${COMPILE_FLAGS} 5268") set (COMPILE_FLAGS "${COMPILE_FLAGS} 5268")
# ... the text exceeds right hand column allowed on the line (we have only comments there) # ... the text exceeds right hand column allowed on the line (enforced by pre-receive hook)
set (COMPILE_FLAGS "${COMPILE_FLAGS},7624") set (COMPILE_FLAGS "${COMPILE_FLAGS},7624")
# ... about deprecated forall (has nice syntax and most likely a performance advantage) # ... about deprecated forall (has nice syntax and most likely a performance advantage)
@ -93,11 +90,12 @@ set (DEBUG_FLAGS "${DEBUG_FLAGS},pointers")
# ... for certain disassociated or uninitialized pointers or unallocated allocatable objects. # ... for certain disassociated or uninitialized pointers or unallocated allocatable objects.
set (DEBUG_FLAGS "${DEBUG_FLAGS},uninit") set (DEBUG_FLAGS "${DEBUG_FLAGS},uninit")
# ... for uninitialized variables. # ... for uninitialized variables.
set (DEBUG_FLAGS "${DEBUG_FLAGS} -ftrapuv")
# ... initializes stack local variables to an unusual value to aid error detection
set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0 -ftz") set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0 -ftz")
# ... capture all floating-point exceptions, need to overwrite -no-ftz # ... capture all floating-point exceptions, need to overwrite -no-ftz
set (DEBUG_FLAGS "${DEBUG_FLAGS} -init=arrays,zero,minus_huge,snan")
# ... initialize logical to false, integer to -huge, float+complex to signaling NaN
# disable due to compiler bug https://community.intel.com/t5/Intel-Fortran-Compiler/false-positive-stand-f18-and-IEEE-SELECTED-REAL-KIND/m-p/1227336 # disable due to compiler bug https://community.intel.com/t5/Intel-Fortran-Compiler/false-positive-stand-f18-and-IEEE-SELECTED-REAL-KIND/m-p/1227336
#set (DEBUG_FLAGS "${DEBUG_FLAGS} -warn") #set (DEBUG_FLAGS "${DEBUG_FLAGS} -warn")
# enables warnings ... # enables warnings ...

View File

@ -0,0 +1,12 @@
###################################################################################################
# LLVM Compiler
###################################################################################################
if (OPENMP)
set (OPENMP_FLAGS "-fopenmp")
endif ()
set (STANDARD_CHECK "-std=f2018 -pedantic" )
#------------------------------------------------------------------------------------------------
# Fine tuning compilation options
set (COMPILE_FLAGS "${COMPILE_FLAGS} -cpp") # preprocessor, needed for CMake < 3.18

1
examples/.gitignore vendored
View File

@ -1,4 +1,3 @@
*.C_ref
*.hdf5 *.hdf5
*.xdmf *.xdmf
*.sta *.sta

View File

@ -13,12 +13,12 @@ phase:
plastic: plastic:
type: phenopowerlaw type: phenopowerlaw
N_sl: [12] N_sl: [12]
a_sl: 2.25 a_sl: [2.25]
atol_xi: 1.0 atol_xi: 1.0
dot_gamma_0_sl: 0.001 dot_gamma_0_sl: [0.001]
h_0_sl-sl: 75.e+6 h_0_sl-sl: [75.e+6]
h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4]
n_sl: 20 n_sl: [20]
output: [xi_sl] output: [xi_sl]
xi_0_sl: [31.e+6] xi_0_sl: [31.e+6]
xi_inf_sl: [63.e+6] xi_inf_sl: [63.e+6]

View File

@ -1,62 +0,0 @@
type: dislotwin
output: [rho_mob, rho_dip, gamma_sl, Lambda_sl, tau_pass, f_tw, Lambda_tw, f_tr]
# Slip
N_sl: [12]
b_sl: [2.56e-10]
Q_sl: [3.5e-19]
p_sl: [0.325]
q_sl: [1.55]
B: [0.001]
i_sl: [30.0]
rho_mob_0: [1.0e+12]
rho_dip_0: [1.0]
v_0: [1.0e+4]
tau_0: [3.5e+8]
D_a: 1.0 # minimum dipole distance / b
Q_cl: 4.5e-19 # Activation energy for climb / J
h_sl-sl: [0.122, 0.122, 0.625, 0.07, 0.137, 0.137, 0.122] # Interaction coefficients (Kubin et al. 2008)
h_tw-sl: [0.0] # ToDo: values not known
# Twin
N_tw: [12]
b_tw: [1.40e-10]
L_tw: 1.8e-7
i_tw: 10.0
t_tw: [5.0e-8]
p_tw: [3.0] # A
h_tw-tw: [0.0, 1.0] # ToDo: values not known
h_sl-tw: [0.0, 1.0, 1.0] # ToDo: values not known
# Transformation
N_tr: [12]
b_tr: [1.40e-10]
L_tr: 1.8e-7
i_tr: 3.0
t_tr: [1.0e-7]
p_tr: [3.0] # B
V_mol: 7.09e-6
Delta_G: 1.33343932e+02
Delta_G,T: 2.56640412
Delta_G,T^2: 1.49524179e-03
h_tr-tr: [1.0, 1.0] # guessing
h_sl-tr: [0.0, 1.0, 1.0] # guessing
# Twin & Transformation
T_ref: 298.15
Gamma_sf: 2.89394017e-02
Gamma_sf,T: 1.22823814e-04
Gamma_sf,T^2: 1.47322968e-07
x_c: 1.0e-9
V_cs: 1.67e-29
a_cF: 3.62e-10
c/a_hP: 1.633
# Slip & Twin & Transformation
D: 2.0e-5

View File

@ -1,12 +0,0 @@
phase: [basic, extensive, selective]
materialpoint: [basic, extensive, selective]
# options for selective debugging
element: 1
integrationpoint: 1
constituent: 1
# solver-specific
mesh: [PETSc]
grid: [basic, rotation, PETSc]
Marc: [basic]

View File

@ -1,83 +1,100 @@
# Available numerical parameters # Default values of all available numerical parameters
# Case sensitive keys # Please note that keys are case sensitive
homogenization:
mech:
RGC:
atol: 1.0e+4 # absolute tolerance of RGC residuum (in Pa)
rtol: 1.0e-3 # relative ...
amax: 1.0e+10 # absolute upper-limit of RGC residuum (in Pa)
rmax: 1.0e+2 # relative ...
perturbpenalty: 1.0e-7 # perturbation for computing penalty tangent
relevantmismatch: 1.0e-5 # minimum threshold of mismatch
viscositypower: 1.0e+0 # power (sensitivity rate) of numerical viscosity in RGC scheme
viscositymodulus: 0.0e+0 # stress modulus of RGC numerical viscosity (zero = without numerical viscosity)
# suggestion: larger than the aTol_RGC but still far below the expected flow stress of material
refrelaxationrate: 1.0e-3 # reference rate of relaxation (about the same magnitude as straining rate, possibly a bit higher)
maxrelaxationrate: 1.0e+0 # threshold of maximum relaxation vector increment (if exceed this then cutback)
maxvoldiscrepancy: 1.0e-5 # maximum allowable relative volume discrepancy
voldiscrepancymod: 1.0e+12
discrepancypower: 5.0
generic:
subStepMin: 1.0e-3 # minimum (relative) size of sub-step allowed during cutback in homogenization
subStepSize: 0.25 # size of substep when cutback introduced in homogenization (value between 0 and 1)
stepIncrease: 1.5 # increase of next substep size when previous substep converged in homogenization (value higher than 1)
nMPstate: 10 # materialpoint state loop limit
solver:
grid: grid:
eps_div_atol: 1.0e-3 # absolute tolerance for fulfillment of stress equilibrium N_staggered_iter_max: 10 # max number of field-level staggered iterations
eps_div_rtol: 5.0e-4 # relative tolerance for fulfillment of stress equilibrium N_cutback_max: 3 # maximum cutback level (0: 1, 1: 0.5, 2: 0.25, etc)
eps_curl_atol: 1.0e-12 # absolute tolerance for fulfillment of strain compatibility
eps_curl_rtol: 5.0e-4 # relative tolerance for fulfillment of strain compatibility damage:
eps_stress_atol: 1.0e+3 # absolute tolerance for fulfillment of stress BC N_iter_max: 100 # maximum iteration number
eps_stress_rtol: 0.01 # relative tolerance for fulfillment of stress BC eps_abs_phi: 1.0e-2 # absolute tolerance for damage evolution
eps_damage_atol: 1.0e-2 # absolute tolerance for damage evolution eps_rel_phi: 1.0e-6 # relative tolerance for damage evolution
eps_damage_rtol: 1.0e-6 # relative tolerance for damage evolution phi_min: 1.0e-6 # residual integrity
eps_thermal_atol: 1.0e-2 # absolute tolerance for thermal equilibrium
eps_thermal_rtol: 1.0e-6 # relative tolerance for thermal equilibrium thermal:
itmax: 250 # Maximum iteration number N_iter_max: 100 # maximum iteration number
itmin: 2 # Minimum iteration number eps_abs_T: 1.0e-2 # absolute tolerance for thermal equilibrium
fftw_timelimit: -1.0 # timelimit of plan creation for FFTW, see manual on www.fftw.org, Default -1.0: disable timelimit eps_rel_T: 1.0e-6 # relative tolerance for thermal equilibrium
fftw_plan_mode: FFTW_PATIENT # reads the planing-rigor flag, see manual on www.fftw.org, Default FFTW_PATIENT: use patient planner flag
maxCutBack: 3 # maximum cut back level (0: 1, 1: 0.5, 2: 0.25, etc) mechanical:
maxStaggeredIter: 10 # max number of field level staggered iterations N_iter_min: 1 # minimum iteration number
memory_efficient: 1 # Precalculate Gamma-operator (81 double per point) N_iter_max: 100 # maximum iteration number
update_gamma: false # Update Gamma-operator with current dPdF (not possible if memory_efficient=1) eps_abs_div(P): 1.0e-4 # absolute tolerance for fulfillment of stress equilibrium
divergence_correction: 2 # Use size-independent divergence criterion eps_rel_div(P): 5.0e-4 # relative tolerance for fulfillment of stress equilibrium
derivative: continuous # Approximation used for derivatives in Fourier space eps_abs_P: 1.0e3 # absolute tolerance for fulfillment of stress BC
petsc_options: -snes_type ngmres -snes_ngmres_anderson # PetSc solver options eps_rel_P: 1.0e-3 # relative tolerance for fulfillment of stress BC
alpha: 1.0 # polarization scheme parameter 0.0 < alpha < 2.0. alpha = 1.0 ==> AL scheme, alpha = 2.0 ==> accelerated scheme update_gamma: false # update Gamma-operator with current dPdF (not possible if FFT: memory_efficient == true)
beta: 1.0 # polarization scheme parameter 0.0 < beta < 2.0. beta = 1.0 ==> AL scheme, beta = 2.0 ==> accelerated scheme PETSc_options: -snes_type ngmres -snes_ngmres_anderson # PETSc solver options
FFT:
memory_efficient: true # precalculate Gamma-operator (81 doubles per point)
divergence_correction: size+grid # use size-independent divergence criterion {none, size, size+grid}
derivative: continuous # approximation used for derivatives in Fourier space {continuous, central_difference, FWBW_difference}
FFTW_plan_mode: FFTW_MEASURE # planning-rigor flags, see manual at https://www.fftw.org/fftw3_doc/Planner-Flags.html
FFTW_timelimit: -1.0 # time limit of plan creation for FFTW, see manual on www.fftw.org. (-1.0: disable time limit)
alpha: 1.0 # polarization scheme parameter 0.0 < alpha < 2.0 (1.0: AL scheme, 2.0: accelerated scheme)
beta: 1.0 # polarization scheme parameter 0.0 < beta < 2.0 (1.0: AL scheme, 2.0: accelerated scheme)
eps_abs_curl(F): 1.0e-10 # absolute tolerance for fulfillment of strain compatibility
eps_rel_curl(F): 5.0e-4 # relative tolerance for fulfillment of strain compatibility
mesh: mesh:
maxCutBack: 3 # maximum cut back level (0: 1, 1: 0.5, 2: 0.25, etc) N_cutback_max: 3 # maximum cut back level (0: 1, 1: 0.5, 2: 0.25, etc)
maxStaggeredIter: 10 # max number of field level staggered iterations N_staggered_iter_max: 10 # max number of field level staggered iterations
structorder: 2 # order of displacement shape functions (when mesh is defined) p_s: 2 # order of displacement shape functions
bbarstabilisation: false p_i: 2 # order of quadrature rule required
integrationorder: 2 # order of quadrature rule required (when mesh is defined) bbarstabilization: false
itmax: 250 # Maximum iteration number
itmin: 2 # Minimum iteration number
eps_struct_atol: 1.0e-10 # absolute tolerance for mechanical equilibrium
eps_struct_rtol: 1.0e-4 # relative tolerance for mechanical equilibrium
crystallite: mechanical:
subStepMin: 1.0e-3 # minimum (relative) size of sub-step allowed during cutback in crystallite N_iter_max: 250 # Maximum iteration number
subStepSize: 0.25 # size of substep when cutback introduced in crystallite (value between 0 and 1) eps_abs_div(P): 1.0e-10 # absolute tolerance for mechanical equilibrium
stepIncrease: 1.5 # increase of next substep size when previous substep converged in crystallite (value higher than 1) eps_rel_div(P): 1.0e-4 # relative tolerance for mechanical equilibrium
subStepSizeLp: 0.5 # size of first substep when cutback in Lp calculation
subStepSizeLi: 0.5 # size of first substep when cutback in Li calculation
nState: 10 # state loop limit
nStress: 40 # stress loop limit
rtol_State: 1.0e-6 # relative tolerance in crystallite state loop (abs tol provided by constitutive law)
rtol_Stress: 1.0e-6 # relative tolerance in crystallite stress loop (Lp residuum)
atol_Stress: 1.0e-8 # absolute tolerance in crystallite stress loop (Lp residuum!)
integrator: FPI # integration method (FPI = Fixed Point Iteration, Euler = Euler, AdaptiveEuler = Adaptive Euler, RK4 = classical 4th order Runge-Kutta, RKCK45 = 5th order Runge-Kutta Cash-Karp)
iJacoLpresiduum: 1 # frequency of Jacobian update of residuum in Lp
commercialFEM: Marc:
unitlength: 1 # physical length of one computational length unit unit_length: 1.0 # physical length of one computational length unit
homogenization:
mechanical:
RGC:
eps_abs_P: 1.0e+4 # absolute tolerance of RGC residuum (in Pa)
eps_rel_P: 1.0e-3 # relative ...
eps_abs_max: 1.0e+10 # absolute upper-limit of RGC residuum (in Pa)
eps_rel_max: 1.0e+2 # relative ...
Delta_a: 1.0e-7 # perturbation for computing penalty tangent
relevant_mismatch: 1.0e-5 # minimum threshold of mismatch
viscosity_exponent: 1.0e+0 # power (sensitivity rate) of numerical viscosity in RGC scheme
viscosity_modulus: 0.0e+0 # stress modulus of RGC numerical viscosity (0: without numerical viscosity)
# suggestion: larger than the aTol_RGC but still far below the expected flow stress of material
dot_a_ref: 1.0e-3 # reference rate of relaxation (about the same magnitude as straining rate, possibly a bit higher)
dot_a_max: 1.0e+0 # threshold of maximum relaxation vector increment (if exceed this then cutback)
Delta_V_max: 1.0e-5 # maximum allowable relative volume discrepancy
Delta_V_modulus: 1.0e+12
Delta_V_exponent: 5.0
phase:
mechanical:
r_cutback_min: 1.0e-3 # minimum (relative) size of step allowed during cutback in phase state calculation
r_cutback: 0.25 # factor to decrease size of step when cutback introduced in phase state calculation (value between 0 and 1)
r_increase: 1.5 # factor to increase size of next step when previous step converged in phase state calculation
eps_rel_state: 1.0e-6 # relative tolerance in phase state loop (abs tol provided by constitutive law)
N_iter_state_max: 10 # state loop limit
plastic:
r_linesearch_Lp: 0.5 # factor to decrease the step if Lp calculation fails to converge
eps_rel_Lp: 1.0e-6 # relative tolerance in Lp residuum
eps_abs_Lp: 1.0e-8 # absolute tolerance in Lp residuum
N_iter_Lp_max: 40 # stress loop limit for Lp
f_update_jacobi_Lp: 1 # frequency of Jacobian update of residuum in Lp
integrator_state: FPI # integration method (FPI = Fixed Point Iteration, Euler = Euler, AdaptiveEuler = Adaptive Euler, RK4 = classical 4th order Runge-Kutta, RKCK45 = 5th order Runge-Kutta Cash-Karp)
eigen:
r_linesearch_Li: 0.5 # factor to decrease the step if Li calculation fails to converge
eps_rel_Li: 1.0e-6 # relative tolerance in Li residuum
eps_abs_Li: 1.0e-8 # absolute tolerance in Li residuum
N_iter_Li_max: 40 # stress loop limit for Li
f_update_jacobi_Li: 1 # frequency of updating the Jacobian of residuum in Li
generic: generic:
random_seed: 0 # fixed seeding for pseudo-random number generator, Default 0: use random seed. random_seed: 0 # fixed seeding for pseudo-random number generator (0: use random seed)
residualStiffness: 1.0e-6 # non-zero residual damage.

View File

@ -6,8 +6,8 @@ N_cl: [3]
g_crit: [0.5e+7] g_crit: [0.5e+7]
s_crit: [0.006666] s_crit: [0.006666]
dot_o: 1.e-3 dot_o_0: 1.e-3
q: 20 p: 20
l_c: 1.0 l_c: 1.0
mu: 0.001 mu: 0.001

View File

@ -4,10 +4,11 @@ references:
- R.H. Bogaard et al., - R.H. Bogaard et al.,
Thermochimica Acta 218:373-393, 1993, Thermochimica Acta 218:373-393, 1993,
https://doi.org/10.1016/0040-6031(93)80437-F, https://doi.org/10.1016/0040-6031(93)80437-F,
fit to Fig. 6 (T_min=100K, T_max=1400K) fit to Fig. 6 (T_min=100K, T_max=1200K)
A_11: 2.068e-08 Alpha_11: 14.9e-6
A_11,T: 1.579e-09 Alpha_11,T: 1.838e-08
A_11,T^2: 3.449e-13 Alpha_11,T^2: -2.028e-11
Alpha_11,T^3: 9.173e-15
T_ref: 293.15 T_ref: 293.15

View File

@ -4,4 +4,4 @@ references:
- https://en.wikipedia.org/wiki/Thermal_expansion, - https://en.wikipedia.org/wiki/Thermal_expansion,
293.15K 293.15K
A_11: 23.1e-6 Alpha_11: 23.1e-6

View File

@ -4,4 +4,4 @@ references:
- https://en.wikipedia.org/wiki/Thermal_expansion, - https://en.wikipedia.org/wiki/Thermal_expansion,
293.15K 293.15K
A_11: 14.e-6 Alpha_11: 14.e-6

View File

@ -4,8 +4,8 @@ references:
- https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg, - https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg,
fit to image description (Scilab code) fit to image description (Scilab code)
A_11: 12.70371e-6 Alpha_11: 10.2e-6
A_11,T: 7.54e-9 Alpha_11,T: 1.260e-08
A_11,T^2: -1.0e-11 Alpha_11,T^2: -1.000e-11
T_ref: 273.0 T_ref: 293.15

View File

@ -4,4 +4,4 @@ references:
- https://en.wikipedia.org/wiki/Thermal_expansion, - https://en.wikipedia.org/wiki/Thermal_expansion,
293.15K 293.15K
A_11: 17.e-6 Alpha_11: 17.e-6

View File

@ -4,4 +4,4 @@ references:
- https://en.wikipedia.org/wiki/Thermal_expansion, - https://en.wikipedia.org/wiki/Thermal_expansion,
293.15K 293.15K
A_11: 11.8e-6 Alpha_11: 11.8e-6

View File

@ -0,0 +1,16 @@
type: thermalexpansion
references:
- Z. Li and R.C. Bradt,
Journal of the American Ceramic Society 69(12):863-866, 1986,
https://doi.org/10.1111/j.1151-2916.1986.tb07385.x
Alpha_11: 3.27e-6
Alpha_11,T: 3.25e-9
Alpha_11,T^2: -1.36e-12
Alpha_33: 3.18e-6
Alpha_33,T: 2.48e-9
Alpha_33,T^2: -8.51e-13
T_ref: 273.15

View File

@ -0,0 +1,12 @@
type: thermalexpansion
references:
- Z. Li and R.C. Bradt,
Journal of Materials Science 21:4366-4368, 1986,
https://doi.org/10.1007/BF01106557
Alpha_11: 3.19e-6
Alpha_11,T: 3.60e-9
Alpha_11,T^2: -1.68e-12
T_ref: 273.15

View File

@ -6,12 +6,12 @@ references:
https://doi.org/10.1107/S0365110X62000742, https://doi.org/10.1107/S0365110X62000742,
fit to Tab. 2 (T_min=30ºC, T_max=210ºC) fit to Tab. 2 (T_min=30ºC, T_max=210ºC)
A_11: 1.639e-05 Alpha_11: 16.4e-6
A_11,T: 1.799e-08 Alpha_11,T: 1.799e-08
A_11,T^2: 1.734e-10 Alpha_11,T^2: 1.734e-10
A_33: 3.263e-05 Alpha_33: 32.6e-6
A_33,T: 1.387e-08 Alpha_33,T: 1.387e-08
A_33,T^2: 5.794e-10 Alpha_33,T^2: 5.794e-10
T_ref: 293.15 T_ref: 293.15

View File

@ -4,4 +4,4 @@ references:
- https://en.wikipedia.org/wiki/Thermal_expansion, - https://en.wikipedia.org/wiki/Thermal_expansion,
293.15K 293.15K
A_11: 4.5e-6 Alpha_11: 4.5e-6

View File

@ -2,9 +2,9 @@ type: thermalexpansion
references: references:
- https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg, - https://commons.wikimedia.org/wiki/File:Coefficient_dilatation_lineique_aciers.svg,
fit to image description (Scilab code) fit to Scilab code for generating the image (T_min=100ºC, T_max=400ºC)
A_11: 11.365e-6 Alpha_11: 10.1e-6
A_11,T: 5.0e-9 Alpha_11,T: 5.000e-09
T_ref: 273.0 T_ref: 293.15

View File

@ -3,21 +3,23 @@ type: Hooke
references: references:
- J.R. Neighbours and G.A. Alers, - J.R. Neighbours and G.A. Alers,
Physical Review 111:707-712, 1958, Physical Review 111:707-712, 1958,
https://doi.org/10.1103/PhysRev.111.707 https://doi.org/10.1103/PhysRev.111.707,
fit to Tab. I (T_min=100K, T_max=300K)
- Y.A. Chang and L. Himmel, - Y.A. Chang and L. Himmel,
Journal of Applied Physics 37:3567-3572, 1966, Journal of Applied Physics 37:3567-3572, 1966,
https://doi.org/10.1063/1.1708903 https://doi.org/10.1063/1.1708903,
fit to Tab. II (T_min=300K, T_max=800K)
C_11: 122.9e+9 C_11: 124.1e+9
C_11,T: -313.5e+5 C_11,T: -3.148e+7
C_11,T^2: -107.3e+2 C_11,T^2: -6.594e+3
C_12: 91.55e+9 C_12: 93.7e+9
C_12,T: -164.1e+5 C_12,T: -1.657e+7
C_12,T^2: -681.6e+1 C_12,T^2: -4.220e+3
C_44: 42.63e+9 C_44: 46.4e+9
C_44,T: -180.5e+5 C_44,T: -1.775e+7
C_44,T^2: -353.8e+1 C_44,T^2: -1.973e+3
T_ref: 300 T_ref: 293.15

View File

@ -6,20 +6,20 @@ references:
https://doi.org/10.1063/1.1713309, https://doi.org/10.1063/1.1713309,
fit to Tab. I (T_min=100K, T_max=300K) fit to Tab. I (T_min=100K, T_max=300K)
- D. Gerlich and E.S. Fisher, - D. Gerlich and E.S. Fisher,
Journal of Physics and Chemistry of Solids 30:1197-1205, 1969 Journal of Physics and Chemistry of Solids 30:1197-1205, 1969,
https://doi.org/10.1016/0022-3697(69)90377-1, https://doi.org/10.1016/0022-3697(69)90377-1,
fit to Tab. 2 (T_min=293K, T_max=900K) fit to Tab. 2 (T_min=293K, T_max=900K)
C_11: 106.9e+9 C_11: 106.9e+9
C_11,T: -3.685e+7 C_11,T: -3.691e+7
C_11,T^2: -1.016e+4 C_11,T^2: -9.790e+3
C_12: 60.55e+9 C_12: 60.5e+9
C_12,T: -8.307e+6 C_12,T: -8.412e+6
C_12,T^2: -4.353e+3 C_12,T^2: -3.972e+3
C_44: 28.37e+9 C_44: 28.4e+9
C_44,T: -1.418e+7 C_44,T: -1.413e+7
C_44,T^2: -3.253e+3 C_44,T^2: -3.408e+3
T_ref: 293.15 T_ref: 293.15

View File

@ -1,11 +1,25 @@
type: Hooke type: Hooke
references: references:
- J.P. Hirth and J. Lothe, - J.R. Neighbours and G.A. Alers,
Theory of Dislocations, 1982, Physical Review 111:707-712, 1958,
John Wiley & Sons, https://doi.org/10.1103/PhysRev.111.707,
page 837 fit to Tab. II (T_min=100K, T_max=300K)
- Y.A. Chang and L. Himmel,
Journal of Applied Physics 37:3567-3572, 1966,
https://doi.org/10.1063/1.1708903,
fit to Tab. III (T_min=300K, T_max=800K)
C_11: 186.e+9 C_11: 192.7e+9
C_12: 157.e+9 C_11,T: -3.472e+7
C_44: 42.e+9 C_11,T^2: 1.102e+3
C_12: 163.2e+9
C_12,T: -2.607e+7
C_12,T^2: 2.397e+3
C_44: 42.2e+9
C_44,T: -1.172e+7
C_44,T^2: -3.078e+3
T_ref: 293.15

View File

@ -1,21 +1,25 @@
type: Hooke type: Hooke
references: references:
- W.C. Overton, Jr. and J. Gaffney, - W.C. Overton Jr. and J. Gaffney,
Physical Review 98(4):969-977, 1955, Physical Review 98(4):969-977, 1955,
https://doi.org/10.1103/PhysRev.98.969, https://doi.org/10.1103/PhysRev.98.969,
fit to Tab. I (T_min=100K, T_max=300K) fit to Tab. I (T_min=100K, T_max=300K)
- Y.A. Chang and L. Himmel,
Journal of Applied Physics 37:3567-3572, 1966,
https://doi.org/10.1063/1.1708903,
fit to Tab. II (T_min=300K, T_max=800K)
C_11: 168.6e+9 C_11: 168.9e+9
C_11,T: -3.779e+7 C_11,T: -3.332e+7
C_11,T^2: -2.536e+4 C_11,T^2: -1.074e+4
C_12: 121.5e+9 C_12: 121.8e+9
C_12,T: -1.632e+7 C_12,T: -1.402e+7
C_12,T^2: -1.116e+4 C_12,T^2: -9.003e+3
C_44: 75.59e+9 C_44: 75.8e+9
C_44,T: -2.912e+7 C_44,T: -2.555e+7
C_44,T^2: -1.669e+4 C_44,T^2: -2.188e+3
T_ref: 293.15 T_ref: 293.15

View File

@ -3,19 +3,19 @@ type: Hooke
references: references:
- D.J. Dever, - D.J. Dever,
Journal of Applied Physics 43(8):3293-3301, 1972, Journal of Applied Physics 43(8):3293-3301, 1972,
https://doi.org/10.1063/1.1661710 https://doi.org/10.1063/1.1661710,
fit to Tab. II (T_min=25ºC, T_max=880ºC) fit to Tab. II (T_min=25ºC, T_max=880ºC)
C_11: 232.1e+9 C_11: 232.2e+9
C_11,T: -4.678e+7 C_11,T: -4.683e+7
C_11,T^2: -5.762e+4 C_11,T^2: -5.988e+4
C_12: 135.9e+9 C_12: 136.4e+9
C_12,T: -1.695e+7 C_12,T: -1.970e+7
C_12,T^2: 1.555e+3 C_12,T^2: 3.760e+3
C_44: 117.0e+9 C_44: 117.0e+9
C_44,T: -2.047e+7 C_44,T: -2.015e+7
C_44,T^2: -2.814e+2 C_44,T^2: -7.485e+2
T_ref: 293.15 T_ref: 293.15

View File

@ -1,21 +1,18 @@
type: Hooke type: Hooke
references: references:
- Wang et al., - Z. Wang et al.,
Materials Science and Engineering:A 674:406-412, 2016, Materials Science and Engineering:A 674:406-412, 2016,
https://doi.org/10.1016/j.msea.2016.08.010, https://doi.org/10.1016/j.msea.2016.08.010,
fitted to Tab. 2 (last 3 rows) fit to Tab. 2 (last 3 rows)
C_11: 243.3e+9 C_11: 243.9e+9
C_11,T: -6.380e+5 C_11,T: -5.410e+7
C_11,T^2: -8.362e+4
C_12: 156.7e+9 C_12: 157.0e+9
C_12,T: 2.091e+7 C_12,T: -9.352e+6
C_12,T^2: -4.675e+4
C_44: 117.8e+9 C_44: 117.9e+9
C_44,T: -3.800e+7 C_44,T: -2.798e+7
C_44,T^2: 1.587e+4
T_ref: 293.15 T_ref: 293.15

View File

@ -6,23 +6,23 @@ references:
https://doi.org/10.1103/PhysRev.107.972, https://doi.org/10.1103/PhysRev.107.972,
fit to Tab. I (T_min=100K, T_max=300K) fit to Tab. I (T_min=100K, T_max=300K)
C_11: 59.50e+9 C_11: 59.5e+9
C_11,T: -1.930e+7 C_11,T: -1.930e+7
C_11,T^2: -1.215e+4 C_11,T^2: -1.215e+4
C_33: 61.72e+9 C_12: 25.6e+9
C_33,T: -2.175e+7
C_33,T^2: -5.624e+3
C_44: 16.46e+9
C_44,T: -1.006e+7
C_44,T^2: -7.692e+3
C_12: 25.62e+9
C_12,T: -2.216e+6 C_12,T: -2.216e+6
C_12,T^2: -4.138e+3 C_12,T^2: -4.138e+3
C_13: 21.46e+9 C_44: 16.5e+9
C_44,T: -1.006e+7
C_44,T^2: -7.692e+3
C_33: 61.7e+9
C_33,T: -2.175e+7
C_33,T^2: -5.624e+3
C_13: 21.5e+9
C_13,T: -1.921e+6 C_13,T: -1.921e+6
C_13,T^2: -4.283e+3 C_13,T^2: -4.283e+3

View File

@ -7,15 +7,15 @@ references:
fit to Tab. 2 (T_min=100K, T_max=700K) fit to Tab. 2 (T_min=100K, T_max=700K)
C_11: 251.0e+9 C_11: 251.0e+9
C_11,T: -4.998e+7 C_11,T: -4.967e+7
C_11,T^2: -2.952e+4 C_11,T^2: -3.327e+4
C_12: 150.0e+9 C_12: 150.0e+9
C_12,T: -4.269e+6 C_12,T: -3.714e+6
C_12,T^2: -6.429e+3 C_12,T^2: -7.414e+3
C_44: 123.7e+9 C_44: 123.7e+9
C_44,T: -3.618e+7 C_44,T: -3.621e+7
C_44,T^2: -7.024e+3 C_44,T^2: -8.017e+3
T_ref: 293.15 T_ref: 293.15

View File

@ -3,8 +3,9 @@ type: Hooke
references: references:
- S.A. Kim and W.L. Johnson, - S.A. Kim and W.L. Johnson,
Materials Science & Engineering A 452-453:633-639, 2007, Materials Science & Engineering A 452-453:633-639, 2007,
https://doi.org/10.1016/j.msea.2006.11.147 https://doi.org/10.1016/j.msea.2006.11.147,
Tab. 1 (averaged for bcc)
C_11: 268.1e+9 C_11: 267.9e+9
C_12: 111.2e+9 C_12: 110.8e+9
C_44: 79.06e+9 C_44: 78.9e+9

View File

@ -4,29 +4,24 @@ references:
- J.A. Rayne and B.S. Chandrasekhar, - J.A. Rayne and B.S. Chandrasekhar,
Physical Review 120(5):1658-1663, 1960, Physical Review 120(5):1658-1663, 1960,
https://doi.org/10.1103/PhysRev.120.1658, https://doi.org/10.1103/PhysRev.120.1658,
fit to Fig. 2 (T_min=100K, T_max=300K) and Tab. IV (C_13, T_min=77K, T_max=300K) fit to Tab. IV (T_min=77K, T_max=300K)
C_11: 72.90e+9 C_11: 72.6e+9
C_11,T: -4.399e+7 C_11,T: -4.135e+7
C_11,T^2: -2.645e+4
C_12: 59.27e+9 C_12: 59.4e+9
C_12,T: 1.058e+7 C_12,T: 6.726e+6
C_12,T^2: 1.002e+4
C_13: 35.80e+9 C_44: 22.2e+9
C_44,T: -1.870e+7
C_33: 88.8e+9
C_33,T: -5.381e+7
C_13: 35.8e+9
C_13,T: -2.870e+6 C_13,T: -2.870e+6
C_33: 88.78e+9 C_66: 24.1e+9
C_33,T: -5.250e+7 C_66,T: -1.709e+7
C_33,T^2: 3.546e+3
C_44: 22.26e+9
C_44,T: -1.982e+7
C_44,T^2: -8.711e+3
C_66: 24.18e+9
C_66,T: -1.806e+7
C_66,T^2: -4.112e+3
T_ref: 293.15 T_ref: 293.15

View File

@ -0,0 +1,21 @@
type: Hooke
references:
- F.H. Featherston and J.R. Neighbours,
Physical Review 130(4):1324-1333, 1963,
https://doi.org/10.1103/PhysRev.130.1324,
fit to Tab. II (T_min=100K, T_max=300K)
C_11: 523.6e+9
C_11,T: -7.704e+7
C_11,T^2: -1.562e+5
C_12: 204.6e+9
C_12,T: -2.485e+7
C_12,T^2: -1.182e+5
C_44: 160.7e+9
C_44,T: -1.028e+7
C_44,T^2: 1.291e+4
T_ref: 293.15

View File

@ -4,30 +4,26 @@ references:
- E.S. Fisher and C.J. Renken, - E.S. Fisher and C.J. Renken,
Physical Review 135(2A):A482-A494, 1964, Physical Review 135(2A):A482-A494, 1964,
https://doi.org/10.1103/PhysRev.135.A482, https://doi.org/10.1103/PhysRev.135.A482,
fit to Tab. IV (T_min=150K, T_max=250K) fit to Tab. IV (T_min=77K, T_max=923K)
- H. Ogi et al.,
Acta Materialia 52(7):2075-2080, 2004,
https://doi.org/10.1016/j.actamat.2004.01.002,
fit to Fig. 3 (T_min=300K, T_max=900K)
C_11: 162.6e+9 C_11: 162.5e+9
C_11,T: -6.150e+7 C_11,T: -5.915e+7
C_11,T^2: -5.557e+2 C_11,T^2: 1.156e+4
C_33: 183.3e+9 C_12: 91.8e+9
C_33,T: -1.655e+07 C_12,T: 2.192e+7
C_33,T^2: -1.022e+04 C_12,T^2: -1.621e+4
C_44: 45.80e+9 C_44: 46.8e+9
C_44,T: -2.936e+07 C_44,T: -1.857e+7
C_44,T^2: 7.120e+02 C_44,T^2: -3.745e+3
C_12: 89.97e+9 C_33: 180.6e+9
C_12,T: 2.776e+6 C_33,T: -4.110e+7
C_12,T^2: -2.389e+4 C_33,T^2: 7.330e+3
C_13: 69.53e+9 C_13: 68.9e+9
C_13,T: 1.057e+7 C_13,T: 2.965e+6
C_13,T^2: -2.966e+3 C_13,T^2: -5.767e+3
T_ref: 293.15 T_ref: 293.15

View File

@ -0,0 +1,21 @@
type: Hooke
references:
- R.A. Ayres et al.,
Journal of Applied Physics 46:1526-1530, 1975,
https://doi.org/10.1063/1.321804,
fit to Table IV (T_min=100K, T_max=300K)
C_11: 524.6e+9
C_11,T: -5.783e+07
C_11,T^2: -1.355e+05
C_12: 219.0e+9
C_12,T: 1.940e+07
C_12,T^2: 7.634e+04
C_44: 168.7e+9
C_44,T: -2.048e+07
C_44,T^2: -5.478e+04
T_ref: 293.15

View File

@ -0,0 +1,21 @@
type: Hooke
references:
- R.A. Ayres et al.,
Journal of Applied Physics 46:1526-1530, 1975,
https://doi.org/10.1063/1.321804,
fit to Table IV (T_min=100K, T_max=300K)
C_11: 535.1e+9
C_11,T: -6.459e+07
C_11,T^2: -1.664e+05
C_12: 216.1e+9
C_12,T: 2.357e+07
C_12,T^2: 5.186e+04
C_44: 161.1e+9
C_44,T: -1.498e+07
C_44,T^2: -3.234e+04
T_ref: 293.15

View File

@ -1,20 +1,18 @@
type: Hooke type: Hooke
references: references:
- F.H. Featherston and J.R. Nieghbours, - F.H. Featherston and J.R. Neighbours,
Physical Review 130(4):1324-1333, Physical Review 130(4):1324-1333, 1963,
https://doi.org/10.1103/PhysRev.130.1324, https://doi.org/10.1103/PhysRev.130.1324,
fit to Tab. III (T_min=100K, T_max=300K) fit to Tab. III (T_min=100K, T_max=300K)
C_11: 523.6e+9 C_11: 524.3e+9
C_11,T: -7.607e+7 C_11,T: -4.794e+07
C_11,T^2: -1.551e+5
C_12: 205.1e+9 C_12: 205.1e+9
C_12,T: -2.843e+6 C_12,T: -2.836e+06
C_44: 160.8e+9 C_44: 160.7e+9
C_44,T: -1.057e+7 C_44,T: -1.269e+07
C_44,T^2: 9.933e+3
T_ref: 293.15 T_ref: 293.15

View File

@ -3,7 +3,7 @@ type: dislotungsten
references: references:
- D. Cereceda et al., - D. Cereceda et al.,
International Journal of Plasticity 78:242-265, 2016, International Journal of Plasticity 78:242-265, 2016,
http://dx.doi.org/10.1016/j.ijplas.2015.09.002 https://doi.org/10.1016/j.ijplas.2015.09.002
- R. Gröger et al., - R. Gröger et al.,
Acta Materialia 56(19):5412-5425, 2008, Acta Materialia 56(19):5412-5425, 2008,
https://doi.org/10.1016/j.actamat.2008.07.037 https://doi.org/10.1016/j.actamat.2008.07.037
@ -26,7 +26,7 @@ h_sl-sl: [0.009, 0.72, 0.009, 0.05, 0.05, 0.06, 0.09]
w: [2.992e-09] # 11b w: [2.992e-09] # 11b
# values in Cereceda et al. are high, using parameters from Gröger et al. # values in Cereceda et al. are high, using parameters from Gröger et al.
a_nonSchmid: [0.0, 0.56, 0.75] # Table 2 a_nonSchmid_110: [0.0, 0.56, 0.75] # Tab. 2
# (almost) no annhilation, adjustment needed for simulations beyond the yield point # (almost) no annhilation, adjustment needed for simulations beyond the yield point
i_sl: [1] # c, eq. (25) i_sl: [1] # c, eq. (25)

View File

@ -12,8 +12,9 @@ output: [rho_dip, rho_mob]
N_sl: [12, 12] N_sl: [12, 12]
f_edge: [1.0, 1.0]
b_sl: [2.49e-10, 2.49e-10] b_sl: [2.49e-10, 2.49e-10]
rho_mob_0: [2.81e12, 2.8e+12] rho_mob_0: [2.81e+12, 2.8e+12]
rho_dip_0: [1.0, 1.0] # not given rho_dip_0: [1.0, 1.0] # not given
v_0: [1.4e+3, 1.4e+3] v_0: [1.4e+3, 1.4e+3]
Q_sl: [1.57e-19, 1.57e-19] # Delta_F Q_sl: [1.57e-19, 1.57e-19] # Delta_F

View File

@ -0,0 +1,74 @@
type: dislotwin
references:
- S.L. Wong et al.,
Acta Materialia 118:140-151, 2016,
https://doi.org/10.1016/j.actamat.2016.07.032
- K. Sedighiani et al.,
Mechanics of Materials, 164:104117, 2022,
https://doi.org/10.1016/j.mechmat.2021.104117
- L. Kubin et al.,
Acta Materialia 56:6040-6049,
https://doi.org/10.1016/j.actamat.2008.08.012
output: [rho_mob, rho_dip, gamma_sl, Lambda_sl, tau_pass, f_tw, Lambda_tw, f_tr]
# Glide
N_sl: [12]
f_edge: [1.0]
b_sl: [2.56e-10] # a/sqrt(2)
Q_sl: [3.5e-19]
p_sl: [0.325]
q_sl: [1.55]
B: [0.001]
i_sl: [30.0]
v_0: [1.4e+3]
tau_0: [5.5e+8] # adjusted
D_a: 2.0
Q_cl: 3.0e-19
rho_mob_0: [5.0e+10]
rho_dip_0: [5.0e+10]
h_sl-sl: [0.122, 0.122, 0.625, 0.07, 0.137, 0.137, 0.122]
# Twin
N_tw: [12]
b_tw: [1.47e-10] # a_cF/sqrt(6)
L_tw: 1.91e-7 # 1300 *b_tw
i_tw: 10.0
t_tw: [5.0e-8]
p_tw: [7] # A, adjusted
h_tw-tw: [1.0, 1.0]
h_sl-tw: [1.0, 1.0, 1.0]
# Transformation
N_tr: [12]
b_tr: [1.47e-10] # a_cF/sqrt(6)
L_tr: 2.21e-7 # 1500 *b_tr
i_tr: 10.0 # adjusted
t_tr: [1.0e-7]
p_tr: [4] # B, adjusted
V_mol: 7.09e-6
c/a_hP: 1.633
Delta_G: 1.2055e+2
Delta_G,T: 2.5515
Delta_G,T^2: 1.4952e-3
h_tr-tr: [1.0, 1.0]
h_sl-tr: [1.5, 1.5, 1.5]
# Twin & Transformation
T_ref: 293.15
Gamma_sf: 2.833e-2
Gamma_sf,T: 1.214e-4
Gamma_sf,T^2: 1.473e-7
x_c: 1.0e-9
V_cs: 1.67e-29
# Slip & Twin & Transformation
D: 5.0e-5

View File

@ -0,0 +1,23 @@
type: kinehardening
references:
- J.A. Wollmershauser et al.,
International Journal of Fatigue 36(1):181-193, 2012,
https://doi.org/10.1016/j.ijfatigue.2011.07.008
output: [xi, chi, chi_flip, gamma_flip, gamma, sgn(gamma)]
N_sl: [12]
xi_0: [0.070e+9] # τ_0,for
xi_inf: [0.015e+9] # τ_1,for
h_0_xi: [0.065e+9] # θ_0,for
h_inf_xi: [0.045e+9] # θ_1,for
chi_inf: [0.027e+9] # τ_1,bs
h_0_chi: [55e+9] # θ_0,bs
h_inf_chi: [1.3e+9] # θ_1,bs
n: [20] # not mentioned in the reference
dot_gamma_0: [1e-4] # not mentioned in the reference
h_sl-sl: [1, 1, 1, 1, 1, 1, 1]

View File

@ -40,7 +40,7 @@ nu_a: 50.e+9
B: 1.e-2 B: 1.e-2
f_ed: 1.0 # k_3 f_ed: 1.0 # k_3
h_sl-sl: [0, 0, 0.625, 0.07, 0.137, 0.137, 0.122] # Table 3.4 h_sl-sl: [0, 0, 0.625, 0.07, 0.137, 0.137, 0.122] # Tab. 3.4
chi_GB: 0.0 # full blocking at GB chi_GB: 0.0 # full blocking at GB
chi_surface: 1.0 # no blocking at surface chi_surface: 1.0 # no blocking at surface

View File

@ -40,7 +40,7 @@ nu_a: 50.e+9
B: 1.e-3 B: 1.e-3
f_ed: 0.01 # k_3 f_ed: 0.01 # k_3
h_sl-sl: [0, 0, 0.625, 0.07, 0.137, 0.137, 0.122] # Table 3.4 h_sl-sl: [0, 0, 0.625, 0.07, 0.137, 0.137, 0.122] # Tab. 3.4
chi_GB: 0.0 # full blocking at GB chi_GB: 0.0 # full blocking at GB
chi_surface: 1.0 # no blocking at surface chi_surface: 1.0 # no blocking at surface

View File

@ -0,0 +1,19 @@
type: phenopowerlaw
references:
- T.J. Barrett and M. Knezevic,
Computer Methods in Applied Mechanics and Engineering 354:245-270, 2019,
https://doi.org/10.1016/j.cma.2019.05.035,
fitted to data shown in Fig 1 and Fig. 2a
output: [xi_sl, gamma_sl]
N_sl: [12]
dot_gamma_0_sl: [0.001]
n_sl: [20]
a_sl: [3.7]
xi_0_sl: [76.e+6]
xi_inf_sl: [266.e+6]
h_0_sl-sl: [1.02e+9]
h_sl-sl: [1, 1, 5.123, 0.574, 1.123, 1.123, 1]

View File

@ -4,19 +4,16 @@ references:
- W.F. Hosford et al., - W.F. Hosford et al.,
Acta Metallurgica 8(3):187-199, 1960, Acta Metallurgica 8(3):187-199, 1960,
https://doi.org/10.1016/0001-6160(60)90127-9, https://doi.org/10.1016/0001-6160(60)90127-9,
fitted from Fig. 5 fitted to Fig. 5 ([111] and [001])
- U.F. Kocks,
Metallurgical and Materials Transactions B 1:11211143, 1970,
https://doi.org/10.1007/BF02900224
output: [xi_sl, gamma_sl] output: [xi_sl, gamma_sl]
N_sl: [12] N_sl: [12]
n_sl: 20 dot_gamma_0_sl: [7.5e-5]
a_sl: 3.1 n_sl: [20]
h_0_sl-sl: 1.7e+8 a_sl: [5.4]
xi_0_sl: [5.0e+6] xi_0_sl: [2.69e+6]
xi_inf_sl: [37.5e+6] xi_inf_sl: [67.5e+6]
h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] h_0_sl-sl: [0.2815e+9]
dot_gamma_0_sl: 7.5e-5 h_sl-sl: [1, 1, 5.123, 0.574, 1.123, 1.123, 1]

View File

@ -15,10 +15,10 @@ output: [xi_sl, gamma_sl]
N_sl: [12] N_sl: [12]
n_sl: 83.3 dot_gamma_0_sl: [0.001]
a_sl: 1.0 n_sl: [83.3]
h_0_sl-sl: 75.0e+6 a_sl: [1.0]
xi_0_sl: [26.25e+6] xi_0_sl: [26.25e+6]
xi_inf_sl: [53.0e+6] xi_inf_sl: [53.0e+6]
h_0_sl-sl: [75.0e+6]
h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4]
dot_gamma_0_sl: 0.001

View File

@ -1,22 +1,19 @@
type: phenopowerlaw type: phenopowerlaw
references: references:
- T Takeuchi, - T. Takeuchi,
Transactions of the Japan Institute of Metals 16(10):629-640, 1975, Transactions of the Japan Institute of Metals 16(10):629-640, 1975,
https://doi.org/10.2320/matertrans1960.16.629, https://doi.org/10.2320/matertrans1960.16.629,
fitted from Fig. 3b fitted to Fig. 3b ([111] and [001])
- U.F. Kocks,
Metallurgical and Materials Transactions B 1:11211143, 1970,
https://doi.org/10.1007/BF02900224
output: [xi_sl, gamma_sl] output: [xi_sl, gamma_sl]
N_sl: [12] N_sl: [12]
n_sl: 20 dot_gamma_0_sl: [3.e-3]
a_sl: 1.0 n_sl: [20]
h_0_sl-sl: 2.4e+8 a_sl: [0.6]
xi_0_sl: [1.5e+6] xi_0_sl: [1.6e+6]
xi_inf_sl: [112.5e+6] xi_inf_sl: [96.4e+6]
h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] h_0_sl-sl: [0.35e+9]
dot_gamma_0_sl: 3.e-3 h_sl-sl: [1, 1, 5.123, 0.574, 1.123, 1.123, 1]

View File

@ -12,10 +12,10 @@ output: [xi_sl, gamma_sl]
N_sl: [12, 12] N_sl: [12, 12]
n_sl: 20 dot_gamma_0_sl: [0.001, 0.001]
a_sl: 2.25 n_sl: [20, 20]
h_0_sl-sl: 1.0e+9 a_sl: [2.25, 2.25]
xi_0_sl: [95.e+6, 96.e+6] xi_0_sl: [95.e+6, 96.e+6]
xi_inf_sl: [222.e+6, 412.e+6] xi_inf_sl: [222.e+6, 412.e+6]
h_0_sl-sl: [1.0e+9, 1.0e+9]
h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4] h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4]
dot_gamma_0_sl: 0.001

View File

@ -14,23 +14,23 @@ xi_0_sl: [10.e+6, 55.e+6, 60.e+6, 0., 60.e+6]
xi_inf_sl: [40.e+6, 135.e+6, 150.e+6, 0., 150.e+6] xi_inf_sl: [40.e+6, 135.e+6, 150.e+6, 0., 150.e+6]
xi_0_tw: [40.e+6, 0., 60.e+6] xi_0_tw: [40.e+6, 0., 60.e+6]
a_sl: 2.25 a_sl: [2.25, 2.25, 2.25, 1, 2.25]
dot_gamma_0_sl: 0.001 dot_gamma_0_sl: [0.001, 0.001, 0.001, 0, 0.001]
dot_gamma_0_tw: 0.001 dot_gamma_0_tw: [0.001, 0, 0.001]
n_sl: 20 n_sl: [20, 20, 20, 1, 20]
n_tw: 20 n_tw: [20, 1, 20]
f_sat_sl-tw: 10.0 f_sat_sl-tw: [10.0, 10.0, 10.0, 0, 10.0]
h_0_sl-sl: 500.0e+6 h_0_sl-sl: [0.5e+9, 0.5e+9, 0.5e+9, 0, 0.5e+9]
h_0_tw-tw: 50.0e+6 h_0_tw-tw: [50.0e+6, 0, 50.0e+6]
h_0_tw-sl: 150.0e+6 h_0_tw-sl: [0.15e+9, 0, 0.15e+9]
h_sl-sl: [+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, h_sl-sl: [+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, -1.0, +1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, -1.0,
-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,
-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0,
-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, 1.0, 1.0, 1.0, 1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, 1.0, 1.0, 1.0, 1.0,
+1.0, 1.0, -1.0, -1.0, -1.0, -1.0, 1.0, 1.0, 1.0, 1.0, +1.0, 1.0, -1.0, -1.0, -1.0, -1.0, 1.0, 1.0, 1.0, -1.0,
-1.0, -1.0, -1.0, -1.0, 1.0, 1.0, 1.0, 1.0, 1.0] # unused entries are indicated by -1.0 -1.0, -1.0, -1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0] # unused entries are indicated by -1.0
h_tw-tw: [+1.0, 1.0, -1.0, -1.0, -1.0, -1.0, 1.0, -1.0, 1.0, 1.0, h_tw-tw: [+1.0, 1.0, -1.0, -1.0, -1.0, -1.0, 1.0, -1.0, 1.0, 1.0,
-1.0, 1.0] # unused entries are indicated by -1.0 -1.0, 1.0] # unused entries are indicated by -1.0
h_tw-sl: [1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, h_tw-sl: [1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0,

View File

@ -4,17 +4,16 @@ references:
- K.M. Jackson and C. Lang, - K.M. Jackson and C. Lang,
Platinum Metals Review 50:15-19, 2006, Platinum Metals Review 50:15-19, 2006,
https://doi.org/10.1595/147106705X93359, https://doi.org/10.1595/147106705X93359,
fitted from Fig. 5 (Pt-5% Cu recrystallised) fitted to Fig. 5 (Pt-5% Cu recrystallised)
- U.F. Kocks,
Metallurgical and Materials Transactions B 1:11211143, 1970, output: [xi_sl, gamma_sl]
https://doi.org/10.1007/BF02900224
N_sl: [12] N_sl: [12]
n_sl: 1.6 dot_gamma_0_sl: [0.001]
a_sl: 0.8 n_sl: [20]
h_0_sl-sl: 300.0e+6 a_sl: [0.9]
xi_0_sl: [150.0e+6] xi_0_sl: [0.114e+9]
xi_inf_sl: [500.0e+6] xi_inf_sl: [0.207e+9]
h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] h_0_sl-sl: [0.7812e+9]
dot_gamma_0_sl: 0.0001 h_sl-sl: [1, 1, 5.123, 0.574, 1.123, 1.123, 1]

View File

@ -9,9 +9,9 @@ output: [xi_sl, gamma_sl]
N_sl: [2, 2, 2, 4, 2, 4, 2, 2, 4, 0, 0, 8] N_sl: [2, 2, 2, 4, 2, 4, 2, 2, 4, 0, 0, 8]
n_sl: 6.0 n_sl: [6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 6.0, 1, 1, 6.0]
a_sl: 2.0 a_sl: [2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 1.0, 1.0, 2.0]
h_0_sl-sl: 20.0e+6 h_0_sl-sl: [20e+6, 20e+6, 20e+6, 20e+6, 20e+6, 20e+6, 20e+6, 20e+6, 20e+6, 0.0, 0.0, 20e+6]
xi_0_sl: [8.5e+6, 4.3e+6, 10.4e+6, 4.5e+6, 5.6e+6, 5.1e+6, 7.4e+6, 15.0e+6, 6.6e+6, 0.0, 0.0, 12.0e+6] xi_0_sl: [8.5e+6, 4.3e+6, 10.4e+6, 4.5e+6, 5.6e+6, 5.1e+6, 7.4e+6, 15.0e+6, 6.6e+6, 0.0, 0.0, 12.0e+6]
xi_inf_sl: [11.0e+6, 9.0e+6, 11.0e+6, 9.0e+6, 10.0e+6, 10.0e+6, 10.0e+6, 10.0e+6, 9.0e+6, 0.0, 0.0, 13.0e+6] xi_inf_sl: [11.0e+6, 9.0e+6, 11.0e+6, 9.0e+6, 10.0e+6, 10.0e+6, 10.0e+6, 10.0e+6, 9.0e+6, 0.0, 0.0, 13.0e+6]
h_sl-sl: [+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, h_sl-sl: [+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
@ -30,4 +30,4 @@ h_sl-sl: [+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
-1.0, -1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
+1.0, -1.0, -1.0, 1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0, # 150 +1.0, -1.0, -1.0, 1.0, 1.0, -1.0, -1.0, 1.0, 1.0, 1.0, # 150
+1.0, 1.0, 1.0, 1.0, 1.0, 1.0] # unused entries are indicated by -1.0 +1.0, 1.0, 1.0, 1.0, 1.0, 1.0] # unused entries are indicated by -1.0
dot_gamma_0_sl: 2.6e-8 dot_gamma_0_sl: [2.6e-8, 2.6e-8, 2.6e-8, 2.6e-8, 2.6e-8, 2.6e-8, 2.6e-8, 2.6e-8, 2.6e-8, 1.0, 1.0, 2.6e-8]

View File

@ -12,17 +12,17 @@ output: [gamma_sl]
N_sl: [3, 3, 0, 12] # basal, prism, -, 1. pyr<c+a> N_sl: [3, 3, 0, 12] # basal, prism, -, 1. pyr<c+a>
n_sl: 20 dot_gamma_0_sl: [0.001, 0.001, 0.0, 0.001]
a_sl: 2.0 n_sl: [20, 20, 1, 20]
dot_gamma_0_sl: 0.001 a_sl: [2.0, 2.0, 1.0, 2.0]
h_0_sl-sl: 200.e+6
# C. Zambaldi et al.: # C. Zambaldi et al.:
xi_0_sl: [349.e+6, 150.e+6, 0.0, 1107.e+6] xi_0_sl: [0.349e+9, 0.15e+9, 0.0, 1.107e+9]
xi_inf_sl: [568.e+6, 150.e+7, 0.0, 3420.e+6] xi_inf_sl: [0.568e+9, 1.50e+9, 0.0, 3.420e+9]
# L. Wang et al. : # L. Wang et al. :
# xi_0_sl: [127.e+6, 96.e+6, 0.0, 240.e+6] # xi_0_sl: [127.e+6, 96.e+6, 0.0, 240.e+6]
h_0_sl-sl: [0.2e+9, 0.2e+9, 0.0, 0.2e+9]
h_sl-sl: [+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, -1.0, -1.0, h_sl-sl: [+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, -1.0, -1.0,
-1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, 1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, 1.0,
+1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, +1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,

View File

@ -1,12 +1,14 @@
# Tasan et.al. 2015 Acta Materalia # Tasan et.al. 2015 Acta Materalia
# Tasan et.al. 2015 International Journal of Plasticity # Tasan et.al. 2015 International Journal of Plasticity
# Diehl et.al. 2015 Meccanica # Diehl et.al. 2015 Meccanica
N_sl: [12, 12]
a_sl: 2.0
dot_gamma_0_sl: 0.001
h_0_sl-sl: 563.0e+9
h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4]
n_sl: 20
type: phenopowerlaw type: phenopowerlaw
N_sl: [12, 12]
dot_gamma_0_sl: [0.001, 0.001]
n_sl: [20, 20]
a_sl: [2.0, 2.0]
xi_0_sl: [405.8e+6, 456.7e+6] xi_0_sl: [405.8e+6, 456.7e+6]
xi_inf_sl: [872.9e+6, 971.2e+6] xi_inf_sl: [872.9e+6, 971.2e+6]
h_0_sl-sl: [563.0e+9, 563.0e+9]
h_sl-sl: [1, 1.4, 1, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4, 1.4]

View File

@ -7,9 +7,11 @@ references:
output: [T] output: [T]
K_11: 2.380e+2 K_11: 2.374e+2
K_11,T: 2.068e-3 K_11,T: 8.952e-3
K_11,T^2: -7.765e-5 K_11,T^2: 2.650e-5
K_11,T^3: -5.687e-7
K_11,T^4: 6.407e-10
T_ref: 293.15 T_ref: 293.15

View File

@ -2,14 +2,16 @@ references:
- J.G. Hust and A.B. Lankford, - J.G. Hust and A.B. Lankford,
Thermal Conductivity of Aluminum, Copper, Iron, and Tungsten from 1K to the Melting Point, Thermal Conductivity of Aluminum, Copper, Iron, and Tungsten from 1K to the Melting Point,
US Department of Commerce, Boulder, Colorado, 1984, US Department of Commerce, Boulder, Colorado, 1984,
fit to Tab. 2.4.1 (RRR=1000, T_min=200K, T_max=1000K) fit to Tab. 2.4.1 (RRR=300, T_min=150K, T_max=1000K)
- https://www.mit.edu/~6.777/matprops/copper.htm - https://www.mit.edu/~6.777/matprops/copper.htm
output: [T] output: [T]
K_11: 4.039e+2 K_11: 4.005e+2
K_11,T: -8.119e-2 K_11,T: -1.075e-1
K_11,T^2: 1.454e-5 K_11,T^2: 3.293e-4
K_11,T^3: -7.533e-7
K_11,T^4: 5.223e-10
T_ref: 293.15 T_ref: 293.15

View File

@ -2,14 +2,15 @@ references:
- J.G. Hust and A.B. Lankford, - J.G. Hust and A.B. Lankford,
Thermal Conductivity of Aluminum, Copper, Iron, and Tungsten from 1K to the Melting Point, Thermal Conductivity of Aluminum, Copper, Iron, and Tungsten from 1K to the Melting Point,
US Department of Commerce, Boulder, Colorado, 1984, US Department of Commerce, Boulder, Colorado, 1984,
fit to Tab. 4.4.1 (RRR=300, T_min=200K, T_max=1000K) fit to Tab. 4.4.1 (RRR=300, T_min=150K, T_max=1000K)
- https://www.engineeringtoolbox.com/specific-heat-metals-d_152.html - https://www.engineeringtoolbox.com/specific-heat-metals-d_152.html
output: [T] output: [T]
K_11: 8.055e+1 K_11: 8.034e+1
K_11,T: -1.051e-1 K_11,T: -1.216e-1
K_11,T^2: 5.464e-5 K_11,T^2: 1.327e-4
K_11,T^3: -7.993e-8
T_ref: 293.15 T_ref: 293.15

View File

@ -2,14 +2,16 @@ references:
- Y.S. Touloukian et al., - Y.S. Touloukian et al.,
TPRC Data Series Volume 1. Thermal conductivity - metallic elements and alloys, TPRC Data Series Volume 1. Thermal conductivity - metallic elements and alloys,
IFI/Plenum, 1970, IFI/Plenum, 1970,
fit to Tab. 35R (T_min=150K, T_max=500K) fit to Tab. 35R (T_min=80K, T_max=500K)
- https://www.engineeringtoolbox.com/specific-heat-metals-d_152.html - https://www.engineeringtoolbox.com/specific-heat-metals-d_152.html
output: [T] output: [T]
K_11: 9.132e+1 K_11: 9.311e+1
K_11,T: -1.525e-1 K_11,T: -8.719e-2
K_11,T^2: 3.053e-4 K_11,T^2: -3.793e-4
K_11,T^3: -4.003e-6
K_11,T^4: 2.676e-8
T_ref: 293.15 T_ref: 293.15

View File

@ -2,18 +2,22 @@ references:
- Y.S. Touloukian et al., - Y.S. Touloukian et al.,
TPRC Data Series Volume 1. Thermal conductivity - metallic elements and alloys, TPRC Data Series Volume 1. Thermal conductivity - metallic elements and alloys,
IFI/Plenum, 1970, IFI/Plenum, 1970,
fit to Tab. 61R (T_min=100K, T_max=400K) fit to Tab. 61R (T_min=80K, T_max=500K)
- https://www.engineeringtoolbox.com/specific-heat-metals-d_152.html - https://www.engineeringtoolbox.com/specific-heat-metals-d_152.html
output: [T] output: [T]
K_11: 7.414e+1 K_11: 7.495e+1
K_11,T: -6.465e-2 K_11,T: -5.646e-2
K_11,T^2: 2.066e-4 K_11,T^2: 1.420e-5
K_11,T^3: -5.390e-7
K_11,T^4: 4.012e-9
K_33: 5.147e+1 K_33: 5.204e+1
K_33,T: -4.506e-2 K_33,T: -3.940e-2
K_33,T^2: 1.435e-4 K_33,T^2: 7.037e-6
K_33,T^3: -3.738e-7
K_33,T^4: 2.873e-9
T_ref: 293.15 T_ref: 293.15

View File

@ -2,14 +2,16 @@ references:
- J.G. Hust and A.B. Lankford, - J.G. Hust and A.B. Lankford,
Thermal Conductivity of Aluminum, Copper, Iron, and Tungsten from 1K to the Melting Point, Thermal Conductivity of Aluminum, Copper, Iron, and Tungsten from 1K to the Melting Point,
US Department of Commerce, Boulder, Colorado, 1984, US Department of Commerce, Boulder, Colorado, 1984,
fit to Tab. 5.4.1 (RRR=300, T_min=200K, T_max=1000K) fit to Tab. 5.4.1 (RRR=300, T_min=100K, T_max=2000K)
- https://www.mit.edu/~6.777/matprops/tungsten.htm - https://www.mit.edu/~6.777/matprops/tungsten.htm
output: [T] output: [T]
K_11: 1.758e+2 K_11: 1.750e+2
K_11,T: -1.605e-1 K_11,T: -1.809e-1
K_11,T^2: 1.160e-4 K_11,T^2: 2.257e-4
K_11,T^3: -1.395e-7
K_11,T^4: 3.192e-11
T_ref: 293.15 T_ref: 293.15

View File

@ -1,4 +1,4 @@
type: externalheat type: externalheat
f_T: [1, 1, 0, 0] f: [1, 1, 0, 0]
t_n: [0, 500, 500.001, 1000] t: [0, 500, 500.001, 1000]

View File

@ -13,12 +13,12 @@ phase:
plastic: plastic:
type: phenopowerlaw type: phenopowerlaw
N_sl: [12] N_sl: [12]
a_sl: 2.25 a_sl: [2.25]
atol_xi: 1.0 atol_xi: 1.0
dot_gamma_0_sl: 0.001 dot_gamma_0_sl: [0.001]
h_0_sl-sl: 75.e+6 h_0_sl-sl: [75.e+6]
h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4]
n_sl: 20 n_sl: [20]
output: [xi_sl] output: [xi_sl]
xi_0_sl: [31.e+6] xi_0_sl: [31.e+6]
xi_inf_sl: [63.e+6] xi_inf_sl: [63.e+6]

View File

@ -1,3 +1,5 @@
solver:
grid: grid:
itmin: 4 mechanical:
itmax: 40 N_iter_min: 4
N_iter_max: 40

View File

@ -0,0 +1,360 @@
$MeshFormat
4.1 0 8
$EndMeshFormat
$Entities
17 30 17 3
1 1 0 0 0
2 1 1 0 0
3 0 1 0 0
4 0 0.540411555524 0 0
5 0 1 0.258901682216 0
6 0.259060770574 0 0 0
7 1 1 0.561947208528 0
8 1 0 0.130664843584 0
9 0.5517921536930001 0 0.343999673446 0
10 0.471814845485 1 0.813349077109 0
11 0 0 0 0
12 0 0 1 0
13 0 1 1 0
14 0.280568187696 0 1 0
15 0.394643841883 1 1 0
16 1 1 1 0
17 1 0 1 0
1 0 0.540411555524 0 0 1 0 0 2 3 -4
2 0 0.540411555524 0 0 1 0.258901682216 0 2 4 -5
3 0 1 0 0 1 0.258901682216 0 2 5 -3
4 1 0 0 1 1 0 0 2 1 -2
5 1 1 0 1 1 0.561947208528 0 2 2 -7
6 1 0 0.130664843584 1 1 0.561947208528 0 2 7 -8
7 1 0 0 1 0 0.130664843584 0 2 8 -1
8 0.259060770574 0 0 1 0 0 0 2 6 -1
9 0.5517921536930001 0 0.130664843584 1 0 0.343999673446 0 2 8 -9
10 0.259060770574 0 0 0.5517921536930001 0 0.343999673446 0 2 9 -6
11 0 1 0 1 1 0 0 2 2 -3
12 0 1 0.258901682216 0.471814845485 1 0.813349077109 0 2 5 -10
13 0.471814845485 1 0.561947208528 1 1 0.813349077109 0 2 10 -7
14 0 0 0 0.259060770574 0.540411555524 0 0 2 6 -4
15 0.471814845485 0 0.343999673446 0.5517921536930001 1 0.813349077109 0 2 10 -9
16 0 0 0 0 0 1 0 2 11 -12
17 0 0 1 0 1 1 0 2 12 -13
18 0 1 0.258901682216 0 1 1 0 2 13 -5
19 0 0 0 0 0.540411555524 0 0 2 4 -11
20 0 0 0 0.259060770574 0 0 0 2 11 -6
21 0.280568187696 0 0.343999673446 0.5517921536930001 0 1 0 2 9 -14
22 0 0 1 0.280568187696 0 1 0 2 14 -12
23 0 1 1 0.394643841883 1 1 0 2 13 -15
24 0.394643841883 1 0.813349077109 0.471814845485 1 1 0 2 15 -10
25 0.280568187696 0 1 0.394643841883 1 1 0 2 14 -15
26 1 0 1 1 1 1 0 2 16 -17
27 1 0 0.130664843584 1 0 1 0 2 17 -8
28 1 1 0.561947208528 1 1 1 0 2 7 -16
29 0.280568187696 0 1 1 0 1 0 2 17 -14
30 0.394643841883 1 1 1 1 1 0 2 15 -16
1 0 0.540411555524 0 0 1 0.258901682216 0 3 1 2 3
2 1 0 0 1 1 0.561947208528 0 4 4 5 6 7
3 0.259060770574 0 0 1 0 0.343999673446 0 4 8 -7 9 10
4 0 1 0 1 1 0.813349077109 0 5 11 -3 12 13 -5
5 0 0 0 1 1 0 1 1 5 -11 -4 -8 14 -1
6 0 0 0 0.5517921536930001 1 0.813349077109 0 5 14 2 12 15 10
7 0.471814845485 0 0.130664843584 1 1 0.813349077109 0 4 6 9 -15 13
8 0 0 0 0 1 1 0 5 16 17 18 -2 19
9 0 0 0 0.5517921536930001 0 1 0 5 -16 20 -10 21 22
10 0 1 0.258901682216 0.471814845485 1 1 0 4 -18 23 24 -12
11 0 0 0 0.259060770574 0.540411555524 0 1 1 3 -19 -14 -20
12 0 0 1 0.394643841883 1 1 1 2 4 -17 -22 25 -23
13 0.280568187696 0 0.343999673446 0.5517921536930001 1 1 0 4 -21 -15 -24 -25
14 1 0 0.130664843584 1 1 1 0 4 26 27 -6 28
15 0.280568187696 0 0.130664843584 1 0 1 0 4 -27 29 -21 -9
16 0.394643841883 1 0.561947208528 1 1 1 0 4 -28 -13 -24 30
17 0.280568187696 0 1 1 1 1 1 2 4 -26 -30 -25 -29
1 0 0 0 1 1 0.813349077109 1 1 7 1 2 3 4 5 -6 -7
2 0 0 0 0.5517921536930001 1 1 1 2 7 8 9 10 11 12 6 13
3 0.280568187696 0 0.130664843584 1 1 1 1 3 6 14 15 16 17 7 -13
$EndEntities
$Nodes
40 45 1 45
0 1 0 1
1
1 0 0
0 2 0 1
2
1 1 0
0 3 0 1
3
0 1 0
0 4 0 1
4
-0 0.540411555524 -0
0 5 0 1
5
-0 1 0.258901682216
0 6 0 1
6
0.259060770574 -0 -0
0 7 0 1
7
1 1 0.561947208528
0 8 0 1
8
1 -0 0.130664843584
0 9 0 1
9
0.5517921536930001 -0 0.343999673446
0 10 0 1
10
0.471814845485 1 0.813349077109
0 11 0 1
11
0 0 0
0 12 0 1
12
0 0 1
0 13 0 1
13
0 1 1
0 14 0 1
14
0.280568187696 -0 1
0 15 0 1
15
0.394643841883 1 1
0 16 0 1
16
1 1 1
0 17 0 1
17
1 0 1
1 4 0 1
18
1 0.4999999999986929 0
1 6 0 1
19
1 0.5000000000019492 0.3463060260568406
1 11 0 1
20
0.5000000000020608 1 0
1 15 0 1
21
0.5118034995888453 0.5000000000019342 0.5786743752784078
1 16 0 1
22
0 0 0.4999999999986929
1 17 0 1
23
0 0.4999999999986929 1
1 25 0 1
24
0.337606014789348 0.4999999999986674 1
1 26 0 1
25
1 0.5000000000020608 1
1 27 0 1
26
1 0 0.5653324217931721
2 2 0 1
27
1 0.7499999999995584 0.1871863053053647
2 4 0 2
28
29
0.4194268839877067 1 0.3569087755797939
0.7500000000010304 1 0.280973604264
2 5 0 3
30
31
32
0.4970161792427553 0.4463699474287017 0
0.2500000000010305 0.7702057777619999 0
0.7219805561060536 0.7219805561045584 0
2 6 0 2
33
34
0.3123109503140938 0.3486457789905926 0.2589802261270177
0.2591858590776071 0.6778114669033146 0.3819810721460686
2 8 0 3
35
36
37
0 0.5934362222140065 0.5431502803691154
0 0.2719143829747943 0.2782772948957658
0 0.2499999999993465 0.7499999999993464
2 9 0 1
38
0.2373377366398625 0 0.3248115644201713
2 11 0 0
2 12 0 2
39
40
0.147559326895621 0.2499999999993432 1
0.1739996024287286 0.7499999999993441 1
2 13 0 1
41
0.4204424639417847 0.250000000000152 0.7306685121810963
2 14 0 2
42
43
1 0.3464521962708518 0.6901692035205218
1 0.6923503137538461 0.7371956638047661
2 17 0 2
44
45
0.6573954419757837 0.343094360024705 1
0.6753216162050389 0.682005422895861 1
3 1 0 0
3 2 0 0
3 3 0 0
$EndNodes
$Elements
7 144 1 144
2 5 2 11
1 6 30 1
2 1 30 18
3 18 32 2
4 2 32 20
5 3 31 4
6 20 31 3
7 4 30 6
8 4 31 30
9 30 32 18
10 20 32 31
11 31 32 30
2 11 2 1
12 4 6 11
2 12 2 8
13 14 39 12
14 12 39 23
15 13 40 15
16 23 40 13
17 24 39 14
18 15 40 24
19 23 39 24
20 24 40 23
2 17 2 8
21 17 44 14
22 14 44 24
23 15 45 16
24 24 45 15
25 16 45 25
26 25 44 17
27 44 45 24
28 25 45 44
3 1 4 41
29 29 34 28 32
30 34 28 5 10
31 29 19 32 27
32 31 28 34 32
33 28 31 20 32
34 18 19 30 8
35 29 21 34 32
36 21 33 30 9
37 21 34 28 29
38 9 30 19 8
39 29 19 21 32
40 21 28 10 29
41 30 18 8 1
42 34 30 31 32
43 21 30 34 32
44 19 30 21 32
45 19 21 7 29
46 6 30 9 1
47 10 7 21 29
48 19 21 30 9
49 7 19 29 27
50 8 9 30 1
51 20 29 28 32
52 32 19 30 18
53 27 32 2 18
54 33 30 6 4
55 34 33 30 21
56 28 31 5 20
57 31 4 33 34
58 31 3 5 20
59 10 34 28 21
60 2 7 29 27
61 19 32 27 18
62 4 33 30 31
63 31 33 30 34
64 4 31 5 34
65 6 30 33 9
66 20 2 29 32
67 28 5 31 34
68 4 31 3 5
69 32 2 29 27
3 2 4 45
70 12 23 39 37
71 22 33 36 37
72 37 33 35 41
73 35 36 33 37
74 40 13 35 23
75 40 35 34 21
76 23 35 40 24
77 41 37 39 24
78 35 40 24 21
79 35 37 41 24
80 40 34 10 21
81 37 23 39 24
82 38 41 14 9
83 33 38 22 36
84 37 35 23 24
85 22 38 41 14
86 41 33 35 21
87 24 40 10 21
88 36 33 6 4
89 24 41 35 21
90 36 6 11 4
91 14 24 41 39
92 41 37 22 14
93 4 36 33 34
94 24 15 10 40
95 33 34 35 21
96 4 36 34 35
97 21 41 33 9
98 37 12 22 14
99 34 5 4 35
100 41 39 37 14
101 38 33 41 9
102 34 36 33 35
103 10 15 13 40
104 11 22 38 36
105 39 12 37 14
106 33 6 38 36
107 33 38 6 9
108 11 38 6 36
109 40 34 13 10
110 40 13 34 35
111 5 13 34 10
112 5 34 13 35
113 41 22 33 38
114 41 33 22 37
3 3 4 30
115 26 14 41 9
116 45 25 42 43
117 26 41 14 17
118 42 44 41 26
119 25 42 44 45
120 44 14 41 17
121 45 42 21 43
122 42 41 21 9
123 21 19 7 43
124 21 10 45 43
125 45 42 44 21
126 16 45 10 43
127 21 7 10 43
128 26 44 41 17
129 19 42 21 9
130 41 44 42 21
131 41 42 26 9
132 26 42 44 17
133 43 42 21 19
134 25 45 16 43
135 7 16 10 43
136 26 42 19 9
137 45 10 15 16
138 17 42 44 25
139 45 24 10 21
140 19 26 9 8
141 45 44 24 21
142 24 15 45 10
143 14 24 44 41
144 41 24 44 21
$EndElements

File diff suppressed because it is too large Load Diff

View File

@ -12,12 +12,12 @@ phase:
plastic: plastic:
type: phenopowerlaw type: phenopowerlaw
N_sl: [12] N_sl: [12]
a_sl: 2.25 a_sl: [2.25]
atol_xi: 1.0 atol_xi: 1.0
dot_gamma_0_sl: 0.001 dot_gamma_0_sl: [0.001]
h_0_sl-sl: 75.e+6 h_0_sl-sl: [75.e+6]
h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4] h_sl-sl: [1, 1, 1.4, 1.4, 1.4, 1.4, 1.4]
n_sl: 20 n_sl: [20]
output: [xi_sl] output: [xi_sl]
xi_0_sl: [31.e+6] xi_0_sl: [31.e+6]
xi_inf_sl: [63.e+6] xi_inf_sl: [63.e+6]
@ -28,101 +28,6 @@ material:
v: 1.0 v: 1.0
phase: Aluminum phase: Aluminum
homogenization: SX homogenization: SX
- constituents:
- O: [0.12807292351503236, 0.22200469518411023, 0.6352813278477609, -0.7285114110750144]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.372279509887385, 0.7538147166654958, 0.5325170025119552, -0.09796418474222598]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.36250483607280015, 0.1909385526545633, 0.22801354774620894, 0.883256777487838]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.732294920525089, 0.5171063011556195, -0.1407961220188403, 0.4201448258669421]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.708826030342622, -0.6702053835750753, -0.20103371291967786, -0.08930760776907508]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5987257793404215, -0.07651654961032513, 0.5682302685884709, 0.5592736545277363]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.06694940093926707, -0.30782756132267486, -0.12043616569331547, 0.9414112279960869]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.18461382116884548, -0.6204161624733774, -0.29958251820830917, 0.700893599028564]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.9169840196863235, -0.06434514294945529, -0.39316017660689456, -0.02061760774585527]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.6721337568887824, 0.25328061978301336, 0.695177984796291, 0.028508068111876502]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5634397986285561, 0.5706880594373327, 0.08060455928790704, 0.5919067808017289]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5400408176755693, -0.4956697116684921, 0.14064883310776702, 0.6654963245008945]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.07812412485408982, 0.5540083408137547, 0.5031719732018802, -0.6586268631089227]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.41240828720357114, -0.026821321952330345, -0.06656740215323173, -0.9081678271691396]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.3658567189933218, -0.6119251240676276, 0.3102501533620181, -0.6288412725331445]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.2308179184918794, 0.26432722557112004, -0.14038019870347257, -0.925822664518926]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.4363489638426341, -0.5213523479018052, -0.37065469878209856, -0.6327767421148525]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.15751083378097516, -0.5830676086424881, -0.7731435878587035, -0.19357554997086668]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.41698573506483805, 0.5882742372124636, 0.4716906164392004, 0.5075079122021035]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents: - constituents:
- O: [0.17835925061073415, -0.7576341567357145, 0.5458453874401553, 0.3102116620619653] - O: [0.17835925061073415, -0.7576341567357145, 0.5458453874401553, 0.3102116620619653]
v: 1.0 v: 1.0
@ -148,383 +53,3 @@ material:
v: 1.0 v: 1.0
phase: Aluminum phase: Aluminum
homogenization: SX homogenization: SX
- constituents:
- O: [0.06696575255653868, 0.5321303636902097, -0.6166115894646206, 0.5763184985417141]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.31809816235976984, 0.4876502255202392, -0.7296452532806524, -0.3586483249903866]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.2549514949878876, 0.05524371396681128, 0.9470351218726387, -0.18727612023499066]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.3760153183052231, -0.4217640210815424, 0.6443784334217433, -0.515270827295598]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.6102174060370085, -0.022958466699548683, -0.6694455254088741, -0.42302519391438936]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5254549417230717, 0.20193294294562072, -0.19303567281299983, -0.8036525491739303]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.7169626866664082, -0.6629494257626796, -0.1589260699014312, -0.14561960415653047]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.040377943142626056, 0.7396298011497441, -0.661651923110657, -0.11633620074048379]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.8080395996415211, -0.5263437715228787, 0.22303374382245625, -0.1424436334371638]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.21962598047172166, 0.45293590819075397, -0.06718005388282963, -0.8614524549466163]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.7348220818417669, 0.06949262003518837, 0.20336956395879577, 0.643310270595446]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.27437168454785316, 0.607839586873941, -0.06548653269996256, -0.7422686369382898]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5821287086059501, 0.5669682803260325, -0.47414005369298196, 0.338916428054065]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.3970593041780103, 0.8246645098423279, -0.36199337531483944, 0.1767290338352959]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5081480477127669, 0.3204901365034085, 0.7369345512733142, -0.3098372171791651]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.6953483497932282, -0.7005111230189092, -0.030120917781595695, -0.15769454422590312]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.20780780106593144, -0.4156481640905742, -0.859796494212616, -0.2116660342236624]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.875449475108018, 0.334405906289409, 0.08321243768586052, 0.3388754883231179]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.4878954087431437, -0.201899911445109, -0.016443700876142255, 0.8490724943061776]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.809006993377334, -0.4511704605616954, 0.3107581234699541, 0.21303119227133527]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.2783061701232137, -0.37155930333092624, 0.2983006011383234, 0.833970090075238]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.8685487200401724, 0.4286175969913296, 0.2073677875225473, -0.13750882576751258]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.8559566148691011, 0.23856401969856064, 0.39423286552950637, 0.23453342982075753]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.1756511736975092, 0.07342062889304078, -0.04772989392115008, -0.9805498119207986]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.7200508938250222, 0.6735134759580867, -0.1233849919850085, 0.11261639204619212]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.047335400154722915, 0.49129103138311975, 0.525630527898618, -0.6928961181271857]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.28118642835330543, 0.5395929890335265, 0.40425497687514045, 0.6828993427786086]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.006026285215314257, -0.1679148292265234, -0.7479485565815042, -0.6421380308936511]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.334648430137024, 0.6496056109679386, -0.1394793624167455, 0.6682577989560725]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.7232075581792949, -0.28960085183792955, -0.6223046032924913, -0.07641436467093393]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.47299579296952254, -0.5670338162851795, -0.5015824290282452, 0.45073572957146774]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5759837103124865, 0.47483366659316206, 0.13338249877309968, -0.6519086312861638]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.2133016608721166, 0.8062208250934307, -0.14645674169152062, 0.5320345904807013]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.7863833344402563, 0.15848713668741257, 0.5963350020823727, 0.02945579927053303]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.2759341654421687, -0.6656009677995011, 0.632033964698132, -0.2852520910949854]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.3400173283191303, 0.2790322396525497, 0.05686903943434476, -0.8962673362513095]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.3090337373688507, -0.6179184060817985, -0.40306280271429823, -0.6001794478831014]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.48435626950922916, 0.11609254154182697, 0.8072509012091782, 0.31665045157465316]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.9341912300459765, 0.06381865157465592, -0.2688666295423878, 0.22566493067132626]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.3246762949389304, -0.8214600528123802, 0.1647217509197912, -0.43892531245318767]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.22010536155962523, 0.3952675899243737, -0.4188983380967744, 0.787300034616946]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.4751050223053463, -0.4218758221556333, 0.4821369300658099, -0.6031915028641082]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.880861720439117, 0.09303992127699898, 0.06428592081503388, 0.459666752004941]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.017063839192766467, -0.6261860403002049, 0.7746195154331581, 0.0869739882680612]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.8252329561137333, 0.43850926617938535, -0.16721886267130043, 0.314226102648273]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.4088699582548411, 0.5235534931618994, 0.2277666883750278, -0.7119265641211392]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.31369184472576933, -0.5429805343259477, -0.5533576236189442, -0.5482380014906362]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.8207922579932034, -0.40913772106857016, -0.29054259084664685, 0.2729311219362013]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.39996686955088523, 0.8073277952554248, -0.42163315248684, 0.10234167769627939]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.14522555946678525, -0.9642883914638805, -0.07079650136982708, -0.20986969852590256]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.8609444342657742, -0.4171158046302133, 0.08690127066297638, -0.2779159149664443]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.09931399908465133, 0.16026167862873547, -0.3511391996430844, 0.9171445831617433]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.6587918595877198, 0.6189906598816806, 0.0005033162297445391, 0.42760214615103187]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.7412785017238798, -0.6379030203895805, -0.20813887288112973, -0.016252047736315157]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5032998395625615, -0.8189944544199759, -0.2752734056777696, 0.012724278061564797]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.30815895127983317, 0.20282878988385175, 0.8579906660791383, -0.3574221029279561]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.0912817179686122, 0.5543695707221443, -0.21745503821012058, 0.7981574615193918]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.718183481882936, 0.6611923783626078, 0.21674094418893908, 0.007777419738431369]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.641563954107516, 0.47603559168775506, 0.3154268571613459, 0.512144223844938]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.8439024683820513, 0.43153248029761754, -0.2652577072450959, -0.1767673359360896]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.17482457972766288, 0.13632980653604765, -0.729153335123429, -0.6474457228612067]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.5462682331321344, -0.6419412420912892, 0.5193526292629735, -0.14062469786856494]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.06193959356412827, 0.9446609987066811, 0.2955015499517284, 0.12828841821354212]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.13005379758833394, -0.4761566918831448, -0.8677539374042601, -0.0579992985057245]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.12401013449245081, -0.9269166108137696, 0.1869992698940139, -0.30079620376558064]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.6368058430024911, 0.28319472159332215, 0.09883070908659818, -0.7102897710941695]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.7479222172438762, 0.5613955239110566, -0.3036337525818155, -0.18235670258786588]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.13628779568798424, -0.7300975764648174, 0.27927071064003745, -0.6085975975678171]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.24072388217536397, -0.41900940030067935, -0.16600482052691715, 0.859607779497087]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.75515292090621, 0.08155675624188279, -0.050775397210192544, 0.6484708324946223]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.6714109994800408, 0.44985122714627734, -0.39700997413825245, -0.4349991076392517]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.42120801893902454, -0.5534446724220495, -0.5021395923844388, 0.5139441887103136]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.021268573686443606, 0.024774237164421335, -0.3057203971540149, -0.9515613084348569]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.7264452778402825, -0.06307246428220294, -0.667017211813705, -0.15292861634499988]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.23746818259636918, 0.6362552151914914, 0.7106717442450251, -0.18366773077418935]
v: 1.0
phase: Aluminum
homogenization: SX
- constituents:
- O: [0.24869738401636882, 0.6772930680861174, -0.5511240766607762, 0.4191490942740014]
v: 1.0
phase: Aluminum
homogenization: SX

View File

@ -0,0 +1,421 @@
$MeshFormat
4.1 0 8
$EndMeshFormat
$Entities
8 12 6 1
1 0 0 0 0
2 1 0 0 0
3 1 1 0 0
4 0 1 0 0
5 0 0 1 0
6 0 1 1 0
7 1 1 1 0
8 1 0 1 0
1 0 0 0 0 0 1 0 2 1 -5
2 0 0 1 0 1 1 0 2 5 -6
3 0 1 0 0 1 1 0 2 6 -4
4 0 0 0 0 1 0 0 2 4 -1
5 1 1 0 1 1 1 0 2 3 -7
6 1 0 1 1 1 1 0 2 7 -8
7 1 0 0 1 0 1 0 2 8 -2
8 1 0 0 1 1 0 0 2 2 -3
9 0 0 1 1 0 1 0 2 8 -5
10 0 0 0 1 0 0 0 2 1 -2
11 0 1 1 1 1 1 0 2 6 -7
12 0 1 0 1 1 0 0 2 3 -4
1 0 0 0 0 1 1 1 1 4 1 2 3 4
2 1 0 0 1 1 1 1 2 4 5 6 7 8
3 0 0 0 1 0 1 1 3 4 -7 9 -1 10
4 0 1 0 1 1 1 1 4 4 11 -5 12 -3
5 0 0 0 1 1 0 1 5 4 -12 -8 -10 -4
6 0 0 1 1 1 1 1 6 4 -6 -11 -2 -9
1 0 0 0 1 1 1 1 1 6 1 2 3 4 5 6
$EndEntities
$Nodes
27 58 1 58
0 1 0 1
1
0 0 0
0 2 0 1
2
1 0 0
0 3 0 1
3
1 1 0
0 4 0 1
4
0 1 0
0 5 0 1
5
0 0 1
0 6 0 1
6
0 1 1
0 7 0 1
7
1 1 1
0 8 0 1
8
1 0 1
1 1 0 2
9
10
0 0 0.333333333332501
0 0 0.6666666666657874
1 2 0 2
11
12
0 0.333333333332501 1
0 0.6666666666657874 1
1 3 0 2
13
14
0 1 0.6666666666675918
0 1 0.3333333333347207
1 4 0 2
15
16
0 0.6666666666675918 0
0 0.3333333333347207 0
1 5 0 2
17
18
1 1 0.333333333332501
1 1 0.6666666666657874
1 6 0 2
19
20
1 0.6666666666675918 1
1 0.3333333333347207 1
1 7 0 2
21
22
1 0 0.6666666666675918
1 0 0.3333333333347207
1 8 0 2
23
24
1 0.333333333332501 0
1 0.6666666666657874 0
1 9 0 2
25
26
0.6666666666675918 0 1
0.3333333333347207 0 1
1 10 0 2
27
28
0.333333333332501 0 0
0.6666666666657874 0 0
1 11 0 2
29
30
0.333333333332501 1 1
0.6666666666657874 1 1
1 12 0 2
31
32
0.6666666666675918 1 0
0.3333333333347207 1 0
2 1 0 4
33
34
35
36
0 0.3333333333339809 0.3333333333332409
0 0.6666666666669903 0.3333333333339808
0 0.3333333333332409 0.666666666666389
0 0.666666666666389 0.6666666666669903
2 2 0 4
37
38
39
40
1 0.666666666666389 0.3333333333332409
1 0.3333333333332409 0.3333333333339808
1 0.6666666666669903 0.666666666666389
1 0.3333333333339809 0.6666666666669903
2 3 0 4
41
42
43
44
0.6666666666669903 0 0.6666666666669905
0.3333333333339809 0 0.666666666666389
0.666666666666389 0 0.3333333333339809
0.3333333333332409 0 0.3333333333332409
2 4 0 4
45
46
47
48
0.3333333333332409 1 0.6666666666669903
0.3333333333339808 1 0.3333333333339809
0.666666666666389 1 0.666666666666389
0.6666666666669903 1 0.3333333333332409
2 5 0 4
49
50
51
52
0.6666666666669905 0.666666666666389 0
0.666666666666389 0.3333333333332409 0
0.3333333333339809 0.6666666666669903 0
0.3333333333332409 0.3333333333339809 0
2 6 0 4
53
54
55
56
0.666666666666389 0.6666666666669905 1
0.3333333333332409 0.666666666666389 1
0.6666666666669903 0.3333333333339809 1
0.3333333333339809 0.3333333333332409 1
3 1 0 2
57
58
0.1111111111109364 0.8333333333329824 0.8888888888891177
0.4999999999997687 0.5000000000000693 0.5000000000001156
$EndNodes
$Elements
7 232 1 232
2 1 2 18
1 1 9 16
2 4 34 14
3 15 34 4
4 10 5 35
5 35 5 11
6 13 12 6
7 9 10 33
8 16 9 33
9 33 10 35
10 36 11 12
11 35 11 36
12 36 12 13
13 14 36 13
14 34 36 14
15 16 33 15
16 15 33 34
17 33 35 34
18 34 35 36
2 2 2 18
19 2 38 22
20 23 38 2
21 3 17 24
22 18 7 39
23 39 7 19
24 21 20 8
25 17 18 37
26 24 17 37
27 37 18 39
28 40 19 20
29 39 19 40
30 40 20 21
31 22 40 21
32 38 40 22
33 24 37 23
34 23 37 38
35 37 39 38
36 38 39 40
2 3 2 18
37 9 1 27
38 22 43 2
39 43 28 2
40 5 10 42
41 26 5 42
42 8 25 21
43 10 9 44
44 44 9 27
45 42 10 44
46 21 41 22
47 25 41 21
48 41 43 22
49 25 26 41
50 26 42 41
51 44 27 28
52 43 44 28
53 41 42 43
54 42 44 43
2 4 2 18
55 31 17 3
56 14 46 4
57 4 46 32
58 6 29 13
59 47 7 18
60 30 7 47
61 13 45 14
62 13 29 45
63 14 45 46
64 48 18 17
65 48 17 31
66 47 18 48
67 29 30 45
68 45 30 47
69 32 48 31
70 46 48 32
71 45 47 46
72 46 47 48
2 5 2 18
73 27 1 16
74 23 2 50
75 2 28 50
76 3 24 31
77 51 15 4
78 32 51 4
79 52 16 15
80 51 52 15
81 52 27 16
82 24 23 49
83 23 50 49
84 24 49 31
85 28 27 52
86 50 28 52
87 31 49 32
88 49 51 32
89 49 50 51
90 50 52 51
2 6 2 18
91 11 5 26
92 6 12 54
93 29 6 54
94 7 30 19
95 20 55 8
96 55 25 8
97 12 11 56
98 56 11 26
99 54 12 56
100 19 53 20
101 30 53 19
102 53 55 20
103 56 26 25
104 55 56 25
105 30 29 53
106 29 54 53
107 53 54 55
108 54 56 55
3 1 4 124
109 54 12 6 57
110 29 54 6 57
111 6 12 13 57
112 13 12 36 57
113 40 43 41 58
114 44 50 52 58
115 48 37 39 58
116 47 48 39 58
117 56 55 41 58
118 51 49 48 58
119 44 33 35 58
120 54 45 53 58
121 50 44 43 58
122 53 39 40 58
123 49 50 38 58
124 56 41 42 58
125 53 45 47 58
126 49 38 37 58
127 55 53 40 58
128 38 43 40 58
129 35 42 44 58
130 45 36 46 58
131 34 33 52 58
132 48 46 51 58
133 34 52 51 58
134 36 54 56 58
135 36 56 35 58
136 36 34 46 58
137 41 55 40 58
138 48 49 37 58
139 44 52 33 58
140 36 45 54 58
141 53 47 39 58
142 50 43 38 58
143 35 56 42 58
144 46 34 51 58
145 31 3 17 24
146 9 27 1 16
147 40 39 38 58
148 37 38 39 58
149 52 50 51 58
150 51 50 49 58
151 55 56 54 58
152 54 53 55 58
153 35 33 34 58
154 36 35 34 58
155 41 43 42 58
156 42 43 44 58
157 46 48 47 58
158 46 47 45 58
159 6 13 29 57
160 51 4 34 32
161 46 32 51 34
162 22 41 40 43
163 46 4 32 34
164 19 53 30 39
165 4 51 34 15
166 23 38 50 2
167 36 46 14 45
168 7 19 30 39
169 30 53 47 39
170 7 47 39 30
171 33 15 52 16
172 24 37 49 23
173 22 43 40 38
174 46 36 14 34
175 12 36 54 56
176 15 33 52 34
177 28 52 44 50
178 10 44 33 35
179 50 38 43 2
180 52 15 34 51
181 36 11 56 12
182 51 32 48 49
183 9 52 33 44
184 36 11 35 56
185 55 21 41 40
186 37 39 18 48
187 38 49 23 50
188 19 40 53 39
189 28 50 44 43
190 35 10 44 42
191 39 47 18 48
192 9 52 44 27
193 55 21 25 41
194 43 28 50 2
195 35 5 10 42
196 25 41 56 55
197 37 48 17 31
198 49 38 23 37
199 37 48 31 49
200 46 14 4 34
201 26 41 56 25
202 45 29 53 30
203 47 7 39 18
204 40 19 53 20
205 42 35 11 56
206 51 32 46 48
207 22 43 38 2
208 45 29 54 53
209 30 53 45 47
210 20 40 55 53
211 11 26 42 56
212 41 22 40 21
213 52 9 33 16
214 14 36 45 13
215 31 48 32 49
216 41 26 56 42
217 9 44 33 10
218 52 28 44 27
219 35 5 42 11
220 31 17 37 24
221 9 52 27 16
222 49 31 37 24
223 26 11 42 5
224 20 21 55 40
225 8 55 21 25
226 48 18 37 17
227 55 8 21 20
228 36 12 54 57
229 54 57 45 36
230 54 45 57 29
231 13 45 57 36
232 13 57 45 29
$EndElements

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,22 @@
---
loadstep:
- boundary_conditions:
mechanical:
- dot_u: ['x', -0.025, 'x']
tag: 3
- dot_u: [0.0, 0.0, 0.0]
tag: 4
discretization:
t: 0.0005
N: 1
f_out: 1
- boundary_conditions:
mechanical:
- dot_u: ['x', -0.025, 'x']
tag: 3
- dot_u: [0.0, 0.0, 0.0]
tag: 4
discretization:
t: 1.0
N: 10
f_out: 2

View File

@ -1,13 +0,0 @@
#initial elastic step
$Loadcase 1 t 0.0005 N 1 f_out 5
Face 1 X 0.01
Face 2 X 0.0
Face 2 Y 0.0
Face 2 Z 0.0
$EndLoadcase
$Loadcase 2 t 10.0 N 200 f_out 5
Face 1 X 0.01
Face 2 X 0.0
Face 2 Y 0.0
Face 2 Z 0.0
$EndLoadcase

View File

@ -0,0 +1,22 @@
---
loadstep:
- boundary_conditions:
mechanical:
- dot_u: ['x', 'x', 0.01]
tag: 1
- dot_u: [0.0, 0.0, 0.0]
tag: 2
discretization:
t: 0.0005
N: 1
f_out: 1
- boundary_conditions:
mechanical:
- dot_u: ['x', 'x', 0.01]
tag: 1
- dot_u: [0.0, 0.0, 0.0]
tag: 2
discretization:
t: 1.0
N: 10
f_out: 2

View File

@ -0,0 +1,22 @@
---
loadstep:
- boundary_conditions:
mechanical:
- dot_u: [0.0, 0.0, 0.0]
tag: 1
- dot_u: [0.0, 0.0, 0.0025]
tag: 2
discretization:
t: 0.0005
N: 1
f_out: 1
- boundary_conditions:
mechanical:
- dot_u: [0.0, 0.0, 0.0]
tag: 1
- dot_u: [0.0, 0.0, 0.0025]
tag: 2
discretization:
t: 1.0
N: 10
f_out: 2

View File

@ -46,7 +46,7 @@
+ +
+# determine DAMASK version +# determine DAMASK version
+if test -n "$DAMASK_USER"; then +if test -n "$DAMASK_USER"; then
+ DAMASKROOT=`dirname $DAMASK_USER`/.. + DAMASKROOT=`dirname $DAMASK_USER`/../..
+ read DAMASKVERSION < $DAMASKROOT/VERSION + read DAMASKVERSION < $DAMASKROOT/VERSION
+ DAMASKVERSION="'"$DAMASKVERSION"'" + DAMASKVERSION="'"$DAMASKVERSION"'"
+else +else

View File

@ -251,7 +251,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -251,7 +251,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -251,7 +251,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -66,7 +66,7 @@
+ label { + label {
+ position -32 +6 + position -32 +6
+ size 12 6 + size 12 6
+ text "O2 / OpenMP" + text "O3 / OpenMP"
+ border_width 1 + border_width 1
+ border_color black + border_color black
+ } + }

View File

@ -46,7 +46,7 @@
+ +
+# determine DAMASK version +# determine DAMASK version
+if test -n "$DAMASK_USER"; then +if test -n "$DAMASK_USER"; then
+ DAMASKROOT=`dirname $DAMASK_USER`/.. + DAMASKROOT=`dirname $DAMASK_USER`/../..
+ read DAMASKVERSION < $DAMASKROOT/VERSION + read DAMASKVERSION < $DAMASKROOT/VERSION
+ DAMASKVERSION="'"$DAMASKVERSION"'" + DAMASKVERSION="'"$DAMASKVERSION"'"
+else +else

View File

@ -284,7 +284,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -284,7 +284,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -284,7 +284,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -65,7 +65,7 @@
+ label { + label {
+ position -32 +6 + position -32 +6
+ size 12 6 + size 12 6
+ text "O2 / OpenMP" + text "O3 / OpenMP"
+ border_width 1 + border_width 1
+ border_color black + border_color black
+ } + }

View File

@ -50,7 +50,7 @@
+# determine DAMASK version +# determine DAMASK version
+if test -n "$DAMASK_USER"; then +if test -n "$DAMASK_USER"; then
+ DAMASKROOT=`dirname $DAMASK_USER`/.. + DAMASKROOT=`dirname $DAMASK_USER`/../..
+ read DAMASKVERSION < $DAMASKROOT/VERSION + read DAMASKVERSION < $DAMASKROOT/VERSION
+ DAMASKVERSION="'"$DAMASKVERSION"'" + DAMASKVERSION="'"$DAMASKVERSION"'"
+else +else

View File

@ -283,7 +283,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -283,7 +283,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -301,7 +301,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

View File

@ -67,7 +67,7 @@
+ label { + label {
+ position -32 +6 + position -32 +6
+ size 12 6 + size 12 6
+ text "O2 / OpenMP" + text "O3 / OpenMP"
+ border_width 1 + border_width 1
+ border_color black + border_color black
+ } + }

View File

@ -40,7 +40,7 @@
+# determine DAMASK version +# determine DAMASK version
+if test -n "$DAMASK_USER"; then +if test -n "$DAMASK_USER"; then
+ DAMASKROOT=`dirname $DAMASK_USER`/.. + DAMASKROOT=`dirname $DAMASK_USER`/../..
+ read DAMASKVERSION < $DAMASKROOT/VERSION + read DAMASKVERSION < $DAMASKROOT/VERSION
+ DAMASKVERSION="'"$DAMASKVERSION"'" + DAMASKVERSION="'"$DAMASKVERSION"'"
+else +else

View File

@ -228,7 +228,7 @@
- usersub=$usersubname - usersub=$usersubname
- fi - fi
- -
+ userobj=$usermoext.o + userobj=$usernoext.o
fi fi
cat > $jid.runmarcscript << END4 cat > $jid.runmarcscript << END4
if test "$user" if test "$user"

Some files were not shown because too many files have changed in this diff Show More