Commit Graph

6083 Commits

Author SHA1 Message Date
Franz Roters f1aedf4bc3 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-04-27 09:07:50 +02:00
Test User 426f048916 [skip ci] updated version information after successful test of v2.0.1-633-gd35df1d 2017-04-27 09:02:01 +02:00
Franz Roters dd34f28cdb Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-04-27 08:22:08 +02:00
Philip Eisenlohr d35df1df49 Operate on MFD file to apply servo links, not client-server communication
Speed up by many orders of magnitude... 64 x 64 x 64 mesh less than a minute! Thanks Brendan!
2017-04-26 17:32:01 -04:00
Test User c8889e7408 [skip ci] updated version information after successful test of v2.0.1-631-g175e119 2017-04-26 21:47:45 +02:00
Franz Roters 7b2d901563 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-04-26 09:59:38 +02:00
Martin Diehl 175e119d7b new PETSc on matesting (inlcuding use of IMKL) 2017-04-26 09:41:25 +02:00
Martin Diehl c5f1574f47 commands depend on build type 2017-04-26 09:40:45 +02:00
Franz Roters 597ee589a5 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-04-25 12:44:03 +02:00
Martin Diehl 69dba834cb build type (and, hence openMP) was not set correctly 2017-04-25 12:35:19 +02:00
Martin Diehl a0af685883 compiler complained 2017-04-25 12:34:14 +02:00
Franz Roters 14aeff50ba Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-04-24 09:10:51 +02:00
Franz Roters 611b86da66 update temperature to FEM provided temperature only in case of thermal_condutcion, i.e. thermo-mechanical FEM simulation 2017-04-24 09:10:37 +02:00
Test User a64da06c43 [skip ci] updated version information after successful test of v2.0.1-626-gc10c58b 2017-04-20 19:17:45 +02:00
Martin Diehl c10c58bf44 first creating documentation, then doing commit 2017-04-20 08:26:09 +02:00
Test User d49286f548 [skip ci] updated version information after successful test of v2.0.1-624-g718f384 2017-04-20 07:56:20 +02:00
Martin Diehl 718f3841f8 Merge branch 'cmake' into development 2017-04-19 21:48:50 +02:00
Martin Diehl e65de75814 fixed pas (was still code) 2017-04-19 15:10:43 +02:00
Martin Diehl b2897210f9 source DAMASK_env.sh was missing 2017-04-19 10:50:07 +02:00
Martin Diehl cbaec8bcb9 was in wrong directory 2017-04-19 09:35:19 +02:00
Test User c97226a75f [skip ci] updated version information after successful test of v2.0.1-477-gf0f602e 2017-04-19 06:40:49 +02:00
Martin Diehl f0f602e1f5 confused merging strategies 2017-04-18 15:18:23 +02:00
Martin Diehl bffccca628 address changed a while ago 2017-04-18 15:17:37 +02:00
Test User 2e173fbddd [skip ci] Merge branch 'master' into development 2017-04-18 14:42:03 +02:00
Test User 7986ae66bc Merge commit 'v2.0.1-473-gc5c2c19' 2017-04-18 14:41:59 +02:00
Test User c5c2c19a2f [skip ci] updated version information after successful test of v2.0.1-472-g1768d8f 2017-04-18 14:41:58 +02:00
Martin Diehl 7cb2669648 sytaycheck only target was not working 2017-04-18 07:38:36 +02:00
Martin Diehl d4c1482690 syntax check not for debug 2017-04-18 07:14:55 +02:00
Martin Diehl 2c28d059b5 Merge branch 'development' into PRIVATEasSubmodule 2017-04-18 05:42:27 +02:00
Martin Diehl 1768d8f103 update of VERSION file should not trigger new GitLabCI 2017-04-18 05:37:36 +02:00
Martin Diehl 32722a3d77 adopting to new installation and test 2017-04-18 05:29:00 +02:00
Test User 9a18d994a5 Merge branch 'master' into development 2017-04-17 14:56:25 +02:00
Test User cd04a9f75d Merge commit 'v2.0.1-467-g1dd36c6' 2017-04-17 14:56:22 +02:00
Test User 1dd36c6e28 [skip ci] updated version information after successful test of v2.0.1-466-gde48d54 2017-04-17 14:56:22 +02:00
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