Commit Graph

906 Commits

Author SHA1 Message Date
Martin Diehl dc91016729 simpler loop structures for better readability 2018-08-31 13:38:07 +02:00
Martin Diehl 42745c66f0 nested loops do not improve readability 2018-08-31 13:32:24 +02:00
Martin Diehl ba65044ff5 looping over systems simplifies loop structure 2018-08-31 13:19:28 +02:00
Martin Diehl 3431086fdb storing data per slip system simplifies calculation 2018-08-31 13:14:16 +02:00
Martin Diehl c9bb051261 fill local Schmid Matrices 2018-08-31 11:52:43 +02:00
Martin Diehl 54fe0afb16 indentation wrong 2018-08-31 11:42:54 +02:00
Martin Diehl fc4253ed57 conversion from 3x3 to 6 of stress in constitutive will be remove later 2018-08-31 11:37:14 +02:00
Martin Diehl 3b88096cd7 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-31 11:09:52 +02:00
Martin Diehl 5330fb31ad more verbose error message 2018-08-31 10:19:37 +02:00
Martin Diehl f028e05298 guessing was not correctly set 2018-08-31 10:14:33 +02:00
Martin Diehl 3cb279b083 one more loop not needed 2018-08-31 10:03:15 +02:00
Martin Diehl 017563e061 one more loop not needed 2018-08-31 09:14:16 +02:00
Martin Diehl c0ac05aa88 no need to use two loops 2018-08-31 09:12:50 +02:00
Martin Diehl 732022d4f0 functions from IO does not add any value here
only prevents the automated selection of a new unit
2018-08-31 08:58:13 +02:00
Martin Diehl d18d74ae31 mechanics solver type is set only once
as all mech routines have the same interface, this leaner syntax can be
used
2018-08-31 08:20:23 +02:00
Martin Diehl 555ca8e5f1 debug statements not needed anymore 2018-08-30 17:21:22 +02:00
Martin Diehl 62413e8187 now compiles again 2018-08-30 17:18:56 +02:00
Martin Diehl 5f97ae9080 not used at the moment 2018-08-30 16:39:18 +02:00
Martin Diehl cbecb71000 [skip sc] using explicit interface helps to get correct type
still some issues with different ranks and datatypes
2018-08-30 13:10:18 +02:00
Martin Diehl b930c68887 PETSc 3.9 style (no SIGSEGVs anymore) 2018-08-30 12:38:44 +02:00
Martin Diehl 8b6bef159e a little bit more verbose 2018-08-30 12:38:29 +02:00
Martin Diehl 3254ae79a5 collecting questions to Pratheek 2018-08-30 12:37:47 +02:00
Martin Diehl d180af494e adopted to new PETSc fortran interface 2018-08-30 11:55:13 +02:00
Martin Diehl 29e55d20fb message better to understand and giving error instead of SIGSEGV 2018-08-30 09:42:45 +02:00
Martin Diehl b96e01c128 Merge branch 'development' into lattice-builds-interaction 2018-08-30 05:41:40 +02:00
Martin Diehl 105c4077ad Merge branch 'development' into 19-NewStylePhenopowerlaw 2018-08-30 00:58:54 +02:00
Martin Diehl b163a8aaa0 Non-schmid activated again
internally, no need for long name plastic_phenopowerlaw_postResults
2018-08-30 00:57:15 +02:00
Martin Diehl b884349e7b only renaming
3333 not needed for dX_dY if X and Y are 3x3 tensors
PK2 stress is S not T according to the DAMASK paper
2018-08-29 13:16:37 +02:00
Martin Diehl 6d28883db5 starting to include non-Schmid terms (again) 2018-08-29 12:07:51 +02:00
Martin Diehl 922273f230 does not make sense to store and use the 6-vector version of the Schmid
matrix
2018-08-29 12:03:31 +02:00
Martin Diehl baeb449e07 WIP: debugging 2018-08-29 11:44:39 +02:00
Martin Diehl f2acc14882 Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development 2018-08-29 08:27:15 +02:00
Martin Diehl 680c9e11d4 segmentation fault in cause of empty list 2018-08-29 08:26:28 +02:00
Martin Diehl b5e4ad247d LpAndItsTangent naming convention following DAMASK paper 2018-08-28 15:40:24 +02:00
Martin Diehl fc3ce54667 return more than one tangent 2018-08-28 15:07:39 +02:00
Martin Diehl 15e2d4a7cd Tstar is S
according to the DAMASK paper
2018-08-28 15:02:58 +02:00
Martin Diehl 4c14f988a3 rename according to paper 2018-08-28 14:58:17 +02:00
Martin Diehl 06e7156351 did not work for values <0 2018-08-28 12:41:21 +02:00
Martin Diehl 42f8b0a063 labels of slip and twin systems for more self-explanatory output 2018-08-28 12:27:56 +02:00
Martin Diehl 94695f773e more verbose and works for arbitrary precision 2018-08-28 07:47:05 +02:00
Franz Roters 38fd517c44 Merge remote-tracking branch 'remotes/origin/36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading' into development 2018-08-27 15:13:16 +02:00
Martin Diehl 38a855243d Merge branch 'development' into 43-wrong-stress-in-dotstate-and-deltastate 2018-08-27 06:31:45 +02:00
Martin Diehl dd81fe806d naming was not completely corrected 2018-08-27 06:30:55 +02:00
Martin Diehl b11666effa Merge branch 'development' into 38-introduce-rudimentary-PETSc-based-FEM-solver 2018-08-26 13:59:50 +02:00
Martin Diehl a5f139b786 unused variables 2018-08-26 11:53:18 +02:00
Martin Diehl 241b2ade8b more portable way to define PI
https://software.intel.com/en-us/forums/intel-visual-fortran-compiler-for-windows/topic/490432
and compiler will not complain about truncation
2018-08-26 11:40:38 +02:00
Martin Diehl 0041d21777 output was screwed up 2018-08-26 06:20:48 +02:00
Martin Diehl 4f1becb503 cleaning and fixing bugs (wrong indices) 2018-08-25 21:27:14 +02:00
Martin Diehl f458de82fa simplified 2018-08-25 21:13:32 +02:00
Martin Diehl 3ff7c9c0eb extendend to Schmid_twin 2018-08-25 20:55:15 +02:00
Martin Diehl fbaac484ea extended to postResults 2018-08-25 20:32:01 +02:00
Martin Diehl 780699740d internal (non)-Schmid definitions also in dotState 2018-08-25 20:19:02 +02:00
Martin Diehl ba9330c8dd early rename 2018-08-25 20:08:46 +02:00
Martin Diehl d51b00c2d3 no need to loop over families and systems independently. no need for 3333 2018-08-25 20:06:19 +02:00
Martin Diehl d055ef665a using only internal schmid and non schmid matrices 2018-08-25 20:01:39 +02:00
Martin Diehl cc5d04ff2a newly introduced parameters for non-schmid were confusing 2018-08-25 19:28:09 +02:00
Martin Diehl 5b3bed3e48 functionality to calculate SchmidMatrices 2018-08-25 18:32:55 +02:00
Martin Diehl d3db0d816c ordered by dimension and set private where possible 2018-08-25 17:29:20 +02:00
Martin Diehl 1c76e156d9 new symmetry handling will be handled in a different branch 2018-08-25 17:19:48 +02:00
Martin Diehl bde242902b Merge branch 'development' into 43-wrong-stress-in-dotstate-and-deltastate 2018-08-25 16:02:12 +02:00
Martin Diehl b8b5bac684 dotState and deltaState parse Mstar instead of Tstar
requires to parse in Fi
2018-08-25 15:59:34 +02:00
Martin Diehl 22a232ad08 bug: memory access out of bounds
introduced when moderninzing reading in of parameters
2018-08-25 15:50:43 +02:00
Martin Diehl 7e002d1bfb missing rename 2018-08-25 14:42:44 +02:00
Martin Diehl e46605f0ef forall is deprecated 2018-08-25 14:36:21 +02:00
Martin Diehl 17d88184a7 typos fixed 2018-08-25 14:35:49 +02:00
Martin Diehl 35688a6acf temp33 not needed (compiler should be smart enough) 2018-08-25 14:29:03 +02:00
Martin Diehl 953fff79ac prepared LpAndItsTangent to remove superflous forward-backward
conversion

updating the individual plastic laws will be done in the respective
branches
2018-08-25 14:21:06 +02:00
Martin Diehl d585deee7e unified syntax
_v for vector representation of tensor conflicts with 3333 suffix for
4-th order tensors.
General idea: Mark symmetric second order tensors in vector notation with
'6' and fourth order tensors in second order matrix notation with '99'.

Append nothing for 'natural' representation, i.e. F and NOT F33, Lp_dTstar and NOT
Lp_dTstar3333
2018-08-25 14:07:23 +02:00
Martin Diehl 025cbddd00 generic function and interfaces for slipSlip, twinTwin, transTrans 2018-08-25 13:08:32 +02:00
Martin Diehl 7ecb7689f1 Intel compiler failed with SIGSEV
derived types, pointers, finalize .... altogether seems to bring both Compilers to their limits.
I cannot see what was wrong before, but now it works and might be a little faster
2018-08-23 00:13:57 +02:00
Martin Diehl 271b9ba76b intersting note ... 2018-08-22 23:28:47 +02:00
Martin Diehl 8c5f3d4e07 only needed once 2018-08-22 22:52:12 +02:00
Martin Diehl 51b4ef319a HDF5 was not compiled due to missing dependency 2018-08-22 20:12:16 +02:00
Martin Diehl dc596e6789 zero termination does not work 2018-08-22 18:09:17 +02:00
Martin Diehl 1a943df97e small flaws 2018-08-22 17:52:00 +02:00
Martin Diehl ab45818d51 seems to work now
anyway, nicer code
2018-08-22 14:30:51 +02:00
Martin Diehl 1b5623ad6c avoid out of bound access, removed unneeded stuff 2018-08-22 14:22:37 +02:00
Martin Diehl 037ab3d081 getTag works now for tags with the same start and close tag
needed for '/echo/'. Still suggest to rather use /echo\
2018-08-22 13:10:59 +02:00
Martin Diehl 52088691d1 improved linked list and fixed solution for strange bug
Bug: Using automated LHS re-allocation for a string array that with global scope seems to cause trouble
     Hence, "parse_file" works with a local string and assings only once to it

Linked_List: Now storing data in the list head also and last element is always empty.
             Finalize allows simple handling of deallocation
2018-08-22 11:51:23 +02:00
Martin Diehl 52002f654e to converge at one point to one (or two) string lenth values 2018-08-22 09:14:16 +02:00
Martin Diehl 0068dba40f Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-22 09:11:33 +02:00
Martin Diehl 4d432e5462 Merge branch 'development' into 38-introduce-rudimentary-PETSc-based-FEM-solver 2018-08-21 23:03:56 +02:00
Martin Diehl 0fa902100c Merge branch 'development' into 39-simplify-obscure-numerics-integration-mode 2018-08-21 22:59:57 +02:00
Martin Diehl 61070fd908 Merge branch 'development' into 37-include-hdf5-routines 2018-08-21 22:46:30 +02:00
Martin Diehl 8de321382f using final seems to be the better approach
http://www.training.prace-ri.eu/uploads/tx_pracetmo/AdvFTN_handout.pdf
still needs in-depth analysis, even though I cannot reproduce 'terminally ill'
2018-08-21 08:14:59 +02:00
Martin Diehl d146417abe hot fix for terminally ill with gfortran 7.3
might be a bug in the compiler or in the linked list.
waste some memory at the moment...
check linked list carefully before enabling again and blaming gfortran
2018-08-21 07:41:10 +02:00
Martin Diehl 465d950ab1 gfortran 7.3 and optimized code still gives 'terminally ill' 2018-08-21 07:09:50 +02:00
Martin Diehl 60f56255e4 [skip sc] [skip ci] simplified interfacing 2018-08-20 23:14:49 +02:00
Martin Diehl 69ad600916 more explicit file opening
still having trouble with Gfortran 7.3 and no numerics.config
2018-08-20 22:36:55 +02:00
Philip Eisenlohr 87a8a9536b absTol for divergence was way too tight 2018-08-20 16:34:43 -04:00
Martin Diehl c78396dd78 randomized FILEUNIT
matrix inversion error when numerics.config is not there or not present
very strange
2018-08-20 22:11:53 +02:00
Martin Diehl e47677738a more verbose error 2018-08-20 17:57:15 +02:00
Martin Diehl 031c59954f working directory is changed automatically 2018-08-20 17:45:34 +02:00
Martin Diehl 29cd8fa5e2 Merge branch 'development' into 36-include-hdf5-routines 2018-08-20 17:35:32 +02:00
Martin Diehl dbed7056e5 [skip sc] cleaning 2018-08-20 17:08:33 +02:00
Martin Diehl 93562d5142 mapping of elements etc not needed for PETSc-based FEM and spectral
solvers
2018-08-20 16:42:47 +02:00
Martin Diehl e3e905938e all elements are CP elements 2018-08-20 16:23:05 +02:00
Martin Diehl 3e4c878304 using shared interface for spectral and FEM solver
group_scalar seems inappropriate as integers are also scalars. renamed
to group_float (is actually usually of double precision).

think about better name, types should have a t prefix. tgroupFloat?
2018-08-20 16:09:40 +02:00
Martin Diehl b8d56ae320 unfified interface for spectral and FEM solver
Note: extension to load case and geometry is not added automatically
anymore!
2018-08-20 15:59:13 +02:00
Martin Diehl f29a5b3df3 not used at all 2018-08-20 13:15:44 +02:00
Martin Diehl 543c49426f Merge branch 'development' into 38-introduce-rudimentary-PETSc-based-FEM-solver 2018-08-20 09:09:15 +02:00
Martin Diehl 3a097d1099 Merge branch 'development' into 36-faster-file-handling-for-material-config-use-stream-access-instead-of-line-wise-reading 2018-08-20 09:04:28 +02:00
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 1493b33a03 fixed buggy state width assignment (endindex += %nSlip corrected to %totalNslip) 2018-08-14 01:07:06 +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 fd578ab8eb Merge branch 'development' into 19-NewStylePhenopowerlaw 2018-08-05 07:38:09 +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 8a32ed8747 calculating non-schmid related data only once 2018-08-03 23:03:51 +02: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 5cf2973715 naming reflect change from Piola-Kirchhoff to Mandel stress
not using the symmetrized stress anymore to avoid handling of
symmetrized Schmid matrizes. The time saved when calculating the double
contraction is probably anyway lost during the conversion from (3,3) to
(6) of Mstar
2018-08-03 14:53:40 +02:00
Martin Diehl b8e8193001 many imported functions not used anymore, moving parameters to structure 2018-08-03 11:10:22 +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 1c83f841aa don't depend on any shear band parameters if sbVelocity is switched of 2018-07-20 17:52:15 +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 8554279351 outputID is not of default integer type (causes trouble with MSC.Marc) 2018-07-20 04:02:49 +02:00
Sharan Roongta 3f285d3a3f polishing: prm replaces param(instance) 2018-07-17 19:29:39 +02:00
Martin Diehl a3037a6064 cmpftwin was not read in 2018-07-17 18:02:55 +02:00
Martin Diehl b3a6aabdc5 cthresholdtwin was not read in!
polished and commented
2018-07-17 12:32:57 +02:00
Martin Diehl edcf97ea59 associate: clearer code and no performance drawbacks 2018-07-16 22:02:31 +02:00
Martin Diehl df42e9ed88 using associate avoids performance issues related to pointers 2018-07-16 21:37:26 +02:00
Martin Diehl e0e03827c5 simplified 2018-07-16 21:14:33 +02:00
Martin Diehl fb1265db3d checking for existing file 2018-07-16 20:08:31 +02:00
Martin Diehl fc0499a9bb bug fixes and polishing
bugs: wrong bracket in calculation of threshold_stress_twin
      3**b_twin instead of 3*b_twin in calculation of threshold_stress_twin
      ph instead of instance in calculation of mfp_twin
2018-07-16 19:53:26 +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 84c29bb255 Merge branch 'development' into 19-NewStyleDislotwin 2018-07-13 11:54:42 +02:00
Sharan Roongta 0c7c77987b typo in plastic dislotwin 2018-07-12 23:22:55 +02:00
Sharan Roongta eb7860ba22 Tolerances were different from original 2018-07-12 18:30:30 +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 a78d1d7556 Merge branch 'development' into 20-NewStyleDislotwin 2018-07-07 13:26:45 +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 88b9da1973 using up-to-date development since Abaqus exp has been removed 2018-07-06 19:00:58 +02:00
Martin Diehl a9845c4bf8 using wrong default for dipole formation 2018-07-06 18:57:37 +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 580a0bbedd reading in interaction parameters, looping only over existing families 2018-07-05 13:09:11 +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 9d993de256 should not be executable 2018-07-03 19:34:26 +02: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 cc0db1a577 WIP: compiles 2018-06-27 17:38:52 +02:00
Martin Diehl 158e6fd601 Merge branch '30_parsePhasePartOnce' into 20-NewStyleDislotwin 2018-06-27 11:24:42 +02:00
Sharan Roongta 90d9724b9f Reading in of parameters using list 2018-06-27 11:22:16 +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 2480d2f1ba Reading in of parameters made consistent 2018-06-25 20:07:35 +02:00
Sharan Roongta 57c6f44dfc Merge branch '30_parsePhasePartOnce' into 20-NewStyleDislotwin 2018-06-25 15:36:23 +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
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 277cc59069 Merge branch 'development' into 20-NewStyleDislotwin 2018-05-31 17:07:38 +02:00
Martin Diehl 72b69959de Merge branch 'development' into 19-NewStylePhenopowerlaw 2018-05-31 17:02:45 +02:00
Sharan Roongta 1a5ed20708 outputID is part of param(instance) array, reading in of output made consistent with kinematic hardeing law/outputtag not needed 2018-05-29 18:29:38 +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