Changeset 10148

Timestamp:

10/08/11 17:00:14 (13 years ago)

Author:

Mathieu Morlighem

Message:

improved python interface (slightly)

Location:

issm/trunk

Files:

• src/py/README (added)
• src/py/classes/model.py (modified) (1 diff)
• src/py/modules/TriMesh/Makefile (modified) (2 diffs)
• src/py/modules/hello/Makefile (modified) (2 diffs)
• src/py/test.py (deleted)
• startup.py (modified) (1 diff)

issm/trunk/src/py/classes/model.py

@@ +1 @@
+from mesh import *
+
 class model:
         """Python model class"""
-        x = []
-        y = []
-        elements = []
+        mesh=mesh()
         def __init__(self):
                 print 'new model created'
+        def __repr__(self):
+                return "   mesh: mesh properties"

issm/trunk/src/py/modules/TriMesh/Makefile

@@ -1 @@
-all:
+all: ogive
+
+ice:
         g++ -bundle  -bind \
                 -I$(ISSM_TIER)/externalpackages/boost/install/include \
@@ -5 +7 @@
                 -L/usr/lib/python2.6/config/ -lpython2.6 \
                 TriMeshmodule.cpp -o TriMesh.so
-        #-I/usr/include/python2.6/ \
+
+ogive:
+        g++ \
+                -I$(ISSM_TIER)/externalpackages/boost/install/include \
+                -I/opt/local/include/python2.5/ \
+                -L$(ISSM_TIER)/externalpackages/boost/install/lib -lboost_python \
+                -L/usr/lib/ -lpython2.5 \
+                TriMeshmodule.cpp -o TriMesh.so -bundle
+
+clean:
+        rm TriMesh.so

issm/trunk/src/py/modules/hello/Makefile

@@ -1 @@
-all:
+all: ogive
+
+ice:
         g++ -bundle  -bind \
                 -I$(ISSM_TIER)/externalpackages/boost/install/include \
@@ -6 +8 @@
                 -L/usr/lib/python2.6/config/ -lpython2.6 \
                 hellomodule.cpp -o hello.so
+
+ogive:
+        g++ \
+                -I$(ISSM_TIER)/externalpackages/boost/install/include \
+                -I/usr/include/python2.5/ \
+                -L$(ISSM_TIER)/externalpackages/boost/install/lib -lboost_python \
+                -L/usr/lib/python2.5/config/ -lpython2.5 \
+                hellomodule.cpp -o hello.so -bundle
+
+clean:
+        rm hello.so

issm/trunk/startup.py

@@ -22 +22 @@
 sys.path.append(ISSM_TIER+'/src/py')
 sys.path.append(ISSM_TIER+'/src/py/classes')
-import model
+sys.path.append(ISSM_TIER+'/src/py/modules/TriMesh')
+sys.path.append(ISSM_TIER+'/src/py/modules/hello')
+from model import *
 
 print "\n  To get started with ISSM, type issmdoc at the command prompt.\n\n"