Martin Diehl
a308b2130a
Merge branch 'development' into 21_removeperformanceprofiling
2018-06-28 13:09:11 +02:00
Martin Diehl
20f70dc943
Merge branch 'development' into 25_materialConfigPythonInclude
2018-06-28 13:07:16 +02:00
Martin Diehl
5e5f975bff
Merge branch '30_parsePhasePartOnce' into development
...
Changes have been reviewed by Philip, just waited for all tests to pass.
Failing tests were partly related to version mismatches on the test
server for Compiler, python etc.
2018-06-28 12:38:08 +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
9101af84c6
only testing Marc 2017
...
Using Intel 17 Compiler even though recommended Compiler is 16.0.2
We only have 16.0.0 and that gives random segmenation faults
2018-06-28 06:47:22 +02:00
Martin Diehl
b6631da299
Merge branch 'development' into 30_parsePhasePartOnce
2018-06-27 21:45:50 +02:00
Martin Diehl
1ae9f79ab4
forgot to remove stage
2018-06-27 21:45:29 +02:00
Martin Diehl
716065c0cd
Merge branch 'development' into 30_parsePhasePartOnce
2018-06-27 21:43:09 +02:00
Martin Diehl
7e0aca6a45
Don't know which compiler is needed for Marc 2015
2018-06-27 21:42:12 +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
78f9a107fe
exception for empty list
2018-06-27 09:04:14 +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
Philip Eisenlohr
1b920705d7
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2018-06-26 10:03:02 -04:00
Martin Diehl
a5ca26ab10
bug (copy and paste): fiber should be counted, not gauss
2018-06-26 08:20:40 +02:00
Martin Diehl
0680b1706f
improved error handling
2018-06-26 07:56:20 +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
Vitesh Shah
aad3611bb4
Defined a new function to handle recursive file includes
2018-06-25 15:10:54 +02:00
Vitesh Shah
47a6e6b292
Added functionality to read include statements on the go
2018-06-22 12:13:43 +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
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
28b82fe511
bugfixes
...
type on zsh gives information in prefix, = comparison operator should
not be in in string
2018-06-21 21:50:11 +02:00
Martin Diehl
f225591ccc
transition compatibility not needed anymore, more verbose
2018-06-21 21:30:14 +02:00
Martin Diehl
b58489c1c2
merged all config related data into the config module
2018-06-19 23:53:14 +02:00
Martin Diehl
5302782dad
need to search for cumulative tag
2018-06-19 23:42:15 +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
2b5db71739
using consistent names
2018-06-19 19:25:29 +02:00