From 5d7f7f1bc59225ae3a622a8c9d46db531067c0e6 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 7 Jun 2013 07:27:12 +0000 Subject: [PATCH] reverted accidently commited changes to Makefile. one public statement in math.f90 still prevented compilation of core module, fixed that --- code/Makefile | 16 +++++++++++----- code/math.f90 | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/code/Makefile b/code/Makefile index 3c5337b78..f83d14869 100644 --- a/code/Makefile +++ b/code/Makefile @@ -39,12 +39,12 @@ SHELL = /bin/sh ######################################################################################## #any values will be overwritten by setup_code.py -FFTWROOT ?= /usr/lib/fftw -IMKLROOT ?= /opt/intel/composerxe/mkl -ACMLROOT ?= /opt/acml5.2.0 -LAPACKROOT ?= +FFTWROOT ?= /usr/local +IMKLROOT ?= +ACMLROOT ?= +LAPACKROOT ?= /usr -F90 ?= ifort +F90 ?= = ifort COMPILERNAME ?= $(F90) @@ -115,6 +115,12 @@ endif LIBRARIES +=-lfftw3 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 include ${PETSC_DIR}/conf/variables diff --git a/code/math.f90 b/code/math.f90 index 21f9eeabb..92d43bb98 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -245,6 +245,7 @@ real(pReal), dimension(4,36), parameter, private :: & math_logstrainMat, & math_cauchy, & math_periodicNearestNeighbor, & + math_nearestNeighbor, & math_periodicNearestNeighborDistances #endif private :: & @@ -3350,6 +3351,7 @@ function math_periodicNearestNeighbor(geomdim, Favg, querySet, domainSet) end function math_periodicNearestNeighbor + !-------------------------------------------------------------------------------------------------- !> @brief Obtain the nearest neighbor from domainSet at points in querySet !--------------------------------------------------------------------------------------------------