[cig-commits] r6030 - in cs/benchmark/trunk: . benchmark
benchmark/discretize benchmark/short/applications
brad at geodynamics.org
brad at geodynamics.org
Wed Feb 14 17:12:45 PST 2007
Author: brad
Date: 2007-02-14 17:12:45 -0800 (Wed, 14 Feb 2007)
New Revision: 6030
Added:
cs/benchmark/trunk/setup.py
Modified:
cs/benchmark/trunk/benchmark/CompareApp.py
cs/benchmark/trunk/benchmark/ProjectionQuadPts.py
cs/benchmark/trunk/benchmark/discretize/Tet4.py
cs/benchmark/trunk/benchmark/short/applications/bm_create_projection.py
cs/benchmark/trunk/benchmark/short/applications/femlabtoh5.py
cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py
cs/benchmark/trunk/benchmark/short/applications/okadaelastictoh5.py
cs/benchmark/trunk/benchmark/short/applications/pylithtoh5.py
Log:
Added missing setup.py. Removed 'requires' stuff that wasn't needed.
Modified: cs/benchmark/trunk/benchmark/CompareApp.py
===================================================================
--- cs/benchmark/trunk/benchmark/CompareApp.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/benchmark/CompareApp.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -14,9 +14,6 @@
## @brief Python application to compare projected solutions.
-from pkg_resources import require
-require("pythia>=0.8")
-
from pyre.applications.Script import Script
# CompareApp class
Modified: cs/benchmark/trunk/benchmark/ProjectionQuadPts.py
===================================================================
--- cs/benchmark/trunk/benchmark/ProjectionQuadPts.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/benchmark/ProjectionQuadPts.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -15,9 +15,6 @@
## @brief Python object for projecting solutions to element quadrature
## points. Projected solutions are stored in an HDF5 file.
-from pkg_resources import require
-require("pythia>=0.8")
-
from pyre.components.Component import Component
import numpy
Modified: cs/benchmark/trunk/benchmark/discretize/Tet4.py
===================================================================
--- cs/benchmark/trunk/benchmark/discretize/Tet4.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/benchmark/discretize/Tet4.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -15,9 +15,6 @@
## @brief Python object describing interpolation and quadrature
## information for linear tetrahedral finite-element.
-from pkg_resources import require
-require("pythia>=0.8")
-
from pyre.components.Component import Component
# Tet4 class
Modified: cs/benchmark/trunk/benchmark/short/applications/bm_create_projection.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/bm_create_projection.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/benchmark/short/applications/bm_create_projection.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -15,9 +15,6 @@
## @brief Python application to create projection and dump projection
## quadrature points to file.
-from pkg_resources import require
-require("pythia>=0.8")
-
from pyre.applications.Script import Script
# Creator class
Modified: cs/benchmark/trunk/benchmark/short/applications/femlabtoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/femlabtoh5.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/benchmark/short/applications/femlabtoh5.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -15,9 +15,6 @@
## @brief Python application to translate Femlab solution computed
## at projection quadrature points to HDF5 file.
-from pkg_resources import require
-require("pythia>=0.8")
-
from pyre.applications.Script import Script
import numpy
from benchmark.tablewaiter import createGroup
Modified: cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/benchmark/short/applications/geofesttoh5.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -15,9 +15,6 @@
## @brief Python application to translate GeoFEST output from UCD
## format to HDF5.
-from pkg_resources import require
-require("pythia>=0.8")
-
from pyre.applications.Script import Script
import numpy
Modified: cs/benchmark/trunk/benchmark/short/applications/okadaelastictoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/okadaelastictoh5.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/benchmark/short/applications/okadaelastictoh5.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -15,9 +15,6 @@
## @brief Python application to translate analytical elastic solution computed
## using Okada at projection quadrature points to HDF5 file.
-from pkg_resources import require
-require("pythia>=0.8")
-
from pyre.applications.Script import Script
import numpy
from benchmark.tablewaiter import createGroup
Modified: cs/benchmark/trunk/benchmark/short/applications/pylithtoh5.py
===================================================================
--- cs/benchmark/trunk/benchmark/short/applications/pylithtoh5.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/benchmark/short/applications/pylithtoh5.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -15,9 +15,6 @@
## @brief Python application to translate PyLith output from UCD
## format to HDF5.
-from pkg_resources import require
-require("pythia>=0.8")
-
from pyre.applications.Script import Script
import numpy
Added: cs/benchmark/trunk/setup.py
===================================================================
--- cs/benchmark/trunk/setup.py 2007-02-14 21:47:41 UTC (rev 6029)
+++ cs/benchmark/trunk/setup.py 2007-02-15 01:12:45 UTC (rev 6030)
@@ -0,0 +1,25 @@
+
+from archimedes import use_merlin
+use_merlin()
+
+from merlin import setup, find_packages
+
+setup(
+
+ name = 'benchmark',
+ version = '1.0',
+
+ zip_safe = False,
+ packages = find_packages(),
+
+ install_requires = [
+ 'pythia[mpi] >= 0.8.1.0, < 0.8.2a',
+ ],
+
+ author = 'Luis Armendariz, Brad Aagaard',
+ author_email = '??@geodynamics.org',
+ description = """Code to evaluate results of benchmark problems.""",
+ license = 'other',
+ url = 'http://www.geodynamics.org/cig/software/packages/cs/benchmark/',
+
+)
More information about the cig-commits
mailing list