Changeset 7137e5d

Timestamp:

04/01/10 12:10:52 (14 years ago)

Author:

Jan Meinke <j.meinke@…>

Branches:

master

Children:

5272e0d

Parents:

38d77eb

Message:

Added timer and enyshe using double loop.

Files:

• Makefile (modified) (5 diffs)
• enyshe_simple.f90 (added)
• timer.F90 (added)

Makefile

@@ -17 +17 @@
         $(F90) $(F_FLAGS) $<
 
+.SUFFIXES:      .o .F90
+.F90.o:
+        $(F90) $(F_FLAGS) $<
 # ==================================== Variables for compiling and linking
 L_FLAGS=-g
 # Linker flags
 # Default flags, e.g., for gfortran, g77
-#L_FLAGS=-O2 -g
+L_FLAGS=-O2 -g
 
 # Flags for Intel's ifort
@@ -37 +40 @@
 # Compiler flags
 # Default flags, e.g., for gfortran, g77
-#F_FLAGS=-c -O2 -g
+F_FLAGS=-c -O2 -g
 # Flags for Intel's ifort
 #F_FLAGS=-c -O3 -axT -g
 #F_FLAGS=-c -fast -parallel
 # Flags for debugging build
- F_FLAGS=-c -O0 -g
+# F_FLAGS=-c -O0 -g
 # FLAGS for Cray
 # F_FLAGS=-c -fastsse -Mipa
@@ -52 +55 @@
 
 # Select your compiler
-F90=ifort
+#F90=ifort
 #F90=pgf90
 #F90=xlf
-#F90=gfortran
+F90=gfortran
 MPIF90=mpif90
 
@@ -69 +72 @@
 init_energy.o init_molecule.o gradient.o energy.o \
 regul.o nursvr.o twister.o eninteract.o bgs.o eyabgn.o enylun.o utilities.o\
-partem_s.o esolan.o opesol.o init_lund.o
+partem_s.o esolan.o opesol.o init_lund.o enyshe_simple.o timer.o
 #_________Serial implementation of ECEPP/3 and solvent
 SOBJ=enyshe.o enysol.o
@@ -92 +95 @@
 # metropolis
 # ============================================== Linking
+all: $(PROG)
 
 $(PROG):        $(OBJ) $(SOBJ) main.o