3c1012ef38
cut out more now useless pieces
2018-07-03 22:12:25 +02:00
efee9d98e7
elseif contained only debug statements, not needed
2018-07-03 21:58:28 +02:00
bebcd53445
more commenting, clearer variable naming, stress_mask as param
2018-07-03 15:51:46 -04:00
b1a7eca528
array access out of bounds
2018-07-03 19:32:31 +02:00
8eeec5c0f1
also Abaqus works with openMP now/again?
2018-07-03 12:05:14 +02:00
b1c37996d3
also using short names for state and dotstate in postResults
2018-06-30 14:35:58 +02:00
c50f32b0d8
shorthand names improve readability for dotstate and LpAnd...
2018-06-30 14:11:05 +02:00
980e34f728
state pointer as shortcut, variables not used
2018-06-30 13:37:13 +02:00
fb80c41215
Merge branch 'development' into 19-NewStylePhenopowerlaw
2018-06-30 13:16:04 +02:00
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
8c727eb4ff
removed obsolete second assignment of slipRate and accSlip pointers
2018-06-29 18:07:32 -04:00
e166f118f4
Merge branch 'development' into 31_consistent_wd
2018-06-29 15:46:55 +02:00
613e976a86
the working directory and pathes of load and geometry files are now consistent.
2018-06-29 15:36:12 +02:00
a308b2130a
Merge branch 'development' into 21_removeperformanceprofiling
2018-06-28 13:09:11 +02:00
e8a4f588f4
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-28 07:24:04 +02:00
b3862ef800
enough to support 3 versions (2018 should be out already/soon)
2018-06-28 07:22:32 +02:00
716065c0cd
Merge branch 'development' into 30_parsePhasePartOnce
2018-06-27 21:43:09 +02:00
2bee95bfee
argument for checking expected shape in the future
2018-06-27 18:04:06 +02:00
49126d2f6f
further simplified
2018-06-27 10:19:50 +02:00
0f05565fd5
don't complicate code with potential enhancements
2018-06-27 10:09:19 +02:00
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
00f34363dc
adjusted naming convention
2018-06-27 09:12:33 +02:00
fb528dad52
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-27 09:05:37 +02:00
78f9a107fe
exception for empty list
2018-06-27 09:04:14 +02:00
96e5175f41
updated rename
2018-06-26 21:08:13 +02:00
2bc919e4e3
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-26 21:04:10 +02:00
fc83a76318
consistent naming
2018-06-26 20:54:54 +02:00
ea80e04ea8
deallocating config, simplifying
2018-06-26 20:50:06 +02:00
bb415e8a02
using array size not to rely on correctly set variable, cleaning crystallite data after use
2018-06-26 20:33:41 +02:00
98cc56968e
don't rely on a variable, use the array size directly
2018-06-26 20:33:02 +02:00
d786ead381
freeing space
...
debug statements have been inactive for a while ...
2018-06-26 20:31:52 +02:00
1abe747204
possibility to deallocate material.config parts
2018-06-26 20:30:41 +02:00
a68c466fc6
simplified
2018-06-26 19:18:23 +02:00
66a254f8fb
polishing
2018-06-26 19:09:46 +02:00
6a75021bca
need to check at the beginning
...
wrong logic in case default was overwritten
2018-06-26 19:09:08 +02:00
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
b907acfbfa
improved if then else logic here and there
2018-06-26 11:36:45 -04:00
a8c69dfcad
commit spectral_interface
2018-06-26 16:09:37 +02:00
1b920705d7
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2018-06-26 10:03:02 -04:00
5c9f6c61b1
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-26 08:22:44 +02:00
a5ca26ab10
bug (copy and paste): fiber should be counted, not gauss
2018-06-26 08:20:40 +02:00
860899b769
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-26 08:03:49 +02:00
0680b1706f
improved error handling
2018-06-26 07:56:20 +02:00
6ffac60961
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-26 07:38:53 +02:00
a91fa75a28
sanity check, something is going wrong with intel 16.0
2018-06-26 07:38:41 +02:00
300b2827b2
Using new functions for parsing material config
2018-06-25 15:28:15 +02:00
6cd08a38b1
pre-defined variables seem to work for gfortran
2018-06-25 14:06:13 +02:00
d484d1b5bb
fixed typo and removed alias
2018-06-25 10:33:22 +02:00
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
74aec7bb71
circumventing bug in Gfortran, tests use correct label (a_slip)
2018-06-22 18:14:14 +02:00
363c083886
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-22 17:57:33 +02:00
1add0f3d84
gfortran does not recognice an empty array as 'present'
2018-06-22 08:03:22 +02:00
c5ebe3510f
simplified by using empty string list as default
2018-06-21 23:49:07 +02:00
c5b00e7a6c
consistent description
2018-06-21 23:48:34 +02:00
0f3485c4a1
using default value for when getting strings, setting correct size for post results
2018-06-21 23:14:30 +02:00
fd097846ae
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-21 22:47:51 +02:00
367e6a4eee
consistent string length (de-facto standard 65536)
2018-06-21 22:39:18 +02:00
bed9220597
consistent string name and more verbose "prm" for shortcut parameters
2018-06-21 22:38:48 +02:00
f61f22924a
empty string list as default value simplifies logic
2018-06-21 22:38:06 +02:00
adefbd95e6
don't use intrinsic names of keywors as function names
2018-06-21 22:34:32 +02:00
910aad1094
Marc 2014 requires old compiler not supported any more
2018-06-21 21:54:07 +02:00
b58489c1c2
merged all config related data into the config module
2018-06-19 23:53:14 +02:00
8bcaaf11a5
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-19 23:44:16 +02:00
5302782dad
need to search for cumulative tag
2018-06-19 23:42:15 +02:00
7aa8cac164
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-19 23:10:06 +02:00
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
d177afa9e1
unallocated array
2018-06-19 22:59:18 +02:00
9aa211605f
having no output in crystallite caused trouble
2018-06-19 22:58:46 +02:00
13f280367e
using config module
2018-06-19 19:43:41 +02:00
d7da70cefb
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-19 19:30:01 +02:00
2b5db71739
using consistent names
2018-06-19 19:25:29 +02:00
efd2eae63e
first step to get rid off getStringsRaw
2018-06-19 19:16:03 +02:00
fc54104599
getStrings works for cumulative and non-cumulative
2018-06-19 18:38:32 +02:00
8d5d306076
getStrings has functionality for multiple entries in a row of cumulative
...
searches
2018-06-19 18:02:53 +02:00
3b676af215
always search for last occurrence
2018-06-19 18:02:53 +02:00
8739bada26
always search for last occurrence
2018-06-19 13:08:14 +02:00
8aeb4a115e
first commit.
2018-06-18 16:19:03 +02:00
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
32d481020f
Merge branch 'development' into 30_parsePhasePartOnce
2018-06-16 14:49:57 +02:00
0e4379f7ec
straightened out logic and variable naming
2018-06-15 20:42:28 +02:00
999d0d774e
first try of unifying getInts and getIntArray
2018-06-15 19:23:04 +02:00
7388cbb940
'split' should be default, wrong position in stringPos
2018-06-14 20:39:23 +02:00
877481811b
old statement was overcomplex
2018-06-14 18:25:16 +02:00
aebb06eaa9
source code files should not be executable
2018-06-14 16:44:11 +02:00
05ac53430e
always using last key in list to be compatible with convention
2018-06-14 08:32:02 +02:00
9c12ce5539
more general name (should include parsing of debug and numerics)
2018-06-14 06:39:49 +02:00
a11c6e0fea
convention: intent(out) first, intent(in) last
2018-06-14 06:35:28 +02:00
bd97bc8c39
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2018-06-12 14:33:15 -04:00
bedc17b1c6
nicer formatting
2018-06-12 14:33:08 -04:00
e29add3bce
intitial values are not given by default
2018-06-11 07:33:45 +02:00
ca24681c49
variable is undefined if no echo tag is found
2018-06-11 00:42:42 +02:00
04b8218d2c
module name and file name should match
2018-06-11 00:28:36 +02:00
1c8c33595e
more precise name
2018-06-11 00:27:30 +02:00
940d9fcbab
cleaning
2018-06-11 00:23:43 +02:00
fdd3bd1262
polishing
2018-06-11 00:16:48 +02:00
e0a6b79b14
trying to have descriptive names
2018-06-10 23:38:16 +02:00
a1fdbd1d5e
most IO related variables not needed any more in material
2018-06-10 18:38:31 +02:00
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
f8ae0ec925
list does tokenizing automatically
2018-06-10 11:07:17 +02:00
08a4da01e0
IO_stringPos failed when parsing trimmed string
2018-06-10 11:03:34 +02:00
73e915c35a
wrong dependencies cause failure during compilation
2018-06-10 07:05:25 +02:00
cb0cb29393
reading in done by one function
2018-06-09 13:48:37 +02:00
11ab56e5d1
migrating reading in of material.config to own module
2018-06-08 21:01:58 +02:00
81dffef21c
Merge branch 'development' into 23_BasticPETSc_2_PETSc
2018-06-04 17:03:13 +02:00
c903880d19
using on unitialized error caused segfault in some cases
2018-06-04 12:38:28 +02:00
ab4f5413c6
line should have the correct return value
2018-06-03 14:27:43 +02:00
0f8fe555c5
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-03 10:49:28 +02:00
b055416026
also parsing texture only once
2018-06-03 10:44:20 +02:00
e7d27a3991
function to return plain strings (in case they have a different syntax)
2018-06-03 10:43:43 +02:00
5b5f10aecf
parsing homogenization-related data
2018-06-03 00:36:34 +02:00
1e5106f601
return empty string array if nothing found (plasticity detect changes failed)
2018-06-02 23:10:38 +02:00
5ec98f65b4
wrong intialization, homogenization test failed
2018-06-02 23:10:08 +02:00
e93e380ad3
output tag was empty:
2018-06-02 21:00:47 +02:00
3fec2c960d
missing initialization caused problems
2018-06-02 21:00:26 +02:00
db32bd1fd6
initializing lattice after materials allows to use the pre-parsed material.config
2018-06-02 20:59:30 +02:00
4ee62538d7
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-02 19:33:06 +02:00
142ce51c9c
homogenization and crystallite use new structure
...
math_transpose33 has no advantage over transpose intrinsic
2018-06-02 19:28:08 +02:00
4fd2338d35
added parsing of homogenization and workaround for gfortran
2018-06-02 19:27:03 +02:00
c2d30aec43
gfortran has issues with zero-sized string arrays:
2018-06-02 19:24:53 +02:00
fdf8833c36
debug output not needed any more
2018-06-02 13:31:21 +02:00
c7da8c7f75
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-02 13:24:17 +02:00
bc03b8670a
parsing microstructure, phase, and crystallite in one loop
2018-06-02 13:23:42 +02:00
11383a2aca
proper error checks
2018-06-02 10:19:22 +02:00
cfc1a48833
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-02 09:52:00 +02:00
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
bf43156112
search for global tags can stop once first section is found
2018-06-02 06:32:16 +02:00
29a0ec2800
polishing
2018-06-02 05:39:40 +02:00
a0a5d4c549
only doing things that are required
...
rely on default values where applicable
2018-06-02 05:38:45 +02:00
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
de39edda5b
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-01 23:19:08 +02:00
8e0a3ff389
arrays have no variable length, need to check for empty string
2018-06-01 23:14:43 +02:00
7db08f0a76
using material.config values from main memory
2018-06-01 22:56:20 +02:00
02fdfa8445
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-01 21:26:29 +02:00
70166657a9
FILEUNIT still needed
2018-06-01 21:25:08 +02:00
cd9fb1c544
adjusting variable names in isotropic to DAMASK paper
2018-06-01 21:23:25 +02:00
64270f6c95
no need to store trailing whitespace
2018-06-01 21:22:19 +02:00
f843254233
Noutput not needed, using size ensures consistency
2018-06-01 20:54:40 +02:00
e0ec7ab54f
Merge branch '30_parsePhasePartOnce' into 19-NewStylePhenopowerlaw
2018-06-01 14:23:16 +02:00
c8cec5a121
some more functions to parse material.config from memory
2018-06-01 14:14:53 +02:00
cfefcaebb8
simplifying
2018-06-01 11:33:13 +02:00
48851c00f6
sizePostResults not needed, transpose33 has no advantage over transpose:
2018-06-01 11:24:00 +02:00
5de4b47438
plastic isotropic parses material.config from main memory, not from file
2018-06-01 10:24:42 +02:00
052a0af2ac
storing phase part of material.config per section in chained list
2018-06-01 10:14:46 +02:00
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
804febe7f9
WIP: separate reading in and parsing
2018-05-31 18:31:44 +02:00
72b69959de
Merge branch 'development' into 19-NewStylePhenopowerlaw
2018-05-31 17:02:45 +02:00
60e30e4a64
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2018-05-28 07:03:56 +02:00
e661a42a4c
citation block should be separated by empty lines
2018-05-28 07:01:50 +02:00
715f2a59d0
Merge branch 'development' into release_bugfix
2018-05-27 14:10:38 +02:00
87a16b775e
function to change working directory
2018-05-27 14:08:23 +02:00
Philip Eisenlohr