Merge branch 'master' into lammps-icms

2010-11-30 08:35:42 -05:00
parent 189735810b 0e72c6f0e5
commit e42d61f775
8 changed files with 29 additions and 35 deletions
--- a/python/examples/pizza/vmd.py
+++ b/python/examples/pizza/vmd.py
@ -54,6 +54,12 @@ except: PIZZA_VMDDEV = "win"
 try: from DEFAULTS import PIZZA_VMDARCH
 except: PIZZA_VMDARCH = "LINUX"

+# try these settings for a Mac
+#PIZZA_VMDNAME = "vmd"
+#PIZZA_VMDDIR = "/Applications/VMD\ 1.8.7.app/Contents/vmd"
+#PIZZA_VMDDEV = "win"
+#PIZZA_VMDARCH = "MACOSXX86"
+
 try: import pexpect
 except: 
  print "pexpect from http://pypi.python.org/pypi/pexpect", \