projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zmiany w geomout dla AFM
[unres.git]
/
source
/
unres
/
src_MD-M
/
Makefile
diff --git
a/source/unres/src_MD-M/Makefile
b/source/unres/src_MD-M/Makefile
index
d3206a8
..
ef18714
100644
(file)
--- a/
source/unres/src_MD-M/Makefile
+++ b/
source/unres/src_MD-M/Makefile
@@
-1,7
+1,9
@@
CPPFLAGS = -DLINUX -DUNRES -DMP -DMPI \
-DPGI -DSPLITELE -DISNAN -DAMD64 \
-DPROCOR -DLANG0 \
CPPFLAGS = -DLINUX -DUNRES -DMP -DMPI \
-DPGI -DSPLITELE -DISNAN -DAMD64 \
-DPROCOR -DLANG0 \
- -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
+ -DSCCORPDB
+# -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
+# -DSCCORPDB
## -DPROCOR
## -DMOMENT
#-DCO_BIAS
## -DPROCOR
## -DMOMENT
#-DCO_BIAS
@@
-14,8
+16,9
@@
INSTALL_DIR = /users/software/mpich-1.2.7p1_intel-10.1_em64_ssh
#FC= /usr/local/opt/intel/compiler60/ia32/bin/ifc
FC= ifort
#FC= /usr/local/opt/intel/compiler60/ia32/bin/ifc
FC= ifort
-OPT = -O3 -ip -w
-
+#OPT = -O3 -ip -w
+OPT = -g -CB
+#OPT = -g
CFLAGS = -DSGI -c
FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include
CFLAGS = -DSGI -c
FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include
@@
-23,10
+26,10
@@
FFLAGS1 = -c -w -g -d2 -CA -CB -I$(INSTALL_DIR)/include
FFLAGS2 = -c -w -O0 -I$(INSTALL_DIR)/include
FFLAGSE = -c -w -O3 -ipo -ipo_obj -opt_report -I$(INSTALL_DIR)/include
FFLAGS2 = -c -w -O0 -I$(INSTALL_DIR)/include
FFLAGSE = -c -w -O3 -ipo -ipo_obj -opt_report -I$(INSTALL_DIR)/include
-BIN = ../../../bin/unres/MD-M/unres_Tc_procor_oldparm_em64-D-symetr.exe
+BIN = ../../../bin/unres/MD-M/unres_Tc_procor_newparm_em64-D-symetr.exe
#LIBS = -L$(INSTALL_DIR)/lib_pgi -lmpich xdrf/libxdrf.a
#LIBS = -L$(INSTALL_DIR)/lib_ifort -lmpich xdrf/libxdrf.a
#LIBS = -L$(INSTALL_DIR)/lib_pgi -lmpich xdrf/libxdrf.a
#LIBS = -L$(INSTALL_DIR)/lib_ifort -lmpich xdrf/libxdrf.a
-LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf_em64/libxdrf.a -g -d2 -CA -CB
+LIBS = -L$(INSTALL_DIR)/lib -lmpich ../../lib/xdrf_em64/libxdrf.a -g -d2 -CA -CB
ARCH = LINUX
PP = /lib/cpp -P
ARCH = LINUX
PP = /lib/cpp -P
@@
-60,7
+63,8
@@
unres: ${object} proc_proc.o
cc -o compinfo compinfo.c
./compinfo | true
${FC} ${FFLAGS} cinfo.f
cc -o compinfo compinfo.c
./compinfo | true
${FC} ${FFLAGS} cinfo.f
- ${FC} ${OPT} -Wl,-M ${object} proc_proc.o cinfo.o ${LIBS} -o ${BIN}
+ ${FC} ${OPT} ${object} proc_proc.o cinfo.o ${LIBS} -o ${BIN}
+#${FC} ${OPT} -Wl,-M ${object} proc_proc.o cinfo.o ${LIBS} -o ${BIN}
clean:
clean:
@@
-128,3
+132,12
@@
lagrangian_lesyng.o : lagrangian_lesyng.F
proc_proc.o: proc_proc.c
${CC} ${CFLAGS} proc_proc.c
proc_proc.o: proc_proc.c
${CC} ${CFLAGS} proc_proc.c
+
+add.o: add.f
+ ${FC} ${FFLAGS2} add.f
+
+blas.o: blas.f
+ ${FC} ${FFLAGS2} blas.f
+
+eigen.o: eigen.f
+ ${FC} ${FFLAGS2} eigen.f