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
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
Yi-Chin Yang
35a4fdc358
"et al." instead of "et. al" abbreviates "et alii", meaning "and others"
2018-04-22 10:07:49 +02:00
Yi-Chin Yang
e90861956d
"et al." instead of "et. al" abbreviates "et alii", meaning "and others"
2018-04-22 09:32:59 +02:00
Sharan Roongta
488ff6bb2d
Rectifying a typo
2018-04-18 15:30:54 +02:00
Sharan Roongta
71d23274e7
A citation on twinning was missing
2018-04-18 15:22:19 +02:00
Sharan Roongta
451e9f245a
Removing some typos in citations
2018-04-18 15:01:03 +02:00
Sharan Roongta
90a1af5096
Cited HybridIA algorithm
2018-04-18 14:18:48 +02:00
Sharan Roongta
e77e0b6f20
Merge branch '17-citations-in-source-code' of magit1.mpie.de:damask/DAMASK into 17-citations-in-source-code
2018-04-17 15:54:20 +02:00
Sharan Roongta
3fca8da6aa
Citations in plastic_twin
2018-04-17 15:51:59 +02:00
Yi-Chin Yang
4f5b5d9d4a
Merge branch '17-citations-in-source-code' of magit1.mpie.de:damask/DAMASK into 17-citations-in-source-code
2018-04-17 15:42:45 +02:00
Yi-Chin Yang
b7d622c32d
No tab allowed
2018-04-17 15:39:08 +02:00
Yi-Chin Yang
258be943c7
No tab allowed
2018-04-17 15:25:27 +02:00
Yi-Chin Yang
fc3abd4f39
References for spectral solvers
2018-04-17 15:22:18 +02:00
Yi-Chin Yang
41967da684
edit
2018-04-17 15:09:12 +02:00
Yi-Chin Yang
d6d9d6e1bb
edit
2018-04-17 15:07:16 +02:00
Yi-Chin Yang
86683674c0
mod
2018-04-17 14:52:50 +02:00
Sharan Roongta
3bd09fe837
fixed typo
2018-04-17 14:43:38 +02:00
Yi-Chin Yang
afcaafa798
Reference for homogenization_RGC added
2018-04-17 08:20:41 +02:00
Yi-Chin Yang
0701b535fc
DAMASK overview reference independently of selected solver
2018-04-16 16:16:10 +02:00
Martin Diehl
ea9434432e
added reference for the tungsten model
2018-04-09 15:04:58 +02:00
Martin Diehl
8509b13f16
avoid numerical noise
2018-03-13 09:21:41 +01:00
Martin Diehl
302a5017d4
Merge branch 'development' into 12-fixOrientationSampling
2018-03-13 04:12:03 +01:00
Martin Diehl
2ceb3aeea0
not all variables were consistently renamed
2018-03-13 03:56:02 +01:00
Martin Diehl
44e5644e78
fixed random Gaussian sampling
...
sampling needs to be performed from unfiform misorientation, NOT uniformly distributed rotations
for Fiber, compute uniform tilt of Fiber axis
2018-03-13 03:36:24 +01:00
Zhuowen Zhao
361cf680a5
merged more recent development
2018-03-09 18:19:41 -05:00
Zhuowen Zhao
f26fd1d1dc
Fixed a physics issue: sense change with respect to difference between resolved stress and backstress
2018-03-09 18:01:09 -05:00
Martin Diehl
0ccce7facc
fixed missing angle initialization, simplified and commented
2018-03-08 17:33:54 +01:00
Philip Eisenlohr
88c46d500e
Merge branch '13-higher-order-thermal-expansion' into 'development'
...
Resolve "higher-order thermal expansion"
Closes #13
See merge request damask/DAMASK!19
2018-02-28 21:08:01 +01:00
Martin Diehl
e716441787
indexing now follows description
2018-02-26 20:18:38 +01:00
Martin Diehl
cd4115bada
now using the correct rotation formula
2018-02-26 11:14:02 +01:00
Martin Diehl
e1c4c7e6e8
wrong indices in matrix rotation
...
fixing this resolves issue 14: "Poor performance after load case rotation"
now inline with http://www.continuummechanics.org/rotationmatrix.html
C'_mnop = R_mi R_nj R_ok R_pl C_ijkl
2018-02-25 21:01:23 +01:00
Philip Eisenlohr
bc998846ab
thermal expansion coefficient alpha = a + b(T-T_0) + c(T-T_0)^2
2018-02-25 14:14:03 -05:00
Martin Diehl
c2ced6a274
not needed anymore
2018-02-25 14:45:35 +01:00
Martin Diehl
d5d71d2321
math_transpose33 has no benefit here
2018-02-25 13:42:02 +01:00
Martin Diehl
42500eabff
simplified (math_transpose33 does not provide any benefit here)
2018-02-25 12:48:58 +01:00
Martin Diehl
eedec74a6a
correct debug reporting
2018-02-25 12:31:23 +01:00
Martin Diehl
86768c38d9
source code should not be executable
2018-02-25 10:16:27 +01:00
Martin Diehl
4f4fa5daf8
simplified
2018-02-22 14:54:49 +01:00
Martin Diehl
e51de7ffd8
explicitly select halton bases in call
2018-02-22 14:16:36 +01:00
Martin Diehl
c6c66bb653
using proper Gauss sampling also for the fiber components
...
function most probably still contains a bu
2018-02-22 00:42:06 +01:00
Martin Diehl
5c908e44ec
correct scaling for FWHM
...
FWHM was wrong by a factor of approx 2.
Analytic expression can be found in https://en.wikipedia.org/wiki/Gaussian_function
2018-02-22 00:10:38 +01:00
Martin Diehl
9173d12d14
correct algorithm for sampling of uniform orientations and fix for Halton series
...
Halton series gives strange results for large prime numbers, now always starting with 2 for first dimension, 3 for second etc.
Consecutive Halton numbers for rejection sampling seem to cause problems (i.e. introduce patterns).
Algorithm for uniformly distributed orientations with FWHM specified is taken from https://math.stackexchange.com/questions/131336 .
WIP: Gauss filtering is currently not implemented!
2018-02-21 20:32:52 +01:00
Martin Diehl
ae27660e86
simplified halto procedure (still needs testing)
2018-02-21 18:47:39 +01:00
Martin Diehl
98df2d1427
better description and names
2018-02-21 16:49:29 +01:00
Martin Diehl
a52f54a9a0
fixed typo in prime number list and extended to 1600 values
...
source https://people.sc.fsu.edu/~jburkardt/f_src/halton/halton.f90
2018-02-21 14:37:02 +01:00
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