Martin Diehl
0810295fe9
Merge branch 'development' into cmake
...
Conflicts:
code/Makefile
2016-05-21 14:56:57 +02:00
Martin Diehl
6023f64eff
Merge branch 'cmake' of magit1.mpie.de:damask/DAMASK into cmake
...
Conflicts:
CMakeLists.txt
2016-05-21 12:37:05 +02:00
Philip Eisenlohr
0b5ce0ed80
Merge branch 'CCodeUse' into 'development'
...
C code use
Use a standard conforming C-to-Fortran wrapper to have access to system routines available in C but not in standard Fortran. Having PETSc as a backend ensures that we have a C compiler (don't make it as complex as with f2py). No need to use vendor specific extensions to figure out if a path is a directory and to get the current working directory anymore. Simplifies the makefiles (only exceptions currently are for NaN to be compatible to older gfortran).
See merge request !6
2016-05-21 03:31:41 +02:00
Martin Diehl
475c864ea3
using different CMAKE projects for FEM/Spectral
2016-05-20 11:51:50 +02:00
Martin Diehl
b4ecea564f
also not needed anymore (still to decide how to set bin directory for processing scripts)
2016-05-20 08:50:02 +02:00
Martin Diehl
8184f1c39a
old Makefile is not needed anymore
2016-05-20 08:45:22 +02:00
Martin Diehl
a009bfaf08
renamed _FLAG(S) consistently to _FLAGS
...
removed code doubling
2016-05-20 08:44:11 +02:00
Martin Diehl
85cfe670ae
same defaults for spectral and FEM solver
2016-05-20 08:15:49 +02:00
Martin Diehl
f4ddb0f9d2
was not doing anything
2016-05-20 08:09:06 +02:00
Martin Diehl
abb686029d
version was never used and wrong defined
2016-05-20 08:06:06 +02:00
Test User
b8ae4fbfb6
updated version information after successful test of v2.0.0-262-gbd1beb4
2016-05-20 04:21:23 +02:00
Martin Diehl
bd1beb4ae6
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2016-05-19 13:01:55 +02:00
Martin Diehl
20b3b43785
wrong pointer alias (no harm caused so far)
2016-05-19 13:01:13 +02:00
Test User
5523d5d9ef
updated version information after successful test of v2.0.0-259-gaa9a8b2
2016-05-19 04:21:42 +02:00
Martin Diehl
aa9a8b21c7
lables is now a method, not an attribute
2016-05-18 18:31:54 +02:00
Martin Diehl
be99018ce3
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2016-05-18 18:28:57 +02:00
Martin Diehl
5ef9c65cbe
cleaning
2016-05-18 08:54:16 +02:00
Martin Diehl
3b843b1dd9
linux line endings
2016-05-18 08:22:37 +02:00
Martin Diehl
91f96cf69b
reverted handling back
2016-05-18 07:52:19 +02:00
Martin Diehl
97f7abf915
cleaner declaration
2016-05-17 23:16:17 +02:00
Philip Eisenlohr
a7c15b4c00
avoided quoting of "N of x" and "a to b".
2016-05-17 11:29:31 -04:00
Philip Eisenlohr
12affbd240
simplified and corrected
2016-05-17 11:23:57 -04:00
Philip Eisenlohr
d669cfb024
removed obsolete importing of sys
2016-05-17 11:15:04 -04:00
Philip Eisenlohr
a8765a963d
more fixing of old .labels use
2016-05-17 11:12:26 -04:00
Philip Eisenlohr
0c1657693f
dirty (but working) fix to adopt table.labels now being table.tags: table.labels --> table.labels(raw = True)
2016-05-17 10:52:21 -04:00
Martin Diehl
66e06cf61f
shebang for python2 got lost
2016-05-17 16:41:38 +02:00
Philip Eisenlohr
9103ee544b
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2016-05-17 09:52:18 -04:00
Martin Diehl
fa3d8fa460
adopted description/simplified
2016-05-17 11:05:50 +02:00
Aritra Chakraborty
8d6c601a45
fixed python flake complaints.
2016-05-16 20:17:17 -04:00
Aritra Chakraborty
8e01247597
merged functionality of fillTable (change existing column values) into addCalculation. If labels already exist, they are altered. Otherwise, new columns are appended.
2016-05-16 20:06:13 -04:00
Aritra Chakraborty
1c36380a8a
fixed typo...
2016-05-16 20:05:57 -04:00
Aritra Chakraborty
515b8ee457
reworked use of "labels" property to proper methods for access.
2016-05-16 19:55:06 -04:00
Aritra Chakraborty
dc6260be58
changed "labels" property to "tags". added method to inquire about (abstract) labels, i.e. interpreting the tag list to distill underlying label "meaning".
2016-05-16 19:54:00 -04:00
Aritra Chakraborty
8540748220
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2016-05-16 19:45:57 -04:00
Martin Diehl
49b02ac1f2
label name inline with current scheme
2016-05-13 22:46:03 +02:00
Martin Diehl
fa5ebdd46b
added correct metavar
2016-05-13 09:43:56 +02:00
Martin Diehl
61c93bdbf4
adjusted help message for automated documentation
2016-05-12 08:54:34 +02:00
Aritra Chakraborty
4a273f9cb3
Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development
2016-05-11 14:53:21 -04:00
Aritra Chakraborty
739fc0f9ad
introduced H_int for family--wise assignment of initial hardening rate.
2016-05-11 14:53:05 -04:00
Philip Eisenlohr
ba6889a54f
removed debug statement
2016-05-11 10:04:55 -04:00
Philip Eisenlohr
280076e7ef
removed (probably obsolete) warning about missing h5py module.
2016-05-11 10:04:01 -04:00
Martin Diehl
7ea5ce73ae
line too long
2016-05-11 11:46:20 +02:00
Martin Diehl
0da55113f9
not needed anymore
2016-05-11 11:44:24 +02:00
Martin Diehl
d3ee2c05b9
=removed remaining IDs
2016-05-11 11:43:21 +02:00
Martin Diehl
7f24fe15ed
removed svn ID from python files
2016-05-11 11:37:59 +02:00
Martin Diehl
b9e768f879
removed old svn ID tag
2016-05-11 11:33:16 +02:00
Martin Diehl
a21e8cd863
usind explicitly python2 to run in environments with python 3 as default
2016-05-11 11:01:39 +02:00
zhangc43
eaacde48ba
Merge branch 'pheno+' into cmake
2016-05-06 18:26:22 -04:00
zhangc43
c6ddfae4e0
specify OPTIMIZATIO in makefile
2016-05-06 18:26:03 -04:00
zhangc43
89db00da0a
change default optmizatio schem
2016-05-06 17:49:36 -04:00