Commit Graph

445 Commits

Author SHA1 Message Date
Martin Diehl 1add0f3d84 gfortran does not recognice an empty array as 'present' 2018-06-22 08:03:22 +02:00
Martin Diehl c5ebe3510f simplified by using empty string list as default 2018-06-21 23:49:07 +02:00
Martin Diehl c5b00e7a6c consistent description 2018-06-21 23:48:34 +02:00
Martin Diehl 0f3485c4a1 using default value for when getting strings, setting correct size for post results 2018-06-21 23:14:30 +02:00
Martin Diehl fd097846ae Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-21 22:47:51 +02:00
Martin Diehl 367e6a4eee consistent string length (de-facto standard 65536) 2018-06-21 22:39:18 +02:00
Martin Diehl bed9220597 consistent string name and more verbose "prm" for shortcut parameters 2018-06-21 22:38:48 +02:00
Martin Diehl f61f22924a empty string list as default value simplifies logic 2018-06-21 22:38:06 +02:00
Martin Diehl adefbd95e6 don't use intrinsic names of keywors as function names 2018-06-21 22:34:32 +02:00
Martin Diehl 910aad1094 Marc 2014 requires old compiler not supported any more 2018-06-21 21:54:07 +02:00
Martin Diehl b58489c1c2 merged all config related data into the config module 2018-06-19 23:53:14 +02:00
Martin Diehl 8bcaaf11a5 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-19 23:44:16 +02:00
Martin Diehl 5302782dad need to search for cumulative tag 2018-06-19 23:42:15 +02:00
Martin Diehl 7aa8cac164 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-19 23:10:06 +02:00
Martin Diehl 76fcf6b204 logic for default value was broken
only use default value if nothing else is found (do not append)
2018-06-19 22:59:52 +02:00
Martin Diehl d177afa9e1 unallocated array 2018-06-19 22:59:18 +02:00
Martin Diehl 9aa211605f having no output in crystallite caused trouble 2018-06-19 22:58:46 +02:00
Martin Diehl 13f280367e using config module 2018-06-19 19:43:41 +02:00
Martin Diehl d7da70cefb Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-19 19:30:01 +02:00
Martin Diehl 2b5db71739 using consistent names 2018-06-19 19:25:29 +02:00
Martin Diehl efd2eae63e first step to get rid off getStringsRaw 2018-06-19 19:16:03 +02:00
Martin Diehl fc54104599 getStrings works for cumulative and non-cumulative 2018-06-19 18:38:32 +02:00
Martin Diehl 8d5d306076 getStrings has functionality for multiple entries in a row of cumulative
searches
2018-06-19 18:02:53 +02:00
Martin Diehl 3b676af215 always search for last occurrence 2018-06-19 18:02:53 +02:00
Martin Diehl 8739bada26 always search for last occurrence 2018-06-19 13:08:14 +02:00
Jaeyong Jung 8aeb4a115e first commit. 2018-06-18 16:19:03 +02:00
Philip Eisenlohr d6d1439f52 more polishing, getStrings seems still somewhat murky... return lengths of strings are still inconsistent (64 and 65536) 2018-06-16 17:44:27 +02:00
Martin Diehl 32d481020f Merge branch 'development' into 30_parsePhasePartOnce 2018-06-16 14:49:57 +02:00
Philip Eisenlohr 0e4379f7ec straightened out logic and variable naming 2018-06-15 20:42:28 +02:00
Martin Diehl 999d0d774e first try of unifying getInts and getIntArray 2018-06-15 19:23:04 +02:00
Martin Diehl 7388cbb940 'split' should be default, wrong position in stringPos 2018-06-14 20:39:23 +02:00
Martin Diehl 877481811b old statement was overcomplex 2018-06-14 18:25:16 +02:00
Martin Diehl aebb06eaa9 source code files should not be executable 2018-06-14 16:44:11 +02:00
Martin Diehl 05ac53430e always using last key in list to be compatible with convention 2018-06-14 08:32:02 +02:00
Martin Diehl 9c12ce5539 more general name (should include parsing of debug and numerics) 2018-06-14 06:39:49 +02:00
Martin Diehl a11c6e0fea convention: intent(out) first, intent(in) last 2018-06-14 06:35:28 +02:00
Philip Eisenlohr bd97bc8c39 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-06-12 14:33:15 -04:00
Philip Eisenlohr bedc17b1c6 nicer formatting 2018-06-12 14:33:08 -04:00
Martin Diehl e29add3bce intitial values are not given by default 2018-06-11 07:33:45 +02:00
Martin Diehl ca24681c49 variable is undefined if no echo tag is found 2018-06-11 00:42:42 +02:00
Martin Diehl 04b8218d2c module name and file name should match 2018-06-11 00:28:36 +02:00
Martin Diehl 1c8c33595e more precise name 2018-06-11 00:27:30 +02:00
Martin Diehl 940d9fcbab cleaning 2018-06-11 00:23:43 +02:00
Martin Diehl fdd3bd1262 polishing 2018-06-11 00:16:48 +02:00
Martin Diehl e0a6b79b14 trying to have descriptive names 2018-06-10 23:38:16 +02:00
Martin Diehl a1fdbd1d5e most IO related variables not needed any more in material 2018-06-10 18:38:31 +02:00
Martin Diehl 91d9c11612 material.config is read in centrally
moving data from material to config_material. use statements need to
change. All aspects of reading from file will be removed from the
individual modules
2018-06-10 18:01:52 +02:00
Martin Diehl f8ae0ec925 list does tokenizing automatically 2018-06-10 11:07:17 +02:00
Martin Diehl 08a4da01e0 IO_stringPos failed when parsing trimmed string 2018-06-10 11:03:34 +02:00
Martin Diehl 73e915c35a wrong dependencies cause failure during compilation 2018-06-10 07:05:25 +02:00
Martin Diehl cb0cb29393 reading in done by one function 2018-06-09 13:48:37 +02:00
Martin Diehl 11ab56e5d1 migrating reading in of material.config to own module 2018-06-08 21:01:58 +02:00
Jaeyong Jung 81dffef21c Merge branch 'development' into 23_BasticPETSc_2_PETSc 2018-06-04 17:03:13 +02:00
Vitesh Shah c903880d19 using on unitialized error caused segfault in some cases 2018-06-04 12:38:28 +02:00
Martin Diehl ab4f5413c6 line should have the correct return value 2018-06-03 14:27:43 +02:00
Martin Diehl 0f8fe555c5 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-03 10:49:28 +02:00
Martin Diehl b055416026 also parsing texture only once 2018-06-03 10:44:20 +02:00
Martin Diehl e7d27a3991 function to return plain strings (in case they have a different syntax) 2018-06-03 10:43:43 +02:00
Martin Diehl 5b5f10aecf parsing homogenization-related data 2018-06-03 00:36:34 +02:00
Martin Diehl 1e5106f601 return empty string array if nothing found (plasticity detect changes failed) 2018-06-02 23:10:38 +02:00
Martin Diehl 5ec98f65b4 wrong intialization, homogenization test failed 2018-06-02 23:10:08 +02:00
Martin Diehl e93e380ad3 output tag was empty: 2018-06-02 21:00:47 +02:00
Martin Diehl 3fec2c960d missing initialization caused problems 2018-06-02 21:00:26 +02:00
Martin Diehl db32bd1fd6 initializing lattice after materials allows to use the pre-parsed material.config 2018-06-02 20:59:30 +02:00
Martin Diehl 4ee62538d7 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-02 19:33:06 +02:00
Martin Diehl 142ce51c9c homogenization and crystallite use new structure
math_transpose33 has no advantage over transpose intrinsic
2018-06-02 19:28:08 +02:00
Martin Diehl 4fd2338d35 added parsing of homogenization and workaround for gfortran 2018-06-02 19:27:03 +02:00
Martin Diehl c2d30aec43 gfortran has issues with zero-sized string arrays: 2018-06-02 19:24:53 +02:00
Martin Diehl fdf8833c36 debug output not needed any more 2018-06-02 13:31:21 +02:00
Martin Diehl c7da8c7f75 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-02 13:24:17 +02:00
Martin Diehl bc03b8670a parsing microstructure, phase, and crystallite in one loop 2018-06-02 13:23:42 +02:00
Martin Diehl 11383a2aca proper error checks 2018-06-02 10:19:22 +02:00
Martin Diehl cfc1a48833 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-02 09:52:00 +02:00
Martin Diehl 69aee3ccdd read phase part in material.f90 only once and operate then on data in main memory 2018-06-02 09:39:05 +02:00
Martin Diehl bf43156112 search for global tags can stop once first section is found 2018-06-02 06:32:16 +02:00
Martin Diehl 29a0ec2800 polishing 2018-06-02 05:39:40 +02:00
Martin Diehl a0a5d4c549 only doing things that are required
rely on default values where applicable
2018-06-02 05:38:45 +02:00
Martin Diehl 4b5401e10c Merge branch 'release_bugfix' into 'development'
Improve error reports in CMake script

See merge request damask/DAMASK!26
2018-06-01 23:34:28 +02:00
Martin Diehl de39edda5b Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-01 23:19:08 +02:00
Martin Diehl 8e0a3ff389 arrays have no variable length, need to check for empty string 2018-06-01 23:14:43 +02:00
Martin Diehl 7db08f0a76 using material.config values from main memory 2018-06-01 22:56:20 +02:00
Martin Diehl 02fdfa8445 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-01 21:26:29 +02:00
Martin Diehl 70166657a9 FILEUNIT still needed 2018-06-01 21:25:08 +02:00
Martin Diehl cd9fb1c544 adjusting variable names in isotropic to DAMASK paper 2018-06-01 21:23:25 +02:00
Martin Diehl 64270f6c95 no need to store trailing whitespace 2018-06-01 21:22:19 +02:00
Martin Diehl f843254233 Noutput not needed, using size ensures consistency 2018-06-01 20:54:40 +02:00
Martin Diehl e0ec7ab54f Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-01 14:23:16 +02:00
Martin Diehl c8cec5a121 some more functions to parse material.config from memory 2018-06-01 14:14:53 +02:00
Martin Diehl cfefcaebb8 simplifying 2018-06-01 11:33:13 +02:00
Martin Diehl 48851c00f6 sizePostResults not needed, transpose33 has no advantage over transpose: 2018-06-01 11:24:00 +02:00
Martin Diehl 5de4b47438 plastic isotropic parses material.config from main memory, not from file 2018-06-01 10:24:42 +02:00
Martin Diehl 052a0af2ac storing phase part of material.config per section in chained list 2018-06-01 10:14:46 +02:00
Martin Diehl 8867322713 data structure to store material.config
chained list data structure to store string and stringPos.
Performance-wise not 100% optimal as searching requires to parse all elements in the list.
However, secions are typically rather small (usually Order 1 to 3) and parsing from file is much slower.
Also, only the actual length of the array is stored (thats wy I preferred the list over a 2D array)
2018-06-01 10:14:12 +02:00
Martin Diehl 804febe7f9 WIP: separate reading in and parsing 2018-05-31 18:31:44 +02:00
Martin Diehl 72b69959de Merge branch 'development' into 19-NewStylePhenopowerlaw 2018-05-31 17:02:45 +02:00
Martin Diehl 60e30e4a64 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-05-28 07:03:56 +02:00
Martin Diehl e661a42a4c citation block should be separated by empty lines 2018-05-28 07:01:50 +02:00
Martin Diehl 715f2a59d0 Merge branch 'development' into release_bugfix 2018-05-27 14:10:38 +02:00
Martin Diehl 87a16b775e function to change working directory 2018-05-27 14:08:23 +02:00
Martin Diehl 39e2e8a305 len is length of string, here size is required 2018-05-27 14:07:34 +02:00
Martin Diehl e0e97abda4 citation does not match 2018-05-27 08:16:05 +02:00
Martin Diehl 60cdffacd6 integer kind need to match for array constructor
hence, a=[a,b] requires a and b of the same kind
2018-05-27 08:09:32 +02:00
Martin Diehl 466cb57d7c Merge branch 'development' into release_bugfix 2018-05-26 16:37:39 +02:00
Martin Diehl 6891a48c82 wrong label 2018-05-26 12:35:02 +02:00
Martin Diehl 896a502099 Merge branch 'development' of magit0.mpie.de:damask/DAMASK into development 2018-05-26 12:09:09 +02:00
Martin Diehl 0172987115 forgot to update default 2018-05-26 12:08:28 +02:00
Martin Diehl bcaab1c068 restored working behavior 2018-05-26 12:07:13 +02:00
Martin Diehl 2fbe60b949 anticipate (proper) change in 23_BasticPETSc_2_PETSc as PRIVATE repository is ahead 2018-05-26 09:54:50 +02:00
Martin Diehl c7c39922f0 pointer assignment was done twice
pointer is re-assigned automatically, but I found it confusing.
Also using automatic left hand side reallocation to simplify handling of outputID
2018-05-26 09:44:14 +02:00
Martin Diehl 8184d51a99 following style of more complex constitutive laws
offset for different states needs to be computed, so it makes sense to define global and local aliases together.
no need to introduce variables for state0 and aTolstate, they are only used once
2018-05-26 09:31:36 +02:00
Eureka Pai c09a7fd157 replaced param(instance) with p => pointer, corrected errors 2018-05-24 18:31:32 -04:00
Eureka Pai 982c0fb90a replaced param(instance) with p => pointer, corrected error 2018-05-24 18:24:58 -04:00
Eureka Pai f97800658f replaced param(instance) with p => pointer 2018-05-24 17:56:09 -04:00
Jaeyong Jung c79a0d39c0 Merge branch 'development' into 23_BasticPETSc_2_PETSc 2018-05-24 15:53:00 +02:00
Martin Diehl 5bf6ede661 polishing 2018-05-24 07:57:10 +02:00
Martin Diehl 1bad719abe undefined variables can be removed, style as in other plastic modules 2018-05-24 07:51:43 +02:00
Martin Diehl f0309ac4dd Bessel functions not used 2018-05-24 07:51:16 +02:00
Martin Diehl 1c75a2e9cd using syntax with better error handling 2018-05-24 07:13:12 +02:00
Martin Diehl 0ee34d608c fixing all appaerances 2018-05-24 00:06:03 +02:00
Mingxuan Lin bf7efad250 Fix errors in CMake script 2018-05-23 21:46:03 +02:00
Martin Diehl 30fe87a88a post-release cleaning 2018-05-22 19:16:12 +02:00
Philip Eisenlohr 324df2eeba Merge branch 'PETSc3.9' into 'development'
PETSc 3.9 working

See merge request damask/DAMASK!25
2018-05-19 17:39:26 +02:00
Martin Diehl 5187ee25b6 destroying unused object causes problem with PETSc 3.9
not clear, why destroying at the end of the program is anyway needed, so removed it
2018-05-19 11:20:04 +02:00
Philip Eisenlohr d79d366355 Merge branch '20_modify_RGC' into 'development'
20 modify rgc

See merge request damask/DAMASK!24
2018-05-18 00:15:47 +02:00
Arka Lahiri c45d9f9ee9 Deleted performance profiling code 2018-05-17 16:33:35 +02:00
Jaeyong Jung 6800e779cb second try! 2018-05-17 16:27:36 +02:00
Martin Diehl 537bb8df48 employing use statements (almost no external functions anymore)
adopted function calls to newer PETSc versions
2018-05-17 12:04:21 +02:00
Martin Diehl 8193e27e8d line break looked strange 2018-05-16 18:34:49 +02:00
Martin Diehl 31311d63db gfortran 8 was complaining, asigned pointer is not contiguous 2018-05-16 00:09:33 +02:00
Jaeyong Jung a65e4bdad4 first modification. compile succeeded 2018-05-14 15:45:12 +02:00
Arka Lahiri 4d393518ac did only compile with BUILD_TYPE=DEBUG 2018-05-09 16:54:06 +02:00
Arka Lahiri 90e9b98584 performance profiling should not be part of the source code 2018-05-09 16:35:09 +02:00
Martin Diehl 6b27460a3b Merge branch 'development' into 12-fixOrientationSampling 2018-05-05 19:03:51 +02:00
Martin Diehl 9072179c61 Merge branch 'development' into 3-adding-plastic-constitutive-law-with-kinematic-hardening 2018-05-04 16:07:15 +02:00
Jaeyong Jung 3f71288e0a Now, homogenization_RGC is fixed! 2018-05-04 14:09:49 +02:00
Zhuowen Zhao 76e6fa24fb added check to the "Plasticity_DetectChanges" test and removed commented-out parts for kinematic hardening 2018-05-03 22:39:49 -04:00
Sharan Roongta ccde78799e using state pointers increases readability in postResults 2018-05-02 17:33:42 +02:00
Sharan Roongta f44d20fdc6 Merge branch '19-NewStylePhenopowerlaw' of magit1.mpie.de:damask/DAMASK into 19-NewStylePhenopowerlaw 2018-05-02 17:00:46 +02:00
Martin Diehl 235b2fe3c8 ntwin = [0] cause problems
math_expand now works for sum(how) == 0
2018-05-02 16:44:27 +02:00
Martin Diehl 74956de9bd misplaced bracket caused wrong results introduced in commit e3bd09d8 2018-05-02 16:06:30 +02:00
Sharan Roongta 51f56f5bad using state pointers increases readability in constitutive results 2018-04-30 21:30:53 +02:00
Martin Diehl c3322b589e not needed anymore 2018-04-30 13:58:50 +02:00
Sharan Roongta 423fcd6e0d using state pointer increases readability in dotState 2018-04-27 20:00:35 +02:00
Martin Diehl d9548b455e should loop over slip systems 2018-04-26 18:35:49 +02:00
Martin Diehl e3bd09d8e6 wrong initiatilization 2018-04-26 18:12:45 +02:00
Jaeyong Jung 4c42510ad6 compiles without AL solver 2018-04-26 14:11:45 +02:00
Zhuowen Zhao 65f17f4166 merge development into kinematic-hardening branch 2018-04-25 14:14:17 -04:00
Martin Diehl 81cab02d7a simplified reading in and initialization
init of absolute tolerances and state0 done on the fly
reading in array type parameters in the param structure
:
2018-04-25 19:43:03 +02:00
Zhuowen Zhao 7bc736aad7 killed modification not relevant to kinematic hardening 2018-04-25 13:26:38 -04:00
Martin Diehl 54a68014ea Ntrans not needed/used. Simplified storage of parameters 2018-04-24 17:31:05 +02:00