Commit Graph

6762 Commits

Author SHA1 Message Date
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
Test User e06b9e778c updated version information after successful test of v2.0.0-199-gaae41e0 2016-04-26 16:13:28 +02:00
Test User a616f06fc4 Merge branch 'development' 2016-04-26 11:21:34 +02:00
Test User fba8741376 updated version information after successful test of v2.0.0-196-g1940b8d 2016-04-26 11:21:34 +02:00
Martin Diehl aae41e0479 external lapack functions marked as external 2016-04-26 09:36:27 +02:00
Martin Diehl f8e50cc304 fixed some missing "sum" initialisers, prepared more self consistent variable definitions for future use
(ifort > 15.0)
2016-04-26 09:35:42 +02:00
Martin Diehl 33b8360ebb ifort 15.0 is not capable of simple definition 2016-04-26 08:11:55 +02:00
Martin Diehl 1940b8d691 results should not be part of the repository 2016-04-26 07:29:41 +02:00
Test User 87deb4fc41 Merge branch 'development' 2016-04-26 00:13:01 +02:00
Test User 1e9679f8a8 updated version information after successful test of v2.0.0-194-g137a5d1 2016-04-26 00:13:01 +02:00
zhangc43 5e39d38a86 update formula for strain path modifier 2016-04-25 16:02:56 -04:00
zhangc43 b168317a17 modify fomular in pheno+ to remove dampping 2016-04-25 15:18:46 -04:00
zhangc43 bc4f04a1c5 Merge remote branch 'origin/development' into pheno+ 2016-04-25 14:16:56 -04:00
Martin Diehl 137a5d1d4b bugfix, misplaced if statement caused failing update of orienation 2016-04-25 20:13:59 +02:00
Philip Eisenlohr 0f0ca8cd71 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2016-04-25 10:24:30 -05:00
Philip Eisenlohr 36f41341ec Merge branch 'SimplifiedvtkRectilinear' into development 2016-04-25 10:23:50 -05:00
Philip Eisenlohr c67fbe7653 distinguished between singular and plural in remark 2016-04-25 10:23:08 -05:00
zhangc43 4eb45708a5 revert to old lattice.f90 file to suport ifrot v15.0 2016-04-25 09:55:50 -04:00
zhangc43 5fe177e43b remove build target for j2 2016-04-25 09:47:14 -04:00
zhangc43 e0f8699605 remove plastic_j2 2016-04-25 09:40:44 -04:00
zhangc43 7ed4ce859a remove obsolete geom_frombarucentric script for microstructure reconstruction 2016-04-25 09:24:05 -04:00
Martin Diehl c30c7714ad hickup, probably from merge 2016-04-25 14:11:27 +02:00
Martin Diehl 26e5f97ff3 missing comma 2016-04-25 13:22:34 +02:00