Changeset 21086


Ignore:
Timestamp:
08/04/16 13:56:55 (9 years ago)
Author:
Mathieu Morlighem
Message:

DEL: no more Enums, RIP

Location:
issm/trunk-jpl/src/wrappers
Files:
2 deleted
14 edited

Legend:

Unmodified
Added
Removed

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

    r19838 r21086  
    2424#include "../../c/shared/shared.h"
    2525#include "../../c/shared/io/io.h"
    26 #include "../../c/shared/Enum/Enum.h"
    2726
    2827#undef __FUNCT__

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

    r20061 r21086  
    2323#include "../../c/shared/shared.h"
    2424#include "../../c/shared/io/io.h"
    25 #include "../../c/shared/Enum/Enum.h"
    2625
    2726#undef __FUNCT__

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

    r19717 r21086  
    2424#include "../../c/shared/shared.h"
    2525#include "../../c/shared/io/io.h"
    26 #include "../../c/shared/Enum/Enum.h"
    2726
    2827#undef __FUNCT__

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

    r19010 r21086  
    2424#include "../../c/shared/shared.h"
    2525#include "../../c/shared/io/io.h"
    26 #include "../../c/shared/Enum/Enum.h"
    2726
    2827#undef __FUNCT__

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

    r17129 r21086  
    2323#include "../../c/shared/shared.h"
    2424#include "../../c/shared/io/io.h"
    25 #include "../../c/shared/Enum/Enum.h"
    2625
    2726#undef __FUNCT__

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

    r19753 r21086  
    2424#include "../../c/shared/shared.h"
    2525#include "../../c/shared/io/io.h"
    26 #include "../../c/shared/Enum/Enum.h"
    2726
    2827#undef __FUNCT__

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

    r19896 r21086  
    2020#include "../bindings.h"
    2121#include "../../c/main/globals.h"
    22 #include "../../c/shared/Enum/Enum.h"
    2322#include "../../c/shared/shared.h"
    2423

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

    r19717 r21086  
    2727#include "../../c/shared/shared.h"
    2828#include "../../c/shared/io/io.h"
    29 #include "../../c/shared/Enum/Enum.h"
    3029
    3130#ifdef _HAVE_MATLAB_MODULES_

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

    r19717 r21086  
    2929#include "../../c/shared/shared.h"
    3030#include "../../c/shared/io/io.h"
    31 #include "../../c/shared/Enum/Enum.h"
    3231
    3332#undef __FUNCT__

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

    r20352 r21086  
    1313                         ${ISSM_DIR}/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.js\
    1414                         ${ISSM_DIR}/src/wrappers/IssmConfig/IssmConfig.js\
    15                          ${ISSM_DIR}/src/wrappers/EnumToString/EnumToString.js\
    16                          ${ISSM_DIR}/src/wrappers/StringToEnum/StringToEnum.js\
    1715                         ${ISSM_DIR}/src/wrappers/Issm/issm.js
    1816
    … …  
    8987                                         ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\
    9088                                         ../IssmConfig/IssmConfig.cpp\
    91                                          ../EnumToString/EnumToString.cpp\
    92                                          ../StringToEnum/StringToEnum.cpp\
    9389                                         ../Issm/issm.cpp
    9490
    95 IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_  --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_EnumToStringModule','_StringToEnumModule','_IssmModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
     91IssmModule_CXXFLAGS= -fPIC -D_DO_NOT_LOAD_GLOBALS_  --memory-init-file 0 $(AM_CXXFLAGS) $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) -s EXPORTED_FUNCTIONS="['_TriMeshModule','_NodeConnectivityModule','_ContourToMeshModule','_ElementConnectivityModule','_InterpFromMeshToMesh2dModule','_IssmConfigModule','_IssmModule']"  -s DISABLE_EXCEPTION_CATCHING=0 -s ALLOW_MEMORY_GROWTH=1 -s INVOKE_RUN=0
    9692IssmModule_LDADD = ${deps} $(TRIANGLELIB)  $(GSLLIB)
    9793#}}}

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

    r20963 r21086  
    4444                                                 DistanceToMaskBoundary_matlab.la\
    4545                                                 ElementConnectivity_matlab.la\
    46                                                  EnumToString_matlab.la\
    4746                                                 ExpSimplify_matlab.la\
    4847                                                 ExpToLevelSet_matlab.la\
    … …  
    6059                                                 PointCloudFindNeighbors_matlab.la\
    6160                                                 PropagateFlagsFromConnectivity_matlab.la\
    62                                                  StringToEnum_matlab.la\
    6361                                                 TriMesh_matlab.la\
    6462                                                 TriMeshProcessRifts_matlab.la\
    … …  
    179177ElementConnectivity_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    180178
    181 EnumToString_matlab_la_SOURCES = ../EnumToString/EnumToString.cpp
    182 EnumToString_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    183 EnumToString_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    184 
    185 StringToEnum_matlab_la_SOURCES = ../StringToEnum/StringToEnum.cpp
    186 StringToEnum_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
    187 StringToEnum_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    188 
    189179InterpFromGridToMesh_matlab_la_SOURCES = ../InterpFromGridToMesh/InterpFromGridToMesh.cpp
    190180InterpFromGridToMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}

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

    r20963 r21086  
    3434                                                ContourToNodes_python.la\
    3535                                                ElementConnectivity_python.la\
    36                                                 EnumToString_python.la\
    3736                                                InterpFromMeshToMesh2d_python.la\
    3837                                                InterpFromMeshToMesh3d_python.la\
    … …  
    4241                                                MeshProfileIntersection_python.la\
    4342                                                NodeConnectivity_python.la\
    44                                                 StringToEnum_python.la\
    4543                                                TriMesh_python.la\
    4644                                                TriMeshProcessRifts_python.la
    … …  
    115113ElementConnectivity_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    116114
    117 EnumToString_python_la_SOURCES = ../EnumToString/EnumToString.cpp
    118 EnumToString_python_la_CXXFLAGS = ${AM_CXXFLAGS}
    119 EnumToString_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    120 
    121115InterpFromMeshToMesh2d_python_la_SOURCES = ../InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp
    122116InterpFromMeshToMesh2d_python_la_CXXFLAGS = ${AM_CXXFLAGS}
    … …  
    147141NodeConnectivity_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    148142
    149 StringToEnum_python_la_SOURCES = ../StringToEnum/StringToEnum.cpp
    150 StringToEnum_python_la_CXXFLAGS = ${AM_CXXFLAGS}
    151 StringToEnum_python_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
    152 
    153143TriMesh_python_la_SOURCES = ../TriMesh/TriMesh.cpp
    154144TriMesh_python_la_CXXFLAGS = ${AM_CXXFLAGS}

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

    r15281 r21086  
    1111#include "./pythonio.h"
    1212#include "../../c/shared/shared.h"
    13 #include "../../c/shared/Enum/Enum.h"
    1413
    1514/*Python printf i/o: */

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

    r21049 r21086  
    1414#include "./pythonio.h"
    1515#include "../../c/shared/shared.h"
    16 #include "../../c/shared/Enum/Enum.h"
    1716
    1817/*Primitive data types*/
Note: See TracChangeset for help on using the changeset viewer.