Commit Graph

564 Commits

Author SHA1 Message Date
Martin Diehl 8fb780ab42 now compiles with gfortran 2018-08-20 09:01:13 +02:00
Martin Diehl d6c69e3a18 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-18 23:17:07 +02:00
Martin Diehl 85358bae1b copy and paste error 2018-08-18 21:30:57 +02:00
Martin Diehl 97659c359a MPI write only in case that PETSc is used 2018-08-18 21:01:25 +02:00
Martin Diehl 3b3e0bc068 forgotten use 2018-08-18 17:11:50 +02:00
Martin Diehl 67314fc204 leftover from reducing numerics_integrator to scalar
postponed simplification to scalar because of heavy modification in plastic
constitutive laws
2018-08-18 16:42:32 +02:00
Martin Diehl 2618593568 :Merge branch 'development' into Integration-Mode-Confusion 2018-08-18 16:37:25 +02:00
Martin Diehl f7c20d74af compiles now, but most likely does not work 2018-08-18 15:58:42 +02:00
Martin Diehl 0d8f17cbe6 adjusting to PETSc 3.9.x 2018-08-18 14:05:57 +02:00
Philip Eisenlohr c03ea8f5c7 added forgotten C66(2,2) read-in from parameter database 2018-08-17 15:43:09 -04:00
Philip Eisenlohr 62d2806fe1 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-17 14:59:00 -04:00
Martin Diehl d4bcfae82b WIP: adopting to PETSc 3.9.x and modifications in development branch 2018-08-17 12:00:44 +02:00
Martin Diehl 821860987c copied existing files 2018-08-17 00:14:25 +02:00
Martin Diehl 26b08bc21b Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-16 23:39:14 +02:00
Martin Diehl b64b5b82de integrationMode was always 1, very obscure code
was most likely the leftover of old functionality
2018-08-16 23:33:39 +02:00
Philip Eisenlohr 66e68151ea Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-13 18:28:59 -04:00
Philip Eisenlohr ba215ed9ea small polish 2018-08-13 18:27:51 -04:00
Martin Diehl 5337fb1229 old runtime debugging leftovers 2018-08-05 11:08:17 +02:00
Martin Diehl c0adb61350 outdated description 2018-08-05 10:41:01 +02:00
Martin Diehl 60fc47ca2a unused import 2018-08-05 09:41:27 +02:00
Martin Diehl 386c3e7797 Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-05 06:04:33 +02:00
Martin Diehl 661636d83e default values needed to suppress error in case of missing key 2018-08-04 22:53:56 +02:00
Martin Diehl f522f79703 Merge branch 'development' into 35-new-style-of-reading-in-parameters-in-lattice 2018-08-04 22:42:14 +02:00
Martin Diehl 6a4260ac07 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-04 22:29:52 +02:00
Martin Diehl 9360c171a1 polished for merge
access to array(n+m:) is safe for array of size n with m>1
2018-08-04 19:39:50 +02:00
Martin Diehl 20d1264d07 small improvements
default case of error handling, checking for recursion limit, some
comments to also understand it later
2018-08-04 13:58:01 +02:00
Philip Eisenlohr 8edeeaf213 renaming of p_vec and friends to names based on "group" 2018-08-03 19:39:14 -04:00
Martin Diehl 8c07825d7e Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-03 22:21:37 +02:00
Martin Diehl 5b409fd6f7 type mismatch 2018-08-03 16:16:50 +02:00
Martin Diehl f0645d84f5 not a target anymore 2018-08-03 15:10:38 +02:00
Martin Diehl 38183fdbf6 Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-03 08:57:44 +02:00
Martin Diehl dc6855261a number of helper functions for HDF5 2018-08-03 08:53:37 +02:00
Martin Diehl c2f9709567 leaner, most of it also supported by older gcc 2018-08-03 08:42:26 +02:00
Martin Diehl af931a78c7 finalizing reading in 2018-08-03 08:09:28 +02:00
Martin Diehl 68c476f690 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-03 07:56:02 +02:00
Martin Diehl 0a6bde70c5 Merge branch 'development' into 19-NewStylePhenopowerlaw 2018-08-03 06:56:43 +02:00
Martin Diehl 5d09e98e02 checking with Philip 2018-08-03 01:14:18 +02:00
Martin Diehl 3cceda5fe3 Merge branch 'development' into 31_consistent_wd 2018-08-03 00:08:16 +02:00
Pratheek Shanthraj bc3f6ae97c missing bits in getStrings function 2018-07-31 23:15:44 +02:00
Martin Diehl a908e66306 WIP: reading in new style 2018-07-30 11:58:59 +02:00
Martin Diehl ed97afb51c WIP: inherent definition instead of check, using new reading in functionality 2018-07-29 21:18:04 +02:00
Martin Diehl 5eed7d06e9 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-07-29 20:29:55 +02:00
Martin Diehl 449449b500 does the same as numpy.clip 2018-07-28 01:31:02 +02:00
Martin Diehl e7fd445816 WIP: Simplifying
using maxval gives inherently correct values and a consistency check is not needed any more
using config_phase capabilities to read in lattice related data
2018-07-20 14:13:13 +02:00
Martin Diehl edcf97ea59 associate: clearer code and no performance drawbacks 2018-07-16 22:02:31 +02:00
Martin Diehl fb1265db3d checking for existing file 2018-07-16 20:08:31 +02:00
Martin Diehl a1ad18c88a 256 characters is enough for material.config
larger values waste memory and decrease readability.
Still need to discuss how geom files are handled, for them longer limits make sense
2018-07-16 12:08:22 +02:00
Martin Diehl 7f05bf9c0a leftover variables not needed anymore 2018-07-16 11:54:46 +02:00
Martin Diehl b26c4a39ef store raw material.config 2018-07-16 11:42:58 +02:00
Martin Diehl 3f7a1d1c07 function to read and store complete text file
reading as stream avoids costly repeated call to 'read'. Requires of course more memory, but that should be fine
also, recursion case ('{}') is internally handled. Old recursive was error prone and buggy when rewining (see 'reset' option)
2018-07-16 11:40:42 +02:00
Martin Diehl bc5fcf2c14 leftover variable from cleaning 2018-07-16 10:51:42 +02:00
Martin Diehl a4e4a9c4ab merge does not work for strings of different length
fixed possible out of bounds access
2018-07-10 21:40:01 +02:00
Martin Diehl a1b1a4c476 include files are not libraries 2018-07-10 18:26:45 +02:00
Martin Diehl f493a5419b forgot line continuation 2018-07-10 10:39:24 +02:00
Martin Diehl 1336f8f129 cleanding and simplifying
1) arguments are case sensitive, i.e. -H is NOT -h
2) don't rely on trailing '/' for working dir
3) when adding '/' to working dir, rectify path should take care of '//'
2018-07-10 10:23:21 +02:00
Martin Diehl 70a3db275a verbose error message 2018-07-10 09:53:20 +02:00
Martin Diehl ac7bc4b9ed dont' store the working directory but set it centrally
makes life easier, writing and reading always to CWD unless absolute path is given
Spectral: using --wd argrument and C code
MSC.Marc: using directory of input deck and Intel extension
Abaqus: using function and Intel extension
2018-07-10 08:24:45 +02:00
Martin Diehl cd4dc25513 Merge branch 'development' into 31_consistent_wd 2018-07-08 15:14:19 +02:00
Martin Diehl 771b8f00ec leftover from performance reporting/debugging 2018-07-07 13:50:39 +02:00
Martin Diehl c2b332616a Merge branch 'development' into 31_consistent_wd 2018-07-07 12:37:51 +02:00
Martin Diehl 5295b49ab3 deallocate statements not needed
not clear why global variables need check (should be allocated only once)
local variables are deallocated when they go out of scope
2018-07-07 12:32:57 +02:00
Martin Diehl 4e3cc75c1a forgot rename 2018-07-07 12:32:47 +02:00
Martin Diehl 0065f0472c Merge branch 'development' into 31_consistent_wd 2018-07-06 13:26:29 +02:00
Martin Diehl ce32372f1c more cleaning of old commercial FEM solver files 2018-07-06 13:18:55 +02:00
Sharan Roongta 7ca005d237 avoiding division by zero 2018-07-05 15:44:25 +02:00
Martin Diehl cb71e9401b Merge branch '21_removeperformanceprofiling' into 'development'
21 removeperformanceprofiling

See merge request damask/DAMASK!29
2018-07-04 19:02:02 +02:00
Martin Diehl 346a0b722b Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-07-03 22:59:49 +02:00
Martin Diehl 63057998fe array of size 0 seems to be a common source for segmentation fault 2018-07-03 22:58:49 +02:00
Philip Eisenlohr 3c1012ef38 cut out more now useless pieces 2018-07-03 22:12:25 +02:00
Test User efee9d98e7 elseif contained only debug statements, not needed 2018-07-03 21:58:28 +02:00
Philip Eisenlohr bebcd53445 more commenting, clearer variable naming, stress_mask as param 2018-07-03 15:51:46 -04:00
Martin Diehl b1a7eca528 array access out of bounds 2018-07-03 19:32:31 +02:00
Martin Diehl 8eeec5c0f1 also Abaqus works with openMP now/again? 2018-07-03 12:05:14 +02:00
Martin Diehl b1c37996d3 also using short names for state and dotstate in postResults 2018-06-30 14:35:58 +02:00
Martin Diehl c50f32b0d8 shorthand names improve readability for dotstate and LpAnd... 2018-06-30 14:11:05 +02:00
Martin Diehl 980e34f728 state pointer as shortcut, variables not used 2018-06-30 13:37:13 +02:00
Martin Diehl fb80c41215 Merge branch 'development' into 19-NewStylePhenopowerlaw 2018-06-30 13:16:04 +02:00
Yang Su a38a3ef83e changed state assignment to b=a;c=b from b=a;c=a --- caused memory fault in ifort15 2018-06-29 18:47:27 -04:00
Yang Su 8c727eb4ff removed obsolete second assignment of slipRate and accSlip pointers 2018-06-29 18:07:32 -04:00
Jaeyong Jung e166f118f4 Merge branch 'development' into 31_consistent_wd 2018-06-29 15:46:55 +02:00
Jaeyong Jung 613e976a86 the working directory and pathes of load and geometry files are now consistent. 2018-06-29 15:36:12 +02:00
Martin Diehl a308b2130a Merge branch 'development' into 21_removeperformanceprofiling 2018-06-28 13:09:11 +02:00
Martin Diehl e8a4f588f4 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-28 07:24:04 +02:00
Martin Diehl b3862ef800 enough to support 3 versions (2018 should be out already/soon) 2018-06-28 07:22:32 +02:00
Martin Diehl 716065c0cd Merge branch 'development' into 30_parsePhasePartOnce 2018-06-27 21:43:09 +02:00
Martin Diehl 2bee95bfee argument for checking expected shape in the future 2018-06-27 18:04:06 +02:00
Martin Diehl 49126d2f6f further simplified 2018-06-27 10:19:50 +02:00
Martin Diehl 0f05565fd5 don't complicate code with potential enhancements 2018-06-27 10:09:19 +02:00
Martin Diehl ddf7584f4d following ideas implemented by Philip in disloUCLA
prm and stt are pointers to instance of parameter and state
interaction_xxYY is a matrix, gets shape assigned during calculation
totalNslip and totalNslip are defined as derived parameter
2018-06-27 10:01:36 +02:00
Martin Diehl 00f34363dc adjusted naming convention 2018-06-27 09:12:33 +02:00
Martin Diehl fb528dad52 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-27 09:05:37 +02:00
Martin Diehl 78f9a107fe exception for empty list 2018-06-27 09:04:14 +02:00
Martin Diehl 96e5175f41 updated rename 2018-06-26 21:08:13 +02:00
Martin Diehl 2bc919e4e3 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-26 21:04:10 +02:00
Martin Diehl fc83a76318 consistent naming 2018-06-26 20:54:54 +02:00
Martin Diehl ea80e04ea8 deallocating config, simplifying 2018-06-26 20:50:06 +02:00
Martin Diehl bb415e8a02 using array size not to rely on correctly set variable, cleaning crystallite data after use 2018-06-26 20:33:41 +02:00
Martin Diehl 98cc56968e don't rely on a variable, use the array size directly 2018-06-26 20:33:02 +02:00
Martin Diehl d786ead381 freeing space
debug statements have been inactive for a while ...
2018-06-26 20:31:52 +02:00
Martin Diehl 1abe747204 possibility to deallocate material.config parts 2018-06-26 20:30:41 +02:00
Martin Diehl a68c466fc6 simplified 2018-06-26 19:18:23 +02:00
Martin Diehl 66a254f8fb polishing 2018-06-26 19:09:46 +02:00
Martin Diehl 6a75021bca need to check at the beginning
wrong logic in case default was overwritten
2018-06-26 19:09:08 +02:00
Martin Diehl 92bcf3a7aa function to free elements of the string list.
Note: Pointers that are allocated will never go out of scope. Pointers
that are assigned (=>) will be deallocated/disaccociated like allocatables
that go out of scope
2018-06-26 18:48:29 +02:00
Philip Eisenlohr b907acfbfa improved if then else logic here and there 2018-06-26 11:36:45 -04:00
Jaeyong Jung a8c69dfcad commit spectral_interface 2018-06-26 16:09:37 +02:00
Philip Eisenlohr 1b920705d7 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-06-26 10:03:02 -04:00
Martin Diehl 5c9f6c61b1 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-26 08:22:44 +02:00
Martin Diehl a5ca26ab10 bug (copy and paste): fiber should be counted, not gauss 2018-06-26 08:20:40 +02:00
Martin Diehl 860899b769 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-26 08:03:49 +02:00
Martin Diehl 0680b1706f improved error handling 2018-06-26 07:56:20 +02:00
Martin Diehl 6ffac60961 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-26 07:38:53 +02:00
Martin Diehl a91fa75a28 sanity check, something is going wrong with intel 16.0 2018-06-26 07:38:41 +02:00
Sharan Roongta 300b2827b2 Using new functions for parsing material config 2018-06-25 15:28:15 +02:00
Martin Diehl 6cd08a38b1 pre-defined variables seem to work for gfortran 2018-06-25 14:06:13 +02:00
Martin Diehl d484d1b5bb fixed typo and removed alias 2018-06-25 10:33:22 +02:00
Martin Diehl bd09bd91f9 exit immediately if array size does not match Nslip/Ntwin
otherwise, array acces out of bounds might happen for subsequent sanity
checks
2018-06-23 14:48:32 +02:00
Martin Diehl 74aec7bb71 circumventing bug in Gfortran, tests use correct label (a_slip) 2018-06-22 18:14:14 +02:00
Martin Diehl 363c083886 Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw 2018-06-22 17:57:33 +02:00
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