Commit Graph

370 Commits

Author SHA1 Message Date
Chen Zhang 3991813595 fix syntax error regarding several static method 2015-08-10 21:08:00 +00:00
Philip Eisenlohr d4e748b654 outsourced multiple repetitive functions into ASCIItable class.
changed ASCIItable API from file-handles to filenames.

adopted these changes in pre and post processing scripts.

unified behavior and look.

fixed bugs here and there.

improved functionality.
2015-08-07 19:03:26 +00:00
Chen Zhang dfe0991134 adding property alias for Orientation class to simplify syntax. 2015-08-04 20:38:06 +00:00
Chen Zhang 1ec3639cf1 use pure python implementation of orientation class as default 2015-08-02 17:49:38 +00:00
Chen Zhang fbb7f9b11b remove deprecated function from math.f90 2015-07-29 20:49:42 +00:00
Chen Zhang 9287d6f15f make the interface for Symmetry class compatible with pure python version. 2015-07-29 19:39:30 +00:00
Chen Zhang 5f74f3e95e add Cython version of orientation module to provide faster orientation calculation. 2015-07-29 19:23:06 +00:00
Chen Zhang 70606770d0 correct two typos in Quaternion class 2015-07-28 20:10:27 +00:00
Chen Zhang bfedf037c6 add asAngleAxis() to Orientation class 2015-07-22 21:49:24 +00:00
Chen Zhang 08f4495721 changed readArray default behavior to reading always scalars when columns are referenced by number 2015-07-21 20:44:40 +00:00
Philip Eisenlohr c46e639a38 fixed bug preventing first line to be read when using readArray without labels. 2015-07-09 03:40:15 +00:00
Yannick Naunheim 5fe65bfcc3 corrected OR models and set up simple test to check them 2015-06-29 16:02:56 +00:00
Martin Diehl 50bcfe6e0d possibility to give fixed seed to random orientation 2015-06-26 06:32:25 +00:00
Martin Diehl 6aaf074651 bug fix 2015-06-25 16:16:01 +00:00
Martin Diehl f10dfa311a fixed ORs 2015-06-25 12:00:08 +00:00
Philip Eisenlohr 2d8af638b0 added optional keyword `degrees´ to q.asEulers().
added methods inFZ, equivalentQuaternions, and equivalentOrientations to Orientation class.
general polishing…
2015-06-21 12:05:17 +00:00
Philip Eisenlohr 16edd1693d now only trying to close input and output tables.
corrected buggy behavior in case no columns found in data_readArray.
2015-06-19 06:08:09 +00:00
Philip Eisenlohr 83547ce29f condensed multiple import statements into general one at module start. 2015-06-15 15:36:58 +00:00
Philip Eisenlohr 66ce1d0b33 speed up for inversePole method. Now only performing symmetry equivalence when asked for SST. 2015-06-13 11:51:10 +00:00
Philip Eisenlohr 0efbd4b11f added Colormap.color(fraction) function to interpolate a color from the colormap.
cleaned Colormap.export by now relying on new interpolation function.
2015-06-13 11:46:32 +00:00
Philip Eisenlohr 3d7dfba40a syntax polishing 2015-06-13 11:43:34 +00:00
Martin Diehl d894900c2e added support for marc 2014:X 2015-06-11 18:19:52 +00:00
Philip Eisenlohr 48f31f13a6 label_index now transparently searches for “1_”+label if label itself not found.
added label_dimension method returning the dimension of the requested object, i.e. 1, 3, or 9 as typical outcomes.
2015-06-08 05:02:11 +00:00
Philip Eisenlohr 83d5686995 added check before trying to delete/dismiss file 2015-06-06 11:18:39 +00:00
Philip Eisenlohr a8d61a29d6 added newlines at end of colormap.exports 2015-06-06 11:09:15 +00:00
Philip Eisenlohr 5adbe74b10 changed library function name table.labels_index() to table.label_index() 2015-06-05 11:44:17 +00:00
Tias Maiti 9d5ca8b631 orientation matrix shape checked in “ fromMatrix “ function 2015-05-28 21:52:05 +00:00
Philip Eisenlohr 58eb4fc301 transparent (3,3) reshape of matrix when generating orientation. 2015-05-27 18:56:18 +00:00
Harsha Phukan c8d774f456 adopted math from Martin Baker to calculate quaternion from matrix representation. 2015-05-22 20:04:05 +00:00
Philip Eisenlohr 4bd44f8e43 better robustness against scalar arguments and “None”. 2015-05-21 21:53:54 +00:00
Philip Eisenlohr 99adf42f0f improved robustness of labels_index determination.
fixed errors in data_readArray and improved functionality. Can now cope with list of columns. reads all valid columns returning list of invalid ones. updates table.labels accordingly.
2015-05-21 00:02:32 +00:00
Philip Eisenlohr 06f017effa added possibility to dismiss (delete) output file upon closing an ASCIItable.
“None” labels are disregarded in labels_index() method.
2015-05-19 21:11:49 +00:00
Philip Eisenlohr 9f569d04c6 added “.close()” method to close input and output at the same time.
accept header only if space present between number and “head” string.
2015-05-19 20:35:56 +00:00
Martin Diehl 5d19e55eb4 corrected access by number 2015-05-15 13:35:50 +00:00
Martin Diehl b30eba3919 introduced (untested) OR calculation 2015-05-15 12:44:48 +00:00
Martin Diehl fa1368204d fixed bug in asciitable when updating labels for readArray, fixed checking for euler angels presence in tessellation, improved help 2015-05-14 17:07:50 +00:00
Martin Diehl b60f868a76 renumbering asciitable when readArray for selected columns only
test no longer for deleteColumn
2015-05-10 11:29:11 +00:00
Yannick Naunheim 88e16f9344 corrected Bain model 2015-05-08 14:45:59 +00:00
Yannick Naunheim 90ae536204 introduction of orientation-relationship (OR) models: Kurdjumov-Sachs (KS), Nishiyama and Wassermann (NW), Greninger-Troiano(GT), Bain 2015-05-08 14:14:44 +00:00
Martin Diehl 4448187c1e functions have been removed in previous commit 2015-05-05 14:44:31 +00:00
Martin Diehl 9694d63874 introduced option mute output to screen 2015-04-22 18:47:45 +00:00
Chen Zhang 43b665ba48 add getAverageOrientation() to Orientation class as class method. 2015-04-02 19:15:09 +00:00
Martin Diehl 32f9e7f9d8 now giving just a 'Remark' when h5py is not found 2015-04-01 14:43:34 +00:00
Tias Maiti f5801601d8 fixed UnboundLocalError (calling variable before assignment) in “inversePole” function 2015-03-29 19:16:45 +00:00
Tias Maiti 0e7325b27d added function — “inversePole” axis rotated according to orientation (using crystal symmetry to ensure location falls into SST) 2015-03-28 07:43:49 +00:00
Martin Diehl 151d4ff75b fixed bug (crash) in case (meaningless) strings found after part or section key.
DAMASK itself is fine with it, and it can be used for commenting.
thanks to B. Bode for figuring out
2015-03-27 16:23:21 +00:00
Martin Diehl 8a30021202 cleaned up core modul 2015-03-27 14:10:18 +00:00
Martin Diehl dd5055dc19 improved warning in case the core module is not found, corrected '/echo/' handling (had problems with key 'c/a' 2015-03-15 15:24:45 +00:00
Martin Diehl 89fa31b070 avoid troubles with /echo/ tag by considering it as a comment 2015-03-13 14:46:11 +00:00
Philip Eisenlohr 4c1e9c559b removed debug printing. 2015-03-06 15:13:18 +00:00
Philip Eisenlohr 3d86c9b363 corrected conversion of quaternion to AxisAngle and Euler angles. 2015-03-06 13:54:30 +00:00
Haiming Zhang 7818a8f467 Add codes about enforcing the boundary constraints for the fitting parameters, especially for the exponent term of non-quadratic yield functions. 2015-02-05 21:25:00 +00:00
Franz Roters 6cf9907cc9 added support for Marc2014 2014-10-22 07:43:06 +00:00
Martin Diehl 84df61d4a0 made license check tolerate non-existing licenses 2014-10-21 05:40:26 +00:00
Martin Diehl b7f078971b added background threading (might be used in more than one script) 2014-10-15 08:32:53 +00:00
Martin Diehl 8985a2d7e6 fixed wrong position when comparing tables 2014-10-09 15:37:35 +00:00
Martin Diehl 033a275d82 a bunch of small changes. deleted compiled FFTW libraries 2014-10-02 21:27:03 +00:00
Philip Eisenlohr 28a7c4c727 corrected (probable) bug in disorientation calculation. 2014-08-22 15:45:03 +00:00
Philip Eisenlohr d5e2e42f21 file handle closing can now be done from within class.
methods:
.input_close()
.output_close()
2014-08-22 15:37:46 +00:00
Martin Diehl a8ced53b59 fix for the fix. now both, single column and single line files are working 2014-08-07 08:51:25 +00:00
Martin Diehl 1402527f48 fixed nasty bug cause strange behavior for voronoi tessellation 2014-08-06 19:32:26 +00:00
Martin Diehl c8cd775747 added spectral solver grid location and index function to util library 2014-07-21 17:49:45 +00:00
Martin Diehl 28f3ba6841 fixed abaqus job submission 2014-06-25 08:32:33 +00:00
Martin Diehl 930cd0f3ac improved abaqus test structure 2014-06-24 15:32:42 +00:00
Martin Diehl 1333921ed5 improved logging 2014-06-18 09:03:48 +00:00
Martin Diehl 7d8934c9f6 made some more functions case insensitive 2014-06-17 08:53:37 +00:00
Martin Diehl eac0217b78 check for valid marc version 2014-06-17 07:29:05 +00:00
Martin Diehl 51b92f3ef9 simplified option parsing (so far, only for addCalculation and addMises) 2014-06-17 07:10:10 +00:00
Martin Diehl 488927a231 worked on phenopowerlaw test, made material.config writer case insensitive, polished lattice, removed deprecated part of documentation 2014-06-16 13:11:26 +00:00
Martin Diehl 25459823ee improved on test scripts to support individual parser options 2014-06-11 17:46:26 +00:00
Martin Diehl 07765da01a fixed typo 2014-06-07 08:36:43 +00:00
Martin Diehl f928d9406d replaced print output by logging class for better control over output (level, screen/file) 2014-06-04 15:34:35 +00:00
Martin Diehl 27ffa658b6 corrected use of variants 2014-06-03 17:19:56 +00:00
Martin Diehl 41b097bbc1 simplified updating 2014-06-03 13:09:52 +00:00
Martin Diehl 5321019457 updated some test related files as a preparation for a more intuitive automator 2014-06-03 10:30:51 +00:00
Martin Diehl 8493d6b414 now correctly detecting symbolic links for different marc versions 2014-05-16 06:21:50 +00:00
Martin Diehl 3d4ef650f3 simplified test scripts using msc.marc.
changed tolerance for hex test. was successfull for rev 3058, but now needs less strict tolerance, which seems to be related to the marc run script or the library, because with rev 3058 and current marc it has a slightly higher error
2014-05-09 11:29:35 +00:00
Martin Diehl 02edadfdeb fixed typo in marc class 2014-05-08 11:02:26 +00:00
Martin Diehl 6df66c6349 updated Marc run_damask scripts, linking against BLAS is done by Marc anyway, removed. renamed extension of original files from org to more explicit original 2014-05-07 14:29:53 +00:00
Martin Diehl 86cec35799 new test for Marc 2013.1 + small changes on marc solver class to run with intermediate release (20xx.1) 2014-04-14 16:18:08 +00:00
Martin Diehl 342ca0be47 tested new scripts to update shebang, all files got same shebang (and for python files encoding) 2014-04-01 18:41:14 +00:00
Martin Diehl 188002f16e more LF, Id, and executable status changes 2014-04-01 16:58:54 +00:00
Christoph Kords 3b20f1154e added macro releases 2013 and 2013.1 2014-03-07 09:22:04 +00:00
Philip Eisenlohr 6fd8407d6e moved "predefined" to colormap init
cleaned interpolate to not change color model

fixed color range cropping issue
2014-02-28 16:09:01 +00:00
Martin Diehl 3abe4699b7 fixed typo in output 2014-02-28 12:23:46 +00:00
Martin Diehl 3dee38433d fixed formatting 2014-02-27 18:08:37 +00:00
Philip Eisenlohr 4e5803fc36 forgot to clear readBuffer upon data_rewinding... 2014-02-06 16:37:45 +00:00
Martin Diehl bc4cc20c55 slightly polished makefile and numerics, recompile fftw with icc; still not running with ifort 14.01 2014-02-06 10:41:34 +00:00
Philip Eisenlohr ccb950f3d8 checked Unix command piping conformity -- seems to now work:
seeds_fromRandom |
geom_fromVoronoiTessellation |
geom_grainGrowth |
geom_unpack |
geom_pack

However, grainGrowth functionality seems broken...
2014-02-03 23:44:29 +00:00
Martin Diehl 83e4bc3247 updated test for restart, now also checking if number of increments is the same
fixed output of test class
fixed small bug? in asciitable.py, @philip: please check
2014-02-03 19:30:28 +00:00
Tias Maiti 521a9d2d81 changed STDOUT to STDERR for complaining about missing h5py. Please report any warnings or errors to STDERR since otherwise command piping breaks... 2014-01-29 20:16:31 +00:00
Christoph Kords de01c50d79 corrected format string in order to get meaningful error message 2014-01-29 12:54:18 +00:00
Martin Diehl a6dac1eceb fixed lib to use new config file 2014-01-24 13:15:01 +00:00
Martin Diehl d66b41c686 fixed installation, will test now 2014-01-24 12:30:27 +00:00
Philip Eisenlohr 033b979471 corrected __slots__ class variable 2014-01-17 01:37:01 +00:00
Philip Eisenlohr fdd4e224ce fixed integer type clash in Get_Unit function 2014-01-16 22:02:03 +00:00
Philip Eisenlohr 4d1d4fcf4a forgot to change obsolete property "pathInfo" to new name "options"... 2014-01-16 21:40:54 +00:00
Philip Eisenlohr c402d848f7 adopted "MSC_ROOT" instead of "msc" for pathinfo 2014-01-16 21:35:51 +00:00
Philip Eisenlohr 50b682db4c syntax polishing 2014-01-16 21:29:39 +00:00
Martin Diehl 278f854e41 introduced functionality to get output results by point from the HDF5 file 2014-01-15 22:17:32 +00:00
Martin Diehl cbc6f2a3af updated library for vtk output 2014-01-15 14:58:59 +00:00
Martin Diehl 01c8c434f7 finished work on the new installation scheme (if no bugs are found ;)) 2014-01-14 19:03:41 +00:00
Philip Eisenlohr ddc88d4cd6 added (I4P) to output integer type of Get_Unit function since plain integer resulted in compiler error (with ifort 14) 2014-01-13 16:52:06 +00:00
Martin Diehl aab0208c65 more modifications, only configure needs modifications 2014-01-12 17:29:00 +00:00
Martin Diehl 80da1c529e some more work on the consistent installation scheme, fixed bug in Makefile 2014-01-11 19:13:02 +00:00
Martin Diehl 22aa934a7d restructured results class, starting to write the unified damask result class 2014-01-09 21:35:21 +00:00
Franz Roters 543639bb8f added support for Marc/Mentat2013.1 2013-12-19 13:37:35 +00:00
Martin Diehl 676e621af2 new version of Lib_VTK_IO 2013-12-17 13:24:34 +00:00
Martin Diehl 2f1db8f69a introduced delimiter option (default = tab) for ascii table output, use space for geometry files 2013-12-17 08:16:29 +00:00
Philip Eisenlohr e20ffb379d changed numpy.readtxt logic from "data_asArray" returning a copy to inplace "data_readArray" now directly storing into self.data 2013-12-14 03:51:22 +00:00
Philip Eisenlohr 0e84db8f19 improved stability of xxx_append commands when dealing with iterable content 2013-12-12 02:36:05 +00:00
Philip Eisenlohr 9c7335f799 bug fix: wrong variable name "label" --> "labels" 2013-12-11 14:38:09 +00:00
Philip Eisenlohr 0e8fdaf59e changed exponent in IPF color mapping from 1/3 to 1/2 to get closer to TSL-OIM reference. 2013-12-09 18:57:38 +00:00
Philip Eisenlohr 24a4ca8ca8 "quack-like-a-duck" check for object properties.
sum equiv Quats don't need inverse option anymore.
fixed (severe) bug in IPFcolor determination.
2013-12-09 15:49:57 +00:00
Philip Eisenlohr c1b5b802ec fixed problem of adding strings in "data_append" resulting in infinite recursion.
more gracefully check for problems.
numpy.loadtxt now correctly transposes single column of data.
2013-12-09 15:45:18 +00:00
Philip Eisenlohr d17d6636df substantial rewrite of former package. now includes dedicated orientation and (associated) symmetry class. should be easier to handle...
new or improved methods:
- disorientation (between two orientations)
- IPFcolor: TSL color of inverse pole figure for given axis
2013-11-25 19:04:39 +00:00
Philip Eisenlohr 05fa8bf580 make data_append() coping with any iterable data type (not just list) 2013-11-25 18:58:27 +00:00
Martin Diehl 9ac8846e41 compiling with hdf5 is now working for DAMASK (if HDF5=ON) and for playground example in private 2013-11-07 12:52:36 +00:00
Philip Eisenlohr c496288144 make "orientation" module part of damask python interface 2013-10-08 13:56:28 +00:00
Philip Eisenlohr ec6440f1f4 when adding labels now making sure that they get processed during output writing 2013-10-08 13:54:13 +00:00
Philip Eisenlohr a2169e338f fixed type-casting problems (mainly with Lib_VTK_IO) 2013-09-26 17:21:46 +00:00
Martin Diehl 9f39405adf fixed material.config of elastic tests to run with new error, currently to strict, needs fix
removed long spectral example test from list of daily tests
2013-09-20 16:23:52 +00:00
Martin Diehl a0f304021f fixed restarting for Polarisation and AL, updated corresponding test and polished output in python (some statements are screwed up when making them Python3 compatible) 2013-09-20 14:22:37 +00:00
Martin Diehl 415892b8e7 did some conversion needed for use with python 3 2013-09-18 19:31:27 +00:00
Martin Diehl 59ba41e9e7 forgot this in last commit
Important: Do not update only the code dir, also the lib dir
2013-09-18 14:14:39 +00:00
Martin Diehl 3eb8aa1362 checked for python3 compatibility:
use "print('foo')" instead of "print 'foo'"
and "except(error) as e" instead of "except error,e"
2013-09-14 10:52:02 +00:00
Martin Diehl 3bb5a5e7b5 line too long in DAMASK_spectral_solverPolarisation.f90, reordered curl calculation for clearer look, fixed test for Marc 2013 2013-08-08 18:10:58 +00:00
Martin Diehl 4cb6c0a706 added support for MSC.Marc>2013 to tools (execution with option for optimization (h/l/-) and OpenMP (True/False)
added test for MSC.Marc2013
removed automated test run for MSC.Marc 2010, hast to run on a different machine and is deprecated anyway
2013-08-08 09:12:44 +00:00
Martin Diehl cc6c524740 updated test for spectral solver example and example files. changed marc job submission such that the marc version number is no longer expected at the end of the subroutine file 2013-08-06 09:48:57 +00:00
Franz Roters f896b4a01e updated Marc/Mentat integration once more to minimze interference with original instal
added support for Marc2013, which is now default in apply_DAMASK_modifications
2013-07-24 08:41:58 +00:00
Philip Eisenlohr 9abc9a99fc added possibility to
* read ASCIItable not having labels
* write numpy array as data
2013-06-30 00:21:51 +00:00
Christoph Kords fab0ea8e4e interpolation method is now an attribute of the Colormap class; added classic "rainbow" colorscheme to predefined ones 2013-05-28 20:15:13 +00:00
Christoph Kords 65c5090378 added option to linearly interpolate colors to Colormap class 2013-05-28 17:33:51 +00:00
Christoph Kords 2784a96a51 do not print colormap name for format=raw 2013-05-28 14:45:53 +00:00
Christoph Kords 7c42facfe0 predefined colormaps now as class attribute of "Colormap" 2013-05-28 14:04:25 +00:00
Christoph Kords ee2595c008 added method to use predefined colormaps 2013-05-28 13:50:36 +00:00
Christoph Kords 4fda285e08 added method to invert colormap 2013-05-28 12:18:25 +00:00
Christoph Kords d01a8bdf8c renamed methods "to" and "asModel" to more (?) meaningfull "convertTo" and "expressAs" 2013-05-28 11:47:15 +00:00
Christoph Kords 8421587724 added some space here and there for more readability 2013-05-28 11:39:26 +00:00
David Mercier 190a59b707 set Lib_VTK_IO-master.zip and related files back to initial version, new version is not working with MSC.Marc 2010 2013-05-15 16:43:18 +00:00
Martin Diehl b83b557af2 updated Lib_VTK_IO again. Contains small bug fix ans support for Base64 encoding 2013-05-10 12:57:00 +00:00
Martin Diehl cfac73043d some lines in crystallite.f90 exceeded limit of 132 characters
fixed bug in Lib_VTK_IO.f90 (informed author as well)
added zip file containing source of Lib_VTK_IO.f90
2013-05-08 17:48:00 +00:00
Martin Diehl 755e0e2440 vtk files are now correctly written to current working directory.
updated Lib_VTK_IO.f90
2013-05-08 16:10:21 +00:00
Martin Diehl 3f9d642d87 corrected error message when complaining about uncompiled core module 2013-04-29 16:30:08 +00:00
Martin Diehl 8da7544978 marc doesn't need error prone setup_code any more, moved Marc includes from code/include to lib/includeMarc
DAMASK_marcXXXX.f90 now is not a copy any more but contains one definition and an include statement

setup_code of spectral solver is now replaced by the standard 1) configure 2) make 3) make install
2013-04-22 14:41:33 +00:00
Martin Diehl d751283b4a updated fftw to 3.3.3 (from 3.3.2) 2013-04-16 16:38:54 +00:00
Martin Diehl ee22a2698b added library to write out vtk file from Fortran (Lib_VTK_IO) 2013-04-16 10:20:22 +00:00
Martin Diehl aee8196b32 example test for Abaqus now takes files from examples folder, both Abaqus test take now *.env from installation/mods_abaqus 2013-03-26 12:06:19 +00:00
Mahesh Balasubramaniam 7fd1dca4f5 corrected a little mistake on line 145 that sets the maximum value of XYZ values to be 1.0 2013-03-25 20:18:30 +00:00
Martin Diehl cb8a7e7d25 new function to compare tables both located in current directory 2013-03-19 15:46:07 +00:00