Commit Graph

283 Commits

Author SHA1 Message Date
Martin Diehl a5f8c5ba32 Merge branch 'development' into cmake 2017-04-15 16:17:50 +02:00
Martin Diehl aaa41b8232 not needed anymore 2017-04-13 12:54:26 +02:00
Philip Eisenlohr 4bf11b20c9 hypela cloning as part of specific Marc modification; Makefile corrections/improvements 2017-03-15 18:43:04 -05:00
Martin Diehl 64a6476c1a Abaqus is complaining 2017-03-05 22:47:28 +01:00
Martin Diehl 71e2c3f203 switching to PETSc 3.7.x 2017-02-14 22:33:27 +01:00
Philip Eisenlohr d403f5f346 give feedback on invalid MSC version and path input 2017-02-10 18:33:30 -05:00
Martin Diehl 3e7ab76582 adding functionality from previous build system 2017-02-03 23:23:55 +01:00
Franz Roters 676ecb2ade correctly determine DAMASK version 2017-01-06 16:14:35 +01:00
Franz Roters 6d0e3f4f32 corrected opneMP options
fixed N/A string in version handling
2017-01-02 17:31:38 +01:00
Martin Diehl e532228b15 fixed handling of version string 2016-12-23 14:21:17 +01:00
Philip Eisenlohr 20c5ccc112 corrected (my standard) mistake in README 2016-11-29 10:02:07 -05:00
Philip Eisenlohr 94c934c8bd added patch to switch to fwbw_derivative 2016-11-29 09:52:14 -05:00
Philip Eisenlohr d6baa71ee4 added temporary patch for PETSc 3.7.x compatibility
apply with "patch -p1 < installation/patch/petsc3.7"
2016-11-24 09:51:21 -05:00
Franz Roters cbe2fb8d57 removed support for old Marc versions 2016-11-07 11:56:39 +01:00
Franz Roters b27c9388e6 adopted linker string for earlier Marc versions to work with Intel Fortran 17 2016-11-07 11:54:27 +01:00
Franz Roters 2fa4e48cf0 modified mkl libraries as to also work with Intel Fortran 17 2016-11-02 13:53:12 +01:00
Franz Roters b34a60d2f4 added support for Marc2016 2016-10-28 09:16:20 +02:00
Philip Eisenlohr eb9f6c939c condensed output, DAMASK_marc symlinks are relative, add symlink pruning 2016-08-25 12:08:19 -04:00
Martin Diehl cd63a92733 using python 2.7 has shebang will also work on mac without symlink
unless someone uses the 6 year old python 2.6, this should be save
2016-07-18 19:35:35 +02:00
Martin Diehl e7a174abc1 cleaner code 2016-07-18 19:19:51 +02:00
Martin Diehl 2a7f772d08 adopted to new installation config file 2016-07-15 11:05:27 +02:00
Martin Diehl 38bf357e7c removed obsolote information on lapack and (always outdated) version information 2016-07-14 16:18:27 +02:00
Martin Diehl 3314e5f051 updated symlinking, removed unused "rootRelation" 2016-07-14 15:11:49 +02:00
Martin Diehl 97d6ed57e1 also not needed any more 2016-06-29 20:13:00 +02:00
Martin Diehl 4b860fb083 added c routines to core module compilation 2016-05-22 17:18:15 +02:00
Martin Diehl 7ea5ce73ae line too long 2016-05-11 11:46:20 +02:00
Martin Diehl d3ee2c05b9 =removed remaining IDs 2016-05-11 11:43:21 +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
Test User 054d9710b5 Merge branch 'development'
Conflicts:
	VERSION
2016-04-29 08:03:07 +02:00
Philip Eisenlohr c4c24d3a70 shortened comment line 2016-04-24 14:08:05 -05:00
Philip Eisenlohr 9abc0dbeeb added *.sh as possible targets for symlinking 2016-04-24 13:36:23 -05:00
Franz Roters 6bd17b3e4e integrated new version handling 2016-02-03 09:52:11 +01:00
Martin Diehl 81a7fcbe6e escape magic for string macro 2016-02-02 23:33:21 +01:00
Martin Diehl 23f1344031 for new versioning 2016-02-02 19:55:55 +01:00
Martin Diehl e298d2ebaa new version handling was broken 2016-01-28 08:56:12 +00:00
Martin Diehl e59bc9780d adopted file name change 2016-01-25 20:44:22 +00:00
Franz Roters ad71d03d13 now we are (hopefully) complete 2015-12-08 14:27:58 +00:00
Franz Roters eff2c883b4 added support for Marc 2015 and made it default 2015-12-08 14:26:27 +00:00
Franz Roters cef87db699 renamed original file 2015-12-03 07:47:28 +00:00
Franz Roters b676ed0085 support for Marc 2010 was dropped a long time ago 2015-10-20 13:32:48 +00:00
Franz Roters a087eedd54 added support for Marc2014.2 (so far installed on maws14 only) 2015-10-20 13:25:59 +00:00
Martin Diehl 7d996cfa11 fixed new IO_stringPos for Abaqus 2015-09-05 16:26:55 +00:00
Martin Diehl be4068661b fortran 2008 standard implies assume realloc-lhs 2015-09-02 13:01:39 +00:00
Martin Diehl 7a3a67601f realloc lhs was not always working, fixed now and added test for new string pos function 2015-08-31 16:30:04 +00:00
Martin Diehl eb3173c6cc ugly hack for Abaqus in prec, it seems that it links against old (10.1) ifort where IEEE_arithmetic is not avaialbe.
Took the chance and cleaned the env file and used #ifdef# statement in the wrappers because in fixed format Fortran some lines of code might be interpretated as comments.
This should not happen, but it happens for Abaqus exp
2015-04-15 18:10:56 +00:00
Franz Roters 3f55518c31 corrected spelling error in comment 2015-01-15 08:42:47 +00:00
Franz Roters a7a6ee6cff removed non OpenMP calls from DAMASK run menu as 2013.1 enforces use of OpenMP 2014-10-30 07:33:24 +00:00
Franz Roters 63b00e4fd2 use MSC_ROOT as default installation dir but allow to modify it
make Marc2014 the default version
2014-10-22 07:45:52 +00:00
Franz Roters 6cf9907cc9 added support for Marc2014 2014-10-22 07:43:06 +00:00
Pratheek Shanthraj 9b4c1fc43d added DAMASK_FEM.exe to bin_link list 2014-09-10 08:09:35 +00:00
Martin Diehl d426be49d0 fixed linker error for some ifort/f2py combinations 2014-05-21 10:07:10 +00:00
Martin Diehl 89c896678b added printing of cli arguments to seeds_fromRandom, fixed regression in compile_CoreModule and DAMASK_spectral_doxygen 2014-05-15 09:58:31 +00:00
Martin Diehl 142a72335e small changes on the deploy me / documentation scripts 2014-05-14 10:07:10 +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 5dedad1392 fixed typo in last commit 2014-04-30 05:05:41 +00:00
Martin Diehl 6bce04df48 changed linker command slightly to ensure dynamic linking and link now agains non-parallel (but threadsafe) versions of LAPACK
(compile_CoreModule.py, Makefile, abaqus_v6.env, mod_MarcMentat)

openmp is not working for Abaqus exp, probably because the ifort 14 is not supported.
Test is now using a version without openmp
2014-04-29 16:43:59 +00:00
Martin Diehl 2346a0841e improved symbolic linking and replace deprecated print syntax 2014-04-29 14:43:04 +00:00
Philip Eisenlohr 3f5d92b9a4 polishing and shortening 2014-04-10 19:25:23 +00:00
Martin Diehl 6550729b49 now symlinking only to know extensions (cause trouble for temp files like *.py~ and the like) 2014-04-09 10:40:10 +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
Martin Diehl 5c3e2f49d7 simplified symlinking, using python list dir method, no need to update this script anymore 2014-03-26 13:11:12 +00:00
Philip Eisenlohr 943349fdbb bunch of new scripts:
gwyddion_filter tries to smoothen out Gwyddion data sets.
vtk_fromGwyddion produces vtk mesh from Gwyddion data set.
geom_addPrimitive allows to add box, cylinder, or ellipsoidal blobs to geom file.
2014-03-04 03:34:34 +00:00
Martin Diehl f146359c04 added --prefix option to configure script to specify symlink location 2014-02-28 07:47:11 +00:00
Martin Diehl 7245e38327 like for IMKL, we probably should link ACML also against the omp version 2014-02-14 20:14:44 +00:00
Franz Roters 8ec38e8476 corrected linker options for blas 2014-02-14 15:59:25 +00:00
Martin Diehl 368de2f565 small fix on installation with imkl, need to try it out 2014-02-11 17:05:20 +00:00
Martin Diehl 25ee49ea78 fixed Abaqus test to run with new installation scheme 2014-02-05 06:38:31 +00:00
Martin Diehl 986591682c remove equals sign in rpath definition to work with mac, changed linker options in compile_CoreModule to work with linux again, please let me know if mac doesn't work anymore (it should) 2014-01-30 13:07:44 +00:00
Tias Maiti eeca9ed349 solved error: Undefined symbols for architecture x86_64: "_PyArg_ParseTupleAndKeywords" by adding arguments to LDFLAGS 2014-01-29 20:06:57 +00:00
Tias Maiti 34663daa99 rpath=argument syntax unfortunately not working on OS X, hence changed back to rpath,argument 2014-01-29 19:52:31 +00:00
Martin Diehl f82e5ec26e some small changes on the installation scripts, IMKL now works with gfortran, more verbosity and more sanity checks 2014-01-29 12:20:56 +00:00
Martin Diehl ee99216edc polishing compile_CoreModule, bug fix for Makefile 2014-01-28 07:34:13 +00:00
Martin Diehl 4648da1f32 small changes, tests still not running 2014-01-27 22:06:39 +00:00
Martin Diehl b11c64d310 polishing 2014-01-27 16:24:07 +00:00
Martin Diehl 861dc76700 fixed test for compilation of core module 2014-01-27 16:07:52 +00:00
Martin Diehl 36812cd6ea fixed some testing scripts to run with the new installation 2014-01-27 15:09:38 +00:00
Martin Diehl 02441bef0f introduced rpath to tell executable where libraries are located 2014-01-27 14:10:49 +00:00
Martin Diehl 656e3cc6ca some more small changes, including bug fix in configure + relative linking in Makefile for spectral solver 2014-01-27 10:12:29 +00:00
Martin Diehl 081d4da768 fixed path 2014-01-24 13:47:46 +00:00
Martin Diehl 554a6ab738 fixed typos and missing include 2014-01-24 13:17:54 +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 c9c6588f7c renamed seeds file related scripts in a (hopefully) consistent manner 2014-01-23 20:48:33 +00:00
Philip Eisenlohr 3e697e006a added (again) Intel OpenMP library to linker flag list (-liomp5). Why was that dropped..? 2014-01-22 23:57:08 +00:00
Philip Eisenlohr 380f6e1ec5 fixed syntax bugs 2014-01-22 16:03:27 +00:00
Martin Diehl e81b798662 corrected shell extension for apply_DAMASK_modifications.sh (was py) 2014-01-18 18:00:28 +00:00
Philip Eisenlohr fc7fd80e9c following convention of ".py" extension for Python scripts (now also compatible with new Makefile) 2014-01-16 21:53:14 +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 cf318f4392 fixed bug in lapack 2014-01-14 22:50:57 +00:00
Martin Diehl 449c66c70f did some testing... 2014-01-14 19:32:55 +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
Martin Diehl 3d69d9b927 moved DAMASK_NUM_THREADS to options, DAMASK_env.sh gets it from there 2014-01-13 10:56:54 +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 4271f65d05 textfile containing options (like pathinfo, but extended and will be directly used by the Makefile) 2014-01-11 17:16:51 +00:00
Martin Diehl 2262098ed4 more work on new installation 2014-01-11 14:28:07 +00:00
Martin Diehl e025ac5952 fixed DAMASK_env.sh to work with linux and Mac, started to reorganize installation to be consistent for all solvers 2014-01-11 12:46:30 +00:00
Christoph Kords 9a2ad45f7a probably(?) fixed bug with Windows: comparison string should be 'Windows' not 'Windos' , I suppose 2014-01-02 15:08:09 +00:00
Martin Diehl 65de581f72 new script setup_env.py to modify DAMASK_env files, will replace setup_shellrc.py 2013-12-21 11:57:02 +00:00
Franz Roters 543639bb8f added support for Marc/Mentat2013.1 2013-12-19 13:37:35 +00:00
Martin Diehl bb0b35e466 made compilation_info.f90 windows compatible and added abaqus_v6_windows.env as a template for using DAMASK with windows.
Deleted old fftw and ACML installation instruction (can be found on damask.mpie.de)
2013-10-10 09:38:31 +00:00
Philip Eisenlohr 1593daea97 exchanged order of asking for BLASDIR and BLASTYPE. now type comes first (otherwise you may not know your options...) 2013-09-23 19:27:34 +00:00
Franz Roters 5bb9c95245 removed compiler option '-diag-enable sc3' from openMP compiler calls as it does not work together 2013-08-08 14:47:04 +00:00
Franz Roters 7415c934c5 fixed too long lines in Fortran commands with openMP 2013-08-08 07:53:51 +00:00
Franz Roters 1c933bd39a added possibility to create damsk symlinks in /usr/local/bin, that's where also marc mentat links are placed by default 2013-08-02 13:55:06 +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
Martin Diehl a7b6093edc fixed bug in include_linux64 for Marc 2012, tests should run again after updating the copy in /msc/....
polished two other versions of this file
unified output format for /echo/ in material.f90
2013-06-11 07:28:08 +00:00
Franz Roters 6b7a69fea6 Layout compromise between classic and new Mentat 2013-04-29 14:27:25 +00:00
Franz Roters 29a6d4f901 new Mentat integration; thre is a DAMASK menu now in jobs/run
our installations will be updated one by one, so watch out for the new menu!
2013-04-26 13:43:10 +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 2a6f66d504 Abaqus explicit now with correct interface, seems to work now 2013-03-21 17:24:58 +00:00
Franz Roters 48e57fc3cb removed -save option from all compiler calls using openMP 2013-03-06 07:45:45 +00:00
Martin Diehl 80a20d5ea9 continuation of last commit 2013-02-01 13:22:40 +00:00
Martin Diehl 3ffd6499b1 change bash-only "let" to "`expr`", abaqus_v6.env now suppresses warnings about long lines (there are only comments anyway) 2013-01-28 15:30:51 +00:00
Franz Roters 41c5e43377 reduced optimization level to 01 as O2 gives the following runtime error:
/abaqus/6.12-2/code/bin/standard.exe: symbol lookup error: /tmp/f.roters_input_hbc_29668/libstandardU.so: undefined symbol: for_simd_random_number
2012-12-21 15:09:34 +00:00
Franz Roters 93a5a0be50 updated Marc/Mentat scripts
submit1 now usese O1 optimization
submit2 now usese O2 optimization
submit3 now usese O1 optimization plus openMP

added posibility to choose preferred editor in apply_DAMASK_modifications
2012-11-13 15:27:06 +00:00
Martin Diehl 339205c890 added missing quotes 2012-10-25 07:56:58 +00:00
Philip Eisenlohr 0e33725395 switched to general logic that branches locally depending on shell type.
now bash and csh derivatives should work.
2012-10-18 09:55:54 +00:00
Martin Diehl 71e1d4d5bb substituted old patched FFTW with new, now unpatched, version 2012-10-05 17:27:40 +00:00
Martin Diehl 48a9104b7e corrected fortran compile command and added comments on the compiler switches 2012-10-05 17:22:45 +00:00
Martin Diehl 73349d02f5 merged precision info into the file prec.f90 and removed prec_single.f90
precision information is now parsed as a makro, defined by the compiler, eg. -DFLOAT=8 for 8 byte long floats or -- in case no values is given -- for the FEM wrapper by the interface files.

Please don't forget to run setup_code.py  !!!!!!!!!!!

abaqus_v6.env is adjusted to specify the standard precision (float=8, int=4) and got some extra compilation options, some deprecated warning supressors are removed

Optional Marc modification will follow that allow automatic selection of suitable precision
2012-08-28 16:08:17 +00:00
Martin Diehl beda30302a setup_shellrc.py now creates .bashrc if no file for login startup information is found 2012-06-22 14:18:42 +00:00
Franz Roters 5923d6b413 changed default Marc version to 2012 2012-06-20 06:40:34 +00:00
Franz Roters 15c8a6b0ac FFTW is no longer needed for the FEM subroutine 2012-06-19 08:05:47 +00:00
Franz Roters 976564b74e modifications for Marc/Mentat2012 2012-06-13 07:32:20 +00:00
Franz Roters 1a96a9fbad now based on abq6111
now using ifort in $PATH
2012-05-16 06:57:37 +00:00
Franz Roters 93f311f2b9 now skips environment variables in comments, i.e. after '#' 2012-01-31 15:43:39 +00:00
Franz Roters 0b5a1a8925 removed some no longer used defaults
added library path for fftw
2012-01-17 08:37:09 +00:00
Philip Eisenlohr 37807ff6ca added reporting of files altered by the script 2012-01-11 17:30:27 +00:00
Philip Eisenlohr 7827364908 improved subtitution/deletion handling 2012-01-11 16:38:23 +00:00
Philip Eisenlohr c052e3d5d2 path to fftw3 lib is now set (hopefully, mandatory) with LD_LIBRARY_PATH (via setup_shellrc.py...) 2011-12-22 10:41:17 +00:00
Philip Eisenlohr 8535421429 killed obsolete "--heap-arrays" comment 2011-12-22 10:21:50 +00:00
Philip Eisenlohr b12c6672d6 corrected LD_LIBRARY_PATH processing of LAPACK and added FFTW to it. 2011-12-21 13:13:11 +00:00
Philip Eisenlohr 8bf3cc3a3f exchanged fftw3.3 source with patched one (now containing set_timelimit wrapper in api/f77funcs.h) 2011-12-21 12:48:20 +00:00
Franz Roters 0695bfd315 updated instructions 2011-12-21 09:35:47 +00:00
Franz Roters fcfc8d9402 corrected small syntax error 2011-12-20 13:58:30 +00:00
Franz Roters 34d56548ad corrected librarypath for fftw
removed fftw3_threads
2011-12-20 13:52:19 +00:00
Franz Roters ee3049b761 corrected syntax errors 2011-12-20 12:53:19 +00:00
Franz Roters 485ed3742c now aware of empty lines 2011-12-20 11:04:29 +00:00
Philip Eisenlohr 7dff3ba12c reworked script... 2011-12-20 10:52:58 +00:00
Philip Eisenlohr 2b42896ef6 added parsing of comments (# comment here...)
added "lib64" as possible location (sub-directory) for liblapack.a
2011-12-20 10:19:48 +00:00
Philip Eisenlohr 2b6cb3bd84 added linking option for FFTW.
which LAPACK installation is used can now be selected by switching on IKML, ACML, or LAPACK path (in that order of preference)

(multiuser environments now need to have system-wide installation locations for those libraries, since run_*_marc scripts are set once and for all to use them.)
2011-12-20 09:47:27 +00:00
Franz Roters c4a4c5cdca corrected error in apply_DAMASK_modifications
added support for Marc/Mentat2011 (classic)
2011-12-19 16:06:03 +00:00
Martin Diehl 031a00237f improved makefile, no directly linking to files of acml
corrected default pathinfo
improved test for intel compiler
2011-12-09 16:34:53 +00:00
Franz Roters 1f1046ecc5 removed option -heap arrays from all compiler calls use 'ulimit -s unlimited' on the command line instead 2011-12-01 08:54:26 +00:00
Philip Eisenlohr 4137d1f9af fixed stupid lower case typo in pathInfo assignment 2011-11-29 17:40:11 +00:00
Franz Roters 12bf99c2f9 removed option -extend_source from compile_fortran command definition as it also seems to influence allowed line length for free format files 2011-11-28 08:19:55 +00:00
Philip Eisenlohr db09a8b17a removed ACML from public part and adjusted install instructions accordingly. 2011-11-14 15:21:12 +00:00
Philip Eisenlohr 413805e589 now aware of ACMLpathinfo 2011-11-14 14:59:16 +00:00