Martin Diehl
|
c58dd6279d
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-17 05:51:04 +02:00 |
|
Martin Diehl
|
de48d54201
|
conflict occured after manual merge+push to master
|
2017-04-17 05:50:41 +02:00 |
|
Martin Diehl
|
a5f8c5ba32
|
Merge branch 'development' into cmake
|
2017-04-15 16:17:50 +02:00 |
|
Martin Diehl
|
b1248cfa77
|
simplified
|
2017-04-15 12:59:46 +02:00 |
|
Martin Diehl
|
a52010dff2
|
error during merge
|
2017-04-15 12:58:13 +02:00 |
|
Martin Diehl
|
8bee117401
|
corrected path
|
2017-04-15 12:55:13 +02:00 |
|
Martin Diehl
|
1344905c7e
|
typo
|
2017-04-15 12:45:11 +02:00 |
|
Martin Diehl
|
65985e3dd7
|
correct escape
|
2017-04-15 12:44:02 +02:00 |
|
Martin Diehl
|
d2b6fdd453
|
corrected path
|
2017-04-15 12:33:52 +02:00 |
|
Martin Diehl
|
cb4a1a0f81
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-15 12:27:13 +02:00 |
|
Martin Diehl
|
b792a5e22e
|
Merge branch 'development'
|
2017-04-15 12:08:37 +02:00 |
|
Martin Diehl
|
62dd57313e
|
queue for runners to retain order
|
2017-04-15 12:07:59 +02:00 |
|
Philip Eisenlohr
|
2b21d72c6b
|
Merge remote-tracking branch 'origin/development' into development
|
2017-04-14 15:07:52 -04:00 |
|
Philip Eisenlohr
|
c34716a0da
|
modern form of croaking, added '*draw_automatic' as final output
|
2017-04-14 15:07:43 -04:00 |
|
Martin Diehl
|
a46107ba7f
|
pull needed to avoid conflicts
|
2017-04-14 09:16:21 +02:00 |
|
Test User
|
b3066122dc
|
[skip ci] updated version information after successful test of v2.0.1-455-gae3a518
|
2017-04-14 08:46:11 +02:00 |
|
Philip Eisenlohr
|
4ffca8f0dc
|
check for erroneous total phase fraction
|
2017-04-13 19:01:42 -04:00 |
|
Philip Eisenlohr
|
d1c2e2114d
|
switch auto drawing back on at end of pipeline
|
2017-04-13 19:00:19 -04:00 |
|
Philip Eisenlohr
|
6114541dba
|
try unlimited heap and stack first
|
2017-04-13 18:59:52 -04:00 |
|
Martin Diehl
|
ae3a5187c0
|
syntax error
|
2017-04-13 21:35:46 +02:00 |
|
Martin Diehl
|
a2bbf1faaf
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-13 19:59:33 +02:00 |
|
Martin Diehl
|
45f192be09
|
safe in case of failing prepareAll
|
2017-04-13 19:56:52 +02:00 |
|
Martin Diehl
|
67d9fb386b
|
in-line code for better readability
|
2017-04-13 19:42:59 +02:00 |
|
Martin Diehl
|
b5275ad7b9
|
adjusted handling of PRIVATE for testing
|
2017-04-13 16:24:55 +02:00 |
|
Martin Diehl
|
f8ae4b8f20
|
Merge branch 'development' into PRIVATEasSubmodule
|
2017-04-13 16:17:17 +02:00 |
|
Martin Diehl
|
e5eea4caec
|
finished debugging, master and release will never be tested
|
2017-04-13 16:12:48 +02:00 |
|
Test User
|
2f77f086b5
|
Merge branch 'master' into development
|
2017-04-13 13:27:41 +02:00 |
|
Test User
|
d595ad5616
|
[skip ci] updated version information after successful test of v2.0.1-449-g3898995
|
2017-04-13 13:27:39 +02:00 |
|
Test User
|
3898995c74
|
Merge branch 'master' into development
|
2017-04-13 13:23:22 +02:00 |
|
Test User
|
73ce3c01b7
|
[skip ci] updated version information after successful test of v2.0.1-447-gbf7b4f2
|
2017-04-13 13:23:07 +02:00 |
|
Martin Diehl
|
bf7b4f2af5
|
debugging update procedure2
|
2017-04-13 13:21:38 +02:00 |
|
Martin Diehl
|
f1c6524c34
|
debugging update procedure
|
2017-04-13 13:07:38 +02:00 |
|
Martin Diehl
|
bdbbcdb908
|
parameters not needed
|
2017-04-13 13:02:55 +02:00 |
|
Martin Diehl
|
101913a944
|
rel tol of 0.0 useful when looking for absolute value only
|
2017-04-13 12:54:26 +02:00 |
|
Martin Diehl
|
95a982e002
|
default type for muliple arguments (not extend) is tuple, not list
|
2017-04-13 12:54:26 +02:00 |
|
Martin Diehl
|
dc387b4060
|
removed unused parameters. Why was shearbanding on in for HMs TWIP steel?
|
2017-04-13 12:54:26 +02:00 |
|
Martin Diehl
|
aaa41b8232
|
not needed anymore
|
2017-04-13 12:54:26 +02:00 |
|
Martin Diehl
|
97d19320ce
|
fixed .zsh script as well, checking out PRIVATE repo again
|
2017-04-13 08:20:30 +02:00 |
|
Martin Diehl
|
11a3d9c333
|
error in DAMASK_env.sh seems to be the reason
|
2017-04-13 08:15:01 +02:00 |
|
Martin Diehl
|
50b3523927
|
reverting
|
2017-04-13 08:11:40 +02:00 |
|
Martin Diehl
|
92ce58bcf1
|
trying non-NFS location
|
2017-04-13 08:09:07 +02:00 |
|
Martin Diehl
|
6d82566920
|
working around source statement
|
2017-04-13 07:55:37 +02:00 |
|
Martin Diehl
|
8f08c2e843
|
working around cd2
|
2017-04-13 07:50:53 +02:00 |
|
Martin Diehl
|
4d80f7f8ac
|
working around cd
|
2017-04-13 07:43:36 +02:00 |
|
Martin Diehl
|
1b71b098d4
|
debugging source statement2
|
2017-04-13 07:35:21 +02:00 |
|
Martin Diehl
|
75c3fff355
|
debugging source statement1
|
2017-04-13 07:31:57 +02:00 |
|
Martin Diehl
|
043d96f902
|
debugging source statement
|
2017-04-13 07:23:27 +02:00 |
|
Martin Diehl
|
f759dd0204
|
debugging source1
|
2017-04-13 07:20:56 +02:00 |
|
Martin Diehl
|
39732f0ad1
|
debugging source
|
2017-04-13 07:17:57 +02:00 |
|
Martin Diehl
|
53ba9f2497
|
still failing
|
2017-04-13 00:14:15 +02:00 |