Commit Graph

2801 Commits

Author SHA1 Message Date
Martin Diehl 6b1c1af609 no early return required here 2018-02-21 08:55:33 +01:00
Martin Diehl 051f3592ea Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-02-21 07:53:00 +01:00
Philip Eisenlohr ad1179117d modified meaning of restart increment to "restart from" instead of "restart at" 2018-02-16 16:41:07 -05:00
Philip Eisenlohr 0a763ff116 included changes to correct cutback issue of spectral solver 2018-02-16 09:36:18 -05:00
Martin Diehl 9b1e72e7bc more sensible cutoff for scatter 2018-02-15 11:26:19 +01:00
Martin Diehl 230ffe8f35 Bessel functions for Gaussian scatter 2018-02-14 13:03:50 +01:00
Martin Diehl c544fa1b34 typo, cause wrong finalization sequence 2018-02-12 15:03:35 +01:00
Martin Diehl fe07a34c69 source code should not be executable 2018-02-12 12:42:18 +01:00
Martin Diehl 4e62d7793a more detailed comments 2018-02-12 11:46:01 +01:00
Martin Diehl b6abbfca9d early return not needed here 2018-02-12 11:45:42 +01:00
Martin Diehl 2254746177 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-02-12 11:23:05 +01:00
Zhuowen Zhao 7f487bb77b merge development into kinematic hardening branch 2018-02-07 11:30:57 -05:00
Fengbo Han 208c4affa4 using math_equivStrain33 and math_equivStress33 instead of Mises 2018-02-07 17:11:43 +01:00
Fengbo Han b834b2a00d removed unnecessary lines 2018-02-07 13:37:26 +01:00
Fengbo Han 9249e7db2b Merge branch 'development' into HMS 2018-02-07 11:44:17 +01:00
Fengbo Han 190a2baf9f when using yield stop criteria, if rotation of the load frame is specified, the output results in .yield and .stressstrain files are also rotated 2018-02-07 11:35:16 +01:00
Martin Diehl b455fcd0a3 acos has the same limits/stability as indirect asin calculation, enforing limits directly instead of scaling 2018-02-03 09:21:19 +01:00
Martin Diehl 9908734710 wrong random number, simplified 2018-02-03 09:04:49 +01:00
Martin Diehl ba6fd70654 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-02-03 09:02:20 +01:00
Franz Roters d80a255736 new Marc2017 file format finally working! 2018-02-02 15:06:13 +01:00
Martin Diehl d80e15bd76 compiler_options and compiler_version supported by new Intel compiler 2018-02-02 12:36:09 +01:00
Zhuowen Zhao 700edc313f Merge remote-tracking branch 'origin/spectralSolver-cutbackfix' into 3-adding-plastic-constitutive-law-with-kinematic-hardening 2018-01-18 18:18:34 -05:00
Philip Eisenlohr 307aa7e7d1 fixed forgotten file writing of F_aimDot 2018-01-18 18:16:16 -05:00
Zhuowen Zhao 7c755a0241 Merge remote-tracking branch 'origin/spectralSolver-cutbackfix' into 3-adding-plastic-constitutive-law-with-kinematic-hardening 2018-01-18 13:59:42 -05:00
Philip Eisenlohr b36151cc32 fixing spectral cutback hiccup and multiple cleanups
flush(6) at better places, added dedicated CPFEM_age subroutine, cleaned up cutback logic, fixed broken assignment of old timeinc, continueCalculation is now a logical, rearrnaged interfaces for utilities_constitutiveResponse and utilities_calculateRate, handling of stressBC more understandable, added more comments and explanations
2018-01-18 11:14:06 -05:00
Philip Eisenlohr 93073ed661 summarized multiple logicals into one 2018-01-18 10:47:52 -05:00
Franz Roters 2c4df2f070 working further on Marc2017 compatibility 2018-01-11 17:11:03 +01:00
Franz Roters 7149f9599f changes towards supporting new Marc2017 input file format
still not working
2018-01-10 17:13:25 +01:00
Zhuowen Zhao bc9c647aad assign outputID type to undifined 2018-01-09 17:25:16 -05:00
Zhuowen Zhao 8837656870 added "plastic_kinematichardeing.f90" to commercialFEM_fileList
Changed outputID type
2018-01-09 15:17:51 -05:00
ChuanlaiLiu e02a0d32be debug corrected index for stiffness tensor, phase not instance 2017-12-19 12:59:10 +08:00
Zhuowen Zhao 14c0503a7e change tag to all lowercase; make pheno hardeing only depend on its own system 2017-12-14 16:51:58 -05:00
Zhuowen Zhao dcf9e139d0 question marks on those files 2017-12-13 19:18:45 -05:00
Fengbo Han d81870dc57 output the stress-strain curve to file if yield stop criterion is used 2017-11-22 09:02:35 +01:00
Fengbo Han 2b5a536458 calculate stress and strain from the average PK stress and average deformation gradient of the whole RVE 2017-11-22 08:52:48 +01:00
Martin Diehl 8d705522ea output already disabled for worldrank !=0 2017-11-21 15:10:48 +01:00
Martin Diehl 09a66d918d (in)equality comparison for double was far too tolerant 2017-11-21 09:24:25 +01:00
Martin Diehl 37e154de65 preventing division by zero 2017-11-20 23:43:06 +01:00
Martin Diehl c81a438546 SCHMID-BOAS notation for reference 2017-11-18 22:39:13 +01:00
Zhuowen Zhao 2b8baa2f01 fixed backstress rate of change based on its own slip system evolution and its sense 2017-11-14 12:25:55 -05:00
Philip Eisenlohr e4700cda25 changed fixed_seed to random_seed for clarity 2017-11-07 14:56:28 -05:00
Zhuowen Zhao 2caf8b7ffd delete extra variable 2017-11-06 22:10:04 -05:00
Zhuowen Zhao ab11830e71 Merge branch '6-debug-replaces-openmp-preprocessor-switch' into 3-adding-plastic-constitutive-law-with-kinematic-hardening 2017-11-06 18:20:51 -05:00
Zhuowen Zhao 566cf3d855 Merge branch 'development' into 3-adding-plastic-constitutive-law-with-kinematic-hardening 2017-11-06 18:11:47 -05:00
Zhuowen Zhao 2b4a024671 renamed "tau0" to "crss0" 2017-11-06 18:11:02 -05:00
Zhuowen Zhao 23f9f03ca8 refined debug output 2017-11-06 18:09:04 -05:00
Philip Eisenlohr 426b2d0537 Merge branch 'development' into 6-debug-replaces-openmp-preprocessor-switch 2017-11-06 11:39:58 -05:00
Fengbo Han d599aec37f Merge branch 'development' into HMS 2017-10-24 11:24:54 +02:00
Fengbo Han 82758bd90f added yield criterion of facet potential 2017-10-24 11:15:34 +02:00
Martin Diehl 1c2af7bbc6 phenoplus has own brach, titanmod was not used for a long time 2017-10-08 13:41:54 +02:00
Martin Diehl eda8c24b7d Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-10-07 17:24:59 +02:00
Martin Diehl e32b9d9ca8 for comparison with de-facto stardard rotation definitions 2017-10-07 13:18:42 +02:00
Franz Roters 14bf4d5c7b added Marc 2017 link 2017-10-05 17:57:21 +02:00
Martin Diehl e9440ccd6f suppress warning when compiling with gfortran 2017-10-05 16:35:34 +02:00
Franz Roters 5011e201d6 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-10-04 17:18:57 +02:00
Franz Roters 4d4a546e2d hot fix for so far non-supported input file format of Marc 2017 2017-10-04 17:18:06 +02:00
Zhuowen Zhao 2f5d81e111 beautified debug output 2017-10-03 17:18:34 -04:00
Philip Eisenlohr 483ed745e0 replaced #ifndef _OPENMP with #ifdef DEBUG to trigger inclusion of parallelized debug statements; fixed minor bugs in debug output 2017-10-03 09:20:53 -04:00
Philip Eisenlohr 05bb3c109c Merge branch '5-flexible-dot-delta-state-relation' into 'development'
added offsetDeltaState to type-definition and respect this when applying deltaState

Closes #5

See merge request !15
2017-10-03 14:09:20 +02:00
Zhuowen Zhao 7d6d822ee0 Merge branch '5-flexible-dot-delta-state-relation' into 3-adding-plastic-constitutive-law-with-kinematic-hardening 2017-09-29 18:46:35 -04:00
Zhuowen Zhao b66a9a3527 Merge remote-tracking branch 'origin/development' into development 2017-09-29 18:40:00 -04:00
Zhuowen Zhao 81bcc72993 first shot at kinematic hardening constitutive law 2017-09-29 18:36:28 -04:00
Zhuowen Zhao d6cf3c4dd4 reduced size of aTolState from sizeState to sizeDotState
asb tolerance check is only meaningful for the state part affected by dotState
2017-09-29 18:35:36 -04:00
Zhuowen Zhao a153443239 clarified comment 2017-09-29 18:34:18 -04:00
Zhuowen Zhao fb4aadbafa moved deltaState to group of contigous memory pointers 2017-09-29 18:33:39 -04:00
Zhuowen Zhao 80bed8b8aa improved math_expand algorithm 2017-09-29 18:32:52 -04:00
Zhuowen Zhao f3292507b5 added more debugging messages and switched to DEBUG as flag 2017-09-29 18:32:07 -04:00
Philip Eisenlohr f5816a643d added offsetDeltaState to type-definition and respect this when applying deltaState 2017-09-29 17:44:10 -04:00
Martin Diehl e1bfde94f9 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-09-19 23:40:10 +02:00
Martin Diehl d8d42c32e7 cleaned + shortened, fixed handling of optional order parameter in math_exp33 2017-09-19 23:39:19 +02:00
Philip Eisenlohr 67ac5c7b84 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2017-09-19 08:13:08 -04:00
Philip Eisenlohr 330906d08f removed unneccesary detail from general error message, now caller gives specifics 2017-09-19 08:11:57 -04:00
Zhuowen Zhao 56f7836bf8 clarified composition of overall sizeState 2017-09-18 19:42:27 -04:00
Zhuowen Zhao ae868d3ada only one error for math_check; new "math_expand('what' by 'how')" 2017-09-14 15:25:22 -04:00
Martin Diehl f0d8d7c50a bug in eigenvalue calculation, caused wrong eigenvectors for sym33 matrices. Credits to Duancheng Ma 2017-09-06 16:20:24 +02:00
Philip Eisenlohr adc7c9d5b1 removed executable bit 2017-08-28 13:55:12 -04:00
Martin Diehl 7e0a9b75f9 simplified prime fuction 2017-08-12 06:35:44 +02:00
Martin Diehl cf6894442b moved specific functions into the scope of the calling functions 2017-08-12 06:03:40 +02:00
Martin Diehl 9823f5f495 one time used variables with name a and x to not help, assignement of i and j via loop is safe 2017-08-12 04:51:10 +02:00
Fengbo Han 0750f7fd01 fixed plastic work calculation 2017-08-10 15:40:18 +02:00
Fengbo Han 36c370e668 implemented fast yield surface fitting with yield stop criteria 2017-08-08 17:25:38 +02:00
Fengbo Han afda166fd8 calculate platic strain by subtracting elastic strain from total strain 2017-08-01 18:02:53 +02:00
Fengbo Han d51fa10ae5 implemented yield stop criteria 2017-07-27 16:33:05 +02:00
Fengbo Han 414faa53d3 implemented yield stop criteria 2017-07-27 16:31:16 +02:00
Fengbo Han b33d7e0585 implemented yield stop criteria 2017-07-27 16:28:33 +02:00
Fengbo Han 3f02844966 implemented yield stop criteria 2017-07-27 16:24:56 +02:00
Fengbo Han 5cedba0721 implemented yield stop criteria 2017-07-27 16:21:02 +02:00
Tias Maiti dd68374afd moved new constitutive law to new branch for further testing 2017-06-11 18:47:21 -04:00
Tias Maiti 9894af74ca new material subroutine implementing the diagonal hardening concept outlined by "Z. Zhao et al. / International Journal of Plasticity 24 (2008) 2278–2297" 2017-06-06 20:37:23 -04:00
Martin Diehl 618bf95a43 did not compile, adjusted dummy compilation routine to detect such errors 2017-05-24 22:16:35 +02:00
Martin Diehl 8b529d8b04 cleaner finalizing in case of interrupted simulation 2017-05-24 18:12:36 +02:00
Martin Diehl d3467705ca compilation exception not needed any more for intrinsic NaN function 2017-05-22 10:08:16 +02:00
Martin Diehl 12f66fd806 bug introduced during merge 2017-05-18 11:42:41 +02:00
Martin Diehl 9be3cac947 unused variable 2017-05-18 11:32:49 +02:00
Martin Diehl 590a5c8b91 using also variable cutback factor for Li 2017-05-18 11:30:14 +02:00
Martin Diehl 295bcd20f0 variable cut back factor for Lp as suggested by Duancheng 2017-05-18 11:30:14 +02:00
Martin Diehl be62abc2bc Merge branch 'development' into IntrinsicNaN 2017-05-17 07:36:47 +02:00
Martin Diehl 7da8bc8d4a symlinks can be handled by Git, so we can store them and simplify the installation 2017-05-16 11:10:01 +02:00
Martin Diehl 1f1a1826a1 string length was wrong, IO_warning now also with new style 2017-05-15 21:53:25 +02:00
Martin Diehl 4f3b0e4c34 symlinks should not be part of the repository 2017-05-15 06:45:53 +02:00
Martin Diehl 25865d4b54 using asinh (defined in F2008) instead of equivalent formulation using log 2017-05-10 07:40:26 +02:00
Martin Diehl b35ff67f99 using IEEE_is_NAN and IEEE_quiet_NaN instead of hand-written solution, will not work for gfortran < 5 2017-05-04 00:32:44 +02:00
Philip Eisenlohr 131e34ae8d nicer formatting of error reporting 2017-04-30 21:48:06 -04:00
Philip Eisenlohr 23e2cf9aad perform sanity checks at end to catch missing parameters 2017-04-30 17:10:31 -04:00
Franz Roters 3e52e8b3b2 fixed syntax errors 2017-04-28 12:39:01 +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 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 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
Martin Diehl 7cb2669648 sytaycheck only target was not working 2017-04-18 07:38:36 +02:00
Martin Diehl a5f8c5ba32 Merge branch 'development' into cmake 2017-04-15 16:17:50 +02:00
Martin Diehl a248a24250 consistent with other routines 2017-02-08 20:01:42 +01:00
Martin Diehl 89be6d0b08 intent(in/out) is self-explanatory 2017-02-08 19:44:19 +01:00
Martin Diehl b67f4dd324 Default cases seem to work 2017-02-04 01:01:42 +01:00
Martin Diehl 3e7ab76582 adding functionality from previous build system 2017-02-03 23:23:55 +01:00
Martin Diehl 2116226407 status from development branch 2017-02-03 20:35:05 +01:00
Martin Diehl d202e7dbd5 no dirty tricks needed 2017-02-03 20:19:02 +01:00
Martin Diehl cf36d4534f adjusting to development branch 2017-02-03 20:16:25 +01:00
Martin Diehl fd41681b19 not needed 2017-02-03 19:56:06 +01:00
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