Changeset 11860


Ignore:
Timestamp:
04/02/12 14:25:48 (13 years ago)
Author:
Eric.Larour
Message:

Python into Makefile.am

Location:
issm/trunk-jpl/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/Makefile.am

    r11830 r11860  
    1 INCLUDES = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@
     1INCLUDES = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
     2
    23EXEEXT=$(ISSMEXT)
    34
  • issm/trunk-jpl/src/c/toolkits/python/pythonincludes.h

    r11849 r11860  
    55#ifndef _PYTHON_INCLUDES_H_
    66#define _PYTHON_INCLUDES_H_
    7 
    87
    98#include <stdio.h>
  • issm/trunk-jpl/src/py/modules/TriMesh/TriMesh.cpp

    r11850 r11860  
    3333
    3434        boost::python::list output;
     35        boost::python::numeric::array array;
    3536
    3637        double *index=NULL;
     
    3940        FetchData(&index,&n,INDEX);
    4041
     42        for(i=0;i<n;i++)array.append(index[i]);
    4143        for(i=0;i<n;i++)output.append(index[i]);
     44        output.append(array);
    4245
    4346        /*Call x layer*/
Note: See TracChangeset for help on using the changeset viewer.