kthyng · kthyng · Nov 17, 2013 · Nov 6, 2013 · Nov 6, 2013
diff --git a/manual.ipynb → docs/manual.ipynb b/manual.ipynb → docs/manual.ipynb
diff --git a/manual.pdf → docs/manual.pdf b/manual.pdf → docs/manual.pdf
diff --git a/plotting.py b/plotting.py
diff --git a/setup.py b/setup.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+
+"""
+setup.py for tracpy -- python wrappers around TRACMASS
+
+"""
+import shutil
+from setuptools import setup # to support "develop" mode
+from numpy.distutils.core import setup, Extension
+
+# ## total kludge:
+# ## this copies extension built with makefile to package
+# ## better to have setup.py build TRACMASS
+
+# try:
+#     shutil.copyfile("src/tracmass.so", "tracpy/tracmass.so")
+
+# except IOError:
+#     raise Exception("TRAMASS extesnion not built -- built it with the makefile in src")
+
+tracmass_mod = Extension(name = "tracmass",
+                         sources=['src/calc_dxyz.f95',
+                                  'src/cross.f95',
+                                  'src/loop_pos.f95',
+                                  'src/step.f95',
+                                  'src/vertvel.f95',
+                                  'src/calc_time.f95',
+                                  'src/diffusion.f95',
+                                  'src/pos.f95',
+                                  'src/turb.f95',
+                                  ],
+                      #extra_f90_compile_args=["-ffixed-form"],
+                      )
+
+# modules = ["tracpy/inout.py",
+#            "tracpy/op.py"
+#            "tracpy/plotting.py",
+#            "tracpy/run.py",
+#            "tracpy/tools.py",
+#            ]
+
+print tracmass_mod
+
+setup(
+    name = "tracpy",
+    version = "0.01",
+    author = "Kristen Thyng",
+    author_email = "",
+    description = ("python wrappers around TRACMASS"),
+    long_description=open('README.md').read(),
+    classifiers=[
+                 "Development Status :: 3 - Alpha",
+    #             "Topic :: Utilities",
+                 ],
+    packages = ["tracpy"],
+    # py_modules = modules,
+    ext_package='tracpy', 
+    ext_modules = [tracmass_mod],
+    scripts = [],
+    )
diff --git a/calc_dxyz.f95 → src/calc_dxyz.f95 b/calc_dxyz.f95 → src/calc_dxyz.f95
diff --git a/calc_time.f95 → src/calc_time.f95 b/calc_time.f95 → src/calc_time.f95
diff --git a/cross.f95 → src/cross.f95 b/cross.f95 → src/cross.f95
diff --git a/diffusion.f95 → src/diffusion.f95 b/diffusion.f95 → src/diffusion.f95
diff --git a/loop_pos.f95 → src/loop_pos.f95 b/loop_pos.f95 → src/loop_pos.f95
diff --git a/makefile → src/makefile b/makefile → src/makefile
diff --git a/outdir/.gitignore → src/outdir/.gitignore b/outdir/.gitignore → src/outdir/.gitignore
diff --git a/pos.f95 → src/pos.f95 b/pos.f95 → src/pos.f95
diff --git a/step.f95 → src/step.f95 b/step.f95 → src/step.f95
diff --git a/turb.f95 → src/turb.f95 b/turb.f95 → src/turb.f95
diff --git a/vertvel.f95 → src/vertvel.f95 b/vertvel.f95 → src/vertvel.f95
diff --git a/init.py → tests/init.py b/init.py → tests/init.py
diff --git a/__init__.py → tracpy/__init__.py b/__init__.py → tracpy/__init__.py
@@ -31,11 +31,10 @@
 * vertvel.f95
 '''
 
-import init
 import inout
 import op
-import plotting
-import run
+#import plotting
+#import run
 import tools
 
 __authors__ = ['Kristen Thyng <kthyng@tamu.edu>']
diff --git a/inout.py → tracpy/inout.py b/inout.py → tracpy/inout.py
diff --git a/op.py → tracpy/op.py b/op.py → tracpy/op.py
diff --git a/run.py → tracpy/run.py b/run.py → tracpy/run.py
@@ -14,7 +14,7 @@
 import time
 from matplotlib.mlab import *
 import inout
-import init
+#import init
 import plotting
 import tools
 from scipy import ndimage

diff --git a/tools.py → tracpy/tools.py b/tools.py → tracpy/tools.py