Commit Graph

292 Commits

Author SHA1 Message Date
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
Martin Diehl 43ec1d2051 added output of perceptual unfiform colormaps to GOM (DIC Aramis) format, deleted some old files in the documentation folder 2013-03-19 15:19:46 +00:00
Martin Diehl 3660b2a245 added functionality to check for available licenses to damask/environment.py, now using this functionality + a check for the correct version before starting Abaqus6.12.2_compileIfort/run_test.py and Abaqus6.12.2_example/run_test.py 2013-03-04 19:39:13 +00:00
Martin Diehl b94caae041 added missing import of os 2013-02-19 15:57:51 +00:00
Philip Eisenlohr d8da2f60d8 added core module function math_periodicNearestNeighborDistances 2013-02-19 14:56:26 +00:00
Philip Eisenlohr 0047c32411 dropped ./fftw in favor of /usr/local as FFTW default install path 2013-02-19 13:35:38 +00:00
Philip Eisenlohr 9d32e51da8 more verbose explanations 2013-02-15 08:38:58 +00:00
Philip Eisenlohr fc9ecc7ed5 fixed bugs in HSL2RGB and the two CIE conversions.
streamlined interpolation.
2013-02-02 20:17:02 +00:00
Philip Eisenlohr 95c74961dd polished syntax here and there. 2013-02-02 15:11:55 +00:00
Martin Diehl b0263a8aab added possibility to parse options for setup_code.sh and setup_processing.sh + other improvements in setup functionality 2013-02-01 12:21:56 +00:00
Philip Eisenlohr 0dabe29657 ignore problems when importing (outdated) core module during its rebuilding. 2013-02-01 11:45:20 +00:00
Philip Eisenlohr 20060b4275 added pathInfo parsing of $shellVariables. These are now interpreted as absolute path (used to be wrongly considered relative...) 2013-02-01 11:30:57 +00:00
Martin Diehl e74b5da19a changed all remaining routines to fortran-fast arrays (geometry reconstruction etc.)
changed all remaining routines in f2py to more clever determination of array size (requires f2py >= 2.0)
enabled 3D visualize to work with odd resolution by switching to linear reconstruction
PLEASE NOTE: Redefinition of routines for f2py might cause trouble -> DELETE DAMASK_ROOT/lib/damask/core.so in this case
further changes: added pure statement where possible, polished, unified use of "Q" for "Quaternion" and reordered math to have similar routines together
2013-01-31 16:28:08 +00:00
Martin Diehl 96577b18fb introduced error code for run_test.py 2013-01-23 18:33:46 +00:00
Mahesh Balasubramaniam a1f0ed483c export method with format and revised crop options added to the Colormap class. 2013-01-18 17:17:50 +00:00
Martin Diehl b018934b45 simplified code, added functionality to export raw list 2013-01-16 18:45:10 +00:00
Mahesh Balasubramaniam 7ac7d1a657 new tool for creation of colormaps, now using proper classes 2013-01-15 18:24:10 +00:00
Martin Diehl 0d4db957f8 started to rearrange testing folder 2013-01-14 15:20:17 +00:00
Martin Diehl fd0e096256 rewrote colormaps to use classes 2013-01-08 18:47:44 +00:00
Mahesh Balasubramaniam 820b8eb2c1 put colormap related functions into library, renamed and added scripts for creation of colormaps 2013-01-04 13:57:36 +00:00
Martin Diehl e3970ce152 added detection of Marc 2012 in postResults (lib/damask/solver/marc.py)
added test for Marc 2012 and updated old tests from 2010 to 2012
2012-12-13 17:50:00 +00:00
Martin Diehl 7848e933bb wrong file was selected during last commit 2012-12-12 17:10:04 +00:00
Philip Eisenlohr dc746119e3 introduced two more helper functions:
- labels_index
- data_asArray
2012-12-06 21:46:19 +00:00
Martin Diehl 549ea3c1e6 updated restart test to use the new table comparison facilities and check the new basic solver (part 1, there is some problem with renaming) 2012-11-23 17:21:18 +00:00
Martin Diehl 11ed7fab86 corrected bug in curl calculation causing the output of transposed tensor (according to information stored in testing/9102/proof/Curl of Tensor - Physics Forums.pdf)
addCurl test is now done against analytical solution and working, added it to list of automated tests.
small improvements on test.py
2012-11-23 15:16:51 +00:00
Martin Diehl 565713fecb improve functionality to compare ASCII tables 2012-11-22 18:01:51 +00:00
Martin Diehl a40b73dc72 for array comparison, only values are taken into consideration that are non zero in array 1 AND array 2 2012-11-21 15:37:59 +00:00
Martin Diehl 78aa010565 now just comparing substring to figure out if setup_processing was importing the core module 2012-10-25 12:40:06 +00:00
Martin Diehl 868984cb89 import of damask.core will not complain any more if done in setup_processing.py, however setup_processing.py will check if core.so exist after compilation and delete it before compilation 2012-10-25 07:55:27 +00:00
Martin Diehl 398643a3b1 made exception in case of non-working f2py code (core.so) again verbose 2012-10-10 16:38:02 +00:00
Martin Diehl 7ad3ce62e7 added hint if test don't support update 2012-10-09 07:37:48 +00:00
Claudio Zambaldi 1585fbe927 improved material.config writer class
includes example of usage
should replace material.py, after the tests 
have been confirmed to work with it

mat=damask.Material()
m=mat.example_1()
m.write(file='material.config_<descriptive-label>')
2012-09-07 18:25:25 +00:00
Martin Diehl 96ba5ecae4 moved some more 'mesh related' functions for post processing from math.f90 to mesh.f90
f2py functions remaining in math.f90 now uses assumed size arrays in order to have simpler interfaces. This is only working with python 2.7!
changed python pre- and postprocessing scripts.
If you encounter any problems whith core modules, try to remove the old core.so in the lib/damask
2012-08-27 08:04:47 +00:00
Mahesh Balasubramaniam 87bec7eafa added test to check if lab-to-load rotation is done properly, small improvement on test.py 2012-08-14 13:23:50 +00:00
Martin Diehl ee1bde0cd7 enabling regridding more than once by introducing deallocation of arrays
added J2 test (stub from Taymour)
2012-07-31 15:37:49 +00:00
Martin Diehl 8a64be7d1b added restart-test to list of automated tests, improved reporting of tests 2012-07-26 07:47:31 +00:00
Claudio Zambaldi 9078d70af0 polishing, and using numpy's deg2rad/rad2deg 2012-07-19 16:05:05 +00:00
Claudio Zambaldi b2a7f85101 __init__ of damask package not crashing in python 2.5 if core module not available
added some Matlab-like utility functions (damask.sind, cosd, tand, acosd, ...)  that take and return degree instead of radians
2012-07-18 13:46:33 +00:00
Martin Diehl 95d292b286 2012-07-18 12:31:07 +00:00
Martin Diehl 3cb1d7e31f replaced FFTW libs with new version 3.3.2 2012-07-17 13:27:51 +00:00
Martin Diehl fe3b537851 added some useful functions for copying and comparison and renamed some functions in the lib file; changed the tests accordingly 2012-07-17 13:04:57 +00:00
Martin Diehl 7847816044 changed back to previous (working) version 2012-07-05 20:27:05 +00:00
Mahesh Balasubramaniam ca83c6082a 2012-07-05 11:21:06 +00:00
Philip Eisenlohr 9490c8a3c1 corrected to consistent naming: "IMKL" finally ;-) 2012-07-03 12:59:19 +00:00
Philip Eisenlohr bf4d47266e corrected to consistent naming: "IMKL"
changed dummy entry for FFTW to usr/local
2012-07-03 12:41:29 +00:00
Martin Diehl b2fd3e1180 introduced preprocessor identifiers Marc, Abaqus, and Spectral to enable conditional compilation. This allows deleted dummy functions that are used by one solver only.
Mainly affected modules are IO and mesh. Most of the changes in mesh result from reordering the functions when grouping them depending on their solver.
Further advantage is that FE solver do not need FFTW and kdtree2 anymore. The include files for these two libraries moved to DAMASKROO/lib now as I figured out how to use a include path in the Makefile.
Put all the files I got when testing compilation with abaqus in a folder which to become the abaqus compilation test.
2012-06-15 16:10:21 +00:00
Martin Diehl e18a6f6c7f again small adjustments for the automatic testing 2012-05-29 09:59:04 +00:00
Martin Diehl 34777e3df8 some smaller improvements on the intel compilation test 2012-05-25 15:11:00 +00:00
Taymor El Achkar be355c8f40 updated reference result for compile test
added dislotwin law to hex elastic test and drastically increased loading time. still the question why Young's modulo is increasing.

added possibility to add crystallite microstructure in material.py
2012-05-24 16:00:32 +00:00
Martin Diehl 77c066d0a8 corrected error handling to work with older python versions 2012-05-10 09:38:55 +00:00
Martin Diehl 331ef7ad68 made init of python module more verbose in case core modules cannot be loaded 2012-05-03 19:00:34 +00:00
Martin Diehl 31753be16f updated setup/setup_processing.py with new files
added data_readLine(LINE) and data_skipLines(LINES) for ascii table
2012-04-18 11:42:57 +00:00
Martin Diehl efd653fb00 removed old *.output* and *.spectralOut as they are not updated anyway from reference.
introduced a numbering scheme for variants
calculated new reference results due to slight changes
2012-03-09 16:30:42 +00:00
Martin Diehl 3f1c16e079 removed headerLen completely, use len(self.info)+1 instead 2012-03-09 14:18:48 +00:00
Martin Diehl ee6b1eb22c elastic phenopowerlaw for hex crystals is working, results are close to analytic ones but there is a small "elastic hardening" and the values are a little bit higher than the ones calculated with mtex 2012-02-24 14:34:44 +00:00
Martin Diehl 7ce583405f made copy_Current2Current and copy_Current2Current in testclass more verbose, added numerics with fixed seed to compile test to get always exactly the same results 2012-02-23 17:44:09 +00:00
Philip Eisenlohr 6b8bebad49 removed unused headerLen property. added info_clear() method 2012-02-23 13:54:38 +00:00
Martin Diehl a8f4fc76b3 made results better visible 2012-02-23 09:23:37 +00:00
Philip Eisenlohr 58fdf4ebfc improved STDOUT | STDIN constructs -- no more broken pipe left-overs (I hope) 2012-02-16 18:42:04 +00:00
Philip Eisenlohr c24f258eba now works with piped STDOUT | STDIN constructs. 2012-02-16 18:03:14 +00:00
Philip Eisenlohr ae8ec80dd0 croaking about missing core module now goes to STDERR (formerly this influenced piped STDOUT detrimentally...) 2012-02-16 18:02:15 +00:00
Martin Diehl 4c59015a78 further simplified creation of tests by moving the option parsing to the general test class 2012-02-15 20:54:14 +00:00
Philip Eisenlohr d642730776 added method to set data value in given column (by name) 2012-02-15 14:50:51 +00:00
Philip Eisenlohr 8671b8ed38 script to delete existing columns from ASCIItable 2012-02-14 12:04:37 +00:00
Martin Diehl 7960600dbe improved updating of reference results 2012-02-09 14:41:18 +00:00
Philip Eisenlohr a3e47b2d65 added method to return data as list of floats.
safer check whether ASCII file has ended.
2012-02-02 17:13:51 +00:00
Claudio Zambaldi 7dd67e3ebb improved creation of material.config files, mostly done by Philip 2012-02-01 19:44:36 +00:00
Martin Diehl e87296b10a added debug output for tests, corrected bug reporting number of successful tests 2012-01-31 13:10:14 +00:00
Martin Diehl 2a89d9b81a simplified compilation testing by introducing some small helper functions for common tasks, continued to rename 2012-01-27 09:55:19 +00:00
Martin Diehl 20a775e8d1 small improvements (more output to screen) 2012-01-26 15:26:21 +00:00
Martin Diehl becb863110 added test for gfortran and gfortran vs intel, renamed intel test to new numbering scheme and changed to new div criterion
introduced "try" statement in lib/damask/test/test.py to avoid crash if a test variant fails
2012-01-25 15:14:31 +00:00
Claudio Zambaldi 2b8e0b27fc a rough version of a t16 to vtk converter
needs polishing to be used with damask python package
paraview plotting is useful if you want semi-transparent iso-surfaces
2012-01-24 14:26:13 +00:00
Philip Eisenlohr 3c87d20353 added capability to rewind to beginning of data 2012-01-19 20:37:53 +00:00
Philip Eisenlohr 4eb754b1fb added release '2011'.
added toolsPath() method.
added optional release hinting for path determinations.

streamlined submit_job method.
2012-01-18 09:41:10 +00:00
Philip Eisenlohr 0b4b154abb reworked class definition.
now follows workflow of
1. clean
2. prepare
3. run
4. postprocess
5. compare/update

added file-structural helper functions.
2012-01-18 09:34:49 +00:00
Philip Eisenlohr aba4703463 added property "headerLen" 2012-01-18 09:30:50 +00:00
Christoph Kords 7f94b3f267 subroutine path was not correct 2012-01-17 09:28:52 +00:00
Christoph Kords 684cac1206 corrected typo 2012-01-17 08:44:57 +00:00
Philip Eisenlohr 48729ff2e1 modified testing class to use generic "damask" module.
removed obsolete individual class definitions.
2012-01-16 15:18:43 +00:00