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

reverted accidently commited changes to Makefile. 

one public statement in math.f90 still prevented compilation of core module, fixed that
This commit is contained in:
Martin Diehl 2013-06-07 07:27:12 +00:00
parent e6ca36c7d7
commit 5d7f7f1bc5
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
code/Makefile
View File

@ -39,12 +39,12 @@ SHELL = /bin/sh
######################################################################################## ########################################################################################
#any values will be overwritten by setup_code.py #any values will be overwritten by setup_code.py
FFTWROOT ?= /usr/lib/fftw FFTWROOT ?= /usr/local
IMKLROOT ?= /opt/intel/composerxe/mkl IMKLROOT ?=
ACMLROOT ?= /opt/acml5.2.0 ACMLROOT ?=
LAPACKROOT ?= LAPACKROOT ?= /usr
F90 ?= ifort F90 ?= = ifort
COMPILERNAME ?= $(F90) COMPILERNAME ?= $(F90)
@ -115,6 +115,12 @@ endif
LIBRARIES +=-lfftw3 LIBRARIES +=-lfftw3
LIB_DIRS +=-L$(FFTWROOT)/lib LIB_DIRS +=-L$(FFTWROOT)/lib
#hdf5
ifeq "$(HDF5)" "ON"
LIB_DIRS +=-L/opt/hdf5-1.8.10-patch1/hdf5/lib
LIBRARIES +=-lhdf5_fortran -lhdf5
INCLUDE_DIRS +=-I/opt/hdf5-1.8.10-patch1/hdf5/include -DHDF
endif
ifdef PETSC_DIR ifdef PETSC_DIR
include ${PETSC_DIR}/conf/variables include ${PETSC_DIR}/conf/variables

2
code/math.f90
View File

@ -245,6 +245,7 @@ real(pReal), dimension(4,36), parameter, private :: &
math_logstrainMat, & math_logstrainMat, &
math_cauchy, & math_cauchy, &
math_periodicNearestNeighbor, & math_periodicNearestNeighbor, &
math_nearestNeighbor, &
math_periodicNearestNeighborDistances math_periodicNearestNeighborDistances
#endif #endif
private :: & private :: &
@ -3350,6 +3351,7 @@ function math_periodicNearestNeighbor(geomdim, Favg, querySet, domainSet)
end function math_periodicNearestNeighbor end function math_periodicNearestNeighbor
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief Obtain the nearest neighbor from domainSet at points in querySet !> @brief Obtain the nearest neighbor from domainSet at points in querySet
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------