Changeset 281b862

Timestamp:

06/15/10 21:58:07 (14 years ago)

Author:

Jan Meinke <j.meinke@…>

Branches:

master

Children:

9f146fa

Parents:

5272e0d

Message:

Merged Makefile

File:

• Makefile (modified) (4 diffs)

Makefile

@@ -30 +30 @@
 #L_FLAGS=-fast -parallel
 # FLAGS for Cray
-# L_FLAGS=-fastsse -Mipa
+# L_FLAGS=-fast -Mipa
 
 # Flags for xlf
@@ -47 +47 @@
 # F_FLAGS=-c -O0 -g
 # FLAGS for Cray
-# F_FLAGS=-c -fastsse -Mipa
+#F_FLAGS=-c -fast -Mipa -Minfo
 # Flags for xlf
 #F_FLAGS=-c -O3 -qhot -q64 -qipa -qextname=flush
@@ -84 +84 @@
 pdbread.f  rmsdfun.f opereg.f mincjg.f cnteny.f  init_energy.f init_molecule.f \
 gradient.f regul.f nursvr.f twister.f eninteract.f bgs.f eyabgn.f enylun.f \
-mulcan_par_mod.f90 esolan.f opesol.f
+mulcan_par_mod.f90 esolan.f opesol.f init_lund.f90
 # partem_s.f
 
 
-pyInterface=init_molecule init_energy 
-#mulcan_par mulcan_sim \
-#init_lund sgrnd energy helix zimmer rgyr rmsdfun \
-#anneal canon  outpdb  minim  regul contacts interhbond hbond setvar\
-#enysol
-# metropolis
+pyInterface=init_molecule init_energy \
+init_lund sgrnd energy helix zimmer rgyr rmsdfun \
+anneal  outpdb  minim  regul contacts interhbond hbond setvar\
+enysol 
+#canon mulcan_par mulcan_sim metropolis
 # ============================================== Linking
 all: $(PROG)
@@ -135 +134 @@
 pybind: $(FILES)
         #./rmexclpoint.py $(FILES)
-#       f2py -c -m smmp min_smmp.pyf $(FILES) --fcompiler=gnu95
+        f2py -c -m smmp smmp.pyf $(FILES) --fcompiler=gnu95
         #./restoreexclpoint.py $(FILES)