Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added call flush and compiling lines #5

Merged
merged 1 commit into from
May 23, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 24 additions & 7 deletions makefile.CHOICES
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Compilation and link flags for LATTE
#


# Precision - double or single
PRECISION = DOUBLE
#PRECISION = SINGLE
Expand All @@ -14,12 +13,12 @@ MAKELIB = ON
AR = /usr/bin/ar cq
RANLIB = /usr/bin/ranlib

# Use the PROGRESS and BML libraries
# Use PROGRESS and BML libraries
PROGRESS = OFF
PROGRESS_PATH= $(HOME)/qmd-progress/install/lib
BML_PATH= $(HOME)/bml/install/lib

# Use the METIS library for graph partitioning
# Use METIS library for graph partitioning
METIS = OFF
METIS_PATH= $(HOME)/metis/metis-5.1.0/install

Expand All @@ -35,18 +34,36 @@ MPIOPT = OFF
#
# CPU Fortran options
#

#For GNU compiler:
#FC = mpif90
FC = gfortran
FCL = $(FC)
FFLAGS = -O3 -fopenmp -cpp
#FFLAGS = -fast -Mpreprocess -mp
LINKFLAG = -fopenmp

#For intel compiler:
#FC = ifort
#FCL = $(FC)
#FFLAGS = -O3 -fpp -qopenmp
#LINKFLAG = -qopenmp
#LIB = -mkl=parallel

#GNU BLAS/LAPACK libraries:
LIB = -llapack -lblas

#Intel MKL BLAS/LAPACK libraries:
#LIB = -Wl,--no-as-needed -L${MKLROOT}/lib/intel64 \
# -lmkl_lapack95_lp64 -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core \
# -lmkl_gnu_thread -lmkl_core -ldl -lpthread -lm

#Alternative flags for MKL:
#LIB += -mkl=parallel

#Other BLAS/LAPACK vendors:
#LIB = -framework Accelerate
#LIB = -L/usr/projects/hpcsoft/toss2/common/acml/5.3.1/gfortran64/lib -lacml
#LIB = -Wl,--no-as-needed -L${MKLROOT}/lib/intel64 \
-lmkl_lapack95_lp64 -lmkl_gf_lp64 -lmkl_gnu_thread -lmkl_core \
-lmkl_gnu_thread -lmkl_core -ldl -lpthread -lm
LIB = -llapack -lblas

ifeq ($(PROGRESS), ON)
LIB += -L$(PROGRESS_PATH) -lprogress -L$(BML_PATH) -lbml
Expand Down
2 changes: 2 additions & 0 deletions src/latte_lib.f90
Original file line number Diff line number Diff line change
Expand Up @@ -570,6 +570,8 @@ SUBROUTINE LATTE(NTYPES,TYPES,CR_IN,MASSES_IN,XLO,XHI,FTOT_OUT, &

INITIALIZED = .true.

CALL FLUSH(6) !To force writing to file at every call

RETURN

ELSEIF (MDON .EQ. 1 .AND. RELAXME .EQ. 0 .AND. MAXITER_IN >= 0) THEN
Expand Down