Skip to content

Commit

Permalink
NONUNIFORM: Deleted the cache.py file that created the jiang_shu.pkl
Browse files Browse the repository at this point in the history
file as that is no longer necessary. Designed setup.py so that it will
use f2py to create the nonuniform_weno_k.so modules and then carry those
over in the installation of the package. Added MANIFEST and vim backup
files to the .gitignore file.
  • Loading branch information
tbenthompson committed Nov 11, 2013
1 parent b960c9e commit 71cf721
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 55 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ __git_version__.py
# setuptools
build
dist
MANIFEST
PyWENO*

# examples
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
include LICENSE
include version.py
include pyweno/nonuniform_weno_3.so
include pyweno/nonuniform_weno_5.so
54 changes: 0 additions & 54 deletions cache.py

This file was deleted.

9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'''PyWENO setup script.'''

import subprocess
import glob
import os
import re
Expand Down Expand Up @@ -53,21 +54,27 @@
f.close()


if not os.path.exists('pyweno/nonuniform_weno_3.so'):
subprocess.call('f2py -c pyweno/nonuniform_weno_3.f90 -m nonuniform_weno_3', shell=True)
subprocess.call('mv nonuniform_weno_3.so pyweno/', shell=True)
subprocess.call('f2py -c pyweno/nonuniform_weno_5.f90 -m nonuniform_weno_5', shell=True)
subprocess.call('mv nonuniform_weno_5.so pyweno/', shell=True)

###############################################################################
# setup!

setup(

name = "PyWENO",
packages = ['pyweno'],
package_data = {'pyweno': ['nonuniform_weno_3.so', 'nonuniform_weno_5.so']},
version = version,
author = "Matthew Emmett",
author_email = "[email protected]",
description = "Weighted Essentially Non-oscillatory (WENO) reconstructions.",
license = "BSD",
keywords = "weno, interpolate, interpolation, finite, volume",
url = "http://readthedocs.org/docs/pyweno/en/latest/",
data_files = [('pyweno', ['pyweno/nonuniform_weno_3.f90'])],

# XXX
# requires = [],
Expand Down

0 comments on commit 71cf721

Please sign in to comment.