Commit Graph

6886 Commits

Author SHA1 Message Date
Martin Diehl 26b08bc21b Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-16 23:39:14 +02:00
Test User 2ea894dbbe [skip ci] updated version information after successful test of v2.0.2-374-g3e4f6598 2018-08-16 03:16:13 +02:00
Franz Roters 3e4f6598f4 Merge remote-tracking branch 'remotes/origin/35-new-style-of-reading-in-parameters-in-lattice' into development 2018-08-15 14:48:25 +02:00
Test User 6c4ae60030 [skip ci] updated version information after successful test of v2.0.2-357-g3fbc537b 2018-08-09 00:03:41 +02:00
Martin Diehl 3fbc537b7b avoid deadlock for master pipelines 2018-08-05 22:50:43 +02:00
Martin Diehl 80841adcbb support python 3 soon 2018-08-05 22:50:21 +02:00
Test User 784faafdd7 [skip ci] Merge branch 'master' into development 2018-08-05 22:35:23 +02:00
Test User 9f8325ab0e Merge commit 'v2.0.2-351-g8173b8ce' 2018-08-05 22:35:17 +02:00
Test User 8173b8ced1 [skip ci] updated version information after successful test of v2.0.2-350-g2be13b00 2018-08-05 22:35:17 +02:00
Test User 7f933025c7 [skip ci] Merge branch 'master' into development 2018-08-05 15:22:57 +02:00
Test User 686f0fe801 [skip ci] updated version information after successful test of v2.0.2-349-gd623d037 2018-08-05 15:22:24 +02:00
Martin Diehl 386c3e7797 Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-05 06:04:33 +02:00
Martin Diehl 2be13b0047 test that also works for new nonlocal 2018-08-05 06:02:33 +02:00
Martin Diehl 661636d83e default values needed to suppress error in case of missing key 2018-08-04 22:53:56 +02:00
Martin Diehl f522f79703 Merge branch 'development' into 35-new-style-of-reading-in-parameters-in-lattice 2018-08-04 22:42:14 +02:00
Martin Diehl d623d0379b resolved confusion of different branches in PRIVATE 2018-08-04 22:38:38 +02:00
Martin Diehl 6a4260ac07 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-04 22:29:52 +02:00
Test User fa0dff7ac8 [skip ci] updated version information after successful test of v2.0.2-282-gc05337a2 2018-08-04 21:51:25 +02:00
Martin Diehl 9360c171a1 polished for merge
access to array(n+m:) is safe for array of size n with m>1
2018-08-04 19:39:50 +02:00
Martin Diehl 20d1264d07 small improvements
default case of error handling, checking for recursion limit, some
comments to also understand it later
2018-08-04 13:58:01 +02:00
Martin Diehl 8c07825d7e Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-03 22:21:37 +02:00
Martin Diehl c05337a21b Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-03 22:09:34 +02:00
Test User eebff83252 [skip ci] updated version information after successful test of v2.0.2-263-gb305d913 2018-08-03 22:06:36 +02:00
Martin Diehl c8aa9ff3ef merge-related fixes 2018-08-03 19:30:36 +02:00
Martin Diehl 2da5d0029c Merge branch '19-NewStylePhenopowerlaw' into development 2018-08-03 18:50:53 +02:00
Martin Diehl f0645d84f5 not a target anymore 2018-08-03 15:10:38 +02:00
Martin Diehl 03e283e62c Merge branch '31_consistent_wd' into development 2018-08-03 15:01:47 +02:00
Martin Diehl b305d9133f avoid timeouts if Abaqus is used by someone else 2018-08-03 09:12:30 +02:00
Martin Diehl 38183fdbf6 Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-03 08:57:44 +02:00
Martin Diehl c2f9709567 leaner, most of it also supported by older gcc 2018-08-03 08:42:26 +02:00
Martin Diehl af931a78c7 finalizing reading in 2018-08-03 08:09:28 +02:00
Martin Diehl 68c476f690 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-03 07:56:02 +02:00
Martin Diehl 0a6bde70c5 Merge branch 'development' into 19-NewStylePhenopowerlaw 2018-08-03 06:56:43 +02:00
Martin Diehl 5d09e98e02 checking with Philip 2018-08-03 01:14:18 +02:00
Martin Diehl 3cceda5fe3 Merge branch 'development' into 31_consistent_wd 2018-08-03 00:08:16 +02:00
Martin Diehl 7283ee6caa using updated tests from PRIVATE/master 2018-08-01 09:29:01 +02:00
Test User e0a39d202c [skip ci] updated version information after successful test of v2.0.2-261-gbc3f6ae9 2018-08-01 07:12:12 +02:00
Pratheek Shanthraj bc3f6ae97c missing bits in getStrings function 2018-07-31 23:15:44 +02:00
Test User 2419deea8f [skip ci] updated version information after successful test of v2.0.2-259-g06a0128d 2018-07-30 22:31:50 +02:00
Martin Diehl 06a0128d91 no more aliases for c/a 2018-07-30 12:40:31 +02:00
Martin Diehl a908e66306 WIP: reading in new style 2018-07-30 11:58:59 +02:00
Test User c96081c99a [skip ci] updated version information after successful test of v2.0.2-257-gf9d8278c 2018-07-30 11:36:05 +02:00
Martin Diehl 7f0bf8c4cd Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-07-30 07:53:13 +02:00
Martin Diehl f9d8278ca6 using new test variant 2018-07-29 22:41:18 +02:00
Martin Diehl ed97afb51c WIP: inherent definition instead of check, using new reading in functionality 2018-07-29 21:18:04 +02:00
Martin Diehl 5eed7d06e9 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-07-29 20:29:55 +02:00
Test User 708e2e0ac5 [skip ci] updated version information after successful test of v2.0.2-255-g449449b5 2018-07-28 16:16:31 +02:00
Martin Diehl 449449b500 does the same as numpy.clip 2018-07-28 01:31:02 +02:00
Test User 5eff624d3f [skip ci] updated version information after successful test of v2.0.2-253-gce203ca7 2018-07-22 06:39:27 +02:00
Martin Diehl ce203ca75c [skip sc] merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-07-21 23:20:42 +02:00