Commit Graph

148 Commits

Author SHA1 Message Date
Martin Diehl f64418f29a removed multithreaded FFTW, does not make a big time difference and will simplify linking when using PETSc 2014-09-18 15:23:11 +00:00
Martin Diehl 4aa2c65d1e next try to make the makefile work in all possible cases for FEM and spectral 2014-09-11 09:51:38 +00:00
Martin Diehl 0af667e94d set search path (VPATH) to ../private/FEM/code only in case FEM solver is the target 2014-09-10 16:27:53 +00:00
Luv Sharma 7b5cbf4199 now compiling thermal_adiabatic.f90 also and some field related changes 2014-09-10 15:05:28 +00:00
Martin Diehl f1e345dcdb fixed compilation for FEM 2014-09-09 15:59:41 +00:00
Luv Sharma 79f572f869 more work on homogenisation new state and introduced field state 2014-09-03 17:12:06 +00:00
Martin Diehl 06988353ee now compiling spectral solver even if private folder is missing 2014-08-25 06:20:25 +00:00
Martin Diehl 977392cfe7 compiler for spectral solver is now the version provided by petsc (similar to linking)
added option to compile FEM solver with same Makefile
2014-08-24 22:07:53 +00:00
Luv Sharma e555ce4827 started introducing new state structure in homogenisation 2014-08-21 17:48:20 +00:00
Philip Eisenlohr 5c429a9939 added ..._ROOT/lib64 as possible locations for FFTW and HDF5 libraries 2014-08-20 19:13:28 +00:00
Pratheek Shanthraj 10d2cfebd3 changed naming scheme for helper functions. damage and thermal dependent stress calculation more modularised 2014-08-08 14:02:20 +00:00
Martin Diehl ea66511160 added dislokmc (dislotwin modification) 2014-08-08 11:04:40 +00:00
Pratheek Shanthraj 3d83ac64fd added code for local damage 2014-08-01 14:54:57 +00:00
Martin Diehl a8c0ca66fc corrected linking: use PETSC MPI (when available) rather then system wide version.
little polishing (e.g. debug output for new state)
2014-07-23 13:26:05 +00:00
Martin Diehl ab9f36cfe7 fixed bug in J2 related to new state.
make clean now deletes old marc compilations
2014-07-23 08:23:56 +00:00
Luv Sharma 7dfda9d8af remved bug in phenopower law state initialization and a minor change in Makefile 2014-07-07 14:21:58 +00:00
Pratheek Shanthraj cd1d286611 updated makefile for FEM solver and minor changes to spectral makefile 2014-07-04 10:46:23 +00:00
Pratheek Shanthraj 3ee743ce66 corrected dependencies for thermal and damage modules in makefile 2014-07-03 13:32:21 +00:00
Martin Diehl 27d861decc fixed calculation of post results size introduced with new state 2014-07-03 13:17:29 +00:00
Martin Diehl 8fa2dcffbd changed to new state, please report bugs to Luv or Martin 2014-07-02 12:27:39 +00:00
Pratheek Shanthraj ab9a9f4f58 thermal and damage modules now linked to DAMASK 2014-06-24 23:18:39 +00:00
Martin Diehl 72c7cfc7af still some linking issues 2014-04-30 21:13:06 +00:00
Martin Diehl e8df11b62f splitted link and compile options 2014-04-30 14:13:21 +00:00
Martin Diehl 8cc3bf4049 added forgotten linker options 2014-04-30 13:22:08 +00:00
Martin Diehl 5b5a6ceaac makefile modified not to link against wrong libraries when using PETSc, reading in of values in phenopowerlaw improved, HDF5 in mesh 2014-04-29 17:50:59 +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 302423d266 introduced new state structure, compile with STATE=NEW 2014-04-15 09:20:38 +00:00
Martin Diehl eca211588e new compiler is more sensitive, needed to disable complaints in case of DEBUG=ON 2014-04-11 08:00:20 +00:00
Martin Diehl 5d4017bbfc introduced homogenization_none to substitute isostrain with ngrains 1.
cleaned up homogenization isostrain (has no state)
2014-03-13 23:20:50 +00:00
Martin Diehl ad203d32c1 circular dependencie (copy and paste error) removed 2014-02-26 12:04:52 +00:00
Franz Roters d3d4931061 corrected checking for ~/.damask/damask.conf 2014-02-14 15:58:01 +00:00
Martin Diehl 20bea80f0c changed order to have PETSc variables before others, fixed problem when MPI and FFTW were installed in standard location but PETSc build own MPI 2014-02-09 18:30:31 +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
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
Martin Diehl 1444739d60 prevent ifort from complaining too loud about old syntax in openmpi files 2014-02-03 16:47:16 +00:00
Martin Diehl c7e59821d1 fixed compilation bug when using IMKL single core 2014-01-30 15:38:10 +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
Martin Diehl 9e5a2d8e10 fixed runpath 2014-01-29 19:52:53 +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 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 4850e5987d remove LD_LIBRARY_PATH (http://linuxmafia.com/faq/Admin/ld-lib-path.html) and fixed wrong named xxx_ROOT 2014-01-25 00:15:04 +00:00
Martin Diehl d66b41c686 fixed installation, will test now 2014-01-24 12:30:27 +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 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 00eb9b2cf6 forgot Makefile 2014-01-11 17:18:59 +00:00
Martin Diehl 98d5a99a43 reverted unwanted changes to Makefile (configure) 2013-12-20 10:31:33 +00:00
Martin Diehl 61c6839723 fixed over-sensitive error in homogeniztion and ifort option in makefile 2013-12-19 08:49:47 +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
Martin Diehl 56d21286a6 fixed comment on values changed automatically 2013-09-18 14:33:40 +00:00
Martin Diehl 3bf0ed84c8 some comments and minor improvements.
removed tol_gravityNodePos from prec because it's not used
tol_math_check is now used by spectral driver to check rotation
2013-09-14 10:59:35 +00:00
Martin Diehl 216063fe36 added Polarisation scheme as solver 2013-07-24 13:06:16 +00:00
Martin Diehl 1b53bad9a4 removed doubled equal sign in compiler name definition 2013-06-11 09:06:25 +00:00
Martin Diehl 5d7f7f1bc5 reverted accidently commited changes to Makefile.
one public statement in math.f90 still prevented compilation of core module, fixed that
2013-06-07 07:27:12 +00:00
Martin Diehl e6ca36c7d7 removed old DAMASK_marcXXXX.f90 source files.
If you just use one Marc version, simply select DAMASK_marc.f90, this matches for all releases. 
DAMAKS_marc.marc compile with Marc 2010 does not work with Marc 2012. In case you need more than one Marc version in parallel, run symLink_Code.py in /code/setup to generate symlinks for Marc version 2010,2011,2012
2013-06-06 16:04:40 +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 2ba986be2a introduced new dummy module "libs" for inclusion of further library sources. contains kdtree2 and Lib_VTK_IO at and is enabled for the spectral solver only at the moment 2013-04-16 12:45:12 +00:00
Martin Diehl 2f76365ac8 fixed wrong string concatenation 2013-03-30 19:43:06 +00:00
Martin Diehl 745ca5a6a5 added "public" (and where possible "protected") statements to functions/subroutines/variables/parameters where needed
added -fmodule-private to compile options for gfortran, i.e. gfortran won't compile anymore if an entity is not explicitly declared as public but used in another module to ensure stronger encapsulation
2013-03-28 07:40:30 +00:00
Martin Diehl 1496c62258 updated doxygen config file for FEM solvers, replaced some external statements, removed debugging options from abaqus_v6.env causing Abaqus to crash (didn't detect the bug so far), added new homogenization test to automator, added more debug options + comments to Makefile 2013-02-13 17:54:56 +00:00
Martin Diehl f928d0ca0f some changes on the IKML libs, now using explicit linkin 2013-02-09 08:17:12 +00:00
Martin Diehl 59e59c90c5 added Option DEBUG to Makefile to turn run time debugging on, compile tests use this option 2013-02-08 15:43:15 +00:00
Martin Diehl 6ce78cf806 gfortran now detects "call flush" statements, removed the last of them in mesh.f90 2013-01-23 21:50:01 +00:00
Martin Diehl 566b680319 made new spectral solver the default (no need for SOLVER=NEW anymore) and added additional warnings switche to be used with gfortran >= 4.6
added comments
2012-12-15 16:21:10 +00:00
Henry Hutasoit 07bec16268 corrected compilation exception for gfortran in case of compilername!=F90 2012-11-28 13:54:02 +00:00
Martin Diehl e45e1316ba removed auto detection of compilername, it only works if the file you're looking for (in our case "ifort") is in the same directory as the Makefile 2012-11-27 17:22:03 +00:00
Martin Diehl dbc26e5f25 corrected auto detection of ifort compiler 2012-11-22 13:17:54 +00:00
Martin Diehl c3926efd93 introduced logic to use gfortran as default if ifort is not found 2012-11-13 19:12:00 +00:00
Martin Diehl 922042d8d5 now automatically using gfortran if no ifort is found 2012-11-13 18:40:14 +00:00
Martin Diehl 6a86f36407 now having libraries from Makefile before PETSc Libraries in linker order 2012-11-08 18:26:10 +00:00
Martin Diehl b9f97ba5da unified naming scheme, fixed a bug in the new basic scheme, and added a statistic file similar to abaqus to store the information on needed cut backs and iterations for each inc 2012-10-19 08:44:21 +00:00
Martin Diehl 3106b8ce0c corrected definition of integer type for gfortran 2012-08-29 05:19:35 +00:00
Martin Diehl 5e9e8497e6 new solver is now compiling without a PETSc installation, however only the plain basic solver is available then.
also removed reporting of PETSc related variables in the case it is not installed/found
2012-08-28 19:19:47 +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
Pratheek Shanthraj c2c31a0a59 added SolverBasicPETSC module to the new FFT solver (solves the basic scheme using PETSc when mysolver = basicpetsc in numerics.config)
some bug fixes
2012-08-14 16:58:23 +00:00
Martin Diehl 93658c72db set auto values back to auto 2012-08-06 12:44:07 +00:00
Martin Diehl 7e3a837640 moved calculation and output of geometry related data to mesh.f90, moved output of command line related information to DAMASK_spectral_interface.f90.
improved new solver structure (use with make SOLVER=NEW)
2012-08-06 12:43:05 +00:00
Martin Diehl a22163c2ae reverted unwanted commit of Makefile 2012-07-18 12:34:46 +00:00
Martin Diehl 95d292b286 2012-07-18 12:31:07 +00:00
Philip Eisenlohr b69f446caa added constitutive_none
added wrongly deleted "endif" statements
removed tmglib and refblas from linker command for lapack (Koen??)
xxxROOT is changed by setup_code unless commented-out... So had to delete '#' again.
2012-07-03 13:59:38 +00:00
Philip Eisenlohr 7f10ab0996 corrected to consistent naming: "IMKL"
restored xxxROOT to commented-out auto entries.
commented-out currently unused PETSC parts.
added "refblas" and "tmglib" to LAPACK library inclusion (seems to be necessary since 3.2.1).
2012-07-03 12:36:54 +00:00
Martin Diehl d650972904 corrected some bugs concerning the regridding
prevented FEsolving from potentially write to a none existing file
started to introduce petsc into the make chain (nothing happens if PETSC_DIR is not set)
2012-06-20 12:49:46 +00:00
Martin Diehl 8537e87b7e added shell scripts to run tests from crontab, improved numbering in spectral compile tests and added some first files for testing restart capabilities of spectral solver.
added configuration file for generation of code documentation using doxygen
restart of spectral solver is fixed and seem to work now also for restart at significant deformation.
spectral solver now gives exit code 2 if some increments did not converge
2012-06-18 15:27:01 +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 eb39d332bd ULTRA OPTIMIZATION wasnt working anymore, seems to be related to Bertholds update of ws12 and ws13. had to remove -static from optimization string to be able to link again. Added some support for IKLM, but this didn't solve the problem 2012-06-13 17:19:16 +00:00
Martin Diehl 3ef17c208b set default lapack to lapack instead of acml, added definition of makro for spectral solver for later use in preprocessor 2012-06-13 13:45:58 +00:00
Franz Roters 5b7f2e122e fixed usage of OpenMP function library 2012-06-12 09:44:05 +00:00
Martin Diehl 1003cfa7f8 added missing space in makefile, made removing of old files in Makefile silent and updated files for tests to current versions 2012-05-23 18:08:34 +00:00
Martin Diehl 0d745adfa0 corrected NaN in prec_single.f90 (was already silent but with typo), polished output and added switch in order to check range on all files except of prec.f90 (in which NaN is defined) 2012-05-11 12:46:17 +00:00
Martin Diehl 863f0c766e removed line continuation causing trouble 2012-05-04 08:19:12 +00:00
Martin Diehl b4775249e8 corrected standard check to make f2py working with gfortran 2012-05-03 17:12:36 +00:00
Martin Diehl 15dd860de9 new switch "SOLVER", set it to SOLVER=AL to compile the Augmented Lagrange version of the spectral solver 2012-03-21 18:01:25 +00:00
Martin Diehl dbdc7ddfa2 debug.config, debug.f90, DAMASK_abaqus_exp.f, DAMASK_abaqus_std.f: changed to new debug scheme (wasn't working)
lattice.f90, FEsolving.f90: explicitly defined public functions and variables, all others are now private
numerics.f90: changed output format of real numbers, now instead of 0.1eX 1.0e(X-1) is printed to screen
Makefile: now using correct Optimization flags for OPTIMIZATION=AGGRESSIVE
DAMASK_spectral_AL.f90: improved, but still testing. Stress BCs now seem to be handled correctly
2012-03-20 18:01:31 +00:00
Martin Diehl 04d83ec9cd added "-assume byterecl" in Makefile for ifortran to specify with "recl=" the size of the file in bytes instead of 4byte chunk when opening files. (same as in gfortran per default).
no important changes in other files
2012-03-20 12:26:21 +00:00
Martin Diehl d00c3c9e19 added error for to IO to substitute stop statement in kdtree2
explicitly defined all functions in as either public or private in the modules to have a quick overview on all functions and parameters that are available
2012-03-06 14:52:48 +00:00
Martin Diehl df03dee91c improved readability, removed archive statements. With new option FASTBUILD=YES build without any warnings etc 2012-03-01 19:34:42 +00:00