223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Philip Eisenlohr 2012-07-03 13:59:38 +00:00
parent aeb1e18268
commit b69f446caa
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
code/Makefile
View File

@ -39,10 +39,10 @@ SHELL = /bin/sh
######################################################################################## ########################################################################################
#auto values will be set by setup_code.py #auto values will be set by setup_code.py
#FFTWROOT := auto FFTWROOT := auto
#IMKLROOT := auto IMKLROOT := auto
#ACMLROOT := auto ACMLROOT := auto
#LAPACKROOT := auto LAPACKROOT := auto
F90 ?= ifort F90 ?= ifort
COMPILERNAME ?= $(F90) COMPILERNAME ?= $(F90)
@ -112,7 +112,9 @@ LIBRARIES +=-lacml$(ACML_ARCH)
else else
ifdef LAPACKROOT ifdef LAPACKROOT
LIB_DIRS +=-L$(LAPACKROOT)/lib64 -L$(LAPACKROOT)/lib LIB_DIRS +=-L$(LAPACKROOT)/lib64 -L$(LAPACKROOT)/lib
LIBRARIES +=-llapack -lrefblas -ltmglib LIBRARIES +=-llapack
endif
endif
endif endif
ifdef STANDARD_CHECK ifdef STANDARD_CHECK
@ -271,7 +273,7 @@ COMPILE_MAXOPTI =$(OPENMP_FLAG_$(F90)) $(COMPILE_OPTIONS_$(F90)) $(STANDARD_CHEC
COMPILED_FILES = prec.o DAMASK_spectral_interface.o IO.o numerics.o debug.o math.o \ COMPILED_FILES = prec.o DAMASK_spectral_interface.o IO.o numerics.o debug.o math.o \
FEsolving.o mesh.o material.o lattice.o \ FEsolving.o mesh.o material.o lattice.o \
constitutive_dislotwin.o constitutive_j2.o constitutive_phenopowerlaw.o \ constitutive_dislotwin.o constitutive_j2.o constitutive_phenopowerlaw.o \
constitutive_titanmod.o constitutive_nonlocal.o constitutive.o \ constitutive_titanmod.o constitutive_nonlocal.o constitutive_none.o constitutive.o \
homogenization_RGC.o homogenization_isostrain.o homogenization.o CPFEM.o crystallite.o homogenization_RGC.o homogenization_isostrain.o homogenization.o CPFEM.o crystallite.o
ifneq "$(SOLVER)" "AL" ifneq "$(SOLVER)" "AL"
@ -312,7 +314,8 @@ constitutive.o: constitutive.f90 \
constitutive_titanmod.o \ constitutive_titanmod.o \
constitutive_dislotwin.o \ constitutive_dislotwin.o \
constitutive_phenopowerlaw.o \ constitutive_phenopowerlaw.o \
constitutive_j2.o constitutive_j2.o \
constitutive_none.o
constitutive_nonlocal.o: constitutive_nonlocal.f90 \ constitutive_nonlocal.o: constitutive_nonlocal.f90 \
lattice.o lattice.o
@ -329,6 +332,9 @@ constitutive_phenopowerlaw.o: constitutive_phenopowerlaw.f90 \
constitutive_j2.o: constitutive_j2.f90 \ constitutive_j2.o: constitutive_j2.f90 \
lattice.o lattice.o
constitutive_none.o: constitutive_none.f90 \
lattice.o
lattice.o: lattice.f90 \ lattice.o: lattice.f90 \
material.o material.o