Commit Graph

7334 Commits

Author SHA1 Message Date
Martin Diehl a21e8cd863 usind explicitly python2 to run in environments with python 3 as default 2016-05-11 11:01:39 +02:00
zhangc43 eaacde48ba Merge branch 'pheno+' into cmake 2016-05-06 18:26:22 -04:00
zhangc43 c6ddfae4e0 specify OPTIMIZATIO in makefile 2016-05-06 18:26:03 -04:00
zhangc43 89db00da0a change default optmizatio schem 2016-05-06 17:49:36 -04:00
Martin Diehl 8a9c5efbe7 working for ifort 2016-05-05 16:38:08 +02:00
Martin Diehl e0cc66950f fixed intent in/out 2016-05-05 15:47:15 +02:00
Martin Diehl 0c105658c3 simplifying 2016-05-05 15:11:28 +02:00
Martin Diehl ba0b278aca better name 2016-05-05 13:13:52 +02:00
Martin Diehl 6f8f2da2c0 Merge branch 'development' into CCodeUse 2016-05-05 12:57:07 +02:00
zhangc43 9fd8a72d05 Merge remote branch 'origin/development' into pheno+ 2016-05-04 10:24:35 -04:00
zhangc43 dbaea4838e Merge remote branch 'origin/development' into cmake 2016-05-04 10:24:10 -04:00
Franz Roters 2c43e9993f Merge branch 'StringASCIItable' into development 2016-05-04 15:37:28 +02:00
Test User 6447e0649e Merge branch 'development' 2016-05-04 04:13:22 +02:00
Test User 8b860a0b65 updated version information after successful test of v2.0.0-219-g297d5ca 2016-05-04 04:13:22 +02:00
Martin Diehl 1753d35e87 corrected subroutine description 2016-05-03 17:07:51 +02:00
Martin Diehl 3b673d23dc added code for solving heat equation 2016-05-03 17:06:55 +02:00
zhangc43 aaa08eecc1 Merge remote branch 'origin/development' into cmake 2016-05-03 10:39:43 -04:00
zhangc43 7c084f8bf5 lower strain path modifer to 3% 2016-05-03 10:38:04 -04:00
Test User e90c1b4f06 Merge branch 'development' 2016-05-03 16:12:52 +02:00
Test User 297d5caca0 updated version information after successful test of v2.0.0-218-g0c70c67 2016-05-03 16:12:52 +02:00
Test User 0c70c676f6 now having windows line endings 2016-05-03 09:22:48 +02:00
Test User b6bbfb3ab0 filter for windows line endings was not working 2016-05-03 09:20:51 +02:00
Test User 879d67f819 updated version information after successful test of v2.0.0-215-gc0b4bb6 2016-05-03 04:12:50 +02:00
zhangc43 1e176d20a4 Merge remote branch 'origin/development' into pheno+ 2016-05-02 09:52:17 -04:00
zhangc43 6c9ca73534 Merge remote branch 'origin/development' into cmake 2016-05-02 09:51:58 -04:00
Test User 455c3e5f44 Merge branch 'development' 2016-05-02 09:09:02 +02:00
Test User c0b4bb6b44 updated version information after successful test of v2.0.0-214-g6b57eec 2016-05-02 04:13:07 +02:00
Test User 6b57eece6a updated version information after successful test of v2.0.0-213-g9cae9b8 2016-05-01 16:13:51 +02:00
Test User 9cae9b895e updated version information after successful test of v2.0.0-212-g58d7005 2016-05-01 00:05:05 +02:00
Test User 58d7005547 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2016-04-29 16:13:51 +02:00
Test User 3aeda37a46 updated version information after successful test of v2.0.0-209-g79fac18 2016-04-29 16:13:50 +02:00
Martin Diehl f07f8e12ca don't change line endings for real windows files 2016-04-29 15:22:36 +02:00
Test User 79fac183e3 updated version information after successful test of v2.0.0-208-g5089d86 2016-04-29 11:50:19 +02:00
Test User 054d9710b5 Merge branch 'development'
Conflicts:
	VERSION
2016-04-29 08:03:07 +02:00
Philip Eisenlohr 5d4d78b079 expanded functionality to treat (white space-containing) strings and empty ("") data. 2016-04-28 23:11:06 -04:00
Philip Eisenlohr 5089d86b3d sorting labels are now optional. uses existing labels (from left to right) for sorting if none specified. 2016-04-28 20:28:45 -04:00
Philip Eisenlohr d3a7ceff15 fixed serious bug regarding wrong reshaping order (was 'C' now 'F') of 3dim to 1dim and back. 2016-04-28 13:25:46 -04:00
Test User b9021f3b3f updated version information after successful test of v2.0.0-205-gced4d9d 2016-04-28 16:13:52 +02:00
Test User ced4d9d393 updated version information after successful test of v2.0.0-204-g426658e 2016-04-28 04:14:08 +02:00
zhangc43 88cca87429 raise kappa_max to 4% 2016-04-27 15:48:27 -04:00
zhangc43 ab4ec134df reduce push up to 2% 2016-04-27 14:39:35 -04:00
zhangc43 c8f85453d2 Merge remote branch 'origin/development' into cmake 2016-04-27 09:35:20 -04:00
zhangc43 cf5a52be22 Merge remote branch 'origin/development' into pheno+ 2016-04-27 09:34:56 -04:00
Philip Eisenlohr 426658eb36 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2016-04-27 09:28:51 -04:00
Philip Eisenlohr b3e9877058 changed from "coords" to "pos"
remind user about (creating a new) nodal output file
2016-04-27 09:28:43 -04:00
zhangc43 8ddb024df3 lower magnitude of strain path modifier 2016-04-27 08:38:22 -04:00
Test User 02021b9bb0 updated version information after successful test of v2.0.0-201-gd497503 2016-04-27 04:13:14 +02:00
Martin Diehl d497503411 renamed options.coords/options.coordinates consistently to options.pos 2016-04-26 22:49:58 +02:00
zhangc43 3a561c9a8d remove obsolete j2 module 2016-04-26 14:24:43 -04:00
zhangc43 513e3543b0 fix merging conflict 2016-04-26 14:23:05 -04:00