Changeset 13749


Ignore:
Timestamp:
10/19/12 09:59:06 (12 years ago)
Author:
Mathieu Morlighem
Message:

CHG: moved all matlab and python code from src/c/ to src/wrappers

Location:
issm/trunk-jpl/src
Files:
2 added
2 deleted
58 edited
3 copied
4 moved

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r13722 r13749  
    1 AM_CPPFLAGS = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
     1AM_CPPFLAGS = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@
    22
    33EXEEXT=$(ISSMEXT)
    … …  
    88if SHAREDLIBS
    99lib_LTLIBRARIES = libISSMCore.la libISSMOverload.la libISSM.la
    10 endif
    11 if PYTHON
    12 lib_LIBRARIES += libISSMPython.a
    13 endif
    14 if MATLAB
    15 if SHAREDLIBS
    16 lib_LTLIBRARIES += libISSMMatlab.la
    17 endif
    18 lib_LIBRARIES += libISSMMatlab.a
    1910endif
    2011if WRAPPERS
    … …  
    764755                                        ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp
    765756#}}}
    766 #Python sources  {{{
    767 python_sources=     ./python/io/pythonio.h\
    768                                         ./python/python-binding.h\
    769                                     ./python/io/WritePythonData.cpp\
    770                                     ./python/io/CheckNumPythonArguments.cpp\
    771                                     ./python/io/FetchPythonData.cpp
    772 
    773 #}}}
    774 #Matlab sources  {{{
    775 matlab_sources= ./toolkits/matlab/matlabincludes.h\
    776                                     ./matlab/matlab-binding.h\
    777                                     ./matlab/io/matlabio.h\
    778                                     ./matlab/io/MatlabNArrayToNArray.cpp\
    779                                     ./matlab/io/CheckNumMatlabArguments.cpp\
    780                                     ./matlab/io/mxGetAssignedField.cpp\
    781                                     ./matlab/io/WriteMatlabData.cpp\
    782                                     ./matlab/io/FetchMatlabData.cpp\
    783                                     ./matlab/io/OptionParse.cpp\
    784                                     ./matlab/io/MatlabMatrixToMatrix.cpp\
    785                                     ./matlab/io/MatlabVectorToVector.cpp\
    786                                          ./matlab/io/MatlabVectorToDoubleVector.cpp\
    787                                          ./matlab/io/MatlabMatrixToDoubleMatrix.cpp\
    788                                          ./matlab/io/MatlabMatrixToSeqMat.cpp\
    789                                          ./matlab/io/MatlabVectorToSeqVec.cpp
    790 #}}}
    791 #Matlab and Petsc sources  {{{
    792 matlabpetsc_sources= ./matlab/io/MatlabMatrixToPetscMat.cpp\
    793                                          ./matlab/io/MatlabVectorToPetscVec.cpp
    794 
    795 #}}}
    796757#Wrappers sources{{{
    797758wrapper_sources= ./shared/Threads/issm_threads.h\
    … …  
    945906endif
    946907
    947 if PETSC
    948 if MATLAB
    949 issm_sources +=  $(matlabpetsc_sources)
    950 endif
    951 endif
    952 
    953908if KRIGING
    954909issm_sources +=  $(pkriging_sources)
    … …  
    984939if SHAREDLIBS
    985940libISSMWrappers_la_SOURCES = $(libISSMWrappers_a_SOURCES)
    986 endif
    987 endif
    988 
    989 if PYTHON
    990 libISSMPython_a_SOURCES = $(python_sources)
    991 libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS)
    992 endif
    993 
    994 if MATLAB
    995 libISSMMatlab_a_SOURCES = $(matlab_sources)
    996 libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS)
    997 if SHAREDLIBS
    998 libISSMMatlab_la_SOURCES = $(libISSMMatlab_a_SOURCES)
    999941endif
    1000942endif

  • issm/trunk-jpl/src/c/toolkits/toolkits.h

    r12102 r13749  
    1010#else
    1111#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    12 #endif
    13 
    14 #ifdef _HAVE_PYTHON_
    15 #include "./python/pythonincludes.h"
    1612#endif
    1713
    … …  
    3127#include "./toolkitsenums.h"
    3228#include "./issm/issmtoolkit.h"
    33 
    3429#endif

  • issm/trunk-jpl/src/wrappers/AverageFilter/AverageFilter.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/BamgConvertMesh/BamgConvertMesh.h

    r13243 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424#include "../../c/io/io.h"
    2525

  • issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.h

    r13586 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/BamgTriangulate/BamgTriangulate.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/Chaco/Chaco.h

    r13236 r13749  
    2525#include "../../c/Container/Container.h"
    2626#include "../../c/shared/shared.h"
    27 #include "../../c/issm-binding.h"
     27#include "../bindings.h"
    2828
    2929#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h

    r13355 r13749  
    2424#include "../../c/Container/Container.h"
    2525#include "../../c/shared/shared.h"
    26 #include "../../c/issm-binding.h"
     26#include "../bindings.h"
    2727#include "../../c/io/io.h"
    2828#include "../../c/EnumDefinitions/EnumDefinitions.h"

  • issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.h

    r13353 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.h

    r13236 r13749  
    2424#include "../../c/Container/Container.h"
    2525#include "../../c/shared/shared.h"
    26 #include "../../c/issm-binding.h"
     26#include "../bindings.h"
    2727#include "../../c/io/io.h"
    2828#include "../../c/EnumDefinitions/EnumDefinitions.h"

  • issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.h

    r13236 r13749  
    2222#include "../../c/Container/Container.h"
    2323#include "../../c/shared/shared.h"
    24 #include "../../c/issm-binding.h"
     24#include "../bindings.h"
    2525
    2626#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/HoleFiller/HoleFiller.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.h

    r13236 r13749  
    1919#include "../../c/include/globals.h"
    2020#include "../../c/shared/shared.h"
    21 #include "../../c/issm-binding.h"
     21#include "../bindings.h"
    2222#include "../../c/io/io.h"
    2323

  • issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h

    r13236 r13749  
    2424#include "../../c/Container/Container.h"
    2525#include "../../c/shared/shared.h"
    26 #include "../../c/issm-binding.h"
     26#include "../bindings.h"
    2727#include "../../c/io/io.h"
    2828#include "../../c/EnumDefinitions/EnumDefinitions.h"

  • issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/Kriging/Kriging.h

    r13236 r13749  
    2020#include "../../c/modules/modules.h"
    2121#include "../../c/shared/shared.h"
    22 #include "../../c/issm-binding.h"
     22#include "../bindings.h"
    2323
    2424#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.h

    r13236 r13749  
    2727#include "../../c/Container/Container.h"
    2828#include "../../c/shared/shared.h"
    29 #include "../../c/issm-binding.h"
     29#include "../bindings.h"
    3030#include "../../c/io/io.h"
    3131#include "../../c/EnumDefinitions/EnumDefinitions.h"

  • issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/Scotch/Scotch.h

    r13236 r13749  
    1313#include "../../c/Container/Container.h"
    1414#include "../../c/shared/shared.h"
    15 #include "../../c/issm-binding.h"
     15#include "../bindings.h"
    1616   
    1717#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.h

    r13236 r13749  
    2222#include "../../c/Container/Container.h"
    2323#include "../../c/shared/shared.h"
    24 #include "../../c/issm-binding.h"
     24#include "../bindings.h"
    2525
    2626#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h

    r13236 r13749  
    2424#include "../../c/Container/Container.h"
    2525#include "../../c/shared/shared.h"
    26 #include "../../c/issm-binding.h"
     26#include "../bindings.h"
    2727#include "../../c/io/io.h"
    2828#include "../../c/EnumDefinitions/EnumDefinitions.h"

  • issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.h

    r13640 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/TriaSearch/TriaSearch.h

    r13236 r13749  
    2020#include "../../c/Container/Container.h"
    2121#include "../../c/shared/shared.h"
    22 #include "../../c/issm-binding.h"
     22#include "../bindings.h"
    2323
    2424#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.h

    r13236 r13749  
    2121#include "../../c/Container/Container.h"
    2222#include "../../c/shared/shared.h"
    23 #include "../../c/issm-binding.h"
     23#include "../bindings.h"
    2424
    2525#undef __FUNCT__

  • issm/trunk-jpl/src/wrappers/bindings.h

    r13743 r13749  
    1 #ifndef _ISSM_BINDING_H_
    2 #define _ISSM_BINDING_H_
     1#ifndef _BINDINGS_H_
     2#define _BINDINGS_H_
    33
    44#ifdef HAVE_CONFIG_H
    … …  
    99
    1010#ifdef  _HAVE_MATLAB_MODULES_
    11 #include "./matlab/matlab-binding.h"
     11#include "./matlab/include/matlabincludes.h"
     12#include "./matlab/include/wrapper_macros.h"
     13#include "./matlab/io/matlabio.h"
    1214#endif
    1315
    1416#ifdef  _HAVE_PYTHON_MODULES_
    15 #include "./python/python-binding.h"
     17#include "./python/include/pythonincludes.h"
     18#include "./python/include/wrapper_macros.h"
     19#include "./python/io/pythonio.h"
    1620#endif
    1721

  • issm/trunk-jpl/src/wrappers/include/issm-binding.h

    r13737 r13749  
    99
    1010#ifdef  _HAVE_MATLAB_MODULES_
    11 #include "./matlab/matlab-binding.h"
     11#include "../matlab/include/matlab-macros.h"
    1212#endif
    1313
    1414#ifdef  _HAVE_PYTHON_MODULES_
    15 #include "./python/python-binding.h"
     15#include "../python/include/python-macros.h"
    1616#endif
    1717

  • issm/trunk-jpl/src/wrappers/matlab/Makefile.am

    r13743 r13749  
    1 AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@ @ADOLCINCL@
     1AM_CPPFLAGS = @DAKOTAINCL@ @MATLABINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@
    22
    33EXEEXT=$(MATLABWRAPPEREXT)
    44
     5#matlab io{{{
     6lib_LIBRARIES = libISSMMatlab.a
     7if SHAREDLIBS
     8lib_LTLIBRARIES = libISSMMatlab.la
     9else
     10lib_LTLIBRARIES =
     11endif
     12
     13io_sources= ./include/matlabincludes.h\
     14                                ./io/matlabio.h\
     15                                ./io/MatlabNArrayToNArray.cpp\
     16                                ./io/CheckNumMatlabArguments.cpp\
     17                                ./io/mxGetAssignedField.cpp\
     18                                ./io/WriteMatlabData.cpp\
     19                                ./io/FetchMatlabData.cpp\
     20                                ./io/OptionParse.cpp\
     21                                ./io/MatlabMatrixToMatrix.cpp\
     22                                ./io/MatlabVectorToVector.cpp\
     23                                ./io/MatlabVectorToDoubleVector.cpp\
     24                                ./io/MatlabMatrixToDoubleMatrix.cpp\
     25                                ./io/MatlabMatrixToSeqMat.cpp\
     26                                ./io/MatlabVectorToSeqVec.cpp
     27
     28ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXFLAGS) $(CXXOPTFLAGS)
     29libISSMMatlab_a_SOURCES = $(io_sources)
     30libISSMMatlab_a_CXXFLAGS= $(ALLCXXFLAGS)
     31if SHAREDLIBS
     32libISSMMatlab_la_SOURCES = $(io_sources)
     33endif
     34#}}}
    535#Wrappers {{{
    636if WRAPPERS
    7 lib_LTLIBRARIES =  AverageFilter.la\
     37lib_LTLIBRARIES +=  AverageFilter.la\
    838                                                 BamgMesher.la\
    939                                                 BamgConvertMesh.la\
    … …  
    4676endif
    4777endif
    48 
    4978#}}}
    5079#Flags and libraries {{{
    … …  
    6897endif
    6998if SHAREDLIBS
    70 deps += ../../c/libISSMMatlab.la
    71 else
    72 deps += ../../c/libISSMMatlab.a
     99deps += ./libISSMMatlab.la
     100else
     101deps += ./libISSMMatlab.a
    73102AM_LDFLAGS += --no-warnings
    74103endif

  • issm/trunk-jpl/src/wrappers/matlab/include/wrapper_macros.h

    r13737 r13749  
    33 */
    44
    5 /*Header {{{*/
    65#ifndef _MATLAB_MACROS_H_
    76#define _MATLAB_MACROS_H_
    … …  
    1211#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    1312#endif
    14 /*}}}*/
    1513
    1614#ifdef _HAVE_MATLAB_

  • issm/trunk-jpl/src/wrappers/matlab/io/CheckNumMatlabArguments.cpp

    r13622 r13749  
    33 */
    44
    5 #ifdef HAVE_CONFIG_H
    6         #include <config.h>
    7 #else
    8 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    9 #endif
     5#include "./matlabio.h"
     6#include "../../c/shared/Exceptions/exceptions.h"
    107
    11 #include "../../shared/Exceptions/exceptions.h"
    12 #include "../../include/include.h"
    13 #include "mex.h"
    14 
    15 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* __FUNCT__, void (*function)( void )){
     8int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* THISFUNCTION, void (*function)( void )){
    169
    1710        /*checks on arguments on the matlab side: */

  • issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp

    r13622 r13749  
    99#endif
    1010
    11 #include <mex.h>
    12 #include "../../shared/shared.h"
    13 #include "../../include/include.h"
    1411#include "./matlabio.h"
     12#include "../../c/shared/shared.h"
    1513
    1614/*Primitive data types*/

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToDoubleMatrix.cpp

    r13622 r13749  
    1010
    1111/*Matlab includes: */
    12 #include "mex.h"
    13 #include "../../shared/shared.h"
     12#include "./matlabio.h"
     13#include "../../c/shared/shared.h"
    1414
    1515int MatlabMatrixToDoubleMatrix(double** pmatrix,int* pmatrix_rows,int* pmatrix_cols,const mxArray* mxmatrix){

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToMatrix.cpp

    r13622 r13749  
    22 */
    33
    4 /*Headers:*/
    5 /*{{{*/
    64#ifdef HAVE_CONFIG_H
    75        #include <config.h>
    … …  
    108#endif
    119
    12 #include <mex.h>
    1310#include <stdio.h>
    1411#include <string.h>
    1512#include "./matlabio.h"
    16 #include "../../classes/classes.h"
    17 #include "../../shared/shared.h"
    18 #include "../../Container/Container.h"
    19 #include "../../include/include.h"
    20 #include "../../toolkits/toolkits.h"
    21 
    22 /*}}}*/
     13#include "../../c/shared/shared.h"
     14#include "../../c/toolkits/toolkits.h"
    2315
    2416Matrix<double>* MatlabMatrixToMatrix(const mxArray* mxmatrix){

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToPetscMat.cpp

    r13622 r13749  
    88#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    99#endif
    10 #include "../../shared/shared.h"
     10#include "../../c/shared/shared.h"
    1111
    1212/*Petsc includes: */
    13 #include "petscmat.h"
    14 #include "petscvec.h"
    15 #include "petscksp.h"
     13#include <petscmat.h>
     14#include <petscvec.h>
     15#include <petscksp.h>
    1616
    1717/*Matlab includes: */
    18 #include "mex.h"
    19 #include "matlabio.h"
     18#include "./matlabio.h"
    2019
    2120PetscMat* MatlabMatrixToPetscMat(const mxArray* mxmatrix){

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabMatrixToSeqMat.cpp

    r13216 r13749  
    33
    44/*Headers:*/
    5 /*{{{*/
    65#ifdef HAVE_CONFIG_H
    76        #include <config.h>
    … …  
    109#endif
    1110
    12 #include <mex.h>
    1311#include <stdio.h>
    1412#include <string.h>
    15 #include "../../toolkits/toolkits.h"
    16 #include "../../shared/shared.h"
    1713#include "./matlabio.h"
    18 
    19 /*}}}*/
     14#include "../../c/toolkits/toolkits.h"
     15#include "../../c/shared/shared.h"
    2016
    2117SeqMat<double>* MatlabMatrixToSeqMat(const mxArray* dataref){

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabNArrayToNArray.cpp

    r13622 r13749  
    99#endif
    1010
    11 #include "../../shared/shared.h"
    12 #include "../../include/include.h"
    13 
    14 #include <mex.h>
     11#include "./matlabio.h"
     12#include "../../c/shared/shared.h"
     13#include "../../c/include/include.h"
    1514
    1615/*FUNCTION MatlabNArrayToNArray(double** pmatrix,int* pmatrix_numel,int* pmatrix_ndims,int** pmatrix_size,const mxArray* mxmatrix){{{*/

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToDoubleVector.cpp

    r13622 r13749  
    1212
    1313/*Matlab includes: */
    14 #include "mex.h"
    15 
    16 #include "../../shared/shared.h"
     14#include "./matlabio.h"
     15#include "../../c/shared/shared.h"
    1716
    1817int MatlabVectorToDoubleVector(double** pvector,int* pvector_rows,const mxArray* mxvector){

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToPetscVec.cpp

    r13622 r13749  
    1010
    1111/*Petsc includes: */
    12 #include "petscmat.h"
    13 #include "petscvec.h"
    14 #include "petscksp.h"
     12#include <petscmat.h>
     13#include <petscvec.h>
     14#include <petscksp.h>
    1515
    1616/*Matlab includes: */
    17 #include "mex.h"
    18 
    19 #include "../../shared/shared.h"
    20 #include "matlabio.h"
     17#include "./matlabio.h"
     18#include "../../c/shared/shared.h"
    2119
    2220PetscVec* MatlabVectorToPetscVec(const mxArray* mxvector){

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToSeqVec.cpp

    r13216 r13749  
    33
    44/*Headers:*/
    5 /*{{{*/
    6 #ifdef HAVE_CONFIG_H
    7         #include <config.h>
    8 #else
    9 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    10 #endif
    11 
    125#include <mex.h>
    136#include <stdio.h>
    147#include <string.h>
    15 #include "../../toolkits/toolkits.h"
    16 #include "../../shared/shared.h"
    178#include "./matlabio.h"
    18 
    19 /*}}}*/
     9#include "../../c/toolkits/toolkits.h"
     10#include "../../c/shared/shared.h"
    2011
    2112SeqVec<double>* MatlabVectorToSeqVec(const mxArray* dataref){

  • issm/trunk-jpl/src/wrappers/matlab/io/MatlabVectorToVector.cpp

    r13622 r13749  
    33
    44/*Headers:*/
    5 /*{{{*/
    65#ifdef HAVE_CONFIG_H
    76        #include <config.h>
    … …  
    98#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    109#endif
    11 
    12 #include <mex.h>
    1310#include <stdio.h>
    1411#include <string.h>
    1512#include "./matlabio.h"
    16 #include "../../classes/classes.h"
    17 #include "../../shared/shared.h"
    18 #include "../../Container/Container.h"
    19 #include "../../include/include.h"
    20 #include "../../toolkits/toolkits.h"
    21 
    22 /*}}}*/
     13#include "../../c/shared/shared.h"
     14#include "../../c/toolkits/toolkits.h"
    2315
    2416Vector<double>* MatlabVectorToVector(const mxArray* mxvector){

  • issm/trunk-jpl/src/wrappers/matlab/io/OptionParse.cpp

    r13267 r13749  
    99
    1010#include <cstring>
    11 #include <mex.h>
    12 #include "../../shared/shared.h"
    13 #include "../../io/io.h"
    14 #include "../../include/include.h"
    1511#include "./matlabio.h"
     12#include "../../c/shared/shared.h"
     13#include "../../c/io/io.h"
    1614
    1715GenericOption<double>* OptionDoubleParse( char* name, const mxArray* prhs[]){ /*{{{*/

  • issm/trunk-jpl/src/wrappers/matlab/io/WriteMatlabData.cpp

    r13695 r13749  
    99#endif
    1010
    11 #include <mex.h>
    12 #include "../../include/include.h"
    13 #include "../../shared/shared.h"
    1411#include "./matlabio.h"
     12#include "../../c/shared/shared.h"
    1513
    1614/*Primitive data types*/

  • issm/trunk-jpl/src/wrappers/matlab/io/matlabio.h

    r13638 r13749  
    1212#endif
    1313
    14 #include <mex.h>
    15 #include "../../classes/classes.h"
    16 #include "../../Container/Container.h"
    17 #include "../../include/include.h"
     14#include "../include/matlabincludes.h"
     15#include "../../c/classes/classes.h"
     16#include "../../c/Container/Container.h"
     17#include "../../c/include/include.h"
    1818
    1919void WriteData(mxArray** pdataref,SeqMat<double>* matrix);

  • issm/trunk-jpl/src/wrappers/matlab/io/mxGetAssignedField.cpp

    r13622 r13749  
    88 */
    99
    10 #ifdef HAVE_CONFIG_H
    11 #include <config.h>
    12 #else
    13 #error "Cannot compile without HAVE_CONFIG_H symbol! run configure first!"
    14 #endif
    15 
    16 #include "mex.h"
     10#include "./matlabio.h"
    1711
    1812mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number,const char* field){

  • issm/trunk-jpl/src/wrappers/python/Makefile.am

    r13743 r13749  
    1 AM_CPPFLAGS = @DAKOTAINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @BOOSTINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
     1AM_CPPFLAGS = @DAKOTAINCL@ @PETSCINCL@ @MPIINCL@ @SPOOLESINCL@ @METISINCL@ @TRIANGLEINCL@ @CHACOINCL@ @SCOTCHINCL@ @SHAPELIBINCL@ @PYTHONINCL@ @PYTHON_NUMPYINCL@
    22
    33EXEEXT=$(PYTHONWRAPPEREXT)
    44
     5#python io{{{
     6lib_LIBRARIES = libISSMPython.a
     7if SHAREDLIBS
     8lib_LTLIBRARIES = libISSMPython.la
     9else
     10        lib_LTLIBRARIES =
     11endif
     12
     13io_sources= ./include/pythonincludes.h\
     14                                ./io/pythonio.h\
     15                                ./io/WritePythonData.cpp\
     16                                ./io/CheckNumPythonArguments.cpp\
     17                                ./io/FetchPythonData.cpp
     18
     19ALLCXXFLAGS= -fPIC -D_GNU_SOURCE -fno-omit-frame-pointer -pthread -D_CPP_  $(CXXFLAGS) $(CXXOPTFLAGS)
     20libISSMPython_a_SOURCES = $(io_sources)
     21libISSMPython_a_CXXFLAGS= $(ALLCXXFLAGS)
     22if SHAREDLIBS
     23libISSMPython_la_SOURCES = $(io_sources)
     24endif
     25#}}}
    526#Wrappers {{{
    627if WRAPPERS
    … …  
    3859endif
    3960if SHAREDLIBS
    40 deps += ../../c/libISSMPython.la
     61deps += ./libISSMPython.la
    4162else
    42 deps += ../../c/libISSMPython.a
     63deps += ./libISSMPython.a
    4364AM_LDFLAGS += --no-warnings
    4465endif

  • issm/trunk-jpl/src/wrappers/python/include/wrapper_macros.h

    r13747 r13749  
    33 */
    44
    5 #ifndef _PYTHON_MACROS_H_
    6 #define _PYTHON_MACROS_H_
    7 
    8 /*Header {{{*/
     5#ifndef _PY_WRAPPER_MACROS_H_
     6#define _PY_WRAPPER_MACROS_H_
    97
    108#ifdef HAVE_CONFIG_H
    … …  
    1311#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    1412#endif
    15 /*}}}*/
    1613
    1714#ifdef _HAVE_PYTHON_
    … …  
    9390/*}}}*/
    9491#endif
    95 
    9692#endif

  • issm/trunk-jpl/src/wrappers/python/io/CheckNumPythonArguments.cpp

    r13622 r13749  
    33 */
    44
    5 #ifdef HAVE_CONFIG_H
    6         #include <config.h>
    7 #else
    8 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
    9 #endif
    10 
    115#define PY_ARRAY_UNIQUE_SYMBOL PythonIOSymbol
    126#define NO_IMPORT
    137
    14 #include "../../toolkits/toolkits.h"
    15 #include "../../shared/Exceptions/exceptions.h"
    16 #include "../../include/include.h"
     8#include "./pythonio.h"
     9#include "../../c/shared/Exceptions/exceptions.h"
     10#include "../../c/include/include.h"
    1711
    1812int CheckNumPythonArguments(PyObject* inputs,int NRHS, void (*function)( void )){

  • issm/trunk-jpl/src/wrappers/python/io/FetchPythonData.cpp

    r13622 r13749  
    1212#define NO_IMPORT
    1313
    14 #include "../../toolkits/toolkits.h"
    15 #include "../../include/include.h"
    16 #include "../../shared/shared.h"
    17 #include "../../io/io.h"
    18 void FetchData(char** pstring,PyObject* py_string);
     14#include "./pythonio.h"
     15#include "../../c/include/include.h"
     16#include "../../c/shared/shared.h"
    1917
    2018/*Primitive data types*/

  • issm/trunk-jpl/src/wrappers/python/io/WritePythonData.cpp

    r13698 r13749  
    1212#define NO_IMPORT
    1313
    14 #include "../../toolkits/toolkits.h"
    15 #include "../../include/include.h"
    16 #include "../../modules/modules.h"
    17 #include "../../Container/Container.h"
    18 #include "../../shared/shared.h"
    19 #include "../../io/io.h"
    20 #include "../../EnumDefinitions/EnumDefinitions.h"
    21 PyObject* PyArrayFromCopiedData(int dims[2],double* data);
    22 PyObject* PyArrayFromCopiedData(int dimi,int dimj,double* data);
     14#include "./pythonio.h"
     15#include "../../c/include/include.h"
     16#include "../../c/Container/Container.h"
     17#include "../../c/shared/shared.h"
     18#include "../../c/EnumDefinitions/EnumDefinitions.h"
    2319
    2420/*Primitive data types*/

  • issm/trunk-jpl/src/wrappers/python/io/pythonio.h

    r13640 r13749  
    1212#endif
    1313
    14 #include "../../classes/classes.h"
    15 #include "../../Container/Container.h"
    16 #include "../../include/include.h"
     14#include "../include/pythonincludes.h"
     15#include "../../c/classes/classes.h"
     16#include "../../c/Container/Container.h"
     17#include "../../c/include/include.h"
    1718
    1819void WriteData(PyObject* py_tuple,int index, double* matrix, int M,int N);
    … …  
    4142int CheckNumPythonArguments(PyObject* inputs,int NRHS, void (*function)( void ));
    4243
     44/*Utils*/
     45PyObject* PyArrayFromCopiedData(int dims[2],double* data);
     46PyObject* PyArrayFromCopiedData(int dimi,int dimj,double* data);
     47
    4348#endif  /* _IO_H_ */
Note: See TracChangeset for help on using the changeset viewer.