Commit Graph

3131 Commits

Author SHA1 Message Date
Martin Diehl d86074829c Merge branch 'development' into cmake 2017-02-03 19:28:23 +01:00
Martin Diehl 21ad810209 changed to compile object files rather than libraries 2016-05-24 21:35:16 +02:00
Martin Diehl 0eb4c4867e build files should be ignored 2016-05-21 16:53:33 +02:00
Martin Diehl 13782f4ee0 simplified 2016-05-21 16:51:12 +02:00
Martin Diehl e3d8d48990 currently, only BUILD_CMD_TYPE release works 2016-05-21 15:19:21 +02:00
Martin Diehl 0810295fe9 Merge branch 'development' into cmake
Conflicts:
	code/Makefile
2016-05-21 14:56:57 +02:00
Martin Diehl 6023f64eff Merge branch 'cmake' of magit1.mpie.de:damask/DAMASK into cmake
Conflicts:
	CMakeLists.txt
2016-05-21 12:37:05 +02:00
Martin Diehl 475c864ea3 using different CMAKE projects for FEM/Spectral 2016-05-20 11:51:50 +02:00
Martin Diehl 8184f1c39a old Makefile is not needed anymore 2016-05-20 08:45:22 +02:00
Martin Diehl f4ddb0f9d2 was not doing anything 2016-05-20 08:09:06 +02:00
zhangc43 7c084f8bf5 lower strain path modifer to 3% 2016-05-03 10:38:04 -04: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 8ddb024df3 lower magnitude of strain path modifier 2016-04-27 08:38:22 -04:00
zhangc43 513e3543b0 fix merging conflict 2016-04-26 14:23:05 -04: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
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 4029346aed remove outdated code in comment 2016-04-21 14:07:20 -04:00
zhangc43 a99529b9b0 Merge remote branch 'origin/cmake' into pheno+ 2016-04-20 16:12:17 -04:00
zhangc43 3d0fe23919 tmp store before switch 2016-04-20 12:31:28 -04:00
Chen Zhang a7c4cdaa2f update cmake build system 2016-04-18 11:14:32 -04:00
Chen Zhang 672c8d0606 Merge remote branch 'origin/development' into cmake 2016-04-18 09:11:29 -04:00
Chen Zhang 610a54c048 remove options for building core module, which will be implemted in python 2016-03-14 17:49:36 -04:00
zhangc43 7aadfd56ca use options for future cross-platform support 2016-03-14 15:57:19 -04:00
Martin Diehl 1935d00e05 cleaned 2016-03-08 00:00:12 +01:00
Chen Zhang 81ac9aefa1 support special compile flags for single file 2016-03-04 17:32:26 -05:00
Chen Zhang e33594cb44 change code folder to src 2016-03-04 14:43:29 -05:00